Merge branch 'Moulberry:master' into master

1 files changed, 25 insertions, 0 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinWorldClient.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinWorldClient.java
new file mode 100644
index 00000000..f8b01883
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinWorldClient.java
@@ -0,0 +1,25 @@
+package io.github.moulberry.notenoughupdates.mixins;
+
+import io.github.moulberry.notenoughupdates.miscfeatures.FishingHelper;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.entity.Entity;
+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(WorldClient.class)
+public class MixinWorldClient {
+
+    @Inject(method="addEntityToWorld", at=@At("HEAD"))
+    public void addEntityToWorld(int entityID, Entity entityToSpawn, CallbackInfo ci) {
+        FishingHelper.getInstance().addEntity(entityID, entityToSpawn);
+    }
+
+    @Inject(method="removeEntityFromWorld", at=@At("RETURN"))
+    public void removeEntityFromWorld(int entityID, CallbackInfoReturnable<Entity> cir) {
+        FishingHelper.getInstance().removeEntity(entityID);
+    }
+
+}