From 2c569612892dc5a48c46205f89cb716a6f1fb46c Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Tue, 3 Nov 2015 11:18:22 +0000 Subject: [PATCH] Fixes #226 --- .../java/techreborn/client/gui/GuiBlastFurnace.java | 7 ++++++- .../client/render/MultiblockRenderEvent.java | 12 +----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 08ecb5127..d32e59c7b 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -15,6 +15,7 @@ import techreborn.client.multiblock.MultiblockSet; import techreborn.init.ModBlocks; import techreborn.lib.Location; import techreborn.lib.ModInfo; +import techreborn.partSystem.fmp.PacketFMPPlacePart; import techreborn.proxies.ClientProxy; import techreborn.tiles.TileBlastFurnace; @@ -45,6 +46,9 @@ public class GuiBlastFurnace extends GuiContainer { ChunkCoordinates coordinates = new ChunkCoordinates(blastfurnace.xCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetX * 2), blastfurnace.yCoord - 1, blastfurnace.zCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetZ * 2)); if(coordinates.equals(ClientProxy.multiblockRenderEvent.anchor) && blastfurnace.getHeat() != 0){ ClientProxy.multiblockRenderEvent.setMultiblock(null); + button.displayString = "B"; + } else { + button.displayString = "A"; } } @@ -118,7 +122,8 @@ public class GuiBlastFurnace extends GuiContainer { multiblock.addComponent(-1, 2, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 2, -1, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 2, 1, ModBlocks.MachineCasing, 0); - + + multiblock.addComponent(0, 3, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(1, 3, 0, ModBlocks.MachineCasing, 0); multiblock.addComponent(0, 3, 1, ModBlocks.MachineCasing, 0); multiblock.addComponent(-1, 3, 0, ModBlocks.MachineCasing, 0); diff --git a/src/main/java/techreborn/client/render/MultiblockRenderEvent.java b/src/main/java/techreborn/client/render/MultiblockRenderEvent.java index 45f806f82..4c7a23669 100644 --- a/src/main/java/techreborn/client/render/MultiblockRenderEvent.java +++ b/src/main/java/techreborn/client/render/MultiblockRenderEvent.java @@ -38,7 +38,6 @@ import techreborn.client.multiblock.component.MultiblockComponent; import techreborn.lib.Location; public class MultiblockRenderEvent { - public static boolean rendering = false; private static RenderBlocks blockRender = RenderBlocks.getInstance(); public MultiblockSet currentMultiblock; @@ -77,18 +76,9 @@ public class MultiblockRenderEvent { int anchorY = anchor != null ? anchor.posY +1 : src.blockY + 1; int anchorZ = anchor != null ? anchor.posZ : src.blockZ; - rendering = true; Multiblock mb =currentMultiblock.getForEntity(player); - boolean didAny = false; for(MultiblockComponent comp : mb.getComponents()) - if(renderComponent(player.worldObj, mb, comp, anchorX, anchorY, anchorZ)) - didAny = true; - rendering = false; - - if(!didAny) { - setMultiblock(null); - player.addChatComponentMessage(new ChatComponentText("Structure Complete!").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN))); - } + renderComponent(player.worldObj, mb, comp, anchorX, anchorY, anchorZ); } }