OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
authorponkotate <ponkotate@users.sourceforge.jp>
Wed, 17 Apr 2013 16:00:00 +0000 (01:00 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Wed, 17 Apr 2013 16:00:00 +0000 (01:00 +0900)
Conflicts:
common/pcc/chemicraft/base/ChemiCraftBase.java
common/pcc/chemicraft/base/ChemiCraftRegisterItem.java

common/pcc/chemicraft/base/ChemiCraftBase.java
common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
common/pcc/chemicraft/testcase/FormulaTest.java

index ee4b742..ffb1368 100644 (file)
@@ -69,6 +69,7 @@ public class ChemiCraftBase extends ChemiCraft {
        public int dustID;
        public int radiationGunID;
        public int radiationBalletID;
+       public int raditionGunDataChipID;
 
        /**
         * the BlockID.
@@ -90,6 +91,7 @@ public class ChemiCraftBase extends ChemiCraft {
        public Item itemRadiationGun;
        public Item itemRadiationBallet;
        public Item itemOreSearcher;
+       public Item itemRaditionGunDataChip;
 
        /**
         * the Register Instances.
@@ -103,7 +105,7 @@ public class ChemiCraftBase extends ChemiCraft {
        public ChemiCraftRegister registerEntitys;
 
        /**
-        * the Textures
+        * the Textures.
         */
        public static final String INGOT = ChemiCraft.TEXTURE + "atom_ingots_";
        public static final String ORE = ChemiCraft.TEXTURE + "atom_ores_";
index 88ed7f1..ed3df5b 100644 (file)
@@ -6,6 +6,8 @@ import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
+import pcc.chemicraft.ChemiCraftData;
+import pcc.chemicraft.core.ChemiCraftAPI;
 import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.core.nbt.NBTRecipeGrenade;
 import pcc.chemicraft.util.Formula;
@@ -97,15 +99,9 @@ public class ChemiCraftRegisterBaseRecipe extends ChemiCraftBaseRegister {
                //素材制作台のレシピ
                this.mod.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
+                                               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.mod.itemAtomGrenade, 16, 0),
                                new NBTRecipeGrenade());
@@ -118,6 +114,33 @@ public class ChemiCraftRegisterBaseRecipe extends ChemiCraftBaseRegister {
                                new NBTRecipeGrenade()
                                );
 
+               ChemiCraftAPI.addMaterialRecipe(
+                               new ItemStack[] {
+                                               new ItemStack(Block.stone), new ItemStack(Item.ingotIron), new ItemStack(Block.stone),
+                                               new ItemStack(Item.ingotIron), new ItemStack(ChemiCraftCore.instance.itemAtoms, 1, ChemiCraftData.URANIUM), new ItemStack(Item.ingotIron),
+                                               new ItemStack(Block.stone), new ItemStack(Item.redstone), new ItemStack(Block.stone)
+                               },
+                               new ItemStack(this.mod.itemRadiationBallet),
+                               null);
+
+               ChemiCraftAPI.addMaterialRecipe(
+                               new ItemStack[] {
+                                               new ItemStack(Block.stone), new ItemStack(ChemiCraftCore.instance.itemAtoms, 1, ChemiCraftData.URANIUM), new ItemStack(Block.stone),
+                                               new ItemStack(Item.ingotIron), new ItemStack(Item.redstone), new ItemStack(Item.ingotIron),
+                                               new ItemStack(Block.stone), new ItemStack(Item.redstone), new ItemStack(Block.stone)
+                               },
+                               new ItemStack(this.mod.itemRaditionGunDataChip),
+                               null);
+
+               ChemiCraftAPI.addMaterialRecipe(
+                               new ItemStack[]{
+                                               new ItemStack(Block.blockSteel), new ItemStack(Block.blockSteel), new ItemStack(this.mod.itemRaditionGunDataChip),
+                                               null, null, new ItemStack(Block.stone),
+                                               null, null, new ItemStack(Item.stick)
+                               },
+                               new ItemStack(this.mod.itemRadiationGun),
+                               null);
+
                //分解台のレシピ
                this.mod.api.addElectrolysisDecompositionRecipe(
                                new ItemStack(ChemiCraftCore.instance.itemCompounds, 1, this.mod.api.getCompound("Water")),
index b057e5b..d460d91 100644 (file)
@@ -1,5 +1,8 @@
 package pcc.chemicraft.base;
 
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.item.Item;
+import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.base.item.ItemAtomsGrenade;
 import pcc.chemicraft.base.item.ItemBlackSmoke;
 import pcc.chemicraft.base.item.ItemDust;
@@ -28,6 +31,12 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
                this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher");
                this.mod.itemRadiationGun = new ItemRadiationGun(this.mod.radiationGunID).setUnlocalizedName("RadiationGun");
                this.mod.itemRadiationBallet = new ItemRadiationBullet(this.mod.radiationBalletID).setUnlocalizedName("RadiationBullet");
+               this.mod.itemRaditionGunDataChip = new Item(this.mod.raditionGunDataChipID) {
+                       @Override
+                       public void updateIcons(IconRegister par1IconRegister) {
+                               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "RaditionGunDataChip");
+                       }
+               }.setUnlocalizedName("RaditionGunDataChip");
 
                //名前を登録&Minecraftに登録
                this.mod.nameAuxiliary.addName(this.mod.itemAtomGrenade, "AtomGrenade");
@@ -42,6 +51,8 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線銃");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationBallet, "RadiationBullet");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線弾");
+               this.mod.nameAuxiliary.addName(this.mod.itemRaditionGunDataChip, "RaditionGunDataChip");
+               this.mod.nameAuxiliary.addName(this.mod.itemRaditionGunDataChip, "ja_JP", "放射線銃データチップ");
        }
 
 }
index cc6558e..31f2a43 100644 (file)
@@ -1,4 +1,3 @@
-/*
 package pcc.chemicraft.testcase;
 
 import static org.junit.Assert.*;
@@ -80,4 +79,3 @@ public class FormulaTest extends Formula {
        }
 
 }
-*/