競合確認

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

diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java
index 231b97f..704344b 100644 (file)
--- a/common/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@ -2,6 +2,7 @@ package chemicraft;
 \r
 import net.minecraft.block.Block;\r
 import net.minecraft.block.material.Material;\r
+import net.minecraft.client.audio.SoundManager;\r
 import net.minecraft.creativetab.CreativeTabs;\r
 import net.minecraft.item.Item;\r
 import net.minecraft.item.ItemStack;\r
@@ -11,6 +12,7 @@ import chemicraft.block.BlockChemicalCombinationTable;
 import chemicraft.block.BlockChemicalCraftingTable;\r
 import chemicraft.block.BlockPyrolysisTable;\r
 import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
+import chemicraft.compounds.CompoundDebug;\r
 import chemicraft.compounds.CompoundWater;\r
 import chemicraft.debug.CommandDeleteItem;\r
 import chemicraft.debug.CommandGenDebugRoom;\r
@@ -300,7 +302,6 @@ public class ChemiCraft {
                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
@@ -310,23 +311,30 @@ public class ChemiCraft {
                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
+               api.addMaterialRecipe(new ItemStack[] {\r
+                               null,\r
+                               new ItemStack(Block.stone),\r
+                               null,\r
+                               new ItemStack(Block.stone),\r
+                               new ItemStack(Item.gunpowder),\r
+                               new ItemStack(Block.stone),\r
+                               null,\r
+                               new ItemStack(Block.stone),\r
+                               null\r
+               },\r
+               new ItemStack(this.itemAtomGrenade, 16, 0),\r
+               new NBTRecipeGrenade()\r
                                );\r
-               //Tickingの追加\r
-               this.proxy.registerTickHandler();\r
+\r
+               api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0),\r
+                               new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},\r
+                               new int[] {2, 1});\r
+\r
+               api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, api.getCompound("Water")),\r
+                               new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},\r
+                               new int[] {2, 1});\r
+\r
+               api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8);\r
        }\r
 \r
        private void apiProcessing(final FMLPostInitializationEvent event) {\r
@@ -338,6 +346,10 @@ public class ChemiCraft {
        }\r
 \r
        private void debug(final FMLPostInitializationEvent event) {\r
+               //DebugTickingの追加\r
+               this.proxy.registerTickHandler();\r
+               api.addCompound("Debug");\r
+               this.api.settingCompoundHandler("Debug", new CompoundDebug());\r
        }\r
 \r
 }\r