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

fixed style, #1880

Browse source
This commit is contained in:
SpaceToad 2014-06-14 15:34:14 +02:00
parent 4f8e82b153
commit 71687ec20c
4 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/BuildCraftCore.java
View file

@ -92,11 +92,11 @@ import buildcraft.core.robots.EntityRobot;
import buildcraft.core.triggers.ActionMachineControl;
import buildcraft.core.triggers.ActionMachineControl.Mode;
import buildcraft.core.triggers.ActionRedstoneOutput;
import buildcraft.core.triggers.StatementIconProvider;
import buildcraft.core.triggers.BCAction;
import buildcraft.core.triggers.BCTrigger;
import buildcraft.core.triggers.DefaultActionProvider;
import buildcraft.core.triggers.DefaultTriggerProvider;
import buildcraft.core.triggers.StatementIconProvider;
import buildcraft.core.triggers.TriggerFluidContainer;
import buildcraft.core.triggers.TriggerFluidContainerLevel;
import buildcraft.core.triggers.TriggerInventory;

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

@ -56,7 +56,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
@Override
public String getDescription() {
IStatement stmt = getStatement();
if (stmt != null) {
return stmt.getDescription();
} else {
@ -260,12 +260,12 @@ public class GuiGateInterface extends GuiAdvancedInterface {
for (int x = 0; x < 3; ++x) {
slots[position] = new TriggerParameterSlot(
8 + 18 * (x + 1),
26 + 18 * y,
8 + 18 * (x + 1),
26 + 18 * y,
pipe,
x,
(TriggerSlot) slots[lastPos]);
position++;
}
@ -274,10 +274,10 @@ public class GuiGateInterface extends GuiAdvancedInterface {
position++;
for (int x = 0; x < 3; ++x) {
slots[position] = new ActionParameterSlot(
98 + 18 * (x + 1),
26 + 18 * y,
pipe,
slots[position] = new ActionParameterSlot(
98 + 18 * (x + 1),
26 + 18 * y,
pipe,
x,
(ActionSlot) slots[lastPos]);
position++;

2
common/buildcraft/transport/triggers/ActionSignalOutput.java
View file

@ -12,8 +12,8 @@ import java.util.Locale;
import buildcraft.api.gates.IAction;
import buildcraft.api.transport.PipeWire;
import buildcraft.core.triggers.StatementIconProvider;
import buildcraft.core.triggers.BCAction;
import buildcraft.core.triggers.StatementIconProvider;
import buildcraft.core.utils.StringUtils;
public class ActionSignalOutput extends BCAction {

40
common/buildcraft/transport/triggers/TriggerParameterSignal.java
View file

@ -38,25 +38,33 @@ public class TriggerParameterSignal implements ITriggerParameter {
if (active) {
switch (color) {
case RED:
id = StatementIconProvider.Trigger_PipeSignal_Red_Active;
case BLUE:
id = StatementIconProvider.Trigger_PipeSignal_Blue_Active;
case GREEN:
id = StatementIconProvider.Trigger_PipeSignal_Green_Active;
case YELLOW:
id = StatementIconProvider.Trigger_PipeSignal_Yellow_Active;
case RED:
id = StatementIconProvider.Trigger_PipeSignal_Red_Active;
break;
case BLUE:
id = StatementIconProvider.Trigger_PipeSignal_Blue_Active;
break;
case GREEN:
id = StatementIconProvider.Trigger_PipeSignal_Green_Active;
break;
case YELLOW:
id = StatementIconProvider.Trigger_PipeSignal_Yellow_Active;
break;
}
} else {
switch (color) {
case RED:
id = StatementIconProvider.Trigger_PipeSignal_Red_Inactive;
case BLUE:
id = StatementIconProvider.Trigger_PipeSignal_Blue_Inactive;
case GREEN:
id = StatementIconProvider.Trigger_PipeSignal_Green_Inactive;
case YELLOW:
id = StatementIconProvider.Trigger_PipeSignal_Yellow_Inactive;
case RED:
id = StatementIconProvider.Trigger_PipeSignal_Red_Inactive;
break;
case BLUE:
id = StatementIconProvider.Trigger_PipeSignal_Blue_Inactive;
break;
case GREEN:
id = StatementIconProvider.Trigger_PipeSignal_Green_Inactive;
break;
case YELLOW:
id = StatementIconProvider.Trigger_PipeSignal_Yellow_Inactive;
break;
}
}