とりあえずコミット

[chemicraft/chemicraft.git] / common / chemicraft / ChemiCraft.java

diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java
index 471e34d..06bbe9a 100644 (file)
--- a/common/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@ -1,5 +1,7 @@
 package chemicraft;\r
 \r
+import ic2.api.energy.event.EnergyTileEvent;\r
+import ic2.api.energy.event.EnergyTileLoadEvent;\r
 import net.minecraft.block.Block;\r
 import net.minecraft.block.material.Material;\r
 import net.minecraft.creativetab.CreativeTabs;\r
@@ -9,7 +11,7 @@ import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.Property;\r
 import chemicraft.block.BlockChemicalCombinationTable;\r
 import chemicraft.block.BlockChemicalCraftingTable;\r
-import chemicraft.block.BlockDecompositionTable;\r
+import chemicraft.block.BlockPyrolysisTable;\r
 import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
 import chemicraft.compounds.CompoundWater;\r
 import chemicraft.debug.CommandDeleteItem;\r
@@ -23,7 +25,7 @@ import chemicraft.system.CommonProxy;
 import chemicraft.system.PacketHandler;\r
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityDecompositionTable;\r
+import chemicraft.tileentity.TileEntityPyrolysisTable;\r
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 import chemicraft.util.Auxiliary;\r
 import chemicraft.util.Auxiliary.ArrayAuxiliary;\r
@@ -45,9 +47,7 @@ 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.3.2", channels = "chemicraft", packetHandler = PacketHandler.class)\r
-// クライアント、サーバー共に必要 1.3.2用\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
@@ -96,7 +96,7 @@ public class ChemiCraft {
        /**\r
         * BlockID.\r
         */\r
-       public int decompositionTableID;\r
+       public int pyrolysisTableID;\r
        public int chemicalConbinationTableID;\r
        public int toolAndWeaponCraftingTableID;\r
        public int chemicalCraftingTableID;\r
@@ -104,7 +104,7 @@ public class ChemiCraft {
        /**\r
         * GUIID.\r
         */\r
-       public int guiDecompositionTableID;\r
+       public int guiPyrolysisTableID;\r
        public int guiChemicalCombinationTableID;\r
        public int guiToolAndWeaponCraftingTableID;\r
        public int guiChemicalCraftingTableID;\r
@@ -112,7 +112,7 @@ public class ChemiCraft {
        /**\r
         * Block型変数.\r
         */\r
-       public Block blockDecompositionTable;\r
+       public Block blockPyrolysisTable;\r
        public Block blockChemicalCombinationTable;\r
        public Block blockToolAndWeaponCraftingTable;\r
        public Block blockChemicalCraftingTable;\r
@@ -131,8 +131,8 @@ 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 guiDecompositionTexture = "/chemicraft/guis/Decomposition.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
@@ -152,7 +152,7 @@ public class ChemiCraft {
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r
 \r
-               Property decompositionTableIDProp = cfg.getBlock("DecompositionTable", 2400);\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
@@ -162,13 +162,13 @@ public class ChemiCraft {
                Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);\r
                Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);\r
 \r
-               Property guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000);\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.decompositionTableID = decompositionTableIDProp.getInt();\r
+               this.pyrolysisTableID = pyrolysisTableIDProp.getInt();\r
                this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
                this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
                this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();\r
@@ -176,7 +176,7 @@ public class ChemiCraft {
                this.compoundsID = compoundsIDProp.getInt();\r
                this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
                this.atomGrenadeID = atomGrenadeIDProp.getInt();\r
-               this.guiDecompositionTableID = guiDecompositionTableIDProp.getInt();\r
+               this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();\r
                this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();\r
                this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();\r
                this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();\r
@@ -201,11 +201,11 @@ public class ChemiCraft {
        private void settingProcessing(final FMLPostInitializationEvent event) {\r
 \r
                // Blockを追加します\r
-               this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).\r
+               this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground).\r
                                setHardness(2.0F).\r
                                setResistance(0.0F).\r
                                setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("DecompositionTable");\r
+                               setBlockName("PyrolysisTable");\r
                this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).\r
                                setHardness(2.0F).\r
                                setResistance(0.0F).\r
@@ -229,14 +229,14 @@ public class ChemiCraft {
                this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);\r
 \r
                // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(this.blockDecompositionTable, "BlockDecompositionTable");\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.blockDecompositionTable, "DecompositionTable");\r
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "ja_JP", "分解台");\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
@@ -253,7 +253,7 @@ public class ChemiCraft {
                this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");\r
 \r
                // TileEntityを追加します\r
-               GameRegistry.registerTileEntity(TileEntityDecompositionTable.class, "DecompositionTable");\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
@@ -265,13 +265,13 @@ public class ChemiCraft {
                proxy.registerRenderInformation();\r
 \r
                //化学作業台類のレシピを追加します\r
-               GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable),\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(Block.tnt),\r
+                       Character.valueOf('A'), new ItemStack(Item.bucketLava),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
                                new Object[]{\r
@@ -340,4 +340,4 @@ public class ChemiCraft {
        private void debug(final FMLPostInitializationEvent event) {\r
        }\r
 \r
-}
\ No newline at end of file
+}\r