OSDN Git Service

修正用
authorponkotate <ponkotate@users.sourceforge.jp>
Sun, 3 Feb 2013 09:33:29 +0000 (18:33 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Sun, 3 Feb 2013 09:33:29 +0000 (18:33 +0900)
94 files changed:
common/chemicraft/ChemiCraft.java [deleted file]
common/chemicraft/block/BlockPyrolysisTable.java [deleted file]
common/chemicraft/client/ClientProxy.java [deleted file]
common/chemicraft/compounds/CompoundWater.java [deleted file]
common/chemicraft/container/ContainerChemicalCombinationTable.java [deleted file]
common/chemicraft/container/ContainerChemicalCraftingTable.java [deleted file]
common/chemicraft/container/ContainerElectrolysisTable.java [deleted file]
common/chemicraft/container/ContainerPyrolysisTable.java [deleted file]
common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java [deleted file]
common/chemicraft/debug/CommandDeleteItem.java [deleted file]
common/chemicraft/debug/CommandGenDebugRoom.java [deleted file]
common/chemicraft/debug/CommandSetTile.java [deleted file]
common/chemicraft/debug/CompoundHandlerTest.java [deleted file]
common/chemicraft/debug/DebugData.java [deleted file]
common/chemicraft/debug/DebugTick.java [deleted file]
common/chemicraft/debug/SetBlockSupport.java [deleted file]
common/chemicraft/entity/EntityAtomsGrenade.java [deleted file]
common/chemicraft/gui/GuiChemicalCombinationTable.java [deleted file]
common/chemicraft/gui/GuiChemicalCraftingTable.java [deleted file]
common/chemicraft/gui/GuiElectrolysisTable.java [deleted file]
common/chemicraft/gui/GuiPyrolysisTable.java [deleted file]
common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java [deleted file]
common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java [deleted file]
common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java [deleted file]
common/chemicraft/inventory/InventoryChemicalCraftingMaterial.java [deleted file]
common/chemicraft/inventory/InventoryChemicalCraftingNBT.java [deleted file]
common/chemicraft/inventory/InventoryChemicalCraftingResult.java [deleted file]
common/chemicraft/inventory/InventoryElectrolysisFuel.java [deleted file]
common/chemicraft/inventory/InventoryElectrolysisMaterial.java [deleted file]
common/chemicraft/inventory/InventoryElectrolysisResult.java [deleted file]
common/chemicraft/inventory/InventoryPyrolysisTableFuel.java [deleted file]
common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java [deleted file]
common/chemicraft/inventory/InventoryPyrolysisTableResult.java [deleted file]
common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java [deleted file]
common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java [deleted file]
common/chemicraft/item/ItemAtomInfoContainer.java [deleted file]
common/chemicraft/item/ItemAtoms.java [deleted file]
common/chemicraft/item/ItemAtomsGrenade.java [deleted file]
common/chemicraft/item/ItemCompounds.java [deleted file]
common/chemicraft/item/ItemGasCollectingBottle.java [deleted file]
common/chemicraft/render/RenderAtomsGrenade.java [deleted file]
common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java [deleted file]
common/chemicraft/slot/SlotChemicalCombinationTableResult.java [deleted file]
common/chemicraft/slot/SlotChemicalCraftingTableResult.java [deleted file]
common/chemicraft/slot/SlotDecompositionTableMaterial.java [deleted file]
common/chemicraft/slot/SlotDecompositionTableResult.java [deleted file]
common/chemicraft/slot/SlotElectrolysisFuel.java [deleted file]
common/chemicraft/slot/SlotElectrolysisMaterial.java [deleted file]
common/chemicraft/slot/SlotElectrolysisResult.java [deleted file]
common/chemicraft/slot/SlotPyrolysisTableFuel.java [deleted file]
common/chemicraft/slot/SlotPyrolysisTableMaterial.java [deleted file]
common/chemicraft/slot/SlotPyrolysisTableResult.java [deleted file]
common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java [deleted file]
common/chemicraft/system/ChemiCraftCraftingManager.java [deleted file]
common/chemicraft/system/CommonProxy.java [deleted file]
common/chemicraft/system/PacketHandler.java [deleted file]
common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java [deleted file]
common/chemicraft/tileentity/TileEntityChemicalCraftingTable.java [deleted file]
common/chemicraft/tileentity/TileEntityElectrolysisTable.java [deleted file]
common/chemicraft/tileentity/TileEntityPyrolysisTable.java [deleted file]
common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java [deleted file]
common/chemicraft/util/AtomInfo.java [deleted file]
common/chemicraft/util/Auxiliary.java [deleted file]
common/chemicraft/util/ChemicalNBTRecipe.java [deleted file]
common/chemicraft/util/ChunkProviderChemical.java [deleted file]
common/chemicraft/util/ComparatorFormulaPart.java [deleted file]
common/chemicraft/util/ComparatorItemStack.java [deleted file]
common/chemicraft/util/CreativeTabAtoms.java [deleted file]
common/chemicraft/util/FormulaPart.java [deleted file]
common/chemicraft/util/ICompoundHandler.java [deleted file]
common/chemicraft/util/MaterialRecipe.java [deleted file]
common/chemicraft/util/MathHelperPlus.java [deleted file]
common/chemicraft/util/NBTRecipeGrenade.java [deleted file]
common/chemicraft/util/WorldProviderChemical.java [deleted file]
common/chemicraft/util/WorldTypeChemical.java [deleted file]
resources/chemicraft/items/items.png
src/chemicraft/ChemiCraft.java
src/chemicraft/ChemiCraftAPI.java [moved from common/chemicraft/ChemiCraftAPI.java with 91% similarity]
src/chemicraft/ChemiCraftData.java [moved from common/chemicraft/ChemiCraftData.java with 100% similarity]
src/chemicraft/block/BlockChemicalCombinationTable.java [moved from common/chemicraft/block/BlockChemicalCombinationTable.java with 100% similarity]
src/chemicraft/block/BlockChemicalCraftingTable.java [moved from common/chemicraft/block/BlockChemicalCraftingTable.java with 100% similarity]
src/chemicraft/block/BlockDecompositionTable.java
src/chemicraft/block/BlockToolAndWeaponCraftingTable.java [moved from common/chemicraft/block/BlockToolAndWeaponCraftingTable.java with 100% similarity]
src/chemicraft/client/ClientProxy.java
src/chemicraft/container/ContainerDecompositionTable.java
src/chemicraft/debug/CommandDeleteItem.java
src/chemicraft/gui/GuiDecompositionTable.java
src/chemicraft/inventory/InventoryDecompositionTableMaterial.java
src/chemicraft/item/ItemGasCollectingBottle.java
src/chemicraft/system/CommonProxy.java
src/chemicraft/tileentity/TileEntityDecompositionTable.java
src/chemicraft/util/MathHelperPlus.java
アカウント関係.txt [deleted file]
仕様書/分解装置.odt

diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java
deleted file mode 100644 (file)
index 231b97f..0000000
+++ /dev/null
@@ -1,343 +0,0 @@
-package chemicraft;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.block.material.Material;\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.BlockPyrolysisTable;\r
-import chemicraft.block.BlockToolAndWeaponCraftingTable;\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.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
-\r
-       /**\r
-        * GUIID.\r
-        */\r
-       public int guiPyrolysisTableID;\r
-       public int guiChemicalCombinationTableID;\r
-       public int guiToolAndWeaponCraftingTableID;\r
-       public int guiChemicalCraftingTableID;\r
-\r
-       /**\r
-        * Block型変数.\r
-        */\r
-       public Block blockPyrolysisTable;\r
-       public Block blockChemicalCombinationTable;\r
-       public Block blockToolAndWeaponCraftingTable;\r
-       public Block blockChemicalCraftingTable;\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 String itemAtomsTexture = "/chemicraft/items/Atoms.png";\r
-       public String itemCompoundsTexture = "/chemicraft/items/Compounds.png";\r
-       public String itemTexture = "/chemicraft/items/items.png";\r
-       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/cctable.png";\r
-       public String guiPyrolysisTexture = "/chemicraft/guis/Pyrolysis.png";\r
-       public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png";\r
-       public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
-       public String guiChemicalCraftingTexture = "/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
-\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
-\r
-\r
-               this.pyrolysisTableID = pyrolysisTableIDProp.getInt();\r
-               this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
-               this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
-               this.chemicalCraftingTableID = chemicalCraftingTableIDProp.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
-\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(chemicalCraftingTableID, 0, Material.ground).\r
-                               setHardness(2.0F).\r
-                               setResistance(0.0F).\r
-                               setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("ChemicalCraftingTable");\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
-\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(blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");\r
-               this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");\r
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "ChemicalCraftingTable");\r
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "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
-\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
-               api.addCompound("Test");\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(\r
-                               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
-               //Tickingの追加\r
-               this.proxy.registerTickHandler();\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
-       }\r
-\r
-}\r
diff --git a/common/chemicraft/block/BlockPyrolysisTable.java b/common/chemicraft/block/BlockPyrolysisTable.java
deleted file mode 100644 (file)
index 728545f..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-package 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;
-
-public class BlockPyrolysisTable extends BlockContainer {
-
-       public BlockPyrolysisTable(int par1, int par2, Material par3Material) {
-               super(par1, par2, par3Material);
-               this.setCreativeTab(ChemiCraft.creativeTab);
-       }
-
-       @Override
-       public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9){
-               par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiPyrolysisTableID, par1World, par2, par3, par4);
-               return true;
-       }
-
-
-
-       @Override
-       public String getTextureFile(){
-               return ChemiCraft.instance.blockChemicalCraftingTableTexture;
-       }
-
-
-
-       @Override
-       public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) {
-               TileEntity tileentity = par1World.getBlockTileEntity(par2, par3, par4);
-               if (tileentity != null) {
-                       DebugTick.removeDebugData("PyrolysisTable" +
-                                       "(x:" + tileentity.xCoord +
-                                       " y:" + tileentity.yCoord +
-                                       " z:" + tileentity.zCoord + ")");
-               }
-               super.breakBlock(par1World, par2, par3, par4, par5, par6);
-       }
-
-
-
-       @Override
-       public int getBlockTextureFromSide(int par1)
-       {
-               if(par1 == 0){
-                       return 17;
-               }else if(par1 == 1){
-                       return 0;
-               }else{
-                       return 16;
-               }
-       }
-
-       @Override
-       public TileEntity createNewTileEntity(World var1) {
-               return new TileEntityPyrolysisTable();
-       }
-
-}
diff --git a/common/chemicraft/client/ClientProxy.java b/common/chemicraft/client/ClientProxy.java
deleted file mode 100644 (file)
index d001c82..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-package 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.gui.GuiPyrolysisTable;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.registry.TickRegistry;
-import cpw.mods.fml.relauncher.Side;
-
-public class ClientProxy extends CommonProxy {
-
-       @Override
-       public void registerRenderInformation() {
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.blockChemicalCraftingTableTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemAtomsTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemCompoundsTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCombinationTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiPyrolysisTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCraftingTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture);
-               RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F));
-       }
-
-
-       @Override
-       public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-               if (!world.blockExists(x, y, z))
-                       return null;
-
-               TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if (tileEntity instanceof TileEntityPyrolysisTable) {
-                       return new GuiPyrolysisTable(player, (TileEntityPyrolysisTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
-                       return new GuiChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){
-                       return new GuiToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
-                       return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
-               }
-               return null;
-       }
-
-
-       @Override
-       public World getClientWorld() {
-               return FMLClientHandler.instance().getClient().theWorld;
-       }
-
-       @Override
-       public void registerTickHandler() {
-               TickRegistry.registerTickHandler(new DebugTick(), Side.CLIENT);
-       }
-
-}
diff --git a/common/chemicraft/compounds/CompoundWater.java b/common/chemicraft/compounds/CompoundWater.java
deleted file mode 100644 (file)
index a009a6c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-package 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;
-
-public class CompoundWater implements ICompoundHandler {
-
-       @Override
-       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-               return null;
-       }
-
-       @Override
-       public boolean onItemUseHandler(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-               return false;
-       }
-
-       @Override
-       public void onUpdateHandler(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-
-       }
-
-       @Override
-       public int getIconIndexHandler() {
-               return 1;
-       }
-
-}
diff --git a/common/chemicraft/container/ContainerChemicalCombinationTable.java b/common/chemicraft/container/ContainerChemicalCombinationTable.java
deleted file mode 100644 (file)
index 26ebd93..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-package 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.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 cpw.mods.fml.common.network.PacketDispatcher;
-
-public class ContainerChemicalCombinationTable extends Container {
-
-       /**
-        * the world.
-        */
-       private World worldObj;
-
-       /**
-        * the TileEntity of Position.
-        */
-       private int posX;
-       private int posY;
-       private int posZ;
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityChemicalCombinationTable tileentity;
-
-       /**
-        * the Inventory's.
-        */
-       private InventoryChemicalCombinationTableMaterial invm;
-       private InventoryChemicalCombinationTableResult invr;
-
-       /**
-        * the EntityPlayer.
-        */
-       private EntityPlayer entityplayer;
-
-       public ContainerChemicalCombinationTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCombinationTable par2) {
-               super();
-               this.entityplayer = par1EntityPlayer;
-               this.tileentity = par2;
-               this.worldObj = tileentity.worldObj;
-               this.posX = tileentity.xCoord;
-               this.posY = tileentity.yCoord;
-               this.posZ = tileentity.zCoord;
-               this.invm = this.tileentity.getInvMaterial();
-               this.invr = this.tileentity.getInvResult();
-
-               for(int i = 0;i < 5;i++){
-                       for(int j = 0;j < 3;j++){
-                               this.addSlotToContainer(new SlotChemicalCombinationTableMaterial(this.invm, i * 3 + j, i * 18 + 16, j * 18 + 15));
-                       }
-               }
-               this.addSlotToContainer(new SlotChemicalCombinationTableResult(invr, 0, 123, 34));
-
-
-               int var3;
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 121 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 179));
-               }
-
-               this.invm.setEventHandler(this);
-               this.onCraftMatrixChanged(invm);
-       }
-
-
-
-       @Override
-       public void onCraftMatrixChanged(IInventory par1IInventory){
-               this.invr.setInventorySlotContents(0, ChemiCraftAPI.getInstance().getCraftingManager().getChemicalCombinationResult(this.tileentity.getAtomsList(), this.tileentity.getAtomsAmountList()));
-               if (par1IInventory instanceof InventoryChemicalCombinationTableResult) {
-                       PacketDispatcher.sendPacketToServer(this.tileentity.getDescriptionPacket());
-               }
-       }
-
-       @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer){
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.chemicalConbinationTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
-       }
-
-       @Override
-       public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) {
-               ItemStack var3 = null;
-               Slot var4 = (Slot)this.inventorySlots.get(par2);
-               Slot var6 = (Slot)this.inventorySlots.get(0);
-
-               if (var4 != null && var4.getHasStack()) {
-                       ItemStack var5 = var4.getStack();
-                       var3 = var5.copy();
-                       if (par2 >= 0 && par2 < 16) {
-                               if (!this.mergeItemStack(var5, 16, 52, false)) {
-                                       return null;
-                               }
-                       } else if (par2 >= 16 && par2 < 53) {
-                               if (var6.isItemValid(var3)) {
-                                       if (!this.mergeItemStack(var5, 0, 15, false)) {
-                                               return null;
-                                       }
-                               }
-                       } else if(par2 == 16) {
-                               if (!this.mergeItemStack(var5, 16, 52, false)) {
-                                       return null;
-                               }
-                       }
-
-                       if (var5.stackSize == 0) {
-                               var4.putStack((ItemStack)null);
-                       } else {
-                               var4.onSlotChanged();
-                       }
-
-                       if (var5.stackSize == var3.stackSize) {
-                               return null;
-                       }
-
-                       var4.onPickupFromSlot(par1EntityPlayer, var5);
-               }
-
-               return var3;
-       }
-
-       @Override
-       public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) {
-               if (par1 == 15) {
-                       if (this.invr.getStackInSlot(0) != null) {
-                               this.tileentity.emptytoAtomsList();
-                       }
-               }
-               return super.slotClick(par1, par2, par3, par4EntityPlayer);
-       }
-
-       @Override
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer){
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
-}
diff --git a/common/chemicraft/container/ContainerChemicalCraftingTable.java b/common/chemicraft/container/ContainerChemicalCraftingTable.java
deleted file mode 100644 (file)
index 017066f..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-package 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.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;
-
-public class ContainerChemicalCraftingTable extends Container {
-
-       /**
-        * Worldのインスタンス
-        */
-       private World worldObj;
-
-
-       /**
-        * BlockのX, Y, Z座標
-        */
-       private int posX;
-       private int posY;
-       private int posZ;
-
-
-       /**
-        * the TileEntity.
-        */
-       private TileEntityChemicalCraftingTable tileEntity;
-
-
-       private InventoryChemicalCraftingMaterial invm;
-       private InventoryChemicalCraftingResult invr;
-       private InventoryChemicalCraftingNBT invn;
-
-       private ChemicalNBTRecipe useNBT;
-
-
-
-       public ContainerChemicalCraftingTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCraftingTable par2)
-       {
-               super();
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-               this.tileEntity = par2;
-               this.invm = (InventoryChemicalCraftingMaterial) this.tileEntity.chemicalCraftingInvMaterial;
-               this.invr = (InventoryChemicalCraftingResult) this.tileEntity.chemicalCraftingInvResult;
-               this.invn = (InventoryChemicalCraftingNBT) this.tileEntity.chemicalCraftingInvNBT;
-               //GenerateInventory
-               this.generateSlots(this.invm, this.invr, this.invn);
-               //GeneratePlayerInventory
-               int var3;
-
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 85 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 143));
-               }
-
-               this.invm.setEventHandler(this);
-               this.invr.setEventHandler(this);
-               this.invn.setEventHandler(this);
-               this.onCraftMatrixChanged(invm);
-       }
-
-
-
-       @Override
-       public void onCraftMatrixChanged(IInventory par1IInventory){
-               this.useNBT = ChemiCraftAPI.getInstance().getCraftingManager().chemicalCrafting(this.invm, this.invr, this.invn);
-       }
-
-       @Override
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer){
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
-       @Override
-       public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer)
-       {
-               if(par1 == 12){
-                       if(this.invr.getStackInSlot(0) == null) return super.slotClick(par1, par2, par3, par4EntityPlayer);
-                       ItemStack var1 = par4EntityPlayer.inventory.getItemStack();
-                       if(var1 != null){
-                               if(var1.stackSize + this.invr.getStackInSlot(0).stackSize >= var1.getMaxStackSize()) return super.slotClick(par1, par2, par3, par4EntityPlayer);
-                       }
-                       for(int i = 0;i < this.invm.getSizeInventory();i++){
-                               if(this.invm.getStackInSlot(i) != null){
-                                       if(this.invm.getStackInSlot(i).stackSize > 1){
-                                               this.invm.getStackInSlot(i).stackSize--;
-                                       }else{
-                                               this.invm.setInventorySlotContents(i, null);
-                                       }
-                               }
-                       }
-                       ItemStack[] matchNBT = new ItemStack[this.invn.getSizeInventory()];
-                       for(int i = 0;i < this.invn.getSizeInventory();i++){
-                               matchNBT[i] = this.invn.getStackInSlot(i);
-                       }
-                       if(this.useNBT == null) return super.slotClick(par1, par2, par3, par4EntityPlayer);
-                       ItemStack[] useItems = this.useNBT.getMatchItems(matchNBT);
-                       for(int i = 0;i < useItems.length;i++){
-                               if(useItems[i] != null){
-                                       this.invn.setInventorySlotContents(i, null);
-                               }
-                       }
-               }
-               return super.slotClick(par1, par2, par3, par4EntityPlayer);
-       }
-
-       @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer){
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.chemicalCraftingTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
-       }
-
-
-
-       @Override
-       public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2){
-               return null;
-       }
-
-
-
-       private void generateSlots(IInventory materialInv, IInventory resultInv, IInventory nbtInv){
-               for(int i = 0;i < 3;i++){
-                       this.addSlotToContainer(new Slot(invn, i, 30 + 18 * i, 7));
-               }
-               for(int i = 0;i < 3;i++){
-                       for(int j = 0;j < 3;j++){
-                               this.addSlotToContainer(new Slot(invm, i * 3 + j, 30 + 18 * j, 27 + 18 * i));
-                       }
-               }
-               this.addSlotToContainer(new SlotChemicalCraftingTableResult(invr, 0, 123, 33));
-       }
-}
diff --git a/common/chemicraft/container/ContainerElectrolysisTable.java b/common/chemicraft/container/ContainerElectrolysisTable.java
deleted file mode 100644 (file)
index c6e5d50..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-package 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;
-
-public class ContainerElectrolysisTable extends Container
-{
-
-       private World worldObj;
-
-       private int posX;
-       private int posY;
-       private int posZ;
-
-       private TileEntityElectrolysisTable tileEntity;
-
-       private InventoryElectrolysisMaterial invm;
-       private InventoryElectrolysisResult invr;
-       private InventoryElectrolysisFuel invf;
-
-       public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
-               super();
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-               this.invm = (InventoryElectrolysisMaterial) this.tileEntity.getInvMaterial();
-               this.invr = (InventoryElectrolysisResult) this.tileEntity.getInvResult();
-               this.invf = (InventoryElectrolysisFuel) this.tileEntity.getInvFuel();
-
-               this.addSlotToContainer(new SlotElectrolysisMaterial(invm, 0, 123, 34));
-               for (int i = 0; i < 16; i++) {
-                       this.addSlotToContainer(new SlotElectrolysisResult(invr, i, 123, 34));
-               }
-               this.addSlotToContainer(new SlotElectrolysisResult(invf, 0, 123, 34));
-
-               int var3;
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 85 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 143));
-               }
-
-       }
-
-       @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer)
-       {
-               return true;
-               //return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.electrolysisTableID ? false : par1EntityPlayer.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) <= 64.0D;
-       }
-
-}
diff --git a/common/chemicraft/container/ContainerPyrolysisTable.java b/common/chemicraft/container/ContainerPyrolysisTable.java
deleted file mode 100644 (file)
index 83477d0..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-package 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;
-
-public class ContainerPyrolysisTable extends Container {
-
-       private World worldObj;
-
-       private int posX;
-       private int posY;
-       private int posZ;
-
-       private TileEntityPyrolysisTable tileentity;
-
-       public ContainerPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2){
-               super();
-               this.tileentity = par2;
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-
-               for (int i = 0; i < 4; i++) {
-                       for (int j = 0; j < 4; j++) {
-                               this.addSlotToContainer(new SlotPyrolysisTableResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
-                       }
-               }
-               this.addSlotToContainer(new SlotPyrolysisTableMaterial(this.tileentity.getInvMaterial(), 0, 27, 20));
-               this.addSlotToContainer(new SlotPyrolysisTableFuel(this.tileentity.getInvFuel(), 0, 27, 63));
-
-               int var3;
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 121 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 179));
-               }
-       }
-
-       @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer) {
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.pyrolysisTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
-       }
-
-}
diff --git a/common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java b/common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
deleted file mode 100644 (file)
index acadb79..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-package chemicraft.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-
-public class ContainerToolAndWeaponCraftingTable extends Container {
-
-       public ContainerToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2){
-               super();
-       }
-
-       @Override
-       public boolean canInteractWith(EntityPlayer var1) {
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/debug/CommandDeleteItem.java b/common/chemicraft/debug/CommandDeleteItem.java
deleted file mode 100644 (file)
index 50fa3d6..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-package chemicraft.debug;
-
-import java.util.Iterator;
-import java.util.List;
-
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.World;
-
-public class CommandDeleteItem extends CommandBase {
-
-       @Override
-       public String getCommandName() {
-               return "delItem";
-       }
-
-       @SuppressWarnings("unchecked")
-       @Override
-       public void processCommand(ICommandSender var1, String[] var2) {
-               MinecraftServer server = null;
-               EntityPlayerMP player = null;
-               try { server = (MinecraftServer)var1; } catch (ClassCastException e) {}
-               try{ player = (EntityPlayerMP)var1;} catch(ClassCastException e) {}
-
-               World world;
-               List<Entity> list;
-               Iterator<Entity> itr;
-
-               if(server != null){
-                       if(var2.length > 0){
-                               world = server.worldServerForDimension(Integer.parseInt(var2[0]));
-                               list = world.loadedEntityList;
-                               itr = list.iterator();
-                               while(itr.hasNext()){
-                                       Entity entity = itr.next();
-                                       if(entity instanceof EntityItem){
-                                               entity.setDead();
-                                       }
-                               }
-                       }else{
-                               var1.sendChatToPlayer("Please specify the World.");
-                       }
-               }else if(player != null){
-                       world = player.worldObj;
-                       list = world.loadedEntityList;
-                       itr = list.iterator();
-                       player.dimension = 128;
-                       while(itr.hasNext()){
-                               Entity entity = itr.next();
-                               if(entity instanceof EntityItem){
-                                       entity.setDead();
-                               }
-                       }
-               }else{
-                       var1.sendChatToPlayer("---Command Error---");
-               }
-
-       }
-
-}
diff --git a/common/chemicraft/debug/CommandGenDebugRoom.java b/common/chemicraft/debug/CommandGenDebugRoom.java
deleted file mode 100644 (file)
index 1d95976..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-package chemicraft.debug;
-
-import net.minecraft.block.Block;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-
-public class CommandGenDebugRoom extends CommandBase {
-
-       @Override
-       public String getCommandName() {
-               return "debugRoom";
-       }
-
-       @Override
-       public void processCommand(ICommandSender var1, String[] var2) {
-               try{
-                       EntityPlayer player = (EntityPlayer)var1;
-                       World wolrd = player.worldObj;
-
-                       SetBlockSupport.box(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Block.bedrock.blockID, 0, 20, 20, 6);
-               }catch(ClassCastException e){
-
-               }
-       }
-
-}
diff --git a/common/chemicraft/debug/CommandSetTile.java b/common/chemicraft/debug/CommandSetTile.java
deleted file mode 100644 (file)
index d7b4bfa..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-package chemicraft.debug;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.command.CommandBase;\r
-import net.minecraft.command.ICommandSender;\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.world.World;\r
-\r
-public class CommandSetTile extends CommandBase {\r
-\r
-       @Override\r
-       public String getCommandName() {\r
-               return "setTile";\r
-       }\r
-\r
-       @Override\r
-       public void processCommand(ICommandSender var1, String[] var2) {\r
-               try{\r
-                       EntityPlayer player = (EntityPlayer)var1;\r
-                       World wolrd = player.worldObj;\r
-                       if(var2.length > 0){\r
-                               try{\r
-                                       if(Integer.parseInt(var2[0]) < 4096 && Block.blocksList[Integer.parseInt(var2[0])] != null || Integer.parseInt(var2[0]) == 0){\r
-                                               if(var2.length == 1){\r
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), 12, 12);\r
-                                               }else if(var2.length > 2){\r
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), Integer.parseInt(var2[2]), Integer.parseInt(var2[2]));\r
-                                               }else{\r
-                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), 0, 12, 12);\r
-                                               }\r
-                                       }else{\r
-                                               var1.sendChatToPlayer("\u00a7cBlockが存在しないか指定された数が4096を超えています。");\r
-                                       }\r
-                               }catch(NumberFormatException e){\r
-                                       var1.sendChatToPlayer("\u00a7c指定された文字は数値ではありません。");\r
-                               }\r
-                       }else{\r
-                               var1.sendChatToPlayer("\u00a7cBlockIDを指定してください。(Metadata, Sizeも可能)");\r
-                       }\r
-               }catch(ClassCastException e){\r
-\r
-               }\r
-       }\r
-\r
-}\r
diff --git a/common/chemicraft/debug/CompoundHandlerTest.java b/common/chemicraft/debug/CompoundHandlerTest.java
deleted file mode 100644 (file)
index 3dbe818..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-package 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;
-
-public class CompoundHandlerTest implements ICompoundHandler {
-
-       @Override
-       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World,
-                       EntityPlayer par3EntityPlayer) {
-               System.out.println("onRightClick");
-               return par1ItemStack;
-       }
-
-       @Override
-       public boolean onItemUseHandler(ItemStack par1ItemStack,
-                       EntityPlayer par2EntityPlayer, World par3World, int par4, int par5,
-                       int par6, int par7, float par8, float par9, float par10) {
-               System.out.println("onItemUse");
-               return true;
-       }
-
-       @Override
-       public void onUpdateHandler(ItemStack par1ItemStack, World par2World,
-                       Entity par3Entity, int par4, boolean par5) {
-               System.out.println("onUpdate");
-       }
-
-       @Override
-       public int getIconIndexHandler() {
-               return 0;
-       }
-
-}
diff --git a/common/chemicraft/debug/DebugData.java b/common/chemicraft/debug/DebugData.java
deleted file mode 100644 (file)
index 7af7876..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-package chemicraft.debug;
-
-public class DebugData {
-
-       private String key;
-       private Object value;
-
-       public DebugData(String par1, Object par2) {
-               this.key = par1;
-               this.value = par2;
-       }
-
-       public String getKey() {
-               return this.key;
-       }
-
-       public Object getValue() {
-               return this.value;
-       }
-
-}
diff --git a/common/chemicraft/debug/DebugTick.java b/common/chemicraft/debug/DebugTick.java
deleted file mode 100644 (file)
index 1e1edde..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-package chemicraft.debug;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-import cpw.mods.fml.common.ITickHandler;
-import cpw.mods.fml.common.TickType;
-
-public class DebugTick extends JPanel implements ITickHandler {
-
-       private static HashMap<String, DebugData[]> displayDataList = new HashMap<String, DebugData[]>();
-
-       public DebugTick() {
-               JFrame frame = new JFrame();
-               frame.setSize(640, 480);
-               frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-               frame.add(this);
-               frame.setVisible(true);
-
-       }
-
-       @Override
-       public void tickStart(EnumSet<TickType> type, Object... tickData) {
-
-       }
-
-       @Override
-       public void tickEnd(EnumSet<TickType> type, Object... tickData) {
-               this.repaint();
-       }
-
-       @Override
-       public EnumSet<TickType> ticks() {
-               return EnumSet.of(TickType.GUI, TickType.CLIENT);
-       }
-
-       @Override
-       public String getLabel() {
-               return null;
-       }
-
-       @Override
-       public void paintComponent(Graphics g) {
-               Graphics2D g2 = (Graphics2D) g;
-
-               g2.clearRect(0, 0, this.getWidth(), this.getHeight());
-
-               int fontPos = 20;
-               Iterator<String> itKey = displayDataList.keySet().iterator();
-               while (itKey.hasNext()) {
-                       String key = itKey.next();
-                       DebugData[] datas = displayDataList.get(key);
-                       g2.setFont(new Font("MS ゴシック", Font.BOLD, 16));
-                       g2.setColor(Color.RED);
-                       g2.drawString(key + ":", 10, fontPos);
-                       g2.setFont(new Font("MS ゴシック", Font.PLAIN, 12));
-                       g2.setColor(Color.BLACK);
-
-                       fontPos += 16;
-
-                       for (int i = 0; i < datas.length; i++) {
-                               g2.drawString(String.valueOf(datas[i].getKey()) + ":" + String.valueOf(datas[i].getValue()), 10, fontPos);
-                               fontPos += 12;
-                       }
-
-                       fontPos += 4;
-
-               }
-       }
-
-       public static void setDebugData(String key, DebugData... value) {
-               displayDataList.put(key, value);
-       }
-
-       public static void removeDebugData(String key) {
-               displayDataList.remove(key);
-       }
-
-}
diff --git a/common/chemicraft/debug/SetBlockSupport.java b/common/chemicraft/debug/SetBlockSupport.java
deleted file mode 100644 (file)
index d9aded8..0000000
+++ /dev/null
@@ -1,596 +0,0 @@
-package chemicraft.debug;\r
-import java.util.Random;\r
-\r
-import net.minecraft.world.World;\r
-\r
-public class SetBlockSupport\r
-{\r
-\r
-       static Random rand = new Random();\r
-\r
-       /**\r
-        * X方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 長さ\r
-        * @param Direction 方向(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object lineX(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)\r
-       {\r
-               int loop2=0;\r
-               Object DataBox=null;\r
-               for(loop2=0;loop2 < Length;loop2++)\r
-               {\r
-                       switch(Direction)\r
-                       {\r
-                       default:\r
-\r
-                       case -1:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z, Block, meta);\r
-                               break;\r
-                       case 0:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X-(Length-1)+loop2,Y,Z,Block,meta);\r
-                               break;\r
-                       case 1:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X+loop2, Y, Z, Block,meta);\r
-                               break;\r
-                       }\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * Y方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 長さ\r
-        * @param Direction 方向(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object lineY(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)\r
-       {\r
-               int loop2=0;\r
-               Object DataBox=null;\r
-               for(loop2=0;loop2 < Length;loop2++)\r
-               {\r
-                       switch(Direction)\r
-                       {\r
-                       default:\r
-\r
-                       case -1:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y-loop2, Z, Block,meta);\r
-                               break;\r
-                       case 0:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X,Y-(Length-1)+loop2,Z,Block,meta);\r
-                               break;\r
-                       case 1:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y+loop2, Z, Block,meta);\r
-                               break;\r
-                       }\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * Z方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 長さ\r
-        * @param Direction 方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object lineZ(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int Direction)\r
-       {\r
-               int loop2=0;\r
-               Object DataBox=null;\r
-               for(loop2=0;loop2 < Length;loop2++)\r
-               {\r
-                       switch(Direction)\r
-                       {\r
-                       default:\r
-\r
-                       case -1:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z-loop2, Block,meta);\r
-                               break;\r
-                       case 0:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X,Y,Z-(Length-1)+loop2,Block,meta);\r
-                               break;\r
-                       case 1:\r
-                               DataBox = par1World.setBlockAndMetadataWithNotify(X, Y, Z+loop2, Block,meta);\r
-                               break;\r
-                       }\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * XY方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param XLength X方向の長さ\r
-        * @param YLength Y方向の長さ\r
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object  lineXY(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int YLength,int XDirection,int YDirection)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);\r
-               DataBox = lineY(par1World,X,Y,Z,Block,YLength,meta,YDirection);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * XZ方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param XLength X方向の長さ\r
-        * @param ZLength Y方向の長さ\r
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object  lineXZ(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int ZLength,int XDirection,int ZDirection)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);\r
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * YZ方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param YLength X方向の長さ\r
-        * @param ZLength Y方向の長さ\r
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object  lineYZ(World par1World,int X,int Y,int Z,int Block,int meta,int YLength,int ZLength,int YDirection,int ZDirection)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineY(par1World,X,Y,Z,Block,meta,YLength,YDirection);\r
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * XYZ方向に線状にBlockを配置します。\r
-        * Directionが0の場合、特殊な計算式で\r
-        * +,-方向:loop-1の長さになります。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param XLength X方向の長さ\r
-        * @param YLength Y方向の長さ\r
-        * @param ZLength Z方向の長さ\r
-        * @param XDirection X方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param YDirection Y方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @param ZDirection Z方向指定(+方向:1,-方向:-1,中心から-+の方向:0)\r
-        * @return Object\r
-        */\r
-       public static Object  lineXYZ(World par1World,int X,int Y,int Z,int Block,int meta,int XLength,int YLength,int ZLength,int XDirection,int YDirection,int ZDirection)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineX(par1World,X,Y,Z,Block,meta,XLength,XDirection);\r
-               DataBox = lineY(par1World,X,Y,Z,Block,meta,YLength,YDirection);\r
-               DataBox = lineZ(par1World,X,Y,Z,Block,meta,ZLength,ZDirection);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * X方向の壁を作成します。\r
-        * Directionは1で固定です。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 幅\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object wallX(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int height)\r
-       {\r
-               Object DataBox = null;\r
-               for(int loop = 0;loop < Length;loop++){\r
-                       lineY(par1World, X - (Length/2) + loop, Y, Z, Block,meta, height, 1);\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * Z方向の壁を作成します。\r
-        * Directionは1で固定です。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param Length 幅\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object wallZ(World par1World,int X,int Y,int Z,int Block,int meta,int Length,int height)\r
-       {\r
-               Object DataBox = null;\r
-               for(int loop = 0;loop < Length;loop++){\r
-                       lineY(par1World, X, Y, Z - (Length/2) + loop, Block,meta, height, 1);\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 辺だけの四角を作成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @return Object\r
-        */\r
-       public static Object spuareFrame(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ)\r
-       {\r
-               Object DataBox = null;\r
-               DataBox = lineX(par1World, X, Y, Z + (LengthZ/2), Block,meta, LengthX/2+1, 0);\r
-               DataBox = lineX(par1World, X, Y, Z - (LengthZ/2), Block,meta, LengthX/2+1, 0);\r
-               DataBox = lineZ(par1World, X + (LengthX/2), Y, Z, Block,meta, LengthZ/2+1, 0);\r
-               DataBox = lineZ(par1World, X - (LengthX/2), Y, Z, Block,meta, LengthZ/2+1, 0);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 辺だけの箱を作成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object boxFrame(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)\r
-       {\r
-               Object DataBox=null;\r
-               DataBox = lineX(par1World, X, Y, Z + (LengthZ/2), Block,meta, LengthX/2, 0);\r
-               DataBox = lineX(par1World, X, Y, Z - (LengthZ/2), Block,meta, LengthX/2, 0);\r
-               DataBox = lineX(par1World, X, Y + height-1, Z + (LengthZ/2), Block,meta, LengthX/2, 0);\r
-               DataBox = lineX(par1World, X, Y + height-1, Z - (LengthZ/2), Block,meta, LengthX/2, 0);\r
-\r
-               DataBox = lineY(par1World,X +(LengthX/2),Y,Z +(LengthZ/2),Block,meta,height,1);\r
-               DataBox = lineY(par1World,X -(LengthX/2),Y,Z +(LengthZ/2),Block,meta,height,1);\r
-               DataBox = lineY(par1World,X +(LengthX/2),Y,Z - (LengthZ/2),Block,meta,height,1);\r
-               DataBox = lineY(par1World,X -(LengthX/2),Y,Z - (LengthZ/2),Block,meta,height,1);\r
-\r
-               DataBox = lineZ(par1World, X + (LengthX/2), Y, Z, Block,meta, LengthZ/2, 0);\r
-               DataBox = lineZ(par1World, X - (LengthX/2), Y, Z, Block,meta, LengthZ/2, 0);\r
-               DataBox = lineZ(par1World, X + (LengthX/2), Y + height-1, Z, Block,meta, LengthZ/2, 0);\r
-               DataBox = lineZ(par1World, X - (LengthX/2), Y + height-1, Z, Block,meta, LengthZ/2, 0);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 四角を作成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @return Object\r
-        */\r
-       public static Object square(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ)\r
-       {\r
-               Object DataBox = null;\r
-               int loop1 = 0;\r
-               for(loop1=0; loop1 < LengthZ; loop1++){\r
-                       DataBox = lineX(par1World,X - (LengthX/2),Y,Z - (LengthZ/2) + loop1,Block,meta,LengthX,1);\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 箱を生成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object box(World par1World,int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)\r
-       {\r
-               Object DataBox = null;\r
-               DataBox = square(par1World, X, Y, Z, Block, meta,LengthX,LengthZ);\r
-               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);\r
-               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);\r
-               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);\r
-               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);\r
-               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * Blockで埋め尽くされた箱を生成します。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param LengthX X方向の長さ\r
-        * @param LengthZ  Z方向の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object fillBox(World par1World , int X,int Y,int Z,int Block,int meta,int LengthX,int LengthZ,int height)\r
-       {\r
-               Object DataBox = null;\r
-               DataBox = square(par1World, X, Y, Z, Block,meta, LengthX,LengthZ);\r
-               DataBox = square(par1World,X,Y+height,Z,Block,meta,LengthX,LengthZ);\r
-               DataBox = wallX(par1World,X,Y,Z-(LengthZ/2),Block,meta,LengthX,height);\r
-               DataBox = wallZ(par1World,X-(LengthX/2),Y,Z,Block,meta,LengthZ,height);\r
-               DataBox = wallX(par1World,X,Y,Z+(LengthZ/2),Block,meta,LengthX,height);\r
-               DataBox = wallZ(par1World,X+(LengthX/2),Y,Z,Block,meta,LengthZ,height);\r
-\r
-               for(int i = 0; i < LengthX - 1; i++)\r
-               {\r
-                       DataBox = wallZ(par1World,X + 1 - LengthX / 2 + i, Y , Z , Block ,meta,LengthZ, height);\r
-               }\r
-\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * 座標ごとにデータを指定して配置します。\r
-        * 配列になっているので、順番に指定してください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param XPosition 配置する相対X座標\r
-        * @param YPosition 配置する相対Y座標\r
-        * @param ZPosition 配置する相対Z座標\r
-        * @param Option\r
-        * @return Object\r
-        */\r
-       public static Object fineSetBlock(World par1World,int X,int Y,int Z,int[] Block,int[] meta,int[] XPosition,int[] YPosition,int[] ZPosition,Object[] Option){\r
-               Object DataBox = null;\r
-               for(int i=0;i<Block.length;i++){\r
-                       DataBox = par1World.setBlockAndMetadata(X+XPosition[i], Y+YPosition[i], Z+ZPosition[i], Block[i],meta[i]);\r
-               }\r
-\r
-               if(Option!=null){\r
-                       for(int j=0;j<Option.length;j++){\r
-                               DataBox = Option[j];\r
-                       }\r
-               }\r
-               return DataBox;\r
-       }\r
-\r
-       /**\r
-        * X方向に台形を作成します。\r
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param upperSide 上辺の長さ\r
-        * @param bottomSide 下辺の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object trapezoidX(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
-               Object dataBox = null;\r
-               int Rate=0;\r
-               int Math=0;\r
-               int XRate=0;\r
-               int YRate = 0;\r
-               for(int i=0;i<height;i++){\r
-                       YRate++;\r
-                       Math++;\r
-                       XRate++;\r
-                       if(upperSide < bottomSide){\r
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){\r
-                                       Rate++;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       if(bottomSide < upperSide){\r
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){\r
-                                       Rate--;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       dataBox=lineZ(par1World, X+XRate-1, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
-               }\r
-               return dataBox;\r
-       }\r
-\r
-       /**\r
-        * Y方向のXラインに台形を作成します。\r
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param upperSide 上辺の長さ\r
-        * @param bottomSide 下辺の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object trapezoidY_X(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
-               Object dataBox = null;\r
-               int Rate=0;\r
-               int Math=0;\r
-               int YRate = 0;\r
-               for(int i=0;i<height;i++){\r
-                       YRate++;\r
-                       Math++;\r
-                       if(upperSide < bottomSide){\r
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){\r
-                                       Rate++;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       if(bottomSide < upperSide){\r
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){\r
-                                       Rate--;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       dataBox=lineZ(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
-               }\r
-               return dataBox;\r
-       }\r
-\r
-       /**\r
-        * Y方向のZラインに台形を作成します。\r
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param upperSide 上辺の長さ\r
-        * @param bottomSide 下辺の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object trapezoidY_Z(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
-               Object dataBox = null;\r
-               int Rate=0;\r
-               int Math=0;\r
-               int YRate = 0;\r
-               for(int i=0;i<height;i++){\r
-                       YRate++;\r
-                       Math++;\r
-                       if(upperSide < bottomSide){\r
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){\r
-                                       Rate++;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       if(bottomSide < upperSide){\r
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){\r
-                                       Rate--;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       dataBox=lineX(par1World, X, Y+YRate, Z, Block, meta, upperSide+Rate, 0);\r
-               }\r
-               return dataBox;\r
-       }\r
-\r
-       /**\r
-        * Z方向に台形を作成します。\r
-        * 必ずbottom/(upper*3)*(height/upper)かupper/(bottom*3)*(height/buttom)が整数になるようにしてください。\r
-        * @param par1World\r
-        * @param X 基準X座標\r
-        * @param Y 基準Y座標\r
-        * @param Z 基準Z座標\r
-        * @param Block 配置するBlock\r
-        * @param meta 配置するMetadata\r
-        * @param upperSide 上辺の長さ\r
-        * @param bottomSide 下辺の長さ\r
-        * @param height 高さ\r
-        * @return Object\r
-        */\r
-       public static Object TrapezoidZ(World par1World,int X,int Y,int Z,int Block,int meta,int upperSide,int bottomSide,int height){\r
-               Object dataBox = null;\r
-               int Rate=0;\r
-               int Math=0;\r
-               int ZRate=0;\r
-               for(int i=0;i<height;i++){\r
-                       Math++;\r
-                       ZRate++;\r
-                       if(upperSide < bottomSide){\r
-                               if(Math == bottomSide/(upperSide*3)*(height/upperSide)){\r
-                                       Rate++;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       if(bottomSide < upperSide){\r
-                               if(Math == upperSide/(bottomSide*3)*(height/bottomSide)){\r
-                                       Rate--;\r
-                                       Math=0;\r
-                               }\r
-                       }\r
-\r
-                       dataBox=lineX(par1World, X, Y, Z+ZRate, Block, meta, upperSide+Rate, 0);\r
-               }\r
-               return dataBox;\r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/common/chemicraft/entity/EntityAtomsGrenade.java b/common/chemicraft/entity/EntityAtomsGrenade.java
deleted file mode 100644 (file)
index deb72b1..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-package chemicraft.entity;
-
-import java.util.Iterator;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.projectile.EntityThrowable;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
-public class EntityAtomsGrenade extends EntityThrowable
-{
-
-       private float explodeSize;
-       private boolean isExplode;
-       private boolean onFire;
-       private boolean isNuke;
-
-       public EntityAtomsGrenade(World par1World, EntityLiving par2EntityLiving, boolean par3, boolean par4, boolean par5) {
-               super(par1World, par2EntityLiving);
-               this.isExplode = par3;
-               this.onFire = par4;
-               this.isNuke = par5;
-       }
-
-       @Override
-       public void onUpdate(){
-               super.onUpdate();
-       }
-
-       @SuppressWarnings("unchecked")
-       @Override
-       protected void onImpact(MovingObjectPosition par1MovingObjectPosition)
-       {
-
-               if(isExplode){
-                       this.explodeSize = 3.0F;
-               }
-
-               if(isNuke){
-                       this.explodeSize = 20.0F;
-               }
-
-               if (par1MovingObjectPosition.entityHit != null) {
-                       par1MovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.func_85052_h()), 2);
-                       par1MovingObjectPosition.entityHit.setFire(5);
-               }
-
-               if (!this.worldObj.isRemote && !isNuke) {
-                       this.worldObj.createExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
-                       this.isDead = true;
-               }else if(!this.worldObj.isRemote && isNuke){
-                       this.worldObj.createExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
-                       Iterator<EntityLiving> itr = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, this.boundingBox.expand(30, 30, 30)).iterator();
-                       while(itr.hasNext()){
-                               EntityLiving entity = itr.next();
-                               double dx = Math.abs(entity.posX - this.posX);
-                               double dy = Math.abs(entity.posY - this.posY);
-                               double dz = Math.abs(entity.posZ - this.posZ);
-                               int distance = (int)Math.sqrt( Math.pow(dx, 2) + Math.pow(dy, 2) + Math.pow(dz, 2) );
-                               if(30 - distance >= 0){
-                                       entity.addPotionEffect(new PotionEffect(2, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(4, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(18, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(19, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                               }
-                       }
-                       this.isDead = true;
-               }
-
-       }
-
-}
diff --git a/common/chemicraft/gui/GuiChemicalCombinationTable.java b/common/chemicraft/gui/GuiChemicalCombinationTable.java
deleted file mode 100644 (file)
index 7daf181..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-package 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 cpw.mods.fml.common.network.PacketDispatcher;
-
-public class GuiChemicalCombinationTable extends GuiContainer {
-
-       private GuiTextField atomList;
-
-       private TileEntityChemicalCombinationTable tileentity;
-
-       public GuiChemicalCombinationTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCombinationTable par2) {
-               super(new ContainerChemicalCombinationTable(par1EntityPlayer, par2));
-               this.tileentity = par2;
-               this.ySize = 204;
-       }
-
-       @Override
-       public void initGui(){
-               super.initGui();
-               this.atomList = new GuiTextField(this.fontRenderer, 9, 103, 160, 15);
-               this.atomList.setFocused(false);
-               this.atomList.setMaxStringLength(25);
-               this.controlList.add(new GuiButton(0, this.guiLeft + 172 - 41, this.guiTop + 80 - 21, 40, 20, "Add"));
-               this.controlList.add(new GuiButton(1, this.guiLeft + 172 - 41, this.guiTop + 80, 40, 20, "Eject"));
-       }
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiChemicalCombinationTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-       @Override
-       protected void actionPerformed(GuiButton par1GuiButton) {
-               if(par1GuiButton.id == 0){
-                       this.tileentity.field_00001();
-                       PacketDispatcher.sendPacketToServer(this.tileentity.getDescriptionPacket());
-               }else if(par1GuiButton.id == 1){
-                       this.tileentity.field_00002();
-                       PacketDispatcher.sendPacketToServer(this.tileentity.getDescriptionPacket());
-               }
-               return;
-       }
-
-       @Override
-       protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-               this.atomList.setText(this.tileentity.getAtoms());
-               this.atomList.drawTextBox();
-       }
-
-}
diff --git a/common/chemicraft/gui/GuiChemicalCraftingTable.java b/common/chemicraft/gui/GuiChemicalCraftingTable.java
deleted file mode 100644 (file)
index a25ad96..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-package 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 cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GuiChemicalCraftingTable extends GuiContainer {
-
-       public GuiChemicalCraftingTable(EntityPlayer par1EntityPlayer, TileEntityChemicalCraftingTable par2){
-               super(new ContainerChemicalCraftingTable(par1EntityPlayer, par2));
-       }
-
-
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiChemicalCraftingTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-}
diff --git a/common/chemicraft/gui/GuiElectrolysisTable.java b/common/chemicraft/gui/GuiElectrolysisTable.java
deleted file mode 100644 (file)
index 5fe55f8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package 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;
-
-public class GuiElectrolysisTable extends GuiContainer
-{
-
-       public GuiElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
-               super(new ContainerElectrolysisTable(par1EntityPlayer, par2));
-               this.ySize = 204;
-       }
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3)
-       {
-               //this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiElectrolysisTableTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-}
diff --git a/common/chemicraft/gui/GuiPyrolysisTable.java b/common/chemicraft/gui/GuiPyrolysisTable.java
deleted file mode 100644 (file)
index 903740c..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-package 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;
-
-public class GuiPyrolysisTable extends GuiContainer{
-
-       private TileEntityPyrolysisTable tileentity;
-
-       public GuiPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2) {
-               super(new ContainerPyrolysisTable(par1EntityPlayer, par2));
-               this.tileentity = par2;
-               this.ySize = 204;
-       }
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiPyrolysisTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-       @Override
-       protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-               this.fontRenderer.drawString(String.valueOf("Temp:" + (int)this.tileentity.getHeat()), 110, 100, 0x000000);
-       }
-
-}
diff --git a/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java b/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
deleted file mode 100644 (file)
index d3e9288..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-package 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;
-
-public class GuiToolAndWeaponCraftingTable extends GuiContainer {
-
-       public GuiToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2) {
-               super(new ContainerToolAndWeaponCraftingTable(par1EntityPlayer, par2));
-       }
-
-       @Override
-       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture));
-               this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
-       }
-
-
-}
diff --git a/common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java b/common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java
deleted file mode 100644 (file)
index 42f2f05..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCombinationTableMaterial implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "ChemicalCombinationTableMaterial";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java b/common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java
deleted file mode 100644 (file)
index a6edc74..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCombinationTableResult implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[15];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "ChemicalCombinationTableResult";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-
-
-}
diff --git a/common/chemicraft/inventory/InventoryChemicalCraftingMaterial.java b/common/chemicraft/inventory/InventoryChemicalCraftingMaterial.java
deleted file mode 100644 (file)
index 6bd7c4b..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCraftingMaterial implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[9];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container){
-               this.eventHandelr = par1Container;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               inventory[var1] = var2;
-       }
-
-       @Override
-       public String getInvName() {
-               return "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryChemicalCraftingNBT.java b/common/chemicraft/inventory/InventoryChemicalCraftingNBT.java
deleted file mode 100644 (file)
index f57eb68..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCraftingNBT implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[3];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container){
-               this.eventHandelr = par1Container;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               inventory[var1] = var2;
-       }
-
-       @Override
-       public String getInvName() {
-               return "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryChemicalCraftingResult.java b/common/chemicraft/inventory/InventoryChemicalCraftingResult.java
deleted file mode 100644 (file)
index 1c6aa6e..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryChemicalCraftingResult implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[1];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container){
-               this.eventHandelr = par1Container;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null)
-               {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               inventory[var1] = var2;
-       }
-
-       @Override
-       public String getInvName() {
-               return "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-
-       }
-
-       @Override
-       public void closeChest() {
-
-       }
-
-
-}
diff --git a/common/chemicraft/inventory/InventoryElectrolysisFuel.java b/common/chemicraft/inventory/InventoryElectrolysisFuel.java
deleted file mode 100644 (file)
index a811979..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryElectrolysisFuel implements IInventory
-{
-
-       private ItemStack[] inventory = new ItemStack[1];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container)
-       {
-               this.eventHandelr = par1Container;
-       }
-
-       @Override
-       public int getSizeInventory()
-       {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1)
-       {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null) {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               } else {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null) {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               } else {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2)
-       {
-               inventory[var1] = var2;
-       }
-
-       @Override
-       public String getInvName()
-       {
-               return "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit()
-       {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged()
-       {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1)
-       {
-               return true;
-       }
-
-       @Override
-       public void openChest()
-       {
-
-       }
-
-       @Override
-       public void closeChest()
-       {
-
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryElectrolysisMaterial.java b/common/chemicraft/inventory/InventoryElectrolysisMaterial.java
deleted file mode 100644 (file)
index d004d5c..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryElectrolysisMaterial implements IInventory
-{
-
-       private ItemStack[] inventory = new ItemStack[1];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container)
-       {
-               this.eventHandelr = par1Container;
-       }
-
-       @Override
-       public int getSizeInventory()
-       {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1)
-       {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null) {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               } else {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null) {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               } else {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2)
-       {
-               inventory[var1] = var2;
-       }
-
-       @Override
-       public String getInvName()
-       {
-               return "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit()
-       {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged()
-       {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1)
-       {
-               return true;
-       }
-
-       @Override
-       public void openChest()
-       {
-
-       }
-
-       @Override
-       public void closeChest()
-       {
-
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryElectrolysisResult.java b/common/chemicraft/inventory/InventoryElectrolysisResult.java
deleted file mode 100644 (file)
index 2acf3a2..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryElectrolysisResult implements IInventory
-{
-
-       private ItemStack[] inventory = new ItemStack[16];
-
-       private Container eventHandelr;
-
-       public void setEventHandler(Container par1Container)
-       {
-               this.eventHandelr = par1Container;
-       }
-
-       @Override
-       public int getSizeInventory()
-       {
-               return inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1)
-       {
-               return inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int par1, int par2)
-       {
-               if (this.inventory[par1] != null) {
-                       ItemStack var3 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var3;
-               } else {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int par1)
-       {
-               if (this.inventory[par1] != null) {
-                       ItemStack var2 = this.inventory[par1];
-                       this.inventory[par1] = null;
-                       return var2;
-               } else {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2)
-       {
-               inventory[var1] = var2;
-       }
-
-       @Override
-       public String getInvName()
-       {
-               return "ChemicalCraftingInventory";
-       }
-
-       @Override
-       public int getInventoryStackLimit()
-       {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged()
-       {
-               this.eventHandelr.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1)
-       {
-               return true;
-       }
-
-       @Override
-       public void openChest()
-       {
-
-       }
-
-       @Override
-       public void closeChest()
-       {
-
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java b/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java
deleted file mode 100644 (file)
index 1f4c5be..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryPyrolysisTableFuel implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[1];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "PyrolysisTableFuel";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-}
diff --git a/common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java b/common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java
deleted file mode 100644 (file)
index fab443c..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryPyrolysisTableMaterial implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[1];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "PyrolysisTableMaterial";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-}
diff --git a/common/chemicraft/inventory/InventoryPyrolysisTableResult.java b/common/chemicraft/inventory/InventoryPyrolysisTableResult.java
deleted file mode 100644 (file)
index ea14e17..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryPyrolysisTableResult implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "PyrolysisTableResult";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-}
diff --git a/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java b/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java
deleted file mode 100644 (file)
index aad5063..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryToolAndWeaponCraftingTableMaterial implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "ToolAndWeaponCraftingTableMaterial";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-
-}
diff --git a/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java b/common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java
deleted file mode 100644 (file)
index b6743a7..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-package chemicraft.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class InventoryToolAndWeaponCraftingTableResult implements IInventory {
-
-       private ItemStack[] inventory = new ItemStack[16];
-       private Container eventHandler;
-
-       public void setEventHandler(Container par1){
-               this.eventHandler = par1;
-       }
-
-       @Override
-       public int getSizeInventory() {
-               return this.inventory.length;
-       }
-
-       @Override
-       public ItemStack getStackInSlot(int var1) {
-               return this.inventory[var1];
-       }
-
-       @Override
-       public ItemStack decrStackSize(int var1, int var2) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var3;
-
-                       if (this.inventory[var1].stackSize <= var2)
-                       {
-                               var3 = this.inventory[var1];
-                               this.inventory[var1] = null;
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-                       else
-                       {
-                               var3 = this.inventory[var1].splitStack(var2);
-
-                               if (this.inventory[var1].stackSize == 0)
-                               {
-                                       this.inventory[var1] = null;
-                               }
-
-                               this.onInventoryChanged();
-                               return var3;
-                       }
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public ItemStack getStackInSlotOnClosing(int var1) {
-               if (this.inventory[var1] != null)
-               {
-                       ItemStack var2 = this.inventory[var1];
-                       this.inventory[var1] = null;
-                       return var2;
-               }
-               else
-               {
-                       return null;
-               }
-       }
-
-       @Override
-       public void setInventorySlotContents(int var1, ItemStack var2) {
-               this.inventory[var1] = var2;
-
-               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
-               {
-                       var2.stackSize = this.getInventoryStackLimit();
-               }
-
-               this.onInventoryChanged();
-       }
-
-       @Override
-       public String getInvName() {
-               return "ToolAndWeaponCraftingTableResult";
-       }
-
-       @Override
-       public int getInventoryStackLimit() {
-               return 64;
-       }
-
-       @Override
-       public void onInventoryChanged() {
-               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
-       }
-
-       @Override
-       public boolean isUseableByPlayer(EntityPlayer var1) {
-               return true;
-       }
-
-       @Override
-       public void openChest() {
-       }
-
-       @Override
-       public void closeChest() {
-       }
-
-
-}
diff --git a/common/chemicraft/item/ItemAtomInfoContainer.java b/common/chemicraft/item/ItemAtomInfoContainer.java
deleted file mode 100644 (file)
index 2c2894e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-package chemicraft.item;\r
-\r
-import net.minecraft.item.Item;\r
-import chemicraft.util.AtomInfo;\r
-\r
-public class ItemAtomInfoContainer extends Item {\r
-\r
-       /**\r
-        * AtonInfoのインスタンス\r
-        */\r
-       public AtomInfo atomInfo = new AtomInfo();\r
-\r
-\r
-\r
-       public ItemAtomInfoContainer(int par1){\r
-               super(par1);\r
-       }\r
-\r
-}\r
diff --git a/common/chemicraft/item/ItemAtoms.java b/common/chemicraft/item/ItemAtoms.java
deleted file mode 100644 (file)
index b766426..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-package 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 cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ItemAtoms extends Item {
-
-       public ItemAtoms(int par1){
-               super(par1);
-               this.maxStackSize = 64;
-               this.setHasSubtypes(true);
-               this.setMaxDamage(0);
-               this.setCreativeTab(ChemiCraft.instance.creativeTab);
-       }
-
-
-
-       @SuppressWarnings({ "unchecked", "rawtypes" })
-       @SideOnly(Side.CLIENT)
-       @Override
-       public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List){
-               for(int type = 0; type < ChemiCraft.instance.ATOMSNAME.length; type++)
-               {
-                       par3List.add(new ItemStack(par1, 1, type));
-                       this.setIconIndex(type);
-               }
-       }
-
-
-
-       @Override
-       public String getItemNameIS(ItemStack par1ItemStack){
-               return super.getItemName() + "." + ChemiCraft.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
-       }
-
-
-
-       @Override
-       public String getTextureFile(){
-               return ChemiCraft.instance.itemAtomsTexture;
-       }
-
-
-
-       @SideOnly(Side.CLIENT)
-       @Override
-       public int getIconFromDamage(int par1){
-               return par1;
-       }
-
-}
\ No newline at end of file
diff --git a/common/chemicraft/item/ItemAtomsGrenade.java b/common/chemicraft/item/ItemAtomsGrenade.java
deleted file mode 100644 (file)
index 8d33bec..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-package chemicraft.item;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.world.World;
-import chemicraft.entity.EntityAtomsGrenade;
-
-public class ItemAtomsGrenade extends Item {
-
-       public ItemAtomsGrenade(int par1) {
-               super(par1);
-       }
-
-       @Override
-       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer){
-               if(par1ItemStack.stackSize <= 0){
-                       return null;
-               }
-
-               boolean var1 = false;
-               boolean var2 = false;
-               boolean var3 = false;
-
-               if(par1ItemStack.stackTagCompound != null){
-                       NBTTagList var4 = par1ItemStack.getTagCompound().getTagList("Effect");
-
-                       for(int i = 0;i < 3;i++){
-                               if(!((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("")){
-                                       if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Hydrogen")){
-                                               var1 = true;
-                                       }
-                                       if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Carbon")){
-                                               var2 = true;
-                                       }
-                                       if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Uranium")){
-                                               var3 = true;
-                                       }
-                               }
-                       }
-               }
-               EntityAtomsGrenade entity = new EntityAtomsGrenade(par2World, par3EntityPlayer, var1, var2, var3);
-               par2World.spawnEntityInWorld(entity);
-               par1ItemStack.stackSize--;
-               return par1ItemStack;
-       }
-
-       @Override
-       public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
-               ItemStack var2 = new ItemStack(this);
-               if(par1ItemStack.hasTagCompound()){
-                       NBTTagList var1 = par1ItemStack.getTagCompound().getTagList("Effect");
-
-                       for(int i = 0;i < 3;i++){
-                               if(!((NBTTagCompound)var1.tagAt(0)).getString("GrenadeEffect" + i).equals("")){
-                                       par3List.add(
-                                                       ((NBTTagCompound)var1.tagAt(0)).getString("GrenadeEffect" + i)
-                                                       );
-                               }
-                       }
-               }
-       }
-
-       @Override
-       public boolean getShareTag()
-       {
-               return true;
-       }
-
-       @Override
-       public String getTextureFile(){
-               return "/chemicraft/items/items.png";
-       }
-
-}
diff --git a/common/chemicraft/item/ItemCompounds.java b/common/chemicraft/item/ItemCompounds.java
deleted file mode 100644 (file)
index 18df605..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-package chemicraft.item;
-
-import java.util.List;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-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 cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ItemCompounds extends Item {
-
-       public ItemCompounds(int par1){
-               super(par1);
-               this.setHasSubtypes(true);
-               this.setMaxDamage(0);
-               this.setCreativeTab(ChemiCraft.instance.creativeTab);
-       }
-
-       @Override
-       public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-               for(int i=0;i < ChemiCraftAPI.getInstance().getCompoundHandlerItemName().size();i++){
-                       if(ChemiCraftAPI.getInstance().getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.getInstance().getCompoundHandlerItemName().get(i))){
-                               return ChemiCraftAPI.getInstance().getCompoundHandler().get(i).onItemUseHandler(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
-                       }
-               }
-               return false;
-       }
-
-
-       @Override
-       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
-       {
-               for(int i=0;i < ChemiCraftAPI.getInstance().getCompoundHandlerItemName().size();i++){
-                       if(ChemiCraftAPI.getInstance().getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.getInstance().getCompoundHandlerItemName().get(i))){
-                               ChemiCraftAPI.getInstance().getCompoundHandler().get(i).onItemRightClickHandler(par1ItemStack, par2World, par3EntityPlayer);
-                       }
-               }
-               return par1ItemStack;
-       }
-
-
-
-       @Override
-       public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5){
-               for(int i=0;i < ChemiCraftAPI.getInstance().getCompoundHandlerItemName().size();i++){
-                       if(ChemiCraftAPI.getInstance().getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.getInstance().getCompoundHandlerItemName().get(i))){
-                               ChemiCraftAPI.getInstance().getCompoundHandler().get(i).onUpdateHandler(par1ItemStack, par2World, par3Entity, par4, par5);
-                       }
-               }
-       }
-
-
-
-       @SuppressWarnings({ "unchecked", "rawtypes" })
-       @SideOnly(Side.CLIENT)
-       @Override
-       public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List){
-               for(int type = 0; type < ChemiCraftAPI.getInstance().getCompoundsName().toArray().length; type++)
-               {
-                       par3List.add(new ItemStack(par1, 1, type));
-                       this.setIconIndex(type);
-               }
-       }
-
-
-
-       @Override
-       public String getItemNameIS(ItemStack par1ItemStack){
-               return super.getItemName() + "." + ChemiCraftAPI.getInstance().getCompoundsName().toArray()[par1ItemStack.getItemDamage()];
-       }
-
-
-
-       @Override
-       public String getTextureFile(){
-               return ChemiCraft.instance.itemCompoundsTexture;
-       }
-
-
-
-       @SideOnly(Side.CLIENT)
-       @Override
-       public int getIconFromDamage(int par1){
-               for(int i=0;i < ChemiCraftAPI.getInstance().getCompoundHandlerItemName().size();i++){
-                       if(ChemiCraftAPI.getInstance().getCompoundsName().get(par1).equals(ChemiCraftAPI.getInstance().getCompoundHandlerItemName().get(i))){
-                               return ChemiCraftAPI.getInstance().getCompoundHandler().get(i).getIconIndexHandler();
-                       }
-               }
-               return 0;
-       }
-
-}
diff --git a/common/chemicraft/item/ItemGasCollectingBottle.java b/common/chemicraft/item/ItemGasCollectingBottle.java
deleted file mode 100644 (file)
index ee8d2a4..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-package chemicraft.item;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.block.BlockFire;\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.item.ItemStack;\r
-import net.minecraft.world.World;\r
-import chemicraft.ChemiCraft;\r
-import chemicraft.ChemiCraftAPI;\r
-import chemicraft.util.MathHelperPlus;\r
-\r
-public class ItemGasCollectingBottle extends ItemAtomInfoContainer\r
-{\r
-\r
-       public ItemGasCollectingBottle(int id) {\r
-               super(id);\r
-               this.setMaxStackSize(1);\r
-               this.setMaxDamage(2);\r
-               this.setCreativeTab(ChemiCraft.instance.creativeTab);\r
-       }\r
-\r
-       @Override\r
-       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)\r
-       {\r
-               par1ItemStack.damageItem(1, par3EntityPlayer);\r
-\r
-               this.atomInfo.update(par2World, par3EntityPlayer);\r
-\r
-               int heightValue = par2World.getHeightValue((int) par3EntityPlayer.posX, (int) par3EntityPlayer.posZ);\r
-\r
-               int result1 = MathHelperPlus.probability(99, 1);\r
-               int result2 = MathHelperPlus.probability(78, 21, 1);\r
-               int result3 = MathHelperPlus.probability(0.032, 0.0018, 0.000012, 0.00052);\r
-               if (this.atomInfo.isOverY(heightValue)) {\r
-                       if (result1 == 0) {\r
-                               if (result2 == 0) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 6), par3EntityPlayer);\r
-                               } else if (result2 == 1) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 7), par3EntityPlayer);\r
-                               } else {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 17), par3EntityPlayer);\r
-                               }\r
-                       } else {\r
-                               if (result3 == 0) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par3EntityPlayer);\r
-                               } else if (result3 == 1) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 9), par3EntityPlayer);\r
-                               } else if (result3 == 2) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, 1), par3EntityPlayer);\r
-                               } else {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 1), par3EntityPlayer);\r
-                               }\r
-                       }\r
-               }\r
-\r
-               // デバッグ用\r
-               if (par2World.isRemote) {\r
-                       par3EntityPlayer.addChatMessage("result1=" + result1 + " result2=" + result2 + " result3=" + result3);\r
-                       par3EntityPlayer.addChatMessage("このメッセージは開発版のみの表示ですが、もし製品版で表示されていた場合はご連絡ください。");\r
-               }\r
-\r
-               return par1ItemStack;\r
-       }\r
-\r
-       protected void isStackOrDrop(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer)\r
-       {\r
-               if (!par2EntityPlayer.inventory.addItemStackToInventory(par1ItemStack)) {\r
-                       par2EntityPlayer.dropPlayerItem(par1ItemStack);\r
-               }\r
-       }\r
-\r
-       @Override\r
-       public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)\r
-       {\r
-               int blockID = par3World.getBlockId(par4, par5, par6);\r
-               Block block = Block.blocksList[blockID];\r
-\r
-               int uniqueBlockID = par3World.getBlockId(par4, par5 + 1, par6);\r
-               Block uniqueBlock = Block.blocksList[uniqueBlockID];\r
-\r
-               if (uniqueBlock instanceof BlockFire){\r
-                       par1ItemStack.damageItem(1, par2EntityPlayer);\r
-\r
-                       int result1 = MathHelperPlus.probability(90, 10);\r
-\r
-                       if (result1 == 0) {\r
-                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par2EntityPlayer);\r
-                       } else {\r
-                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonMonoxide")), par2EntityPlayer);\r
-                       }\r
-\r
-                       return true;\r
-               }\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public String getTextureFile()\r
-       {\r
-               return "/chemicraft/items/items.png";\r
-       }\r
-\r
-}\r
diff --git a/common/chemicraft/render/RenderAtomsGrenade.java b/common/chemicraft/render/RenderAtomsGrenade.java
deleted file mode 100644 (file)
index 916a86f..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-package chemicraft.render;
-
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.entity.Entity;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-import chemicraft.ChemiCraft;
-import chemicraft.entity.EntityAtomsGrenade;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderAtomsGrenade extends Render {
-
-       private float field_77002_a;
-
-       public RenderAtomsGrenade(float par1)
-       {
-               this.field_77002_a = par1;
-       }
-
-       public void doRenderAtomsGrenade(EntityAtomsGrenade par1AtomGrenade, double par2, double par4, double par6, float par8, float par9)
-       {
-               GL11.glPushMatrix();
-               GL11.glTranslatef((float)par2, (float)par4, (float)par6);
-               GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-               float var10 = this.field_77002_a;
-               GL11.glScalef(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F);
-               byte var11 = 1;
-               this.loadTexture(ChemiCraft.instance.itemTexture);
-               Tessellator var12 = Tessellator.instance;
-               float var13 = (float)(var11 % 16 * 16 + 0) / 256.0F;
-               float var14 = (float)(var11 % 16 * 16 + 16) / 256.0F;
-               float var15 = (float)(var11 / 16 * 16 + 0) / 256.0F;
-               float var16 = (float)(var11 / 16 * 16 + 16) / 256.0F;
-               float var17 = 1.0F;
-               float var18 = 0.5F;
-               float var19 = 0.25F;
-               GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
-               GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
-               var12.startDrawingQuads();
-               var12.setNormal(0.0F, 1.0F, 0.0F);
-               var12.addVertexWithUV((double)(0.0F - var18), (double)(0.0F - var19), 0.0D, (double)var13, (double)var16);
-               var12.addVertexWithUV((double)(var17 - var18), (double)(0.0F - var19), 0.0D, (double)var14, (double)var16);
-               var12.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15);
-               var12.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15);
-               var12.draw();
-               GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-               GL11.glPopMatrix();
-       }
-
-       @Override
-       public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
-       {
-               this.doRenderAtomsGrenade((EntityAtomsGrenade)par1Entity, par2, par4, par6, par8, par9);
-       }
-}
diff --git a/common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java b/common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
deleted file mode 100644 (file)
index 288775d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import chemicraft.ChemiCraft;
-
-public class SlotChemicalCombinationTableMaterial extends Slot {
-
-       public SlotChemicalCombinationTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack){
-               if(par1ItemStack.itemID == ChemiCraft.instance.atomsID + 256){
-                       return true;
-               }
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotChemicalCombinationTableResult.java b/common/chemicraft/slot/SlotChemicalCombinationTableResult.java
deleted file mode 100644 (file)
index 52a1837..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotChemicalCombinationTableResult extends Slot {
-
-       public SlotChemicalCombinationTableResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack){
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotChemicalCraftingTableResult.java b/common/chemicraft/slot/SlotChemicalCraftingTableResult.java
deleted file mode 100644 (file)
index 1611868..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotChemicalCraftingTableResult extends Slot {
-
-       public SlotChemicalCraftingTableResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack)
-       {
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotDecompositionTableMaterial.java b/common/chemicraft/slot/SlotDecompositionTableMaterial.java
deleted file mode 100644 (file)
index 4925d0d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotDecompositionTableMaterial extends Slot {
-
-       public SlotDecompositionTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotDecompositionTableResult.java b/common/chemicraft/slot/SlotDecompositionTableResult.java
deleted file mode 100644 (file)
index 1200f4b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotDecompositionTableResult extends Slot {
-
-       public SlotDecompositionTableResult(IInventory par1iInventory, int par2,        int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack){
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotElectrolysisFuel.java b/common/chemicraft/slot/SlotElectrolysisFuel.java
deleted file mode 100644 (file)
index e4e70fe..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotElectrolysisFuel extends Slot
-{
-
-       public SlotElectrolysisFuel(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotElectrolysisMaterial.java b/common/chemicraft/slot/SlotElectrolysisMaterial.java
deleted file mode 100644 (file)
index 6483b88..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotElectrolysisMaterial extends Slot
-{
-
-       public SlotElectrolysisMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotElectrolysisResult.java b/common/chemicraft/slot/SlotElectrolysisResult.java
deleted file mode 100644 (file)
index 3fe451e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotElectrolysisResult extends Slot
-{
-
-       public SlotElectrolysisResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotPyrolysisTableFuel.java b/common/chemicraft/slot/SlotPyrolysisTableFuel.java
deleted file mode 100644 (file)
index a2ab846..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotPyrolysisTableFuel extends Slot {
-
-       public SlotPyrolysisTableFuel(IInventory par1IInventory, int par2, int par3, int par4) {
-               super(par1IInventory, par2, par3, par4);
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotPyrolysisTableMaterial.java b/common/chemicraft/slot/SlotPyrolysisTableMaterial.java
deleted file mode 100644 (file)
index fb83ba6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotPyrolysisTableMaterial extends Slot {
-
-       public SlotPyrolysisTableMaterial(IInventory par1IInventory, int par2, int par3, int par4) {
-               super(par1IInventory, par2, par3, par4);
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotPyrolysisTableResult.java b/common/chemicraft/slot/SlotPyrolysisTableResult.java
deleted file mode 100644 (file)
index 41d25e0..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotPyrolysisTableResult extends Slot {
-
-       public SlotPyrolysisTableResult(IInventory par1IInventory, int par2, int par3, int par4) {
-               super(par1IInventory, par2, par3, par4);
-       }
-
-       public boolean isItemValid(ItemStack par1ItemStack)
-       {
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java b/common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java
deleted file mode 100644 (file)
index a49b5f3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-package chemicraft.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotToolAndWeaponCraftingTableResult extends Slot {
-
-       public SlotToolAndWeaponCraftingTableResult(IInventory par1iInventory, int par2, int par3, int par4) {
-               super(par1iInventory, par2, par3, par4);
-       }
-
-       @Override
-       public boolean isItemValid(ItemStack par1ItemStack){
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/system/ChemiCraftCraftingManager.java b/common/chemicraft/system/ChemiCraftCraftingManager.java
deleted file mode 100644 (file)
index 48d177d..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-package chemicraft.system;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-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;
-
-public class ChemiCraftCraftingManager {
-
-       public ItemStack[] getDecompositionResults(IInventory par1IInventory){
-               return null;
-       }
-
-
-
-       public ItemStack getChemicalCombinationResult(ArrayList<String> atomsList, ArrayList<Integer> atomsAmountList){
-               ChemiCraftAPI api = ChemiCraftAPI.getInstance();
-               recipeSize :
-                       for (int i = 0; i < api.getChemicalCombinationAtoms().size(); i++) {
-                               FormulaPart[] var1 = new FormulaPart[atomsList.size()];
-                               FormulaPart[] var2 = new FormulaPart[api.getChemicalCombinationAtoms().get(i).length];
-                               for (int j = 0; j < atomsList.size(); j++) {
-                                       var1[j] = new FormulaPart(atomsList.get(j), atomsAmountList.get(j));
-                               }
-                               for (int j = 0; j < api.getChemicalCombinationAtoms().get(i).length; j++) {
-                                       var2[j] = new FormulaPart(api.getChemicalCombinationAtoms().get(i)[j], api.getChemicalCombinationAmounts().get(i)[j]);
-                               }
-                               Arrays.sort(var1, new ComparatorFormulaPart());
-                               Arrays.sort(var2, new ComparatorFormulaPart());
-                               if (var1.length != var2.length) {
-                                       continue recipeSize;
-                               }
-                               for (int j = 0; j < var1.length; j++) {
-                                       if (!var1[j].equals(var2[j])) {
-                                               continue recipeSize;
-                                       }
-                               }
-                               return api.getChemicalCombinationResult().get(i);
-                       }
-               return null;
-       }
-
-
-
-       public ChemicalNBTRecipe chemicalCrafting(InventoryChemicalCraftingMaterial par1IInventory, InventoryChemicalCraftingResult par2IInventory, InventoryChemicalCraftingNBT par3IInventory){
-               ChemiCraftAPI api = ChemiCraftAPI.getInstance();
-               ChemicalNBTRecipe returnObj = null;
-               for(int i = 0;i < api.getMaterialRecipe().size();i++){
-                       ItemStack result = api.getMaterialRecipe().get(i).match(par1IInventory);
-                       ItemStack resultArg = null;
-                       if(result != null){
-                               resultArg = new ItemStack(result.itemID, result.stackSize, result.getItemDamage());
-                               if(api.getMaterialRecipe().get(i).nbtMatch(par1IInventory) != null){
-                                       ItemStack[] nbtInv = new ItemStack[par3IInventory.getSizeInventory()];
-                                       for(int j = 0;j < par3IInventory.getSizeInventory();j++){
-                                               nbtInv[j] = par3IInventory.getStackInSlot(j);
-                                       }
-                                       api.getMaterialRecipe().get(i).nbtMatch(par1IInventory).setNBT(nbtInv, resultArg);
-                               }
-                               returnObj = api.getMaterialRecipe().get(i).nbtMatch(par1IInventory);
-                       }
-                       par2IInventory.setInventorySlotContents(0, resultArg);
-               }
-               return returnObj;
-       }
-
-
-
-       private void clearResults(IInventory par1IInventory, int par2){
-               /*
-                * Commented by mozipi.
-               ((InventoryDecomposition)par1IInventory).setFlag(false);
-                */
-               for(int i = 0;i < par2;i++){
-                       par1IInventory.setInventorySlotContents(i, null);
-               }
-       }
-
-}
diff --git a/common/chemicraft/system/CommonProxy.java b/common/chemicraft/system/CommonProxy.java
deleted file mode 100644 (file)
index 7edcb3a..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-package 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 cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.common.registry.TickRegistry;
-import cpw.mods.fml.relauncher.Side;
-
-public class CommonProxy implements IGuiHandler {
-
-       public void registerTextures(){
-
-       }
-
-       public void registerRenderInformation() {
-       }
-
-
-       @Override
-       public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-               if (!world.blockExists(x, y, z))
-                       return null;
-
-               TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if(tileEntity instanceof TileEntityChemicalCombinationTable){
-                       return new ContainerChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){
-                       return new ContainerToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
-                       return new ContainerChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityElectrolysisTable){
-                       return new ContainerElectrolysisTable(player, (TileEntityElectrolysisTable)tileEntity);
-               } else if(tileEntity instanceof TileEntityPyrolysisTable) {
-                       return new ContainerPyrolysisTable(player, (TileEntityPyrolysisTable)tileEntity);
-               }
-               return null;
-       }
-
-
-       @Override
-       public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-               return null;
-       }
-
-       public World getClientWorld(){
-               return null;
-       }
-
-       public void registerTickHandler() {
-               TickRegistry.registerTickHandler(new DebugTick(), Side.SERVER);
-       }
-
-}
\ No newline at end of file
diff --git a/common/chemicraft/system/PacketHandler.java b/common/chemicraft/system/PacketHandler.java
deleted file mode 100644 (file)
index fa6d9ae..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-package chemicraft.system;\r
-\r
-import java.io.ByteArrayOutputStream;\r
-import java.io.DataOutputStream;\r
-import java.io.IOException;\r
-\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.network.INetworkManager;\r
-import net.minecraft.network.packet.Packet;\r
-import net.minecraft.network.packet.Packet250CustomPayload;\r
-import net.minecraft.tileentity.TileEntity;\r
-import net.minecraft.world.World;\r
-import chemicraft.ChemiCraft;\r
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityPyrolysisTable;\r
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
-\r
-import com.google.common.io.ByteArrayDataInput;\r
-import com.google.common.io.ByteStreams;\r
-\r
-import cpw.mods.fml.common.network.IPacketHandler;\r
-import cpw.mods.fml.common.network.Player;\r
-\r
-/**\r
- * サーバーとクライアントのデータの同期に必要なクラス\r
- *\r
- * @author Lilly\r
- *\r
- */\r
-public class PacketHandler implements IPacketHandler {\r
-\r
-       @Override\r
-       public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) {\r
-               if (packet.channel.equals("chemicraft")) {\r
-                       ByteArrayDataInput badi = ByteStreams.newDataInput(packet.data);\r
-\r
-                       World worldClient;\r
-                       World worldServer;\r
-                       TileEntity var1;\r
-\r
-                       // TileEntityのx, y, z座標\r
-                       int x, y, z;\r
-\r
-                       // 座標読み込み\r
-                       x = badi.readInt();\r
-                       y = badi.readInt();\r
-                       z = badi.readInt();\r
-\r
-                       worldClient = ChemiCraft.proxy.getClientWorld();\r
-                       worldServer = ((EntityPlayer)player).worldObj;\r
-                       if(worldClient != null && worldServer == null){\r
-                               var1 = worldClient.getBlockTileEntity(x, y, z);\r
-                               if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi);\r
-                               return;\r
-                       }\r
-                       if(worldServer != null){\r
-                               var1 = worldServer.getBlockTileEntity(x, y, z);\r
-                               if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi);\r
-                       }\r
-                       return;\r
-               }\r
-       }\r
-\r
-\r
-       public static Packet getPacket(TileEntityPyrolysisTable tileEntity) {\r
-               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
-               DataOutputStream var2 = new DataOutputStream(var1);\r
-\r
-               // Blockのx, y, z座標\r
-               int x, y, z;\r
-\r
-               // x, y, z座標を代入\r
-               x = tileEntity.xCoord;\r
-               y = tileEntity.yCoord;\r
-               z = tileEntity.zCoord;\r
-\r
-               try {\r
-                       // 座標書き込み\r
-                       var2.writeInt(x);\r
-                       var2.writeInt(y);\r
-                       var2.writeInt(z);\r
-                       tileEntity.writePacket(var2);\r
-               } catch (IOException e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // パケットの作成\r
-               Packet250CustomPayload packet = new Packet250CustomPayload();\r
-               packet.channel = "chemicraft";\r
-               packet.data = var1.toByteArray();\r
-               packet.length = var1.size();\r
-               packet.isChunkDataPacket = true;\r
-               return packet;\r
-       }\r
-\r
-       public static Packet getPacket(TileEntityChemicalCombinationTable tileEntity) {\r
-               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
-               DataOutputStream var2 = new DataOutputStream(var1);\r
-\r
-               // Blockのx, y, z座標\r
-               int x, y, z;\r
-\r
-               // x, y, z座標を代入\r
-               x = tileEntity.xCoord;\r
-               y = tileEntity.yCoord;\r
-               z = tileEntity.zCoord;\r
-\r
-               try {\r
-                       // 座標書き込み\r
-                       var2.writeInt(x);\r
-                       var2.writeInt(y);\r
-                       var2.writeInt(z);\r
-                       tileEntity.writePacket(var2);\r
-               } catch (IOException e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // パケットの作成\r
-               Packet250CustomPayload packet = new Packet250CustomPayload();\r
-               packet.channel = "chemicraft";\r
-               packet.data = var1.toByteArray();\r
-               packet.length = var1.size();\r
-               packet.isChunkDataPacket = true;\r
-               return packet;\r
-       }\r
-\r
-       public static Packet getPacket(TileEntityToolAndWeaponCraftingTable tileEntity) {\r
-               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
-               DataOutputStream var2 = new DataOutputStream(var1);\r
-\r
-               // Blockのx, y, z座標\r
-               int x, y, z;\r
-\r
-               // x, y, z座標を代入\r
-               x = tileEntity.xCoord;\r
-               y = tileEntity.yCoord;\r
-               z = tileEntity.zCoord;\r
-\r
-               try {\r
-                       // 座標書き込み\r
-                       var2.writeInt(x);\r
-                       var2.writeInt(y);\r
-                       var2.writeInt(z);\r
-                       tileEntity.writePacket(var2);\r
-               } catch (IOException e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // パケットの作成\r
-               Packet250CustomPayload packet = new Packet250CustomPayload();\r
-               packet.channel = "chemicraft";\r
-               packet.data = var1.toByteArray();\r
-               packet.length = var1.size();\r
-               packet.isChunkDataPacket = true;\r
-               return packet;\r
-       }\r
-\r
-       public static Packet getPacket(TileEntityChemicalCraftingTable tileEntity) {\r
-               ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
-               DataOutputStream var2 = new DataOutputStream(var1);\r
-\r
-               // Blockのx, y, z座標\r
-               int x, y, z;\r
-\r
-               // x, y, z座標を代入\r
-               x = tileEntity.xCoord;\r
-               y = tileEntity.yCoord;\r
-               z = tileEntity.zCoord;\r
-\r
-               try {\r
-                       // 座標書き込み\r
-                       var2.writeInt(x);\r
-                       var2.writeInt(y);\r
-                       var2.writeInt(z);\r
-                       tileEntity.writePacket(var2);\r
-               } catch (IOException e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // パケットの作成\r
-               Packet250CustomPayload packet = new Packet250CustomPayload();\r
-               packet.channel = "chemicraft";\r
-               packet.data = var1.toByteArray();\r
-               packet.length = var1.size();\r
-               packet.isChunkDataPacket = true;\r
-               return packet;\r
-       }\r
-\r
-}\r
diff --git a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java b/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
deleted file mode 100644 (file)
index 35b2dcb..0000000
+++ /dev/null
@@ -1,370 +0,0 @@
-package chemicraft.tileentity;
-
-import java.io.DataOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-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 com.google.common.io.ByteArrayDataInput;
-
-import cpw.mods.fml.common.network.PacketDispatcher;
-
-public class TileEntityChemicalCombinationTable extends TileEntity {
-
-       private InventoryChemicalCombinationTableMaterial invm = new InventoryChemicalCombinationTableMaterial();
-       private InventoryChemicalCombinationTableResult invr = new InventoryChemicalCombinationTableResult();
-
-       private ArrayList<String> atomsList = new ArrayList<String>();
-       private ArrayList<Integer> atomsAmountList = new ArrayList<Integer>();
-       private int atomsListSize = 0;
-
-       private ItemStack dropItems;
-
-       private boolean isProvidePower;
-
-       @Override
-       public void updateEntity(){
-               super.updateEntity();
-               if (this.isProvidePower && !this.worldObj.isRemote) {
-                       this.field_00001();
-                       this.isProvidePower = false;
-                       PacketDispatcher.sendPacketToAllPlayers(this.getDescriptionPacket());
-               }
-       }
-
-       @Override
-       public void readFromNBT(NBTTagCompound par1){
-               super.readFromNBT(par1);
-               NBTTagList var2 = par1.getTagList("Items");
-               for (int var3 = 0; var3 < var2.tagCount(); ++var3)
-               {
-                       NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
-                       int var5 = var4.getByte("Slot") & 255;
-
-                       if  (var5 >= 0 && var5 < this.invm.getSizeInventory())
-                       {
-                               this.invm.setInventorySlotContents(var5, ItemStack.loadItemStackFromNBT(var4));
-                       }
-               }
-
-               NBTTagList var6 = par1.getTagList("Items2");
-               for (int var3 = 0; var3 < var6.tagCount(); ++var3)
-               {
-                       NBTTagCompound var7 = (NBTTagCompound)var6.tagAt(var3);
-                       int var8 = var7.getByte("Slot2") & 255;
-
-                       if  (var8 >= 0 && var8 < this.invr.getSizeInventory())
-                       {
-                               this.invr.setInventorySlotContents(var8, ItemStack.loadItemStackFromNBT(var7));
-                       }
-               }
-
-               this.atomsListSize = par1.getInteger("atomsListSize");
-               for(int i = 0;i < this.atomsListSize;i++){
-                       this.atomsList.add(par1.getString("atomsList" + i));
-               }
-               for(int i = 0;i < this.atomsListSize;i++){
-                       this.atomsAmountList.add(par1.getInteger("atomsAmountList" + i));
-               }
-
-               this.isProvidePower = par1.getBoolean("isProvidePower");
-       }
-
-       @Override
-       public void writeToNBT(NBTTagCompound par1){
-               super.writeToNBT(par1);
-               NBTTagList var2 = new NBTTagList();
-               for (int var3 = 0; var3 < this.invm.getSizeInventory(); ++var3)
-               {
-                       if  (this.invm.getStackInSlot(var3) != null)
-                       {
-                               NBTTagCompound var4 = new NBTTagCompound();
-                               var4.setByte("Slot", (byte)var3);
-                               this.invm.getStackInSlot(var3).writeToNBT(var4);
-                               var2.appendTag(var4);
-                       }
-               }
-               par1.setTag("Items", var2);
-
-               NBTTagList var5 = new NBTTagList();
-               for (int var6 = 0; var6 < this.invr.getSizeInventory(); ++var6)
-               {
-                       if  (this.invr.getStackInSlot(var6) != null)
-                       {
-                               NBTTagCompound var7 = new NBTTagCompound();
-                               var7.setByte("Slot2", (byte)var6);
-                               this.invr.getStackInSlot(var6).writeToNBT(var7);
-                               var5.appendTag(var7);
-                       }
-               }
-               par1.setTag("Items2", var5);
-
-               this.atomsList.trimToSize();
-               this.atomsAmountList.trimToSize();
-               for(int i = 0;i < this.atomsList.size();i++){
-                       par1.setString("atomsList" + i, this.atomsList.get(i));
-               }
-               for(int i = 0;i < this.atomsAmountList.size();i++){
-                       par1.setInteger("atomsAmountList" + i, this.atomsAmountList.get(i));
-               }
-
-               this.atomsListSize = this.atomsList.size();
-               par1.setInteger("atomsListSize", this.atomsListSize);
-
-               par1.setBoolean("isProvidePower", this.isProvidePower);
-       }
-
-       @Override
-       public Packet getDescriptionPacket() {
-               return PacketHandler.getPacket(this);
-       }
-
-       public void readPacket(ByteArrayDataInput data) {
-               try {
-                       for(int i = 0;i < this.invm.getSizeInventory();i++){
-                               int id = data.readInt();
-                               int size = data.readByte();
-                               int damage = data.readInt();
-                               if (id != 0 && size != 0){
-                                       this.invm.setInventorySlotContents(i, new ItemStack(id, size, damage));
-                               }else{
-                                       this.invm.setInventorySlotContents(i, null);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invr.getSizeInventory();i++){
-                               int id = data.readInt();
-                               int size = data.readByte();
-                               int damage = data.readInt();
-                               if (id != 0 && size != 0){
-                                       this.invr.setInventorySlotContents(i, new ItemStack(id, size, damage));
-                               }else{
-                                       this.invr.setInventorySlotContents(i, null);
-                               }
-                       }
-
-                       this.atomsListSize = data.readInt();
-                       this.atomsList.clear();
-                       this.atomsAmountList.clear();
-                       for(int i = 0;i < this.atomsListSize;i++){
-                               this.atomsList.add(data.readUTF());
-                       }
-                       for(int i = 0;i < this.atomsListSize;i++){
-                               this.atomsAmountList.add(data.readInt());
-                       }
-
-                       ItemStack itemstack = new ItemStack(data.readInt(), data.readByte(), data.readInt());
-                       if(itemstack.itemID != 0 && !this.worldObj.isRemote){
-                               this.worldObj.spawnEntityInWorld(new EntityItem(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord, itemstack));
-                       }
-                       this.dropItems = null;
-
-                       this.isProvidePower = data.readBoolean();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public void writePacket(DataOutputStream dos){
-               try {
-                       for(int i = 0;i < this.invm.getSizeInventory();i++){
-                               int id = 0;
-                               int size = 0;
-                               int damage  = 0;
-                               ItemStack itemstack = this.invm.getStackInSlot(i);
-                               if (itemstack != null){
-                                       id = itemstack.itemID;
-                                       size = itemstack.stackSize;
-                                       damage = itemstack.getItemDamage();
-                                       dos.writeInt(id);
-                                       dos.writeByte(size);
-                                       dos.writeInt(damage);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeByte(0);
-                                       dos.writeInt(0);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invr.getSizeInventory();i++){
-                               int id = 0;
-                               int size = 0;
-                               int damage  = 0;
-                               ItemStack itemstack = this.invr.getStackInSlot(i);
-                               if (itemstack != null){
-                                       id = itemstack.itemID;
-                                       size = itemstack.stackSize;
-                                       damage = itemstack.getItemDamage();
-                                       dos.writeInt(id);
-                                       dos.writeByte(size);
-                                       dos.writeInt(damage);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeByte(0);
-                                       dos.writeInt(0);
-                               }
-                       }
-
-                       dos.writeInt(this.atomsList.size());
-                       for(int i = 0;i < this.atomsList.size();i++){
-                               dos.writeUTF(this.atomsList.get(i));
-                       }
-                       for(int i = 0;i < this.atomsAmountList.size();i++){
-                               dos.writeInt(this.atomsAmountList.get(i));
-                       }
-
-                       if (this.dropItems != null){
-                               int id = this.dropItems.itemID;
-                               int size = this.dropItems.stackSize;
-                               int damage = this.dropItems.getItemDamage();
-                               dos.writeInt(id);
-                               dos.writeByte(size);
-                               dos.writeInt(damage);
-                       }else{
-                               dos.writeInt(0);
-                               dos.writeByte(0);
-                               dos.writeInt(0);
-                       }
-                       this.dropItems = null;
-
-                       dos.writeBoolean(this.isProvidePower);
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public void setAtoms(String par1, int par2){
-               if (this.atomsList.indexOf(par1) != -1){
-                       int var1 = this.atomsList.indexOf(par1);
-                       this.atomsAmountList.set(var1, this.atomsAmountList.get(var1) + par2);
-               }else{
-                       this.atomsList.add(par1);
-                       this.atomsAmountList.add(par2);
-               }
-               PacketDispatcher.sendPacketToAllPlayers(this.getDescriptionPacket());
-       }
-
-       public void setDropItems(ItemStack par1ItemStack){
-               this.dropItems = par1ItemStack;
-       }
-
-       public String getAtoms(){
-               StringBuffer var1 = new StringBuffer();
-               for(int i = 0;i < this.atomsList.size();i++){
-                       if (this.atomsAmountList.get(i) != 1){
-                               var1.append(this.atomsList.get(i) + this.atomsAmountList.get(i));
-                       }else{
-                               var1.append(this.atomsList.get(i));
-                       }
-               }
-               return var1.toString();
-       }
-
-       public ArrayList<String> getAtomsList(){
-               return this.atomsList;
-       }
-
-       public ArrayList<Integer> getAtomsAmountList(){
-               return this.atomsAmountList;
-       }
-
-       public void emptytoAtomsList(){
-               this.atomsList.clear();
-               this.atomsAmountList.clear();
-       }
-
-       public void setProvidePower(boolean par1) {
-               this.isProvidePower = par1;
-       }
-
-       public boolean getProvidePower() {
-               return this.isProvidePower;
-       }
-
-       public void field_00001() {
-               IInventory inv = this.getInvMaterial();
-               ItemStack[] stacks = new ItemStack[inv.getSizeInventory()];
-               for(int i = 0;i < stacks.length;i++){
-                       if(inv.getStackInSlot(i) != null){
-                               stacks[i] = inv.getStackInSlot(i);
-                       }
-               }
-               Arrays.sort(stacks, new ComparatorItemStack());
-               stacks = ChemiCraft.instance.arrayAuxiliary.deleteNull(stacks);
-
-               for(int i = 0;i < stacks.length;i++){
-                       if(stacks[i].stackSize > 1){
-                               this.setAtoms(ChemiCraftData.ATOMSLIST[stacks[i].getItemDamage()], stacks[i].stackSize);
-                       }else{
-                               this.setAtoms(ChemiCraftData.ATOMSLIST[stacks[i].getItemDamage()], 1);
-                       }
-               }
-
-               for(int i = 0;i < inv.getSizeInventory();i++){
-                       inv.setInventorySlotContents(i, null);
-               }
-       }
-
-       public void field_00002() {
-               ArrayList<String> var1 = this.getAtomsList();
-               ArrayList<Integer> var2 = this.getAtomsAmountList();
-
-               for (int i = 0;i < var1.size();i++) {
-                       for (int j = 0;j < ChemiCraftData.ATOMSLIST.length;j++) {
-                               if (var1.get(i).equals(ChemiCraftData.ATOMSLIST[j])) {
-                                       int var3 = var2.get(i);
-                                       while(var3 > 0){
-                                               if(var3 > 64){
-                                                       ItemStack itemstack = new ItemStack(ChemiCraft.instance.itemAtoms, 64, j);
-                                                       this.setDropItems(itemstack);
-                                                       PacketDispatcher.sendPacketToServer(this.getDescriptionPacket());
-                                                       var3 -= 64;
-                                               }else{
-                                                       ItemStack itemstack = new ItemStack(ChemiCraft.instance.itemAtoms, var3, j);
-                                                       this.setDropItems(itemstack);
-                                                       PacketDispatcher.sendPacketToServer(this.getDescriptionPacket());
-                                                       var3 = 0;
-                                               }
-                                       }
-                                       break;
-                               }
-                       }
-               }
-               IInventory invr = this.getInvResult();
-               if (invr.getStackInSlot(0) != null) {
-                       invr.setInventorySlotContents(0, null);
-               }
-               this.emptytoAtomsList();
-       }
-
-       protected boolean isNumber(String par1){
-               try {
-                       int var1 = Integer.valueOf(new String(par1));
-               } catch (Exception e) {
-                       return false;
-               }
-               return true;
-       }
-
-       public InventoryChemicalCombinationTableMaterial getInvMaterial(){
-               return this.invm;
-       }
-
-       public InventoryChemicalCombinationTableResult getInvResult(){
-               return this.invr;
-       }
-
-}
diff --git a/common/chemicraft/tileentity/TileEntityChemicalCraftingTable.java b/common/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
deleted file mode 100644 (file)
index dfd5a19..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-package chemicraft.tileentity;
-
-import java.io.DataOutputStream;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-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 com.google.common.io.ByteArrayDataInput;
-
-public class TileEntityChemicalCraftingTable extends TileEntity {
-
-       public IInventory chemicalCraftingInvMaterial = new InventoryChemicalCraftingMaterial();
-       public IInventory chemicalCraftingInvResult = new InventoryChemicalCraftingResult();
-       public IInventory chemicalCraftingInvNBT = new InventoryChemicalCraftingNBT();
-
-
-       public TileEntityChemicalCraftingTable() {
-               super();
-       }
-
-       @Override
-       public void updateEntity() {
-               super.updateEntity();
-       }
-
-
-       @Override
-       public void readFromNBT(NBTTagCompound par1) {
-               super.readFromNBT(par1);
-
-               NBTTagList var2 = par1.getTagList("Items");
-               for (int var3 = 0; var3 < var2.tagCount(); ++var3)
-               {
-                       NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
-                       int var5 = var4.getByte("Slot") & 255;
-
-                       if (var5 >= 0 && var5 < this.chemicalCraftingInvMaterial.getSizeInventory())
-                       {
-                               this.chemicalCraftingInvMaterial.setInventorySlotContents(var5, ItemStack.loadItemStackFromNBT(var4));
-                       }
-               }
-
-               NBTTagList var6 = par1.getTagList("Items2");
-               for (int var7 = 0; var7 < var6.tagCount(); ++var7)
-               {
-                       NBTTagCompound var4 = (NBTTagCompound)var6.tagAt(var7);
-                       int var5 = var4.getByte("Slot2") & 255;
-
-                       if (var5 >= 0 && var5 < this.chemicalCraftingInvResult.getSizeInventory())
-                       {
-                               this.chemicalCraftingInvResult.setInventorySlotContents(var5, ItemStack.loadItemStackFromNBT(var4));
-                       }
-               }
-
-               NBTTagList var8 = par1.getTagList("Items3");
-               for (int var9 = 0; var9 < var8.tagCount(); ++var9)
-               {
-                       NBTTagCompound var11 = (NBTTagCompound)var8.tagAt(var9);
-                       int var10 = var11.getByte("Slot3") & 255;
-
-                       if (var10 >= 0 && var10 < this.chemicalCraftingInvNBT.getSizeInventory())
-                       {
-                               this.chemicalCraftingInvNBT.setInventorySlotContents(var10, ItemStack.loadItemStackFromNBT(var11));
-                       }
-               }
-       }
-
-
-       @Override
-       public void writeToNBT(NBTTagCompound par1) {
-               super.writeToNBT(par1);
-
-               NBTTagList var2 = new NBTTagList();
-               for (int var3 = 0; var3 < this.chemicalCraftingInvMaterial.getSizeInventory(); ++var3)
-               {
-                       if (this.chemicalCraftingInvMaterial.getStackInSlot(var3) != null)
-                       {
-                               NBTTagCompound var4 = new NBTTagCompound();
-                               var4.setByte("Slot", (byte)var3);
-                               this.chemicalCraftingInvMaterial.getStackInSlot(var3).writeToNBT(var4);
-                               var2.appendTag(var4);
-                       }
-               }
-               par1.setTag("Items", var2);
-
-               NBTTagList var5 = new NBTTagList();
-               for (int var6 = 0; var6 < this.chemicalCraftingInvResult.getSizeInventory(); ++var6)
-               {
-                       if (this.chemicalCraftingInvResult.getStackInSlot(var6) != null)
-                       {
-                               NBTTagCompound var7 = new NBTTagCompound();
-                               var7.setByte("Slot2", (byte)var6);
-                               this.chemicalCraftingInvResult.getStackInSlot(var6).writeToNBT(var7);
-                               var5.appendTag(var7);
-                       }
-               }
-               par1.setTag("Items2", var5);
-
-               NBTTagList var8 = new NBTTagList();
-               for (int var9 = 0; var9 < this.chemicalCraftingInvNBT.getSizeInventory(); ++var9)
-               {
-                       if (this.chemicalCraftingInvNBT.getStackInSlot(var9) != null)
-                       {
-                               NBTTagCompound var10 = new NBTTagCompound();
-                               var10.setByte("Slot3", (byte)var9);
-                               this.chemicalCraftingInvNBT.getStackInSlot(var9).writeToNBT(var10);
-                               var8.appendTag(var10);
-                       }
-               }
-               par1.setTag("Items3", var8);
-       }
-
-
-       @Override
-       public Packet getDescriptionPacket() {
-               return PacketHandler.getPacket(this);
-       }
-
-
-       public void readPacket(ByteArrayDataInput data) {
-               try {
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-
-       public void writePacket(DataOutputStream dos){
-               try {
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-}
diff --git a/common/chemicraft/tileentity/TileEntityElectrolysisTable.java b/common/chemicraft/tileentity/TileEntityElectrolysisTable.java
deleted file mode 100644 (file)
index aab7b14..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-package chemicraft.tileentity;
-
-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;
-
-public class TileEntityElectrolysisTable extends TileEntity
-{
-
-       private InventoryElectrolysisMaterial invm = new InventoryElectrolysisMaterial();
-       private InventoryElectrolysisResult invr = new InventoryElectrolysisResult();
-       private InventoryElectrolysisFuel invf = new InventoryElectrolysisFuel();
-
-       public TileEntityElectrolysisTable() {
-               
-       }
-
-       @Override
-       public void readFromNBT(NBTTagCompound par1nbtTagCompound)
-       {
-               super.readFromNBT(par1nbtTagCompound);
-       }
-
-       @Override
-       public void writeToNBT(NBTTagCompound par1nbtTagCompound)
-       {
-               super.writeToNBT(par1nbtTagCompound);
-       }
-
-       @Override
-       public void updateEntity()
-       {
-               
-       }
-
-       @Override
-       public Packet getDescriptionPacket()
-       {
-               return super.getDescriptionPacket();
-       }
-
-       public InventoryElectrolysisMaterial getInvMaterial(){
-               return this.invm;
-       }
-
-       public InventoryElectrolysisResult getInvResult(){
-               return this.invr;
-       }
-
-       public InventoryElectrolysisFuel getInvFuel(){
-               return this.invf;
-       }
-
-}
diff --git a/common/chemicraft/tileentity/TileEntityPyrolysisTable.java b/common/chemicraft/tileentity/TileEntityPyrolysisTable.java
deleted file mode 100644 (file)
index 02b592d..0000000
+++ /dev/null
@@ -1,503 +0,0 @@
-package chemicraft.tileentity;
-
-import java.io.DataOutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-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 com.google.common.io.ByteArrayDataInput;
-
-public class TileEntityPyrolysisTable extends TileEntity {
-
-       private InventoryPyrolysisTableMaterial invm = new InventoryPyrolysisTableMaterial();
-       private InventoryPyrolysisTableResult invr = new InventoryPyrolysisTableResult();
-       private InventoryPyrolysisTableFuel invf = new InventoryPyrolysisTableFuel();
-
-       /**
-        * 熱量
-        */
-       private float heat = 0;
-
-       /**
-        * 素材の加熱時間
-        */
-       private float burnTime = 0;
-
-       /**
-        * 燃料の残り燃焼時間
-        */
-       private float fuelRestTime = 0;
-
-       /**
-        * 最大熱量
-        */
-       private static final int MAX_HEAT = 1700;
-
-       /**
-        * 燃料が燃え始める最低熱量
-        */
-       private static final int MIN_HEAT = 400;
-
-       /**
-        * 燃料の燃焼速度比率・素材の燃焼速度比率の中心となる熱量
-        */
-       private static final int CENTER_HEAT = 1050;
-
-       /**
-        * 分解までの時間
-        */
-       private static final int MAX_BURN_TIME = 2000;
-
-       /**
-        * Random of instance.
-        */
-       public static final Random rand = new Random();
-
-       /**
-        * 燃料のリスト。
-        */
-       private static HashMap<ItemStack, Integer> fuelList = new HashMap<ItemStack, Integer>();
-
-       /**
-        * レシピのリスト
-        */
-       private static HashMap<ItemStack, ItemStack[]> recipeList = new HashMap<ItemStack, ItemStack[]>();
-
-       @Override
-       public void updateEntity() {
-
-               //boolean var2 = false;
-
-               boolean var1 = this.worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord);
-               if (this.worldObj.getBlockId(xCoord, yCoord-1, zCoord) == Block.fire.blockID) {
-                       if (this.heat < 1700) {
-                               if (this.worldObj.isRaining() && var1 && !this.worldObj.isThundering()) {
-                                       this.heat += 0.1F;
-                               } else if (this.worldObj.isThundering() && var1) {
-                                       this.heat += 0.25F;
-                               } else {
-                                       this.heat += 3F;
-                               }
-                       } else {
-                               this.heat = 1700;
-                       }
-               } else {
-                       if (this.heat > 0) {
-                               if(this.worldObj.isRaining() && var1 && !this.worldObj.isThundering()) {
-                                       this.heat -= 0.25F;
-                               } else if(this.worldObj.isThundering() && var1) {
-                                       this.heat -= 0.5F;
-                               } else {
-                                       this.heat -= 0.05F;
-                               }
-                       } else {
-                               this.heat = 0;
-                       }
-               }
-
-               if (this.fuelRestTime >= 0) {
-                       this.burnTime += 10 * CENTER_HEAT / this.heat;
-                       this.fuelRestTime -= 10 * CENTER_HEAT / this.heat;
-               }
-
-               if (this.burnTime >= MAX_BURN_TIME) {
-                       Iterator<ItemStack> itMaterial = recipeList.keySet().iterator();
-                       while (itMaterial.hasNext()) {
-                               ItemStack itemstackMaterial = itMaterial.next();
-                               ItemStack materialItem = this.invm.getStackInSlot(0);
-                               if (materialItem != null) {
-                                       if (this.isInItemCheck(itemstackMaterial)) {
-                                               //var2 = true;
-                                               if (itemstackMaterial.itemID == materialItem.itemID && itemstackMaterial.getItemDamage() == materialItem.getItemDamage()) {
-                                                       this.inItem(itemstackMaterial);
-                                                       if (materialItem.stackSize >= 1) {
-                                                               this.invm.setInventorySlotContents(0, new ItemStack(materialItem.itemID, --materialItem.stackSize, materialItem.getItemDamage()));
-                                                       } else {
-                                                               this.invm.setInventorySlotContents(0, null);
-                                                       }
-                                                       break;
-                                               }
-                                       }
-                               }
-                       }
-                       this.burnTime = 0;
-               }
-
-               boolean var3 = false;
-               if (this.heat > MIN_HEAT) {
-                       Iterator<ItemStack> itMaterial = recipeList.keySet().iterator();
-                       while (itMaterial.hasNext()) {
-                               ItemStack itemstackMaterial = itMaterial.next();
-                               ItemStack materialItem = this.invm.getStackInSlot(0);
-                               if (materialItem != null) {
-                                       if (this.isInItemCheck(itemstackMaterial)) {
-                                               //var2 = true;
-                                               if (itemstackMaterial.itemID == materialItem.itemID && itemstackMaterial.getItemDamage() == materialItem.getItemDamage()) {
-                                                       var3 = true;
-                                                       if (this.fuelRestTime <= 0) {
-                                                               Iterator<ItemStack> itFuel = fuelList.keySet().iterator();
-                                                               while (itFuel.hasNext()) {
-                                                                       ItemStack itemstackFuel = itFuel.next();
-                                                                       ItemStack fuelItem = this.invf.getStackInSlot(0);
-                                                                       if (fuelItem != null) {
-                                                                               if (itemstackFuel.itemID == fuelItem.itemID && itemstackFuel.getItemDamage() == fuelItem.getItemDamage()) {
-                                                                                       this.fuelRestTime = fuelList.get(itemstackFuel);
-                                                                                       if (fuelItem.stackSize >= 1) {
-                                                                                               this.invf.setInventorySlotContents(0, new ItemStack(fuelItem.itemID, --fuelItem.stackSize, fuelItem.getItemDamage()));
-                                                                                               break;
-                                                                                       } else {
-                                                                                               this.invf.setInventorySlotContents(0, null);
-                                                                                               break;
-                                                                                       }
-                                                                               }
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               } else {
-                                       this.burnTime = 0;
-                                       //var2 = false;
-                               }
-                       }
-                       if (!var3) {
-                               this.burnTime = 0;
-                       }
-               }
-
-               /*
-               DebugTick.setDebugData("PyrolysisTable" +
-                               "(x:" + this.xCoord +
-                               " y:" + this.yCoord +
-                               " z:" + this.zCoord + ")",
-                               new DebugData("Heat", this.heat),
-                               new DebugData("FuelRestTime", this.fuelRestTime),
-                               new DebugData("BurnTime", this.burnTime),
-                               new DebugData("アイテムが入るか", var2)
-                               );
-                */
-       }
-
-       @Override
-       public void readFromNBT(NBTTagCompound par1) {
-               super.readFromNBT(par1);
-               this.heat = par1.getFloat("Heat");
-               this.burnTime = par1.getFloat("BurnTime");
-               this.fuelRestTime = par1.getFloat("FuelRestTime");
-
-               NBTTagList var2 = par1.getTagList("Items");
-               for (int var3 = 0; var3 < var2.tagCount(); ++var3)
-               {
-                       NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
-                       int var5 = var4.getByte("Slot") & 255;
-
-                       if  (var5 >= 0 && var5 < this.invm.getSizeInventory())
-                       {
-                               this.invm.setInventorySlotContents(var5, ItemStack.loadItemStackFromNBT(var4));
-                       }
-               }
-
-               NBTTagList var6 = par1.getTagList("Items2");
-               for (int var3 = 0; var3 < var6.tagCount(); ++var3)
-               {
-                       NBTTagCompound var7 = (NBTTagCompound)var6.tagAt(var3);
-                       int var8 = var7.getByte("Slot2") & 255;
-
-                       if  (var8 >= 0 && var8 < this.invr.getSizeInventory())
-                       {
-                               this.invr.setInventorySlotContents(var8, ItemStack.loadItemStackFromNBT(var7));
-                       }
-               }
-
-               NBTTagList var9 = par1.getTagList("Items3");
-               for (int var3 = 0; var3 < var9.tagCount(); ++var3)
-               {
-                       NBTTagCompound var10 = (NBTTagCompound)var9.tagAt(var3);
-                       int var11 = var10.getByte("Slot3") & 255;
-
-                       if  (var11 >= 0 && var11 < this.invf.getSizeInventory())
-                       {
-                               this.invf.setInventorySlotContents(var11, ItemStack.loadItemStackFromNBT(var10));
-                       }
-               }
-       }
-
-       @Override
-       public void writeToNBT(NBTTagCompound par1) {
-               super.writeToNBT(par1);
-               par1.setFloat("Heat", this.heat);
-               par1.setFloat("BurnTime", this.burnTime);
-               par1.setFloat("FuelRestTime", this.fuelRestTime);
-
-               NBTTagList var2 = new NBTTagList();
-               for (int var3 = 0; var3 < this.invm.getSizeInventory(); ++var3)
-               {
-                       if  (this.invm.getStackInSlot(var3) != null)
-                       {
-                               NBTTagCompound var4 = new NBTTagCompound();
-                               var4.setByte("Slot", (byte)var3);
-                               this.invm.getStackInSlot(var3).writeToNBT(var4);
-                               var2.appendTag(var4);
-                       }
-               }
-               par1.setTag("Items", var2);
-
-               NBTTagList var5 = new NBTTagList();
-               for (int var6 = 0; var6 < this.invr.getSizeInventory(); ++var6)
-               {
-                       if  (this.invr.getStackInSlot(var6) != null)
-                       {
-                               NBTTagCompound var7 = new NBTTagCompound();
-                               var7.setByte("Slot2", (byte)var6);
-                               this.invr.getStackInSlot(var6).writeToNBT(var7);
-                               var5.appendTag(var7);
-                       }
-               }
-               par1.setTag("Items2", var5);
-
-               NBTTagList var8 = new NBTTagList();
-               for (int var9 = 0; var9 < this.invf.getSizeInventory(); ++var9)
-               {
-                       if  (this.invf.getStackInSlot(var9) != null)
-                       {
-                               NBTTagCompound var10 = new NBTTagCompound();
-                               var10.setByte("Slot3", (byte)var9);
-                               this.invf.getStackInSlot(var9).writeToNBT(var10);
-                               var8.appendTag(var10);
-                       }
-               }
-               par1.setTag("Items3", var8);
-       }
-
-       @Override
-       public Packet getDescriptionPacket() {
-               return PacketHandler.getPacket(this);
-       }
-
-       public void readPacket(ByteArrayDataInput data) {
-               try {
-                       this.heat = data.readFloat();
-                       this.burnTime = data.readInt();
-                       this.fuelRestTime = data.readFloat();
-                       for(int i = 0;i < this.invm.getSizeInventory();i++){
-                               int id = data.readInt();
-                               int size = data.readByte();
-                               int damage = data.readInt();
-                               if (id != 0 && size != 0){
-                                       this.invm.setInventorySlotContents(i, new ItemStack(id, size, damage));
-                               }else{
-                                       this.invm.setInventorySlotContents(i, null);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invr.getSizeInventory();i++){
-                               int id = data.readInt();
-                               int size = data.readByte();
-                               int damage = data.readInt();
-                               if (id != 0 && size != 0){
-                                       this.invr.setInventorySlotContents(i, new ItemStack(id, size, damage));
-                               }else{
-                                       this.invr.setInventorySlotContents(i, null);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invf.getSizeInventory();i++){
-                               int id = data.readInt();
-                               int size = data.readByte();
-                               int damage = data.readInt();
-                               if (id != 0 && size != 0){
-                                       this.invf.setInventorySlotContents(i, new ItemStack(id, size, damage));
-                               }else{
-                                       this.invf.setInventorySlotContents(i, null);
-                               }
-                       }
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-
-       public void writePacket(DataOutputStream dos){
-               try {
-                       dos.writeFloat(this.heat);
-                       dos.writeFloat(this.burnTime);
-                       dos.writeFloat(this.fuelRestTime);
-                       for(int i = 0;i < this.invm.getSizeInventory();i++){
-                               int id = 0;
-                               int size = 0;
-                               int damage  = 0;
-                               ItemStack itemstack = this.invm.getStackInSlot(i);
-                               if (itemstack != null){
-                                       id = itemstack.itemID;
-                                       size = itemstack.stackSize;
-                                       damage = itemstack.getItemDamage();
-                                       dos.writeInt(id);
-                                       dos.writeByte(size);
-                                       dos.writeInt(damage);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeByte(0);
-                                       dos.writeInt(0);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invr.getSizeInventory();i++){
-                               int id = 0;
-                               int size = 0;
-                               int damage  = 0;
-                               ItemStack itemstack = this.invr.getStackInSlot(i);
-                               if (itemstack != null){
-                                       id = itemstack.itemID;
-                                       size = itemstack.stackSize;
-                                       damage = itemstack.getItemDamage();
-                                       dos.writeInt(id);
-                                       dos.writeByte(size);
-                                       dos.writeInt(damage);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeByte(0);
-                                       dos.writeInt(0);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invf.getSizeInventory();i++){
-                               int id = 0;
-                               int size = 0;
-                               int damage  = 0;
-                               ItemStack itemstack = this.invf.getStackInSlot(i);
-                               if (itemstack != null){
-                                       id = itemstack.itemID;
-                                       size = itemstack.stackSize;
-                                       damage = itemstack.getItemDamage();
-                                       dos.writeInt(id);
-                                       dos.writeByte(size);
-                                       dos.writeInt(damage);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeByte(0);
-                                       dos.writeInt(0);
-                               }
-                       }
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public float getBurnTime() {
-               return this.burnTime;
-       }
-
-       public float getHeat() {
-               return this.heat;
-       }
-
-       public InventoryPyrolysisTableMaterial getInvMaterial() {
-               return this.invm;
-       }
-
-       public InventoryPyrolysisTableResult getInvResult() {
-               return this.invr;
-       }
-
-       public InventoryPyrolysisTableFuel getInvFuel() {
-               return this.invf;
-       }
-
-       public boolean isInItemCheck(ItemStack key) {
-               ItemStack[] results = recipeList.get(key).clone();
-               ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
-               for (int i = 0; i < this.invr.getSizeInventory(); i++) {
-                       containerResults[i] = this.invr.getStackInSlot(i);
-               }
-
-               for (int i = 0; i < results.length; i++) {
-                       int var1 = results[i].itemID;
-                       int var3 = results[i].getItemDamage();
-                       int var5 = results[i].stackSize;
-                       for (int j = 0; j < containerResults.length; j++) {
-                               if (containerResults[j] == null) {
-                                       results[i] = null;
-                                       break;
-                               } else {
-                                       int var2 = containerResults[j].itemID;
-                                       int var4 = containerResults[j].getItemDamage();
-                                       int var6 = containerResults[j].stackSize;
-                                       int var7 = containerResults[j].getMaxStackSize();
-                                       if (var1 == var2 && var3 == var4) {
-                                               if (var5 + var6 <= var7) {
-                                                       results[i] = null;
-                                                       break;
-                                               } else {
-                                                       var5 -= var7 - var6;
-                                               }
-                                       }
-                               }
-                       }
-               }
-               for (int i = 0; i < results.length; i++) {
-                       if (results[i] != null) {
-                               return false;
-                       }
-               }
-               return true;
-       }
-
-       public void inItem(ItemStack key) {
-               ItemStack[] results = recipeList.get(key);
-               ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
-               for (int i = 0; i < this.invr.getSizeInventory(); i++) {
-                       containerResults[i] = this.invr.getStackInSlot(i);
-               }
-
-               for (int i = 0; i < results.length; i++) {
-                       int var1 = results[i].itemID;
-                       int var3 = results[i].getItemDamage();
-                       int var5 = results[i].stackSize;
-                       for (int j = 0; j < containerResults.length; j++) {
-                               if (containerResults[j] == null) {
-                                       this.invr.setInventorySlotContents(j, results[i]);
-                                       break;
-                               } else {
-                                       int var2 = containerResults[j].itemID;
-                                       int var4 = containerResults[j].getItemDamage();
-                                       int var6 = containerResults[j].stackSize;
-                                       int var7 = containerResults[j].getMaxStackSize();
-                                       if (var1 == var2 && var3 == var4) {
-                                               if (var5 + var6 <= var7) {
-                                                       System.out.println(var5);
-                                                       System.out.println(var6);
-                                                       System.out.println(var5 + var6);
-                                                       System.out.println(i);
-                                                       System.out.println(j);
-                                                       this.invr.setInventorySlotContents(j, new ItemStack(results[i].itemID, var5 + var6, results[i].getItemDamage()));
-                                                       break;
-                                               } else {
-                                                       this.invr.setInventorySlotContents(j, new ItemStack(results[i].itemID, var7, results[i].getItemDamage()));
-                                                       var5 -= var7 - var6;
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-
-       public static void addFuel(ItemStack itemstack, int burnTime) {
-               fuelList.put(itemstack, burnTime);
-       }
-
-       public static void addRecipe(ItemStack material, ItemStack[] result) {
-               recipeList.put(material, result);
-       }
-
-}
diff --git a/common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java b/common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java
deleted file mode 100644 (file)
index 44bc07e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-package chemicraft.tileentity;
-
-import java.io.DataOutputStream;
-
-import net.minecraft.tileentity.TileEntity;
-
-import com.google.common.io.ByteArrayDataInput;
-
-public class TileEntityToolAndWeaponCraftingTable extends TileEntity {
-
-       public void readPacket(ByteArrayDataInput data) {
-               try {
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-
-       public void writePacket(DataOutputStream dos){
-               try {
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-}
diff --git a/common/chemicraft/util/AtomInfo.java b/common/chemicraft/util/AtomInfo.java
deleted file mode 100644 (file)
index 484fef1..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-package chemicraft.util;\r
-\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.world.World;\r
-import cpw.mods.fml.relauncher.Side;\r
-import cpw.mods.fml.relauncher.SideOnly;\r
-\r
-/**\r
- * いろいろなデータを格納しメソッドによってチェックするクラス\r
- * 使用する場合はItemAtomInfoContainerを継承することを推奨\r
- * @author ponkotate\r
- *\r
- */\r
-public class AtomInfo {\r
-\r
-       /**\r
-        * X, Y, Z座標\r
-        */\r
-       private  int posX;\r
-       private  int posY;\r
-       private  int posZ;\r
-\r
-\r
-       /**\r
-        * biomeの名前\r
-        */\r
-       private  String biomeName;\r
-\r
-\r
-       /**\r
-        * 天候\r
-        */\r
-       private  String weather;\r
-\r
-\r
-       /**\r
-        * EntityPlayerのインスタンス\r
-        */\r
-       private EntityPlayer entityPlayer;\r
-\r
-\r
-       /**\r
-        * Worldのインスタンス\r
-        */\r
-       private World world;\r
-\r
-\r
-\r
-       /**\r
-        * AtomInfoのデータをupdateします\r
-        * @param par1World Worldのインスタンス\r
-        * @param par2EntityPlayer EntityPlayerのインスタンス\r
-        */\r
-       public void update(World par1World, EntityPlayer par2EntityPlayer){\r
-               //this.world = par1World;\r
-               //this.entityPlayer = par2EntityPlayer;\r
-\r
-               this.posX = (int) par2EntityPlayer.posX;\r
-               this.posY = (int) par2EntityPlayer.posY;\r
-               this.posZ = (int) par2EntityPlayer.posZ;\r
-\r
-               this.biomeName = par1World.getBiomeGenForCoords(posX, posZ).biomeName;\r
-\r
-               if (par1World.isThundering()){\r
-                       this.weather = "Thunder";\r
-               }else if(par1World.isRaining()){\r
-                       this.weather = "Rain";\r
-               }else{\r
-                       this.weather = "Sun";\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定されたBiomeと同等か比較します\r
-        * @param biomeName 比較するBiomeの名前\r
-        * @return Biomeが一致しているか\r
-        */\r
-       public boolean isEquivalentBiome(String biomeName){\r
-               if(this.biomeName != null){\r
-                       if(this.biomeName.equals(biomeName)){\r
-                               return true;\r
-                       }else{\r
-                               return false;\r
-                       }\r
-               }else{\r
-                       System.err.println("AtonInfo:データが入っていません。updateメソッドでデータを入れてください");\r
-                       return false;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定された天候と同等か比較します\r
-        * 晴れ:Sun, 雨:Rain, 雷雨:Thunder\r
-        * @param weather 比較する天候\r
-        * @return 天候が一致しているか\r
-        */\r
-       public boolean isEquivalentWeather(String weather){\r
-               if(this.weather != null){\r
-                       if(this.weather.equals(weather)){\r
-                               return true;\r
-                       }else{\r
-                               return false;\r
-                       }\r
-               }else{\r
-                       System.err.println("AtonInfo:データが入っていません。updateメソッドでデータを入れてください");\r
-                       return false;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定されたY軸より高いか判定します\r
-        * @param par1\r
-        * @return 指定されたY軸より高いか\r
-        */\r
-       @SideOnly(Side.CLIENT)\r
-       public boolean isOverY(int par1){\r
-               if(this.posY >= par1){\r
-                       return true;\r
-               }else{\r
-                       return false;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定されたY軸と同等か判定します\r
-        * @param par1\r
-        * @return 指定されたY軸と同等かどうか\r
-        */\r
-       @SideOnly(Side.CLIENT)\r
-       public boolean isEquivalentY(int par1){\r
-               if(this.posY == par1){\r
-                       return true;\r
-               }else{\r
-                       return false;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * 引数に指定されたY軸より低いか判定します\r
-        * @param par1\r
-        * @return 指定されたY軸より低いか\r
-        */\r
-       @SideOnly(Side.CLIENT)\r
-       public boolean isBelowY(int par1){\r
-               if(this.posY <= par1){\r
-                       return true;\r
-               }else{\r
-                       return false;\r
-               }\r
-       }\r
-\r
-}\r
diff --git a/common/chemicraft/util/Auxiliary.java b/common/chemicraft/util/Auxiliary.java
deleted file mode 100644 (file)
index 7560c60..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-package chemicraft.util;\r
-\r
-import net.minecraft.block.Block;\r
-import net.minecraft.item.Item;\r
-import net.minecraft.item.ItemStack;\r
-import cpw.mods.fml.common.registry.LanguageRegistry;\r
-\r
-public class Auxiliary {\r
-\r
-       /**\r
-        * 補助クラス\r
-        * @author mozipi\r
-        *\r
-        */\r
-       public static class NameAuxiliary {\r
-\r
-               /**\r
-                * 名前を設定します\r
-                * @param object\r
-                * @param Name\r
-                */\r
-               public void addName(Object object,Object name){\r
-                       LanguageRegistry.addName(object, (String) name);\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 名前を設定します(ItemStack版)\r
-                * @param object\r
-                * @param name\r
-                * @param meta\r
-                */\r
-               public void addName(ItemStack itemstack,Object name){\r
-                       LanguageRegistry.addName(itemstack, (String) name);\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定言語にそって名前を追加します\r
-                * @param object\r
-                * @param lang\r
-                * @param name\r
-                */\r
-               public void addName(Object object,String lang,Object name){\r
-                       LanguageRegistry.instance().addNameForObject(object, lang, (String) name);\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定言語にそって名前を追加します(ItemStack版)\r
-                * @param object\r
-                * @param lang\r
-                * @param name\r
-                */\r
-               public void addName(ItemStack object,String lang,Object name){\r
-                       LanguageRegistry.instance().addNameForObject(object, lang, (String) name);\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * メタデータごとに名前を追加します(Block版)\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Block object,Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.addName(new ItemStack(object,0,i), (String) name[i]);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * メタデータごとに名前を追加します(Item版)\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Item object,Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.addName(new ItemStack(object,0,i), (String) name[i]);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Block版)\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Block object,String lang,Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i]);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Item版)\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Item object,String lang, Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i]);\r
-                       }\r
-               }\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Block版)\r
-                * また、配列の前に任意の文字列を追加できます。\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Block object,String lang, String string, Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, string + (String) name[i]);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Item版)\r
-                * また、配列の前に任意の文字列を追加できます。\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Item object,String lang, String string, Object[] name){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, string + (String) name[i]);\r
-                       }\r
-               }\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Block版)\r
-                * また、配列の後ろに任意の文字列を追加できます。\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Block object,String lang, Object[] name, String string){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i] + string);\r
-                       }\r
-               }\r
-\r
-\r
-\r
-               /**\r
-                * 指定された言語にそってメタデータごとに名前を設定します(Item版)\r
-                * また、配列の後ろに任意の文字列を追加できます。\r
-                * @param object\r
-                * @param name\r
-                */\r
-               public void addName(Item object,String lang, Object[] name, String string){\r
-                       for(int i=0;i<name.length;i++){\r
-                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i] + string);\r
-                       }\r
-               }\r
-\r
-       }\r
-\r
-       public static class ArrayAuxiliary{\r
-\r
-               public ItemStack[] deleteNull(ItemStack[] array){\r
-                       int count = 0;\r
-                       ItemStack[] arrayCopy;\r
-                       for(int i = 0;i < array.length;i++){\r
-                               if(array[array.length - 1 - i] == null){\r
-                                       count++;\r
-                               }else{\r
-                                       break;\r
-                               }\r
-                       }\r
-                       arrayCopy = new ItemStack[array.length - count];\r
-                       for(int i = 0;i < arrayCopy.length;i++){\r
-                               arrayCopy[i] = array[i];\r
-                       }\r
-                       array = arrayCopy.clone();\r
-                       return array;\r
-               }\r
-\r
-       }\r
-\r
-}\r
diff --git a/common/chemicraft/util/ChemicalNBTRecipe.java b/common/chemicraft/util/ChemicalNBTRecipe.java
deleted file mode 100644 (file)
index 7fcf71e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-package chemicraft.util;
-
-import net.minecraft.item.ItemStack;
-
-public abstract class ChemicalNBTRecipe {
-
-       public abstract void setNBT(ItemStack[] materials, ItemStack result);
-
-       public abstract ItemStack[] getMatchItems(ItemStack[] materials);
-
-}
diff --git a/common/chemicraft/util/ChunkProviderChemical.java b/common/chemicraft/util/ChunkProviderChemical.java
deleted file mode 100644 (file)
index 31cb6a9..0000000
+++ /dev/null
@@ -1,687 +0,0 @@
-package chemicraft.util;
-
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.RAVINE;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.SCATTERED_FEATURE;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.STRONGHOLD;
-import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE;
-import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.DUNGEON;
-import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ICE;
-import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAKE;
-import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAVA;
-
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockSand;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.util.IProgressUpdate;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.ChunkPosition;
-import net.minecraft.world.SpawnerAnimals;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.MapGenBase;
-import net.minecraft.world.gen.MapGenCaves;
-import net.minecraft.world.gen.MapGenRavine;
-import net.minecraft.world.gen.NoiseGeneratorOctaves;
-import net.minecraft.world.gen.feature.MapGenScatteredFeature;
-import net.minecraft.world.gen.feature.WorldGenDungeons;
-import net.minecraft.world.gen.feature.WorldGenLakes;
-import net.minecraft.world.gen.structure.MapGenMineshaft;
-import net.minecraft.world.gen.structure.MapGenStronghold;
-import net.minecraft.world.gen.structure.MapGenVillage;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.Event.Result;
-import net.minecraftforge.event.terraingen.ChunkProviderEvent;
-import net.minecraftforge.event.terraingen.PopulateChunkEvent;
-import net.minecraftforge.event.terraingen.TerrainGen;
-
-public class ChunkProviderChemical implements IChunkProvider
-{
-       /** RNG. */
-       private Random rand;
-
-       /** A NoiseGeneratorOctaves used in generating terrain */
-       private NoiseGeneratorOctaves noiseGen1;
-
-       /** A NoiseGeneratorOctaves used in generating terrain */
-       private NoiseGeneratorOctaves noiseGen2;
-
-       /** A NoiseGeneratorOctaves used in generating terrain */
-       private NoiseGeneratorOctaves noiseGen3;
-
-       /** A NoiseGeneratorOctaves used in generating terrain */
-       private NoiseGeneratorOctaves noiseGen4;
-
-       /** A NoiseGeneratorOctaves used in generating terrain */
-       public NoiseGeneratorOctaves noiseGen5;
-
-       /** A NoiseGeneratorOctaves used in generating terrain */
-       public NoiseGeneratorOctaves noiseGen6;
-       public NoiseGeneratorOctaves mobSpawnerNoise;
-
-       /** Reference to the World object. */
-       private World worldObj;
-
-       /** are map structures going to be generated (e.g. strongholds) */
-       private final boolean mapFeaturesEnabled;
-
-       /** Holds the overall noise array used in chunk generation */
-       private double[] noiseArray;
-       private double[] stoneNoise = new double[256];
-       private MapGenBase caveGenerator = new MapGenCaves();
-
-       /** Holds Stronghold Generator */
-       private MapGenStronghold strongholdGenerator = new MapGenStronghold();
-
-       /** Holds Village Generator */
-       private MapGenVillage villageGenerator = new MapGenVillage();
-
-       /** Holds Mineshaft Generator */
-       private MapGenMineshaft mineshaftGenerator = new MapGenMineshaft();
-       private MapGenScatteredFeature scatteredFeatureGenerator = new MapGenScatteredFeature();
-
-       /** Holds ravine generator */
-       private MapGenBase ravineGenerator = new MapGenRavine();
-
-       /** The biomes that are used to generate the chunk */
-       private BiomeGenBase[] biomesForGeneration;
-
-       /** A double array that hold terrain noise from noiseGen3 */
-       double[] noise3;
-
-       /** A double array that hold terrain noise */
-       double[] noise1;
-
-       /** A double array that hold terrain noise from noiseGen2 */
-       double[] noise2;
-
-       /** A double array that hold terrain noise from noiseGen5 */
-       double[] noise5;
-
-       /** A double array that holds terrain noise from noiseGen6 */
-       double[] noise6;
-
-       /**
-        * Used to store the 5x5 parabolic field that is used during terrain generation.
-        */
-       float[] parabolicField;
-       int[][] field_73219_j = new int[32][32];
-
-       {
-               caveGenerator = TerrainGen.getModdedMapGen(caveGenerator, CAVE);
-               strongholdGenerator = (MapGenStronghold) TerrainGen.getModdedMapGen(strongholdGenerator, STRONGHOLD);
-               villageGenerator = (MapGenVillage) TerrainGen.getModdedMapGen(villageGenerator, VILLAGE);
-               mineshaftGenerator = (MapGenMineshaft) TerrainGen.getModdedMapGen(mineshaftGenerator, MINESHAFT);
-               scatteredFeatureGenerator = (MapGenScatteredFeature) TerrainGen.getModdedMapGen(scatteredFeatureGenerator, SCATTERED_FEATURE);
-               ravineGenerator = TerrainGen.getModdedMapGen(ravineGenerator, RAVINE);
-       }
-
-       public ChunkProviderChemical(World par1World, long par2, boolean par4)
-       {
-               this.worldObj = par1World;
-               this.mapFeaturesEnabled = par4;
-               this.rand = new Random(par2);
-               this.noiseGen1 = new NoiseGeneratorOctaves(this.rand, 16);
-               this.noiseGen2 = new NoiseGeneratorOctaves(this.rand, 16);
-               this.noiseGen3 = new NoiseGeneratorOctaves(this.rand, 8);
-               this.noiseGen4 = new NoiseGeneratorOctaves(this.rand, 4);
-               this.noiseGen5 = new NoiseGeneratorOctaves(this.rand, 10);
-               this.noiseGen6 = new NoiseGeneratorOctaves(this.rand, 16);
-               this.mobSpawnerNoise = new NoiseGeneratorOctaves(this.rand, 8);
-
-               NoiseGeneratorOctaves[] noiseGens = {noiseGen1, noiseGen2, noiseGen3, noiseGen4, noiseGen5, noiseGen6, mobSpawnerNoise};
-               noiseGens = TerrainGen.getModdedNoiseGenerators(par1World, this.rand, noiseGens);
-               this.noiseGen1 = noiseGens[0];
-               this.noiseGen2 = noiseGens[1];
-               this.noiseGen3 = noiseGens[2];
-               this.noiseGen4 = noiseGens[3];
-               this.noiseGen5 = noiseGens[4];
-               this.noiseGen6 = noiseGens[5];
-               this.mobSpawnerNoise = noiseGens[6];
-       }
-
-       /**
-        * Generates the shape of the terrain for the chunk though its all stone though the water is frozen if the
-        * temperature is low enough
-        */
-       public void generateTerrain(int par1, int par2, byte[] par3ArrayOfByte)
-       {
-               byte var4 = 4;
-               byte var5 = 16;
-               byte var6 = 63;
-               int var7 = var4 + 1;
-               byte var8 = 17;
-               int var9 = var4 + 1;
-               this.biomesForGeneration = this.worldObj.getWorldChunkManager().getBiomesForGeneration(this.biomesForGeneration, par1 * 4 - 2, par2 * 4 - 2, var7 + 5, var9 + 5);
-               this.noiseArray = this.initializeNoiseField(this.noiseArray, par1 * var4, 0, par2 * var4, var7, var8, var9);
-
-               for (int var10 = 0; var10 < var4; ++var10)
-               {
-                       for (int var11 = 0; var11 < var4; ++var11)
-                       {
-                               for (int var12 = 0; var12 < var5; ++var12)
-                               {
-                                       double var13 = 0.125D;
-                                       double var15 = this.noiseArray[((var10 + 0) * var9 + var11 + 0) * var8 + var12 + 0];
-                                       double var17 = this.noiseArray[((var10 + 0) * var9 + var11 + 1) * var8 + var12 + 0];
-                                       double var19 = this.noiseArray[((var10 + 1) * var9 + var11 + 0) * var8 + var12 + 0];
-                                       double var21 = this.noiseArray[((var10 + 1) * var9 + var11 + 1) * var8 + var12 + 0];
-                                       double var23 = (this.noiseArray[((var10 + 0) * var9 + var11 + 0) * var8 + var12 + 1] - var15) * var13;
-                                       double var25 = (this.noiseArray[((var10 + 0) * var9 + var11 + 1) * var8 + var12 + 1] - var17) * var13;
-                                       double var27 = (this.noiseArray[((var10 + 1) * var9 + var11 + 0) * var8 + var12 + 1] - var19) * var13;
-                                       double var29 = (this.noiseArray[((var10 + 1) * var9 + var11 + 1) * var8 + var12 + 1] - var21) * var13;
-
-                                       for (int var31 = 0; var31 < 8; ++var31)
-                                       {
-                                               double var32 = 0.25D;
-                                               double var34 = var15;
-                                               double var36 = var17;
-                                               double var38 = (var19 - var15) * var32;
-                                               double var40 = (var21 - var17) * var32;
-
-                                               for (int var42 = 0; var42 < 4; ++var42)
-                                               {
-                                                       int var43 = var42 + var10 * 4 << 11 | 0 + var11 * 4 << 7 | var12 * 8 + var31;
-                                                       short var44 = 128;
-                                                       var43 -= var44;
-                                                       double var45 = 0.25D;
-                                                       double var49 = (var36 - var34) * var45;
-                                                       double var47 = var34 - var49;
-
-                                                       for (int var51 = 0; var51 < 4; ++var51)
-                                                       {
-                                                               if ((var47 += var49) > 0.0D)
-                                                               {
-                                                                       par3ArrayOfByte[var43 += var44] = (byte)Block.stone.blockID;
-                                                               }
-                                                               else if (var12 * 8 + var31 < var6)
-                                                               {
-                                                                       //par3ArrayOfByte[var43 += var44] = (byte)Block.waterStill.blockID;
-                                                               }
-                                                               else
-                                                               {
-                                                                       par3ArrayOfByte[var43 += var44] = 0;
-                                                               }
-                                                       }
-
-                                                       var34 += var38;
-                                                       var36 += var40;
-                                               }
-
-                                               var15 += var23;
-                                               var17 += var25;
-                                               var19 += var27;
-                                               var21 += var29;
-                                       }
-                               }
-                       }
-               }
-       }
-
-       /**
-        * Replaces the stone that was placed in with blocks that match the biome
-        */
-       public void replaceBlocksForBiome(int par1, int par2, byte[] par3ArrayOfByte, BiomeGenBase[] par4ArrayOfBiomeGenBase)
-       {
-               ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, par1, par2, par3ArrayOfByte, par4ArrayOfBiomeGenBase);
-               MinecraftForge.EVENT_BUS.post(event);
-               if (event.getResult() == Result.DENY) return;
-
-               byte var5 = 63;
-               double var6 = 0.03125D;
-               this.stoneNoise = this.noiseGen4.generateNoiseOctaves(this.stoneNoise, par1 * 16, par2 * 16, 0, 16, 16, 1, var6 * 2.0D, var6 * 2.0D, var6 * 2.0D);
-
-               for (int var8 = 0; var8 < 16; ++var8)
-               {
-                       for (int var9 = 0; var9 < 16; ++var9)
-                       {
-                               BiomeGenBase var10 = par4ArrayOfBiomeGenBase[var9 + var8 * 16];
-                               float var11 = var10.getFloatTemperature();
-                               int var12 = (int)(this.stoneNoise[var8 + var9 * 16] / 3.0D + 3.0D + this.rand.nextDouble() * 0.25D);
-                               int var13 = -1;
-                               byte var14 = var10.topBlock;
-                               byte var15 = var10.fillerBlock;
-
-                               for (int var16 = 127; var16 >= 0; --var16)
-                               {
-                                       int var17 = (var9 * 16 + var8) * 128 + var16;
-
-                                       if (var16 <= 0 + this.rand.nextInt(5))
-                                       {
-                                               par3ArrayOfByte[var17] = (byte)Block.bedrock.blockID;
-                                       }
-                                       else
-                                       {
-                                               byte var18 = par3ArrayOfByte[var17];
-
-                                               if (var18 == 0)
-                                               {
-                                                       var13 = -1;
-                                               }
-                                               else if (var18 == Block.stone.blockID)
-                                               {
-                                                       if (var13 == -1)
-                                                       {
-                                                               if (var12 <= 0)
-                                                               {
-                                                                       var14 = 0;
-                                                                       var15 = (byte)Block.stone.blockID;
-                                                               }
-                                                               else if (var16 >= var5 - 4 && var16 <= var5 + 1)
-                                                               {
-                                                                       var14 = var10.topBlock;
-                                                                       var15 = var10.fillerBlock;
-                                                               }
-
-                                                               if (var16 < var5 && var14 == 0)
-                                                               {
-                                                                       if (var11 < 0.15F)
-                                                                       {
-                                                                               //var14 = (byte)Block.ice.blockID;
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               //var14 = (byte)Block.waterStill.blockID;
-                                                                       }
-                                                               }
-
-                                                               var13 = var12;
-
-                                                               if (var16 >= var5 - 1)
-                                                               {
-                                                                       par3ArrayOfByte[var17] = var14;
-                                                               }
-                                                               else
-                                                               {
-                                                                       par3ArrayOfByte[var17] = var15;
-                                                               }
-                                                       }
-                                                       else if (var13 > 0)
-                                                       {
-                                                               --var13;
-                                                               par3ArrayOfByte[var17] = var15;
-
-                                                               if (var13 == 0 && var15 == Block.sand.blockID)
-                                                               {
-                                                                       var13 = this.rand.nextInt(4);
-                                                                       var15 = (byte)Block.sandStone.blockID;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-
-       /**
-        * loads or generates the chunk at the chunk location specified
-        */
-       public Chunk loadChunk(int par1, int par2)
-       {
-               return this.provideChunk(par1, par2);
-       }
-
-       /**
-        * Will return back a chunk, if it doesn't exist and its not a MP client it will generates all the blocks for the
-        * specified chunk from the map seed and chunk seed
-        */
-       public Chunk provideChunk(int par1, int par2)
-       {
-               this.rand.setSeed((long)par1 * 341873128712L + (long)par2 * 132897987541L);
-               byte[] var3 = new byte[32768];
-               this.generateTerrain(par1, par2, var3);
-               this.biomesForGeneration = this.worldObj.getWorldChunkManager().loadBlockGeneratorData(this.biomesForGeneration, par1 * 16, par2 * 16, 16, 16);
-               this.replaceBlocksForBiome(par1, par2, var3, this.biomesForGeneration);
-               this.caveGenerator.generate(this, this.worldObj, par1, par2, var3);
-               this.ravineGenerator.generate(this, this.worldObj, par1, par2, var3);
-
-               if (this.mapFeaturesEnabled)
-               {
-                       this.mineshaftGenerator.generate(this, this.worldObj, par1, par2, var3);
-                       this.villageGenerator.generate(this, this.worldObj, par1, par2, var3);
-                       this.strongholdGenerator.generate(this, this.worldObj, par1, par2, var3);
-                       this.scatteredFeatureGenerator.generate(this, this.worldObj, par1, par2, var3);
-               }
-
-               Chunk var4 = new Chunk(this.worldObj, var3, par1, par2);
-               byte[] var5 = var4.getBiomeArray();
-
-               for (int var6 = 0; var6 < var5.length; ++var6)
-               {
-                       var5[var6] = (byte)this.biomesForGeneration[var6].biomeID;
-               }
-
-               var4.generateSkylightMap();
-               return var4;
-       }
-
-       /**
-        * generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the
-        * size.
-        */
-       private double[] initializeNoiseField(double[] par1ArrayOfDouble, int par2, int par3, int par4, int par5, int par6, int par7)
-       {
-               ChunkProviderEvent.InitNoiseField event = new ChunkProviderEvent.InitNoiseField(this, par1ArrayOfDouble, par2, par3, par4, par5, par6, par7);
-               MinecraftForge.EVENT_BUS.post(event);
-               if (event.getResult() == Result.DENY) return event.noisefield;
-
-               if (par1ArrayOfDouble == null)
-               {
-                       par1ArrayOfDouble = new double[par5 * par6 * par7];
-               }
-
-               if (this.parabolicField == null)
-               {
-                       this.parabolicField = new float[25];
-
-                       for (int var8 = -2; var8 <= 2; ++var8)
-                       {
-                               for (int var9 = -2; var9 <= 2; ++var9)
-                               {
-                                       float var10 = 10.0F / MathHelper.sqrt_float((float)(var8 * var8 + var9 * var9) + 0.2F);
-                                       this.parabolicField[var8 + 2 + (var9 + 2) * 5] = var10;
-                               }
-                       }
-               }
-
-               double var44 = 684.412D;
-               double var45 = 684.412D;
-               this.noise5 = this.noiseGen5.generateNoiseOctaves(this.noise5, par2, par4, par5, par7, 1.121D, 1.121D, 0.5D);
-               this.noise6 = this.noiseGen6.generateNoiseOctaves(this.noise6, par2, par4, par5, par7, 200.0D, 200.0D, 0.5D);
-               this.noise3 = this.noiseGen3.generateNoiseOctaves(this.noise3, par2, par3, par4, par5, par6, par7, var44 / 80.0D, var45 / 160.0D, var44 / 80.0D);
-               this.noise1 = this.noiseGen1.generateNoiseOctaves(this.noise1, par2, par3, par4, par5, par6, par7, var44, var45, var44);
-               this.noise2 = this.noiseGen2.generateNoiseOctaves(this.noise2, par2, par3, par4, par5, par6, par7, var44, var45, var44);
-               boolean var43 = false;
-               boolean var42 = false;
-               int var12 = 0;
-               int var13 = 0;
-
-               for (int var14 = 0; var14 < par5; ++var14)
-               {
-                       for (int var15 = 0; var15 < par7; ++var15)
-                       {
-                               float var16 = 0.0F;
-                               float var17 = 0.0F;
-                               float var18 = 0.0F;
-                               byte var19 = 2;
-                               BiomeGenBase var20 = this.biomesForGeneration[var14 + 2 + (var15 + 2) * (par5 + 5)];
-
-                               for (int var21 = -var19; var21 <= var19; ++var21)
-                               {
-                                       for (int var22 = -var19; var22 <= var19; ++var22)
-                                       {
-                                               BiomeGenBase var23 = this.biomesForGeneration[var14 + var21 + 2 + (var15 + var22 + 2) * (par5 + 5)];
-                                               float var24 = this.parabolicField[var21 + 2 + (var22 + 2) * 5] / (var23.minHeight + 2.0F);
-
-                                               if (var23.minHeight > var20.minHeight)
-                                               {
-                                                       var24 /= 2.0F;
-                                               }
-
-                                               var16 += var23.maxHeight * var24;
-                                               var17 += var23.minHeight * var24;
-                                               var18 += var24;
-                                       }
-                               }
-
-                               var16 /= var18;
-                               var17 /= var18;
-                               var16 = var16 * 0.9F + 0.1F;
-                               var17 = (var17 * 4.0F - 1.0F) / 8.0F;
-                               double var47 = this.noise6[var13] / 8000.0D;
-
-                               if (var47 < 0.0D)
-                               {
-                                       var47 = -var47 * 0.3D;
-                               }
-
-                               var47 = var47 * 3.0D - 2.0D;
-
-                               if (var47 < 0.0D)
-                               {
-                                       var47 /= 2.0D;
-
-                                       if (var47 < -1.0D)
-                                       {
-                                               var47 = -1.0D;
-                                       }
-
-                                       var47 /= 1.4D;
-                                       var47 /= 2.0D;
-                               }
-                               else
-                               {
-                                       if (var47 > 1.0D)
-                                       {
-                                               var47 = 1.0D;
-                                       }
-
-                                       var47 /= 8.0D;
-                               }
-
-                               ++var13;
-
-                               for (int var46 = 0; var46 < par6; ++var46)
-                               {
-                                       double var48 = (double)var17;
-                                       double var26 = (double)var16;
-                                       var48 += var47 * 0.2D;
-                                       var48 = var48 * (double)par6 / 16.0D;
-                                       double var28 = (double)par6 / 2.0D + var48 * 4.0D;
-                                       double var30 = 0.0D;
-                                       double var32 = ((double)var46 - var28) * 12.0D * 128.0D / 128.0D / var26;
-
-                                       if (var32 < 0.0D)
-                                       {
-                                               var32 *= 4.0D;
-                                       }
-
-                                       double var34 = this.noise1[var12] / 512.0D;
-                                       double var36 = this.noise2[var12] / 512.0D;
-                                       double var38 = (this.noise3[var12] / 10.0D + 1.0D) / 2.0D;
-
-                                       if (var38 < 0.0D)
-                                       {
-                                               var30 = var34;
-                                       }
-                                       else if (var38 > 1.0D)
-                                       {
-                                               var30 = var36;
-                                       }
-                                       else
-                                       {
-                                               var30 = var34 + (var36 - var34) * var38;
-                                       }
-
-                                       var30 -= var32;
-
-                                       if (var46 > par6 - 4)
-                                       {
-                                               double var40 = (double)((float)(var46 - (par6 - 4)) / 3.0F);
-                                               var30 = var30 * (1.0D - var40) + -10.0D * var40;
-                                       }
-
-                                       par1ArrayOfDouble[var12] = var30;
-                                       ++var12;
-                               }
-                       }
-               }
-
-               return par1ArrayOfDouble;
-       }
-
-       /**
-        * Checks to see if a chunk exists at x, y
-        */
-       public boolean chunkExists(int par1, int par2)
-       {
-               return true;
-       }
-
-       /**
-        * Populates chunk with ores etc etc
-        */
-       public void populate(IChunkProvider par1IChunkProvider, int par2, int par3)
-       {
-               BlockSand.fallInstantly = true;
-               int var4 = par2 * 16;
-               int var5 = par3 * 16;
-               BiomeGenBase var6 = this.worldObj.getBiomeGenForCoords(var4 + 16, var5 + 16);
-               this.rand.setSeed(this.worldObj.getSeed());
-               long var7 = this.rand.nextLong() / 2L * 2L + 1L;
-               long var9 = this.rand.nextLong() / 2L * 2L + 1L;
-               this.rand.setSeed((long)par2 * var7 + (long)par3 * var9 ^ this.worldObj.getSeed());
-               boolean var11 = false;
-
-               MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, par2, par3, var11));
-
-               if (this.mapFeaturesEnabled)
-               {
-                       this.mineshaftGenerator.generateStructuresInChunk(this.worldObj, this.rand, par2, par3);
-                       var11 = this.villageGenerator.generateStructuresInChunk(this.worldObj, this.rand, par2, par3);
-                       this.strongholdGenerator.generateStructuresInChunk(this.worldObj, this.rand, par2, par3);
-                       this.scatteredFeatureGenerator.generateStructuresInChunk(this.worldObj, this.rand, par2, par3);
-               }
-
-               int var12;
-               int var13;
-               int var14;
-
-               if (TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, var11, LAKE) &&
-                               !var11 && this.rand.nextInt(4) == 0)
-               {
-                       var12 = var4 + this.rand.nextInt(16) + 8;
-                       var13 = this.rand.nextInt(128);
-                       var14 = var5 + this.rand.nextInt(16) + 8;
-                       //(new WorldGenLakes(Block.waterStill.blockID)).generate(this.worldObj, this.rand, var12, var13, var14);
-               }
-
-               if (TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, var11, LAVA) &&
-                               !var11 && this.rand.nextInt(8) == 0)
-               {
-                       var12 = var4 + this.rand.nextInt(16) + 8;
-                       var13 = this.rand.nextInt(this.rand.nextInt(120) + 8);
-                       var14 = var5 + this.rand.nextInt(16) + 8;
-
-                       if (var13 < 63 || this.rand.nextInt(10) == 0)
-                       {
-                               (new WorldGenLakes(Block.lavaStill.blockID)).generate(this.worldObj, this.rand, var12, var13, var14);
-                       }
-               }
-
-               boolean doGen = TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, var11, DUNGEON);
-               for (var12 = 0; doGen && var12 < 8; ++var12)
-               {
-                       var13 = var4 + this.rand.nextInt(16) + 8;
-                       var14 = this.rand.nextInt(128);
-                       int var15 = var5 + this.rand.nextInt(16) + 8;
-
-                       if ((new WorldGenDungeons()).generate(this.worldObj, this.rand, var13, var14, var15))
-                       {
-                               ;
-                       }
-               }
-
-               var6.decorate(this.worldObj, this.rand, var4, var5);
-               SpawnerAnimals.performWorldGenSpawning(this.worldObj, var6, var4 + 8, var5 + 8, 16, 16, this.rand);
-               var4 += 8;
-               var5 += 8;
-
-               doGen = TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, var11, ICE);
-               for (var12 = 0; doGen && var12 < 16; ++var12)
-               {
-                       for (var13 = 0; var13 < 16; ++var13)
-                       {
-                               var14 = this.worldObj.getPrecipitationHeight(var4 + var12, var5 + var13);
-
-                               if (this.worldObj.isBlockFreezable(var12 + var4, var14 - 1, var13 + var5))
-                               {
-                                       this.worldObj.setBlockWithNotify(var12 + var4, var14 - 1, var13 + var5, Block.ice.blockID);
-                               }
-
-                               if (this.worldObj.canSnowAt(var12 + var4, var14, var13 + var5))
-                               {
-                                       this.worldObj.setBlockWithNotify(var12 + var4, var14, var13 + var5, Block.snow.blockID);
-                               }
-                       }
-               }
-
-               MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, var11));
-
-               BlockSand.fallInstantly = false;
-       }
-
-       /**
-        * Two modes of operation: if passed true, save all Chunks in one go.  If passed false, save up to two chunks.
-        * Return true if all chunks have been saved.
-        */
-       public boolean saveChunks(boolean par1, IProgressUpdate par2IProgressUpdate)
-       {
-               return true;
-       }
-
-       /**
-        * Unloads the 100 oldest chunks from memory, due to a bug with chunkSet.add() never being called it thinks the list
-        * is always empty and will not remove any chunks.
-        */
-       public boolean unload100OldestChunks()
-       {
-               return false;
-       }
-
-       /**
-        * Returns if the IChunkProvider supports saving.
-        */
-       public boolean canSave()
-       {
-               return true;
-       }
-
-       /**
-        * Converts the instance data to a readable string.
-        */
-       public String makeString()
-       {
-               return "RandomLevelSource";
-       }
-
-       /**
-        * Returns a list of creatures of the specified type that can spawn at the given location.
-        */
-       public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4)
-       {
-               BiomeGenBase var5 = this.worldObj.getBiomeGenForCoords(par2, par4);
-               return var5 == null ? null : (var5 == BiomeGenBase.swampland && par1EnumCreatureType == EnumCreatureType.monster && this.scatteredFeatureGenerator.hasStructureAt(par2, par3, par4) ? this.scatteredFeatureGenerator.getScatteredFeatureSpawnList() : var5.getSpawnableList(par1EnumCreatureType));
-       }
-
-       /**
-        * Returns the location of the closest structure of the specified type. If not found returns null.
-        */
-       public ChunkPosition findClosestStructure(World par1World, String par2Str, int par3, int par4, int par5)
-       {
-               return "Stronghold".equals(par2Str) && this.strongholdGenerator != null ? this.strongholdGenerator.getNearestInstance(par1World, par3, par4, par5) : null;
-       }
-
-       public int getLoadedChunkCount()
-       {
-               return 0;
-       }
-
-       public void recreateStructures(int par1, int par2)
-       {
-               if (this.mapFeaturesEnabled)
-               {
-                       this.mineshaftGenerator.generate(this, this.worldObj, par1, par2, (byte[])null);
-                       this.villageGenerator.generate(this, this.worldObj, par1, par2, (byte[])null);
-                       this.strongholdGenerator.generate(this, this.worldObj, par1, par2, (byte[])null);
-                       this.scatteredFeatureGenerator.generate(this, this.worldObj, par1, par2, (byte[])null);
-               }
-       }
-}
diff --git a/common/chemicraft/util/ComparatorFormulaPart.java b/common/chemicraft/util/ComparatorFormulaPart.java
deleted file mode 100644 (file)
index d6a7cf6..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-package chemicraft.util;
-
-import java.util.Comparator;
-
-public class ComparatorFormulaPart implements Comparator<FormulaPart> {
-
-       @Override
-       public int compare(FormulaPart o1, FormulaPart o2) {
-               int i = 0;
-               byte[] var1Byte = o1.getAtom().getBytes();
-               byte[] var2Byte = o2.getAtom().getBytes();
-               while (var1Byte.length > i && var2Byte.length > i) {
-                       if (var1Byte[i] == var2Byte[i]) {
-                               i++;
-                               continue;
-                       }
-                       if (var1Byte[i] < var2Byte[i]) {
-                               return -1;
-                       }
-                       if (var1Byte[i] > var2Byte[i]) {
-                               return 1;
-                       }
-               }
-               return 0;
-       }
-
-}
diff --git a/common/chemicraft/util/ComparatorItemStack.java b/common/chemicraft/util/ComparatorItemStack.java
deleted file mode 100644 (file)
index 8962fd6..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-package chemicraft.util;
-
-import java.util.Comparator;
-
-import net.minecraft.item.ItemStack;
-
-
-public class ComparatorItemStack implements Comparator {
-
-       @Override
-       public int compare(Object o1, Object o2) {
-               ItemStack i1 = (ItemStack) o1;
-               ItemStack i2 = (ItemStack) o2;
-
-               if(i1 != null && i2 != null){
-                       if(i1.itemID == i2.itemID){
-                               return i1.getItemDamage() > i2.getItemDamage() ? 1 : -1;
-                       }
-                       return i1.itemID > i2.itemID ? 1 : -1;
-               }
-               if(i1 == null && i2 == null) return 0;
-               if(i1 != null && i2 == null) return -1;
-               if(i1 == null && i2 != null) return 1;
-               return 0;
-       }
-
-}
diff --git a/common/chemicraft/util/CreativeTabAtoms.java b/common/chemicraft/util/CreativeTabAtoms.java
deleted file mode 100644 (file)
index a71d7c1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-package chemicraft.util;
-
-import net.minecraft.creativetab.CreativeTabs;
-import chemicraft.ChemiCraft;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class CreativeTabAtoms extends CreativeTabs {
-
-       public CreativeTabAtoms(String type){
-               super(type);
-       }
-
-
-       @Override
-       @SideOnly(Side.CLIENT)
-       public int getTabIconItemIndex(){
-               return ChemiCraft.instance.itemGasCollectingBottle.shiftedIndex;
-       }
-
-
-
-       @Override
-       @SideOnly(Side.CLIENT)
-       public String getTranslatedTabLabel(){
-               return "Atoms";
-       }
-
-}
diff --git a/common/chemicraft/util/FormulaPart.java b/common/chemicraft/util/FormulaPart.java
deleted file mode 100644 (file)
index 1786cd4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-package chemicraft.util;
-
-public class FormulaPart {
-
-       private String atom;
-       private int amount;
-
-       public FormulaPart(String par1, int par2){
-               this.atom = par1;
-               this.amount = par2;
-       }
-
-       public String getAtom(){
-               return this.atom;
-       }
-
-       public int getAmount(){
-               return this.amount;
-       }
-
-       @Override
-       public boolean equals(Object par1) {
-               try {
-                       FormulaPart var1 = (FormulaPart)par1;
-                       if (var1.atom.equals(this.atom) && var1.amount == this.amount) {
-                               return true;
-                       }
-               } catch (ClassCastException e) {
-                       return false;
-               }
-               return false;
-       }
-
-}
diff --git a/common/chemicraft/util/ICompoundHandler.java b/common/chemicraft/util/ICompoundHandler.java
deleted file mode 100644 (file)
index 9e2ac27..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-package chemicraft.util;\r
-\r
-import net.minecraft.entity.Entity;\r
-import net.minecraft.entity.player.EntityPlayer;\r
-import net.minecraft.item.ItemStack;\r
-import net.minecraft.world.World;\r
-\r
-public interface ICompoundHandler {\r
-\r
-       /**\r
-        * 右クリック時のHandler\r
-        * @param par1ItemStack\r
-        * @param par2World\r
-        * @param par3EntityPlayer\r
-        * @return\r
-        */\r
-       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer);\r
-\r
-\r
-       /**\r
-        * Itemを使用したときのHandler\r
-        * @param par1ItemStack\r
-        * @param par2EntityPlayer\r
-        * @param par3World\r
-        * @param par4\r
-        * @param par5\r
-        * @param par6\r
-        * @param par7\r
-        * @param par8\r
-        * @param par9\r
-        * @param par10\r
-        * @return\r
-        */\r
-       public boolean onItemUseHandler(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10);\r
-\r
-\r
-       /**\r
-        * 毎Tick呼ばれるHandler\r
-        * @param par1ItemStack\r
-        * @param par2World\r
-        * @param par3Entity\r
-        * @param par4\r
-        * @param par5\r
-        */\r
-       public void onUpdateHandler(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5);\r
-\r
-       /**\r
-        * iconIndexの指定\r
-        * @return iconIndex\r
-        */\r
-       public int getIconIndexHandler();\r
-\r
-}\r
diff --git a/common/chemicraft/util/MaterialRecipe.java b/common/chemicraft/util/MaterialRecipe.java
deleted file mode 100644 (file)
index 872d7bb..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-package chemicraft.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import net.minecraft.item.ItemStack;
-import chemicraft.ChemiCraft;
-import chemicraft.inventory.InventoryChemicalCraftingMaterial;
-
-public class MaterialRecipe {
-
-       private ChemicalNBTRecipe nbtRecipe;
-       private ItemStack result;
-       private ItemStack[] material;
-       private boolean isSharpless = true;
-
-       public MaterialRecipe(ItemStack par1ItemStack, ItemStack[] par2ItemStacks, ChemicalNBTRecipe par3NBTRecipe, boolean par4){
-               this.result = par1ItemStack;
-               this.material = par2ItemStacks.clone();
-               this.nbtRecipe = par3NBTRecipe;
-               this.isSharpless = par4;
-       }
-
-       @SuppressWarnings("unchecked")
-       public ItemStack match(InventoryChemicalCraftingMaterial par1IInventory){
-               ArrayList<ItemStack> invItemsArray = new ArrayList<ItemStack>();
-               ItemStack[] invItems;
-               for(int i = 0;i < par1IInventory.getSizeInventory();i++){
-                       invItemsArray.add(par1IInventory.getStackInSlot(i));
-               }
-               invItems = invItemsArray.toArray(new ItemStack[invItemsArray.size()]);
-
-               if(isSharpless){
-                       Arrays.sort(invItems, new ComparatorItemStack());
-                       Arrays.sort(this.material, new ComparatorItemStack());
-                       invItems = (ItemStack[]) ChemiCraft.instance.arrayAuxiliary.deleteNull(invItems);
-                       if(invItems.length != this.material.length) return null;
-                       for(int i = 0;i < this.material.length;i++){
-                               if(this.material[i].itemID != invItems[i].itemID) return null;
-                               if(this.material[i].getItemDamage() != invItems[i].getItemDamage()) return null;
-                       }
-                       return this.result;
-               }else{
-                       if(this.material.length != invItems.length) return null;
-                       for(int i = 0;i < this.material.length;i++){
-                               if(this.material[i] == null && invItems[i] != null) return null;
-                               if(this.material[i] != null && invItems[i] == null) return null;
-                               if(this.material[i] != null && invItems[i] != null){
-                                       if(this.material[i].itemID != invItems[i].itemID) return null;
-                                       if(this.material[i].getItemDamage() != invItems[i].getItemDamage()) return null;
-                               }
-                       }
-                       return this.result;
-               }
-       }
-
-       @SuppressWarnings("unchecked")
-       public ChemicalNBTRecipe nbtMatch(InventoryChemicalCraftingMaterial par1IInventory){
-               ArrayList<ItemStack> invItemsArray = new ArrayList<ItemStack>();
-               ItemStack[] invItems;
-               for(int i = 0;i < par1IInventory.getSizeInventory();i++){
-                       invItemsArray.add(par1IInventory.getStackInSlot(i));
-               }
-               invItems = invItemsArray.toArray(new ItemStack[invItemsArray.size()]);
-
-               if(isSharpless){
-                       Arrays.sort(invItems, new ComparatorItemStack());
-                       Arrays.sort(this.material, new ComparatorItemStack());
-                       invItems = (ItemStack[]) ChemiCraft.instance.arrayAuxiliary.deleteNull(invItems);
-                       if(invItems.length != this.material.length) return null;
-                       for(int i = 0;i < this.material.length;i++){
-                               if(this.material[i].itemID != invItems[i].itemID) return null;
-                               if(this.material[i].getItemDamage() != invItems[i].getItemDamage()) return null;
-                       }
-                       System.out.println(this.nbtRecipe);
-                       return this.nbtRecipe;
-               }else{
-                       if(this.material.length != invItems.length) return null;
-                       for(int i = 0;i < this.material.length;i++){
-                               if(this.material[i] == null && invItems[i] != null) return null;
-                               if(this.material[i] != null && invItems[i] == null) return null;
-                               if(this.material[i] != null && invItems[i] != null){
-                                       if(this.material[i].itemID != invItems[i].itemID) return null;
-                                       if(this.material[i].getItemDamage() != invItems[i].getItemDamage()) return null;
-                               }
-                       }
-                       return this.nbtRecipe;
-               }
-       }
-
-}
diff --git a/common/chemicraft/util/MathHelperPlus.java b/common/chemicraft/util/MathHelperPlus.java
deleted file mode 100644 (file)
index 775a77e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-package chemicraft.util;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-public class MathHelperPlus {
-
-       public static Random rand = new Random();
-
-       /**
-        * Return probability(0~).
-        */
-       public static int probability(double... par1) {
-               ArrayList<Double> var1 = new ArrayList<Double>();
-               for (int var2 = 0; var2 < par1.length; var2++) {
-                       var1.add(par1[var2]);
-               }
-               return probability(var1);
-       }
-
-       public static int probability(ArrayList<Double> par1) {
-               for (int i = 0; i < par1.size(); i++) {
-                       double var1 = par1.get(i) / 100;
-                       double var2 = Math.random();
-                       if (var1 <= var2) {
-                               return i;
-                       } else {
-                               continue;
-                       }
-               }
-               return -1;
-       }
-
-}
diff --git a/common/chemicraft/util/NBTRecipeGrenade.java b/common/chemicraft/util/NBTRecipeGrenade.java
deleted file mode 100644 (file)
index 8d342e0..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-package chemicraft.util;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import chemicraft.ChemiCraft;
-import chemicraft.ChemiCraftData;
-
-public class NBTRecipeGrenade extends ChemicalNBTRecipe {
-
-       @Override
-       public void setNBT(ItemStack[] materials, ItemStack result) {
-               if(result.stackTagCompound == null){
-                       result.stackTagCompound = new NBTTagCompound();
-               }
-
-               if (!result.stackTagCompound.hasKey("Effect"))
-               {
-                       result.stackTagCompound.setTag("Effect", new NBTTagList("Effect"));
-               }
-
-               NBTTagList tagList = (NBTTagList) result.getTagCompound().getTag("Effect");
-               NBTTagCompound tag = new NBTTagCompound();
-
-               for(int i = 0;i < materials.length;i++){
-                       if(materials[i] != null){
-                               if(materials[i].itemID-256 == ChemiCraft.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.HYDROGEN){
-                                       tag.setString("GrenadeEffect" + i, "Hydrogen");
-                               }
-                               if(materials[i].itemID-256 == ChemiCraft.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.CARBON){
-                                       tag.setString("GrenadeEffect" + i, "Carbon");
-                               }
-                               if(materials[i].itemID-256 == ChemiCraft.instance.atomsID && materials[i].getItemDamage() == ChemiCraftData.URANIUM){
-                                       tag.setString("GrenadeEffect" + i, "Uranium");
-                               }
-                       }
-               }
-               tagList.appendTag(tag);
-
-       }
-
-       @Override
-       public ItemStack[] getMatchItems(ItemStack[] materials) {
-               ItemStack[] var1 = new ItemStack[materials.length];
-               for(int i = 0;i < var1.length;i++){
-                       if(materials[i] != null){
-                               if(materials[i].getItemDamage() == ChemiCraftData.HYDROGEN){
-                                       var1[i] = materials[i];
-                               }else if(materials[i].getItemDamage() == ChemiCraftData.CARBON){
-                                       var1[i] = materials[i];
-                               }else if(materials[i].getItemDamage() == ChemiCraftData.URANIUM){
-                                       var1[i] = materials[i];
-                               }else{
-                                       var1[i] = null;
-                               }
-                       }else{
-                               var1[i] = null;
-                       }
-               }
-               return var1;
-       }
-
-}
diff --git a/common/chemicraft/util/WorldProviderChemical.java b/common/chemicraft/util/WorldProviderChemical.java
deleted file mode 100644 (file)
index ca7b168..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-package chemicraft.util;
-
-import net.minecraft.world.WorldProvider;
-
-public class WorldProviderChemical extends WorldProvider
-{
-
-       public WorldProviderChemical() {
-       }
-
-       public String getDimensionName()
-       {
-               return "Chemical";
-       }
-}
diff --git a/common/chemicraft/util/WorldTypeChemical.java b/common/chemicraft/util/WorldTypeChemical.java
deleted file mode 100644 (file)
index afe6a2e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-package chemicraft.util;
-
-import net.minecraft.world.World;
-import net.minecraft.world.WorldType;
-import net.minecraft.world.biome.WorldChunkManager;
-import net.minecraft.world.chunk.IChunkProvider;
-
-public class WorldTypeChemical extends WorldType {
-
-       public WorldTypeChemical(int par1, String par2Str) {
-               super(par1, par2Str);
-       }
-
-       public WorldChunkManager getChunkManager(World par1) {
-               return new WorldChunkManager(par1);
-       }
-
-       public IChunkProvider getChunkGenerator(World par1) {
-               return new ChunkProviderChemical(par1, par1.getSeed(), par1.getWorldInfo().isMapFeaturesEnabled());
-       }
-
-       public int getSeaLevel(World par1) {
-               return 64;
-       }
-
-       public boolean hasVoidParticles(boolean var1) {
-               return false;
-       }
-
-       public double voidFadeMagnitude() {
-               return 1.0D;
-       }
-
-}
index 39484a5..4bd7054 100644 (file)
Binary files a/resources/chemicraft/items/items.png and b/resources/chemicraft/items/items.png differ
index 1766554..70cafaa 100644 (file)
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:common/chemicraft/ChemiCraft.java
 package chemicraft;\r
 \r
 import net.minecraft.block.Block;\r
@@ -6,13 +5,12 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;\r
 import net.minecraft.item.Item;\r
 import net.minecraft.item.ItemStack;\r
-import net.minecraftforge.common.BiomeManager;\r
 import net.minecraftforge.common.Configuration;\r
-import net.minecraftforge.common.DimensionManager;\r
 import net.minecraftforge.common.Property;\r
 import chemicraft.block.BlockChemicalCombinationTable;\r
 import chemicraft.block.BlockChemicalCraftingTable;\r
-import chemicraft.block.BlockPyrolysisTable;\r
+import chemicraft.block.BlockDecompositionTable;\r
+import chemicraft.block.BlockElectrolysisTable;\r
 import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
 import chemicraft.compounds.CompoundWater;\r
 import chemicraft.debug.CommandDeleteItem;\r
@@ -26,14 +24,14 @@ import chemicraft.system.CommonProxy;
 import chemicraft.system.PacketHandler;\r
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityPyrolysisTable;\r
+import chemicraft.tileentity.TileEntityDecompositionTable;\r
+import chemicraft.tileentity.TileEntityElectrolysisTable;\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 chemicraft.util.WorldProviderChemical;\r
 import cpw.mods.fml.common.Mod;\r
 import cpw.mods.fml.common.SidedProxy;\r
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;\r
@@ -49,7 +47,9 @@ import cpw.mods.fml.common.registry.GameRegistry;
  *\r
  */\r
 @Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")\r
+// ID,名前,バージョン\r
 @NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)\r
+// クライアント、サーバー共に必要 1.3.2用\r
 public class ChemiCraft {\r
 \r
        public static final String[] ATOMSNAME = {\r
@@ -98,26 +98,29 @@ public class ChemiCraft {
        /**\r
         * BlockID.\r
         */\r
-       public int pyrolysisTableID;\r
+       public int decompositionTableID;\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 guiDecompositionTableID;\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 blockDecompositionTable;\r
        public Block blockChemicalCombinationTable;\r
        public Block blockToolAndWeaponCraftingTable;\r
        public Block blockChemicalCraftingTable;\r
+       public Block blockElectrolysisTable;\r
 \r
        /**\r
         * Item型変数.\r
@@ -133,11 +136,12 @@ public class ChemiCraft {
        public String itemAtomsTexture = "/chemicraft/items/Atoms.png";\r
        public String itemCompoundsTexture = "/chemicraft/items/Compounds.png";\r
        public String itemTexture = "/chemicraft/items/items.png";\r
-       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/cctable.png";\r
-       public String guiPyrolysisTexture = "/chemicraft/guis/Pyrolysis.png";\r
+       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/CCTable.png";\r
+       public String guiDecompositionTexture = "/chemicraft/guis/Decomposition.png";\r
        public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png";\r
        public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
        public String guiChemicalCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";\r
+       public String guiElectrolysisTableTexture = "/chemicraft/guis/ElectrolysisTable.png";\r
 \r
        /**\r
         * このmodに必要な補助クラスのインスタンス.\r
@@ -154,34 +158,38 @@ public class ChemiCraft {
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r
 \r
-               Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400);\r
+               Property decompositionTableIDProp = cfg.getBlock("DecompositionTable", 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 guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 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.decompositionTableID = decompositionTableIDProp.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.guiDecompositionTableID = guiDecompositionTableIDProp.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
@@ -203,11 +211,11 @@ public class ChemiCraft {
        private void settingProcessing(final FMLPostInitializationEvent event) {\r
 \r
                // Blockを追加します\r
-               this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground).\r
+               this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).\r
                                setHardness(2.0F).\r
                                setResistance(0.0F).\r
                                setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("PyrolysisTable");\r
+                               setBlockName("DecompositionTable");\r
                this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).\r
                                setHardness(2.0F).\r
                                setResistance(0.0F).\r
@@ -223,6 +231,11 @@ public class ChemiCraft {
                                setResistance(0.0F).\r
                                setStepSound(Block.soundStoneFootstep).\r
                                setBlockName("ChemicalCraftingTable");\r
+               this.blockElectrolysisTable = new BlockElectrolysisTable(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
@@ -231,20 +244,23 @@ public class ChemiCraft {
                this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);\r
 \r
                // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable");\r
+               GameRegistry.registerBlock(this.blockDecompositionTable, "BlockDecompositionTable");\r
                GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");\r
                GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");\r
                GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");\r
+               GameRegistry.registerBlock(this.blockElectrolysisTable, "ElectrolysisTable");\r
 \r
                // Blockの名前を設定します\r
-               this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable");\r
-               this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台");\r
+               this.nameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");\r
+               this.nameAuxiliary.addName(this.blockDecompositionTable, "ja_JP", "分解台");\r
                this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable");\r
                this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台");\r
                this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");\r
                this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");\r
                this.nameAuxiliary.addName(blockChemicalCraftingTable, "ChemicalCraftingTable");\r
                this.nameAuxiliary.addName(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
@@ -255,10 +271,11 @@ public class ChemiCraft {
                this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");\r
 \r
                // TileEntityを追加します\r
-               GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable");\r
+               GameRegistry.registerTileEntity(TileEntityDecompositionTable.class, "DecompositionTable");\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
@@ -267,13 +284,13 @@ public class ChemiCraft {
                proxy.registerRenderInformation();\r
 \r
                //化学作業台類のレシピを追加します\r
-               GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable),\r
+               GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable),\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
+                       Character.valueOf('A'), new ItemStack(Block.tnt),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
                                new Object[]{\r
@@ -305,12 +322,13 @@ public class ChemiCraft {
                api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");\r
                api.addLangCompound("ja_JP", "Water", "水");\r
                api.addCompound("Test");\r
-
+\r
 \r
                //化合物のHandlerを設定します\r
                api.settingCompoundHandler("Water", new CompoundWater());\r
 \r
                //化合物のレシピを追加します\r
+               api.addChemicalCombinationRecipe(new String[]{"C", "O"}, new Integer[]{1, 2}, new ItemStack(this.itemCompounds, 1, api.getCompound("CarbonDioxide")));\r
                api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water")));\r
 \r
                //手榴弾の追加\r
@@ -329,8 +347,6 @@ public class ChemiCraft {
                                new ItemStack(this.itemAtomGrenade, 16, 0),\r
                                new NBTRecipeGrenade()\r
                                );\r
-               //Tickingの追加\r
-               this.proxy.registerTickHandler();\r
        }\r
 \r
        private void apiProcessing(final FMLPostInitializationEvent event) {\r
@@ -344,369 +360,4 @@ public class ChemiCraft {
        private void debug(final FMLPostInitializationEvent event) {\r
        }\r
 \r
-}\r
-=======
-package 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 chemicraft.block.BlockChemicalCombinationTable;
-import chemicraft.block.BlockChemicalCraftingTable;
-import chemicraft.block.BlockDecompositionTable;
-import chemicraft.block.BlockElectrolysisTable;
-import chemicraft.block.BlockToolAndWeaponCraftingTable;
-import chemicraft.compounds.CompoundWater;
-import chemicraft.debug.CommandDeleteItem;
-import chemicraft.debug.CommandGenDebugRoom;
-import chemicraft.debug.CommandSetTile;
-import chemicraft.item.ItemAtoms;
-import chemicraft.item.ItemAtomsGrenade;
-import chemicraft.item.ItemCompounds;
-import chemicraft.item.ItemGasCollectingBottle;
-import chemicraft.system.CommonProxy;
-import chemicraft.system.PacketHandler;
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-import chemicraft.util.Auxiliary;
-import chemicraft.util.Auxiliary.ArrayAuxiliary;
-import chemicraft.util.Auxiliary.NameAuxiliary;
-import chemicraft.util.CreativeTabAtoms;
-import 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")
-// ID,名前,バージョン
-@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)
-// クライアント、サーバー共に必要 1.3.2用
-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 decompositionTableID;
-       public int chemicalConbinationTableID;
-       public int toolAndWeaponCraftingTableID;
-       public int chemicalCraftingTableID;
-       public int electrolysisTableID;
-
-       /**
-        * GUIID.
-        */
-       public int guiDecompositionTableID;
-       public int guiChemicalCombinationTableID;
-       public int guiToolAndWeaponCraftingTableID;
-       public int guiChemicalCraftingTableID;
-       public int guiElectrolysisTableID;
-
-       /**
-        * Block型変数.
-        */
-       public Block blockDecompositionTable;
-       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 String itemAtomsTexture = "/chemicraft/items/Atoms.png";
-       public String itemCompoundsTexture = "/chemicraft/items/Compounds.png";
-       public String itemTexture = "/chemicraft/items/items.png";
-       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/CCTable.png";
-       public String guiDecompositionTexture = "/chemicraft/guis/Decomposition.png";
-       public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png";
-       public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png";
-       public String guiChemicalCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";
-       public String guiElectrolysisTableTexture = "/chemicraft/guis/ElectrolysisTable.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 decompositionTableIDProp = cfg.getBlock("DecompositionTable", 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 guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 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.decompositionTableID = decompositionTableIDProp.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.guiDecompositionTableID = guiDecompositionTableIDProp.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.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).
-                               setHardness(2.0F).
-                               setResistance(0.0F).
-                               setStepSound(Block.soundStoneFootstep).
-                               setBlockName("DecompositionTable");
-               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(chemicalCraftingTableID, 0, Material.ground).
-                               setHardness(2.0F).
-                               setResistance(0.0F).
-                               setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ChemicalCraftingTable");
-               this.blockElectrolysisTable = new BlockElectrolysisTable(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.blockDecompositionTable, "BlockDecompositionTable");
-               GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");
-               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");
-               GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");
-               GameRegistry.registerBlock(this.blockElectrolysisTable, "ElectrolysisTable");
-
-               // Blockの名前を設定します
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "ja_JP", "分解台");
-               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable");
-               this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台");
-               this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");
-               this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "ChemicalCraftingTable");
-               this.nameAuxiliary.addName(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(TileEntityDecompositionTable.class, "DecompositionTable");
-               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.blockDecompositionTable),
-                               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.tnt),
-               });
-               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", "水");
-               api.addCompound("Test");
-
-
-               //化合物のHandlerを設定します
-               api.settingCompoundHandler("Water", new CompoundWater());
-
-               //化合物のレシピを追加します
-               api.addChemicalCombinationRecipe(new String[]{"C", "O"}, new Integer[]{1, 2}, new ItemStack(this.itemCompounds, 1, api.getCompound("CarbonDioxide")));
-               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()
-                               );
-       }
-
-       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) {
-       }
-
-}
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/ChemiCraft.java
+}
\ No newline at end of file
similarity index 91%
rename from common/chemicraft/ChemiCraftAPI.java
rename to src/chemicraft/ChemiCraftAPI.java
index b7b64e6..c04730b 100644 (file)
@@ -5,7 +5,6 @@ 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;
@@ -179,28 +178,10 @@ public class ChemiCraftAPI {
 
 
 
-       public void addDecompositionRecipe(ItemStack material, int[] results, int[] stacks) {
-               ItemStack[] itemstacks = new ItemStack[results.length];
-               for (int i = 0; i < itemstacks.length; i++) {
-                       itemstacks[i] = new ItemStack(ChemiCraft.instance.atomsID,stacks[i], results[i]);
-               }
-               TileEntityPyrolysisTable.addRecipe(material, itemstacks);
-       }
-
-
-
-       public void addDecompositionRecipe(ItemStack itemstack, int burnTime) {
-               TileEntityPyrolysisTable.addFuel(itemstack, burnTime);
-       }
-
-
-
        public void addSharplessMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){
                materialRecipe.add(new MaterialRecipe(result, materials, nbtRecipe, true));
        }
 
-
-
        public void addMaterialRecipe(ItemStack[] materials, ItemStack result, ChemicalNBTRecipe nbtRecipe){
                materialRecipe.add(new MaterialRecipe(result, materials, nbtRecipe, false));
        }
index 4594867..d04afa8 100644 (file)
@@ -6,12 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
-<<<<<<< HEAD:common/chemicraft/block/BlockPyrolysisTable.java
-import chemicraft.debug.DebugTick;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-=======
 import chemicraft.tileentity.TileEntityDecompositionTable;
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/block/BlockDecompositionTable.java
 
 public class BlockDecompositionTable extends BlockContainer {
 
@@ -36,20 +31,6 @@ public class BlockDecompositionTable extends BlockContainer {
 
 
        @Override
-       public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) {
-               TileEntity tileentity = par1World.getBlockTileEntity(par2, par3, par4);
-               if (tileentity != null) {
-                       DebugTick.removeDebugData("PyrolysisTable" +
-                                       "(x:" + tileentity.xCoord +
-                                       " y:" + tileentity.yCoord +
-                                       " z:" + tileentity.zCoord + ")");
-               }
-               super.breakBlock(par1World, par2, par3, par4, par5, par6);
-       }
-
-
-
-       @Override
        public int getBlockTextureFromSide(int par1)
        {
                if(par1 == 0){
index c1cd215..85fb428 100644 (file)
@@ -5,22 +5,21 @@ 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.GuiPyrolysisTable;
+import chemicraft.gui.GuiDecompositionTable;
+import chemicraft.gui.GuiElectrolysisTable;
 import chemicraft.gui.GuiToolAndWeaponCraftingTable;
 import chemicraft.render.RenderAtomsGrenade;
 import chemicraft.system.CommonProxy;
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
+import chemicraft.tileentity.TileEntityDecompositionTable;
+import chemicraft.tileentity.TileEntityElectrolysisTable;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.registry.TickRegistry;
-import cpw.mods.fml.relauncher.Side;
 
 public class ClientProxy extends CommonProxy {
 
@@ -31,9 +30,10 @@ public class ClientProxy extends CommonProxy {
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemCompoundsTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCombinationTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiPyrolysisTexture);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiDecompositionTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCraftingTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiElectrolysisTableTexture);
                RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F));
        }
 
@@ -44,14 +44,16 @@ public class ClientProxy extends CommonProxy {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if (tileEntity instanceof TileEntityPyrolysisTable) {
-                       return new GuiPyrolysisTable(player, (TileEntityPyrolysisTable) tileEntity);
+               if (tileEntity instanceof TileEntityDecompositionTable) {
+                       return new GuiDecompositionTable(player, (TileEntityDecompositionTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
                        return new GuiChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
                }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){
                        return new GuiToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
                        return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
+               }else if(tileEntity instanceof TileEntityElectrolysisTable){
+                       return new GuiElectrolysisTable(player, (TileEntityElectrolysisTable) tileEntity);
                }
                return null;
        }
@@ -62,9 +64,4 @@ public class ClientProxy extends CommonProxy {
                return FMLClientHandler.instance().getClient().theWorld;
        }
 
-       @Override
-       public void registerTickHandler() {
-               TickRegistry.registerTickHandler(new DebugTick(), Side.CLIENT);
-       }
-
 }
index 95a454a..b46340d 100644 (file)
@@ -2,17 +2,9 @@ package 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;
-<<<<<<< HEAD:common/chemicraft/container/ContainerPyrolysisTable.java
-import chemicraft.slot.SlotPyrolysisTableFuel;
-import chemicraft.slot.SlotPyrolysisTableMaterial;
-import chemicraft.slot.SlotPyrolysisTableResult;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-=======
 import chemicraft.tileentity.TileEntityDecompositionTable;
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/container/ContainerDecompositionTable.java
 
 public class ContainerDecompositionTable extends Container {
 
@@ -22,41 +14,12 @@ public class ContainerDecompositionTable extends Container {
        private int posY;
        private int posZ;
 
-<<<<<<< HEAD:common/chemicraft/container/ContainerPyrolysisTable.java
-       private TileEntityPyrolysisTable tileentity;
-
-       public ContainerPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2){
-=======
        public ContainerDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2){
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/container/ContainerDecompositionTable.java
                super();
-               this.tileentity = par2;
                this.worldObj = par2.worldObj;
                this.posX = par2.xCoord;
                this.posY = par2.yCoord;
                this.posZ = par2.zCoord;
-
-               for (int i = 0; i < 4; i++) {
-                       for (int j = 0; j < 4; j++) {
-                               this.addSlotToContainer(new SlotPyrolysisTableResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
-                       }
-               }
-               this.addSlotToContainer(new SlotPyrolysisTableMaterial(this.tileentity.getInvMaterial(), 0, 27, 20));
-               this.addSlotToContainer(new SlotPyrolysisTableFuel(this.tileentity.getInvFuel(), 0, 27, 63));
-
-               int var3;
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 121 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 179));
-               }
        }
 
        @Override
index 50fa3d6..be3b649 100644 (file)
@@ -48,7 +48,6 @@ public class CommandDeleteItem extends CommandBase {
                        world = player.worldObj;
                        list = world.loadedEntityList;
                        itr = list.iterator();
-                       player.dimension = 128;
                        while(itr.hasNext()){
                                Entity entity = itr.next();
                                if(entity instanceof EntityItem){
index b22ae2b..1bef9c4 100644 (file)
@@ -8,17 +8,8 @@ import chemicraft.tileentity.TileEntityDecompositionTable;
 
 public class GuiDecompositionTable extends GuiContainer{
 
-<<<<<<< HEAD:common/chemicraft/gui/GuiPyrolysisTable.java
-       private TileEntityPyrolysisTable tileentity;
-
-       public GuiPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2) {
-               super(new ContainerPyrolysisTable(par1EntityPlayer, par2));
-               this.tileentity = par2;
-               this.ySize = 204;
-=======
        public GuiDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2) {
                super(new ContainerDecompositionTable(par1EntityPlayer, par2));
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/gui/GuiDecompositionTable.java
        }
 
        @Override
@@ -27,9 +18,5 @@ public class GuiDecompositionTable extends GuiContainer{
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
-       @Override
-       protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-               this.fontRenderer.drawString(String.valueOf("Temp:" + (int)this.tileentity.getHeat()), 110, 100, 0x000000);
-       }
 
 }
index 8803c14..9326cb6 100644 (file)
@@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
 
 public class InventoryDecompositionTableMaterial implements IInventory {
 
-       private ItemStack[] inventory = new ItemStack[1];
+       private ItemStack[] inventory = new ItemStack[16];
        private Container eventHandler;
 
        public void setEventHandler(Container par1){
index fd8cca2..3feffd2 100644 (file)
@@ -62,7 +62,7 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
                return par1ItemStack;
        }
 
-       protected void isStackOrDrop(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer)
+       public void isStackOrDrop(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer)
        {
                if (!par2EntityPlayer.inventory.addItemStackToInventory(par1ItemStack)) {
                        par2EntityPlayer.dropPlayerItem(par1ItemStack);
index 9662c8c..a01f91f 100644 (file)
@@ -8,15 +8,12 @@ import chemicraft.container.ContainerChemicalCraftingTable;
 import chemicraft.container.ContainerDecompositionTable;
 import chemicraft.container.ContainerElectrolysisTable;
 import chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import chemicraft.debug.DebugTick;
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import chemicraft.tileentity.TileEntityDecompositionTable;
 import chemicraft.tileentity.TileEntityElectrolysisTable;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.common.registry.TickRegistry;
-import cpw.mods.fml.relauncher.Side;
 
 public class CommonProxy implements IGuiHandler {
 
@@ -58,8 +55,4 @@ public class CommonProxy implements IGuiHandler {
                return null;
        }
 
-       public void registerTickHandler() {
-               TickRegistry.registerTickHandler(new DebugTick(), Side.SERVER);
-       }
-
 }
\ No newline at end of file
index e40bb79..fcb4ee5 100644 (file)
@@ -1,201 +1,9 @@
 package chemicraft.tileentity;
 
 import java.io.DataOutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Random;
 
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-<<<<<<< HEAD:common/chemicraft/tileentity/TileEntityPyrolysisTable.java
-import chemicraft.debug.DebugData;
-import chemicraft.debug.DebugTick;
-import chemicraft.inventory.InventoryPyrolysisTableFuel;
-import chemicraft.inventory.InventoryPyrolysisTableMaterial;
-import chemicraft.inventory.InventoryPyrolysisTableResult;
-import chemicraft.system.PacketHandler;
-
-import com.google.common.io.ByteArrayDataInput;
-
-import cpw.mods.fml.common.network.PacketDispatcher;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class TileEntityPyrolysisTable extends TileEntity {
-
-       private InventoryPyrolysisTableMaterial invm = new InventoryPyrolysisTableMaterial();
-       private InventoryPyrolysisTableResult invr = new InventoryPyrolysisTableResult();
-       private InventoryPyrolysisTableFuel invf = new InventoryPyrolysisTableFuel();
-
-       /**
-        * 熱量
-        */
-       private float heat = 0;
-
-       /**
-        * 素材の加熱時間
-        */
-       private float burnTime = 0;
-
-       /**
-        * 燃料の残り燃焼時間
-        */
-       private float fuelRestTime = 0;
-
-       /**
-        * 最大熱量
-        */
-       private static final int MAX_HEAT = 1700;
-
-       /**
-        * 燃料が燃え始める最低熱量
-        */
-       private static final int MIN_HEAT = 400;
-
-       /**
-        * 燃料の燃焼速度比率・素材の燃焼速度比率の中心となる熱量
-        */
-       private static final int CENTER_HEAT = 1050;
-
-       /**
-        * 分解までの時間
-        */
-       private static final int MAX_BURN_TIME = 2000;
-
-       /**
-        * Random of instance.
-        */
-       public static final Random rand = new Random();
-
-       /**
-        * 燃料のリスト。
-        */
-       private static HashMap<ItemStack, Integer> fuelList = new HashMap<ItemStack, Integer>();
-
-       /**
-        * レシピのリスト
-        */
-       private static HashMap<ItemStack, ItemStack[]> recipeList = new HashMap<ItemStack, ItemStack[]>();
-
-       @Override
-       public void updateEntity() {
-
-               //boolean var2 = false;
-
-               boolean var1 = this.worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord);
-               if (this.worldObj.getBlockId(xCoord, yCoord-1, zCoord) == Block.fire.blockID) {
-                       if (this.heat < 1700) {
-                               if (this.worldObj.isRaining() && var1 && !this.worldObj.isThundering()) {
-                                       this.heat += 0.1F;
-                               } else if (this.worldObj.isThundering() && var1) {
-                                       this.heat += 0.25F;
-                               } else {
-                                       this.heat += 3F;
-                               }
-                       } else {
-                               this.heat = 1700;
-                       }
-               } else {
-                       if (this.heat > 0) {
-                               if(this.worldObj.isRaining() && var1 && !this.worldObj.isThundering()) {
-                                       this.heat -= 0.25F;
-                               } else if(this.worldObj.isThundering() && var1) {
-                                       this.heat -= 0.5F;
-                               } else {
-                                       this.heat -= 0.05F;
-                               }
-                       } else {
-                               this.heat = 0;
-                       }
-               }
-
-               if (this.fuelRestTime >= 0) {
-                       this.burnTime += 10 * CENTER_HEAT / this.heat;
-                       this.fuelRestTime -= 10 * CENTER_HEAT / this.heat;
-               }
-
-               if (this.burnTime >= MAX_BURN_TIME) {
-                       Iterator<ItemStack> itMaterial = recipeList.keySet().iterator();
-                       while (itMaterial.hasNext()) {
-                               ItemStack itemstackMaterial = itMaterial.next();
-                               ItemStack materialItem = this.invm.getStackInSlot(0);
-                               if (materialItem != null) {
-                                       if (this.isInItemCheck(itemstackMaterial)) {
-                                               //var2 = true;
-                                               if (itemstackMaterial.itemID == materialItem.itemID && itemstackMaterial.getItemDamage() == materialItem.getItemDamage()) {
-                                                       this.inItem(itemstackMaterial);
-                                                       if (materialItem.stackSize >= 1) {
-                                                               this.invm.setInventorySlotContents(0, new ItemStack(materialItem.itemID, --materialItem.stackSize, materialItem.getItemDamage()));
-                                                       } else {
-                                                               this.invm.setInventorySlotContents(0, null);
-                                                       }
-                                                       break;
-                                               }
-                                       }
-                               }
-                       }
-                       this.burnTime = 0;
-               }
-
-               boolean var3 = false;
-               if (this.heat > MIN_HEAT) {
-                       Iterator<ItemStack> itMaterial = recipeList.keySet().iterator();
-                       while (itMaterial.hasNext()) {
-                               ItemStack itemstackMaterial = itMaterial.next();
-                               ItemStack materialItem = this.invm.getStackInSlot(0);
-                               if (materialItem != null) {
-                                       if (this.isInItemCheck(itemstackMaterial)) {
-                                               //var2 = true;
-                                               if (itemstackMaterial.itemID == materialItem.itemID && itemstackMaterial.getItemDamage() == materialItem.getItemDamage()) {
-                                                       var3 = true;
-                                                       if (this.fuelRestTime <= 0) {
-                                                               Iterator<ItemStack> itFuel = fuelList.keySet().iterator();
-                                                               while (itFuel.hasNext()) {
-                                                                       ItemStack itemstackFuel = itFuel.next();
-                                                                       ItemStack fuelItem = this.invf.getStackInSlot(0);
-                                                                       if (fuelItem != null) {
-                                                                               if (itemstackFuel.itemID == fuelItem.itemID && itemstackFuel.getItemDamage() == fuelItem.getItemDamage()) {
-                                                                                       this.fuelRestTime = fuelList.get(itemstackFuel);
-                                                                                       if (fuelItem.stackSize >= 1) {
-                                                                                               this.invf.setInventorySlotContents(0, new ItemStack(fuelItem.itemID, --fuelItem.stackSize, fuelItem.getItemDamage()));
-                                                                                               break;
-                                                                                       } else {
-                                                                                               this.invf.setInventorySlotContents(0, null);
-                                                                                               break;
-                                                                                       }
-                                                                               }
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               } else {
-                                       this.burnTime = 0;
-                                       //var2 = false;
-                               }
-                       }
-                       if (!var3) {
-                               this.burnTime = 0;
-                       }
-               }
-
-               /*
-               DebugTick.setDebugData("PyrolysisTable" +
-                               "(x:" + this.xCoord +
-                               " y:" + this.yCoord +
-                               " z:" + this.zCoord + ")",
-                               new DebugData("Heat", this.heat),
-                               new DebugData("FuelRestTime", this.fuelRestTime),
-                               new DebugData("BurnTime", this.burnTime),
-                               new DebugData("アイテムが入るか", var2)
-                               );
-                */
-       }
-=======
 import chemicraft.inventory.InventoryDecompositionTableMaterial;
 import chemicraft.inventory.InventoryDecompositionTableResult;
 
@@ -205,141 +13,19 @@ public class TileEntityDecompositionTable extends TileEntity {
 
        private InventoryDecompositionTableMaterial invm = new InventoryDecompositionTableMaterial();
        private InventoryDecompositionTableResult invr = new InventoryDecompositionTableResult();
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/tileentity/TileEntityDecompositionTable.java
 
        @Override
        public void readFromNBT(NBTTagCompound par1) {
                super.readFromNBT(par1);
-               this.heat = par1.getFloat("Heat");
-               this.burnTime = par1.getFloat("BurnTime");
-               this.fuelRestTime = par1.getFloat("FuelRestTime");
-
-               NBTTagList var2 = par1.getTagList("Items");
-               for (int var3 = 0; var3 < var2.tagCount(); ++var3)
-               {
-                       NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
-                       int var5 = var4.getByte("Slot") & 255;
-
-                       if  (var5 >= 0 && var5 < this.invm.getSizeInventory())
-                       {
-                               this.invm.setInventorySlotContents(var5, ItemStack.loadItemStackFromNBT(var4));
-                       }
-               }
-
-               NBTTagList var6 = par1.getTagList("Items2");
-               for (int var3 = 0; var3 < var6.tagCount(); ++var3)
-               {
-                       NBTTagCompound var7 = (NBTTagCompound)var6.tagAt(var3);
-                       int var8 = var7.getByte("Slot2") & 255;
-
-                       if  (var8 >= 0 && var8 < this.invr.getSizeInventory())
-                       {
-                               this.invr.setInventorySlotContents(var8, ItemStack.loadItemStackFromNBT(var7));
-                       }
-               }
-
-               NBTTagList var9 = par1.getTagList("Items3");
-               for (int var3 = 0; var3 < var9.tagCount(); ++var3)
-               {
-                       NBTTagCompound var10 = (NBTTagCompound)var9.tagAt(var3);
-                       int var11 = var10.getByte("Slot3") & 255;
-
-                       if  (var11 >= 0 && var11 < this.invf.getSizeInventory())
-                       {
-                               this.invf.setInventorySlotContents(var11, ItemStack.loadItemStackFromNBT(var10));
-                       }
-               }
        }
 
        @Override
        public void writeToNBT(NBTTagCompound par1) {
                super.writeToNBT(par1);
-               par1.setFloat("Heat", this.heat);
-               par1.setFloat("BurnTime", this.burnTime);
-               par1.setFloat("FuelRestTime", this.fuelRestTime);
-
-               NBTTagList var2 = new NBTTagList();
-               for (int var3 = 0; var3 < this.invm.getSizeInventory(); ++var3)
-               {
-                       if  (this.invm.getStackInSlot(var3) != null)
-                       {
-                               NBTTagCompound var4 = new NBTTagCompound();
-                               var4.setByte("Slot", (byte)var3);
-                               this.invm.getStackInSlot(var3).writeToNBT(var4);
-                               var2.appendTag(var4);
-                       }
-               }
-               par1.setTag("Items", var2);
-
-               NBTTagList var5 = new NBTTagList();
-               for (int var6 = 0; var6 < this.invr.getSizeInventory(); ++var6)
-               {
-                       if  (this.invr.getStackInSlot(var6) != null)
-                       {
-                               NBTTagCompound var7 = new NBTTagCompound();
-                               var7.setByte("Slot2", (byte)var6);
-                               this.invr.getStackInSlot(var6).writeToNBT(var7);
-                               var5.appendTag(var7);
-                       }
-               }
-               par1.setTag("Items2", var5);
-
-               NBTTagList var8 = new NBTTagList();
-               for (int var9 = 0; var9 < this.invf.getSizeInventory(); ++var9)
-               {
-                       if  (this.invf.getStackInSlot(var9) != null)
-                       {
-                               NBTTagCompound var10 = new NBTTagCompound();
-                               var10.setByte("Slot3", (byte)var9);
-                               this.invf.getStackInSlot(var9).writeToNBT(var10);
-                               var8.appendTag(var10);
-                       }
-               }
-               par1.setTag("Items3", var8);
-       }
-
-       @Override
-       public Packet getDescriptionPacket() {
-               return PacketHandler.getPacket(this);
        }
 
        public void readPacket(ByteArrayDataInput data) {
                try {
-                       this.heat = data.readFloat();
-                       this.burnTime = data.readInt();
-                       this.fuelRestTime = data.readFloat();
-                       for(int i = 0;i < this.invm.getSizeInventory();i++){
-                               int id = data.readInt();
-                               int size = data.readByte();
-                               int damage = data.readInt();
-                               if (id != 0 && size != 0){
-                                       this.invm.setInventorySlotContents(i, new ItemStack(id, size, damage));
-                               }else{
-                                       this.invm.setInventorySlotContents(i, null);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invr.getSizeInventory();i++){
-                               int id = data.readInt();
-                               int size = data.readByte();
-                               int damage = data.readInt();
-                               if (id != 0 && size != 0){
-                                       this.invr.setInventorySlotContents(i, new ItemStack(id, size, damage));
-                               }else{
-                                       this.invr.setInventorySlotContents(i, null);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invf.getSizeInventory();i++){
-                               int id = data.readInt();
-                               int size = data.readByte();
-                               int damage = data.readInt();
-                               if (id != 0 && size != 0){
-                                       this.invf.setInventorySlotContents(i, new ItemStack(id, size, damage));
-                               }else{
-                                       this.invf.setInventorySlotContents(i, null);
-                               }
-                       }
                } catch (Exception e) {
                        e.printStackTrace();
                }
@@ -348,83 +34,12 @@ public class TileEntityDecompositionTable extends TileEntity {
 
        public void writePacket(DataOutputStream dos){
                try {
-                       dos.writeFloat(this.heat);
-                       dos.writeFloat(this.burnTime);
-                       dos.writeFloat(this.fuelRestTime);
-                       for(int i = 0;i < this.invm.getSizeInventory();i++){
-                               int id = 0;
-                               int size = 0;
-                               int damage  = 0;
-                               ItemStack itemstack = this.invm.getStackInSlot(i);
-                               if (itemstack != null){
-                                       id = itemstack.itemID;
-                                       size = itemstack.stackSize;
-                                       damage = itemstack.getItemDamage();
-                                       dos.writeInt(id);
-                                       dos.writeByte(size);
-                                       dos.writeInt(damage);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeByte(0);
-                                       dos.writeInt(0);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invr.getSizeInventory();i++){
-                               int id = 0;
-                               int size = 0;
-                               int damage  = 0;
-                               ItemStack itemstack = this.invr.getStackInSlot(i);
-                               if (itemstack != null){
-                                       id = itemstack.itemID;
-                                       size = itemstack.stackSize;
-                                       damage = itemstack.getItemDamage();
-                                       dos.writeInt(id);
-                                       dos.writeByte(size);
-                                       dos.writeInt(damage);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeByte(0);
-                                       dos.writeInt(0);
-                               }
-                       }
-
-                       for(int i = 0;i < this.invf.getSizeInventory();i++){
-                               int id = 0;
-                               int size = 0;
-                               int damage  = 0;
-                               ItemStack itemstack = this.invf.getStackInSlot(i);
-                               if (itemstack != null){
-                                       id = itemstack.itemID;
-                                       size = itemstack.stackSize;
-                                       damage = itemstack.getItemDamage();
-                                       dos.writeInt(id);
-                                       dos.writeByte(size);
-                                       dos.writeInt(damage);
-                               }else{
-                                       dos.writeInt(0);
-                                       dos.writeByte(0);
-                                       dos.writeInt(0);
-                               }
-                       }
                } catch (Exception e) {
                        e.printStackTrace();
                }
        }
 
-<<<<<<< HEAD:common/chemicraft/tileentity/TileEntityPyrolysisTable.java
-       public float getBurnTime() {
-               return this.burnTime;
-       }
-
-       public float getHeat() {
-               return this.heat;
-       }
-
-       public InventoryPyrolysisTableMaterial getInvMaterial() {
-=======
        public InventoryDecompositionTableMaterial getInvMaterial() {
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/tileentity/TileEntityDecompositionTable.java
                return this.invm;
        }
 
@@ -432,94 +47,4 @@ public class TileEntityDecompositionTable extends TileEntity {
                return this.invr;
        }
 
-       public InventoryPyrolysisTableFuel getInvFuel() {
-               return this.invf;
-       }
-
-       public boolean isInItemCheck(ItemStack key) {
-               ItemStack[] results = recipeList.get(key).clone();
-               ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
-               for (int i = 0; i < this.invr.getSizeInventory(); i++) {
-                       containerResults[i] = this.invr.getStackInSlot(i);
-               }
-
-               for (int i = 0; i < results.length; i++) {
-                       int var1 = results[i].itemID;
-                       int var3 = results[i].getItemDamage();
-                       int var5 = results[i].stackSize;
-                       for (int j = 0; j < containerResults.length; j++) {
-                               if (containerResults[j] == null) {
-                                       results[i] = null;
-                                       break;
-                               } else {
-                                       int var2 = containerResults[j].itemID;
-                                       int var4 = containerResults[j].getItemDamage();
-                                       int var6 = containerResults[j].stackSize;
-                                       int var7 = containerResults[j].getMaxStackSize();
-                                       if (var1 == var2 && var3 == var4) {
-                                               if (var5 + var6 <= var7) {
-                                                       results[i] = null;
-                                                       break;
-                                               } else {
-                                                       var5 -= var7 - var6;
-                                               }
-                                       }
-                               }
-                       }
-               }
-               for (int i = 0; i < results.length; i++) {
-                       if (results[i] != null) {
-                               return false;
-                       }
-               }
-               return true;
-       }
-
-       public void inItem(ItemStack key) {
-               ItemStack[] results = recipeList.get(key);
-               ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
-               for (int i = 0; i < this.invr.getSizeInventory(); i++) {
-                       containerResults[i] = this.invr.getStackInSlot(i);
-               }
-
-               for (int i = 0; i < results.length; i++) {
-                       int var1 = results[i].itemID;
-                       int var3 = results[i].getItemDamage();
-                       int var5 = results[i].stackSize;
-                       for (int j = 0; j < containerResults.length; j++) {
-                               if (containerResults[j] == null) {
-                                       this.invr.setInventorySlotContents(j, results[i]);
-                                       break;
-                               } else {
-                                       int var2 = containerResults[j].itemID;
-                                       int var4 = containerResults[j].getItemDamage();
-                                       int var6 = containerResults[j].stackSize;
-                                       int var7 = containerResults[j].getMaxStackSize();
-                                       if (var1 == var2 && var3 == var4) {
-                                               if (var5 + var6 <= var7) {
-                                                       System.out.println(var5);
-                                                       System.out.println(var6);
-                                                       System.out.println(var5 + var6);
-                                                       System.out.println(i);
-                                                       System.out.println(j);
-                                                       this.invr.setInventorySlotContents(j, new ItemStack(results[i].itemID, var5 + var6, results[i].getItemDamage()));
-                                                       break;
-                                               } else {
-                                                       this.invr.setInventorySlotContents(j, new ItemStack(results[i].itemID, var7, results[i].getItemDamage()));
-                                                       var5 -= var7 - var6;
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-
-       public static void addFuel(ItemStack itemstack, int burnTime) {
-               fuelList.put(itemstack, burnTime);
-       }
-
-       public static void addRecipe(ItemStack material, ItemStack[] result) {
-               recipeList.put(material, result);
-       }
-
 }
index 775a77e..a4fbb2b 100644 (file)
@@ -3,29 +3,42 @@ package chemicraft.util;
 import java.util.ArrayList;
 import java.util.Random;
 
-public class MathHelperPlus {
-
-       public static Random rand = new Random();
+public class MathHelperPlus
+{
 
        /**
         * Return probability(0~).
         */
-       public static int probability(double... par1) {
+       public static int probability(double... par1)
+       {
                ArrayList<Double> var1 = new ArrayList<Double>();
-               for (int var2 = 0; var2 < par1.length; var2++) {
+               for (int var2 = 0; var2 < par1.length; var2++){
                        var1.add(par1[var2]);
                }
                return probability(var1);
        }
 
-       public static int probability(ArrayList<Double> par1) {
-               for (int i = 0; i < par1.size(); i++) {
-                       double var1 = par1.get(i) / 100;
-                       double var2 = Math.random();
-                       if (var1 <= var2) {
-                               return i;
+       public static int probability(ArrayList<Double> par1)
+       {
+               Random var2 = new Random();
+               int var3 = var2.nextInt(100);
+               double var4 = 0.0D;
+
+               for (int var5 = 0; var5 < par1.size(); var5++) {
+                       var4 += par1.get(var5);
+               }
+
+               ArrayList<Double> var6 = new ArrayList<Double>();
+               for (int var7 = 0; var7 < par1.size(); var7++) {
+                       var6.add(par1.get(var7) / var4 * 100);
+               }
+
+               double var8 = 0.0D;
+               for (int var9 = 0; var9 < var6.size(); var9++) {
+                       if (var3 < var6.get(var9) + var8) {
+                               return var9;
                        } else {
-                               continue;
+                               var8 += var6.get(var9);
                        }
                }
                return -1;
diff --git a/アカウント関係.txt b/アカウント関係.txt
deleted file mode 100644 (file)
index 862c4c8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-mail:chemicraft@live.jp
-tid:chemicraft
-ajalpccahas5154
\ No newline at end of file
index 1dd7129..a6d2d08 100644 (file)
Binary files a/仕様書/分解装置.odt and b/仕様書/分解装置.odt differ