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

Improved gate selection display client side.

Browse source
This commit is contained in:
SirSengir 2012-05-30 14:04:01 +02:00
parent 9077e9dedf
commit 514039b92b
1 changed files with 77 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
buildcraft_client/net/minecraft/src/buildcraft/transport/GuiGateInterface.java
View file

@ -32,16 +32,20 @@ public class GuiGateInterface extends GuiAdvancedInterface {
private int nbEntries; private int nbEntries;
class TriggerSlot extends AdvancedSlot { class TriggerSlot extends AdvancedSlot {
Trigger trigger;
Pipe pipe;
int slot;
public TriggerSlot (int x, int y, Trigger trigger) { public TriggerSlot (int x, int y, Pipe pipe, int slot) {
super (x, y); super (x, y);
this.trigger = trigger; this.pipe = pipe;
this.slot = slot;
} }
@Override @Override
public String getDescription () { public String getDescription () {
Trigger trigger = pipe.getTrigger(slot);
if (trigger != null) if (trigger != null)
return trigger.getDescription(); return trigger.getDescription();
else else
@ -50,6 +54,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
@Override @Override
public String getTexture () { public String getTexture () {
Trigger trigger = pipe.getTrigger(slot);
if (trigger != null) if (trigger != null)
return trigger.getTextureFile(); return trigger.getTextureFile();
else else
@ -58,6 +63,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
@Override @Override
public int getTextureIndex () { public int getTextureIndex () {
Trigger trigger = pipe.getTrigger(slot);
if (trigger != null) if (trigger != null)
return trigger.getIndexInTexture(); return trigger.getIndexInTexture();
else else
@ -66,22 +72,29 @@ public class GuiGateInterface extends GuiAdvancedInterface {
@Override @Override
public boolean isDefined () { public boolean isDefined () {
return trigger != null; return pipe.getTrigger(slot) != null;
}
public Trigger getTrigger() {
return pipe.getTrigger(slot);
} }
} }
class ActionSlot extends AdvancedSlot { class ActionSlot extends AdvancedSlot {
Action action;
Pipe pipe;
int slot;
public ActionSlot (int x, int y, Action action) { public ActionSlot (int x, int y, Pipe pipe, int slot) {
super (x, y); super (x, y);
this.action = action; this.pipe = pipe;
this.slot = slot;
} }
@Override @Override
public String getDescription () { public String getDescription () {
Action action = pipe.getAction(slot);
if (action != null) if (action != null)
return action.getDescription(); return action.getDescription();
else else
@ -90,6 +103,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
@Override @Override
public String getTexture () { public String getTexture () {
Action action = pipe.getAction(slot);
if (action != null) if (action != null)
return action.getTexture(); return action.getTexture();
else else
@ -98,6 +112,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
@Override @Override
public int getTextureIndex () { public int getTextureIndex () {
Action action = pipe.getAction(slot);
if (action != null) if (action != null)
return action.getIndexInTexture(); return action.getIndexInTexture();
else else
@ -106,31 +121,43 @@ public class GuiGateInterface extends GuiAdvancedInterface {
@Override @Override
public boolean isDefined () { public boolean isDefined () {
return action != null; return pipe.getAction(slot) != null;
}
public Action getAction() {
return pipe.getAction(slot);
} }
} }
class TriggerParameterSlot extends AdvancedSlot { class TriggerParameterSlot extends AdvancedSlot {
TriggerParameter parameter;
Pipe pipe;
int slot;
public TriggerParameterSlot(int x, int y, TriggerParameter parameter) { public TriggerParameterSlot(int x, int y, Pipe pipe, int slot) {
super(x, y); super(x, y);
this.parameter = parameter; this.pipe = pipe;
this.slot = slot;
} }
@Override @Override
public boolean isDefined () { public boolean isDefined () {
return parameter != null; return pipe.getTriggerParameter(slot) != null;
} }
@Override @Override
public ItemStack getItemStack () { public ItemStack getItemStack () {
if (this.parameter != null) TriggerParameter parameter = pipe.getTriggerParameter(slot);
return this.parameter.getItem(); if (parameter != null)
return parameter.getItem();
else else
return null; return null;
} }
public TriggerParameter getTriggerParameter() {
return pipe.getTriggerParameter(slot);
}
} }
public GuiGateInterface(IInventory playerInventory, Pipe pipe) { public GuiGateInterface(IInventory playerInventory, Pipe pipe) {
@ -148,34 +175,34 @@ public class GuiGateInterface extends GuiAdvancedInterface {
nbEntries = 1; nbEntries = 1;
slots = new AdvancedSlot [2]; slots = new AdvancedSlot [2];
slots [0] = new TriggerSlot (65, 54, pipe.getTrigger(0)); slots [0] = new TriggerSlot (65, 54, pipe, 0);
slots [1] = new ActionSlot (99, 54, pipe.getAction(0)); slots [1] = new ActionSlot (99, 54, pipe, 0);
} else if (pipe.gate.kind == GateKind.AND_2 || pipe.gate.kind == GateKind.OR_2) { } else if (pipe.gate.kind == GateKind.AND_2 || pipe.gate.kind == GateKind.OR_2) {
nbEntries = 2; nbEntries = 2;
slots = new AdvancedSlot [4]; slots = new AdvancedSlot [4];
slots [0] = new TriggerSlot (65, 46, pipe.getTrigger(0)); slots [0] = new TriggerSlot (65, 46, pipe, 0);
slots [1] = new TriggerSlot (65, 64, pipe.getTrigger(1)); slots [1] = new TriggerSlot (65, 64, pipe, 1);
slots [2] = new ActionSlot (99, 46, pipe.getAction(0)); slots [2] = new ActionSlot (99, 46, pipe, 0);
slots [3] = new ActionSlot (99, 64, pipe.getAction(1)); slots [3] = new ActionSlot (99, 64, pipe, 1);
} else if (pipe.gate.kind == GateKind.AND_3 || pipe.gate.kind == GateKind.OR_3) { } else if (pipe.gate.kind == GateKind.AND_3 || pipe.gate.kind == GateKind.OR_3) {
nbEntries = 4; nbEntries = 4;
slots = new AdvancedSlot [12]; slots = new AdvancedSlot [12];
for (int k = 0; k < 4; ++k) { for (int k = 0; k < 4; ++k) {
slots [position] = new TriggerSlot (60, 36 + 18 * k, pipe.getTrigger(position)); slots [position] = new TriggerSlot (60, 36 + 18 * k, pipe, position);
position++; position++;
} }
for (int k = 0; k < 4; ++k) { for (int k = 0; k < 4; ++k) {
slots [position] = new ActionSlot (112, 36 + 18 * k, pipe.getAction(position - 4)); slots [position] = new ActionSlot (112, 36 + 18 * k, pipe, position - 4);
position++; position++;
} }
for (int k = 0; k < 4; ++k) { for (int k = 0; k < 4; ++k) {
slots [position] = new TriggerParameterSlot (78, 36 + 18 * k, pipe.getTriggerParameter(position - 8)); slots [position] = new TriggerParameterSlot (78, 36 + 18 * k, pipe, position - 8);
position++; position++;
} }
@ -185,23 +212,23 @@ public class GuiGateInterface extends GuiAdvancedInterface {
slots = new AdvancedSlot [24]; slots = new AdvancedSlot [24];
for (int k = 0; k < 4; ++k) { for (int k = 0; k < 4; ++k) {
slots [position] = new TriggerSlot (8, 36 + 18 * k, pipe.getTrigger(position)); slots [position] = new TriggerSlot (8, 36 + 18 * k, pipe, position);
position++; position++;
slots [position] = new TriggerSlot (100, 36 + 18 * k, pipe.getTrigger(position)); slots [position] = new TriggerSlot (100, 36 + 18 * k, pipe, position);
position++; position++;
} }
for (int k = 0; k < 4; ++k) { for (int k = 0; k < 4; ++k) {
slots [position] = new ActionSlot (60, 36 + 18 * k, pipe.getAction(position - 8)); slots [position] = new ActionSlot (60, 36 + 18 * k, pipe, position - 8);
position++; position++;
slots [position] = new ActionSlot (152, 36 + 18 * k, pipe.getAction(position - 8)); slots [position] = new ActionSlot (152, 36 + 18 * k, pipe, position - 8);
position++; position++;
} }
for (int k = 0; k < 4; ++k) { for (int k = 0; k < 4; ++k) {
slots [position] = new TriggerParameterSlot (26, 36 + 18 * k, pipe.getTriggerParameter(position - 16)); slots [position] = new TriggerParameterSlot (26, 36 + 18 * k, pipe, position - 16);
position++; position++;
slots [position] = new TriggerParameterSlot (118, 36 + 18 * k, pipe.getTriggerParameter(position - 16)); slots [position] = new TriggerParameterSlot (118, 36 + 18 * k, pipe, position - 16);
position++; position++;
} }
} }
@ -237,13 +264,13 @@ public class GuiGateInterface extends GuiAdvancedInterface {
AdvancedSlot slot = slots [s]; AdvancedSlot slot = slots [s];
if (slot instanceof TriggerSlot) { if (slot instanceof TriggerSlot) {
Trigger trigger = ((TriggerSlot) slot).trigger; Trigger trigger = ((TriggerSlot) slot).getTrigger();
if (_container.getGateOrdinal() >= GateKind.AND_3.ordinal()) { if (_container.getGateOrdinal() >= GateKind.AND_3.ordinal()) {
TriggerParameter parameter = null; TriggerParameter parameter = null;
if (slots [s + nbEntries * 2] != null && slots [s + nbEntries * 2].isDefined()) if (slots [s + nbEntries * 2] != null && slots [s + nbEntries * 2].isDefined())
parameter = ((TriggerParameterSlot) slots [s + nbEntries * 2]).parameter; parameter = ((TriggerParameterSlot) slots [s + nbEntries * 2]).getTriggerParameter();
if (_container.isNearbyTriggerActive(trigger, parameter)) { if (_container.isNearbyTriggerActive(trigger, parameter)) {
mc.renderEngine.bindTexture(texture); mc.renderEngine.bindTexture(texture);
@ -289,12 +316,13 @@ public class GuiGateInterface extends GuiAdvancedInterface {
if (slot instanceof TriggerSlot && _container.hasTriggers()) { if (slot instanceof TriggerSlot && _container.hasTriggers()) {
TriggerSlot triggerSlot = (TriggerSlot) slot; TriggerSlot triggerSlot = (TriggerSlot) slot;
if (triggerSlot.trigger == null) { Trigger changed = null;
if (triggerSlot.getTrigger() == null) {
if (k == 0) if (k == 0)
triggerSlot.trigger = _container.getFirstTrigger(); changed = _container.getFirstTrigger();
else else
triggerSlot.trigger = _container.getLastTrigger(); changed = _container.getLastTrigger();
} else { } else {
Iterator<Trigger> it = _container.getTriggerIterator(k != 0); Iterator<Trigger> it = _container.getTriggerIterator(k != 0);
@ -303,32 +331,32 @@ public class GuiGateInterface extends GuiAdvancedInterface {
Trigger trigger = it.next(); Trigger trigger = it.next();
if (!it.hasNext()) { if (!it.hasNext()) {
triggerSlot.trigger = null; changed = null;
break; break;
} }
if (trigger == triggerSlot.trigger) { if (trigger == triggerSlot.getTrigger()) {
triggerSlot.trigger = it.next(); changed = it.next();
break; break;
} }
} }
} }
_container.setTrigger(position, triggerSlot.trigger, true); _container.setTrigger(position, changed, true);
if (_container.getGateOrdinal() >= GateKind.AND_3.ordinal()) { if (_container.getGateOrdinal() >= GateKind.AND_3.ordinal()) {
((TriggerParameterSlot) slots [position + nbEntries * 2]).parameter = null;
_container.setTriggerParameter(position, null, true); _container.setTriggerParameter(position, null, true);
} }
} else if (slot instanceof ActionSlot) { } else if (slot instanceof ActionSlot) {
ActionSlot actionSlot = (ActionSlot) slot; ActionSlot actionSlot = (ActionSlot) slot;
if (actionSlot.action == null) { Action changed = null;
if (actionSlot.getAction() == null) {
if (k == 0) if (k == 0)
actionSlot.action = _container.getFirstAction(); changed = _container.getFirstAction();
else else
actionSlot.action = _container.getLastAction(); changed = _container.getLastAction();
} else { } else {
Iterator<Action> it = _container.getActionIterator(k != 0); Iterator<Action> it = _container.getActionIterator(k != 0);
@ -337,28 +365,26 @@ public class GuiGateInterface extends GuiAdvancedInterface {
Action action = it.next(); Action action = it.next();
if (!it.hasNext()) { if (!it.hasNext()) {
actionSlot.action = null; changed = null;
break; break;
} }
if (action == actionSlot.action) { if (action == actionSlot.getAction()) {
actionSlot.action = it.next(); changed = it.next();
break; break;
} }
} }
} }
_container.setAction(position - nbEntries, actionSlot.action, true); _container.setAction(position - nbEntries, changed, true);
} else if (slot instanceof TriggerParameterSlot) { } else if (slot instanceof TriggerParameterSlot) {
TriggerSlot trigger = (TriggerSlot) slots [position - nbEntries * 2]; TriggerSlot trigger = (TriggerSlot) slots [position - nbEntries * 2];
if (trigger.isDefined() && trigger.trigger.hasParameter()) { if (trigger.isDefined() && trigger.getTrigger().hasParameter()) {
TriggerParameter param = trigger.trigger.createParameter(); TriggerParameter param = trigger.getTrigger().createParameter();
if (param != null) { if (param != null) {
param.set(mc.thePlayer.inventory.getItemStack()); param.set(mc.thePlayer.inventory.getItemStack());
((TriggerParameterSlot) slot).parameter = param;
_container.setTriggerParameter(position - nbEntries * 2, param, true); _container.setTriggerParameter(position - nbEntries * 2, param, true);
} }
} }