OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Mon, 11 Feb 2013 02:28:17 +0000 (11:28 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Mon, 11 Feb 2013 02:28:17 +0000 (11:28 +0900)
Conflicts:
common/chemicraft/inventory/InventoryElectrolysisFuel.java
common/chemicraft/inventory/InventoryElectrolysisMaterial.java
common/chemicraft/inventory/InventoryElectrolysisResult.java
common/chemicraft/inventory/InventoryElectrolysisTableFuel.java
common/chemicraft/inventory/InventoryElectrolysisTableMaterial.java
common/chemicraft/inventory/InventoryElectrolysisTableResult.java
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/ChemiCraftAPI.java
common/pcc/chemicraft/block/BlockElectrolysisTable.java
common/pcc/chemicraft/compounds/CompoundDebug.java
common/pcc/chemicraft/container/ContainerElectrolysis.java
common/pcc/chemicraft/container/ContainerElectrolysisTable.java
common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
common/pcc/chemicraft/inventory/InventoryElectrolysisFuel.java
common/pcc/chemicraft/inventory/InventoryElectrolysisMaterial.java
common/pcc/chemicraft/inventory/InventoryElectrolysisResult.java
common/pcc/chemicraft/system/CommonProxy.java
common/pcc/chemicraft/system/PacketHandler.java
common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
common/pcc/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java

31 files changed:
1  2 
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/ChemiCraftAPI.java
common/pcc/chemicraft/block/BlockChemicalCombinationTable.java
common/pcc/chemicraft/block/BlockChemicalCraftingTable.java
common/pcc/chemicraft/block/BlockElectrolysisTable.java
common/pcc/chemicraft/block/BlockPyrolysisTable.java
common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java
common/pcc/chemicraft/client/ClientProxy.java
common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
common/pcc/chemicraft/container/ContainerElectrolysisTable.java
common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
common/pcc/chemicraft/debug/DebugTick.java
common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java
common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
common/pcc/chemicraft/gui/GuiElectrolysisTable.java
common/pcc/chemicraft/gui/GuiPyrolysisTable.java
common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
common/pcc/chemicraft/inventory/InventoryPyrolysisTableMaterial.java
common/pcc/chemicraft/inventory/InventoryPyrolysisTableResult.java
common/pcc/chemicraft/item/ItemAtoms.java
common/pcc/chemicraft/item/ItemCompounds.java
common/pcc/chemicraft/item/ItemGasCollectingBottle.java
common/pcc/chemicraft/render/RenderAtomsGrenade.java
common/pcc/chemicraft/slot/SlotPyrolysisTableMaterial.java
common/pcc/chemicraft/slot/SlotPyrolysisTableResult.java
common/pcc/chemicraft/system/CommonProxy.java
common/pcc/chemicraft/system/PacketHandler.java
common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
common/pcc/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java

index 32dac1c,0000000..5e6d87f
mode 100644,000000..100644
--- /dev/null
@@@ -1,381 -1,0 +1,756 @@@
++<<<<<<< HEAD:common/pcc/chemicraft/ChemiCraft.java
 +package pcc.chemicraft;
 +
 +import net.minecraft.block.Block;
 +import net.minecraft.block.material.Material;
 +import net.minecraft.creativetab.CreativeTabs;
 +import net.minecraft.item.Item;
 +import net.minecraft.item.ItemStack;
 +import net.minecraftforge.common.Configuration;
 +import net.minecraftforge.common.Property;
 +import pcc.chemicraft.block.BlockChemicalCombinationTable;
 +import pcc.chemicraft.block.BlockChemicalCraftingTable;
 +import pcc.chemicraft.block.BlockElectrolysisTable;
 +import pcc.chemicraft.block.BlockPyrolysisTable;
 +import pcc.chemicraft.block.BlockToolAndWeaponCraftingTable;
 +import pcc.chemicraft.compounds.CompoundDebug;
 +import pcc.chemicraft.compounds.CompoundWater;
 +import pcc.chemicraft.debug.CommandDeleteItem;
 +import pcc.chemicraft.debug.CommandGenDebugRoom;
 +import pcc.chemicraft.debug.CommandSetTile;
 +import pcc.chemicraft.item.ItemAtoms;
 +import pcc.chemicraft.item.ItemAtomsGrenade;
 +import pcc.chemicraft.item.ItemCompounds;
 +import pcc.chemicraft.item.ItemGasCollectingBottle;
 +import pcc.chemicraft.system.CommonProxy;
 +import pcc.chemicraft.system.PacketHandler;
 +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 +import pcc.chemicraft.util.Auxiliary;
 +import pcc.chemicraft.util.Auxiliary.ArrayAuxiliary;
 +import pcc.chemicraft.util.Auxiliary.NameAuxiliary;
 +import pcc.chemicraft.util.CreativeTabAtoms;
 +import pcc.chemicraft.util.NBTRecipeGrenade;
 +import cpw.mods.fml.common.Mod;
 +import cpw.mods.fml.common.SidedProxy;
 +import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 +import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 +import cpw.mods.fml.common.event.FMLServerStartingEvent;
 +import cpw.mods.fml.common.network.NetworkMod;
 +import cpw.mods.fml.common.network.NetworkRegistry;
 +import cpw.mods.fml.common.registry.GameRegistry;
 +
 +/**
 + * ChemiCraft本体
 + * @author P.C.C.
 + *
 + */
 +@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")
 +@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)
 +public class ChemiCraft {
 +
 +      public static final String[] ATOMSNAME = {
 +              "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon",
 +              "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium",
 +              "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium",
 +              "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium",
 +              "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",
 +              "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium",
 +              "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium",
 +              "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" };
 +
 +      public static final String[] ATOMSNAMEJP = {
 +              "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",
 +              "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",
 +              "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",
 +              "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",
 +              "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム",
 +              "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" };
 +
 +      /**
 +       * このmodのインスタンス
 +       */
 +      @Mod.Instance("chemiCraft")
 +      public static ChemiCraft instance;
 +
 +      /**
 +       * ChemiCraftのProxy.
 +       */
 +      @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.system.CommonProxy")
 +      public static CommonProxy proxy;
 +
 +      /**
 +       * ChemiCraftのCreativeTab.
 +       */
 +      public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");
 +
 +      /**
 +       * ItemID.
 +       */
 +      public int atomsID;
 +      public int compoundsID;
 +      public int gasCollectingBottleID;
 +      public int atomGrenadeID;
 +
 +      /**
 +       * BlockID.
 +       */
 +      public int pyrolysisTableID;
 +      public int chemicalConbinationTableID;
 +      public int toolAndWeaponCraftingTableID;
 +      public int chemicalCraftingTableID;
 +      public int electrolysisTableID;
 +
 +      /**
 +       * GUIID.
 +       */
 +      public int guiPyrolysisTableID;
 +      public int guiChemicalCombinationTableID;
 +      public int guiToolAndWeaponCraftingTableID;
 +      public int guiChemicalCraftingTableID;
 +      public int guiElectrolysisTableID;
 +
 +      /**
 +       * Block型変数.
 +       */
 +      public Block blockPyrolysisTable;
 +      public Block blockChemicalCombinationTable;
 +      public Block blockToolAndWeaponCraftingTable;
 +      public Block blockChemicalCraftingTable;
 +      public Block blockElectrolysisTable;
 +
 +      /**
 +       * Item型変数.
 +       */
 +      public Item itemAtoms;
 +      public Item itemCompounds;
 +      public Item itemGasCollectingBottle;
 +      public Item itemAtomGrenade;
 +
 +      /**
 +       * このmodで使用するTextureのパス.
 +       */
 +      public final String ITEM_ATOMS_TEXTURE = "/chemicraft/items/Atoms.png";
 +      public final String ITEM_COMPOUNDS_TEXTURE = "/chemicraft/items/Compounds.png";
 +      public final String ITEM_TEXTURE = "/chemicraft/items/items.png";
 +      public final String BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE = "/chemicraft/blocks/cctable.png";
 +      public final String GUI_PYROLYSIS_TEXTURE = "/chemicraft/guis/Pyrolysis.png";
 +      public final String GUI_ELECTROLYSIS_TEXTURE = "/chemicraft/guis/Electrolysis.png";
 +      public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/chemicraft/guis/ChemicalCombination.png";
 +      public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/chemicraft/guis/ToolAndWeaponCrafting.png";
 +      public final String GUI_CHEMICALCRAFTING_TEXTURE = "/chemicraft/guis/MaterialCrafting.png";
 +
 +      /**
 +       * このmodに必要な補助クラスのインスタンス.
 +       */
 +      public Auxiliary auxiliary = new Auxiliary();
 +      public NameAuxiliary nameAuxiliary = new NameAuxiliary();
 +      public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary();
 +
 +      private ChemiCraftAPI api = ChemiCraftAPI.getInstance();
 +      private ChemiCraftData chemicalData = new ChemiCraftData();
 +
 +      @Mod.PreInit
 +      public void chemiPreLoadMethod(final FMLPreInitializationEvent event) {
 +              Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
 +              cfg.load();
 +
 +              Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400);
 +              Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);
 +              Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);
 +              Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);
 +              Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTableID", 2404);
 +
 +              Property atomsIDProp = cfg.getItem("AtomsID", 25000);
 +              Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);
 +              Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);
 +              Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);
 +
 +              Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000);
 +              Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);
 +              Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);
 +              Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003);
 +              Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableID", 1004);
 +
 +
 +              this.pyrolysisTableID = pyrolysisTableIDProp.getInt();
 +              this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();
 +              this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();
 +              this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();
 +              this.electrolysisTableID = electrolysisTableIDProp.getInt();
 +              this.atomsID = atomsIDProp.getInt();
 +              this.compoundsID = compoundsIDProp.getInt();
 +              this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
 +              this.atomGrenadeID = atomGrenadeIDProp.getInt();
 +              this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();
 +              this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();
 +              this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();
 +              this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();
 +              this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt();
 +
 +              cfg.save();
 +      }
 +
 +      @Mod.ServerStarting
 +      public void serverStarting(final FMLServerStartingEvent event) {
 +              event.registerServerCommand(new CommandSetTile());
 +              event.registerServerCommand(new CommandDeleteItem());
 +              event.registerServerCommand(new CommandGenDebugRoom());
 +      }
 +
 +      @Mod.PostInit
 +      public void chemiPostLoadMethod(final FMLPostInitializationEvent event) {
 +              this.settingProcessing(event);
 +              this.apiProcessing(event);
 +              this.debug(event);
 +      }
 +
 +      private void settingProcessing(final FMLPostInitializationEvent event) {
 +
 +              // Blockを追加します
 +              this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground).
 +                              setHardness(2.0F).
 +                              setResistance(0.0F).
 +                              setStepSound(Block.soundStoneFootstep).
 +                              setBlockName("PyrolysisTable");
 +              this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).
 +                              setHardness(2.0F).
 +                              setResistance(0.0F).
 +                              setStepSound(Block.soundStoneFootstep).
 +                              setBlockName("ChemicalCombinationTable");
 +              this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).
 +                              setHardness(2.0F).
 +                              setResistance(0.0F).
 +                              setStepSound(Block.soundStoneFootstep).
 +                              setBlockName("ToolAndWeaponCraftingTable");
 +              this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.chemicalCraftingTableID, 0, Material.ground).
 +                              setHardness(2.0F).
 +                              setResistance(0.0F).
 +                              setStepSound(Block.soundStoneFootstep).
 +                              setBlockName("ChemicalCraftingTable");
 +              this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground).
 +                              setHardness(2.0F).
 +                              setResistance(0.0F).
 +                              setStepSound(Block.soundStoneFootstep).
 +                              setBlockName("ElectrolysisTable");
 +
 +              // Itemを追加します
 +              this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");
 +              this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds");
 +              this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0);
 +              this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);
 +
 +              // BlockをMinecraftに登録します
 +              GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable");
 +              GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");
 +              GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");
 +              GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");
 +              GameRegistry.registerBlock(this.blockElectrolysisTable, "BlockElectrolysisTable");
 +
 +              // Blockの名前を設定します
 +              this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable");
 +              this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台");
 +              this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable");
 +              this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台");
 +              this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");
 +              this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");
 +              this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ChemicalCraftingTable");
 +              this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ja_JP", "素材製作台");
 +              this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable");
 +              this.nameAuxiliary.addName(this.blockElectrolysisTable, "ja_JP", "電気分解台");
 +
 +              // Itemの名前を設定します
 +              this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME);
 +              this.nameAuxiliary.addName(this.itemAtoms, "ja_JP", ATOMSNAMEJP);
 +              this.nameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle");
 +              this.nameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶");
 +              this.nameAuxiliary.addName(this.itemAtomGrenade, "AtomGrenade");
 +              this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");
 +
 +              // TileEntityを追加します
 +              GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable");
 +              GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");
 +              GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");
 +              GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");
 +              GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable");
 +
 +              // GUIを追加します
 +              NetworkRegistry.instance().registerGuiHandler(instance, proxy);
 +
 +              // 描画関係の読み込み
 +              proxy.registerRenderInformation();
 +
 +              //化学作業台類のレシピを追加します
 +              GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable),
 +                              new Object[]{
 +                      "XYX", "ZAZ", "ZZZ",
 +                      Character.valueOf('X'), new ItemStack(Item.ingotIron),
 +                      Character.valueOf('Y'), new ItemStack(Block.workbench),
 +                      Character.valueOf('Z'), new ItemStack(Block.stone),
 +                      Character.valueOf('A'), new ItemStack(Item.bucketLava),
 +              });
 +              GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),
 +                              new Object[]{
 +                      "XYX", "ZAZ", "ZZZ",
 +                      Character.valueOf('X'), new ItemStack(Item.ingotIron),
 +                      Character.valueOf('Y'), new ItemStack(Block.workbench),
 +                      Character.valueOf('Z'), new ItemStack(Block.stone),
 +                      Character.valueOf('A'), new ItemStack(Block.obsidian),
 +              });
 +              GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable),
 +                              new Object[]{
 +                      "XYX", "ZAZ", "ZZZ",
 +                      Character.valueOf('X'), new ItemStack(Item.ingotIron),
 +                      Character.valueOf('Y'), new ItemStack(Block.workbench),
 +                      Character.valueOf('Z'), new ItemStack(Block.stone),
 +                      Character.valueOf('A'), new ItemStack(Item.pickaxeSteel),
 +              });
 +              GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable),
 +                              new Object[]{
 +                      "XYX", "ZAZ", "ZZZ",
 +                      Character.valueOf('X'), new ItemStack(Item.ingotIron),
 +                      Character.valueOf('Y'), new ItemStack(Block.workbench),
 +                      Character.valueOf('Z'), new ItemStack(Block.stone),
 +                      Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),
 +              });
 +
 +              // 化合物を追加します
 +              api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
 +              api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
 +              api.addLangCompound("ja_JP", "Water", "水");
 +
 +
 +              //化合物のHandlerを設定します
 +              api.settingCompoundHandler("Water", new CompoundWater());
 +
 +              //化合物のレシピを追加します
 +              api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water")));
 +
 +              //手榴弾の追加
 +              api.addMaterialRecipe(new ItemStack[] {
 +                              null,
 +                              new ItemStack(Block.stone),
 +                              null,
 +                              new ItemStack(Block.stone),
 +                              new ItemStack(Item.gunpowder),
 +                              new ItemStack(Block.stone),
 +                              null,
 +                              new ItemStack(Block.stone),
 +                              null
 +              },
 +              new ItemStack(this.itemAtomGrenade, 16, 0),
 +              new NBTRecipeGrenade()
 +                              );
 +
 +              api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0),
 +                              new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},
 +                              new int[] {2, 1});
 +
 +              api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, api.getCompound("Water")),
 +                              new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},
 +                              new int[] {2, 1});
 +
 +              api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8);
 +      }
 +
 +      private void apiProcessing(final FMLPostInitializationEvent event) {
 +              // API用の処理
 +              this.nameAuxiliary.addName(itemCompounds, api.getInstance().getCompoundsName().toArray());
 +              for (int i = 0; i < api.getCompoundsLang().size(); i++) {
 +                      this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getInstance().getCompoundsLangName().toArray());
 +              }
 +      }
 +
 +      private void debug(final FMLPostInitializationEvent event) {
 +              //DebugTickingの追加
 +              this.proxy.registerTickHandler();
 +              api.addCompound("Debug");
 +              this.api.settingCompoundHandler("Debug", new CompoundDebug());
 +
 +              /*
 +               * TWDebug
 +               */
 +              api.addToolAndWeaponRecipe(new ItemStack[] {
 +                              new ItemStack(Block.stone, 1, 1)
 +              },
 +              new ItemStack(Block.dirt, 1, 0));
 +      }
 +
 +}
++=======
++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.BiomeManager;
++import net.minecraftforge.common.Configuration;
++import net.minecraftforge.common.DimensionManager;
++import net.minecraftforge.common.Property;
++import chemicraft.block.BlockChemicalCombinationTable;
++import chemicraft.block.BlockChemicalCraftingTable;
++import chemicraft.block.BlockElectrolysisTable;
++import chemicraft.block.BlockPyrolysisTable;
++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.TileEntityElectrolysisTable;
++import chemicraft.tileentity.TileEntityPyrolysisTable;
++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 chemicraft.util.WorldProviderChemical;
++import cpw.mods.fml.common.Mod;
++import cpw.mods.fml.common.SidedProxy;
++import cpw.mods.fml.common.event.FMLPostInitializationEvent;
++import cpw.mods.fml.common.event.FMLPreInitializationEvent;
++import cpw.mods.fml.common.event.FMLServerStartingEvent;
++import cpw.mods.fml.common.network.NetworkMod;
++import cpw.mods.fml.common.network.NetworkRegistry;
++import cpw.mods.fml.common.registry.GameRegistry;
++
++/**
++ * ChemiCraft本体
++ * @author P.C.C.
++ *
++ */
++@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")
++@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)
++public class ChemiCraft {
++
++      public static final String[] ATOMSNAME = {
++              "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon",
++              "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium",
++              "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium",
++              "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium",
++              "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",
++              "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium",
++              "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium",
++              "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" };
++
++      public static final String[] ATOMSNAMEJP = {
++              "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",
++              "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",
++              "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",
++              "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",
++              "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム",
++              "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" };
++
++      /**
++       * このmodのインスタンス
++       */
++      @Mod.Instance("chemiCraft")
++      public static ChemiCraft instance;
++
++      /**
++       * ChemiCraftのProxy.
++       */
++      @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.system.CommonProxy")
++      public static CommonProxy proxy;
++
++      /**
++       * ChemiCraftのCreativeTab.
++       */
++      public static final CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");
++
++      /**
++       * ItemID.
++       */
++      public int atomsID;
++      public int compoundsID;
++      public int gasCollectingBottleID;
++      public int atomGrenadeID;
++
++      /**
++       * BlockID.
++       */
++      public int pyrolysisTableID;
++      public int electrolysisTableID;
++      public int chemicalConbinationTableID;
++      public int toolAndWeaponCraftingTableID;
++      public int chemicalCraftingTableID;
++
++      /**
++       * GUIID.
++       */
++      public int guiPyrolysisTableID;
++      public int guiElectrolysisTableID;
++      public int guiChemicalCombinationTableID;
++      public int guiToolAndWeaponCraftingTableID;
++      public int guiChemicalCraftingTableID;
++
++      /**
++       * Block型変数.
++       */
++      public Block blockPyrolysisTable;
++      public Block blockElectrolysisTable;
++      public Block blockChemicalCombinationTable;
++      public Block blockToolAndWeaponCraftingTable;
++      public Block blockChemicalCraftingTable;
++
++      /**
++       * Item型変数.
++       */
++      public Item itemAtoms;
++      public Item itemCompounds;
++      public Item itemGasCollectingBottle;
++      public Item itemAtomGrenade;
++
++      /**
++       * このmodで使用するTextureのパス.
++       */
++      public final String ITEMATOMSTEXTURE = "/chemicraft/items/Atoms.png";
++      public final String ITEMCOMPOUNDSTEXTURE = "/chemicraft/items/Compounds.png";
++      public final String ITEMTEXTURE = "/chemicraft/items/items.png";
++      public final String BLOCKCHEMICALCRAFTINGTABLETEXTURE = "/chemicraft/blocks/cctable.png";
++      public final String GUIPYROLYSISTEXTURE = "/chemicraft/guis/Pyrolysis.png";
++      public final String GUIELECTROLYSISTEXTURE = "/chemicraft/guis/Electrolysis.png";
++      public final String GUICHEMICALCOMBINATIONTEXTURE = "/chemicraft/guis/ChemicalCombination.png";
++      public final String GUITOOLANDWEAPONCRAFTINGTEXTURE = "/chemicraft/guis/ToolAndWeaponCrafting.png";
++      public final String GUICHEMICALCRAFTINGTEXTURE = "/chemicraft/guis/MaterialCrafting.png";
++
++      /**
++       * このmodに必要な補助クラスのインスタンス.
++       */
++      public Auxiliary auxiliary = new Auxiliary();
++      public NameAuxiliary nameAuxiliary = new NameAuxiliary();
++      public ArrayAuxiliary arrayAuxiliary = new ArrayAuxiliary();
++
++      private ChemiCraftAPI api = ChemiCraftAPI.getInstance();
++      private ChemiCraftData chemicalData = new ChemiCraftData();
++
++      @Mod.PreInit
++      public void chemiPreLoadMethod(final FMLPreInitializationEvent event) {
++              Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
++              cfg.load();
++
++              Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400);
++              Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTable", 2401);
++              Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2402);
++              Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2403);
++              Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2404);
++
++              Property atomsIDProp = cfg.getItem("AtomsID", 25000);
++              Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);
++              Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);
++              Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);
++
++              Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000);
++              Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableIDProp", 1001);
++              Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1002);
++              Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1003);
++              Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1004);
++
++
++              this.pyrolysisTableID = pyrolysisTableIDProp.getInt();
++              this.electrolysisTableID = electrolysisTableIDProp.getInt();
++              this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();
++              this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();
++              this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();
++              this.atomsID = atomsIDProp.getInt();
++              this.compoundsID = compoundsIDProp.getInt();
++              this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
++              this.atomGrenadeID = atomGrenadeIDProp.getInt();
++              this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();
++              this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt();
++              this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();
++              this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();
++              this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();
++
++              cfg.save();
++      }
++
++      @Mod.ServerStarting
++      public void serverStarting(final FMLServerStartingEvent event) {
++              event.registerServerCommand(new CommandSetTile());
++              event.registerServerCommand(new CommandDeleteItem());
++              event.registerServerCommand(new CommandGenDebugRoom());
++      }
++
++      @Mod.PostInit
++      public void chemiPostLoadMethod(final FMLPostInitializationEvent event) {
++              this.settingProcessing(event);
++              this.apiProcessing(event);
++              this.debug(event);
++      }
++
++      private void settingProcessing(final FMLPostInitializationEvent event) {
++
++              // Blockを追加します
++              this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground).
++                              setHardness(2.0F).
++                              setResistance(0.0F).
++                              setStepSound(Block.soundStoneFootstep).
++                              setBlockName("PyrolysisTable");
++              this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 1, Material.ground).
++                              setHardness(2.0F).
++                              setResistance(0.0F).
++                              setStepSound(Block.soundStoneFootstep).
++                              setBlockName("ElectrolysisTable");
++              this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 2, Material.ground).
++                              setHardness(2.0F).
++                              setResistance(0.0F).
++                              setStepSound(Block.soundStoneFootstep).
++                              setBlockName("ChemicalCombinationTable");
++              this.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.toolAndWeaponCraftingTableID, 3, Material.ground).
++                              setHardness(2.0F).
++                              setResistance(0.0F).
++                              setStepSound(Block.soundStoneFootstep).
++                              setBlockName("ToolAndWeaponCraftingTable");
++              this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(chemicalCraftingTableID, 4, Material.ground).
++                              setHardness(2.0F).
++                              setResistance(0.0F).
++                              setStepSound(Block.soundStoneFootstep).
++                              setBlockName("ChemicalCraftingTable");
++
++              // Itemを追加します
++              this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");
++              this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds");
++              this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0);
++              this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);
++
++              // BlockをMinecraftに登録します
++              GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable");
++              GameRegistry.registerBlock(this.blockElectrolysisTable, "ElectrolysisTable");
++              GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");
++              GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");
++              GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");
++
++              // Blockの名前を設定します
++              this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable");
++              this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台");
++              this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable");
++              this.nameAuxiliary.addName(this.blockElectrolysisTable, "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", "素材製作台");
++
++              // Itemの名前を設定します
++              this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME);
++              this.nameAuxiliary.addName(this.itemAtoms, "ja_JP", ATOMSNAMEJP);
++              this.nameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle");
++              this.nameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶");
++              this.nameAuxiliary.addName(this.itemAtomGrenade, "AtomGrenade");
++              this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");
++
++              // TileEntityを追加します
++              GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable");
++              GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable");
++              GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");
++              GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");
++              GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");
++
++              // GUIを追加します
++              NetworkRegistry.instance().registerGuiHandler(instance, proxy);
++
++              // 描画関係の読み込み
++              proxy.registerRenderInformation();
++
++              //化学作業台類のレシピを追加します
++              GameRegistry.addRecipe(new ItemStack(this.blockElectrolysisTable),
++                              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.blockPyrolysisTable),
++                              new Object[]{
++                      "XYX", "ZAZ", "ZZZ",
++                      Character.valueOf('X'), new ItemStack(Item.ingotIron),
++                      Character.valueOf('Y'), new ItemStack(Block.workbench),
++                      Character.valueOf('Z'), new ItemStack(Block.stone),
++                      Character.valueOf('A'), new ItemStack(Item.bucketLava),
++              });
++              GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),
++                              new Object[]{
++                      "XYX", "ZAZ", "ZZZ",
++                      Character.valueOf('X'), new ItemStack(Item.ingotIron),
++                      Character.valueOf('Y'), new ItemStack(Block.workbench),
++                      Character.valueOf('Z'), new ItemStack(Block.stone),
++                      Character.valueOf('A'), new ItemStack(Block.obsidian),
++              });
++              GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable),
++                              new Object[]{
++                      "XYX", "ZAZ", "ZZZ",
++                      Character.valueOf('X'), new ItemStack(Item.ingotIron),
++                      Character.valueOf('Y'), new ItemStack(Block.workbench),
++                      Character.valueOf('Z'), new ItemStack(Block.stone),
++                      Character.valueOf('A'), new ItemStack(Item.pickaxeSteel),
++              });
++              GameRegistry.addRecipe(new ItemStack(this.blockChemicalCraftingTable),
++                              new Object[]{
++                      "XYX", "ZAZ", "ZZZ",
++                      Character.valueOf('X'), new ItemStack(Item.ingotIron),
++                      Character.valueOf('Y'), new ItemStack(Block.workbench),
++                      Character.valueOf('Z'), new ItemStack(Block.stone),
++                      Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),
++              });
++
++              // 化合物を追加します
++              api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
++              api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
++              api.addLangCompound("ja_JP", "Water", "水");
++
++
++              //化合物のHandlerを設定します
++              api.settingCompoundHandler("Water", new CompoundWater());
++
++              //化合物のレシピを追加します
++              api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water")));
++
++              //手榴弾の追加
++              api.addMaterialRecipe(
++                              new ItemStack[]{
++                                              null,
++                                              new ItemStack(Block.stone),
++                                              null,
++                                              new ItemStack(Block.stone),
++                                              new ItemStack(Item.gunpowder),
++                                              new ItemStack(Block.stone),
++                                              null,
++                                              new ItemStack(Block.stone),
++                                              null
++                              },
++                              new ItemStack(this.itemAtomGrenade, 16, 0),
++                              new NBTRecipeGrenade()
++                              );
++              //Tickingの追加
++              this.proxy.registerTickHandler();
++      }
++
++      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) {
++      }
++
++}
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/ChemiCraft.java
@@@ -185,12 -189,7 +213,16 @@@ public class ChemiCraftAPI 
  
  
  
++<<<<<<< HEAD:common/pcc/chemicraft/ChemiCraftAPI.java
 +      /**
 +       * 分解台の燃料を追加します
 +       * @param itemstack 燃料のItemStack
 +       * @param burnTime 燃焼時間(tick * rate)
 +       */
 +      public void addDecompositionFuel(ItemStack itemstack, int burnTime) {
++=======
+       public void addDecompositionRecipe(ItemStack itemstack, int burnTime) {
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/ChemiCraftAPI.java
                TileEntityPyrolysisTable.addFuel(itemstack, burnTime);
        }
  
@@@ -5,8 -5,9 +5,14 @@@ import net.minecraft.block.material.Mat
  import net.minecraft.entity.player.EntityPlayer;
  import net.minecraft.tileentity.TileEntity;
  import net.minecraft.world.World;
++<<<<<<< HEAD:common/pcc/chemicraft/block/BlockElectrolysisTable.java
 +import pcc.chemicraft.ChemiCraft;
 +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
++=======
+ import chemicraft.ChemiCraft;
+ import chemicraft.debug.DebugTick;
+ import chemicraft.tileentity.TileEntityElectrolysisTable;
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/block/BlockElectrolysisTable.java
  
  public class BlockElectrolysisTable extends BlockContainer
  {
@@@ -1,5 -1,6 +1,6 @@@
 -package chemicraft.container;
 +package pcc.chemicraft.container;
  
+ import net.minecraft.block.Block;
  import net.minecraft.entity.player.EntityPlayer;
  import net.minecraft.inventory.Container;
  import net.minecraft.inventory.IInventory;
@@@ -4,12 -4,10 +4,19 @@@ import net.minecraft.entity.player.Enti
  import net.minecraft.inventory.Container;
  import net.minecraft.inventory.Slot;
  import net.minecraft.world.World;
++<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerElectrolysisTable.java
 +import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
 +import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
 +import pcc.chemicraft.inventory.InventoryElectrolysisResult;
 +import pcc.chemicraft.slot.SlotElectrolysisMaterial;
 +import pcc.chemicraft.slot.SlotElectrolysisResult;
 +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
++=======
+ import chemicraft.ChemiCraft;
+ import chemicraft.slot.SlotElectrolysisMaterial;
+ import chemicraft.slot.SlotElectrolysisResult;
+ import chemicraft.tileentity.TileEntityElectrolysisTable;
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/container/ContainerElectrolysisTable.java
  
  public class ContainerElectrolysisTable extends Container
  {
index d609775,0000000..9e5ccca
mode 100644,000000..100644
--- /dev/null
@@@ -1,69 -1,0 +1,68 @@@
-       private World worldobj;
-       private int posX;
-       private int posY;
-       private int posZ;
-       private TileEntityToolAndWeaponCraftingTable tileentity;
 +package pcc.chemicraft.container;
 +
 +import net.minecraft.entity.player.EntityPlayer;
 +import net.minecraft.inventory.Container;
++<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
 +import net.minecraft.inventory.IInventory;
 +import net.minecraft.inventory.Slot;
 +import net.minecraft.world.World;
 +import pcc.chemicraft.ChemiCraftAPI;
 +import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial;
 +import pcc.chemicraft.slot.SlotToolAndWeaponCraftingTableResult;
 +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
++=======
++import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
 +
 +public class ContainerToolAndWeaponCraftingTable extends Container {
 +
-               return true;
 +      public ContainerToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2){
 +              super();
++<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
 +              this.tileentity = par2;
 +              this.worldobj = this.tileentity.worldObj;
 +              this.posX = this.tileentity.xCoord;
 +              this.posY = this.tileentity.yCoord;
 +              this.posZ = this.tileentity.zCoord;
 +              this.tileentity.invm.setEventHandler(this);
 +              this.tileentity.invr.setEventHandler(this);
 +
 +              for (int i = 0; i < 3; i++) {
 +                      for (int j = 0; j < 3; j++) {
 +                              this.addSlotToContainer(new Slot(this.tileentity.invm, i * 3 + j, 30 + i * 18, 17 + j * 18));
 +                      }
 +              }
 +
 +              this.addSlotToContainer(new SlotToolAndWeaponCraftingTableResult(this.tileentity.invr, 0, 125, 36));
 +
 +              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));
 +              }
 +
++=======
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
 +      }
 +
 +      @Override
 +      public void onCraftMatrixChanged(IInventory par1IInventory){
 +              if (par1IInventory instanceof InventoryToolAndWeaponCraftingTableMaterial) {
 +                      this.tileentity.invr.setInventorySlotContents(0, ChemiCraftAPI.getInstance().getCraftingManager().getToolAndWeaponCraftingResult(this.tileentity.invm));
 +              }
 +      }
 +
 +      @Override
 +      public boolean canInteractWith(EntityPlayer var1) {
++              return false;
 +      }
 +
 +}
@@@ -1,5 -1,6 +1,6 @@@
 -package chemicraft.debug;
 +package pcc.chemicraft.debug;
  
+ import java.awt.BasicStroke;
  import java.awt.Color;
  import java.awt.Font;
  import java.awt.Graphics;
@@@ -3,17 -3,15 +3,29 @@@ package pcc.chemicraft.system
  import net.minecraft.entity.player.EntityPlayer;
  import net.minecraft.tileentity.TileEntity;
  import net.minecraft.world.World;
++<<<<<<< HEAD:common/pcc/chemicraft/system/CommonProxy.java
 +import pcc.chemicraft.container.ContainerChemicalCombinationTable;
 +import pcc.chemicraft.container.ContainerChemicalCraftingTable;
 +import pcc.chemicraft.container.ContainerElectrolysisTable;
 +import pcc.chemicraft.container.ContainerPyrolysisTable;
 +import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
 +import pcc.chemicraft.debug.DebugTick;
 +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
++=======
+ import chemicraft.container.ContainerChemicalCombinationTable;
+ import chemicraft.container.ContainerChemicalCraftingTable;
+ import chemicraft.container.ContainerPyrolysisTable;
+ import chemicraft.container.ContainerToolAndWeaponCraftingTable;
+ import chemicraft.debug.DebugTick;
+ import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+ import chemicraft.tileentity.TileEntityChemicalCraftingTable;
+ import chemicraft.tileentity.TileEntityPyrolysisTable;
+ import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/system/CommonProxy.java
  import cpw.mods.fml.common.network.IGuiHandler;
  import cpw.mods.fml.common.registry.TickRegistry;
  import cpw.mods.fml.relauncher.Side;
@@@ -10,12 -10,11 +10,20 @@@ import net.minecraft.network.packet.Pac
  import net.minecraft.network.packet.Packet250CustomPayload;
  import net.minecraft.tileentity.TileEntity;
  import net.minecraft.world.World;
++<<<<<<< HEAD:common/pcc/chemicraft/system/PacketHandler.java
 +import pcc.chemicraft.ChemiCraft;
 +import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 +import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 +import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 +import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 +import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
++=======
+ import chemicraft.ChemiCraft;
+ import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+ import chemicraft.tileentity.TileEntityChemicalCraftingTable;
+ import chemicraft.tileentity.TileEntityPyrolysisTable;
+ import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/system/PacketHandler.java
  
  import com.google.common.io.ByteArrayDataInput;
  import com.google.common.io.ByteStreams;
@@@ -1,13 -1,11 +1,17 @@@
 -package chemicraft.tileentity;
 +package pcc.chemicraft.tileentity;
  
- import java.io.DataOutputStream;
  import net.minecraft.nbt.NBTTagCompound;
  import net.minecraft.network.packet.Packet;
  import net.minecraft.tileentity.TileEntity;
++<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
 +import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
 +import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
 +import pcc.chemicraft.inventory.InventoryElectrolysisResult;
++=======
+ import chemicraft.inventory.InventoryElectrolysisTableFuel;
+ import chemicraft.inventory.InventoryElectrolysisTableMaterial;
+ import chemicraft.inventory.InventoryElectrolysisTableResult;
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/tileentity/TileEntityElectrolysisTable.java
  
  public class TileEntityElectrolysisTable extends TileEntity
  {
@@@ -11,10 -11,12 +11,19 @@@ import net.minecraft.nbt.NBTTagCompound
  import net.minecraft.nbt.NBTTagList;
  import net.minecraft.network.packet.Packet;
  import net.minecraft.tileentity.TileEntity;
++<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
 +import pcc.chemicraft.inventory.InventoryPyrolysisTableFuel;
 +import pcc.chemicraft.inventory.InventoryPyrolysisTableMaterial;
 +import pcc.chemicraft.inventory.InventoryPyrolysisTableResult;
 +import pcc.chemicraft.system.PacketHandler;
++=======
+ import chemicraft.debug.DebugData;
+ import chemicraft.debug.DebugTick;
+ import chemicraft.inventory.InventoryPyrolysisTableFuel;
+ import chemicraft.inventory.InventoryPyrolysisTableMaterial;
+ import chemicraft.inventory.InventoryPyrolysisTableResult;
+ import chemicraft.system.PacketHandler;
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/tileentity/TileEntityPyrolysisTable.java
  
  import com.google.common.io.ByteArrayDataInput;
  
@@@ -3,8 -3,6 +3,11 @@@ package pcc.chemicraft.tileentity
  import java.io.DataOutputStream;
  
  import net.minecraft.tileentity.TileEntity;
++<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java
 +import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial;
 +import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableResult;
++=======
++>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java
  
  import com.google.common.io.ByteArrayDataInput;