fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add blue light for fully empty Cells (#334)

Browse Source
This commit is contained in:
Serenibyss
2023-12-24 19:46:13 -06:00
committed by GitHub
parent 9dbcf21fa9
commit 29098372af
12 changed files with 150 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/storage/DriveSlotState.java
+6 -1
View File
@@ -40,7 +40,10 @@ public enum DriveSlotState implements IStringSerializable {
TYPES_FULL("types_full"),
// Completely full
FULL("full");
FULL("full"),
// Online and completely empty
NO_CONTENTS("no_contents");
private final String name;
@@ -64,6 +67,8 @@ public enum DriveSlotState implements IStringSerializable {
return DriveSlotState.TYPES_FULL;
case 3:
return DriveSlotState.FULL;
case 4:
return DriveSlotState.NO_CONTENTS;
}
}
src/main/java/appeng/client/render/model/DriveModel.java
+8 -6
View File
@@ -42,12 +42,14 @@ public class DriveModel implements IModel {
private static final ResourceLocation MODEL_BASE = new ResourceLocation("appliedenergistics2:block/drive_base");
private static final Map<DriveSlotState, ResourceLocation> MODELS_CELLS = ImmutableMap.of(
DriveSlotState.EMPTY, new ResourceLocation("appliedenergistics2:block/drive_cell_empty"),
DriveSlotState.OFFLINE, new ResourceLocation("appliedenergistics2:block/drive_cell_off"),
DriveSlotState.ONLINE, new ResourceLocation("appliedenergistics2:block/drive_cell_on"),
DriveSlotState.TYPES_FULL, new ResourceLocation("appliedenergistics2:block/drive_cell_types_full"),
DriveSlotState.FULL, new ResourceLocation("appliedenergistics2:block/drive_cell_full"));
private static final Map<DriveSlotState, ResourceLocation> MODELS_CELLS = ImmutableMap.<DriveSlotState, ResourceLocation>builder()
.put(DriveSlotState.EMPTY, new ResourceLocation("appliedenergistics2:block/drive_cell_empty"))
.put(DriveSlotState.OFFLINE, new ResourceLocation("appliedenergistics2:block/drive_cell_off"))
.put(DriveSlotState.ONLINE, new ResourceLocation("appliedenergistics2:block/drive_cell_on"))
.put(DriveSlotState.TYPES_FULL, new ResourceLocation("appliedenergistics2:block/drive_cell_types_full"))
.put(DriveSlotState.FULL, new ResourceLocation("appliedenergistics2:block/drive_cell_full"))
.put(DriveSlotState.NO_CONTENTS, new ResourceLocation("appliedenergistics2:block/drive_cell_no_contents"))
.build();
@Override
public Collection<ResourceLocation> getDependencies() {
src/main/java/appeng/me/storage/AbstractCellInventory.java
+3
View File
@@ -291,6 +291,9 @@ public abstract class AbstractCellInventory<T extends IAEStack<T>> implements IC
@Override
public int getStatusForCell() {
if (this.getUsedBytes() == 0) {
return 4;
}
if (this.canHoldNewItem()) {
return 1;
}
src/main/java/appeng/tile/storage/TileChest.java
+39 -28
View File
@@ -91,7 +91,6 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
private final IConfigManager config = new ConfigManager(this);
private long lastStateChange = 0;
private int priority = 0;
private int state = 0;
private boolean wasActive = false;
private AEColor paintedColor = AEColor.TRANSPARENT;
private boolean isCached = false;
@@ -99,6 +98,13 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
private Accessor accessor;
private IFluidHandler fluidHandler;
// Client-sided caches for rendering
// state value holds 3 bits per drive
private int cellState;
private boolean powered = false;
// bit index corresponds to cell index
private int blinking;
public TileChest() {
this.setInternalMaxPower(PowerMultiplier.CONFIG.multiply(128));
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
@@ -131,17 +137,14 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
}
private void recalculateDisplay() {
final int oldState = this.state;
final int oldCellState = this.cellState;
final boolean oldPowered = this.powered;
for (int x = 0; x < this.getCellCount(); x++) {
this.state |= (this.getCellStatus(x) << (3 * x));
this.cellState |= (this.getCellStatus(x) << (3 * x));
}
if (this.isPowered()) {
this.state |= 0x40;
} else {
this.state &= ~0x40;
}
this.powered = this.isPowered();
final boolean currentActive = this.getProxy().isActive();
if (this.wasActive != currentActive) {
@@ -153,7 +156,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
}
}
if (oldState != this.state) {
if (oldCellState != this.cellState || oldPowered != this.powered) {
this.markForUpdate();
}
}
@@ -215,7 +218,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public int getCellStatus(final int slot) {
if (Platform.isClient()) {
return (this.state >> (slot * 3)) & 3;
return (this.cellState >> (slot * 3)) & 0b111;
}
this.updateHandler();
@@ -233,7 +236,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public boolean isPowered() {
if (Platform.isClient()) {
return (this.state & 0x40) == 0x40;
return this.powered;
}
boolean gridPowered = this.getAECurrentPower() > 64;
@@ -255,7 +258,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
return false;
}
return ((this.state >> (slot * 3 + 2)) & 0x01) == 0x01;
return (this.blinking & (1 << slot)) == 1;
}
@Override
@@ -287,13 +290,13 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
try {
if (!this.getProxy().getEnergy().isNetworkPowered()) {
final double powerUsed = this.extractAEPower(idleUsage, Actionable.MODULATE, PowerMultiplier.CONFIG); // drain
if (powerUsed + 0.1 >= idleUsage != (this.state & 0x40) > 0) {
if (powerUsed + 0.1 >= idleUsage != this.powered) {
this.recalculateDisplay();
}
}
} catch (final GridAccessException e) {
final double powerUsed = this.extractAEPower(this.getProxy().getIdlePowerUsage(), Actionable.MODULATE, PowerMultiplier.CONFIG); // drain
if (powerUsed + 0.1 >= idleUsage != (this.state & 0x40) > 0) {
if (powerUsed + 0.1 >= idleUsage != this.powered) {
this.recalculateDisplay();
}
}
@@ -308,22 +311,24 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
super.writeToStream(data);
if (this.world.getTotalWorldTime() - this.lastStateChange > 8) {
this.state = 0;
this.cellState = 0;
this.powered = false;
this.blinking = 0;
} else {
this.state &= 0x24924924; // just keep the blinks...
// just keep the blinks...
this.cellState = 0;
this.powered = false;
}
for (int x = 0; x < this.getCellCount(); x++) {
this.state |= (this.getCellStatus(x) << (3 * x));
this.cellState |= (this.getCellStatus(x) << (3 * x));
}
if (this.isPowered()) {
this.state |= 0x40;
} else {
this.state &= ~0x40;
}
this.powered = this.isPowered();
data.writeByte(this.state);
data.writeByte(this.cellState);
data.writeBoolean(this.powered);
data.writeByte(this.blinking);
data.writeByte(this.paintedColor.ordinal());
}
@@ -331,15 +336,19 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
protected boolean readFromStream(final ByteBuf data) throws IOException {
final boolean c = super.readFromStream(data);
final int oldState = this.state;
final int oldState = this.cellState;
final boolean oldPowered = this.powered;
final int oldBlinking = this.blinking;
this.state = data.readByte();
this.cellState = data.readByte();
this.powered = data.readBoolean();
this.blinking = data.readByte();
final AEColor oldPaintedColor = this.paintedColor;
this.paintedColor = AEColor.values()[data.readByte()];
this.lastStateChange = this.world.getTotalWorldTime();
return oldPaintedColor != this.paintedColor || (this.state & 0xDB6DB6DB) != (oldState & 0xDB6DB6DB) || c;
return oldPaintedColor != this.paintedColor || this.cellState != oldState || c || oldPowered != this.powered || oldBlinking != this.blinking;
}
@Override
@@ -470,11 +479,13 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
public void blinkCell(final int slot) {
final long now = this.world.getTotalWorldTime();
if (now - this.lastStateChange > 8) {
this.state = 0;
this.cellState = 0;
this.powered = false;
this.blinking = 0;
}
this.lastStateChange = now;
this.state |= 1 << (slot * 3 + 2);
this.blinking |= (1 << slot);
this.recalculateDisplay();
}
src/main/java/appeng/tile/storage/TileDrive.java
+24 -28
View File
@@ -55,10 +55,6 @@ import java.util.*;
public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPriorityHost {
private static final int BIT_POWER_MASK = 0x80000000;
private static final int BIT_BLINK_MASK = 0x24924924;
private static final int BIT_STATE_MASK = 0xDB6DB6DB;
private final AppEngCellInventory inv = new AppEngCellInventory(this, 10);
private final ICellHandler[] handlersBySlot = new ICellHandler[10];
private final DriveWatcher<IAEItemStack>[] invBySlot = new DriveWatcher[10];
@@ -71,15 +67,15 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
/**
* The state of all cells inside a drive as bitset, using the following format.
* <p>
* Bit 31: power state. 0 = off, 1 = on.
* Bit 30: undefined
* Bit 29-0: 3 bits as state of each cell with the cell in slot 0 located in the 3 least significant bits.
* <p>
* Cell states:
* Bit 2: blink. 0 = off, 1 = on.
* Bit 1-0: cell status
* Bit 2-0: cell status, representing {@link appeng.block.storage.DriveSlotState}.
*/
private int state = 0;
private int cellState = 0;
private boolean powered;
// bit index corresponds to cell index
private int blinking;
public TileDrive() {
this.mySrc = new MachineSource(this);
@@ -91,25 +87,27 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override
protected void writeToStream(final ByteBuf data) throws IOException {
super.writeToStream(data);
int newState = 0;
if (this.getProxy().isActive()) {
newState |= BIT_POWER_MASK;
}
for (int x = 0; x < this.getCellCount(); x++) {
newState |= (this.getCellStatus(x) << (3 * x));
}
data.writeInt(newState);
data.writeBoolean(this.getProxy().isActive());
data.writeInt(this.blinking);
}
@Override
protected boolean readFromStream(final ByteBuf data) throws IOException {
final boolean c = super.readFromStream(data);
final int oldState = this.state;
this.state = data.readInt();
return (this.state & BIT_STATE_MASK) != (oldState & BIT_STATE_MASK) || c;
final int oldCellState = this.cellState;
final boolean oldPowered = this.powered;
final int oldBlinking = this.blinking;
this.cellState = data.readInt();
this.powered = data.readBoolean();
this.blinking = data.readInt();
return oldCellState != this.cellState || oldPowered != this.powered || oldBlinking != this.blinking || c;
}
@Override
@@ -120,7 +118,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override
public int getCellStatus(final int slot) {
if (Platform.isClient()) {
return (this.state >> (slot * 3)) & 3;
return (this.cellState >> (slot * 3)) & 0b111;
}
final DriveWatcher handler = this.invBySlot[slot];
@@ -134,7 +132,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override
public boolean isPowered() {
if (Platform.isClient()) {
return (this.state & BIT_POWER_MASK) == BIT_POWER_MASK;
return this.powered;
}
return this.getProxy().isActive();
@@ -142,7 +140,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override
public boolean isCellBlinking(final int slot) {
return ((this.state >> (slot * 3 + 2)) & 0x01) == 0x01;
return (this.blinking & (1 << slot)) == 1;
}
@Override
@@ -166,11 +164,10 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
private void recalculateDisplay() {
final boolean currentActive = this.getProxy().isActive();
int newState = 0;
final int oldCellState = this.cellState;
final boolean oldPowered = this.powered;
if (currentActive) {
newState |= BIT_POWER_MASK;
}
this.powered = currentActive;
if (this.wasActive != currentActive) {
this.wasActive = currentActive;
@@ -182,11 +179,10 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
}
for (int x = 0; x < this.getCellCount(); x++) {
newState |= (this.getCellStatus(x) << (3 * x));
cellState |= (this.getCellStatus(x) << (3 * x));
}
if (newState != this.state) {
this.state = newState;
if (oldCellState != this.cellState || oldPowered != this.powered) {
this.markForUpdate();
}
}
@@ -306,7 +302,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override
public void blinkCell(final int slot) {
this.state |= 1 << (slot * 3 + 2);
this.blinking |= (1 << slot);
this.recalculateDisplay();
}