From 7c00af18febf6c0b833c7633b4fb60a9a1bb93af Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Sat, 16 Oct 2021 15:50:41 -0400 Subject: Code Clean Up (#2) * intellij code clean up * optimize imports * format * intellij suggestions * fix empty catch issues --- .../mixins/MixinNetHandlerPlayClient.java | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java') diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java index 5711f92b..c67d3a07 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java @@ -1,9 +1,7 @@ package io.github.moulberry.notenoughupdates.mixins; import io.github.moulberry.notenoughupdates.miscfeatures.*; -import io.github.moulberry.notenoughupdates.NotEnoughUpdates; import io.github.moulberry.notenoughupdates.util.SBInfo; -import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.entity.player.EntityPlayer; @@ -21,15 +19,16 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class MixinNetHandlerPlayClient { private static final String TARGET = "Lnet/minecraft/entity/player/EntityPlayer;" + "setPositionAndRotation(DDDFF)V"; - @Redirect(method="handlePlayerPosLook", at=@At(value="INVOKE", target=TARGET)) + + @Redirect(method = "handlePlayerPosLook", at = @At(value = "INVOKE", target = TARGET)) public void handlePlayerPosLook_setPositionAndRotation(EntityPlayer player, double x, double y, double z, float yaw, float pitch) { - if(CustomItemEffects.INSTANCE.aoteTeleportationCurr != null) { + if (CustomItemEffects.INSTANCE.aoteTeleportationCurr != null) { CustomItemEffects.INSTANCE.aoteTeleportationMillis += Math.max(0, Math.min(300, CustomItemEffects.INSTANCE.tpTime)); } player.setPositionAndRotation(x, y, z, yaw, pitch); } - @Redirect(method="handleParticles", at=@At( + @Redirect(method = "handleParticles", at = @At( value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/WorldClient;spawnParticle(Lnet/minecraft/util/EnumParticleTypes;ZDDDDDD[I)V" )) @@ -37,38 +36,38 @@ public class MixinNetHandlerPlayClient { double xCoord, double yCoord, double zCoord, double xOffset, double yOffset, double zOffset, int[] params) { boolean override = FishingHelper.getInstance().onSpawnParticle(particleTypes, xCoord, yCoord, zCoord, xOffset, yOffset, zOffset); - if(!override) { + if (!override) { world.spawnParticle(particleTypes, isLongDistance, xCoord, yCoord, zCoord, xOffset, yOffset, zOffset, params); } } - @Inject(method="handleSpawnMob", at=@At("RETURN")) + @Inject(method = "handleSpawnMob", at = @At("RETURN")) public void handleSpawnMob(S0FPacketSpawnMob packetIn, CallbackInfo ci) { //CollectionLogManager.getInstance().onEntityMetadataUpdated(packetIn.getEntityID()); } - @Inject(method="handleSetSlot", at=@At("RETURN")) + @Inject(method = "handleSetSlot", at = @At("RETURN")) public void handleSetSlot(S2FPacketSetSlot packetIn, CallbackInfo ci) { EnchantingSolvers.processInventoryContents(false); StorageManager.getInstance().setSlotPacket(packetIn); } - @Inject(method="handleOpenWindow", at=@At("RETURN")) + @Inject(method = "handleOpenWindow", at = @At("RETURN")) public void handleOpenWindow(S2DPacketOpenWindow packetIn, CallbackInfo ci) { StorageManager.getInstance().openWindowPacket(packetIn); } - @Inject(method="handleCloseWindow", at=@At("RETURN")) + @Inject(method = "handleCloseWindow", at = @At("RETURN")) public void handleCloseWindow(S2EPacketCloseWindow packetIn, CallbackInfo ci) { StorageManager.getInstance().closeWindowPacket(packetIn); } - @Inject(method="handleWindowItems", at=@At("RETURN")) + @Inject(method = "handleWindowItems", at = @At("RETURN")) public void handleOpenWindow(S30PacketWindowItems packetIn, CallbackInfo ci) { StorageManager.getInstance().setItemsPacket(packetIn); } - @Inject(method="handleRespawn", at=@At( + @Inject(method = "handleRespawn", at = @At( value = "INVOKE", target = "Lnet/minecraft/network/PacketThreadUtil;checkThreadAndEnqueue(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V", shift = At.Shift.AFTER)) @@ -76,25 +75,23 @@ public class MixinNetHandlerPlayClient { FancyPortals.onRespawnPacket(packetIn); } - @Inject(method="handleBlockChange", at=@At("HEAD")) + @Inject(method = "handleBlockChange", at = @At("HEAD")) public void handleBlockChange(S23PacketBlockChange packetIn, CallbackInfo ci) { MiningStuff.processBlockChangePacket(packetIn); ItemCooldowns.processBlockChangePacket(packetIn); } - @Inject(method="addToSendQueue", at=@At("HEAD")) + @Inject(method = "addToSendQueue", at = @At("HEAD")) public void addToSendQueue(Packet packet, CallbackInfo ci) { - if(packet instanceof C0EPacketClickWindow) { - StorageManager.getInstance().clientSendWindowClick((C0EPacketClickWindow)packet); + if (packet instanceof C0EPacketClickWindow) { + StorageManager.getInstance().clientSendWindowClick((C0EPacketClickWindow) packet); } } - @Inject(method="handlePlayerListHeaderFooter", at=@At("HEAD")) + @Inject(method = "handlePlayerListHeaderFooter", at = @At("HEAD")) public void handlePlayerListHeaderFooter(S47PacketPlayerListHeaderFooter packetIn, CallbackInfo ci) { SBInfo.getInstance().header = packetIn.getHeader().getFormattedText().length() == 0 ? null : packetIn.getHeader(); SBInfo.getInstance().footer = packetIn.getFooter().getFormattedText().length() == 0 ? null : packetIn.getFooter(); } - - } -- cgit From ea3ec354ba3bb5b4ac64b8032816b8e4c407f099 Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Tue, 28 Dec 2021 00:49:28 -0500 Subject: more code clean up (#38) --- .../moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java') diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java index c67d3a07..1ddf1933 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java @@ -93,5 +93,4 @@ public class MixinNetHandlerPlayClient { SBInfo.getInstance().header = packetIn.getHeader().getFormattedText().length() == 0 ? null : packetIn.getHeader(); SBInfo.getInstance().footer = packetIn.getFooter().getFormattedText().length() == 0 ? null : packetIn.getFooter(); } - } -- cgit From b09f774d422263ce15b97d6d0804beddf856176d Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Sun, 27 Feb 2022 11:53:57 -0500 Subject: feat: improve formating :) --- .../mixins/MixinNetHandlerPlayClient.java | 150 ++++++++++++--------- 1 file changed, 85 insertions(+), 65 deletions(-) (limited to 'src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java') diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java index 1ddf1933..d47dce2c 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinNetHandlerPlayClient.java @@ -17,80 +17,100 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(NetHandlerPlayClient.class) public class MixinNetHandlerPlayClient { - private static final String TARGET = "Lnet/minecraft/entity/player/EntityPlayer;" + - "setPositionAndRotation(DDDFF)V"; + private static final String TARGET = "Lnet/minecraft/entity/player/EntityPlayer;" + + "setPositionAndRotation(DDDFF)V"; - @Redirect(method = "handlePlayerPosLook", at = @At(value = "INVOKE", target = TARGET)) - public void handlePlayerPosLook_setPositionAndRotation(EntityPlayer player, double x, double y, double z, float yaw, float pitch) { - if (CustomItemEffects.INSTANCE.aoteTeleportationCurr != null) { - CustomItemEffects.INSTANCE.aoteTeleportationMillis += Math.max(0, Math.min(300, CustomItemEffects.INSTANCE.tpTime)); - } - player.setPositionAndRotation(x, y, z, yaw, pitch); - } + @Redirect(method = "handlePlayerPosLook", at = @At(value = "INVOKE", target = TARGET)) + public void handlePlayerPosLook_setPositionAndRotation( + EntityPlayer player, + double x, + double y, + double z, + float yaw, + float pitch + ) { + if (CustomItemEffects.INSTANCE.aoteTeleportationCurr != null) { + CustomItemEffects.INSTANCE.aoteTeleportationMillis += Math.max( + 0, + Math.min(300, CustomItemEffects.INSTANCE.tpTime) + ); + } + player.setPositionAndRotation(x, y, z, yaw, pitch); + } - @Redirect(method = "handleParticles", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/multiplayer/WorldClient;spawnParticle(Lnet/minecraft/util/EnumParticleTypes;ZDDDDDD[I)V" - )) - public void handleParticles(WorldClient world, EnumParticleTypes particleTypes, boolean isLongDistance, - double xCoord, double yCoord, double zCoord, - double xOffset, double yOffset, double zOffset, int[] params) { - boolean override = FishingHelper.getInstance().onSpawnParticle(particleTypes, xCoord, yCoord, zCoord, xOffset, yOffset, zOffset); - if (!override) { - world.spawnParticle(particleTypes, isLongDistance, xCoord, yCoord, zCoord, xOffset, yOffset, zOffset, params); - } - } + @Redirect(method = "handleParticles", at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/multiplayer/WorldClient;spawnParticle(Lnet/minecraft/util/EnumParticleTypes;ZDDDDDD[I)V" + )) + public void handleParticles( + WorldClient world, EnumParticleTypes particleTypes, boolean isLongDistance, + double xCoord, double yCoord, double zCoord, + double xOffset, double yOffset, double zOffset, int[] params + ) { + boolean override = FishingHelper.getInstance().onSpawnParticle( + particleTypes, + xCoord, + yCoord, + zCoord, + xOffset, + yOffset, + zOffset + ); + if (!override) { + world.spawnParticle(particleTypes, isLongDistance, xCoord, yCoord, zCoord, xOffset, yOffset, zOffset, params); + } + } - @Inject(method = "handleSpawnMob", at = @At("RETURN")) - public void handleSpawnMob(S0FPacketSpawnMob packetIn, CallbackInfo ci) { - //CollectionLogManager.getInstance().onEntityMetadataUpdated(packetIn.getEntityID()); - } + @Inject(method = "handleSpawnMob", at = @At("RETURN")) + public void handleSpawnMob(S0FPacketSpawnMob packetIn, CallbackInfo ci) { + //CollectionLogManager.getInstance().onEntityMetadataUpdated(packetIn.getEntityID()); + } - @Inject(method = "handleSetSlot", at = @At("RETURN")) - public void handleSetSlot(S2FPacketSetSlot packetIn, CallbackInfo ci) { - EnchantingSolvers.processInventoryContents(false); - StorageManager.getInstance().setSlotPacket(packetIn); - } + @Inject(method = "handleSetSlot", at = @At("RETURN")) + public void handleSetSlot(S2FPacketSetSlot packetIn, CallbackInfo ci) { + EnchantingSolvers.processInventoryContents(false); + StorageManager.getInstance().setSlotPacket(packetIn); + } - @Inject(method = "handleOpenWindow", at = @At("RETURN")) - public void handleOpenWindow(S2DPacketOpenWindow packetIn, CallbackInfo ci) { - StorageManager.getInstance().openWindowPacket(packetIn); - } + @Inject(method = "handleOpenWindow", at = @At("RETURN")) + public void handleOpenWindow(S2DPacketOpenWindow packetIn, CallbackInfo ci) { + StorageManager.getInstance().openWindowPacket(packetIn); + } - @Inject(method = "handleCloseWindow", at = @At("RETURN")) - public void handleCloseWindow(S2EPacketCloseWindow packetIn, CallbackInfo ci) { - StorageManager.getInstance().closeWindowPacket(packetIn); - } + @Inject(method = "handleCloseWindow", at = @At("RETURN")) + public void handleCloseWindow(S2EPacketCloseWindow packetIn, CallbackInfo ci) { + StorageManager.getInstance().closeWindowPacket(packetIn); + } - @Inject(method = "handleWindowItems", at = @At("RETURN")) - public void handleOpenWindow(S30PacketWindowItems packetIn, CallbackInfo ci) { - StorageManager.getInstance().setItemsPacket(packetIn); - } + @Inject(method = "handleWindowItems", at = @At("RETURN")) + public void handleOpenWindow(S30PacketWindowItems packetIn, CallbackInfo ci) { + StorageManager.getInstance().setItemsPacket(packetIn); + } - @Inject(method = "handleRespawn", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/network/PacketThreadUtil;checkThreadAndEnqueue(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V", - shift = At.Shift.AFTER)) - public void handleOpenWindow(S07PacketRespawn packetIn, CallbackInfo ci) { - FancyPortals.onRespawnPacket(packetIn); - } + @Inject(method = "handleRespawn", at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/PacketThreadUtil;checkThreadAndEnqueue(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V", + shift = At.Shift.AFTER)) + public void handleOpenWindow(S07PacketRespawn packetIn, CallbackInfo ci) { + FancyPortals.onRespawnPacket(packetIn); + } - @Inject(method = "handleBlockChange", at = @At("HEAD")) - public void handleBlockChange(S23PacketBlockChange packetIn, CallbackInfo ci) { - MiningStuff.processBlockChangePacket(packetIn); - ItemCooldowns.processBlockChangePacket(packetIn); - } + @Inject(method = "handleBlockChange", at = @At("HEAD")) + public void handleBlockChange(S23PacketBlockChange packetIn, CallbackInfo ci) { + MiningStuff.processBlockChangePacket(packetIn); + ItemCooldowns.processBlockChangePacket(packetIn); + } - @Inject(method = "addToSendQueue", at = @At("HEAD")) - public void addToSendQueue(Packet packet, CallbackInfo ci) { - if (packet instanceof C0EPacketClickWindow) { - StorageManager.getInstance().clientSendWindowClick((C0EPacketClickWindow) packet); - } - } + @Inject(method = "addToSendQueue", at = @At("HEAD")) + public void addToSendQueue(Packet packet, CallbackInfo ci) { + if (packet instanceof C0EPacketClickWindow) { + StorageManager.getInstance().clientSendWindowClick((C0EPacketClickWindow) packet); + } + } - @Inject(method = "handlePlayerListHeaderFooter", at = @At("HEAD")) - public void handlePlayerListHeaderFooter(S47PacketPlayerListHeaderFooter packetIn, CallbackInfo ci) { - SBInfo.getInstance().header = packetIn.getHeader().getFormattedText().length() == 0 ? null : packetIn.getHeader(); - SBInfo.getInstance().footer = packetIn.getFooter().getFormattedText().length() == 0 ? null : packetIn.getFooter(); - } + @Inject(method = "handlePlayerListHeaderFooter", at = @At("HEAD")) + public void handlePlayerListHeaderFooter(S47PacketPlayerListHeaderFooter packetIn, CallbackInfo ci) { + SBInfo.getInstance().header = packetIn.getHeader().getFormattedText().length() == 0 ? null : packetIn.getHeader(); + SBInfo.getInstance().footer = packetIn.getFooter().getFormattedText().length() == 0 ? null : packetIn.getFooter(); + } } -- cgit