Implement new changes

AbdElAziz333 · Jun 14, 2023 · 35ba554 · 35ba554
1 parent 6a6facc
commit 35ba554
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 272 deletions.
diff --git a/src/main/java/com/abdelaziz/canary/common/entity/nearby_tracker/NearbyEntityListener.java b/src/main/java/com/abdelaziz/canary/common/entity/nearby_tracker/NearbyEntityListener.java
diff --git a/.../java/com/abdelaziz/canary/common/entity/nearby_tracker/NearbyEntityListenerProvider.java b/.../java/com/abdelaziz/canary/common/entity/nearby_tracker/NearbyEntityListenerProvider.java
diff --git a/src/main/java/com/abdelaziz/canary/common/entity/nearby_tracker/NearbyEntityTracker.java b/src/main/java/com/abdelaziz/canary/common/entity/nearby_tracker/NearbyEntityTracker.java
diff --git a/src/main/java/com/abdelaziz/canary/mixin/CanaryMixinPlugin.java b/src/main/java/com/abdelaziz/canary/mixin/CanaryMixinPlugin.java
@@ -53,13 +53,16 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
             return false;
         }
 
-        //For now, disable calc.if_else.player_slot optimization when Inventorio is loaded, until i fix this issue
-        if (mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "calc.if_else.player_slot") && (FMLLoader.getLoadingModList().getModFileById("inventorio") != null)) {
+        //Fix: if Forge errors is not empty then disable shapes, math.sine_lut and alloc.blockstate optimizations. (Thanks for malte!)
+        if (mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "shapes") && !LoadingModList.get().getErrors().isEmpty()) {
             return false;
         }
 
-        //Fix: if Forge errors is not empty then disable shapes, math.sine_lut and alloc.blockstate optimizations. (Thanks for malte!)
-        if ((mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "shapes") && mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "math.sine_lut") && mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "alloc.blockstate")) && !LoadingModList.get().getErrors().isEmpty()) {
+        if (mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "math.sine_lut") && !LoadingModList.get().getErrors().isEmpty()) {
+            return false;
+        }
+
+        if (mixinClassName.startsWith(MIXIN_PACKAGE_ROOT + "alloc.blockstate") && !LoadingModList.get().getErrors().isEmpty()) {
             return false;
         }
 

diff --git a/src/main/java/com/abdelaziz/canary/mixin/ai/goals/AvoidEntityGoalMixin.java b/src/main/java/com/abdelaziz/canary/mixin/ai/goals/AvoidEntityGoalMixin.java
diff --git a/src/main/java/com/abdelaziz/canary/mixin/ai/goals/LookAtPlayerGoalMixin.java b/src/main/java/com/abdelaziz/canary/mixin/ai/goals/LookAtPlayerGoalMixin.java
diff --git a/src/main/resources/canary.mixins.json b/src/main/resources/canary.mixins.json
@@ -9,8 +9,6 @@
   "minVersion": "0.8.2",
   "refmap": "canary.refmap.json",
   "mixins": [
-    "ai.goals.AvoidEntityGoalMixin",
-    "ai.goals.LookAtPlayerGoalMixin",
     "ai.pathing.BlockStateBaseMixin",
     "ai.pathing.FlyNodeEvaluatorMixin",
     "ai.pathing.PathNavigationRegionMixin",