Implement new changes

AbdElAziz333 · Jun 14, 2023 · 4e6157c · 4e6157c
1 parent 037bf1d
commit 4e6157c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 270 deletions.
diff --git a/src/main/java/com/abdelaziz/canary/common/config/CanaryConfig.java b/src/main/java/com/abdelaziz/canary/common/config/CanaryConfig.java
@@ -30,7 +30,6 @@ private CanaryConfig() {
         // Defines the default rules which can be configured by the user or other mods.
         // You must manually add a rule for any new mixins not covered by an existing package rule.
         this.addMixinRule("ai", true);
-        this.addMixinRule("ai.goals", true);
         this.addMixinRule("ai.pathing", true);
         this.addMixinRule("ai.poi", true);
         this.addMixinRule("ai.poi.fast_portals", true);

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
@@ -59,7 +59,15 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
         }
 
         //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 + "shapes") && !LoadingModList.get().getErrors().isEmpty()) {
+            return false;
+        }
+
+        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",