From 7b712c6b88017e5615c2b9d438d5c6aed6c25bf3 Mon Sep 17 00:00:00 2001
From: Keuin <keuinx@gmail.com>
Date: Fri, 18 Dec 2020 22:26:09 +0800
Subject: Bugfix: now the disabling of fish schooling works.

---
 .../ohmyvanillamc/mixin/DisableFishSchooling.java  | 26 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java')

diff --git a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java b/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java
index 28342c9..b48b2b1 100644
--- a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java
+++ b/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java
@@ -1,21 +1,37 @@
 package com.keuin.ohmyvanillamc.mixin;
 
 import com.keuin.ohmyvanillamc.OhMyVanillaMinecraft;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.passive.FishEntity;
 import net.minecraft.entity.passive.SchoolingFishEntity;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(SchoolingFishEntity.class)
-public class DisableFishSchooling {
+public abstract class DisableFishSchooling extends FishEntity {
+
+    public DisableFishSchooling(EntityType<? extends FishEntity> type, World world) {
+        super(type, world);
+    }
+
+    @Shadow public abstract boolean hasLeader();
+    @Shadow private SchoolingFishEntity leader;
+
     /**
      * @reason To disable SchoolingFish schooling.
      * @author trueKeuin
      */
-    @Inject(method = "moveTowardLeader()V", at = @At("HEAD"))
-    protected void moveTowardLeader(CallbackInfo ci) {
-        if (OhMyVanillaMinecraft.disableFishSchooling)
-            ci.cancel();
+    @Overwrite
+    public void moveTowardLeader() {
+        if (!OhMyVanillaMinecraft.disableFishSchooling) {
+            if (this.hasLeader()) {
+                this.getNavigation().startMovingTo(this.leader, 1.0D);
+            }
+        }
     }
 }
-- 
cgit v1.2.3