Fixed Action/Trigger textures

BuildCraft · Mar 9, 2013 · 52b7ce7 · 52b7ce7
1 parent 04726b0
commit 52b7ce7
Show file tree

Hide file tree

Showing 47 changed files with 260 additions and 182 deletions.
diff --git a/...xtures/items/triggers/guitriggers_4_4.png → ...s/triggers/action_machinecontrol_loop.png b/...xtures/items/triggers/guitriggers_4_4.png → ...s/triggers/action_machinecontrol_loop.png
diff --git a/...xtures/items/triggers/guitriggers_4_3.png → ...ms/triggers/action_machinecontrol_off.png b/...xtures/items/triggers/guitriggers_4_3.png → ...ms/triggers/action_machinecontrol_off.png
diff --git a/...xtures/items/triggers/guitriggers_4_2.png → ...ems/triggers/action_machinecontrol_on.png b/...xtures/items/triggers/guitriggers_4_2.png → ...ems/triggers/action_machinecontrol_on.png
diff --git a/...xtures/items/triggers/guitriggers_1_0.png → ...tems/triggers/trigger_engineheat_blue.png b/...xtures/items/triggers/guitriggers_1_0.png → ...tems/triggers/trigger_engineheat_blue.png
diff --git a/...xtures/items/triggers/guitriggers_1_1.png → ...ems/triggers/trigger_engineheat_green.png b/...xtures/items/triggers/guitriggers_1_1.png → ...ems/triggers/trigger_engineheat_green.png
diff --git a/...xtures/items/triggers/guitriggers_1_3.png → ...items/triggers/trigger_engineheat_red.png b/...xtures/items/triggers/guitriggers_1_3.png → ...items/triggers/trigger_engineheat_red.png
diff --git a/...xtures/items/triggers/guitriggers_1_2.png → ...ms/triggers/trigger_engineheat_yellow.png b/...xtures/items/triggers/guitriggers_1_2.png → ...ms/triggers/trigger_engineheat_yellow.png
diff --git a/...xtures/items/triggers/guitriggers_2_5.png → ...s/triggers/trigger_inventory_contains.png b/...xtures/items/triggers/guitriggers_2_5.png → ...s/triggers/trigger_inventory_contains.png
diff --git a/...xtures/items/triggers/guitriggers_2_4.png → ...tems/triggers/trigger_inventory_empty.png b/...xtures/items/triggers/guitriggers_2_4.png → ...tems/triggers/trigger_inventory_empty.png
diff --git a/...xtures/items/triggers/guitriggers_2_7.png → ...items/triggers/trigger_inventory_full.png b/...xtures/items/triggers/guitriggers_2_7.png → ...items/triggers/trigger_inventory_full.png
diff --git a/...xtures/items/triggers/guitriggers_2_6.png → ...tems/triggers/trigger_inventory_space.png b/...xtures/items/triggers/guitriggers_2_6.png → ...tems/triggers/trigger_inventory_space.png
diff --git a/...xtures/items/triggers/guitriggers_2_1.png → ...gers/trigger_liquidcontainer_contains.png b/...xtures/items/triggers/guitriggers_2_1.png → ...gers/trigger_liquidcontainer_contains.png
diff --git a/...xtures/items/triggers/guitriggers_2_0.png → ...riggers/trigger_liquidcontainer_empty.png b/...xtures/items/triggers/guitriggers_2_0.png → ...riggers/trigger_liquidcontainer_empty.png
diff --git a/...xtures/items/triggers/guitriggers_2_3.png → ...triggers/trigger_liquidcontainer_full.png b/...xtures/items/triggers/guitriggers_2_3.png → ...triggers/trigger_liquidcontainer_full.png
diff --git a/...xtures/items/triggers/guitriggers_2_2.png → ...riggers/trigger_liquidcontainer_space.png b/...xtures/items/triggers/guitriggers_2_2.png → ...riggers/trigger_liquidcontainer_space.png
diff --git a/...xtures/items/triggers/guitriggers_4_0.png → ...items/triggers/trigger_machine_active.png b/...xtures/items/triggers/guitriggers_4_0.png → ...items/triggers/trigger_machine_active.png
diff --git a/...xtures/items/triggers/guitriggers_4_1.png → ...ems/triggers/trigger_machine_inactive.png b/...xtures/items/triggers/guitriggers_4_1.png → ...ems/triggers/trigger_machine_inactive.png
diff --git a/...xtures/items/triggers/guitriggers_3_3.png → ...s/trigger_pipecontents_containsenergy.png b/...xtures/items/triggers/guitriggers_3_3.png → ...s/trigger_pipecontents_containsenergy.png
diff --git a/...xtures/items/triggers/guitriggers_3_1.png → ...rs/trigger_pipecontents_containsitems.png b/...xtures/items/triggers/guitriggers_3_1.png → ...rs/trigger_pipecontents_containsitems.png
diff --git a/...xtures/items/triggers/guitriggers_3_2.png → ...s/trigger_pipecontents_containsliquid.png b/...xtures/items/triggers/guitriggers_3_2.png → ...s/trigger_pipecontents_containsliquid.png
diff --git a/...xtures/items/triggers/guitriggers_3_0.png → ...s/triggers/trigger_pipecontents_empty.png b/...xtures/items/triggers/guitriggers_3_0.png → ...s/triggers/trigger_pipecontents_empty.png
diff --git a/...xtures/items/triggers/guitriggers_0_5.png → ...iggers/trigger_pipesignal_blue_active.png b/...xtures/items/triggers/guitriggers_0_5.png → ...iggers/trigger_pipesignal_blue_active.png
diff --git a/...xtures/items/triggers/guitriggers_0_4.png → ...gers/trigger_pipesignal_blue_inactive.png b/...xtures/items/triggers/guitriggers_0_4.png → ...gers/trigger_pipesignal_blue_inactive.png
diff --git a/...xtures/items/triggers/guitriggers_0_7.png → ...ggers/trigger_pipesignal_green_active.png b/...xtures/items/triggers/guitriggers_0_7.png → ...ggers/trigger_pipesignal_green_active.png
diff --git a/...xtures/items/triggers/guitriggers_0_6.png → ...ers/trigger_pipesignal_green_inactive.png b/...xtures/items/triggers/guitriggers_0_6.png → ...ers/trigger_pipesignal_green_inactive.png
diff --git a/...xtures/items/triggers/guitriggers_0_3.png → ...riggers/trigger_pipesignal_red_active.png b/...xtures/items/triggers/guitriggers_0_3.png → ...riggers/trigger_pipesignal_red_active.png
diff --git a/...xtures/items/triggers/guitriggers_0_2.png → ...ggers/trigger_pipesignal_red_inactive.png b/...xtures/items/triggers/guitriggers_0_2.png → ...ggers/trigger_pipesignal_red_inactive.png
diff --git a/...xtures/items/triggers/guitriggers_0_9.png → ...gers/trigger_pipesignal_yellow_active.png b/...xtures/items/triggers/guitriggers_0_9.png → ...gers/trigger_pipesignal_yellow_active.png
diff --git a/...xtures/items/triggers/guitriggers_0_8.png → ...rs/trigger_pipesignal_yellow_inactive.png b/...xtures/items/triggers/guitriggers_0_8.png → ...rs/trigger_pipesignal_yellow_inactive.png
diff --git a/...xtures/items/triggers/guitriggers_0_0.png → ...triggers/trigger_redstoneinput_active.png b/...xtures/items/triggers/guitriggers_0_0.png → ...triggers/trigger_redstoneinput_active.png
diff --git a/...xtures/items/triggers/guitriggers_0_1.png → ...iggers/trigger_redstoneinput_inactive.png b/...xtures/items/triggers/guitriggers_0_1.png → ...iggers/trigger_redstoneinput_inactive.png
diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java
@@ -13,7 +13,7 @@ public interface ITrigger {
 	 * Return the texture file for this trigger icon
 	 */
     @SideOnly(Side.CLIENT)
-	public abstract Icon getTexture();
+	public abstract Icon getTextureIcon();
 
 	/**
 	 * Return true if this trigger can accept parameters

diff --git a/common/buildcraft/api/gates/Trigger.java b/common/buildcraft/api/gates/Trigger.java
@@ -47,7 +47,7 @@ public int getId() {
 	 */
     @SideOnly(Side.CLIENT)
 	@Override
-	public abstract Icon getTexture();
+	public abstract Icon getTextureIcon();
 
 	/*
 	 * (non-Javadoc)

diff --git a/common/buildcraft/core/triggers/ActionMachineControl.java b/common/buildcraft/core/triggers/ActionMachineControl.java
@@ -1,7 +1,12 @@
 package buildcraft.core.triggers;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.util.Icon;
+import buildcraft.BuildCraftTransport;
 import buildcraft.api.gates.Action;
 import buildcraft.core.DefaultProps;
+import buildcraft.transport.IconItemConstants;
 
 public class ActionMachineControl extends Action {
 
@@ -18,36 +23,32 @@ public ActionMachineControl(int id, Mode mode) {
 	}
 
 	@Override
-	public int getIndexInTexture() {
+	public String getDescription() {
 		switch (mode) {
 		case On:
-			return 4 * 16 + 2;
+			return "On";
 		case Off:
-			return 4 * 16 + 3;
+			return "Off";
 		case Loop:
-			return 4 * 16 + 4;
+			return "Loop";
 		default:
-			return 0;
+			return "";
 		}
 	}
 
 	@Override
-	public String getDescription() {
+	@SideOnly(Side.CLIENT)
+	public Icon getTexture() {
 		switch (mode) {
 		case On:
-			return "On";
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_On];
 		case Off:
-			return "Off";
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_Off];
 		case Loop:
-			return "Loop";
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_Loop];
 		default:
-			return "";
+			return null;
 		}
 	}
 
-	@Override
-	public String getTexture() {
-		return DefaultProps.TEXTURE_TRIGGERS;
-	}
-
 }
diff --git a/common/buildcraft/core/triggers/ActionRedstoneOutput.java b/common/buildcraft/core/triggers/ActionRedstoneOutput.java
@@ -9,27 +9,28 @@
 
 package buildcraft.core.triggers;
 
+import net.minecraft.util.Icon;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import buildcraft.BuildCraftTransport;
 import buildcraft.api.gates.Action;
 import buildcraft.core.DefaultProps;
+import buildcraft.transport.IconItemConstants;
 
 public class ActionRedstoneOutput extends Action {
 
 	public ActionRedstoneOutput(int id) {
 		super(id);
 	}
 
-	@Override
-	public int getIndexInTexture() {
-		return 0 * 16 + 0;
-	}
-
 	@Override
 	public String getDescription() {
 		return "Redstone Signal";
 	}
 
 	@Override
-	public String getTexture() {
-		return DefaultProps.TEXTURE_TRIGGERS;
+	@SideOnly(Side.CLIENT)
+	public Icon getTexture() {
+		return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active];
 	}
 }
diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java
@@ -9,17 +9,22 @@
 
 package buildcraft.core.triggers;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.ISidedInventory;
+import buildcraft.BuildCraftTransport;
 import buildcraft.api.gates.ITriggerDirectional;
 import buildcraft.api.gates.ITriggerParameter;
 import buildcraft.api.gates.Trigger;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.SidedInventoryAdapter;
 import buildcraft.core.utils.Utils;
+import buildcraft.transport.IconItemConstants;
 
 public class TriggerInventory extends Trigger implements ITriggerDirectional {
 
@@ -35,20 +40,6 @@ public TriggerInventory(int id, State state) {
 		this.state = state;
 	}
 
-	@Override
-	public int getIndexInTexture() {
-		switch (state) {
-		case Empty:
-			return 2 * 16 + 4;
-		case Contains:
-			return 2 * 16 + 5;
-		case Space:
-			return 2 * 16 + 6;
-		default:
-			return 2 * 16 + 7;
-		}
-	}
-
 	@Override
 	public boolean hasParameter() {
 		if (state == State.Contains || state == State.Space)
@@ -134,7 +125,17 @@ public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) {
 	}
 
 	@Override
-	public String getTexture() {
-		return DefaultProps.TEXTURE_TRIGGERS;
+	@SideOnly(Side.CLIENT)
+	public Icon getTextureIcon() {
+		switch (state) {
+		case Empty:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Empty];
+		case Contains:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Contains];
+		case Space:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Space];
+		default:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Full];
+		}
 	}
 }
diff --git a/common/buildcraft/core/triggers/TriggerLiquidContainer.java b/common/buildcraft/core/triggers/TriggerLiquidContainer.java
@@ -9,15 +9,20 @@
 
 package buildcraft.core.triggers;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.liquids.ILiquidTank;
 import net.minecraftforge.liquids.ITankContainer;
 import net.minecraftforge.liquids.LiquidContainerRegistry;
 import net.minecraftforge.liquids.LiquidStack;
+import buildcraft.BuildCraftTransport;
 import buildcraft.api.gates.ITriggerParameter;
 import buildcraft.api.gates.Trigger;
 import buildcraft.core.DefaultProps;
+import buildcraft.transport.IconItemConstants;
 
 public class TriggerLiquidContainer extends Trigger {
 
@@ -32,20 +37,6 @@ public TriggerLiquidContainer(int id, State state) {
 		this.state = state;
 	}
 
-	@Override
-	public int getIndexInTexture() {
-		switch (state) {
-		case Empty:
-			return 2 * 16 + 0;
-		case Contains:
-			return 2 * 16 + 1;
-		case Space:
-			return 2 * 16 + 2;
-		default:
-			return 2 * 16 + 3;
-		}
-	}
-
 	@Override
 	public boolean hasParameter() {
 		if (state == State.Contains || state == State.Space)
@@ -137,7 +128,17 @@ public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) {
 	}
 
 	@Override
-	public String getTexture() {
-		return DefaultProps.TEXTURE_TRIGGERS;
+	@SideOnly(Side.CLIENT)
+	public Icon getTextureIcon() {
+		switch (state) {
+		case Empty:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Empty];
+		case Contains:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Contains];
+		case Space:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Space];
+		default:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Full];
+		}
 	}
 }
diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java
@@ -9,11 +9,16 @@
 
 package buildcraft.core.triggers;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
+import buildcraft.BuildCraftTransport;
 import buildcraft.api.gates.ITriggerParameter;
 import buildcraft.api.gates.Trigger;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.IMachine;
+import buildcraft.transport.IconItemConstants;
 
 public class TriggerMachine extends Trigger {
 
@@ -25,14 +30,6 @@ public TriggerMachine(int id, boolean active) {
 		this.active = active;
 	}
 
-	@Override
-	public int getIndexInTexture() {
-		if (active)
-			return 4 * 16 + 0;
-		else
-			return 4 * 16 + 1;
-	}
-
 	@Override
 	public String getDescription() {
 		if (active)
@@ -56,7 +53,11 @@ public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) {
 	}
 
 	@Override
-	public String getTexture() {
-		return DefaultProps.TEXTURE_TRIGGERS;
+	@SideOnly(Side.CLIENT)
+	public Icon getTextureIcon() {
+		if (active)
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Machine_Active];
+		else
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Machine_Inactive];
 	}
 }
diff --git a/common/buildcraft/energy/TriggerEngineHeat.java b/common/buildcraft/energy/TriggerEngineHeat.java
@@ -9,10 +9,15 @@
 
 package buildcraft.energy;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
+import buildcraft.BuildCraftTransport;
 import buildcraft.api.gates.ITriggerParameter;
 import buildcraft.api.gates.Trigger;
 import buildcraft.core.DefaultProps;
+import buildcraft.transport.IconItemConstants;
 
 public class TriggerEngineHeat extends Trigger {
 
@@ -24,20 +29,6 @@ public TriggerEngineHeat(int id, Engine.EnergyStage stage) {
 		this.stage = stage;
 	}
 
-	@Override
-	public int getIndexInTexture() {
-		switch (stage) {
-		case Blue:
-			return 1 * 16 + 0;
-		case Green:
-			return 1 * 16 + 1;
-		case Yellow:
-			return 1 * 16 + 2;
-		default:
-			return 1 * 16 + 3;
-		}
-	}
-
 	@Override
 	public String getDescription() {
 		switch (stage) {
@@ -64,7 +55,17 @@ public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) {
 	}
 
 	@Override
-	public String getTexture() {
-		return DefaultProps.TEXTURE_TRIGGERS;
+	@SideOnly(Side.CLIENT)
+	public Icon getTextureIcon() {
+		switch (stage) {
+		case Blue:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Blue];
+		case Green:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Green];
+		case Yellow:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Yellow];
+		default:
+			return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Red];
+		}
 	}
 }