OSDN Git Service

とりあえず
authormozipi <mozipi@users.sourceforge.jp>
Mon, 24 Dec 2012 08:42:59 +0000 (17:42 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Mon, 24 Dec 2012 08:42:59 +0000 (17:42 +0900)
common/chemicraft/ChemiCraft.java
common/chemicraft/NBTRecipeGrenade.java

index 8108003..b5caa9d 100644 (file)
@@ -216,9 +216,42 @@ public class ChemiCraft {
                //Textureをpreloadします\r
                proxy.registerTextures();\r
 \r
-               //化合台のレシピを追加します\r
-               //GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable), new Object[]{new ItemStack()});\r
-               ChemiCraftAPI.instance.addMaterialRecipe(new ItemStack[]{new ItemStack(Block.dirt)}, new ItemStack(this.itemAtomGrenade, 16, 0), new NBTRecipeGrenade());\r
+               //化学作業台類のレシピを追加します\r
+               GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable),\r
+                               new Object[]{\r
+                       "XYX", "ZAZ", "ZZZ",\r
+                       new Character('X'), new ItemStack(Item.ingotIron),\r
+                       new Character('Y'), new ItemStack(Block.workbench),\r
+                       new Character('Z'), new ItemStack(Block.stone),\r
+                       new Character('A'), new ItemStack(Block.tnt),\r
+               });\r
+               GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
+                               new Object[]{\r
+                       "XYX", "ZAZ", "ZZZ",\r
+                       new Character('X'), new ItemStack(Item.ingotIron),\r
+                       new Character('Y'), new ItemStack(Block.workbench),\r
+                       new Character('Z'), new ItemStack(Block.stone),\r
+                       new Character('A'), new ItemStack(Block.obsidian),\r
+               });\r
+               GameRegistry.addRecipe(new ItemStack(this.blockToolAndWeaponCraftingTable),\r
+                               new Object[]{\r
+                       "XYX", "ZAZ", "ZZZ",\r
+                       new Character('X'), new ItemStack(Item.ingotIron),\r
+                       new Character('Y'), new ItemStack(Block.workbench),\r
+                       new Character('Z'), new ItemStack(Block.stone),\r
+                       new Character('A'), new ItemStack(Item.pickaxeSteel),\r
+               });\r
+               GameRegistry.addRecipe(new ItemStack(this.blockMaterialCraftingTable),\r
+                               new Object[]{\r
+                       "XYX", "ZAZ", "ZZZ",\r
+                       new Character('X'), new ItemStack(Item.ingotIron),\r
+                       new Character('Y'), new ItemStack(Block.workbench),\r
+                       new Character('Z'), new ItemStack(Block.stone),\r
+                       new Character('A'), new ItemStack(this.itemAtoms, 1, 0),\r
+               });\r
+\r
+               //手榴弾の追加\r
+               ChemiCraftAPI.instance.addMaterialRecipe(new ItemStack[]{new ItemStack(Item.gunpowder)}, new ItemStack(this.itemAtomGrenade, 16, 0), new NBTRecipeGrenade());\r
 \r
        }\r
 \r
@@ -229,6 +262,7 @@ public class ChemiCraft {
        public final static int BORON = 4;\r
        public final static int CARBON = 5;\r
        public final static int NITROGEN = 6;\r
+       public final static int OXYGEN = 7;\r
        public final static int URANIUM = 91;\r
 \r
 }
\ No newline at end of file
index 3f6ca3c..d718ccf 100644 (file)
@@ -28,7 +28,6 @@ public class NBTRecipeGrenade extends NBTRecipe {
                boolean var1 = false;
 
                for(int i = 0;i < materials.length;i++){
-                       System.out.println(materials[i]);
                        if(materials[i] != null){
                                if(materials[i].itemID-256 == ChemiCraft.instance.atomsID && materials[i].getItemDamage() == ChemiCraft.HYDROGEN){
                                        tag.setString("GrenadeEffect" + i, "Hydrogen");