OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Mon, 4 Feb 2013 09:29:19 +0000 (18:29 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Mon, 4 Feb 2013 09:29:19 +0000 (18:29 +0900)
Conflicts:
common/chemicraft/ChemiCraft.java

1  2 
common/chemicraft/item/ItemGasCollectingBottle.java

- package chemicraft.item;\r
\r
- import net.minecraft.block.Block;\r
- import net.minecraft.block.BlockFire;\r
- import net.minecraft.entity.player.EntityPlayer;\r
- import net.minecraft.item.ItemStack;\r
- import net.minecraft.world.World;\r
- import chemicraft.ChemiCraft;\r
- import chemicraft.ChemiCraftAPI;\r
- import chemicraft.util.MathHelperPlus;\r
\r
- public class ItemGasCollectingBottle extends ItemAtomInfoContainer\r
- {\r
\r
-       public ItemGasCollectingBottle(int id) {\r
-               super(id);\r
-               this.setMaxStackSize(1);\r
-               this.setMaxDamage(2);\r
-               this.setCreativeTab(ChemiCraft.instance.creativeTab);\r
-       }\r
\r
-       @Override\r
-       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)\r
-       {\r
-               par1ItemStack.damageItem(1, par3EntityPlayer);\r
\r
-               this.atomInfo.update(par2World, par3EntityPlayer);\r
\r
-               int heightValue = par2World.getHeightValue((int) par3EntityPlayer.posX, (int) par3EntityPlayer.posZ);\r
\r
-               int result1 = MathHelperPlus.probability(99, 1);\r
-               int result2 = MathHelperPlus.probability(78, 21, 1);\r
-               int result3 = MathHelperPlus.probability(0.032, 0.0018, 0.000012, 0.00052);\r
-               if (this.atomInfo.isOverY(heightValue)) {\r
-                       if (result1 == 0) {\r
-                               if (result2 == 0) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 6), par3EntityPlayer);\r
-                               } else if (result2 == 1) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 7), par3EntityPlayer);\r
-                               } else {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 17), par3EntityPlayer);\r
-                               }\r
-                       } else {\r
-                               if (result3 == 0) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par3EntityPlayer);\r
-                               } else if (result3 == 1) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 9), par3EntityPlayer);\r
-                               } else if (result3 == 2) {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, 1), par3EntityPlayer);\r
-                               } else {\r
-                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemAtoms, 1, 1), par3EntityPlayer);\r
-                               }\r
-                       }\r
-               }\r
\r
-               // デバッグ用\r
-               if (par2World.isRemote) {\r
-                       par3EntityPlayer.addChatMessage("result1=" + result1 + " result2=" + result2 + " result3=" + result3);\r
-                       par3EntityPlayer.addChatMessage("このメッセージは開発版のみの表示ですが、もし製品版で表示されていた場合はご連絡ください。");\r
-               }\r
\r
-               return par1ItemStack;\r
-       }\r
\r
-       protected void isStackOrDrop(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer)\r
-       {\r
-               if (!par2EntityPlayer.inventory.addItemStackToInventory(par1ItemStack)) {\r
-                       par2EntityPlayer.dropPlayerItem(par1ItemStack);\r
-               }\r
-       }\r
\r
-       @Override\r
-       public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)\r
-       {\r
-               int blockID = par3World.getBlockId(par4, par5, par6);\r
-               Block block = Block.blocksList[blockID];\r
\r
-               int uniqueBlockID = par3World.getBlockId(par4, par5 + 1, par6);\r
-               Block uniqueBlock = Block.blocksList[uniqueBlockID];\r
\r
-               if (uniqueBlock instanceof BlockFire){\r
-                       par1ItemStack.damageItem(1, par2EntityPlayer);\r
\r
-                       int result1 = MathHelperPlus.probability(90, 10);\r
\r
-                       if (result1 == 0) {\r
-                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par2EntityPlayer);\r
-                       } else {\r
-                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonMonoxide")), par2EntityPlayer);\r
-                       }\r
\r
-                       return true;\r
-               }\r
-               return false;\r
-       }\r
\r
-       @Override\r
-       public String getTextureFile()\r
-       {\r
-               return "/chemicraft/items/items.png";\r
-       }\r
\r
- }\r
+ package chemicraft.item;
+ import net.minecraft.block.Block;
+ import net.minecraft.block.BlockFire;
+ import net.minecraft.entity.player.EntityPlayer;
+ import net.minecraft.item.ItemStack;
+ import net.minecraft.world.World;
+ import chemicraft.ChemiCraft;
+ import chemicraft.ChemiCraftAPI;
+ import chemicraft.util.MathHelperPlus;
+ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
+ {
+       public ItemGasCollectingBottle(int id) {
+               super(id);
+               this.setMaxStackSize(1);
+               this.setMaxDamage(2);
+               this.setCreativeTab(ChemiCraft.instance.creativeTab);
+       }
+       @Override
+       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
+       {
+               par1ItemStack.damageItem(1, par3EntityPlayer);
+               this.atomInfo.update(par2World, par3EntityPlayer);
+               int heightValue = par2World.getHeightValue((int) par3EntityPlayer.posX, (int) par3EntityPlayer.posZ);
+               int result1 = MathHelperPlus.probability(99, 1);
+               int result2 = MathHelperPlus.probability(78, 21, 1);
+               int result3 = MathHelperPlus.probability(0.032, 0.0018, 0.000012, 0.00052);
+               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);
+                               }
+                       } else {
+                               if (result3 == 0) {
+                                       this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().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);
+                               }
+                       }
+               }
+               // デバッグ用
+               if (par2World.isRemote) {
+                       par3EntityPlayer.addChatMessage("result1=" + result1 + " result2=" + result2 + " result3=" + result3);
++                      par3EntityPlayer.addChatMessage("このメッセージは開発版のみの表示ですが、もし製品版で表示されていた場合はご連絡ください。");
+               }
+               return par1ItemStack;
+       }
+       protected void isStackOrDrop(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer)
+       {
+               if (!par2EntityPlayer.inventory.addItemStackToInventory(par1ItemStack)) {
+                       par2EntityPlayer.dropPlayerItem(par1ItemStack);
+               }
+       }
+       @Override
+       public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
+       {
+               int blockID = par3World.getBlockId(par4, par5, par6);
+               Block block = Block.blocksList[blockID];
+               int uniqueBlockID = par3World.getBlockId(par4, par5 + 1, par6);
+               Block uniqueBlock = Block.blocksList[uniqueBlockID];
+               if (uniqueBlock instanceof BlockFire){
+                       par1ItemStack.damageItem(1, par2EntityPlayer);
 -                      int result1 = MathHelperPlus.probability(99, 1);
++                      int result1 = MathHelperPlus.probability(90, 10);
+                       if (result1 == 0) {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonDioxide")), par2EntityPlayer);
+                       } else {
+                               this.isStackOrDrop(new ItemStack(ChemiCraft.instance.itemCompounds, 1, ChemiCraftAPI.getInstance().getCompound("CarbonMonoxide")), par2EntityPlayer);
+                       }
+                       return true;
+               }
+               return false;
+       }
+       @Override
+       public String getTextureFile()
+       {
+               return "/chemicraft/items/items.png";
+       }
+ }