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

Merge branch 'marmot' of https://github.com/BuildCraft/BuildCraft into marmot

Browse source
This commit is contained in:
CovertJaguar 2014-01-04 07:12:00 -08:00
commit 23a3a7004d
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/buildcraft/core/triggers/ActionTriggerIconProvider.java
View file

@ -8,7 +8,7 @@ import net.minecraft.util.Icon;
/**
* Don't put new Trigger Icons in here please, put them in the Trigger classes
* like the TriggerQuartzTimer. This class will go away someday.
* like the #TriggerClockTimer. This class will go away someday.
*
* @author CovertJaguar <http://www.railcraft.info/>
*/
@ -17,7 +17,7 @@ public class ActionTriggerIconProvider implements IIconProvider {
public static ActionTriggerIconProvider INSTANCE = new ActionTriggerIconProvider();
public static final int Action_MachineControl_On = 0;
public static final int Action_MachineControl_Off = 1;
public static final int Action_MachineControl_Loop = 2;
public static final int Action_MachineControl_Loop = 2;
public static final int Trigger_EngineHeat_Blue = 3;
public static final int Trigger_EngineHeat_Green = 4;
public static final int Trigger_EngineHeat_Yellow = 5;
@ -51,8 +51,6 @@ public class ActionTriggerIconProvider implements IIconProvider {
public static final int Trigger_Inventory_Below25 = 33;
public static final int Trigger_Inventory_Below50 = 34;
public static final int Trigger_Inventory_Below75 = 35;
public static final int Action_Pulsar = 36;
public static final int Action_Single_Pulsar = 37;
public static final int MAX = 39;
@SideOnly(Side.CLIENT)
private final Icon[] icons = new Icon[MAX];
@ -106,7 +104,5 @@ public class ActionTriggerIconProvider implements IIconProvider {
icons[ActionTriggerIconProvider.Trigger_Inventory_Below25] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_below25");
icons[ActionTriggerIconProvider.Trigger_Inventory_Below50] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_below50");
icons[ActionTriggerIconProvider.Trigger_Inventory_Below75] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_below75");
icons[ActionTriggerIconProvider.Action_Pulsar] = iconRegister.registerIcon("buildcraft:triggers/action_pulsar");
icons[ActionTriggerIconProvider.Action_Single_Pulsar] = iconRegister.registerIcon("buildcraft:triggers/action_single_pulsar");
}
}

13
common/buildcraft/transport/triggers/ActionEnergyPulsar.java
View file

@ -1,23 +1,32 @@
package buildcraft.transport.triggers;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.util.Icon;
import buildcraft.core.triggers.ActionTriggerIconProvider;
import buildcraft.core.triggers.BCAction;
import buildcraft.core.utils.StringUtils;
public class ActionEnergyPulsar extends BCAction {
private Icon icon;
public ActionEnergyPulsar() {
super("buildcraft:pulsar.constant", "buildcraft.pulser.constant");
}
@Override
public int getIconIndex() {
return ActionTriggerIconProvider.Action_Pulsar;
public Icon getIcon() {
return icon;
}
@Override
public String getDescription() {
return StringUtils.localize("gate.action.pulsar.constant");
}
@Override
public void registerIcons(IconRegister iconRegister) {
icon = iconRegister.registerIcon("buildcraft:triggers/action_pulsar");
}
}

14
common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java
View file

@ -1,22 +1,32 @@
package buildcraft.transport.triggers;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.util.Icon;
import buildcraft.core.triggers.ActionTriggerIconProvider;
import buildcraft.core.triggers.BCAction;
import buildcraft.core.utils.StringUtils;
public class ActionSingleEnergyPulse extends BCAction {
private Icon icon;
public ActionSingleEnergyPulse() {
super("buildcraft:pulsar.single", "buildcraft.pulser.single");
}
@Override
public int getIconIndex() {
return ActionTriggerIconProvider.Action_Single_Pulsar;
public Icon getIcon() {
return icon;
}
@Override
public String getDescription() {
return StringUtils.localize("gate.action.pulsar.single");
}
@Override
public void registerIcons(IconRegister iconRegister) {
icon = iconRegister.registerIcon("buildcraft:triggers/action_single_pulsar");
}
}