OSDN Git Service

パッケージをpcc.chemicraft.*に変更
authormozipi <mozipi@users.sourceforge.jp>
Mon, 11 Feb 2013 02:07:13 +0000 (11:07 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Mon, 11 Feb 2013 02:07:13 +0000 (11:07 +0900)
83 files changed:
common/pcc/chemicraft/ChemiCraft.java [moved from common/chemicraft/ChemiCraft.java with 91% similarity]
common/pcc/chemicraft/ChemiCraftAPI.java [moved from common/chemicraft/ChemiCraftAPI.java with 70% similarity]
common/pcc/chemicraft/ChemiCraftData.java [moved from common/chemicraft/ChemiCraftData.java with 99% similarity]
common/pcc/chemicraft/block/BlockChemicalCombinationTable.java [moved from common/chemicraft/block/BlockChemicalCombinationTable.java with 92% similarity]
common/pcc/chemicraft/block/BlockChemicalCraftingTable.java [moved from common/chemicraft/block/BlockChemicalCraftingTable.java with 89% similarity]
common/pcc/chemicraft/block/BlockElectrolysisTable.java [moved from common/chemicraft/block/BlockElectrolysisTable.java with 88% similarity]
common/pcc/chemicraft/block/BlockPyrolysisTable.java [moved from common/chemicraft/block/BlockPyrolysisTable.java with 90% similarity]
common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java [moved from common/chemicraft/block/BlockToolAndWeaponCraftingTable.java with 89% similarity]
common/pcc/chemicraft/client/ClientProxy.java [moved from common/chemicraft/client/ClientProxy.java with 75% similarity]
common/pcc/chemicraft/compounds/CompoundDebug.java [moved from common/chemicraft/compounds/CompoundDebug.java with 94% similarity]
common/pcc/chemicraft/compounds/CompoundWater.java [moved from common/chemicraft/compounds/CompoundWater.java with 90% similarity]
common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java [moved from common/chemicraft/container/ContainerChemicalCombinationTable.java with 90% similarity]
common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java [moved from common/chemicraft/container/ContainerChemicalCraftingTable.java with 90% similarity]
common/pcc/chemicraft/container/ContainerElectrolysis.java [moved from common/chemicraft/container/ContainerElectrolysis.java with 81% similarity]
common/pcc/chemicraft/container/ContainerElectrolysisTable.java [moved from common/chemicraft/container/ContainerElectrolysisTable.java with 83% similarity]
common/pcc/chemicraft/container/ContainerPyrolysisTable.java [moved from common/chemicraft/container/ContainerPyrolysisTable.java with 85% similarity]
common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java [moved from common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java with 64% similarity]
common/pcc/chemicraft/debug/CommandDeleteItem.java [moved from common/chemicraft/debug/CommandDeleteItem.java with 98% similarity]
common/pcc/chemicraft/debug/CommandGenDebugRoom.java [moved from common/chemicraft/debug/CommandGenDebugRoom.java with 95% similarity]
common/pcc/chemicraft/debug/CommandSetTile.java [moved from common/chemicraft/debug/CommandSetTile.java with 98% similarity]
common/pcc/chemicraft/debug/CompoundHandlerTest.java [moved from common/chemicraft/debug/CompoundHandlerTest.java with 92% similarity]
common/pcc/chemicraft/debug/DebugData.java [moved from common/chemicraft/debug/DebugData.java with 89% similarity]
common/pcc/chemicraft/debug/DebugTick.java [moved from common/chemicraft/debug/DebugTick.java with 98% similarity]
common/pcc/chemicraft/debug/SetBlockSupport.java [moved from common/chemicraft/debug/SetBlockSupport.java with 99% similarity]
common/pcc/chemicraft/entity/EntityAtomsGrenade.java [moved from common/chemicraft/entity/EntityAtomsGrenade.java with 98% similarity]
common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java [moved from common/chemicraft/gui/GuiChemicalCombinationTable.java with 90% similarity]
common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java [moved from common/chemicraft/gui/GuiChemicalCraftingTable.java with 79% similarity]
common/pcc/chemicraft/gui/GuiElectrolysisTable.java [moved from common/chemicraft/gui/GuiElectrolysisTable.java with 79% similarity]
common/pcc/chemicraft/gui/GuiPyrolysisTable.java [moved from common/chemicraft/gui/GuiPyrolysisTable.java with 83% similarity]
common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java [moved from common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java with 77% similarity]
common/pcc/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java [moved from common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java with 98% similarity]
common/pcc/chemicraft/inventory/InventoryChemicalCombinationTableResult.java [moved from common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java with 98% similarity]
common/pcc/chemicraft/inventory/InventoryChemicalCraftingMaterial.java [moved from common/chemicraft/inventory/InventoryChemicalCraftingMaterial.java with 97% similarity]
common/pcc/chemicraft/inventory/InventoryChemicalCraftingNBT.java [moved from common/chemicraft/inventory/InventoryChemicalCraftingNBT.java with 97% similarity]
common/pcc/chemicraft/inventory/InventoryChemicalCraftingResult.java [moved from common/chemicraft/inventory/InventoryChemicalCraftingResult.java with 97% similarity]
common/pcc/chemicraft/inventory/InventoryElectrolysisFuel.java [moved from common/chemicraft/inventory/InventoryElectrolysisFuel.java with 97% similarity]
common/pcc/chemicraft/inventory/InventoryElectrolysisMaterial.java [moved from common/chemicraft/inventory/InventoryElectrolysisMaterial.java with 97% similarity]
common/pcc/chemicraft/inventory/InventoryElectrolysisResult.java [moved from common/chemicraft/inventory/InventoryElectrolysisResult.java with 97% similarity]
common/pcc/chemicraft/inventory/InventoryPyrolysisTableFuel.java [moved from common/chemicraft/inventory/InventoryPyrolysisTableFuel.java with 98% similarity]
common/pcc/chemicraft/inventory/InventoryPyrolysisTableMaterial.java [moved from common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java with 98% similarity]
common/pcc/chemicraft/inventory/InventoryPyrolysisTableResult.java [moved from common/chemicraft/inventory/InventoryPyrolysisTableResult.java with 98% similarity]
common/pcc/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java [moved from common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java with 98% similarity]
common/pcc/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java [moved from common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java with 98% similarity]
common/pcc/chemicraft/item/ItemAtomInfoContainer.java [moved from common/chemicraft/item/ItemAtomInfoContainer.java with 78% similarity]
common/pcc/chemicraft/item/ItemAtoms.java [moved from common/chemicraft/item/ItemAtoms.java with 94% similarity]
common/pcc/chemicraft/item/ItemAtomsGrenade.java [moved from common/chemicraft/item/ItemAtomsGrenade.java with 96% similarity]
common/pcc/chemicraft/item/ItemCompounds.java [moved from common/chemicraft/item/ItemCompounds.java with 97% similarity]
common/pcc/chemicraft/item/ItemGasCollectingBottle.java [moved from common/chemicraft/item/ItemGasCollectingBottle.java with 96% similarity]
common/pcc/chemicraft/render/RenderAtomsGrenade.java [moved from common/chemicraft/render/RenderAtomsGrenade.java with 95% similarity]
common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java [moved from common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java with 88% similarity]
common/pcc/chemicraft/slot/SlotChemicalCombinationTableResult.java [moved from common/chemicraft/slot/SlotChemicalCombinationTableResult.java with 93% similarity]
common/pcc/chemicraft/slot/SlotChemicalCraftingTableResult.java [moved from common/chemicraft/slot/SlotChemicalCraftingTableResult.java with 93% similarity]
common/pcc/chemicraft/slot/SlotDecompositionTableMaterial.java [moved from common/chemicraft/slot/SlotDecompositionTableMaterial.java with 90% similarity]
common/pcc/chemicraft/slot/SlotDecompositionTableResult.java [moved from common/chemicraft/slot/SlotDecompositionTableResult.java with 93% similarity]
common/pcc/chemicraft/slot/SlotElectrolysisFuel.java [moved from common/chemicraft/slot/SlotElectrolysisFuel.java with 90% similarity]
common/pcc/chemicraft/slot/SlotElectrolysisMaterial.java [moved from common/chemicraft/slot/SlotElectrolysisMaterial.java with 90% similarity]
common/pcc/chemicraft/slot/SlotElectrolysisResult.java [moved from common/chemicraft/slot/SlotElectrolysisResult.java with 90% similarity]
common/pcc/chemicraft/slot/SlotPyrolysisTableFuel.java [moved from common/chemicraft/slot/SlotPyrolysisTableFuel.java with 90% similarity]
common/pcc/chemicraft/slot/SlotPyrolysisTableMaterial.java [moved from common/chemicraft/slot/SlotPyrolysisTableMaterial.java with 90% similarity]
common/pcc/chemicraft/slot/SlotPyrolysisTableResult.java [moved from common/chemicraft/slot/SlotPyrolysisTableResult.java with 93% similarity]
common/pcc/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java [moved from common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java with 93% similarity]
common/pcc/chemicraft/system/ChemiCraftCraftingManager.java [moved from common/chemicraft/system/ChemiCraftCraftingManager.java with 54% similarity]
common/pcc/chemicraft/system/CommonProxy.java [moved from common/chemicraft/system/CommonProxy.java with 71% similarity]
common/pcc/chemicraft/system/PacketHandler.java [moved from common/chemicraft/system/PacketHandler.java with 94% similarity]
common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java [moved from common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java with 96% similarity]
common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java [moved from common/chemicraft/tileentity/TileEntityChemicalCraftingTable.java with 93% similarity]
common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java [moved from common/chemicraft/tileentity/TileEntityElectrolysisTable.java with 84% similarity]
common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java [moved from common/chemicraft/tileentity/TileEntityPyrolysisTable.java with 98% similarity]
common/pcc/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java [moved from common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java with 77% similarity]
common/pcc/chemicraft/util/AtomInfo.java [moved from common/chemicraft/util/AtomInfo.java with 99% similarity]
common/pcc/chemicraft/util/Auxiliary.java [moved from common/chemicraft/util/Auxiliary.java with 99% similarity]
common/pcc/chemicraft/util/ChemicalNBTRecipe.java [moved from common/chemicraft/util/ChemicalNBTRecipe.java with 88% similarity]
common/pcc/chemicraft/util/ChunkProviderChemical.java [moved from common/chemicraft/util/ChunkProviderChemical.java with 99% similarity]
common/pcc/chemicraft/util/ComparatorFormulaPart.java [moved from common/chemicraft/util/ComparatorFormulaPart.java with 94% similarity]
common/pcc/chemicraft/util/ComparatorItemStack.java [moved from common/chemicraft/util/ComparatorItemStack.java with 95% similarity]
common/pcc/chemicraft/util/CreativeTabAtoms.java [moved from common/chemicraft/util/CreativeTabAtoms.java with 88% similarity]
common/pcc/chemicraft/util/FormulaPart.java [moved from common/chemicraft/util/FormulaPart.java with 94% similarity]
common/pcc/chemicraft/util/ICompoundHandler.java [moved from common/chemicraft/util/ICompoundHandler.java with 97% similarity]
common/pcc/chemicraft/util/MaterialRecipe.java [moved from common/chemicraft/util/MaterialRecipe.java with 96% similarity]
common/pcc/chemicraft/util/MathHelperPlus.java [moved from common/chemicraft/util/MathHelperPlus.java with 95% similarity]
common/pcc/chemicraft/util/NBTRecipeGrenade.java [moved from common/chemicraft/util/NBTRecipeGrenade.java with 94% similarity]
common/pcc/chemicraft/util/WorldProviderChemical.java [moved from common/chemicraft/util/WorldProviderChemical.java with 87% similarity]
common/pcc/chemicraft/util/WorldTypeChemical.java [moved from common/chemicraft/util/WorldTypeChemical.java with 96% similarity]

similarity index 91%
rename from common/chemicraft/ChemiCraft.java
rename to common/pcc/chemicraft/ChemiCraft.java
index 7f8829a..32dac1c 100644 (file)
-package chemicraft;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.block.material.Material;\r
-import net.minecraft.client.audio.SoundManager;\r
-import net.minecraft.creativetab.CreativeTabs;\r
-import net.minecraft.item.Item;\r
-import net.minecraft.item.ItemStack;\r
-import net.minecraftforge.common.Configuration;\r
-import net.minecraftforge.common.Property;\r
-import chemicraft.block.BlockChemicalCombinationTable;\r
-import chemicraft.block.BlockChemicalCraftingTable;\r
-import chemicraft.block.BlockElectrolysisTable;\r
-import chemicraft.block.BlockPyrolysisTable;\r
-import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
-import chemicraft.compounds.CompoundDebug;\r
-import chemicraft.compounds.CompoundWater;\r
-import chemicraft.debug.CommandDeleteItem;\r
-import chemicraft.debug.CommandGenDebugRoom;\r
-import chemicraft.debug.CommandSetTile;\r
-import chemicraft.item.ItemAtoms;\r
-import chemicraft.item.ItemAtomsGrenade;\r
-import chemicraft.item.ItemCompounds;\r
-import chemicraft.item.ItemGasCollectingBottle;\r
-import chemicraft.system.CommonProxy;\r
-import chemicraft.system.PacketHandler;\r
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityElectrolysisTable;\r
-import chemicraft.tileentity.TileEntityPyrolysisTable;\r
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
-import chemicraft.util.Auxiliary;\r
-import chemicraft.util.Auxiliary.ArrayAuxiliary;\r
-import chemicraft.util.Auxiliary.NameAuxiliary;\r
-import chemicraft.util.CreativeTabAtoms;\r
-import chemicraft.util.NBTRecipeGrenade;\r
-import cpw.mods.fml.common.Mod;\r
-import cpw.mods.fml.common.SidedProxy;\r
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;\r
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;\r
-import cpw.mods.fml.common.event.FMLServerStartingEvent;\r
-import cpw.mods.fml.common.network.NetworkMod;\r
-import cpw.mods.fml.common.network.NetworkRegistry;\r
-import cpw.mods.fml.common.registry.GameRegistry;\r
-\r
-/**\r
- * ChemiCraft本体\r
- * @author P.C.C.\r
- *\r
- */\r
-@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")\r
-@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)\r
-public class ChemiCraft {\r
-\r
-       public static final String[] ATOMSNAME = {\r
-               "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon",\r
-               "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium",\r
-               "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium",\r
-               "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium",\r
-               "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",\r
-               "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium",\r
-               "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium",\r
-               "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" };\r
-\r
-       public static final String[] ATOMSNAMEJP = {\r
-               "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",\r
-               "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",\r
-               "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",\r
-               "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",\r
-               "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム",\r
-               "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" };\r
-\r
-       /**\r
-        * このmodのインスタンス\r
-        */\r
-       @Mod.Instance("chemiCraft")\r
-       public static ChemiCraft instance;\r
-\r
-       /**\r
-        * ChemiCraftのProxy.\r
-        */\r
-       @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.system.CommonProxy")\r
-       public static CommonProxy proxy;\r
-\r
-       /**\r
-        * ChemiCraftのCreativeTab.\r
-        */\r
-       public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");\r
-\r
-       /**\r
-        * ItemID.\r
-        */\r
-       public int atomsID;\r
-       public int compoundsID;\r
-       public int gasCollectingBottleID;\r
-       public int atomGrenadeID;\r
-\r
-       /**\r
-        * BlockID.\r
-        */\r
-       public int pyrolysisTableID;\r
-       public int chemicalConbinationTableID;\r
-       public int toolAndWeaponCraftingTableID;\r
-       public int chemicalCraftingTableID;\r
-       public int electrolysisTableID;\r
-\r
-       /**\r
-        * GUIID.\r
-        */\r
-       public int guiPyrolysisTableID;\r
-       public int guiChemicalCombinationTableID;\r
-       public int guiToolAndWeaponCraftingTableID;\r
-       public int guiChemicalCraftingTableID;\r
-       public int guiElectrolysisTableID;\r
-\r
-       /**\r
-        * Block型変数.\r
-        */\r
-       public Block blockPyrolysisTable;\r
-       public Block blockChemicalCombinationTable;\r
-       public Block blockToolAndWeaponCraftingTable;\r
-       public Block blockChemicalCraftingTable;\r
-       public Block blockElectrolysisTable;\r
-\r
-       /**\r
-        * Item型変数.\r
-        */\r
-       public Item itemAtoms;\r
-       public Item itemCompounds;\r
-       public Item itemGasCollectingBottle;\r
-       public Item itemAtomGrenade;\r
-\r
-       /**\r
-        * このmodで使用するTextureのパス.\r
-        */\r
-       public final String ITEM_ATOMS_TEXTURE = "/chemicraft/items/Atoms.png";\r
-       public final String ITEM_COMPOUNDS_TEXTURE = "/chemicraft/items/Compounds.png";\r
-       public final String ITEM_TEXTURE = "/chemicraft/items/items.png";\r
-       public final String BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE = "/chemicraft/blocks/cctable.png";\r
-       public final String GUI_PYROLYSIS_TEXTURE = "/chemicraft/guis/Pyrolysis.png";\r
-       public final String GUI_ELECTROLYSIS_TEXTURE = "/chemicraft/guis/Electrolysis.png";\r
-       public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/chemicraft/guis/ChemicalCombination.png";\r
-       public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
-       public final String GUI_CHEMICALCRAFTING_TEXTURE = "/chemicraft/guis/MaterialCrafting.png";\r
-\r
-       /**\r
-        * このmodに必要な補助クラスのインスタンス.\r
-        */\r
-       public Auxiliary auxiliary = new Auxiliary();\r
-       public NameAuxiliary nameAuxiliary = new NameAuxiliary();\r
-       public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary();\r
-\r
-       private ChemiCraftAPI api = ChemiCraftAPI.getInstance();\r
-       private ChemiCraftData chemicalData = new ChemiCraftData();\r
-\r
-       @Mod.PreInit\r
-       public void chemiPreLoadMethod(final FMLPreInitializationEvent event) {\r
-               Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
-               cfg.load();\r
-\r
-               Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400);\r
-               Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);\r
-               Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);\r
-               Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);\r
-               Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTableID", 2404);\r
-\r
-               Property atomsIDProp = cfg.getItem("AtomsID", 25000);\r
-               Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);\r
-               Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);\r
-               Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);\r
-\r
-               Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000);\r
-               Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);\r
-               Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);\r
-               Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003);\r
-               Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableID", 1004);\r
-\r
-\r
-               this.pyrolysisTableID = pyrolysisTableIDProp.getInt();\r
-               this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
-               this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
-               this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();\r
-               this.electrolysisTableID = electrolysisTableIDProp.getInt();\r
-               this.atomsID = atomsIDProp.getInt();\r
-               this.compoundsID = compoundsIDProp.getInt();\r
-               this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
-               this.atomGrenadeID = atomGrenadeIDProp.getInt();\r
-               this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();\r
-               this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();\r
-               this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();\r
-               this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();\r
-               this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt();\r
-\r
-               cfg.save();\r
-       }\r
-\r
-       @Mod.ServerStarting\r
-       public void serverStarting(final FMLServerStartingEvent event) {\r
-               event.registerServerCommand(new CommandSetTile());\r
-               event.registerServerCommand(new CommandDeleteItem());\r
-               event.registerServerCommand(new CommandGenDebugRoom());\r
-       }\r
-\r
-       @Mod.PostInit\r
-       public void chemiPostLoadMethod(final FMLPostInitializationEvent event) {\r
-               this.settingProcessing(event);\r
-               this.apiProcessing(event);\r
-               this.debug(event);\r
-       }\r
-\r
-       private void settingProcessing(final FMLPostInitializationEvent event) {\r
-\r
-               // Blockを追加します\r
-               this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("PyrolysisTable");\r
-               this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("ChemicalCombinationTable");\r
-               this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("ToolAndWeaponCraftingTable");\r
-               this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.chemicalCraftingTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("ChemicalCraftingTable");\r
-               this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("ElectrolysisTable");\r
-\r
-               // Itemを追加します\r
-               this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");\r
-               this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds");\r
-               this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0);\r
-               this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);\r
-\r
-               // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable");\r
-               GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");\r
-               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");\r
-               GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");\r
-               GameRegistry.registerBlock(this.blockElectrolysisTable, "BlockElectrolysisTable");\r
-\r
-               // Blockの名前を設定します\r
-               this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable");\r
-               this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台");\r
-               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable");\r
-               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台");\r
-               this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");\r
-               this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");\r
-               this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ChemicalCraftingTable");\r
-               this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ja_JP", "素材製作台");\r
-               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable");\r
-               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ja_JP", "電気分解台");\r
-\r
-               // Itemの名前を設定します\r
-               this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME);\r
-               this.nameAuxiliary.addName(this.itemAtoms, "ja_JP", ATOMSNAMEJP);\r
-               this.nameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle");\r
-               this.nameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶");\r
-               this.nameAuxiliary.addName(this.itemAtomGrenade, "AtomGrenade");\r
-               this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");\r
-\r
-               // TileEntityを追加します\r
-               GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable");\r
-               GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");\r
-               GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");\r
-               GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");\r
-               GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable");\r
-\r
-               // GUIを追加します\r
-               NetworkRegistry.instance().registerGuiHandler(instance, proxy);\r
-\r
-               // 描画関係の読み込み\r
-               proxy.registerRenderInformation();\r
-\r
-               //化学作業台類のレシピを追加します\r
-               GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable),\r
-                               new Object[]{\r
-                       "XYX", "ZAZ", "ZZZ",\r
-                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
-                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
-                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
-                       Character.valueOf('A'), new ItemStack(Item.bucketLava),\r
-               });\r
-               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
-                               new Object[]{\r
-                       "XYX", "ZAZ", "ZZZ",\r
-                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
-                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
-                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
-                       Character.valueOf('A'), new ItemStack(Block.obsidian),\r
-               });\r
-               GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable),\r
-                               new Object[]{\r
-                       "XYX", "ZAZ", "ZZZ",\r
-                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
-                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
-                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
-                       Character.valueOf('A'), new ItemStack(Item.pickaxeSteel),\r
-               });\r
-               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable),\r
-                               new Object[]{\r
-                       "XYX", "ZAZ", "ZZZ",\r
-                       Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
-                       Character.valueOf('Y'), new ItemStack(Block.workbench),\r
-                       Character.valueOf('Z'), new ItemStack(Block.stone),\r
-                       Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),\r
-               });\r
-\r
-               // 化合物を追加します\r
-               api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");\r
-               api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
-               api.addLangCompound("ja_JP", "Water", "水");\r
-
-\r
-               //化合物のHandlerを設定します\r
-               api.settingCompoundHandler("Water", new CompoundWater());\r
-\r
-               //化合物のレシピを追加します\r
-               api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water")));\r
-\r
-               //手榴弾の追加\r
-               api.addMaterialRecipe(new ItemStack[] {\r
-                               null,\r
-                               new ItemStack(Block.stone),\r
-                               null,\r
-                               new ItemStack(Block.stone),\r
-                               new ItemStack(Item.gunpowder),\r
-                               new ItemStack(Block.stone),\r
-                               null,\r
-                               new ItemStack(Block.stone),\r
-                               null\r
-               },\r
-               new ItemStack(this.itemAtomGrenade, 16, 0),\r
-               new NBTRecipeGrenade()\r
-                               );\r
-\r
-               api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0),\r
-                               new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},\r
-                               new int[] {2, 1});\r
-\r
-               api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, api.getCompound("Water")),\r
-                               new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},\r
-                               new int[] {2, 1});\r
-\r
-               api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8);\r
-       }\r
-\r
-       private void apiProcessing(final FMLPostInitializationEvent event) {\r
-               // API用の処理\r
-               this.nameAuxiliary.addName(itemCompounds, api.getInstance().getCompoundsName().toArray());\r
-               for (int i = 0; i < api.getCompoundsLang().size(); i++) {\r
-                       this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getInstance().getCompoundsLangName().toArray());\r
-               }\r
-       }\r
-\r
-       private void debug(final FMLPostInitializationEvent event) {\r
-               //DebugTickingの追加\r
-               this.proxy.registerTickHandler();\r
-               api.addCompound("Debug");\r
-               this.api.settingCompoundHandler("Debug", new CompoundDebug());\r
-       }\r
-\r
-}\r
+package pcc.chemicraft;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.Configuration;
+import net.minecraftforge.common.Property;
+import pcc.chemicraft.block.BlockChemicalCombinationTable;
+import pcc.chemicraft.block.BlockChemicalCraftingTable;
+import pcc.chemicraft.block.BlockElectrolysisTable;
+import pcc.chemicraft.block.BlockPyrolysisTable;
+import pcc.chemicraft.block.BlockToolAndWeaponCraftingTable;
+import pcc.chemicraft.compounds.CompoundDebug;
+import pcc.chemicraft.compounds.CompoundWater;
+import pcc.chemicraft.debug.CommandDeleteItem;
+import pcc.chemicraft.debug.CommandGenDebugRoom;
+import pcc.chemicraft.debug.CommandSetTile;
+import pcc.chemicraft.item.ItemAtoms;
+import pcc.chemicraft.item.ItemAtomsGrenade;
+import pcc.chemicraft.item.ItemCompounds;
+import pcc.chemicraft.item.ItemGasCollectingBottle;
+import pcc.chemicraft.system.CommonProxy;
+import pcc.chemicraft.system.PacketHandler;
+import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+import pcc.chemicraft.util.Auxiliary;
+import pcc.chemicraft.util.Auxiliary.ArrayAuxiliary;
+import pcc.chemicraft.util.Auxiliary.NameAuxiliary;
+import pcc.chemicraft.util.CreativeTabAtoms;
+import pcc.chemicraft.util.NBTRecipeGrenade;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+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.GameRegistry;
+
+/**
+ * ChemiCraft本体
+ * @author P.C.C.
+ *
+ */
+@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")
+@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)
+public class ChemiCraft {
+
+       public static final String[] ATOMSNAME = {
+               "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon",
+               "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium",
+               "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium",
+               "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium",
+               "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",
+               "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium",
+               "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium",
+               "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" };
+
+       public static final String[] ATOMSNAMEJP = {
+               "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",
+               "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",
+               "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",
+               "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",
+               "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム",
+               "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" };
+
+       /**
+        * このmodのインスタンス
+        */
+       @Mod.Instance("chemiCraft")
+       public static ChemiCraft instance;
+
+       /**
+        * ChemiCraftのProxy.
+        */
+       @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.system.CommonProxy")
+       public static CommonProxy proxy;
+
+       /**
+        * ChemiCraftのCreativeTab.
+        */
+       public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");
+
+       /**
+        * ItemID.
+        */
+       public int atomsID;
+       public int compoundsID;
+       public int gasCollectingBottleID;
+       public int atomGrenadeID;
+
+       /**
+        * BlockID.
+        */
+       public int pyrolysisTableID;
+       public int chemicalConbinationTableID;
+       public int toolAndWeaponCraftingTableID;
+       public int chemicalCraftingTableID;
+       public int electrolysisTableID;
+
+       /**
+        * GUIID.
+        */
+       public int guiPyrolysisTableID;
+       public int guiChemicalCombinationTableID;
+       public int guiToolAndWeaponCraftingTableID;
+       public int guiChemicalCraftingTableID;
+       public int guiElectrolysisTableID;
+
+       /**
+        * Block型変数.
+        */
+       public Block blockPyrolysisTable;
+       public Block blockChemicalCombinationTable;
+       public Block blockToolAndWeaponCraftingTable;
+       public Block blockChemicalCraftingTable;
+       public Block blockElectrolysisTable;
+
+       /**
+        * Item型変数.
+        */
+       public Item itemAtoms;
+       public Item itemCompounds;
+       public Item itemGasCollectingBottle;
+       public Item itemAtomGrenade;
+
+       /**
+        * このmodで使用するTextureのパス.
+        */
+       public final String ITEM_ATOMS_TEXTURE = "/chemicraft/items/Atoms.png";
+       public final String ITEM_COMPOUNDS_TEXTURE = "/chemicraft/items/Compounds.png";
+       public final String ITEM_TEXTURE = "/chemicraft/items/items.png";
+       public final String BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE = "/chemicraft/blocks/cctable.png";
+       public final String GUI_PYROLYSIS_TEXTURE = "/chemicraft/guis/Pyrolysis.png";
+       public final String GUI_ELECTROLYSIS_TEXTURE = "/chemicraft/guis/Electrolysis.png";
+       public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/chemicraft/guis/ChemicalCombination.png";
+       public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/chemicraft/guis/ToolAndWeaponCrafting.png";
+       public final String GUI_CHEMICALCRAFTING_TEXTURE = "/chemicraft/guis/MaterialCrafting.png";
+
+       /**
+        * このmodに必要な補助クラスのインスタンス.
+        */
+       public Auxiliary auxiliary = new Auxiliary();
+       public NameAuxiliary nameAuxiliary = new NameAuxiliary();
+       public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary();
+
+       private ChemiCraftAPI api = ChemiCraftAPI.getInstance();
+       private ChemiCraftData chemicalData = new ChemiCraftData();
+
+       @Mod.PreInit
+       public void chemiPreLoadMethod(final FMLPreInitializationEvent event) {
+               Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
+               cfg.load();
+
+               Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400);
+               Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);
+               Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);
+               Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);
+               Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTableID", 2404);
+
+               Property atomsIDProp = cfg.getItem("AtomsID", 25000);
+               Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);
+               Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);
+               Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);
+
+               Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000);
+               Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);
+               Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);
+               Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003);
+               Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableID", 1004);
+
+
+               this.pyrolysisTableID = pyrolysisTableIDProp.getInt();
+               this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();
+               this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();
+               this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();
+               this.electrolysisTableID = electrolysisTableIDProp.getInt();
+               this.atomsID = atomsIDProp.getInt();
+               this.compoundsID = compoundsIDProp.getInt();
+               this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
+               this.atomGrenadeID = atomGrenadeIDProp.getInt();
+               this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();
+               this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();
+               this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();
+               this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();
+               this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt();
+
+               cfg.save();
+       }
+
+       @Mod.ServerStarting
+       public void serverStarting(final FMLServerStartingEvent event) {
+               event.registerServerCommand(new CommandSetTile());
+               event.registerServerCommand(new CommandDeleteItem());
+               event.registerServerCommand(new CommandGenDebugRoom());
+       }
+
+       @Mod.PostInit
+       public void chemiPostLoadMethod(final FMLPostInitializationEvent event) {
+               this.settingProcessing(event);
+               this.apiProcessing(event);
+               this.debug(event);
+       }
+
+       private void settingProcessing(final FMLPostInitializationEvent event) {
+
+               // Blockを追加します
+               this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground).
+                               setHardness(2.0F).
+                               setResistance(0.0F).
+                               setStepSound(Block.soundStoneFootstep).
+                               setBlockName("PyrolysisTable");
+               this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).
+                               setHardness(2.0F).
+                               setResistance(0.0F).
+                               setStepSound(Block.soundStoneFootstep).
+                               setBlockName("ChemicalCombinationTable");
+               this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).
+                               setHardness(2.0F).
+                               setResistance(0.0F).
+                               setStepSound(Block.soundStoneFootstep).
+                               setBlockName("ToolAndWeaponCraftingTable");
+               this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.chemicalCraftingTableID, 0, Material.ground).
+                               setHardness(2.0F).
+                               setResistance(0.0F).
+                               setStepSound(Block.soundStoneFootstep).
+                               setBlockName("ChemicalCraftingTable");
+               this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground).
+                               setHardness(2.0F).
+                               setResistance(0.0F).
+                               setStepSound(Block.soundStoneFootstep).
+                               setBlockName("ElectrolysisTable");
+
+               // Itemを追加します
+               this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");
+               this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds");
+               this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0);
+               this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);
+
+               // BlockをMinecraftに登録します
+               GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable");
+               GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");
+               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");
+               GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");
+               GameRegistry.registerBlock(this.blockElectrolysisTable, "BlockElectrolysisTable");
+
+               // Blockの名前を設定します
+               this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable");
+               this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台");
+               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable");
+               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台");
+               this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");
+               this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");
+               this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ChemicalCraftingTable");
+               this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ja_JP", "素材製作台");
+               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable");
+               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ja_JP", "電気分解台");
+
+               // Itemの名前を設定します
+               this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME);
+               this.nameAuxiliary.addName(this.itemAtoms, "ja_JP", ATOMSNAMEJP);
+               this.nameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle");
+               this.nameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶");
+               this.nameAuxiliary.addName(this.itemAtomGrenade, "AtomGrenade");
+               this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");
+
+               // TileEntityを追加します
+               GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable");
+               GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");
+               GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");
+               GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");
+               GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable");
+
+               // GUIを追加します
+               NetworkRegistry.instance().registerGuiHandler(instance, proxy);
+
+               // 描画関係の読み込み
+               proxy.registerRenderInformation();
+
+               //化学作業台類のレシピを追加します
+               GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable),
+                               new Object[]{
+                       "XYX", "ZAZ", "ZZZ",
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),
+                       Character.valueOf('Z'), new ItemStack(Block.stone),
+                       Character.valueOf('A'), new ItemStack(Item.bucketLava),
+               });
+               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),
+                               new Object[]{
+                       "XYX", "ZAZ", "ZZZ",
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),
+                       Character.valueOf('Z'), new ItemStack(Block.stone),
+                       Character.valueOf('A'), new ItemStack(Block.obsidian),
+               });
+               GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable),
+                               new Object[]{
+                       "XYX", "ZAZ", "ZZZ",
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),
+                       Character.valueOf('Z'), new ItemStack(Block.stone),
+                       Character.valueOf('A'), new ItemStack(Item.pickaxeSteel),
+               });
+               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable),
+                               new Object[]{
+                       "XYX", "ZAZ", "ZZZ",
+                       Character.valueOf('X'), new ItemStack(Item.ingotIron),
+                       Character.valueOf('Y'), new ItemStack(Block.workbench),
+                       Character.valueOf('Z'), new ItemStack(Block.stone),
+                       Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),
+               });
+
+               // 化合物を追加します
+               api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
+               api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
+               api.addLangCompound("ja_JP", "Water", "水");
+
+
+               //化合物のHandlerを設定します
+               api.settingCompoundHandler("Water", new CompoundWater());
+
+               //化合物のレシピを追加します
+               api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water")));
+
+               //手榴弾の追加
+               api.addMaterialRecipe(new ItemStack[] {
+                               null,
+                               new ItemStack(Block.stone),
+                               null,
+                               new ItemStack(Block.stone),
+                               new ItemStack(Item.gunpowder),
+                               new ItemStack(Block.stone),
+                               null,
+                               new ItemStack(Block.stone),
+                               null
+               },
+               new ItemStack(this.itemAtomGrenade, 16, 0),
+               new NBTRecipeGrenade()
+                               );
+
+               api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0),
+                               new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},
+                               new int[] {2, 1});
+
+               api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, api.getCompound("Water")),
+                               new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},
+                               new int[] {2, 1});
+
+               api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8);
+       }
+
+       private void apiProcessing(final FMLPostInitializationEvent event) {
+               // API用の処理
+               this.nameAuxiliary.addName(itemCompounds, api.getInstance().getCompoundsName().toArray());
+               for (int i = 0; i < api.getCompoundsLang().size(); i++) {
+                       this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getInstance().getCompoundsLangName().toArray());
+               }
+       }
+
+       private void debug(final FMLPostInitializationEvent event) {
+               //DebugTickingの追加
+               this.proxy.registerTickHandler();
+               api.addCompound("Debug");
+               this.api.settingCompoundHandler("Debug", new CompoundDebug());
+
+               /*
+                * TWDebug
+                */
+               api.addToolAndWeaponRecipe(new ItemStack[] {
+                               new ItemStack(Block.stone, 1, 1)
+               },
+               new ItemStack(Block.dirt, 1, 0));
+       }
+
+}
similarity index 70%
rename from common/chemicraft/ChemiCraftAPI.java
rename to common/pcc/chemicraft/ChemiCraftAPI.java
index a538fed..2110f73 100644 (file)
@@ -1,14 +1,14 @@
-package chemicraft;
+package pcc.chemicraft;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
 import net.minecraft.item.ItemStack;
-import chemicraft.system.ChemiCraftCraftingManager;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-import chemicraft.util.ChemicalNBTRecipe;
-import chemicraft.util.ICompoundHandler;
-import chemicraft.util.MaterialRecipe;
+import pcc.chemicraft.system.ChemiCraftCraftingManager;
+import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
+import pcc.chemicraft.util.ChemicalNBTRecipe;
+import pcc.chemicraft.util.ICompoundHandler;
+import pcc.chemicraft.util.MaterialRecipe;
 
 /**
  * ChemiCraftのAPI
@@ -90,6 +90,24 @@ public class ChemiCraftAPI {
        private ChemiCraftCraftingManager chemiCraftCraftingManager = new ChemiCraftCraftingManager();
 
 
+       /**
+        * ツール&武器作成台の素材一覧のリスト
+        */
+       private ArrayList<ItemStack[]> toolAndWeaponMaterials = new ArrayList<ItemStack[]>();
+
+
+       /**
+        * ツール&武器作成台の結果のリスト
+        */
+       private ArrayList<ItemStack> toolAndWeaponResult = new ArrayList<ItemStack>();
+
+
+       /**
+        * ツール&武器作成台の不定形であるか
+        */
+       private ArrayList<Boolean> toolAndWeaponSharpless = new ArrayList<Boolean>();
+
+
 
        /**
         * add compound.
@@ -151,6 +169,12 @@ public class ChemiCraftAPI {
 
 
 
+       /**
+        * 分解台のレシピを追加します
+        * @param material 素材
+        * @param results 原子の元素番号の配列
+        * @param stacks 原子のできる数の配列
+        */
        public void addDecompositionRecipe(ItemStack material, int[] results, int[] stacks) {
                ItemStack[] itemstacks = new ItemStack[results.length];
                for (int i = 0; i < itemstacks.length; i++) {
@@ -161,18 +185,60 @@ public class ChemiCraftAPI {
 
 
 
+       /**
+        * 分解台の燃料を追加します
+        * @param itemstack 燃料のItemStack
+        * @param burnTime 燃焼時間(tick * rate)
+        */
        public void addDecompositionFuel(ItemStack itemstack, int burnTime) {
                TileEntityPyrolysisTable.addFuel(itemstack, burnTime);
        }
 
 
 
+       /**
+        * ツール&武器作成台のレシピを追加します
+        * @param materials 素材
+        * @param result 結果
+        */
+       public void addToolAndWeaponRecipe(ItemStack[] materials, ItemStack result) {
+               toolAndWeaponMaterials.add(materials);
+               toolAndWeaponResult.add(result);
+               toolAndWeaponSharpless.add(false);
+       }
+
+
+       /**
+        * ツール&武器作成台の不定形レシピを追加します
+        * @param materials 素材
+        * @param result 結果
+        */
+       public void addSharplessToolAndWeaponRecipe(ItemStack[] materials, ItemStack result) {
+               toolAndWeaponMaterials.add(materials);
+               toolAndWeaponResult.add(result);
+               toolAndWeaponSharpless.add(true);
+       }
+
+
+
+       /**
+        * 素材作成台の不定形レシピを追加します
+        * @param materials 素材
+        * @param result 結果
+        * @param nbtRecipe NBT(Nullの場合はなし)
+        */
        public void addSharplessMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){
                materialRecipe.add(new MaterialRecipe(result, materials, nbtRecipe, true));
        }
 
 
 
+       /**
+        * 素材作成台のレシピを追加します
+        * @param materials 素材
+        * @param result 結果
+        * @param nbtRecipe NBT(Nullの場合はなし)
+        */
        public void addMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){
                materialRecipe.add(new MaterialRecipe(result, materials, nbtRecipe, false));
        }
@@ -238,6 +304,24 @@ public class ChemiCraftAPI {
 
 
 
+       public ArrayList<ItemStack[]> getToolAndWeaponMaterials() {
+               return toolAndWeaponMaterials;
+       }
+
+
+
+       public ArrayList<ItemStack> getToolAndWeaponResult() {
+               return toolAndWeaponResult;
+       }
+
+
+
+       public ArrayList<Boolean> getToolAndWeaponSharpless() {
+               return toolAndWeaponSharpless;
+       }
+
+
+
        public ChemiCraftCraftingManager getCraftingManager(){
                return chemiCraftCraftingManager;
        }
similarity index 99%
rename from common/chemicraft/ChemiCraftData.java
rename to common/pcc/chemicraft/ChemiCraftData.java
index 8dab814..2601196 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft;
+package pcc.chemicraft;
 
 public final class ChemiCraftData {
 
@@ -1,12 +1,12 @@
-package chemicraft.block;
+package pcc.chemicraft.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 
 public class BlockChemicalCombinationTable extends BlockContainer {
 
@@ -1,12 +1,12 @@
-package chemicraft.block;
+package pcc.chemicraft.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 
 public class BlockChemicalCraftingTable extends BlockContainer {
 
@@ -1,12 +1,12 @@
-package chemicraft.block;
+package pcc.chemicraft.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 
 public class BlockElectrolysisTable extends BlockContainer
 {
@@ -1,13 +1,13 @@
-package chemicraft.block;
+package pcc.chemicraft.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.debug.DebugTick;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.debug.DebugTick;
+import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 
 public class BlockPyrolysisTable extends BlockContainer {
 
@@ -1,12 +1,12 @@
-package chemicraft.block;
+package pcc.chemicraft.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class BlockToolAndWeaponCraftingTable extends BlockContainer {
 
similarity index 75%
rename from common/chemicraft/client/ClientProxy.java
rename to common/pcc/chemicraft/client/ClientProxy.java
index 5ec9032..185c406 100644 (file)
@@ -1,24 +1,24 @@
-package chemicraft.client;
+package pcc.chemicraft.client;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
-import chemicraft.ChemiCraft;
-import chemicraft.debug.DebugTick;
-import chemicraft.entity.EntityAtomsGrenade;
-import chemicraft.gui.GuiChemicalCombinationTable;
-import chemicraft.gui.GuiChemicalCraftingTable;
-import chemicraft.gui.GuiElectrolysisTable;
-import chemicraft.gui.GuiPyrolysisTable;
-import chemicraft.gui.GuiToolAndWeaponCraftingTable;
-import chemicraft.render.RenderAtomsGrenade;
-import chemicraft.system.CommonProxy;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.debug.DebugTick;
+import pcc.chemicraft.entity.EntityAtomsGrenade;
+import pcc.chemicraft.gui.GuiChemicalCombinationTable;
+import pcc.chemicraft.gui.GuiChemicalCraftingTable;
+import pcc.chemicraft.gui.GuiElectrolysisTable;
+import pcc.chemicraft.gui.GuiPyrolysisTable;
+import pcc.chemicraft.gui.GuiToolAndWeaponCraftingTable;
+import pcc.chemicraft.render.RenderAtomsGrenade;
+import pcc.chemicraft.system.CommonProxy;
+import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;
@@ -1,11 +1,11 @@
-package chemicraft.compounds;
+package pcc.chemicraft.compounds;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityLargeFireball;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import chemicraft.util.ICompoundHandler;
+import pcc.chemicraft.util.ICompoundHandler;
 
 public class CompoundDebug implements ICompoundHandler {
 
@@ -1,10 +1,10 @@
-package chemicraft.compounds;
+package pcc.chemicraft.compounds;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import chemicraft.util.ICompoundHandler;
+import pcc.chemicraft.util.ICompoundHandler;
 
 public class CompoundWater implements ICompoundHandler {
 
@@ -1,4 +1,4 @@
-package chemicraft.container;
+package pcc.chemicraft.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -6,13 +6,13 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftAPI;
-import chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
-import chemicraft.inventory.InventoryChemicalCombinationTableResult;
-import chemicraft.slot.SlotChemicalCombinationTableMaterial;
-import chemicraft.slot.SlotChemicalCombinationTableResult;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraftAPI;
+import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
+import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult;
+import pcc.chemicraft.slot.SlotChemicalCombinationTableMaterial;
+import pcc.chemicraft.slot.SlotChemicalCombinationTableResult;
+import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import cpw.mods.fml.common.network.PacketDispatcher;
 
 public class ContainerChemicalCombinationTable extends Container {
@@ -1,4 +1,4 @@
-package chemicraft.container;
+package pcc.chemicraft.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -6,14 +6,14 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftAPI;
-import chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import chemicraft.inventory.InventoryChemicalCraftingNBT;
-import chemicraft.inventory.InventoryChemicalCraftingResult;
-import chemicraft.slot.SlotChemicalCraftingTableResult;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.util.ChemicalNBTRecipe;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraftAPI;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
+import pcc.chemicraft.slot.SlotChemicalCraftingTableResult;
+import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.util.ChemicalNBTRecipe;
 
 public class ContainerChemicalCraftingTable extends Container {
 
@@ -1,16 +1,16 @@
-package chemicraft.container;
+package pcc.chemicraft.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.inventory.InventoryElectrolysisFuel;
-import chemicraft.inventory.InventoryElectrolysisMaterial;
-import chemicraft.inventory.InventoryElectrolysisResult;
-import chemicraft.slot.SlotElectrolysisMaterial;
-import chemicraft.slot.SlotElectrolysisResult;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
+import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
+import pcc.chemicraft.inventory.InventoryElectrolysisResult;
+import pcc.chemicraft.slot.SlotElectrolysisMaterial;
+import pcc.chemicraft.slot.SlotElectrolysisResult;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 
 public class ContainerElectrolysis extends Container
 {
@@ -1,16 +1,15 @@
-package chemicraft.container;
+package pcc.chemicraft.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.inventory.InventoryElectrolysisFuel;
-import chemicraft.inventory.InventoryElectrolysisMaterial;
-import chemicraft.inventory.InventoryElectrolysisResult;
-import chemicraft.slot.SlotElectrolysisMaterial;
-import chemicraft.slot.SlotElectrolysisResult;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
+import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
+import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
+import pcc.chemicraft.inventory.InventoryElectrolysisResult;
+import pcc.chemicraft.slot.SlotElectrolysisMaterial;
+import pcc.chemicraft.slot.SlotElectrolysisResult;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 
 public class ContainerElectrolysisTable extends Container
 {
@@ -1,14 +1,14 @@
-package chemicraft.container;
+package pcc.chemicraft.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.slot.SlotPyrolysisTableFuel;
-import chemicraft.slot.SlotPyrolysisTableMaterial;
-import chemicraft.slot.SlotPyrolysisTableResult;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.slot.SlotPyrolysisTableFuel;
+import pcc.chemicraft.slot.SlotPyrolysisTableMaterial;
+import pcc.chemicraft.slot.SlotPyrolysisTableResult;
+import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 
 public class ContainerPyrolysisTable extends Container {
 
@@ -1,11 +1,14 @@
-package chemicraft.container;
+package pcc.chemicraft.container;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.world.World;
-import chemicraft.slot.SlotToolAndWeaponCraftingTableResult;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+import pcc.chemicraft.ChemiCraftAPI;
+import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial;
+import pcc.chemicraft.slot.SlotToolAndWeaponCraftingTableResult;
+import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class ContainerToolAndWeaponCraftingTable extends Container {
 
@@ -24,10 +27,12 @@ public class ContainerToolAndWeaponCraftingTable extends Container {
                this.posX = this.tileentity.xCoord;
                this.posY = this.tileentity.yCoord;
                this.posZ = this.tileentity.zCoord;
+               this.tileentity.invm.setEventHandler(this);
+               this.tileentity.invr.setEventHandler(this);
 
                for (int i = 0; i < 3; i++) {
                        for (int j = 0; j < 3; j++) {
-                               this.addSlotToContainer(new Slot(this.tileentity.invm, i * 3 + i, 30 + i * 18, 17 + j * 18));
+                               this.addSlotToContainer(new Slot(this.tileentity.invm, i * 3 + j, 30 + i * 18, 17 + j * 18));
                        }
                }
 
@@ -50,6 +55,13 @@ public class ContainerToolAndWeaponCraftingTable extends Container {
        }
 
        @Override
+       public void onCraftMatrixChanged(IInventory par1IInventory){
+               if (par1IInventory instanceof InventoryToolAndWeaponCraftingTableMaterial) {
+                       this.tileentity.invr.setInventorySlotContents(0, ChemiCraftAPI.getInstance().getCraftingManager().getToolAndWeaponCraftingResult(this.tileentity.invm));
+               }
+       }
+
+       @Override
        public boolean canInteractWith(EntityPlayer var1) {
                return true;
        }
@@ -1,4 +1,4 @@
-package chemicraft.debug;
+package pcc.chemicraft.debug;
 
 import java.util.Iterator;
 import java.util.List;
@@ -1,4 +1,4 @@
-package chemicraft.debug;
+package pcc.chemicraft.debug;
 
 import net.minecraft.block.Block;
 import net.minecraft.command.CommandBase;
@@ -1,4 +1,4 @@
-package chemicraft.debug;
+package pcc.chemicraft.debug;
 
 import net.minecraft.block.Block;
 import net.minecraft.command.CommandBase;
@@ -1,10 +1,10 @@
-package chemicraft.debug;
+package pcc.chemicraft.debug;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import chemicraft.util.ICompoundHandler;
+import pcc.chemicraft.util.ICompoundHandler;
 
 public class CompoundHandlerTest implements ICompoundHandler {
 
similarity index 89%
rename from common/chemicraft/debug/DebugData.java
rename to common/pcc/chemicraft/debug/DebugData.java
index 7af7876..cec3c67 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft.debug;
+package pcc.chemicraft.debug;
 
 public class DebugData {
 
similarity index 98%
rename from common/chemicraft/debug/DebugTick.java
rename to common/pcc/chemicraft/debug/DebugTick.java
index 1e1edde..87a6605 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft.debug;
+package pcc.chemicraft.debug;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -1,4 +1,4 @@
-package chemicraft.debug;
+package pcc.chemicraft.debug;
 import java.util.Random;
 
 import net.minecraft.world.World;
@@ -1,12 +1,12 @@
-package chemicraft.gui;
+package pcc.chemicraft.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.container.ContainerChemicalCombinationTable;
+import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import cpw.mods.fml.common.network.PacketDispatcher;
 
 public class GuiChemicalCombinationTable extends GuiContainer {
@@ -1,10 +1,10 @@
-package chemicraft.gui;
+package pcc.chemicraft.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.container.ContainerChemicalCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -1,10 +1,9 @@
-package chemicraft.gui;
+package pcc.chemicraft.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerElectrolysisTable;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
+import pcc.chemicraft.container.ContainerElectrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 
 public class GuiElectrolysisTable extends GuiContainer
 {
@@ -1,10 +1,10 @@
-package chemicraft.gui;
+package pcc.chemicraft.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerPyrolysisTable;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.container.ContainerPyrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 
 public class GuiPyrolysisTable extends GuiContainer{
 
@@ -1,10 +1,10 @@
-package chemicraft.gui;
+package pcc.chemicraft.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class GuiToolAndWeaponCraftingTable extends GuiContainer {
 
@@ -1,4 +1,4 @@
-package chemicraft.inventory;
+package pcc.chemicraft.inventory;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -1,4 +1,4 @@
-package chemicraft.inventory;
+package pcc.chemicraft.inventory;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -1,4 +1,4 @@
-package chemicraft.inventory;
+package pcc.chemicraft.inventory;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -1,4 +1,4 @@
-package chemicraft.inventory;
+package pcc.chemicraft.inventory;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -1,7 +1,7 @@
-package chemicraft.item;
+package pcc.chemicraft.item;
 
 import net.minecraft.item.Item;
-import chemicraft.util.AtomInfo;
+import pcc.chemicraft.util.AtomInfo;
 
 public class ItemAtomInfoContainer extends Item {
 
similarity index 94%
rename from common/chemicraft/item/ItemAtoms.java
rename to common/pcc/chemicraft/item/ItemAtoms.java
index ad1b147..0a32c3b 100644 (file)
@@ -1,11 +1,11 @@
-package chemicraft.item;
+package pcc.chemicraft.item;
 
 import java.util.List;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraft;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -1,4 +1,4 @@
-package chemicraft.item;
+package pcc.chemicraft.item;
 
 import java.util.List;
 
@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
-import chemicraft.entity.EntityAtomsGrenade;
+import pcc.chemicraft.entity.EntityAtomsGrenade;
 
 public class ItemAtomsGrenade extends Item {
 
similarity index 97%
rename from common/chemicraft/item/ItemCompounds.java
rename to common/pcc/chemicraft/item/ItemCompounds.java
index 17d6514..c493bf0 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft.item;
+package pcc.chemicraft.item;
 
 import java.util.List;
 
@@ -8,8 +8,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftAPI;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraftAPI;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -1,13 +1,13 @@
-package chemicraft.item;
+package pcc.chemicraft.item;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFire;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftAPI;
-import chemicraft.util.MathHelperPlus;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraftAPI;
+import pcc.chemicraft.util.MathHelperPlus;
 
 public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 {
@@ -1,4 +1,4 @@
-package chemicraft.render;
+package pcc.chemicraft.render;
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
@@ -7,8 +7,8 @@ import net.minecraft.entity.Entity;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import chemicraft.ChemiCraft;
-import chemicraft.entity.EntityAtomsGrenade;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.entity.EntityAtomsGrenade;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -1,9 +1,9 @@
-package chemicraft.slot;
+package pcc.chemicraft.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraft;
 
 public class SlotChemicalCombinationTableMaterial extends Slot {
 
@@ -1,4 +1,4 @@
-package chemicraft.slot;
+package pcc.chemicraft.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
@@ -1,4 +1,4 @@
-package chemicraft.slot;
+package pcc.chemicraft.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
@@ -1,4 +1,4 @@
-package chemicraft.slot;
+package pcc.chemicraft.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
@@ -1,4 +1,4 @@
-package chemicraft.slot;
+package pcc.chemicraft.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
@@ -1,4 +1,4 @@
-package chemicraft.slot;
+package pcc.chemicraft.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
@@ -1,4 +1,4 @@
-package chemicraft.slot;
+package pcc.chemicraft.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
@@ -1,4 +1,4 @@
-package chemicraft.slot;
+package pcc.chemicraft.slot;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
@@ -1,21 +1,65 @@
-package chemicraft.system;
+package pcc.chemicraft.system;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import chemicraft.ChemiCraftAPI;
-import chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import chemicraft.inventory.InventoryChemicalCraftingNBT;
-import chemicraft.inventory.InventoryChemicalCraftingResult;
-import chemicraft.util.ChemicalNBTRecipe;
-import chemicraft.util.ComparatorFormulaPart;
-import chemicraft.util.FormulaPart;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraftAPI;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
+import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial;
+import pcc.chemicraft.util.ChemicalNBTRecipe;
+import pcc.chemicraft.util.ComparatorFormulaPart;
+import pcc.chemicraft.util.ComparatorItemStack;
+import pcc.chemicraft.util.FormulaPart;
 
 public class ChemiCraftCraftingManager {
 
-       public ItemStack[] getDecompositionResults(IInventory par1IInventory){
+       public ItemStack getToolAndWeaponCraftingResult(InventoryToolAndWeaponCraftingTableMaterial par1IInventory){
+               ChemiCraftAPI api = ChemiCraftAPI.getInstance();
+               ArrayList<ItemStack[]> materials = api.getToolAndWeaponMaterials();
+               ArrayList<ItemStack> result = api.getToolAndWeaponResult();
+               ArrayList<Boolean> sharpless = api.getToolAndWeaponSharpless();
+
+               ItemStack[] slotItems = new ItemStack[par1IInventory.getSizeInventory()];
+               for (int i = 0; i < par1IInventory.getSizeInventory(); i++) {
+                       slotItems[i] = (par1IInventory.getStackInSlot(i));
+               }
+
+               label1 :
+                       for (int i = 0; i < materials.size(); i++) {
+                               if (sharpless.get(i)) {
+                                       slotItems = ChemiCraft.instance.arrayAuxiliary.deleteNull(slotItems);
+                                       Collections.sort(materials, new ComparatorItemStack());
+                                       Arrays.sort(slotItems, new ComparatorItemStack());
+                                       if (materials.size() != slotItems.length) continue label1;
+
+                                       for (int j = 0; j < materials.size(); j++) {
+                                               if (materials.get(i)[j].itemID != slotItems[j].itemID) {
+                                                       if (materials.get(i)[j].getItemDamage() != slotItems[j].getItemDamage()) {
+                                                               continue label1;
+                                                       }
+                                               }
+                                       }
+                                       return result.get(i);
+                               } else {
+                                       slotItems = ChemiCraft.instance.arrayAuxiliary.deleteNull(slotItems);
+                                       if (materials.get(i).length != slotItems.length) continue label1;
+
+                                       for (int j = 0; j < materials.size(); j++) {
+                                               if (materials.get(i)[j].itemID != slotItems[j].itemID) {
+                                                       if (materials.get(i)[j].getItemDamage() != slotItems[j].getItemDamage()) {
+                                                               continue label1;
+                                                       }
+                                               }
+                                       }
+                                       return result.get(i);
+                               }
+                       }
                return null;
        }
 
similarity index 71%
rename from common/chemicraft/system/CommonProxy.java
rename to common/pcc/chemicraft/system/CommonProxy.java
index 7edcb3a..0782c6f 100644 (file)
@@ -1,19 +1,19 @@
-package chemicraft.system;
+package pcc.chemicraft.system;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import chemicraft.container.ContainerChemicalCombinationTable;
-import chemicraft.container.ContainerChemicalCraftingTable;
-import chemicraft.container.ContainerElectrolysisTable;
-import chemicraft.container.ContainerPyrolysisTable;
-import chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import chemicraft.debug.DebugTick;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+import pcc.chemicraft.container.ContainerChemicalCombinationTable;
+import pcc.chemicraft.container.ContainerChemicalCraftingTable;
+import pcc.chemicraft.container.ContainerElectrolysisTable;
+import pcc.chemicraft.container.ContainerPyrolysisTable;
+import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
+import pcc.chemicraft.debug.DebugTick;
+import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.registry.TickRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -1,4 +1,4 @@
-package chemicraft.system;
+package pcc.chemicraft.system;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -10,12 +10,12 @@ import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
+import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
@@ -1,4 +1,4 @@
-package chemicraft.tileentity;
+package pcc.chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 import java.util.ArrayList;
@@ -11,12 +11,12 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftData;
-import chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
-import chemicraft.inventory.InventoryChemicalCombinationTableResult;
-import chemicraft.system.PacketHandler;
-import chemicraft.util.ComparatorItemStack;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraftData;
+import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
+import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult;
+import pcc.chemicraft.system.PacketHandler;
+import pcc.chemicraft.util.ComparatorItemStack;
 
 import com.google.common.io.ByteArrayDataInput;
 
@@ -1,4 +1,4 @@
-package chemicraft.tileentity;
+package pcc.chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
@@ -8,10 +8,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-import chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import chemicraft.inventory.InventoryChemicalCraftingNBT;
-import chemicraft.inventory.InventoryChemicalCraftingResult;
-import chemicraft.system.PacketHandler;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
+import pcc.chemicraft.system.PacketHandler;
 
 import com.google.common.io.ByteArrayDataInput;
 
@@ -1,13 +1,13 @@
-package chemicraft.tileentity;
+package pcc.chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-import chemicraft.inventory.InventoryElectrolysisFuel;
-import chemicraft.inventory.InventoryElectrolysisMaterial;
-import chemicraft.inventory.InventoryElectrolysisResult;
+import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
+import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
+import pcc.chemicraft.inventory.InventoryElectrolysisResult;
 
 public class TileEntityElectrolysisTable extends TileEntity
 {
@@ -1,4 +1,4 @@
-package chemicraft.tileentity;
+package pcc.chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 import java.util.HashMap;
@@ -11,10 +11,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-import chemicraft.inventory.InventoryPyrolysisTableFuel;
-import chemicraft.inventory.InventoryPyrolysisTableMaterial;
-import chemicraft.inventory.InventoryPyrolysisTableResult;
-import chemicraft.system.PacketHandler;
+import pcc.chemicraft.inventory.InventoryPyrolysisTableFuel;
+import pcc.chemicraft.inventory.InventoryPyrolysisTableMaterial;
+import pcc.chemicraft.inventory.InventoryPyrolysisTableResult;
+import pcc.chemicraft.system.PacketHandler;
 
 import com.google.common.io.ByteArrayDataInput;
 
@@ -1,10 +1,10 @@
-package chemicraft.tileentity;
+package pcc.chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
 import net.minecraft.tileentity.TileEntity;
-import chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial;
-import chemicraft.inventory.InventoryToolAndWeaponCraftingTableResult;
+import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial;
+import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableResult;
 
 import com.google.common.io.ByteArrayDataInput;
 
similarity index 99%
rename from common/chemicraft/util/AtomInfo.java
rename to common/pcc/chemicraft/util/AtomInfo.java
index ccc5f01..822dea3 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
similarity index 99%
rename from common/chemicraft/util/Auxiliary.java
rename to common/pcc/chemicraft/util/Auxiliary.java
index fbd32a4..309675d 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -1,4 +1,4 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import net.minecraft.item.ItemStack;
 
@@ -1,4 +1,4 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE;
 import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT;
@@ -1,7 +1,7 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import net.minecraft.creativetab.CreativeTabs;
-import chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraft;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
similarity index 94%
rename from common/chemicraft/util/FormulaPart.java
rename to common/pcc/chemicraft/util/FormulaPart.java
index 1786cd4..9067c91 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 public class FormulaPart {
 
@@ -1,4 +1,4 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
similarity index 96%
rename from common/chemicraft/util/MaterialRecipe.java
rename to common/pcc/chemicraft/util/MaterialRecipe.java
index 872d7bb..eebf6da 100644 (file)
@@ -1,11 +1,11 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
 import net.minecraft.item.ItemStack;
-import chemicraft.ChemiCraft;
-import chemicraft.inventory.InventoryChemicalCraftingMaterial;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
 
 public class MaterialRecipe {
 
similarity index 95%
rename from common/chemicraft/util/MathHelperPlus.java
rename to common/pcc/chemicraft/util/MathHelperPlus.java
index 775a77e..aaacea7 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -1,10 +1,10 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftData;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.ChemiCraftData;
 
 public class NBTRecipeGrenade extends ChemicalNBTRecipe {
 
@@ -1,4 +1,4 @@
-package chemicraft.util;
+package pcc.chemicraft.util;
 
 import net.minecraft.world.World;
 import net.minecraft.world.WorldType;