From 223a210d49655c491fee496dc22097623e0e074f Mon Sep 17 00:00:00 2001 From: thatsIch Date: Wed, 2 Nov 2016 14:22:00 +0100 Subject: [PATCH] Replaced reference to FMLCommonHandler EventBus through MinecraftForge.EVENT_BUS due to deprecation notice --- src/main/java/appeng/core/AEConfig.java | 4 ++-- src/main/java/appeng/core/Registration.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 849580e3..27246cfc 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -25,10 +25,10 @@ import java.util.Collection; import java.util.EnumSet; import java.util.List; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.fml.client.event.ConfigChangedEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -113,7 +113,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject super( configFile ); this.configFile = configFile; - FMLCommonHandler.instance().bus().register( this ); + MinecraftForge.EVENT_BUS.register( this ); final double DEFAULT_IC2_EXCHANGE = 2.0; PowerUnits.EU.conversionRatio = this.get( "PowerRatios", "IC2", DEFAULT_IC2_EXCHANGE ).getDouble( DEFAULT_IC2_EXCHANGE ); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index c67b9691..ecf2ba54 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -22,7 +22,6 @@ package appeng.core; import java.io.File; import java.util.HashSet; import java.util.Set; - import javax.annotation.Nonnull; import com.google.common.base.Preconditions; @@ -30,7 +29,6 @@ import com.google.common.base.Preconditions; import net.minecraft.world.DimensionType; import net.minecraft.world.biome.Biome; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -299,7 +297,7 @@ public final class Registration this.recipeHandler.injectRecipes(); - final PlayerStatsRegistration registration = new PlayerStatsRegistration( FMLCommonHandler.instance().bus(), AEConfig.instance ); + final PlayerStatsRegistration registration = new PlayerStatsRegistration( MinecraftForge.EVENT_BUS, AEConfig.instance ); registration.registerAchievementHandlers(); registration.registerAchievements();