diff --git a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java new file mode 100644 index 0000000..d410a7f --- /dev/null +++ b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java @@ -0,0 +1,16 @@ +package com.hypherionmc.craterlib.compat; + +import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +import dev.ftb.mods.ftbessentials.util.FTBEPlayerData; + +import java.util.Optional; + +public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { + FTBEPlayerData data = FTBEPlayerData.get(player.toMojang()); + return data != null && data.muted; + + } + +} diff --git a/1.18.2/build.gradle b/1.18.2/build.gradle index ccc15b3..eac7ca3 100644 --- a/1.18.2/build.gradle +++ b/1.18.2/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '8.1.1' apply false - id "xyz.wagyourtail.unimined" version "1.2.4" apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.orion" version "1.0.+" id 'maven-publish' @@ -49,8 +49,10 @@ subprojects { configurations { shade modCompileOnly + stupidRemapArch implementation.extendsFrom shade compileOnly.extendsFrom modCompileOnly + compileOnly.extendsFrom stupidRemapArch } dependencies { @@ -64,6 +66,8 @@ subprojects { shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + compileOnly 'net.luckperms:api:5.4' compileOnly("org.projectlombok:lombok:${lombok}") annotationProcessor("org.projectlombok:lombok:${lombok}") @@ -98,6 +102,12 @@ subprojects { mojmap() devNamespace "mojmap" } + + mods { + remap(configurations.stupidRemapArch) { + catchAWNamespaceAssertion() + } + } } tasks.withType(JavaCompile).configureEach { diff --git a/1.18.2/gradle.properties b/1.18.2/gradle.properties index 1a6d6a8..2035615 100644 --- a/1.18.2/gradle.properties +++ b/1.18.2/gradle.properties @@ -28,6 +28,7 @@ rpc_sdk=1.0 discord_formatter=2.0.0 # Mod Dependencies +ftb_essentials=1802.2.2-build.83 fabrictailor=1.9.0+1.18.2 vanish=1.1.0 mod_menu_version=3.2.5 diff --git a/1.19.2/Common/build.gradle b/1.19.2/Common/build.gradle index 843d62a..15a4dec 100644 --- a/1.19.2/Common/build.gradle +++ b/1.19.2/Common/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" dependencies { - + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") } shadowJar { diff --git a/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java b/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java new file mode 100644 index 0000000..d410a7f --- /dev/null +++ b/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java @@ -0,0 +1,16 @@ +package com.hypherionmc.craterlib.compat; + +import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +import dev.ftb.mods.ftbessentials.util.FTBEPlayerData; + +import java.util.Optional; + +public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { + FTBEPlayerData data = FTBEPlayerData.get(player.toMojang()); + return data != null && data.muted; + + } + +} diff --git a/1.19.2/Fabric/build.gradle b/1.19.2/Fabric/build.gradle index df92bab..5b4fde7 100644 --- a/1.19.2/Fabric/build.gradle +++ b/1.19.2/Fabric/build.gradle @@ -9,6 +9,7 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" diff --git a/1.19.2/Forge/build.gradle b/1.19.2/Forge/build.gradle index da32b75..4a37880 100644 --- a/1.19.2/Forge/build.gradle +++ b/1.19.2/Forge/build.gradle @@ -5,6 +5,7 @@ dependencies { // Compat modImplementation("maven.modrinth:vanishmod:${vanishmod}") + stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") // Do not edit or remove implementation project(":Common") } diff --git a/1.19.2/build.gradle b/1.19.2/build.gradle index 4da6385..5a37940 100644 --- a/1.19.2/build.gradle +++ b/1.19.2/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '8.1.1' apply false - id "xyz.wagyourtail.unimined" version "1.2.4" apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.orion" version "1.0.+" id 'maven-publish' @@ -49,8 +49,10 @@ subprojects { configurations { shade modCompileOnly + stupidRemapArch implementation.extendsFrom shade compileOnly.extendsFrom modCompileOnly + compileOnly.extendsFrom stupidRemapArch } dependencies { @@ -98,6 +100,12 @@ subprojects { mojmap() devNamespace "mojmap" } + + mods { + remap(configurations.stupidRemapArch) { + catchAWNamespaceAssertion() + } + } } tasks.withType(JavaCompile).configureEach { diff --git a/1.19.2/gradle.properties b/1.19.2/gradle.properties index f7c791c..6f27f79 100644 --- a/1.19.2/gradle.properties +++ b/1.19.2/gradle.properties @@ -18,7 +18,7 @@ fabric_loader=0.15.11 fabric_api=0.76.0+1.19.2 # Forge -forge_version=43.2.0 +forge_version=43.4.0 # Dependencies moon_config=1.0.9 @@ -28,6 +28,7 @@ rpc_sdk=1.0 discord_formatter=2.0.0 # Mod Dependencies +ftb_essentials=1902.3.5-build.135 fabrictailor=2.0.1 vanish=1.3.2 mod_menu_version=4.2.0-beta.2 diff --git a/1.19.3/Common/build.gradle b/1.19.3/Common/build.gradle index 843d62a..15a4dec 100644 --- a/1.19.3/Common/build.gradle +++ b/1.19.3/Common/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" dependencies { - + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") } shadowJar { diff --git a/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java b/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java new file mode 100644 index 0000000..bf52038 --- /dev/null +++ b/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java @@ -0,0 +1,16 @@ +package com.hypherionmc.craterlib.compat; + +import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +import dev.ftb.mods.ftbessentials.util.FTBEPlayerData; + +import java.util.Optional; + +public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { + Optional data = FTBEPlayerData.getOrCreate(player.toMojang()); + return data.map(FTBEPlayerData::isMuted).orElse(false); + + } + +} diff --git a/1.19.3/Fabric/build.gradle b/1.19.3/Fabric/build.gradle index bfa9be2..6554530 100644 --- a/1.19.3/Fabric/build.gradle +++ b/1.19.3/Fabric/build.gradle @@ -9,6 +9,7 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" diff --git a/1.19.3/Forge/build.gradle b/1.19.3/Forge/build.gradle index 59bf756..6bedefe 100644 --- a/1.19.3/Forge/build.gradle +++ b/1.19.3/Forge/build.gradle @@ -5,6 +5,8 @@ dependencies { // Compat modImplementation("maven.modrinth:vanishmod:${vanishmod}") + stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") + // Do not edit or remove implementation project(":Common") } diff --git a/1.19.3/build.gradle b/1.19.3/build.gradle index 4da6385..5a37940 100644 --- a/1.19.3/build.gradle +++ b/1.19.3/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '8.1.1' apply false - id "xyz.wagyourtail.unimined" version "1.2.4" apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.orion" version "1.0.+" id 'maven-publish' @@ -49,8 +49,10 @@ subprojects { configurations { shade modCompileOnly + stupidRemapArch implementation.extendsFrom shade compileOnly.extendsFrom modCompileOnly + compileOnly.extendsFrom stupidRemapArch } dependencies { @@ -98,6 +100,12 @@ subprojects { mojmap() devNamespace "mojmap" } + + mods { + remap(configurations.stupidRemapArch) { + catchAWNamespaceAssertion() + } + } } tasks.withType(JavaCompile).configureEach { diff --git a/1.19.3/gradle.properties b/1.19.3/gradle.properties index c181622..bfaaa20 100644 --- a/1.19.3/gradle.properties +++ b/1.19.3/gradle.properties @@ -28,6 +28,7 @@ rpc_sdk=1.0 discord_formatter=2.0.0 # Mod Dependencies +ftb_essentials=1904.1.0-build.81-SNAPSHOT fabrictailor=2.0.2 vanish=1.4.0+1.19.3 mod_menu_version=5.1.0-beta.4 diff --git a/1.20.2/Common/build.gradle b/1.20.2/Common/build.gradle index 843d62a..15a4dec 100644 --- a/1.20.2/Common/build.gradle +++ b/1.20.2/Common/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" dependencies { - + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") } shadowJar { diff --git a/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java b/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java new file mode 100644 index 0000000..bf52038 --- /dev/null +++ b/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java @@ -0,0 +1,16 @@ +package com.hypherionmc.craterlib.compat; + +import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +import dev.ftb.mods.ftbessentials.util.FTBEPlayerData; + +import java.util.Optional; + +public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { + Optional data = FTBEPlayerData.getOrCreate(player.toMojang()); + return data.map(FTBEPlayerData::isMuted).orElse(false); + + } + +} diff --git a/1.20.2/Fabric/build.gradle b/1.20.2/Fabric/build.gradle index 1db77f0..e18bccb 100644 --- a/1.20.2/Fabric/build.gradle +++ b/1.20.2/Fabric/build.gradle @@ -9,6 +9,7 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" diff --git a/1.20.2/Forge/build.gradle b/1.20.2/Forge/build.gradle index 8603372..75ef599 100644 --- a/1.20.2/Forge/build.gradle +++ b/1.20.2/Forge/build.gradle @@ -5,6 +5,8 @@ dependencies { // Compat modImplementation("maven.modrinth:vanishmod:${vanishmod}") + stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") + // Do not edit or remove implementation project(":Common") } diff --git a/1.20.2/build.gradle b/1.20.2/build.gradle index 4da6385..5a37940 100644 --- a/1.20.2/build.gradle +++ b/1.20.2/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '8.1.1' apply false - id "xyz.wagyourtail.unimined" version "1.2.4" apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.orion" version "1.0.+" id 'maven-publish' @@ -49,8 +49,10 @@ subprojects { configurations { shade modCompileOnly + stupidRemapArch implementation.extendsFrom shade compileOnly.extendsFrom modCompileOnly + compileOnly.extendsFrom stupidRemapArch } dependencies { @@ -98,6 +100,12 @@ subprojects { mojmap() devNamespace "mojmap" } + + mods { + remap(configurations.stupidRemapArch) { + catchAWNamespaceAssertion() + } + } } tasks.withType(JavaCompile).configureEach { diff --git a/1.20.2/gradle.properties b/1.20.2/gradle.properties index 524bfc1..4fdda6c 100644 --- a/1.20.2/gradle.properties +++ b/1.20.2/gradle.properties @@ -28,6 +28,7 @@ rpc_sdk=1.0 discord_formatter=2.0.0 # Mod Dependencies +ftb_essentials=2001.2.2 fabrictailor=2.2.1 vanish=1.5.0+1.20.2 mod_menu_version=8.0.1 diff --git a/1.20.4/Common/build.gradle b/1.20.4/Common/build.gradle index 843d62a..15a4dec 100644 --- a/1.20.4/Common/build.gradle +++ b/1.20.4/Common/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" dependencies { - + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") } shadowJar { diff --git a/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java b/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java new file mode 100644 index 0000000..bf52038 --- /dev/null +++ b/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java @@ -0,0 +1,16 @@ +package com.hypherionmc.craterlib.compat; + +import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +import dev.ftb.mods.ftbessentials.util.FTBEPlayerData; + +import java.util.Optional; + +public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { + Optional data = FTBEPlayerData.getOrCreate(player.toMojang()); + return data.map(FTBEPlayerData::isMuted).orElse(false); + + } + +} diff --git a/1.20.4/Fabric/build.gradle b/1.20.4/Fabric/build.gradle index daf42ce..b2d9668 100644 --- a/1.20.4/Fabric/build.gradle +++ b/1.20.4/Fabric/build.gradle @@ -9,6 +9,8 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" diff --git a/1.20.4/Forge/build.gradle b/1.20.4/Forge/build.gradle index 1325c10..0ecaa19 100644 --- a/1.20.4/Forge/build.gradle +++ b/1.20.4/Forge/build.gradle @@ -5,6 +5,8 @@ dependencies { // Compat modImplementation("maven.modrinth:vanishmod:${vanishmod}") + stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") + // Do not edit or remove implementation project(":Common") } diff --git a/1.20.4/NeoForge/build.gradle b/1.20.4/NeoForge/build.gradle index 7f53323..8915bc4 100644 --- a/1.20.4/NeoForge/build.gradle +++ b/1.20.4/NeoForge/build.gradle @@ -4,6 +4,8 @@ dependencies { // Compat modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") + stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") + // Do not edit or remove implementation project(":Common") } diff --git a/1.20.4/build.gradle b/1.20.4/build.gradle index 2452d3c..6c58de8 100644 --- a/1.20.4/build.gradle +++ b/1.20.4/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '8.1.1' apply false - id "xyz.wagyourtail.unimined" version "1.2.4" apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.orion" version "1.0.+" id 'maven-publish' @@ -49,8 +49,10 @@ subprojects { configurations { shade modCompileOnly + stupidRemapArch implementation.extendsFrom shade compileOnly.extendsFrom modCompileOnly + compileOnly.extendsFrom stupidRemapArch } dependencies { @@ -98,6 +100,12 @@ subprojects { mojmap() devNamespace "mojmap" } + + mods { + remap(configurations.stupidRemapArch) { + catchAWNamespaceAssertion() + } + } } tasks.withType(JavaCompile).configureEach { diff --git a/1.20.4/gradle.properties b/1.20.4/gradle.properties index 30f4182..3236a9e 100644 --- a/1.20.4/gradle.properties +++ b/1.20.4/gradle.properties @@ -36,6 +36,7 @@ vanish=1.5.4+1.20.4 mod_menu_version=9.2.0-beta.2 vanishmod=1.1.15 vanishmod_neo=puxrKAMr +ftb_essentials=2004.1.3 # Publishing curse_id=867099 diff --git a/1.20/Common/build.gradle b/1.20/Common/build.gradle index 843d62a..15a4dec 100644 --- a/1.20/Common/build.gradle +++ b/1.20/Common/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" dependencies { - + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") } shadowJar { diff --git a/1.20/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java b/1.20/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java new file mode 100644 index 0000000..bf52038 --- /dev/null +++ b/1.20/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java @@ -0,0 +1,16 @@ +package com.hypherionmc.craterlib.compat; + +import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +import dev.ftb.mods.ftbessentials.util.FTBEPlayerData; + +import java.util.Optional; + +public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { + Optional data = FTBEPlayerData.getOrCreate(player.toMojang()); + return data.map(FTBEPlayerData::isMuted).orElse(false); + + } + +} diff --git a/1.20/Fabric/build.gradle b/1.20/Fabric/build.gradle index f4ad92f..edbadf2 100644 --- a/1.20/Fabric/build.gradle +++ b/1.20/Fabric/build.gradle @@ -9,6 +9,7 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" diff --git a/1.20/Forge/build.gradle b/1.20/Forge/build.gradle index 9e6a617..058181c 100644 --- a/1.20/Forge/build.gradle +++ b/1.20/Forge/build.gradle @@ -5,6 +5,8 @@ dependencies { // Compat modImplementation("maven.modrinth:vanishmod:${vanishmod}") + stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") + // Do not edit or remove implementation project(":Common") } diff --git a/1.20/build.gradle b/1.20/build.gradle index 3ef1c25..17dd23e 100644 --- a/1.20/build.gradle +++ b/1.20/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '8.1.1' apply false - id "xyz.wagyourtail.unimined" version "1.2.4" apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.orion" version "1.0.+" id 'maven-publish' @@ -48,8 +48,10 @@ subprojects { configurations { shade modCompileOnly + stupidRemapArch implementation.extendsFrom shade compileOnly.extendsFrom modCompileOnly + compileOnly.extendsFrom stupidRemapArch } dependencies { @@ -97,6 +99,12 @@ subprojects { mojmap() devNamespace "mojmap" } + + mods { + remap(configurations.stupidRemapArch) { + catchAWNamespaceAssertion() + } + } } tasks.withType(JavaCompile).configureEach { diff --git a/1.20/gradle.properties b/1.20/gradle.properties index 6b99090..33d8481 100644 --- a/1.20/gradle.properties +++ b/1.20/gradle.properties @@ -28,6 +28,7 @@ rpc_sdk=1.0 discord_formatter=2.0.0 # Mod Dependencies +ftb_essentials=2001.2.2 fabrictailor=2.2.1 vanish=1.5.4+1.20.1 mod_menu_version=7.0.1 diff --git a/1.21/Common/build.gradle b/1.21/Common/build.gradle index 843d62a..15a4dec 100644 --- a/1.21/Common/build.gradle +++ b/1.21/Common/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" dependencies { - + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") } shadowJar { diff --git a/1.21/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java b/1.21/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java new file mode 100644 index 0000000..bf52038 --- /dev/null +++ b/1.21/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java @@ -0,0 +1,16 @@ +package com.hypherionmc.craterlib.compat; + +import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer; +import dev.ftb.mods.ftbessentials.util.FTBEPlayerData; + +import java.util.Optional; + +public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { + Optional data = FTBEPlayerData.getOrCreate(player.toMojang()); + return data.map(FTBEPlayerData::isMuted).orElse(false); + + } + +} diff --git a/1.21/Fabric/build.gradle b/1.21/Fabric/build.gradle index 0dd5702..6eb855d 100644 --- a/1.21/Fabric/build.gradle +++ b/1.21/Fabric/build.gradle @@ -9,6 +9,8 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } + stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:vanish:${vanish}" diff --git a/1.21/NeoForge/build.gradle b/1.21/NeoForge/build.gradle index 0412dbc..9fa64b3 100644 --- a/1.21/NeoForge/build.gradle +++ b/1.21/NeoForge/build.gradle @@ -4,6 +4,8 @@ dependencies { // Compat modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") + stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") + // Do not edit or remove implementation project(":Common") } diff --git a/1.21/build.gradle b/1.21/build.gradle index af450e6..6f6c3cf 100644 --- a/1.21/build.gradle +++ b/1.21/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '8.1.1' apply false - id "xyz.wagyourtail.unimined" version "1.2.4" apply false + id "xyz.wagyourtail.unimined" version "1.3.9" apply false id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.orion" version "1.0.+" id 'maven-publish' @@ -49,8 +49,10 @@ subprojects { configurations { shade modCompileOnly + stupidRemapArch implementation.extendsFrom shade compileOnly.extendsFrom modCompileOnly + compileOnly.extendsFrom stupidRemapArch } dependencies { @@ -98,11 +100,17 @@ subprojects { mojmap() devNamespace "mojmap" } + + mods { + remap(configurations.stupidRemapArch) { + catchAWNamespaceAssertion() + } + } } tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' - it.options.release = 17 + it.options.release = 21 } tasks.withType(GenerateModuleMetadata).configureEach { diff --git a/1.21/gradle.properties b/1.21/gradle.properties index 3ce8c42..be85cb2 100644 --- a/1.21/gradle.properties +++ b/1.21/gradle.properties @@ -21,7 +21,7 @@ fabric_api=0.100.1+1.21 forge_version=50.0.6 # NeoForged -neoforge_version=0.0-beta +neoforge_version=0-beta # Dependencies moon_config=1.0.9 @@ -36,6 +36,7 @@ vanish=1.5.4+1.20.5 mod_menu_version=10.0.0-beta.1 vanishmod=1.1.12.1 vanishmod_neo=puxrKAMr +ftb_essentials=2101.1.0 # Publishing curse_id=867099 diff --git a/commit.sha b/commit.sha index e9c7bf8..878a4e8 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -eda815c460bd236bc16f0c8066cd7c0a02deafd5 \ No newline at end of file +197bfaf6dffe8c31498242a89aea6c8e329174a1 \ No newline at end of file diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java.patch new file mode 100644 index 0000000..8a7479d --- /dev/null +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java.patch @@ -0,0 +1,13 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java +@@ -8,8 +8,8 @@ + public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { +- Optional data = FTBEPlayerData.getOrCreate(player.toMojang()); +- return data.map(FTBEPlayerData::isMuted).orElse(false); ++ FTBEPlayerData data = FTBEPlayerData.get(player.toMojang()); ++ return data != null && data.muted; + + } + diff --git a/patches/1.18.2/build.gradle.patch b/patches/1.18.2/build.gradle.patch index 7e4c6b5..5be20b1 100644 --- a/patches/1.18.2/build.gradle.patch +++ b/patches/1.18.2/build.gradle.patch @@ -11,7 +11,7 @@ group = rootProject.group -@@ -59,7 +59,7 @@ +@@ -61,7 +61,7 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -20,3 +20,12 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" +@@ -112,7 +112,7 @@ + + tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' +- it.options.release = 21 ++ it.options.release = 17 + } + + tasks.withType(GenerateModuleMetadata).configureEach { diff --git a/patches/1.18.2/gradle.properties.patch b/patches/1.18.2/gradle.properties.patch index 8ef9a5a..f8d4ddb 100644 --- a/patches/1.18.2/gradle.properties.patch +++ b/patches/1.18.2/gradle.properties.patch @@ -23,7 +23,7 @@ # Dependencies moon_config=1.0.9 -@@ -31,16 +28,15 @@ +@@ -31,17 +28,16 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -32,6 +32,8 @@ -mod_menu_version=10.0.0-beta.1 -vanishmod=1.1.12.1 -vanishmod_neo=puxrKAMr +-ftb_essentials=2101.1.0 ++ftb_essentials=1802.2.2-build.83 +fabrictailor=1.9.0+1.18.2 +vanish=1.1.0 +mod_menu_version=3.2.5 diff --git a/patches/1.19.2/Common/build.gradle.patch b/patches/1.19.2/Common/build.gradle.patch new file mode 100644 index 0000000..dc0f827 --- /dev/null +++ b/patches/1.19.2/Common/build.gradle.patch @@ -0,0 +1,11 @@ +--- a/Common/build.gradle ++++ b/Common/build.gradle +@@ -1,7 +1,7 @@ + archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" + + dependencies { +- ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + } + + shadowJar { diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java.patch new file mode 100644 index 0000000..8a7479d --- /dev/null +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java.patch @@ -0,0 +1,13 @@ +--- a/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java ++++ b/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java +@@ -8,8 +8,8 @@ + public class FTBEssentials { + + public static boolean isPlayerMuted(BridgedPlayer player) { +- Optional data = FTBEPlayerData.getOrCreate(player.toMojang()); +- return data.map(FTBEPlayerData::isMuted).orElse(false); ++ FTBEPlayerData data = FTBEPlayerData.get(player.toMojang()); ++ return data != null && data.muted; + + } + diff --git a/patches/1.19.2/Fabric/build.gradle.patch b/patches/1.19.2/Fabric/build.gradle.patch index 593d6b1..2692aa1 100644 --- a/patches/1.19.2/Fabric/build.gradle.patch +++ b/patches/1.19.2/Fabric/build.gradle.patch @@ -1,6 +1,14 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -113,8 +113,8 @@ +@@ -9,6 +9,7 @@ + exclude(group: "net.fabricmc.fabric-api") + } + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" + modImplementation "maven.modrinth:vanish:${vanish}" + +@@ -113,8 +114,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.19.2/Forge/build.gradle.patch b/patches/1.19.2/Forge/build.gradle.patch index e16081d..c5166bf 100644 --- a/patches/1.19.2/Forge/build.gradle.patch +++ b/patches/1.19.2/Forge/build.gradle.patch @@ -1,15 +1,17 @@ --- a/Forge/build.gradle +++ b/Forge/build.gradle -@@ -3,7 +3,7 @@ +@@ -3,8 +3,9 @@ dependencies { // Compat - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}") ++ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") // Do not edit or remove implementation project(":Common") -@@ -107,8 +107,8 @@ + } +@@ -107,8 +108,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.19.2/build.gradle.patch b/patches/1.19.2/build.gradle.patch index 6e95974..5645279 100644 --- a/patches/1.19.2/build.gradle.patch +++ b/patches/1.19.2/build.gradle.patch @@ -11,7 +11,7 @@ group = rootProject.group -@@ -59,7 +59,7 @@ +@@ -61,13 +61,11 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -20,3 +20,18 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" + +- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- + compileOnly 'net.luckperms:api:5.4' + compileOnly("org.projectlombok:lombok:${lombok}") + annotationProcessor("org.projectlombok:lombok:${lombok}") +@@ -112,7 +110,7 @@ + + tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' +- it.options.release = 21 ++ it.options.release = 17 + } + + tasks.withType(GenerateModuleMetadata).configureEach { diff --git a/patches/1.19.2/gradle.properties.patch b/patches/1.19.2/gradle.properties.patch index 20eccdd..9486029 100644 --- a/patches/1.19.2/gradle.properties.patch +++ b/patches/1.19.2/gradle.properties.patch @@ -19,11 +19,11 @@ - -# NeoForged -neoforge_version=0.0-beta -+forge_version=43.2.0 ++forge_version=43.4.0 # Dependencies moon_config=1.0.9 -@@ -31,16 +28,15 @@ +@@ -31,17 +28,16 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -32,6 +32,8 @@ -mod_menu_version=10.0.0-beta.1 -vanishmod=1.1.12.1 -vanishmod_neo=puxrKAMr +-ftb_essentials=2101.1.0 ++ftb_essentials=1902.3.5-build.135 +fabrictailor=2.0.1 +vanish=1.3.2 +mod_menu_version=4.2.0-beta.2 diff --git a/patches/1.19.3/Common/build.gradle.patch b/patches/1.19.3/Common/build.gradle.patch new file mode 100644 index 0000000..dc0f827 --- /dev/null +++ b/patches/1.19.3/Common/build.gradle.patch @@ -0,0 +1,11 @@ +--- a/Common/build.gradle ++++ b/Common/build.gradle +@@ -1,7 +1,7 @@ + archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" + + dependencies { +- ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + } + + shadowJar { diff --git a/patches/1.19.3/Fabric/build.gradle.patch b/patches/1.19.3/Fabric/build.gradle.patch index 6a5f4b0..514ec06 100644 --- a/patches/1.19.3/Fabric/build.gradle.patch +++ b/patches/1.19.3/Fabric/build.gradle.patch @@ -1,6 +1,14 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -113,8 +113,8 @@ +@@ -9,6 +9,7 @@ + exclude(group: "net.fabricmc.fabric-api") + } + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" + modImplementation "maven.modrinth:vanish:${vanish}" + +@@ -113,8 +114,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.19.3/Forge/build.gradle.patch b/patches/1.19.3/Forge/build.gradle.patch index 0cbfa3b..4e10f64 100644 --- a/patches/1.19.3/Forge/build.gradle.patch +++ b/patches/1.19.3/Forge/build.gradle.patch @@ -1,15 +1,17 @@ --- a/Forge/build.gradle +++ b/Forge/build.gradle -@@ -3,7 +3,7 @@ +@@ -3,7 +3,9 @@ dependencies { // Compat - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}") ++ ++ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") // Do not edit or remove implementation project(":Common") -@@ -107,8 +107,8 @@ +@@ -107,8 +109,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.19.3/build.gradle.patch b/patches/1.19.3/build.gradle.patch index 6e95974..5645279 100644 --- a/patches/1.19.3/build.gradle.patch +++ b/patches/1.19.3/build.gradle.patch @@ -11,7 +11,7 @@ group = rootProject.group -@@ -59,7 +59,7 @@ +@@ -61,13 +61,11 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -20,3 +20,18 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" + +- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- + compileOnly 'net.luckperms:api:5.4' + compileOnly("org.projectlombok:lombok:${lombok}") + annotationProcessor("org.projectlombok:lombok:${lombok}") +@@ -112,7 +110,7 @@ + + tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' +- it.options.release = 21 ++ it.options.release = 17 + } + + tasks.withType(GenerateModuleMetadata).configureEach { diff --git a/patches/1.19.3/gradle.properties.patch b/patches/1.19.3/gradle.properties.patch index cac3367..5ea9cba 100644 --- a/patches/1.19.3/gradle.properties.patch +++ b/patches/1.19.3/gradle.properties.patch @@ -23,7 +23,7 @@ # Dependencies moon_config=1.0.9 -@@ -31,16 +28,15 @@ +@@ -31,17 +28,16 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -32,6 +32,8 @@ -mod_menu_version=10.0.0-beta.1 -vanishmod=1.1.12.1 -vanishmod_neo=puxrKAMr +-ftb_essentials=2101.1.0 ++ftb_essentials=1904.1.0-build.81-SNAPSHOT +fabrictailor=2.0.2 +vanish=1.4.0+1.19.3 +mod_menu_version=5.1.0-beta.4 diff --git a/patches/1.20.2/Common/build.gradle.patch b/patches/1.20.2/Common/build.gradle.patch new file mode 100644 index 0000000..dc0f827 --- /dev/null +++ b/patches/1.20.2/Common/build.gradle.patch @@ -0,0 +1,11 @@ +--- a/Common/build.gradle ++++ b/Common/build.gradle +@@ -1,7 +1,7 @@ + archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" + + dependencies { +- ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + } + + shadowJar { diff --git a/patches/1.20.2/Fabric/build.gradle.patch b/patches/1.20.2/Fabric/build.gradle.patch index d202323..fddf03e 100644 --- a/patches/1.20.2/Fabric/build.gradle.patch +++ b/patches/1.20.2/Fabric/build.gradle.patch @@ -1,6 +1,14 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -113,8 +113,8 @@ +@@ -9,6 +9,7 @@ + exclude(group: "net.fabricmc.fabric-api") + } + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" + modImplementation "maven.modrinth:vanish:${vanish}" + +@@ -113,8 +114,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20.2/Forge/build.gradle.patch b/patches/1.20.2/Forge/build.gradle.patch index 4c45cc0..8a2d0fa 100644 --- a/patches/1.20.2/Forge/build.gradle.patch +++ b/patches/1.20.2/Forge/build.gradle.patch @@ -1,15 +1,17 @@ --- a/Forge/build.gradle +++ b/Forge/build.gradle -@@ -3,7 +3,7 @@ +@@ -3,7 +3,9 @@ dependencies { // Compat - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}") ++ ++ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") // Do not edit or remove implementation project(":Common") -@@ -107,8 +107,8 @@ +@@ -107,8 +109,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20.2/build.gradle.patch b/patches/1.20.2/build.gradle.patch index 6e95974..5645279 100644 --- a/patches/1.20.2/build.gradle.patch +++ b/patches/1.20.2/build.gradle.patch @@ -11,7 +11,7 @@ group = rootProject.group -@@ -59,7 +59,7 @@ +@@ -61,13 +61,11 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -20,3 +20,18 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" + +- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- + compileOnly 'net.luckperms:api:5.4' + compileOnly("org.projectlombok:lombok:${lombok}") + annotationProcessor("org.projectlombok:lombok:${lombok}") +@@ -112,7 +110,7 @@ + + tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' +- it.options.release = 21 ++ it.options.release = 17 + } + + tasks.withType(GenerateModuleMetadata).configureEach { diff --git a/patches/1.20.2/gradle.properties.patch b/patches/1.20.2/gradle.properties.patch index 73bcaed..ab92bfa 100644 --- a/patches/1.20.2/gradle.properties.patch +++ b/patches/1.20.2/gradle.properties.patch @@ -23,7 +23,7 @@ # Dependencies moon_config=1.0.9 -@@ -31,16 +28,15 @@ +@@ -31,17 +28,16 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -32,6 +32,8 @@ -mod_menu_version=10.0.0-beta.1 -vanishmod=1.1.12.1 -vanishmod_neo=puxrKAMr +-ftb_essentials=2101.1.0 ++ftb_essentials=2001.2.2 +fabrictailor=2.2.1 +vanish=1.5.0+1.20.2 +mod_menu_version=8.0.1 diff --git a/patches/1.20.4/Common/build.gradle.patch b/patches/1.20.4/Common/build.gradle.patch new file mode 100644 index 0000000..dc0f827 --- /dev/null +++ b/patches/1.20.4/Common/build.gradle.patch @@ -0,0 +1,11 @@ +--- a/Common/build.gradle ++++ b/Common/build.gradle +@@ -1,7 +1,7 @@ + archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" + + dependencies { +- ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + } + + shadowJar { diff --git a/patches/1.20.4/Fabric/build.gradle.patch b/patches/1.20.4/Fabric/build.gradle.patch index c6d385e..3f60a9c 100644 --- a/patches/1.20.4/Fabric/build.gradle.patch +++ b/patches/1.20.4/Fabric/build.gradle.patch @@ -1,6 +1,15 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -113,8 +113,8 @@ +@@ -9,6 +9,8 @@ + exclude(group: "net.fabricmc.fabric-api") + } + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") ++ + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" + modImplementation "maven.modrinth:vanish:${vanish}" + +@@ -113,8 +115,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20.4/Forge/build.gradle.patch b/patches/1.20.4/Forge/build.gradle.patch index d33a5f2..1f74580 100644 --- a/patches/1.20.4/Forge/build.gradle.patch +++ b/patches/1.20.4/Forge/build.gradle.patch @@ -1,15 +1,17 @@ --- a/Forge/build.gradle +++ b/Forge/build.gradle -@@ -3,7 +3,7 @@ +@@ -3,7 +3,9 @@ dependencies { // Compat - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}") ++ ++ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") // Do not edit or remove implementation project(":Common") -@@ -107,8 +107,8 @@ +@@ -107,8 +109,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20.4/NeoForge/build.gradle.patch b/patches/1.20.4/NeoForge/build.gradle.patch index 21641e9..9a591d2 100644 --- a/patches/1.20.4/NeoForge/build.gradle.patch +++ b/patches/1.20.4/NeoForge/build.gradle.patch @@ -1,6 +1,15 @@ --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle -@@ -51,7 +51,7 @@ +@@ -4,6 +4,8 @@ + // Compat + modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") ++ + // Do not edit or remove + implementation project(":Common") + } +@@ -51,7 +53,7 @@ from project(":Common").sourceSets.main.resources def buildProps = project.properties.clone() @@ -9,7 +18,7 @@ expand buildProps } } -@@ -106,8 +106,8 @@ +@@ -106,8 +108,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20.4/build.gradle.patch b/patches/1.20.4/build.gradle.patch index 390a3be..de280fe 100644 --- a/patches/1.20.4/build.gradle.patch +++ b/patches/1.20.4/build.gradle.patch @@ -11,3 +11,21 @@ group = rootProject.group +@@ -66,8 +66,6 @@ + shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" + +- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- + compileOnly 'net.luckperms:api:5.4' + compileOnly("org.projectlombok:lombok:${lombok}") + annotationProcessor("org.projectlombok:lombok:${lombok}") +@@ -112,7 +110,7 @@ + + tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' +- it.options.release = 21 ++ it.options.release = 17 + } + + tasks.withType(GenerateModuleMetadata).configureEach { diff --git a/patches/1.20.4/gradle.properties.patch b/patches/1.20.4/gradle.properties.patch index caaf093..1ea3578 100644 --- a/patches/1.20.4/gradle.properties.patch +++ b/patches/1.20.4/gradle.properties.patch @@ -24,7 +24,7 @@ # Dependencies moon_config=1.0.9 -@@ -32,15 +32,15 @@ +@@ -32,16 +32,16 @@ # Mod Dependencies fabrictailor=2.3.1 @@ -35,6 +35,8 @@ +mod_menu_version=9.2.0-beta.2 +vanishmod=1.1.15 vanishmod_neo=puxrKAMr +-ftb_essentials=2101.1.0 ++ftb_essentials=2004.1.3 # Publishing curse_id=867099 diff --git a/patches/1.20/Common/build.gradle.patch b/patches/1.20/Common/build.gradle.patch new file mode 100644 index 0000000..dc0f827 --- /dev/null +++ b/patches/1.20/Common/build.gradle.patch @@ -0,0 +1,11 @@ +--- a/Common/build.gradle ++++ b/Common/build.gradle +@@ -1,7 +1,7 @@ + archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" + + dependencies { +- ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + } + + shadowJar { diff --git a/patches/1.20/Fabric/build.gradle.patch b/patches/1.20/Fabric/build.gradle.patch index a2a3cc0..407265b 100644 --- a/patches/1.20/Fabric/build.gradle.patch +++ b/patches/1.20/Fabric/build.gradle.patch @@ -1,6 +1,14 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -113,8 +113,8 @@ +@@ -9,6 +9,7 @@ + exclude(group: "net.fabricmc.fabric-api") + } + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" + modImplementation "maven.modrinth:vanish:${vanish}" + +@@ -113,8 +114,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20/Forge/build.gradle.patch b/patches/1.20/Forge/build.gradle.patch index 2482057..cea056e 100644 --- a/patches/1.20/Forge/build.gradle.patch +++ b/patches/1.20/Forge/build.gradle.patch @@ -1,15 +1,17 @@ --- a/Forge/build.gradle +++ b/Forge/build.gradle -@@ -3,7 +3,7 @@ +@@ -3,7 +3,9 @@ dependencies { // Compat - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}") ++ ++ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}") // Do not edit or remove implementation project(":Common") -@@ -107,8 +107,8 @@ +@@ -107,8 +109,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.20/build.gradle.patch b/patches/1.20/build.gradle.patch index e44bb97..1b4ad61 100644 --- a/patches/1.20/build.gradle.patch +++ b/patches/1.20/build.gradle.patch @@ -19,7 +19,7 @@ group = rootProject.group -@@ -59,7 +58,7 @@ +@@ -61,13 +60,11 @@ shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}" @@ -28,3 +28,18 @@ shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}" + +- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- + compileOnly 'net.luckperms:api:5.4' + compileOnly("org.projectlombok:lombok:${lombok}") + annotationProcessor("org.projectlombok:lombok:${lombok}") +@@ -112,7 +109,7 @@ + + tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' +- it.options.release = 21 ++ it.options.release = 17 + } + + tasks.withType(GenerateModuleMetadata).configureEach { diff --git a/patches/1.20/gradle.properties.patch b/patches/1.20/gradle.properties.patch index 95210cc..86867ee 100644 --- a/patches/1.20/gradle.properties.patch +++ b/patches/1.20/gradle.properties.patch @@ -23,7 +23,7 @@ # Dependencies moon_config=1.0.9 -@@ -31,16 +28,15 @@ +@@ -31,17 +28,16 @@ discord_formatter=2.0.0 # Mod Dependencies @@ -32,6 +32,8 @@ -mod_menu_version=10.0.0-beta.1 -vanishmod=1.1.12.1 -vanishmod_neo=puxrKAMr +-ftb_essentials=2101.1.0 ++ftb_essentials=2001.2.2 +fabrictailor=2.2.1 +vanish=1.5.4+1.20.1 +mod_menu_version=7.0.1 diff --git a/patches/1.21/Common/build.gradle.patch b/patches/1.21/Common/build.gradle.patch new file mode 100644 index 0000000..dc0f827 --- /dev/null +++ b/patches/1.21/Common/build.gradle.patch @@ -0,0 +1,11 @@ +--- a/Common/build.gradle ++++ b/Common/build.gradle +@@ -1,7 +1,7 @@ + archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" + + dependencies { +- ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") + } + + shadowJar { diff --git a/patches/1.21/Fabric/build.gradle.patch b/patches/1.21/Fabric/build.gradle.patch index c3541d1..c49616f 100644 --- a/patches/1.21/Fabric/build.gradle.patch +++ b/patches/1.21/Fabric/build.gradle.patch @@ -1,6 +1,15 @@ --- a/Fabric/build.gradle +++ b/Fabric/build.gradle -@@ -113,8 +113,8 @@ +@@ -9,6 +9,8 @@ + exclude(group: "net.fabricmc.fabric-api") + } + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") ++ + modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" + modImplementation "maven.modrinth:vanish:${vanish}" + +@@ -113,8 +115,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.21/NeoForge/build.gradle.patch b/patches/1.21/NeoForge/build.gradle.patch index f530d58..2474f29 100644 --- a/patches/1.21/NeoForge/build.gradle.patch +++ b/patches/1.21/NeoForge/build.gradle.patch @@ -1,6 +1,15 @@ --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle -@@ -106,8 +106,8 @@ +@@ -4,6 +4,8 @@ + // Compat + modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") + ++ stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}") ++ + // Do not edit or remove + implementation project(":Common") + } +@@ -106,8 +108,8 @@ setVersionType("release") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setProjectVersion("${minecraft_version}-${project.version}") diff --git a/patches/1.21/build.gradle.patch b/patches/1.21/build.gradle.patch new file mode 100644 index 0000000..63315a0 --- /dev/null +++ b/patches/1.21/build.gradle.patch @@ -0,0 +1,11 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -66,8 +66,6 @@ + shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" + +- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}") +- + compileOnly 'net.luckperms:api:5.4' + compileOnly("org.projectlombok:lombok:${lombok}") + annotationProcessor("org.projectlombok:lombok:${lombok}") diff --git a/patches/1.21/gradle.properties.patch b/patches/1.21/gradle.properties.patch index 8985be7..7966350 100644 --- a/patches/1.21/gradle.properties.patch +++ b/patches/1.21/gradle.properties.patch @@ -1,6 +1,6 @@ --- a/gradle.properties +++ b/gradle.properties -@@ -10,12 +10,12 @@ +@@ -10,18 +10,18 @@ mod_name=CraterLib # Shared @@ -16,7 +16,14 @@ # Forge forge_version=50.0.6 -@@ -40,7 +40,7 @@ + + # NeoForged +-neoforge_version=0.0-beta ++neoforge_version=0-beta + + # Dependencies + moon_config=1.0.9 +@@ -41,7 +41,7 @@ # Publishing curse_id=867099 modrinth_id=Nn8Wasaq