OSDN Git Service

修正・変更
authorponkotate <ponkotate@users.sourceforge.jp>
Wed, 6 Mar 2013 09:09:48 +0000 (18:09 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Wed, 6 Mar 2013 09:09:48 +0000 (18:09 +0900)
・集気ビンの修正
・鉱石の追加

common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/item/ItemGasCollectingBottle.java

index 3140c6f..799d46c 100644 (file)
@@ -419,6 +419,10 @@ public class ChemiCraft {
                api.addAtomOres("Calcite", new String[]{"Ca", "C", "O"}, new Integer[]{1, 1, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // CaCO3
                api.addAtomOresLanguage("Calcite", "方解石", "ja_JP");
 
                api.addAtomOres("Calcite", new String[]{"Ca", "C", "O"}, new Integer[]{1, 1, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // CaCO3
                api.addAtomOresLanguage("Calcite", "方解石", "ja_JP");
 
+               // スカンジウム
+               api.addAtomOres("Thortveitite", new String[]{"Sc", "Y", "Si", "O"}, new Integer[]{2, 2, 2, 7}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // (Sc,Y)2Si2O7
+               api.addAtomOresLanguage("Thortveitite", "トルトベイト石", "ja_JP");
+
                // api.addAtomOres("元素名(英)", new String[]{"元素"}, new Integer[]{<数>}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // 化学式
                // api.addAtomOresLanguage("元素名(英)", "元素名(他国語)", "言語");
 
                // api.addAtomOres("元素名(英)", new String[]{"元素"}, new Integer[]{<数>}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // 化学式
                // api.addAtomOresLanguage("元素名(英)", "元素名(他国語)", "言語");
 
index 599c729..990710b 100644 (file)
@@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftAPI;
 import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftAPI;
+import pcc.chemicraft.ChemiCraftData;
 import pcc.chemicraft.util.Auxiliary.Probability;
 
 public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 import pcc.chemicraft.util.Auxiliary.Probability;
 
 public class ItemGasCollectingBottle extends ItemAtomInfoContainer
@@ -14,7 +15,8 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 
        public Probability probability = new Probability();
 
 
        public Probability probability = new Probability();
 
-       public ItemGasCollectingBottle(int id) {
+       public ItemGasCollectingBottle(int id)
+       {
                super(id);
                this.setMaxStackSize(1);
                this.setMaxDamage(2);
                super(id);
                this.setMaxStackSize(1);
                this.setMaxDamage(2);
@@ -28,30 +30,28 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 
                this.atomInfo.update(par2World, par3EntityPlayer);
 
 
                this.atomInfo.update(par2World, par3EntityPlayer);
 
-               int heightValue = par2World.getHeightValue((int) par3EntityPlayer.posX, (int) par3EntityPlayer.posZ);
+               int heightValue = par2World.getHeightValue((int)par3EntityPlayer.posX, (int)par3EntityPlayer.posZ);
 
 
-               int result1 = probability.getProbability(99.0D, 1.0D);
-               int result2 = probability.getProbability(78.0D, 21.0D, 1.0D);
-               int result3 = probability.getProbability(0.032D, 0.0018D, 0.000012D, 0.00052D);
+               int result = probability.getProbability(78.0D, 21.0D, 1.0D, 0.032D, 0.0018D, 0.000012D, 0.00052D, 0.000114D, 0.000087D);
                if (this.atomInfo.isOverY(heightValue)) {
                if (this.atomInfo.isOverY(heightValue)) {
-                       if (result1 == 0) {
-                               if (result2 == 0) {
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 6), par3EntityPlayer);
-                               } else if (result2 == 1) {
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 7), par3EntityPlayer);
-                               } else {
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 17), par3EntityPlayer);
-                               }
+                       if (result == 0) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, ChemiCraftData.NITROGEN), par3EntityPlayer);
+                       } else if (result == 1) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, ChemiCraftData.OXYGEN), par3EntityPlayer);
+                       } else if (result == 2) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, ChemiCraftData.ARGON), par3EntityPlayer);
+                       } else if (result == 3) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.instance().getCompound("CarbonDioxide")), par3EntityPlayer);
+                       } else if (result == 4) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, ChemiCraftData.NEON), par3EntityPlayer);
+                       } else if (result == 5) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.instance().getCompound("CarbonMonoxide")), par3EntityPlayer);
+                       } else if (result == 6) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, ChemiCraftData.LITHIUM), par3EntityPlayer);
+                       } else if (result == 7) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, ChemiCraftData.KRYPTON), par3EntityPlayer);
                        } else {
                        } else {
-                               if (result3 == 0) {
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.instance().getCompound("CarbonDioxide")), par3EntityPlayer);
-                               } else if (result3 == 1) {
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 9), par3EntityPlayer);
-                               } else if (result3 == 2) {
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, 1), par3EntityPlayer);
-                               } else {
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 1), par3EntityPlayer);
-                               }
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, ChemiCraftData.XENON), par3EntityPlayer);
                        }
                }
 
                        }
                }
 
@@ -74,7 +74,7 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
                int uniqueBlockID = par3World.getBlockId(par4, par5 + 1, par6);
                Block uniqueBlock = Block.blocksList[uniqueBlockID];
 
                int uniqueBlockID = par3World.getBlockId(par4, par5 + 1, par6);
                Block uniqueBlock = Block.blocksList[uniqueBlockID];
 
-               if (uniqueBlock instanceof BlockFire){
+               if (uniqueBlock instanceof BlockFire) {
                        par1ItemStack.damageItem(1, par2EntityPlayer);
 
                        int result1 = probability.getProbability(99, 1);
                        par1ItemStack.damageItem(1, par2EntityPlayer);
 
                        int result1 = probability.getProbability(99, 1);