mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-21 20:42:24 +00:00
Rewrite Level Maintainer/Terminal logic
This commit is contained in:
16 files changed
+864
-1411
No files matched your search
+8
-8
@@ -61,7 +61,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
|
||||
if (slot < 0 || slot >= TileLevelMaintainer.REQ_COUNT) {
|
||||
throw new IllegalArgumentException("Invalid slot");
|
||||
}
|
||||
return tileEntity.requests.isDone(slot);
|
||||
return tileEntity.isDone(slot);
|
||||
}
|
||||
|
||||
private boolean isEnable(Arguments args) {
|
||||
@@ -69,7 +69,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
|
||||
if (slot < 0 || slot >= TileLevelMaintainer.REQ_COUNT) {
|
||||
throw new IllegalArgumentException("Invalid slot");
|
||||
}
|
||||
return tileEntity.requests.isEnable(slot);
|
||||
return tileEntity.requests[slot].isEnable();
|
||||
}
|
||||
|
||||
private boolean setEnable(Arguments args) {
|
||||
@@ -81,7 +81,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
|
||||
throw new IllegalArgumentException("Invalid slot");
|
||||
}
|
||||
boolean enable = args.checkBoolean(1);
|
||||
tileEntity.requests.updateStatus(slot, enable);
|
||||
tileEntity.requests[slot].updateEnable(enable);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -103,12 +103,12 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
|
||||
result.put("label", stack.getDisplayName());
|
||||
result.put("maxDamage", stack.getMaxDamage());
|
||||
result.put("name", GameRegistry.findUniqueIdentifierFor(stack.getItem()).toString());
|
||||
result.put("quantity", tileEntity.requests.getQuantity(slot));
|
||||
result.put("batch", tileEntity.requests.getBatchSize(slot));
|
||||
result.put("quantity", tileEntity.requests[slot].getQuantity());
|
||||
result.put("batch", tileEntity.requests[slot].getBatchSize());
|
||||
result.put("isFluid", ItemFluidDrop.isFluidStack(stack));
|
||||
if (ItemFluidDrop.isFluidStack(stack)) result.put("fluid", ItemFluidDrop.getFluidStack(stack));
|
||||
result.put("isEnable", tileEntity.requests.isEnable(slot));
|
||||
result.put("isDone", tileEntity.requests.isDone(slot));
|
||||
result.put("isEnable", tileEntity.requests[slot].isEnable());
|
||||
result.put("isDone", tileEntity.isDone(slot));
|
||||
return new Object[] { result };
|
||||
}
|
||||
return new Object[] { null };
|
||||
@@ -122,7 +122,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
|
||||
if (dbStack == null) {
|
||||
throw new IllegalArgumentException("Invalid slot");
|
||||
}
|
||||
tileEntity.requests.updateStack(slot, dbStack);
|
||||
tileEntity.updateStack(slot, dbStack);
|
||||
} else {
|
||||
throw new IllegalArgumentException("Not a database");
|
||||
}
|
||||
|
||||
+9
-10
@@ -11,7 +11,6 @@ import net.minecraft.world.World;
|
||||
import com.glodblock.github.common.tile.TileLevelMaintainer;
|
||||
import com.glodblock.github.crossmod.waila.Tooltip;
|
||||
|
||||
import appeng.api.storage.data.IAEItemStack;
|
||||
import appeng.integration.modules.waila.BaseWailaDataProvider;
|
||||
import mcp.mobius.waila.api.IWailaConfigHandler;
|
||||
import mcp.mobius.waila.api.IWailaDataAccessor;
|
||||
@@ -25,15 +24,15 @@ public class LevelMaintainerWailaDataProvider extends BaseWailaDataProvider {
|
||||
if (te instanceof TileLevelMaintainer tileLevelMaintainer) {
|
||||
te.readFromNBT(accessor.getNBTData());
|
||||
for (int i = 0; i < TileLevelMaintainer.REQ_COUNT; i++) {
|
||||
IAEItemStack ias = tileLevelMaintainer.requests.getAEItemStack(i);
|
||||
if (ias != null) {
|
||||
currentToolTip.add(
|
||||
Tooltip.tileLevelMaintainerFormat(
|
||||
ias.getItemStack().getDisplayName(),
|
||||
tileLevelMaintainer.requests.getQuantity(i),
|
||||
tileLevelMaintainer.requests.getBatchSize(i),
|
||||
tileLevelMaintainer.requests.isEnable(i)));
|
||||
}
|
||||
TileLevelMaintainer.RequestInfo request = tileLevelMaintainer.requests[i];
|
||||
if (request == null) continue;
|
||||
currentToolTip.add(
|
||||
Tooltip.tileLevelMaintainerFormat(
|
||||
request.getAEItemStack().getItemStack().getDisplayName(),
|
||||
request.getQuantity(),
|
||||
request.getBatchSize(),
|
||||
request.isEnable()));
|
||||
|
||||
}
|
||||
}
|
||||
return currentToolTip;
|
||||
|
||||
Reference in new issue
Block a user