diff --git a/fabric/build.gradle b/fabric/build.gradle index 7c197e1..7ec541e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -65,12 +65,12 @@ dependencies { }*/ modImplementation octo_economy_api //modRuntimeOnly eights_economy - modImplementation diamond_economy + modCompileOnly diamond_economy //modImplementation "io.github.ladysnake:PlayerAbilityLib:${rootProject.player_ability_lib}" modCompileOnly "io.github.ladysnake:PlayerAbilityLib:${rootProject.player_ability_lib}" - modCompileOnly("dev.ftb.mods:ftb-ranks-fabric:${rootProject.ftb_ranks}") + modCompileOnly "dev.ftb.mods:ftb-ranks-fabric:${rootProject.ftb_ranks}" } diff --git a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/PermissionNodeHandlerImpl.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/PermissionNodeHandlerImpl.java index 7746ce2..fe64b96 100644 --- a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/PermissionNodeHandlerImpl.java +++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/PermissionNodeHandlerImpl.java @@ -4,6 +4,7 @@ import dev.ftb.mods.ftbranks.api.FTBRanksAPI; import io.github.flemmli97.flan.Flan; import io.github.flemmli97.flan.config.ConfigHandler; import io.github.flemmli97.flan.platform.integration.permissions.PermissionNodeHandler; +import me.lucko.fabric.api.permissions.v0.Options; import me.lucko.fabric.api.permissions.v0.Permissions; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerPlayer; @@ -38,6 +39,10 @@ public class PermissionNodeHandlerImpl implements PermissionNodeHandler { @Override public boolean permBelowEqVal(ServerPlayer src, String perm, int val, int fallback) { + if (Flan.permissionAPI) { + int max = Options.get(src, perm, fallback, Integer::parseInt); + return val <= max; + } if (Flan.ftbRanks) { int max = FTBRanksAPI.getPermissionValue(src, perm).asInteger().orElse(fallback); return val <= max; diff --git a/forge/build.gradle b/forge/build.gradle index eecaba5..4bbfa9b 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -39,8 +39,8 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } - modCompileOnly("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}") - modCompileOnly(dicemcmm) + modCompileOnly "dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}" + modCompileOnly dicemcmm } processResources { diff --git a/gradle.properties b/gradle.properties index 7fae50c..744c305 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ archives_base_name=flan # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api fabric_version=0.58.0+1.19 -fabric_permissions_api=0.1-SNAPSHOT +fabric_permissions_api=0.2-SNAPSHOT player_ability_lib=1.2.2 ftb_ranks=1900.1.9-build.42 dicemcmm=curse.maven:dicemcmoney-406972:3827507