Backport 0.3.2 features to 1.18.2 version

AbdElAziz333 · Jan 18, 2024 · 4d3ef30 · 4d3ef30
1 parent 8d5de05
commit 4d3ef30
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 114 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ mapping_version=1.18.2
 mod_id=canary
 mod_name=Canary
 mod_license=LGPL-3.0
-mod_version=0.2.9
+mod_version=0.3.2
 mod_group_id=com.abdelaziz.canary
 mod_authors=AbdElAziz
 mod_credits=AbdElAziz, JellySquid, 2No2Name

diff --git a/src/main/java/com/abdelaziz/canary/common/config/CanaryConfig.java b/src/main/java/com/abdelaziz/canary/common/config/CanaryConfig.java
@@ -69,7 +69,7 @@ private CanaryConfig() {
 
         this.addMixinRule("block", true);
         this.addMixinRule("block.flatten_states", true);
-        this.addMixinRule("block.hopper", true);
+        this.addMixinRule("block.hopper", false);
         this.addMixinRule("block.hopper.world_edit_compat", true);
         this.addMixinRule("block.moving_block_shapes", true);
         this.addMixinRule("block.redstone_wire", true);
@@ -130,7 +130,6 @@ private CanaryConfig() {
 
         this.addMixinRule("shapes", true);
         this.addMixinRule("shapes.blockstate_cache", true);
-        this.addMixinRule("shapes.lazy_shape_context", true);
         this.addMixinRule("shapes.optimized_matching", true);
         this.addMixinRule("shapes.precompute_shape_arrays", true);
         this.addMixinRule("shapes.shape_merging", true);

diff --git a/src/main/java/com/abdelaziz/canary/mixin/CanaryMixinPlugin.java b/src/main/java/com/abdelaziz/canary/mixin/CanaryMixinPlugin.java
@@ -48,15 +48,6 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
             return false;
         }
 
-        //For now disable this until running some tests
-        if (mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "shapes.lazy_shape_context") && (FMLLoader.getLoadingModList().getModFileById("the_bumblezone") != null)) {
-            return false;
-        }
-
-        if (mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "block.hopper") && (FMLLoader.getLoadingModList().getModFileById("easy_villagers") != null)) {
-            return false;
-        }
-
         if (mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "chunk.replace_streams.servercore_compat") && (FMLLoader.getLoadingModList().getModFileById("servercore") != null)) {
             return false;
         }

diff --git a/...ava/com/abdelaziz/canary/mixin/shapes/lazy_shape_context/EntityCollisionContextMixin.java b/...ava/com/abdelaziz/canary/mixin/shapes/lazy_shape_context/EntityCollisionContextMixin.java
diff --git a/src/main/java/com/abdelaziz/canary/mixin/shapes/specialized_shapes/VoxelShapeMixin.java b/src/main/java/com/abdelaziz/canary/mixin/shapes/specialized_shapes/VoxelShapeMixin.java
@@ -42,10 +42,6 @@ public double collideX(AxisCycle cycleDirection, AABB box, double maxDist) {
             return maxDist;
         }
 
-        if (Math.abs(maxDist) < POSITIVE_EPSILON) {
-            return 0.0D;
-        }
-
         AxisCycle cycle = cycleDirection.inverse();
 
         Direction.Axis axisX = cycle.cycle(Direction.Axis.X);

diff --git a/src/main/resources/canary.mixins.json b/src/main/resources/canary.mixins.json
@@ -149,7 +149,6 @@
     "math.sine_lut.MthMixin",
     "profiler.ServerLevelMixin",
     "shapes.blockstate_cache.BlockMixin",
-    "shapes.lazy_shape_context.EntityCollisionContextMixin",
     "shapes.optimized_matching.ShapesMixin",
     "shapes.precompute_shape_arrays.CubePointRangeMixin",
     "shapes.precompute_shape_arrays.CubeVoxelShapeMixin",