fixed datapacks

Author: SoLegendary

TODO.txt

@@ -32,10 +32,10 @@ Bugfixes
 [❌] Prevent superflat worlds generating regular worlds after a certain range
 [❌] Kicked for sending too many packets when spam clicking large army (rate-limit in server.properties?)
 
-[❌] gui scale not working?
+
 
 [✔] Recreate tutorial world in 1.20.1
-[🟡] Fixed camera centering on the tutorial world
+[✔] Fixed camera centering on the tutorial world
 [✔] Mounted piglins don't heal from nether terrain
 [✔] Anchors are now saved correctly on server restart
 
@@ -46,15 +46,14 @@ Quality of Life
     /sendwood <playername> <amount>
     /sendore <playername> <amount>
 
+[✔] GUI scale in RTS camera now matches your options, but cannot be higher than 3
 [✔] Ravagers that are mounted no longer automatically aggro onto buildings
     - This prevents them hurting themselves from their own splash damage
-[🟡] Spiders now have a button to toggle whether they climb on walls or not
-[🟡] Slimes and magma cubes can now no-clip through log and leaf blocks
+[✔] Spiders now have a button to toggle whether they climb on walls or not
 [✔] Turn cheats on by default for sandbox mode
 [✔] Healing Fountains now heal 1% of hp per second instead of a flat rate, up to a maximum of 1hp/s
-[🟡] Dripstone is now mineable by workers, worth 1 ore each
+[✔] Dripstone is now mineable by workers, worth 1 ore each
 
-[✔] language updates
 
 Balancing
 ---------

src/main/java/com/solegendary/reignofnether/guiscreen/TopdownGuiClientEvents.java

@@ -24,7 +24,7 @@ public class TopdownGuiClientEvents {
     private static final Minecraft MC = Minecraft.getInstance();
     private static int noScreenTicks = 0; // ticks that no screen has been opened
     private static boolean shouldPause = false;
-    private static final int GUI_SCALE_MOD = 3;
+    private static final int MAX_GUI_SCALE_MOD = 3;
 
     // if no other screen is open and we've got orthoview enabled, open a screen based on shouldPause
     @SubscribeEvent
@@ -59,7 +59,9 @@ public static void onScreenClose(ScreenEvent.Closing evt) {
     @SubscribeEvent
     public static void onScreenOpen(ScreenEvent.Opening evt) {
         if (evt.getScreen() instanceof TopdownGui) {
-            int i = MC.getWindow().calculateScale(GUI_SCALE_MOD, MC.isEnforceUnicode());
+            int i = MC.getWindow().calculateScale(Math.min(MAX_GUI_SCALE_MOD, MC.options.guiScale().get()), MC.isEnforceUnicode());
+            if (MC.options.guiScale().get() == 0)
+                i = MAX_GUI_SCALE_MOD;
             MC.getWindow().setGuiScale(i);
         } else {
             int i = MC.getWindow().calculateScale(MC.options.guiScale().get(), MC.isEnforceUnicode());

src/main/java/com/solegendary/reignofnether/mixin/EntityMixin.java

@@ -78,47 +78,4 @@ protected void getPercentFrozen(CallbackInfoReturnable<Float> cir) {
         float percent = (float)Math.min(this.getTicksFrozen(), 140) / (float)i;
         cir.setReturnValue(Math.min(percent, 0.5f));
     }
-
-    @Inject(
-            method = "collide",
-            at = @At("TAIL"),
-            cancellable = true
-    )
-    public void collide(Vec3 pVec, CallbackInfoReturnable<Vec3> cir) {
-        if (!getName().getString().contains("magma"))
-            return;
-
-        Vec3 result = cir.getReturnValue();
-
-        boolean isNearLeafOrLog = false;
-
-        AABB aabb = getBoundingBox().inflate(0.5f);
-        outerloop:
-        for (int x = (int) aabb.minX; x < aabb.maxX; x++) {
-            for (int y = (int) aabb.minY; y < aabb.maxY; y++) {
-                for (int z = (int) aabb.minZ; z < aabb.maxZ; z++) {
-                    BlockState bs = level().getBlockState(new BlockPos(x,y,z));
-                    if (BlockUtils.isLogBlock(bs) ||
-                        BlockUtils.isFallingLogBlock(bs) ||
-                        BlockUtils.isLeafBlock(bs)) {
-                        isNearLeafOrLog = true;
-                        break outerloop;
-                    }
-                }
-            }
-        }
-        if (!isNearLeafOrLog)
-            return;
-
-        BlockState bs = level().getBlockState(getOnPos());
-        BlockState bsBelow = level().getBlockState(getOnPos().below());
-
-        if (BlockUtils.isLogBlock(bs) || BlockUtils.isLogBlock(bsBelow) ||
-            BlockUtils.isFallingLogBlock(bs) || BlockUtils.isFallingLogBlock(bsBelow) ||
-            BlockUtils.isLeafBlock(bs) || BlockUtils.isLeafBlock(bsBelow)) {
-            cir.setReturnValue(new Vec3(pVec.x, pVec.y, pVec.z));
-        } else {
-            cir.setReturnValue(new Vec3(pVec.x, result.y, pVec.z));
-        }
-    }
 }

src/main/java/com/solegendary/reignofnether/unit/units/monsters/SlimeUnit.java

@@ -380,7 +380,6 @@ public void tick() {
     }
 
     // break leaves that are touched
-    /*
     public void aiStep() {
         super.aiStep();
         if (this.isAlive() && getSize() >= 2) {
@@ -409,7 +408,6 @@ public void aiStep() {
             }
         }
     }
-     */
 
     // stop moving if we overshoot our move target
     private double lastDistToMoveTargetSqr = 9999;