Delete the GT ++ utils method that mindlessly register event classes to both buses

4 files changed, 12 insertions, 17 deletions

diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index dc45ae15e5..50b4578085 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -9,6 +9,7 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent;
 
 import baubles.common.container.InventoryBaubles;
 import baubles.common.lib.PlayerHandler;
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
@@ -38,7 +39,6 @@ import gtPlusPlus.core.item.bauble.BaseBauble;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.tileentities.ModTileEntities;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.preloader.PreloaderCore;
@@ -86,10 +86,12 @@ public class CommonProxy {
         // Handles Sleep Benefits
         PlayerSleepEventHandler.init();
         // Handles Magic Feather
-        Utils.registerEvent(ModItems.itemMagicFeather);
-
+        MinecraftForge.EVENT_BUS.register(ModItems.itemMagicFeather);
+        FMLCommonHandler.instance()
+            .bus()
+            .register(ModItems.itemMagicFeather);
         MinecraftForge.EVENT_BUS.register(new EnderDragonDeathHandler());
-        Utils.registerEvent(new EntityDeathHandler());
+        MinecraftForge.EVENT_BUS.register(new EntityDeathHandler());
 
         // Compat Handling
         CompatHandler.registerMyModsOreDictEntries();
diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java
index c3c877388b..fb05c6aa10 100644
--- a/src/main/java/gtPlusPlus/core/util/Utils.java
+++ b/src/main/java/gtPlusPlus/core/util/Utils.java
@@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagString;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.IChatComponent;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -126,14 +125,6 @@ public class Utils {
         return returnValue;
     }
 
-    // Register an event to both busses.
-    public static void registerEvent(Object o) {
-        MinecraftForge.EVENT_BUS.register(o);
-        FMLCommonHandler.instance()
-            .bus()
-            .register(o);
-    }
-
     // Send a message to all players on the server
     public static void sendServerMessage(final String translationKey) {
         sendServerMessage(new ChatComponentText(translationKey));
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index 31c0a2e41c..aa81a0378c 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -4,13 +4,13 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
 
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.api.interfaces.IPlugin;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
 import gtPlusPlus.preloader.PreloaderCore;
@@ -37,7 +37,7 @@ public class VanillaBedHeightFix implements IBugFix {
         if (m != null) {
             mSleepInBedAt = m;
             mParent.log("Registering Bed Height Fix.");
-            Utils.registerEvent(this);
+            MinecraftForge.EVENT_BUS.register(this);
         } else {
             mSleepInBedAt = null;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
index c66d2b574a..4bb51c93d0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
@@ -10,8 +10,8 @@ import static gregtech.api.enums.MetaTileEntityIDs.Charger_UHV;
 import static gregtech.api.enums.MetaTileEntityIDs.Charger_UV;
 import static gregtech.api.enums.MetaTileEntityIDs.Charger_ZPM;
 
+import cpw.mods.fml.common.FMLCommonHandler;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEWirelessCharger;
@@ -22,7 +22,9 @@ public class GregtechWirelessChargers {
 
         Logger.INFO("Gregtech5u Content | Registering Wireless Chargers.");
 
-        Utils.registerEvent(new ChargingHelper());
+        FMLCommonHandler.instance()
+            .bus()
+            .register(new ChargingHelper());
 
         GregtechItemList.Charger_LV.set(
             new MTEWirelessCharger(