From 5d8a8231674a131fa01b511eaf3f5e4d3d6c2696 Mon Sep 17 00:00:00 2001 From: mozipi Date: Sat, 30 Mar 2013 19:58:35 +0900 Subject: [PATCH] tc --- common/pcc/chemicraft/ChemiCraftConfiguration.java | 2 +- common/pcc/chemicraft/base/ChemiCraftBase.java | 27 +++++++++++++-- .../chemicraft/base/ChemiCraftRegisterItem.java | 2 +- common/pcc/chemicraft/core/ChemiCraftAPI.java | 3 +- common/pcc/chemicraft/core/ChemiCraftCore.java | 28 ++++++++++------ .../chemicraft/core/debug/CompoundHandlerTest.java | 38 ---------------------- common/pcc/chemicraft/core/item/ItemCompounds.java | 2 +- 7 files changed, 48 insertions(+), 54 deletions(-) delete mode 100644 common/pcc/chemicraft/core/debug/CompoundHandlerTest.java diff --git a/common/pcc/chemicraft/ChemiCraftConfiguration.java b/common/pcc/chemicraft/ChemiCraftConfiguration.java index b872271..c4a08f2 100644 --- a/common/pcc/chemicraft/ChemiCraftConfiguration.java +++ b/common/pcc/chemicraft/ChemiCraftConfiguration.java @@ -13,7 +13,7 @@ public class ChemiCraftConfiguration { } public int additionID() { - return ++this.nowID; + return this.nowID++; } } diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java index dfa7dd1..cf7dbe2 100644 --- a/common/pcc/chemicraft/base/ChemiCraftBase.java +++ b/common/pcc/chemicraft/base/ChemiCraftBase.java @@ -1,5 +1,7 @@ package pcc.chemicraft.base; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -14,11 +16,15 @@ import pcc.chemicraft.base.creativetab.CreativeTabAtomOres; import pcc.chemicraft.base.system.CommonProxy; import pcc.chemicraft.base.system.PacketHandler; import pcc.chemicraft.core.ChemiCraftAPI; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.common.LoaderState.ModState; 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.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; @@ -127,6 +133,23 @@ public class ChemiCraftBase extends ChemiCraft break; } } + + Thread loadCheckThread = new Thread() { + @Override + public void run() { + while (true) { + List mod = Loader.instance().getModList(); + ModContainer finalMod = mod.get(mod.size()-1); + ModState finalModState = Loader.instance().getModState(finalMod); + if (finalModState == ModState.AVAILABLE) { + apiProcessing((FMLPostInitializationEvent) event); + break; + } + } + } + }; + loadCheckThread.start(); + } /** @@ -139,11 +162,11 @@ public class ChemiCraftBase extends ChemiCraft Configuration cfg = new Configuration(event.getSuggestedConfigurationFile()); cfg.load(); - Property baseBlockID = cfg.get("BlockID", "Base of Block ID", 2900); + Property baseBlockID = cfg.get("BlockID", "Base of Block ID", 2500); Property baseItemID = cfg.get("ItemID", "Base of Item ID", 25500); ChemiCraftConfiguration ccfgBlock = new ChemiCraftConfiguration(baseBlockID.getInt()); - ChemiCraftConfiguration ccfgItem = new ChemiCraftConfiguration(baseBlockID.getInt()); + ChemiCraftConfiguration ccfgItem = new ChemiCraftConfiguration(baseItemID.getInt()); for (int i = 0; i < atomOresID.length; i++) { this.atomOresID[i] = ccfgBlock.additionID(); diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java index 2982592..92eb001 100644 --- a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java +++ b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java @@ -17,7 +17,7 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister { /* * 代入 */ - this.mod.itemAtomGrenade = new ItemAtomsGrenade(this.mod.atomGrenadeID).setItemName("grenade").setIconIndex(1); + this.mod.itemAtomGrenade = new ItemAtomsGrenade(this.mod.atomGrenadeID).setItemName("grenade").setIconIndex(0); this.mod.itemDust = new ItemDust(this.mod.dustID).setItemName("dust").setIconIndex(12); this.mod.itemRadiationGun = new ItemRadiationGun(this.mod.radiationGunID).setIconIndex(4).setItemName("RadiationGun"); this.mod.itemRadiationBallet = new ItemRadiationBallet(this.mod.radiationBalletID).setIconIndex(5).setItemName("RadiationBallet"); diff --git a/common/pcc/chemicraft/core/ChemiCraftAPI.java b/common/pcc/chemicraft/core/ChemiCraftAPI.java index d70783e..49ebd56 100644 --- a/common/pcc/chemicraft/core/ChemiCraftAPI.java +++ b/common/pcc/chemicraft/core/ChemiCraftAPI.java @@ -1,6 +1,7 @@ package pcc.chemicraft.core; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import net.minecraft.item.Item; @@ -147,7 +148,7 @@ public class ChemiCraftAPI { chemicalCellsList.put( new ItemStack( par1ChemicalCell, - 0, + 1, chemicalCellsNameListHash.sizeKeysList()), par3OperationTime); addChemicalCellLanguage( diff --git a/common/pcc/chemicraft/core/ChemiCraftCore.java b/common/pcc/chemicraft/core/ChemiCraftCore.java index eaddef1..e062d58 100644 --- a/common/pcc/chemicraft/core/ChemiCraftCore.java +++ b/common/pcc/chemicraft/core/ChemiCraftCore.java @@ -5,6 +5,7 @@ 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; @@ -166,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(); @@ -178,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); @@ -242,6 +244,7 @@ public class ChemiCraftCore extends ChemiCraft{ ModState finalModState = Loader.instance().getModState(finalMod); if (finalModState == ModState.AVAILABLE) { apiProcessing((FMLInitializationEvent) event); + break; } } } @@ -263,7 +266,7 @@ public class ChemiCraftCore extends ChemiCraft{ NetworkRegistry.instance().registerGuiHandler(instance, proxy); //電池を追加します - this.api.addChemicalCell(itemChemicalCells, "ChemicalCell", 1000); + this.api.addChemicalCell(this.itemChemicalCells, "ChemicalCell", 1000); this.api.addChemicalCellLanguage("ja_JP", "化学電池"); this.api.addPyrolysisDecompositionFuel(new ItemStack(Item.coal), 2000*8); @@ -283,20 +286,25 @@ public class ChemiCraftCore extends ChemiCraft{ names.get(i)); } } + + Iterator langCellItr = this.api.getChemicalCellsName().keySet().iterator(); + while (langCellItr.hasNext()) { + String langCell = langCellItr.next(); + ArrayList 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)); + } + } + } 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)); - } } diff --git a/common/pcc/chemicraft/core/debug/CompoundHandlerTest.java b/common/pcc/chemicraft/core/debug/CompoundHandlerTest.java deleted file mode 100644 index 8c1f509..0000000 --- a/common/pcc/chemicraft/core/debug/CompoundHandlerTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package pcc.chemicraft.core.debug; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import pcc.chemicraft.util.ICompoundHandler; - - -public class CompoundHandlerTest implements ICompoundHandler { - - @Override - public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World, - EntityPlayer par3EntityPlayer) { - System.out.println("onRightClick"); - return par1ItemStack; - } - - @Override - public boolean onItemUseHandler(ItemStack par1ItemStack, - EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, - int par6, int par7, float par8, float par9, float par10) { - System.out.println("onItemUse"); - return true; - } - - @Override - public void onUpdateHandler(ItemStack par1ItemStack, World par2World, - Entity par3Entity, int par4, boolean par5) { - System.out.println("onUpdate"); - } - - @Override - public int getIconIndexHandler() { - return 0; - } - -} diff --git a/common/pcc/chemicraft/core/item/ItemCompounds.java b/common/pcc/chemicraft/core/item/ItemCompounds.java index 69f6210..c0d8bfb 100644 --- a/common/pcc/chemicraft/core/item/ItemCompounds.java +++ b/common/pcc/chemicraft/core/item/ItemCompounds.java @@ -75,7 +75,7 @@ public class ItemCompounds extends Item { @SideOnly(Side.CLIENT) @Override public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List){ - for(int type = 0; type < ChemiCraftAPI.instance().getCompoundsName().sizeKeysList(); type++) + for(int type = 0; type < ChemiCraftAPI.instance().getCompoundsName().get("en_US").size(); type++) { par3List.add(new ItemStack(par1, 1, type)); this.setIconIndex(type); -- 2.11.0