Build against recommended Forge build

GirafiStudios · Jun 29, 2017 · ed12b96 · ed12b96
1 parent cd4917c
commit ed12b96
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 minecraft_version=1.12
-forge_version=14.21.0.2382
-mappings_version=snapshot_20170628
-mod_version=0.5.2
+forge_version=14.21.1.2387
+mappings_version=snapshot_20170629
+mod_version=0.5.3
diff --git a/src/main/java/com/girafi/waddles/Waddles.java b/src/main/java/com/girafi/waddles/Waddles.java
@@ -10,7 +10,6 @@
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.storage.loot.LootTableList;
 import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -36,7 +35,6 @@ public class Waddles {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         ConfigurationHandler.init(new File(event.getModConfigurationDirectory(), "Waddles.cfg"));
-        MinecraftForge.EVENT_BUS.register(new ConfigurationHandler());
         proxy.registerRenders();
     }
 

diff --git a/src/main/java/com/girafi/waddles/utils/ConfigurationHandler.java b/src/main/java/com/girafi/waddles/utils/ConfigurationHandler.java
@@ -2,10 +2,12 @@
 
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.io.File;
 
+@EventBusSubscriber
 public class ConfigurationHandler {
     public static Configuration config;
     public static boolean dropFish;
@@ -28,7 +30,7 @@ private static void loadConfiguration() {
     }
 
     @SubscribeEvent
-    public void onConfigurationChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event) {
+    public static void onConfigurationChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event) {
         if (event.getModID().equalsIgnoreCase(Reference.MOD_ID)) {
             loadConfiguration();
         }

diff --git a/src/main/java/com/girafi/waddles/utils/Reference.java b/src/main/java/com/girafi/waddles/utils/Reference.java
@@ -7,5 +7,5 @@ public class Reference {
     public static final String CLIENT_PROXY_CLASS = "com.girafi.waddles.proxy.ClientProxy";
     public static final String COMMON_PROXY_ClASS = "com.girafi.waddles.proxy.CommonProxy";
     public static final String GUI_FACTORY_CLASS = "com.girafi.waddles.utils.GuiFactory";
-    public static final String DEPENDENCIES = "required-after:forge@[14.21,)";
+    public static final String DEPENDENCIES = "required-after:forge@[14.21.1,)";
 }
diff --git a/src/main/java/com/girafi/waddles/utils/WaddlesSounds.java b/src/main/java/com/girafi/waddles/utils/WaddlesSounds.java
@@ -4,10 +4,12 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
 import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.util.List;
 
+@EventBusSubscriber
 public class WaddlesSounds {
     private static List<SoundEvent> sounds = Lists.newArrayList();
     public static final SoundEvent ADELIE_AMBIENT = createSound("adelie.ambient");
@@ -24,7 +26,7 @@ private static SoundEvent createSound(String name) {
     }
 
     @SubscribeEvent
-    public void registerSound(RegistryEvent.Register<SoundEvent> event) {
+    public static void registerSound(RegistryEvent.Register<SoundEvent> event) {
         for (SoundEvent sound : sounds) {
             event.getRegistry().register(sound);
         }