diff --git a/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java b/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java new file mode 100644 index 0000000..bf52038 --- /dev/null +++ b/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/build.gradle b/build.gradle index af450e6..06c875d 100644 --- a/build.gradle +++ b/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,11 +102,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/gradle.properties b/gradle.properties index 976ffef..cb060bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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