diff --git a/build.gradle b/build.gradle index ab33ec5..f38eb4f 100644 --- a/build.gradle +++ b/build.gradle @@ -34,9 +34,9 @@ dependencies { include(implementation("io.leangen.geantyref:geantyref:2.0.1")) // Adventure - include(modImplementation("net.kyori:adventure-platform-fabric:6.7.0")) - include(implementation("net.kyori:adventure-text-serializer-gson:4.25.0")) - include(implementation("net.kyori:adventure-text-serializer-legacy:4.25.0")) + include(modImplementation("net.kyori:adventure-platform-fabric:6.8.0")) + include(implementation("net.kyori:adventure-text-serializer-gson:4.26.1")) + include(implementation("net.kyori:adventure-text-serializer-legacy:4.26.1")) } processResources { diff --git a/gradle.properties b/gradle.properties index 84b68c9..7f50911 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.21.10 - yarn_mappings=1.21.10+build.2 - loader_version=0.17.3 - loom_version=1.11-SNAPSHOT + minecraft_version=1.21.11 + yarn_mappings=1.21.11+build.3 + loader_version=0.18.3 + loom_version=1.13-SNAPSHOT # Mod Properties mod_version = 1.0.0 @@ -15,5 +15,5 @@ org.gradle.parallel=true archives_base_name = chipmunkmod # Dependencies - fabric_version=0.135.0+1.21.10 + fabric_version=0.140.0+1.21.11 diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java b/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java index ff14dc3..ce482ad 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java +++ b/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java @@ -20,6 +20,8 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.ClientPlayerInteractionManager; import net.minecraft.client.network.PendingUpdateManager; import net.minecraft.client.world.ClientWorld; +import net.minecraft.command.permission.LeveledPermissionPredicate; +import net.minecraft.command.permission.PermissionLevel; import net.minecraft.component.ComponentMap; import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.NbtComponent; @@ -233,7 +235,7 @@ public class CommandCore implements Listener { !runFillCommand || isSingleBlock || player == null || !player.isInCreativeMode() - || !player.hasPermissionLevel(2) + || !player.isCreativeLevelTwoOp() || client.world == null || networkHandler == null || withPos == null diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/KaboomCheck.java b/src/main/java/land/chipmunk/chipmunkmod/modules/KaboomCheck.java index 4138c01..8b94914 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/modules/KaboomCheck.java +++ b/src/main/java/land/chipmunk/chipmunkmod/modules/KaboomCheck.java @@ -3,6 +3,7 @@ package land.chipmunk.chipmunkmod.modules; import com.mojang.brigadier.CommandDispatcher; import net.minecraft.client.MinecraftClient; import net.minecraft.command.CommandSource; +import net.minecraft.command.DefaultPermissions; public class KaboomCheck { public static final KaboomCheck INSTANCE = new KaboomCheck(); @@ -17,7 +18,7 @@ public class KaboomCheck { public void onCommandTree (final CommandDispatcher dispatcher) { assert client.player != null; // We can only receive this packet while in a server - final String checkedCommand = client.player.getPermissionLevel() == 4 + final String checkedCommand = client.player.getPermissions().hasPermission(DefaultPermissions.OWNERS) ? CHECKED_COMMAND_OP : CHECKED_COMMAND; this.isKaboom = dispatcher.getRoot().getChild(checkedCommand) != null; diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java b/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java index 57078cc..526e227 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java +++ b/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java @@ -59,7 +59,7 @@ public class SelfCare implements Listener { if (networkHandler == null || player == null) return; - if (!player.hasPermissionLevel(2) && opEnabled && serverHasCommand("op")) + if (!player.isCreativeLevelTwoOp() && opEnabled && serverHasCommand("op")) networkHandler.sendChatCommand("op @s[type=player]"); else if (!player.isInCreativeMode() && gamemodeEnabled) // ViaVersion will automatically convert this to `/gamemode creative` @@ -69,7 +69,7 @@ public class SelfCare implements Listener { !CommandCore.INSTANCE.ready || !CommandCore.INSTANCE.runFillCommand || !player.isInCreativeMode() - || !player.hasPermissionLevel(2) + || !player.isCreativeLevelTwoOp() ) { networkHandler.sendChatCommand("c on"); } else { diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/custom_chat/CustomChat.java b/src/main/java/land/chipmunk/chipmunkmod/modules/custom_chat/CustomChat.java index bd39f3f..2e4fec7 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/modules/custom_chat/CustomChat.java +++ b/src/main/java/land/chipmunk/chipmunkmod/modules/custom_chat/CustomChat.java @@ -94,7 +94,7 @@ public class CustomChat { } private boolean shouldUsePlayerChat (final ClientPlayerEntity player, final String message) { - return !enabled || isUnnecessary(message) || !player.hasPermissionLevel(2) || !player.isCreative(); + return !enabled || isUnnecessary(message) || !player.isCreativeLevelTwoOp(); } private boolean isUnnecessary (final String message) { diff --git a/src/main/java/land/chipmunk/chipmunkmod/util/BotValidationUtilities.java b/src/main/java/land/chipmunk/chipmunkmod/util/BotValidationUtilities.java index 18a2b83..2de0487 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/util/BotValidationUtilities.java +++ b/src/main/java/land/chipmunk/chipmunkmod/util/BotValidationUtilities.java @@ -92,11 +92,11 @@ public class BotValidationUtilities { final MessageDigest md = MessageDigest.getInstance("SHA-256"); final String time = String.valueOf(System.currentTimeMillis() / 5_000); - final String input = client.player.getUuidAsString() + joinedSplitInput + time + key; + final String input = player.getUuidAsString() + joinedSplitInput + time + key; final byte[] hash = md.digest(input.getBytes(StandardCharsets.UTF_8)); String stringHash = new String(Hex.encodeHex(hash)).substring(0, 16); - final boolean shouldSectionSign = CustomChat.INSTANCE.enabled && player.hasPermissionLevel(2) && player.isCreative(); + final boolean shouldSectionSign = CustomChat.INSTANCE.enabled && player.isCreativeLevelTwoOp(); if (shouldSectionSign) { stringHash = String.join("", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1e7fec9..f799a41 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,9 +30,9 @@ ], "depends": { - "fabricloader": ">=0.16.13", + "fabricloader": ">=0.18.3", "fabric-api": "*", - "minecraft": "1.21.10", + "minecraft": "1.21.11", "java": ">=21" } }