Skip to content

Commit

Permalink
Add a few little things
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexIIL committed Mar 12, 2016
1 parent 1b3d59b commit 38d631b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
6 changes: 5 additions & 1 deletion buildcraft_resources/changelog/7.2.0
Expand Up @@ -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)

This comment has been minimized.

Copy link
@AlexIIL

AlexIIL Mar 12, 2016

Author Member

That was in 1.7.10. Woops

* **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)
Expand Down
2 changes: 2 additions & 0 deletions common/buildcraft/builders/TileFiller.java
Expand Up @@ -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);

Expand Down
8 changes: 8 additions & 0 deletions common/buildcraft/builders/gui/GuiBuilder.java
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion common/buildcraft/builders/gui/GuiFiller.java
Expand Up @@ -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) {
Expand Down

0 comments on commit 38d631b

Please sign in to comment.