From 956e9420c741b04cb291c44fd2aec1c89acb1f27 Mon Sep 17 00:00:00 2001 From: Magnus Date: Sun, 18 Jan 2026 10:39:04 +0000 Subject: [PATCH] update to 1.21.11 --- build.gradle | 2 +- gradle.properties | 10 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../proximity/command/MumbleCommand.java | 2 +- .../proximity/mixin/PlayerManagerMixin.java | 8 ++-- .../registry/ProximityGameRules.java | 39 +++++++++---------- 6 files changed, 30 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index a3466ae..25af1ed 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.11-SNAPSHOT' + id 'fabric-loom' version '1.14-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 4810e7c..55fe189 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ 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 @@ -12,4 +12,4 @@ 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..bad7c24 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/src/main/java/com/chyzman/proximity/command/MumbleCommand.java b/src/main/java/com/chyzman/proximity/command/MumbleCommand.java index c003cf3..9cf55f6 100644 --- a/src/main/java/com/chyzman/proximity/command/MumbleCommand.java +++ b/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) ) ) ); diff --git a/src/main/java/com/chyzman/proximity/mixin/PlayerManagerMixin.java b/src/main/java/com/chyzman/proximity/mixin/PlayerManagerMixin.java index 99d6079..918b0e5 100644 --- a/src/main/java/com/chyzman/proximity/mixin/PlayerManagerMixin.java +++ b/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; diff --git a/src/main/java/com/chyzman/proximity/registry/ProximityGameRules.java b/src/main/java/com/chyzman/proximity/registry/ProximityGameRules.java index bd6e7aa..0631636 100644 --- a/src/main/java/com/chyzman/proximity/registry/ProximityGameRules.java +++ b/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 PROXIMITY_ENABLED = register( - "enableProximity", GameRuleFactory.createBooleanRule(true) + public static final GameRule PROXIMITY_ENABLED = register( + "enable_proximity", GameRuleBuilder.forBoolean(true) ); - public static final GameRules.Key CHAT_DISTANCE = register( - "chatDistance", GameRuleFactory.createDoubleRule(128, -1) + public static final GameRule CHAT_DISTANCE = register( + "chat_distance", GameRuleBuilder.forDouble(128).minValue(-1d) ); - public static final GameRules.Key COMMAND_DISTANCE = register( - "commandDistance", GameRuleFactory.createDoubleRule(128, -1) + public static final GameRule COMMAND_DISTANCE = register( + "command_distance", GameRuleBuilder.forDouble(128).minValue(-1d) ); - public static final GameRules.Key MUMBLE_DISTANCE = register( - "mumbleDistance", GameRuleFactory.createDoubleRule(1, -1) + public static final GameRule MUMBLE_DISTANCE = register( + "mumble_distance", GameRuleBuilder.forDouble(1).minValue(-1d) ); public static void init() { } - public static > GameRules.Key register(String name, GameRules.Type type) { - return GameRuleRegistry.register(MODID + "." + name, PROXIMITY_GAMERULE_CATEGORY, type); + + + public static GameRule register(String name, GameRuleBuilder builder) { + return Registry.register(Registries.GAME_RULE, id(name), builder.category(PROXIMITY_GAMERULE_CATEGORY).build()); } }