From 38d631b3a7a002d30441b9647664d66fce21d5fe Mon Sep 17 00:00:00 2001 From: AlexIIL Date: Sat, 12 Mar 2016 15:56:20 +0000 Subject: [PATCH] Add a few little things --- buildcraft_resources/changelog/7.2.0 | 6 +++++- common/buildcraft/builders/TileFiller.java | 2 ++ common/buildcraft/builders/gui/GuiBuilder.java | 8 ++++++++ common/buildcraft/builders/gui/GuiFiller.java | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/buildcraft_resources/changelog/7.2.0 b/buildcraft_resources/changelog/7.2.0 index 018594f563..d0c083a990 100644 --- a/buildcraft_resources/changelog/7.2.0 +++ b/buildcraft_resources/changelog/7.2.0 @@ -15,7 +15,11 @@ Improvements: * Power in pipes is now animated, showing its direction (AlexIIL) * Things now have somewhat more 3D models (gates, docking stations, builders, fillers at least) (AlexIIL) * Lasers now render at least 2px wide, improving far away lasers. (AlexIIL) - * The filler has an icon showing if a gate is locking the pattern, or if it is in a different mode to normal (AlexIIL + * The filler has an icon showing if a gate is locking the pattern, or if it is in a different mode to normal (AlexIIL) + * The builder has an icon showing if a gate has turned it off (AlexIIL) + * The mining pipes for the quarry are transparent (they match the texture of the frame block) (AlexIIL) + * The mining pipes light properly depending on the light value of the block each part is in (AlexIIL) + * Pipe wire now glows in the dark (when it is on) (AlexIIL) * **Transport** * Gates now let you drag and drop triggers and actions! Lists of them are available to the sides (AlexIIL) * Support for Minecraft's statistics system (AlexIIL) diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index 49d210ef71..04fa5661a6 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -380,6 +380,8 @@ public void receiveCommand(String command, Side side, Object sender, ByteBuf str done = false; } else if ("setParameters".equals(command)) { + // You cannot set the pattern if it is locked + if (isPatternLocked()) return; NBTTagCompound patternData = NetworkUtils.readNBT(stream); readParametersFromNBT(patternData); diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java index 382bdf23bb..8e994aaa3e 100644 --- a/common/buildcraft/builders/gui/GuiBuilder.java +++ b/common/buildcraft/builders/gui/GuiBuilder.java @@ -10,14 +10,17 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import buildcraft.BuildCraftCore; +import buildcraft.api.tiles.IControllable.Mode; import buildcraft.builders.TileBuilder; import buildcraft.core.blueprints.RequirementItemStack; +import buildcraft.core.client.CoreIconProvider; import buildcraft.core.lib.fluids.Tank; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; @@ -137,6 +140,11 @@ protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { b.visible = false; } } + + if (builder.getControlMode() == Mode.Off) { + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + drawTexturedModalRect(guiLeft + 80, guiTop + 44, CoreIconProvider.TURNED_OFF.getSprite(), 16, 16); + } drawWidgets(x, y); diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 424a4f69d7..57bd37216f 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -131,7 +131,7 @@ protected void mouseClicked(int x, int y, int k) throws IOException { AdvancedSlot slot = getSlotAtLocation(x, y); - if (slot != null) { + if (slot != null && !filler.isPatternLocked()) { int i = ((FillerParameterSlot) slot).slot; if (i < filler.patternParameters.length) { if (filler.patternParameters[i] != null) {