feat: show controller conflict
This commit is contained in:
parent
aea647214f
commit
017653aaa0
|
@ -1,6 +1,6 @@
|
||||||
aeversion=rv3
|
aeversion=rv3
|
||||||
aechannel=beta
|
aechannel=beta
|
||||||
aebuild=21
|
aebuild=22
|
||||||
aegroup=appeng
|
aegroup=appeng
|
||||||
aebasename=appliedenergistics2
|
aebasename=appliedenergistics2
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,8 @@ public class BlockLegacyController extends AEBaseTileBlock {
|
||||||
return ExtraBlockTextures.Controller5.getIcon();
|
return ExtraBlockTextures.Controller5.getIcon();
|
||||||
case 6:
|
case 6:
|
||||||
return ExtraBlockTextures.ControllerLinked.getIcon();
|
return ExtraBlockTextures.ControllerLinked.getIcon();
|
||||||
|
case 7:
|
||||||
|
return ExtraBlockTextures.ControllerConflict.getIcon();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return super.getIcon(direction.ordinal(), w.getBlockMetadata(x, y, z));
|
return super.getIcon(direction.ordinal(), w.getBlockMetadata(x, y, z));
|
||||||
|
|
|
@ -126,6 +126,7 @@ public enum ExtraBlockTextures {
|
||||||
Controller4("Controller4"),
|
Controller4("Controller4"),
|
||||||
Controller5("BlockLegacyControllerFront"),
|
Controller5("BlockLegacyControllerFront"),
|
||||||
ControllerLinked("ControllerLinked"),
|
ControllerLinked("ControllerLinked"),
|
||||||
|
ControllerConflict("ControllerConflict"),
|
||||||
|
|
||||||
HDChestTop("BlockHDChestTop"),
|
HDChestTop("BlockHDChestTop"),
|
||||||
HDChestTopParts("BlockHDChestTopParts"),
|
HDChestTopParts("BlockHDChestTopParts"),
|
||||||
|
|
|
@ -11,6 +11,7 @@ import appeng.api.features.ILocatable;
|
||||||
import appeng.api.networking.events.MENetworkCraftingCpuChange;
|
import appeng.api.networking.events.MENetworkCraftingCpuChange;
|
||||||
import appeng.api.networking.events.MENetworkPowerStorage;
|
import appeng.api.networking.events.MENetworkPowerStorage;
|
||||||
import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
|
import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
|
||||||
|
import appeng.api.networking.pathing.ControllerState;
|
||||||
import appeng.me.GridAccessException;
|
import appeng.me.GridAccessException;
|
||||||
import appeng.me.cluster.implementations.InternalCraftingCPU;
|
import appeng.me.cluster.implementations.InternalCraftingCPU;
|
||||||
import appeng.tile.TileEvent;
|
import appeng.tile.TileEvent;
|
||||||
|
@ -133,6 +134,13 @@ public class TileLegacyController extends AENetworkPowerTile implements ILocatab
|
||||||
} else if (!getProxy().isActive()) {
|
} else if (!getProxy().isActive()) {
|
||||||
this.powerLevel = 0;
|
this.powerLevel = 0;
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
if (getProxy().getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT) {
|
||||||
|
this.powerLevel = 7;
|
||||||
|
}
|
||||||
|
} catch (GridAccessException e) {
|
||||||
|
// :P
|
||||||
|
}
|
||||||
|
|
||||||
if (this.powerLevel != this.lastPowerLevel) {
|
if (this.powerLevel != this.lastPowerLevel) {
|
||||||
this.markForUpdate();
|
this.markForUpdate();
|
||||||
|
|
Loading…
Reference in New Issue