Remove more reflection + reorganize mixin accessors packages (#3260)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>

2 files changed, 2 insertions, 13 deletions

diff --git a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
index 9c5d6b25d2..504afc55d8 100644
--- a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
@@ -9,12 +9,9 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.network.handler.AbstractClientMessageHandler;
-import gtPlusPlus.core.network.packet.AbstractPacket;
 import gtPlusPlus.core.network.packet.PacketVolumetricFlaskGui;
 import gtPlusPlus.core.network.packet.PacketVolumetricFlaskGui2;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class PacketHandler {
 
@@ -37,14 +34,6 @@ public class PacketHandler {
 
     private static void registerMessage(Class handlerClass, Class messageClass, Side side) {
         INSTANCE.registerMessage(handlerClass, messageClass, packetId++, side);
-        if (AbstractPacket.class.isInstance(messageClass.getClass())) {
-            AbstractPacket aPacket = ReflectionUtils.createNewInstanceFromConstructor(
-                ReflectionUtils.getConstructor(messageClass, new Class[] {}),
-                new Object[] {});
-            if (aPacket != null) {
-                Logger.INFO("Registered Packet: " + aPacket.getPacketName());
-            }
-        }
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
index 33649b4ff2..41755d6abc 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
@@ -11,7 +11,7 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerWakeUpEvent;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.mixin.interfaces.PotionExt;
+import gregtech.mixin.interfaces.accessors.PotionAccessor;
 import gtPlusPlus.core.util.math.MathUtils;
 
 public class PlayerSleepEventHandler {
@@ -43,7 +43,7 @@ public class PlayerSleepEventHandler {
         final List<Integer> potionToRemove = new ArrayList<>();
         for (PotionEffect potionEffect : player.getActivePotionEffects()) {
             final Potion potion = Potion.potionTypes[potionEffect.getPotionID()];
-            if (potion instanceof PotionExt && ((PotionExt) potion).gt5u$isBadEffect()) {
+            if (potion instanceof PotionAccessor && ((PotionAccessor) potion).gt5u$isBadEffect()) {
                 potionToRemove.add(potion.id);
             }
         }