tc

[chemicraft/chemicraft.git] / common / pcc / chemicraft / core / ChemiCraftCore.java

diff --git a/common/pcc/chemicraft/core/ChemiCraftCore.java b/common/pcc/chemicraft/core/ChemiCraftCore.java
index 563dce4..e062d58 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftCore.java
+++ b/common/pcc/chemicraft/core/ChemiCraftCore.java
@@ -1,6 +1,11 @@
 package pcc.chemicraft.core;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -16,17 +21,21 @@ import pcc.chemicraft.core.debug.CommandGenDebugRoom;
 import pcc.chemicraft.core.debug.CommandSetTile;
 import pcc.chemicraft.core.system.CommonProxy;
 import pcc.chemicraft.core.system.PacketHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.LoaderState.ModState;
 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.PreInit;
 import cpw.mods.fml.common.Mod.ServerStarting;
+import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.SidedProxy;
 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;
 import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
 
 /**
  * ChemiCraft本体
@@ -158,7 +167,7 @@ public class ChemiCraftCore extends ChemiCraft{
                Property coreItemID = cfg.get("ItemID", "Base of Item ID", 25000);
 
                ChemiCraftConfiguration ccfgBlock = new ChemiCraftConfiguration(coreBlockID.getInt());
-               ChemiCraftConfiguration ccfgItem = new ChemiCraftConfiguration(coreBlockID.getInt());
+               ChemiCraftConfiguration ccfgItem = new ChemiCraftConfiguration(coreItemID.getInt());
 
                this.pyrolysisTableID = ccfgBlock.additionID();
                this.electrolysisTableID = ccfgBlock.additionID();
@@ -170,6 +179,7 @@ public class ChemiCraftCore extends ChemiCraft{
                this.compoundsID = ccfgItem.additionID();
                this.gasCollectingBottleID = ccfgItem.additionID();
                this.chemicalCellsID = ccfgItem.additionID();
+               this.pearID = ccfgItem.additionID();
 
                Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000);
                Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableIDProp", 1001);
@@ -220,11 +230,27 @@ public class ChemiCraftCore extends ChemiCraft{
                while (true) {
                        if (proxy != null && instance != null) {
                                this.settingProcessing((FMLInitializationEvent) event);
-                               this.apiProcessing((FMLInitializationEvent) event);
                                this.debug((FMLInitializationEvent) event);
                                break;
                        }
                }
+
+               Thread loadCheckThread = new Thread() {
+                       @Override
+                       public void run() {
+                               while (true) {
+                                       List<ModContainer> mod = Loader.instance().getModList();
+                                       ModContainer finalMod = mod.get(mod.size()-1);
+                                       ModState finalModState = Loader.instance().getModState(finalMod);
+                                       if (finalModState == ModState.AVAILABLE) {
+                                               apiProcessing((FMLInitializationEvent) event);
+                                               break;
+                                       }
+                               }
+                       }
+               };
+               loadCheckThread.start();
+
        }
 
 
@@ -240,8 +266,8 @@ public class ChemiCraftCore extends ChemiCraft{
                NetworkRegistry.instance().registerGuiHandler(instance, proxy);
 
                //電池を追加します
-               this.api.addChemicalCell(itemChemicalCells, "ChemicalCell", 1000);
-               this.api.addChemicalCellLanguage("ChemicalCell", "ja_JP", "化学電池");
+               this.api.addChemicalCell(this.itemChemicalCells, "ChemicalCell", 1000);
+               this.api.addChemicalCellLanguage("ja_JP", "化学電池");
 
                this.api.addPyrolysisDecompositionFuel(new ItemStack(Item.coal), 2000*8);
        }
@@ -249,20 +275,27 @@ public class ChemiCraftCore extends ChemiCraft{
 
 
        private void apiProcessing(final FMLInitializationEvent event) {
-
-               for (int i = 0; i < api.getChemicalCellsName().sizeKeysList(); i++)
-               {
-                       for (int j = 0; j < api.getChemicalCellsName().sizeElementsList(api.getChemicalCellsName().getKeyList(i)); j++)
-                       {
-                               this.nameAuxiliary.addName(new ItemStack(itemChemicalCells, 0, i), api.getChemicalCellsLanguage().get(api.getChemicalCellsName().getKeyList(i), j), api.getChemicalCellsName().get(api.getChemicalCellsName().getKeyList(i), j));
+               Iterator<String> langItr = this.api.getCompoundsName().keySet().iterator();
+               while (langItr.hasNext()) {
+                       String lang = langItr.next();
+                       ArrayList<String> names = this.api.getCompoundsName().get(lang);
+                       for (int i = 0; i < names.size(); i++) {
+                               LanguageRegistry.instance().addNameForObject(
+                                               new ItemStack(this.itemCompounds, 1, i),
+                                               lang,
+                                               names.get(i));
                        }
                }
 
-               for (int i = 0; i < api.getCompoundsName().sizeKeysList(); i++)
-               {
-                       for (int j = 0; j < api.getCompoundsName().sizeElementsList(api.getCompoundsName().getKeyList(i)); j++)
-                       {
-                               this.nameAuxiliary.addName(new ItemStack(itemCompounds, 0, i), api.getCompoundsLang().get(api.getCompoundsName().getKeyList(i), j), api.getCompoundsName().get(api.getCompoundsName().getKeyList(i), j));
+               Iterator<String> langCellItr = this.api.getChemicalCellsName().keySet().iterator();
+               while (langCellItr.hasNext()) {
+                       String langCell = langCellItr.next();
+                       ArrayList<String> names = this.api.getChemicalCellsName().get(langCell);
+                       for (int i = 0; i < names.size(); i++) {
+                               LanguageRegistry.instance().addNameForObject(
+                                               new ItemStack(this.itemChemicalCells, 1, i),
+                                               langCell,
+                                               names.get(i));
                        }
                }
 
@@ -272,14 +305,6 @@ public class ChemiCraftCore extends ChemiCraft{
 
        private void debug(final FMLInitializationEvent event) {
                this.proxy.registerTickHandler();
-               this.api.addCompound("Debug");
-               this.api.settingCompoundHandler("Debug", new CompoundDebug());
-
-               this.api.addToolAndWeaponRecipe(new ItemStack[] {
-                               new ItemStack(Block.stone, 1, 1)
-               },
-               new ItemStack(Block.dirt, 1, 0));
-
        }
 
 }