Merge pull request #138 from glektarssza/mc-1.20.x/dev

[Release] Release v0.4.1

Author: glektarssza

common/src/main/java/com/glektarssza/expandedgamerules/CommonClass.java

@@ -38,7 +38,7 @@ public static void registerBuiltinRules() {
             false);
         GameruleUtilities.register("disableEndermanTeleport", Category.MOBS,
             false);
-        GameruleUtilities.register("doColdBiomesFreezeWater",
+        GameruleUtilities.register("preventColdBiomesFreezingWater",
             CATEGORY_ENVIRONMENT, true);
     }
 }

common/src/main/java/com/glektarssza/expandedgamerules/mixins/vanilla/BiomeMixins.java

@@ -1,6 +1,5 @@
 package com.glektarssza.expandedgamerules.mixins.vanilla;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
@@ -11,7 +10,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import com.glektarssza.expandedgamerules.Constants;
 import com.glektarssza.expandedgamerules.GameruleUtilities;
 
 /**
@@ -22,31 +20,11 @@ public class BiomeMixins {
     @Inject(method = "shouldFreeze(Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;Z)Z", at = @At("RETURN"), cancellable = true)
     public void injectShouldFreeze(LevelReader levelReader, BlockPos blockPos,
         boolean blocked, CallbackInfoReturnable<Boolean> cir) {
-        Level level = null;
-        if (levelReader instanceof Level) {
-            level = (Level) levelReader;
-        }
-        if (Minecraft.getInstance().isSingleplayer()) {
-            try {
-                level = (Level) Minecraft.getInstance().getSingleplayerServer()
-                    .getAllLevels().iterator().next();
-            } catch (Throwable t) {
-                // -- Do nothing
+        if (levelReader instanceof Level level) {
+            if (!GameruleUtilities.getBooleanGamerule(level,
+                "preventColdBiomesFreezingWater")) {
+                cir.setReturnValue(false);
             }
-        } else {
-            Constants.LOG.warn(
-                "'shouldFreeze' mixin is being triggered on the client side!");
-            Constants.LOG.warn(
-                "That's not supposed to happen?!");
-            Constants.LOG.warn(
-                "Please consider filing a bug report at https://github.com/glektarssza/minecraft-expanded-gamerules/issues");
-        }
-        if (level == null) {
-            return;
-        }
-        if (!GameruleUtilities.getBooleanGamerule(level,
-            "doColdBiomesFreezeWater")) {
-            cir.setReturnValue(false);
         }
     }
 }

common/src/main/resources/assets/expandedgamerules/lang/en_us.json

@@ -3,5 +3,5 @@
     "gamerule.disableEndermanTeleport": "Prevent Endermen from teleporting",
     "gamerule.disableShulkerTeleport": "Prevent Shulkers from teleporting",
     "gamerule.disableTargetingPlayers": "Prevent mobs from targeting players",
-    "gamerule.doColdBiomesFreezeWater": "Prevent water from freezing in cold biomes"
+    "gamerule.preventColdBiomesFreezingWater": "Prevent water from freezing in cold biomes"
 }

gradle.properties

@@ -1,5 +1,5 @@
 # Project #
-version=0.4.0
+version=0.4.1
 
 # Common #
 archive_base_name=expanded_gamerules