From 6f84d79bc8452a2e37644e6f0419477b70a09e69 Mon Sep 17 00:00:00 2001
From: Keuin <keuinx@gmail.com>
Date: Mon, 28 Dec 2020 23:10:53 +0800
Subject: Version 1.3.1: fix the wrong mixin.

---
 .../java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java    | 2 +-
 .../java/com/keuin/ohmyvanillamc/mixin/DisablePhantomSpawning.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java b/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java
index 6808596..c30ab02 100644
--- a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java
+++ b/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableFishSchooling.java
@@ -37,7 +37,7 @@ public abstract class DisableFishSchooling extends FishEntity {
      * @author trueKeuin
      */
     @Overwrite
-    protected void initGoals() {
+    public void initGoals() {
         super.initGoals();
     }
 }
diff --git a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisablePhantomSpawning.java b/src/main/java/com/keuin/ohmyvanillamc/mixin/DisablePhantomSpawning.java
index d5788c7..ea97857 100644
--- a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisablePhantomSpawning.java
+++ b/src/main/java/com/keuin/ohmyvanillamc/mixin/DisablePhantomSpawning.java
@@ -6,7 +6,7 @@ import net.minecraft.world.gen.PhantomSpawner;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PhantomSpawner.class)
 public class DisablePhantomSpawning {
@@ -15,8 +15,8 @@ public class DisablePhantomSpawning {
      * @author trueKeuin
      */
     @Inject(method = "spawn", at = @At("HEAD"), cancellable = true)
-    public void spawn(ServerWorld serverWorld, boolean spawnMonsters, boolean spawnAnimals, CallbackInfo ci) {
+    public void spawn(ServerWorld serverWorld, boolean spawnMonsters, boolean spawnAnimals, CallbackInfoReturnable<Integer> cir) {
         if (OhMyVanillaMinecraft.disablePhantomSpawning)
-            ci.cancel();
+            cir.setReturnValue(0);
     }
 }
-- 
cgit v1.2.3