aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMy-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com>2021-10-17 16:46:59 -0400
committerMy-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com>2021-10-17 16:46:59 -0400
commitf25f8b598d33959442f27ad5d23ac7045135969b (patch)
treeb68a937f9a00fdcee33f94e3d8bcb2447fd520d1
parent79deb2463d27b4b2c0d50848d3acc252f17d69f7 (diff)
downloadSkytilsMod-f25f8b598d33959442f27ad5d23ac7045135969b.tar.gz
SkytilsMod-f25f8b598d33959442f27ad5d23ac7045135969b.tar.bz2
SkytilsMod-f25f8b598d33959442f27ad5d23ac7045135969b.zip
remove capture locals on spawnmob
-rw-r--r--src/main/java/skytils/skytilsmod/mixins/transformers/network/MixinNetHandlerPlayClient.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/skytils/skytilsmod/mixins/transformers/network/MixinNetHandlerPlayClient.java b/src/main/java/skytils/skytilsmod/mixins/transformers/network/MixinNetHandlerPlayClient.java
index 77a9947d..d888ef8f 100644
--- a/src/main/java/skytils/skytilsmod/mixins/transformers/network/MixinNetHandlerPlayClient.java
+++ b/src/main/java/skytils/skytilsmod/mixins/transformers/network/MixinNetHandlerPlayClient.java
@@ -18,32 +18,32 @@
package skytils.skytilsmod.mixins.transformers.network;
+import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.entity.DataWatcher;
import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
import net.minecraft.network.Packet;
import net.minecraft.network.play.INetHandlerPlayClient;
import net.minecraft.network.play.server.S0FPacketSpawnMob;
import org.spongepowered.asm.mixin.Mixin;
+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;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import skytils.skytilsmod.mixins.extensions.ExtensionEntityLivingBase;
import skytils.skytilsmod.mixins.hooks.network.NetHandlerPlayClientHookKt;
-import java.util.List;
-
@Mixin(value = NetHandlerPlayClient.class, priority = 1001)
public abstract class MixinNetHandlerPlayClient implements INetHandlerPlayClient {
+ @Shadow private WorldClient clientWorldController;
+
@Inject(method = "addToSendQueue", at = @At("HEAD"), cancellable = true)
private void onSendPacket(Packet<?> packet, CallbackInfo ci) {
NetHandlerPlayClientHookKt.onSendPacket(packet, ci);
}
- @Inject(method = "handleSpawnMob", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILSOFT)
- private void onHandleSpawnMobTail(S0FPacketSpawnMob i, CallbackInfo ci, double d0, double d1, double d2, float f, float f1, EntityLivingBase entity, Entity[] parts, List<DataWatcher.WatchableObject> list) {
+ @Inject(method = "handleSpawnMob", at = @At("TAIL"))
+ private void onHandleSpawnMobTail(S0FPacketSpawnMob packetIn, CallbackInfo ci) {
+ Entity entity = this.clientWorldController.getEntityByID(packetIn.getEntityID());
((ExtensionEntityLivingBase)entity).getSkytilsHook().onNewDisplayName(
entity.getDataWatcher().getWatchableObjectString(2)
);