diff options
author | Technus <daniel112092@gmail.com> | 2017-12-31 11:49:33 +0100 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-12-31 11:49:33 +0100 |
commit | 607be64a145acf5e8952e5056f01843c295696fb (patch) | |
tree | c8338b3d8216c6bbbd699deebce0b14da2020f6e /src | |
parent | 49122ffb2da78539ca1d29ffa429f6482f5dcaec (diff) | |
parent | cb19c71fccff4e71081e4f2e55e50732faaa8cda (diff) | |
download | GT5-Unofficial-607be64a145acf5e8952e5056f01843c295696fb.tar.gz GT5-Unofficial-607be64a145acf5e8952e5056f01843c295696fb.tar.bz2 GT5-Unofficial-607be64a145acf5e8952e5056f01843c295696fb.zip |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
# Conflicts:
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java index 5d96f05afd..68d65ef5e9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java @@ -32,7 +32,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic boolean ready = false; public GT_MetaTileEntity_SeismicProspector(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 1, "Place, activate with explosives(4 Dynamite, 1 Glyceryl Trinitrate Cell, 2 TNT, 8 Powder Barrels or 1 ITNT), use Data Stick then Print.", 1, 1, "Default.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)}); + super(aID, aName, aNameRegional, aTier, 1, "Place, activate with explosives(8 Dynamite, 1 Glyceryl, 4 TNT, 16 Powder Barrels or 2 ITNT), use Data Stick then Print.", 1, 1, "Default.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)}); } public GT_MetaTileEntity_SeismicProspector(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { @@ -53,21 +53,21 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic ItemStack aStack = aPlayer.getCurrentEquippedItem(); ItemData stackData= GT_OreDictUnificator.getItemData(aStack); if (!ready && (aStack != null) && ( - (aStack.getItem() == Item.getItemFromBlock(Blocks.tnt) && aStack.stackSize > 1 ) || - (aStack.getItem() == Ic2Items.industrialTnt.getItem() && aStack.stackSize > 0 ) || - (aStack.getItem() == Ic2Items.dynamite.getItem() && aStack.stackSize > 3 ) || - (stackData!=null && stackData.mMaterial.mMaterial == Materials.Glyceryl && aStack.stackSize > 0 ) || - (aStack.getItem() == ItemList.Block_Powderbarrel.getItem() && aStack.getItemDamage()==ItemList.Block_Powderbarrel.get(1).getItemDamage() && aStack.stackSize > 7 ) + (aStack.getItem() == Item.getItemFromBlock(Blocks.tnt) && aStack.stackSize >= 4 ) || + (aStack.getItem() == Ic2Items.industrialTnt.getItem() && aStack.stackSize >= 2 ) || + (aStack.getItem() == Ic2Items.dynamite.getItem() && aStack.stackSize >= 8 ) || + (stackData!=null && stackData.mMaterial.mMaterial == Materials.Glyceryl && aStack.stackSize >= 1 ) || + (aStack.getItem() == ItemList.Block_Powderbarrel.getItem() && aStack.getItemDamage()==ItemList.Block_Powderbarrel.get(1).getItemDamage() && aStack.stackSize >= 16 ) ) ) { if ((!aPlayer.capabilities.isCreativeMode) && (aStack.stackSize != 111)) { if(aStack.getItem() == Item.getItemFromBlock(Blocks.tnt)){ - aStack.stackSize -= 2; + aStack.stackSize -= 4; }else if(aStack.getItem() == Ic2Items.industrialTnt.getItem()){ - aStack.stackSize -= 1; + aStack.stackSize -= 2; }else if(aStack.getItem() == Ic2Items.dynamite.getItem()){ - aStack.stackSize -= 4; + aStack.stackSize -= 8; }else if(aStack.getItem() == ItemList.Block_Powderbarrel.getItem() && aStack.getItemDamage()==ItemList.Block_Powderbarrel.get(1).getItemDamage()){ - aStack.stackSize -=8; + aStack.stackSize -=16; }else{ aStack.stackSize -= 1; } @@ -129,8 +129,8 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic private int range() { switch (mTier) { - case 1: return 8; - case 2: return 20; + case 1: return 16; + case 2: return 32; case 3: return 48; } return 0; |