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

Fabric port in progress

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 23:25:38 +02:00
parent 80fbb58d4f
commit b79cd732b2
368 changed files with 2498 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
+8 -8
View File
@@ -33,15 +33,15 @@ import appeng.api.util.WorldCoord;
import appeng.me.cluster.IAECluster;
import appeng.me.cluster.IAEMultiBlock;
import appeng.me.cluster.MBCalculator;
import appeng.tile.crafting.CraftingTileEntity;
import appeng.tile.crafting.CraftingBlockEntity;
public class CraftingCPUCalculator extends MBCalculator {
private final CraftingTileEntity tqb;
private final CraftingBlockEntity tqb;
public CraftingCPUCalculator(final IAEMultiBlock t) {
super(t);
this.tqb = (CraftingTileEntity) t;
this.tqb = (CraftingBlockEntity) t;
}
@Override
@@ -73,14 +73,14 @@ public class CraftingCPUCalculator extends MBCalculator {
for (int x = min.x; x <= max.x; x++) {
for (int y = min.y; y <= max.y; y++) {
for (int z = min.z; z <= max.z; z++) {
final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(new BlockPos(x, y, z));
final IAEMultiBlock te = (IAEMultiBlock) w.getBlockEntity(new BlockPos(x, y, z));
if (!te.isValid()) {
return false;
}
if (!storage && te instanceof CraftingTileEntity) {
storage = ((CraftingTileEntity) te).getStorageBytes() > 0;
if (!storage && te instanceof CraftingBlockEntity) {
storage = ((CraftingBlockEntity) te).getStorageBytes() > 0;
}
}
}
@@ -101,7 +101,7 @@ public class CraftingCPUCalculator extends MBCalculator {
for (int x = min.x; x <= max.x; x++) {
for (int y = min.y; y <= max.y; y++) {
for (int z = min.z; z <= max.z; z++) {
final CraftingTileEntity te = (CraftingTileEntity) w.getTileEntity(new BlockPos(x, y, z));
final CraftingBlockEntity te = (CraftingBlockEntity) w.getBlockEntity(new BlockPos(x, y, z));
te.updateStatus(c);
c.addTile(te);
}
@@ -126,6 +126,6 @@ public class CraftingCPUCalculator extends MBCalculator {
@Override
public boolean isValidTile(final BlockEntity te) {
return te instanceof CraftingTileEntity;
return te instanceof CraftingBlockEntity;
}
}
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+18 -18
View File
@@ -73,8 +73,8 @@ import appeng.crafting.MECraftingInventory;
import appeng.me.cache.CraftingGridCache;
import appeng.me.cluster.IAECluster;
import appeng.me.helpers.MachineSource;
import appeng.tile.crafting.CraftingMonitorTileEntity;
import appeng.tile.crafting.CraftingTileEntity;
import appeng.tile.crafting.CraftingMonitorBlockEntity;
import appeng.tile.crafting.CraftingBlockEntity;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
@@ -87,9 +87,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
private final int[] usedOps = new int[3];
private final Map<ICraftingPatternDetails, TaskProgress> tasks = new HashMap<>();
// INSTANCE sate
private final List<CraftingTileEntity> tiles = new ArrayList<>();
private final List<CraftingTileEntity> storage = new ArrayList<>();
private final List<CraftingMonitorTileEntity> status = new ArrayList<>();
private final List<CraftingBlockEntity> tiles = new ArrayList<>();
private final List<CraftingBlockEntity> storage = new ArrayList<>();
private final List<CraftingMonitorBlockEntity> status = new ArrayList<>();
private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
private ICraftingLink myLastLink;
private Text myName = null;
@@ -150,7 +150,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
@Override
public void updateStatus(final boolean updateGrid) {
for (final CraftingTileEntity r : this.tiles) {
for (final CraftingBlockEntity r : this.tiles) {
r.updateMeta(true);
}
}
@@ -164,7 +164,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
boolean posted = false;
for (final CraftingTileEntity r : this.tiles) {
for (final CraftingBlockEntity r : this.tiles) {
final IGridNode n = r.getActionableNode();
if (n != null && !posted) {
final IGrid g = n.getGrid();
@@ -183,7 +183,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
return (Iterator) this.tiles.iterator();
}
void addTile(final CraftingTileEntity te) {
void addTile(final CraftingBlockEntity te) {
if (this.machineSrc == null || te.isCoreBlock()) {
this.machineSrc = new MachineSource(te);
}
@@ -196,7 +196,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
this.availableStorage += te.getStorageBytes();
this.storage.add(te);
} else if (te.isStatus()) {
this.status.add((CraftingMonitorTileEntity) te);
this.status.add((CraftingMonitorBlockEntity) te);
} else if (te.isAccelerator()) {
this.accelerator++;
}
@@ -393,7 +393,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
send = null;
}
for (final CraftingMonitorTileEntity t : this.status) {
for (final CraftingMonitorBlockEntity t : this.status) {
t.setJob(send);
}
}
@@ -402,15 +402,15 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
return this.listeners.entrySet().iterator();
}
private CraftingTileEntity getCore() {
private CraftingBlockEntity getCore() {
if (this.machineSrc == null) {
return null;
}
return (CraftingTileEntity) this.machineSrc.machine().get();
return (CraftingBlockEntity) this.machineSrc.machine().get();
}
private IGrid getGrid() {
for (final CraftingTileEntity r : this.tiles) {
for (final CraftingBlockEntity r : this.tiles) {
final IGridNode gn = r.getActionableNode();
if (gn != null) {
final IGrid g = gn.getGrid();
@@ -839,7 +839,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
public boolean isActive() {
final CraftingTileEntity core = this.getCore();
final CraftingBlockEntity core = this.getCore();
if (core == null) {
return false;
@@ -1024,7 +1024,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
void done() {
final CraftingTileEntity core = this.getCore();
final CraftingBlockEntity core = this.getCore();
core.setCoreBlock(true);
@@ -1081,11 +1081,11 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
public void updateName() {
this.myName = null;
for (final CraftingTileEntity te : this.tiles) {
for (final CraftingBlockEntity te : this.tiles) {
if (te.hasCustomInventoryName()) {
if (this.myName != null) {
this.myName.appendText(" ").appendSibling(te.getCustomInventoryName());
this.myName.append(" ").append(te.getCustomInventoryName());
} else {
this.myName = te.getCustomInventoryName().deepCopy();
}
@@ -1120,7 +1120,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
public void breakCluster() {
final CraftingTileEntity t = this.getCore();
final CraftingBlockEntity t = this.getCore();
if (t != null) {
t.breakCluster();
src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
+6 -6
View File
@@ -30,15 +30,15 @@ import appeng.api.util.WorldCoord;
import appeng.me.cluster.IAECluster;
import appeng.me.cluster.IAEMultiBlock;
import appeng.me.cluster.MBCalculator;
import appeng.tile.qnb.QuantumBridgeTileEntity;
import appeng.tile.qnb.QuantumBridgeBlockEntity;
public class QuantumCalculator extends MBCalculator {
private final QuantumBridgeTileEntity tqb;
private final QuantumBridgeBlockEntity tqb;
public QuantumCalculator(final IAEMultiBlock t) {
super(t);
this.tqb = (QuantumBridgeTileEntity) t;
this.tqb = (QuantumBridgeBlockEntity) t;
}
@Override
@@ -70,7 +70,7 @@ public class QuantumCalculator extends MBCalculator {
for (int y = min.y; y <= max.y; y++) {
for (int z = min.z; z <= max.z; z++) {
final BlockPos p = new BlockPos(x, y, z);
final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(p);
final IAEMultiBlock te = (IAEMultiBlock) w.getBlockEntity(p);
if (!te.isValid()) {
return false;
@@ -107,7 +107,7 @@ public class QuantumCalculator extends MBCalculator {
for (int x = min.x; x <= max.x; x++) {
for (int y = min.y; y <= max.y; y++) {
for (int z = min.z; z <= max.z; z++) {
final QuantumBridgeTileEntity te = (QuantumBridgeTileEntity) w.getTileEntity(new BlockPos(x, y, z));
final QuantumBridgeBlockEntity te = (QuantumBridgeBlockEntity) w.getBlockEntity(new BlockPos(x, y, z));
num++;
final byte flags;
@@ -132,7 +132,7 @@ public class QuantumCalculator extends MBCalculator {
@Override
public boolean isValidTile(final BlockEntity te) {
return te instanceof QuantumBridgeTileEntity;
return te instanceof QuantumBridgeBlockEntity;
}
private boolean isBlockAtLocation(final BlockView w, final BlockPos pos, final IBlockDefinition def) {
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
+12 -12
View File
@@ -40,7 +40,7 @@ import appeng.api.util.WorldCoord;
import appeng.core.AELog;
import appeng.me.cache.helpers.ConnectionWrapper;
import appeng.me.cluster.IAECluster;
import appeng.tile.qnb.QuantumBridgeTileEntity;
import appeng.tile.qnb.QuantumBridgeBlockEntity;
import appeng.util.iterators.ChainedIterator;
public class QuantumCluster implements ILocatable, IAECluster {
@@ -49,17 +49,17 @@ public class QuantumCluster implements ILocatable, IAECluster {
private final WorldCoord max;
private boolean isDestroyed = false;
private boolean updateStatus = true;
private QuantumBridgeTileEntity[] Ring;
private QuantumBridgeBlockEntity[] Ring;
private boolean registered = false;
private ConnectionWrapper connection;
private long thisSide;
private long otherSide;
private QuantumBridgeTileEntity center;
private QuantumBridgeBlockEntity center;
public QuantumCluster(final WorldCoord min, final WorldCoord max) {
this.min = min;
this.max = max;
this.setRing(new QuantumBridgeTileEntity[8]);
this.setRing(new QuantumBridgeBlockEntity[8]);
}
@SubscribeEvent
@@ -165,7 +165,7 @@ public class QuantumCluster implements ILocatable, IAECluster {
final DimensionType id = theWorld.dimension.getType();
final World cur = theWorld.getServer().getWorld(id);
final BlockEntity te = theWorld.getTileEntity(qc.center.getPos());
final BlockEntity te = theWorld.getBlockEntity(qc.center.getPos());
return te != qc.center || theWorld != cur;
}
}
@@ -208,12 +208,12 @@ public class QuantumCluster implements ILocatable, IAECluster {
this.center.updateStatus(null, (byte) -1, this.isUpdateStatus());
for (final QuantumBridgeTileEntity r : this.getRing()) {
for (final QuantumBridgeBlockEntity r : this.getRing()) {
r.updateStatus(null, (byte) -1, this.isUpdateStatus());
}
this.center = null;
this.setRing(new QuantumBridgeTileEntity[8]);
this.setRing(new QuantumBridgeBlockEntity[8]);
}
@Override
@@ -222,7 +222,7 @@ public class QuantumCluster implements ILocatable, IAECluster {
this.getRing()[4], this.getRing()[5], this.getRing()[6], this.getRing()[7], this.center);
}
public boolean isCorner(final QuantumBridgeTileEntity tileQuantumBridge) {
public boolean isCorner(final QuantumBridgeBlockEntity tileQuantumBridge) {
return this.getRing()[0] == tileQuantumBridge || this.getRing()[2] == tileQuantumBridge
|| this.getRing()[4] == tileQuantumBridge || this.getRing()[6] == tileQuantumBridge;
}
@@ -232,11 +232,11 @@ public class QuantumCluster implements ILocatable, IAECluster {
return this.thisSide;
}
public QuantumBridgeTileEntity getCenter() {
public QuantumBridgeBlockEntity getCenter() {
return this.center;
}
void setCenter(final QuantumBridgeTileEntity c) {
void setCenter(final QuantumBridgeBlockEntity c) {
this.registered = true;
MinecraftForge.EVENT_BUS.register(this);
this.center = c;
@@ -250,11 +250,11 @@ public class QuantumCluster implements ILocatable, IAECluster {
this.updateStatus = updateStatus;
}
QuantumBridgeTileEntity[] getRing() {
QuantumBridgeBlockEntity[] getRing() {
return this.Ring;
}
private void setRing(final QuantumBridgeTileEntity[] ring) {
private void setRing(final QuantumBridgeBlockEntity[] ring) {
this.Ring = ring;
}
}
src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
+6 -6
View File
@@ -27,15 +27,15 @@ import appeng.api.util.WorldCoord;
import appeng.me.cluster.IAECluster;
import appeng.me.cluster.IAEMultiBlock;
import appeng.me.cluster.MBCalculator;
import appeng.tile.spatial.SpatialPylonTileEntity;
import appeng.tile.spatial.SpatialPylonBlockEntity;
public class SpatialPylonCalculator extends MBCalculator {
private final SpatialPylonTileEntity tqb;
private final SpatialPylonBlockEntity tqb;
public SpatialPylonCalculator(final IAEMultiBlock t) {
super(t);
this.tqb = (SpatialPylonTileEntity) t;
this.tqb = (SpatialPylonBlockEntity) t;
}
@Override
@@ -57,7 +57,7 @@ public class SpatialPylonCalculator extends MBCalculator {
for (int x = min.x; x <= max.x; x++) {
for (int y = min.y; y <= max.y; y++) {
for (int z = min.z; z <= max.z; z++) {
final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(new BlockPos(x, y, z));
final IAEMultiBlock te = (IAEMultiBlock) w.getBlockEntity(new BlockPos(x, y, z));
if (!te.isValid()) {
return false;
@@ -81,7 +81,7 @@ public class SpatialPylonCalculator extends MBCalculator {
for (int x = min.x; x <= max.x; x++) {
for (int y = min.y; y <= max.y; y++) {
for (int z = min.z; z <= max.z; z++) {
final SpatialPylonTileEntity te = (SpatialPylonTileEntity) w.getTileEntity(new BlockPos(x, y, z));
final SpatialPylonBlockEntity te = (SpatialPylonBlockEntity) w.getBlockEntity(new BlockPos(x, y, z));
te.updateStatus(c);
c.getLine().add((te));
}
@@ -91,6 +91,6 @@ public class SpatialPylonCalculator extends MBCalculator {
@Override
public boolean isValidTile(final BlockEntity te) {
return te instanceof SpatialPylonTileEntity;
return te instanceof SpatialPylonBlockEntity;
}
}
src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java
+5 -5
View File
@@ -25,13 +25,13 @@ import java.util.List;
import appeng.api.networking.IGridHost;
import appeng.api.util.DimensionalCoord;
import appeng.me.cluster.IAECluster;
import appeng.tile.spatial.SpatialPylonTileEntity;
import appeng.tile.spatial.SpatialPylonBlockEntity;
public class SpatialPylonCluster implements IAECluster {
private final DimensionalCoord min;
private final DimensionalCoord max;
private final List<SpatialPylonTileEntity> line = new ArrayList<>();
private final List<SpatialPylonBlockEntity> line = new ArrayList<>();
private boolean isDestroyed = false;
private Axis currentAxis = Axis.UNFORMED;
@@ -54,7 +54,7 @@ public class SpatialPylonCluster implements IAECluster {
@Override
public void updateStatus(final boolean updateGrid) {
for (final SpatialPylonTileEntity r : this.getLine()) {
for (final SpatialPylonBlockEntity r : this.getLine()) {
r.recalculateDisplay();
}
}
@@ -67,7 +67,7 @@ public class SpatialPylonCluster implements IAECluster {
}
this.isDestroyed = true;
for (final SpatialPylonTileEntity r : this.getLine()) {
for (final SpatialPylonBlockEntity r : this.getLine()) {
r.updateStatus(null);
}
}
@@ -105,7 +105,7 @@ public class SpatialPylonCluster implements IAECluster {
return this.min;
}
List<SpatialPylonTileEntity> getLine() {
List<SpatialPylonBlockEntity> getLine() {
return this.line;
}