flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

permission api v2 support close #182

Browse Source
This commit is contained in:
Flemmli97 2022-08-03 22:50:16 +02:00
parent 2b3c4b70c0
commit c84715ecfa
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fabric/build.gradle
View File

@ -65,12 +65,12 @@ dependencies {
}*/ }*/
modImplementation octo_economy_api modImplementation octo_economy_api
//modRuntimeOnly eights_economy //modRuntimeOnly eights_economy
modImplementation diamond_economy modCompileOnly diamond_economy
//modImplementation "io.github.ladysnake:PlayerAbilityLib:${rootProject.player_ability_lib}" //modImplementation "io.github.ladysnake:PlayerAbilityLib:${rootProject.player_ability_lib}"
modCompileOnly "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}"
} }

5
fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/PermissionNodeHandlerImpl.java
View File

@ -4,6 +4,7 @@ import dev.ftb.mods.ftbranks.api.FTBRanksAPI;
import io.github.flemmli97.flan.Flan; import io.github.flemmli97.flan.Flan;
import io.github.flemmli97.flan.config.ConfigHandler; import io.github.flemmli97.flan.config.ConfigHandler;
import io.github.flemmli97.flan.platform.integration.permissions.PermissionNodeHandler; 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 me.lucko.fabric.api.permissions.v0.Permissions;
import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.CommandSourceStack;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@ -38,6 +39,10 @@ public class PermissionNodeHandlerImpl implements PermissionNodeHandler {
@Override @Override
public boolean permBelowEqVal(ServerPlayer src, String perm, int val, int fallback) { 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) { if (Flan.ftbRanks) {
int max = FTBRanksAPI.getPermissionValue(src, perm).asInteger().orElse(fallback); int max = FTBRanksAPI.getPermissionValue(src, perm).asInteger().orElse(fallback);
return val <= max; return val <= max;

4
forge/build.gradle
View File

@ -39,8 +39,8 @@ dependencies {
common(project(path: ":common", configuration: "namedElements")) { transitive false } common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
modCompileOnly("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}") modCompileOnly "dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}"
modCompileOnly(dicemcmm) modCompileOnly dicemcmm
} }
processResources { processResources {

2
gradle.properties
View File

@ -15,7 +15,7 @@ archives_base_name=flan
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # 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_version=0.58.0+1.19
fabric_permissions_api=0.1-SNAPSHOT fabric_permissions_api=0.2-SNAPSHOT
player_ability_lib=1.2.2 player_ability_lib=1.2.2
ftb_ranks=1900.1.9-build.42 ftb_ranks=1900.1.9-build.42
dicemcmm=curse.maven:dicemcmoney-406972:3827507 dicemcmm=curse.maven:dicemcmoney-406972:3827507