From 3a98df4f705597041dbca50300b23bb47020cda7 Mon Sep 17 00:00:00 2001 From: mozipi Date: Fri, 29 Mar 2013 12:13:40 +0900 Subject: [PATCH] www --- common/pcc/chemicraft/ChemiCraft.java | 6 ++---- common/pcc/chemicraft/base/ChemiCraftBase.java | 5 ++--- common/pcc/chemicraft/core/ChemiCraftCore.java | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/common/pcc/chemicraft/ChemiCraft.java b/common/pcc/chemicraft/ChemiCraft.java index b7945ba..73341a8 100644 --- a/common/pcc/chemicraft/ChemiCraft.java +++ b/common/pcc/chemicraft/ChemiCraft.java @@ -5,7 +5,7 @@ import pcc.chemicraft.util.Auxiliary; import pcc.chemicraft.util.Auxiliary.ArrayAuxiliary; import pcc.chemicraft.util.Auxiliary.MathAuxiliary; import pcc.chemicraft.util.Auxiliary.NameAuxiliary; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLStateEvent; public abstract class ChemiCraft implements Runnable { @@ -18,7 +18,7 @@ public abstract class ChemiCraft implements Runnable /** * the Event Instance. */ - protected FMLPostInitializationEvent event; + protected FMLStateEvent event; /** * API Instance and Data Instance. @@ -51,6 +51,4 @@ public abstract class ChemiCraft implements Runnable public static final String GUI_CHEMICALCRAFTING_TEXTURE = "/pcc/chemicraft/guis/MaterialCrafting.png"; public static final String ENTITY_PARTICLE_TEXRURE = "/pcc/chemicraft/entityParticles/dust.png"; - protected abstract void settingProcessing(final FMLPostInitializationEvent event); - } \ No newline at end of file diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java index ba09c77..dfa7dd1 100644 --- a/common/pcc/chemicraft/base/ChemiCraftBase.java +++ b/common/pcc/chemicraft/base/ChemiCraftBase.java @@ -122,8 +122,8 @@ public class ChemiCraftBase extends ChemiCraft { while (true) { if (proxy != null && instance != null) { - this.settingProcessing(event); - this.apiProcessing(event); + this.settingProcessing((FMLPostInitializationEvent) event); + this.apiProcessing((FMLPostInitializationEvent) event); break; } } @@ -158,7 +158,6 @@ public class ChemiCraftBase extends ChemiCraft cfg.save(); } - @Override protected void settingProcessing(FMLPostInitializationEvent event) { this.registerCompounds.start(); diff --git a/common/pcc/chemicraft/core/ChemiCraftCore.java b/common/pcc/chemicraft/core/ChemiCraftCore.java index dbfc825..563dce4 100644 --- a/common/pcc/chemicraft/core/ChemiCraftCore.java +++ b/common/pcc/chemicraft/core/ChemiCraftCore.java @@ -17,12 +17,12 @@ import pcc.chemicraft.core.debug.CommandSetTile; import pcc.chemicraft.core.system.CommonProxy; import pcc.chemicraft.core.system.PacketHandler; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.PostInit; import cpw.mods.fml.common.Mod.PreInit; import cpw.mods.fml.common.Mod.ServerStarting; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.NetworkMod; @@ -197,8 +197,8 @@ public class ChemiCraftCore extends ChemiCraft{ - @PostInit - public void chemiPostLoadMethod(final FMLPostInitializationEvent event) { + @Init + public void chemiPostLoadMethod(final FMLInitializationEvent event) { this.thread = new Thread(this); this.event = event; this.thread.start(); @@ -219,9 +219,9 @@ public class ChemiCraftCore extends ChemiCraft{ public void run() { while (true) { if (proxy != null && instance != null) { - this.settingProcessing(event); - this.apiProcessing(event); - this.debug(event); + this.settingProcessing((FMLInitializationEvent) event); + this.apiProcessing((FMLInitializationEvent) event); + this.debug((FMLInitializationEvent) event); break; } } @@ -229,7 +229,7 @@ public class ChemiCraftCore extends ChemiCraft{ - protected void settingProcessing(final FMLPostInitializationEvent event) { + protected void settingProcessing(final FMLInitializationEvent event) { this.registerItem.start(); this.registerBlock.start(); @@ -248,7 +248,7 @@ public class ChemiCraftCore extends ChemiCraft{ - private void apiProcessing(final FMLPostInitializationEvent event) { + private void apiProcessing(final FMLInitializationEvent event) { for (int i = 0; i < api.getChemicalCellsName().sizeKeysList(); i++) { @@ -270,7 +270,7 @@ public class ChemiCraftCore extends ChemiCraft{ - private void debug(final FMLPostInitializationEvent event) { + private void debug(final FMLInitializationEvent event) { this.proxy.registerTickHandler(); this.api.addCompound("Debug"); this.api.settingCompoundHandler("Debug", new CompoundDebug()); -- 2.11.0