removed duplicate event listeners

cech12 · Oct 15, 2019 · ac0d353 · ac0d353
1 parent a2da23c
commit ac0d353
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Oct 15 12:49:04 CEST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/cech12/usefulhats/UsefulHatsMod.java b/src/main/java/cech12/usefulhats/UsefulHatsMod.java
@@ -1,11 +1,7 @@
 package cech12.usefulhats;
 
 import cech12.usefulhats.init.ModItems;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import static cech12.usefulhats.UsefulHatsMod.MOD_ID;
 
@@ -14,13 +10,8 @@ public class UsefulHatsMod {
 
     public static final String MOD_ID = "usefulhats";
 
-    private static final Logger LOGGER = LogManager.getLogger();
-
     public UsefulHatsMod() {
-        FMLJavaModLoadingContext.get().getModEventBus().register(ModItems.class);
-        //color events are fired on main MinecraftForge event bus
-        MinecraftForge.EVENT_BUS.addListener(ModItems::registerColors);
-        MinecraftForge.EVENT_BUS.addListener(ModItems::onBreakSpeedEvent);
+        ModItems.addEventListeners();
     }
 
 }
diff --git a/src/main/java/cech12/usefulhats/init/ModItems.java b/src/main/java/cech12/usefulhats/init/ModItems.java
@@ -7,12 +7,13 @@
 import net.minecraft.item.IDyeableArmorItem;
 import net.minecraft.item.Item;
 import net.minecraftforge.client.event.ColorHandlerEvent;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
-@Mod.EventBusSubscriber(modid= UsefulHatsMod.MOD_ID)
+@Mod.EventBusSubscriber(modid= UsefulHatsMod.MOD_ID, bus= Mod.EventBusSubscriber.Bus.MOD)
 public class ModItems {
 
     private static final Item[] items = {
@@ -44,8 +45,14 @@ public static void registerColors(ColorHandlerEvent.Item event) {
         }
     }
 
-    @SubscribeEvent
-    public static void onBreakSpeedEvent(PlayerEvent.BreakSpeed event) {
+    /**
+     * Called at mod initialization.
+     */
+    public static void addEventListeners() {
+        MinecraftForge.EVENT_BUS.addListener(ModItems::onBreakSpeedEvent);
+    }
+
+    private static void onBreakSpeedEvent(PlayerEvent.BreakSpeed event) {
         Item headSlotItem = event.getPlayer().getItemStackFromSlot(EquipmentSlotType.HEAD).getItem();
         for (Item item : ModItems.items) {
             if (item instanceof IBreakSpeedChanger && headSlotItem == item) {