Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Gates indicate that trigger require parameter

Browse source 
Also removing normal Inventory Triggers from FilteredBuffer, for now.
This commit is contained in:
SandGrainOne 2014-03-18 23:00:04 +01:00
parent 753dc868d2
commit 8765dac0e3
4 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 6 KiB

BIN
buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

18
common/buildcraft/transport/TileFilteredBuffer.java
View file

@ -8,6 +8,11 @@
*/
package buildcraft.transport;
import java.util.LinkedList;
import buildcraft.BuildCraftCore;
import buildcraft.api.gates.IOverrideDefaultTriggers;
import buildcraft.api.gates.ITrigger;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.inventory.SimpleInventory;
import net.minecraft.entity.player.EntityPlayer;
@ -16,7 +21,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class TileFilteredBuffer extends TileBuildCraft implements IInventory {
public class TileFilteredBuffer extends TileBuildCraft implements IInventory, IOverrideDefaultTriggers {
private final SimpleInventory inventoryFilters = new SimpleInventory(9, "FilteredBufferFilters", 1);
private final SimpleInventory inventoryStorage = new SimpleInventory(9, "FilteredBufferStorage", 64);
@ -124,4 +129,15 @@ public class TileFilteredBuffer extends TileBuildCraft implements IInventory {
public boolean hasCustomInventoryName() {
return false;
}
@Override
public LinkedList<ITrigger> getTriggers() {
LinkedList<ITrigger> triggers = new LinkedList<ITrigger>();
triggers.add(BuildCraftCore.triggerInventoryBelow25);
triggers.add(BuildCraftCore.triggerInventoryBelow50);
triggers.add(BuildCraftCore.triggerInventoryBelow75);
return triggers;
}
}

15
common/buildcraft/transport/gui/GuiGateInterface.java
View file

@ -282,12 +282,25 @@ public class GuiGateInterface extends GuiAdvancedInterface {
drawTexturedModalRect(cornerX + slot.x + 17, cornerY + slot.y - 1, 176, 0, 18, 18);
}
} else if (_container.triggerState[triggerTracker++]) {
}
else if (_container.triggerState[triggerTracker++]) {
mc.renderEngine.bindTexture(texture);
drawTexturedModalRect(cornerX + slot.x + 17, cornerY + slot.y + 6, 176, 18, 18, 4);
}
}
else if (slot instanceof TriggerParameterSlot) {
TriggerParameterSlot paramSlot = (TriggerParameterSlot) slot;
TriggerSlot trigger = (TriggerSlot) slots[s - numSlots * 2];
if (trigger.isDefined() && trigger.getTrigger().requiresParameter()) {
if (paramSlot.getItemStack() == null) {
mc.renderEngine.bindTexture(texture);
drawTexturedModalRect(cornerX + slot.x - 1, cornerY + slot.y - 1, 176, 22, 18, 18);
}
}
}
}
drawBackgroundSlots();