diff options
| author | Technus <daniel112092@gmail.com> | 2016-11-27 12:01:05 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-11-27 12:01:05 +0100 |
| commit | 3362fe92a72b32534e4331c45825556aafeae8dd (patch) | |
| tree | 5dd0a068b31cd106ed5e1d00a4154bbed5632a6c /src/main/java/gregtech/common | |
| parent | 2af343deb0439365859d10505c3e50f25e26ed5e (diff) | |
| download | GT5-Unofficial-3362fe92a72b32534e4331c45825556aafeae8dd.tar.gz GT5-Unofficial-3362fe92a72b32534e4331c45825556aafeae8dd.tar.bz2 GT5-Unofficial-3362fe92a72b32534e4331c45825556aafeae8dd.zip | |
Fix multismelter scanner info
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Client.java | 33 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java | 2 |
2 files changed, 32 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 3b6bcab2a7..05563ab853 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -286,8 +286,6 @@ public class GT_Client extends GT_Proxy @SubscribeEvent public void onPlayerTickEventClient(TickEvent.PlayerTickEvent aEvent) { if ((aEvent.side.isClient()) && (aEvent.phase == TickEvent.Phase.END) && (!aEvent.player.isDead)) { - /**Something on the lines of this works for recipe visibility toggling**/ - /**yes just change the mHidden thing, rest is done by custom NEI configurer GT_NEI_AssLineHandler**/ afterSomeTime++; if(afterSomeTime>=100L){ afterSomeTime=0; @@ -372,6 +370,7 @@ public class GT_Client extends GT_Proxy @SubscribeEvent public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) { if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) { + //hideValue=shouldHeldItemHideThings(); mAnimationTick++; if (mAnimationTick % 50L == 0L) {mAnimationDirection = !mAnimationDirection;} @@ -538,4 +537,34 @@ public class GT_Client extends GT_Proxy else aWorld.playSound(aX, aY, aZ, tString, 3F, tString.startsWith("note.") ? (float) Math.pow(2D, (double) (aStack.stackSize - 13) / 12D) : 1.0F, false); } + + //public static int hideValue=0; + + //private static int shouldHeldItemHideThings() { + // 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); + // int hide = 0; + // for (int i : ids) { + // if (OreDictionary.getOreName(i).equals("craftingToolWrench")) { + // hide |= 0x1; + // continue; + // } + // if (OreDictionary.getOreName(i).equals("craftingToolWireCutter")) { + // hide |= 0x2; + // continue; + // } + // if (OreDictionary.getOreName(i).equals("craftingToolSolderingIron")) { + // hide |= 0x3; + // continue; + // } + // } + // return hide; + // }catch(Exception e){ + // return 0; + // } + //} } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index 7f2563091c..f8f0171924 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -267,7 +267,7 @@ public class GT_MetaTileEntity_MultiFurnace " Efficiency: "+ EnumChatFormatting.YELLOW+Float.toString(mEfficiency / 100.0F)+EnumChatFormatting.RESET + " %", "Multi smelting: "+ - EnumChatFormatting.GREEN+mLevel*8+EnumChatFormatting.RESET+" Discount: "+EnumChatFormatting.GREEN+"(EU/t) / "+mCostDiscount+EnumChatFormatting.RESET, + EnumChatFormatting.GREEN+mLevel*8+EnumChatFormatting.RESET+" Discount: (EU/t) / "+EnumChatFormatting.GREEN+mCostDiscount+EnumChatFormatting.RESET, "Pollution reduced to: "+ EnumChatFormatting.GREEN + mPollutionReduction+ EnumChatFormatting.RESET+" %" }; } |