update to 1.21.11

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.11-SNAPSHOT'
+    id 'fabric-loom' version '1.14-SNAPSHOT'
     id 'maven-publish'
 }
 

gradle.properties

@@ -1,15 +1,15 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_base_version=1.21.9
-minecraft_version=1.21.9
-yarn_mappings=1.21.9+build.1
-loader_version=0.17.2
+minecraft_base_version=1.21.11
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.4
+loader_version=0.18.2
 
 # Mod Properties
 mod_version=1.2.0
 maven_group=com.chyzman
 archives_base_name=proximity
 
 # Dependencies
-fabric_version=0.134.0+1.21.9
+fabric_version=0.141.1+1.21.11

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/chyzman/proximity/command/MumbleCommand.java

@@ -42,7 +42,7 @@ public static void register() {
                                 ProximityHandler.getProximityAttributeValue(
                                     sender,
                                     SPEECH_DISTANCE,
-                                    source.getWorld().getGameRules().get(MUMBLE_DISTANCE).get()
+                                    source.getWorld().getGameRules().getValue(MUMBLE_DISTANCE)
                                 )
                             )
                         );

src/main/java/com/chyzman/proximity/mixin/PlayerManagerMixin.java

@@ -36,8 +36,8 @@ public abstract class PlayerManagerMixin {
         CallbackInfo ci
     ) {
         var gamerules = getServer().getOverworld().getGameRules();
-        if (!gamerules.get(ProximityGameRules.PROXIMITY_ENABLED).get()) return;
-        var distance = gamerules.get(ProximityGameRules.CHAT_DISTANCE).get();
+        if (!gamerules.getValue(ProximityGameRules.PROXIMITY_ENABLED)) return;
+        var distance = gamerules.getValue(ProximityGameRules.CHAT_DISTANCE);
         if (distance < 0) return;
         if (ProximityHandler.broadcastProximityChat(
             new ChatContext(
@@ -66,8 +66,8 @@ public abstract class PlayerManagerMixin {
         MessageType.Parameters params,
         CallbackInfo ci
     ) {
-        if (!getServer().getGameRules().get(ProximityGameRules.PROXIMITY_ENABLED).get()) return;
-        var distance = getServer().getGameRules().get(ProximityGameRules.COMMAND_DISTANCE).get();
+        if (!getServer().getOverworld().getGameRules().getValue(ProximityGameRules.PROXIMITY_ENABLED)) return;
+        var distance = getServer().getOverworld().getGameRules().getValue(ProximityGameRules.COMMAND_DISTANCE);
         if (distance < 0) return;
         var sender = source.getEntity();
         if (sender == null) return;

src/main/java/com/chyzman/proximity/registry/ProximityGameRules.java

@@ -1,42 +1,39 @@
 package com.chyzman.proximity.registry;
 
-import net.fabricmc.fabric.api.gamerule.v1.CustomGameRuleCategory;
-import net.fabricmc.fabric.api.gamerule.v1.GameRuleFactory;
-import net.fabricmc.fabric.api.gamerule.v1.GameRuleRegistry;
-import net.fabricmc.fabric.api.gamerule.v1.rule.DoubleRule;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.world.GameRules;
+import net.fabricmc.fabric.api.gamerule.v1.GameRuleBuilder;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.world.rule.GameRule;
+import net.minecraft.world.rule.GameRuleCategory;
 
 import static com.chyzman.proximity.Proximity.MODID;
 import static com.chyzman.proximity.Proximity.id;
 
 public class ProximityGameRules {
-    public static final CustomGameRuleCategory PROXIMITY_GAMERULE_CATEGORY = new CustomGameRuleCategory(
-        id("proximity"),
-        Text.translatable("gamerule.proximity.category.proximity").formatted(Formatting.BOLD, Formatting.YELLOW)
-    );
+    public static final GameRuleCategory PROXIMITY_GAMERULE_CATEGORY = GameRuleCategory.register(id("category"));
 
-    public static final GameRules.Key<GameRules.BooleanRule> PROXIMITY_ENABLED = register(
-        "enableProximity", GameRuleFactory.createBooleanRule(true)
+    public static final GameRule<Boolean> PROXIMITY_ENABLED = register(
+        "enable_proximity", GameRuleBuilder.forBoolean(true)
     );
 
-    public static final GameRules.Key<DoubleRule> CHAT_DISTANCE = register(
-        "chatDistance", GameRuleFactory.createDoubleRule(128, -1)
+    public static final GameRule<Double> CHAT_DISTANCE = register(
+        "chat_distance", GameRuleBuilder.forDouble(128).minValue(-1d)
     );
 
-    public static final GameRules.Key<DoubleRule> COMMAND_DISTANCE = register(
-        "commandDistance", GameRuleFactory.createDoubleRule(128, -1)
+    public static final GameRule<Double> COMMAND_DISTANCE = register(
+        "command_distance", GameRuleBuilder.forDouble(128).minValue(-1d)
     );
 
-    public static final GameRules.Key<DoubleRule> MUMBLE_DISTANCE = register(
-        "mumbleDistance", GameRuleFactory.createDoubleRule(1, -1)
+    public static final GameRule<Double> MUMBLE_DISTANCE = register(
+        "mumble_distance", GameRuleBuilder.forDouble(1).minValue(-1d)
     );
 
     public static void init() {
     }
 
-    public static <T extends GameRules.Rule<T>> GameRules.Key<T> register(String name, GameRules.Type<T> type) {
-        return GameRuleRegistry.register(MODID + "." + name, PROXIMITY_GAMERULE_CATEGORY, type);
+
+
+    public static <T> GameRule<T> register(String name, GameRuleBuilder<T> builder) {
+        return Registry.register(Registries.GAME_RULE, id(name), builder.category(PROXIMITY_GAMERULE_CATEGORY).build());
     }
 }