Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Fix multismelter scanner info

Browse source
This commit is contained in:
Technus 2016-11-27 12:01:05 +01:00
parent 2af343deb0
commit 3362fe92a7
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/gregtech/common/GT_Client.java
View file

@ -286,8 +286,6 @@ public class GT_Client extends GT_Proxy
@SubscribeEvent @SubscribeEvent
public void onPlayerTickEventClient(TickEvent.PlayerTickEvent aEvent) { public void onPlayerTickEventClient(TickEvent.PlayerTickEvent aEvent) {
if ((aEvent.side.isClient()) && (aEvent.phase == TickEvent.Phase.END) && (!aEvent.player.isDead)) { 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++; afterSomeTime++;
if(afterSomeTime>=100L){ if(afterSomeTime>=100L){
afterSomeTime=0; afterSomeTime=0;
@ -372,6 +370,7 @@ public class GT_Client extends GT_Proxy
@SubscribeEvent @SubscribeEvent
public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) { public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) {
if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) { if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) {
//hideValue=shouldHeldItemHideThings();
mAnimationTick++; mAnimationTick++;
if (mAnimationTick % 50L == 0L) if (mAnimationTick % 50L == 0L)
{mAnimationDirection = !mAnimationDirection;} {mAnimationDirection = !mAnimationDirection;}
@ -538,4 +537,34 @@ public class GT_Client extends GT_Proxy
else else
aWorld.playSound(aX, aY, aZ, tString, 3F, tString.startsWith("note.") ? (float) Math.pow(2D, (double) (aStack.stackSize - 13) / 12D) : 1.0F, false); 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;
// }
//}
} }

2
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
View file

@ -267,7 +267,7 @@ public class GT_MetaTileEntity_MultiFurnace
" Efficiency: "+ " Efficiency: "+
EnumChatFormatting.YELLOW+Float.toString(mEfficiency / 100.0F)+EnumChatFormatting.RESET + " %", EnumChatFormatting.YELLOW+Float.toString(mEfficiency / 100.0F)+EnumChatFormatting.RESET + " %",
"Multi smelting: "+ "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+" %" "Pollution reduced to: "+ EnumChatFormatting.GREEN + mPollutionReduction+ EnumChatFormatting.RESET+" %"
}; };
} }