aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorAntifluxfield <lyj_299792458@163.com>2017-11-06 17:53:15 +0800
committerAntifluxfield <lyj_299792458@163.com>2017-11-06 17:53:15 +0800
commite18f0a186deb9cc6c975b5ae73d7054cbf60224c (patch)
treef45a7cfbc76504c153fd8ae634184c0689154b41 /src/main/java/gregtech/common
parentf6a9bbb2931fe0a640bcf8c8c288a445159875d1 (diff)
downloadGT5-Unofficial-e18f0a186deb9cc6c975b5ae73d7054cbf60224c.tar.gz
GT5-Unofficial-e18f0a186deb9cc6c975b5ae73d7054cbf60224c.tar.bz2
GT5-Unofficial-e18f0a186deb9cc6c975b5ae73d7054cbf60224c.zip
Fix cover placing issue with such small AABB of metapipes
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_Client.java17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index aa8da5469f..a9eac1c6c2 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -16,6 +16,7 @@ import gregtech.api.enums.Materials;
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.ITurnable;
import gregtech.api.metatileentity.BaseMetaPipeEntity;
+import gregtech.api.objects.GT_ItemStack;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_PlayedSound;
import gregtech.api.util.GT_Recipe;
@@ -563,9 +564,9 @@ public class GT_Client extends GT_Proxy
try {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (player == null) return 0;
- ItemStack held = player.getCurrentEquippedItem();
- if (held == null) return 0;
- int[] ids = OreDictionary.getOreIDs(held);
+ ItemStack tCurrentItem = player.getCurrentEquippedItem();
+ if (tCurrentItem == null) return 0;
+ int[] ids = OreDictionary.getOreIDs(tCurrentItem);
int hide = 0;
for (int i : ids) {
if (OreDictionary.getOreName(i).equals("craftingToolSolderingIron")) {
@@ -573,6 +574,16 @@ public class GT_Client extends GT_Proxy
break;
}
}
+ if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)
+ || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList)
+ || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList)
+ || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList)
+ || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList)
+ || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)
+ || GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)
+ || GregTech_API.sCovers.containsKey(new GT_ItemStack(tCurrentItem))) {
+ hide |= 0x2;
+ }
return hide;
}catch(Exception e){
return 0;