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

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
+7 -7
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.TileCraftingTile;
import appeng.tile.crafting.CraftingTileEntity;
public class CraftingCPUCalculator extends MBCalculator {
private final TileCraftingTile tqb;
private final CraftingTileEntity tqb;
public CraftingCPUCalculator(final IAEMultiBlock t) {
super(t);
this.tqb = (TileCraftingTile) t;
this.tqb = (CraftingTileEntity) t;
}
@Override
@@ -79,8 +79,8 @@ public class CraftingCPUCalculator extends MBCalculator {
return false;
}
if (!storage && te instanceof TileCraftingTile) {
storage = ((TileCraftingTile) te).getStorageBytes() > 0;
if (!storage && te instanceof CraftingTileEntity) {
storage = ((CraftingTileEntity) 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 TileCraftingTile te = (TileCraftingTile) w.getTileEntity(new BlockPos(x, y, z));
final CraftingTileEntity te = (CraftingTileEntity) w.getTileEntity(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 TileEntity te) {
return te instanceof TileCraftingTile;
return te instanceof CraftingTileEntity;
}
}
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+17 -17
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.TileCraftingMonitorTile;
import appeng.tile.crafting.TileCraftingTile;
import appeng.tile.crafting.CraftingMonitorTileEntity;
import appeng.tile.crafting.CraftingTileEntity;
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<TileCraftingTile> tiles = new ArrayList<>();
private final List<TileCraftingTile> storage = new ArrayList<>();
private final List<TileCraftingMonitorTile> status = new ArrayList<>();
private final List<CraftingTileEntity> tiles = new ArrayList<>();
private final List<CraftingTileEntity> storage = new ArrayList<>();
private final List<CraftingMonitorTileEntity> status = new ArrayList<>();
private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
private ICraftingLink myLastLink;
private ITextComponent myName = null;
@@ -150,7 +150,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
@Override
public void updateStatus(final boolean updateGrid) {
for (final TileCraftingTile r : this.tiles) {
for (final CraftingTileEntity r : this.tiles) {
r.updateMeta(true);
}
}
@@ -164,7 +164,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
boolean posted = false;
for (final TileCraftingTile r : this.tiles) {
for (final CraftingTileEntity 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 TileCraftingTile te) {
void addTile(final CraftingTileEntity 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((TileCraftingMonitorTile) te);
this.status.add((CraftingMonitorTileEntity) te);
} else if (te.isAccelerator()) {
this.accelerator++;
}
@@ -393,7 +393,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
send = null;
}
for (final TileCraftingMonitorTile t : this.status) {
for (final CraftingMonitorTileEntity t : this.status) {
t.setJob(send);
}
}
@@ -402,15 +402,15 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
return this.listeners.entrySet().iterator();
}
private TileCraftingTile getCore() {
private CraftingTileEntity getCore() {
if (this.machineSrc == null) {
return null;
}
return (TileCraftingTile) this.machineSrc.machine().get();
return (CraftingTileEntity) this.machineSrc.machine().get();
}
private IGrid getGrid() {
for (final TileCraftingTile r : this.tiles) {
for (final CraftingTileEntity 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 TileCraftingTile core = this.getCore();
final CraftingTileEntity core = this.getCore();
if (core == null) {
return false;
@@ -1024,7 +1024,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
void done() {
final TileCraftingTile core = this.getCore();
final CraftingTileEntity core = this.getCore();
core.setCoreBlock(true);
@@ -1081,7 +1081,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
public void updateName() {
this.myName = null;
for (final TileCraftingTile te : this.tiles) {
for (final CraftingTileEntity te : this.tiles) {
if (te.hasCustomInventoryName()) {
if (this.myName != null) {
@@ -1120,7 +1120,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
public void breakCluster() {
final TileCraftingTile t = this.getCore();
final CraftingTileEntity t = this.getCore();
if (t != null) {
t.breakCluster();
src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
+5 -5
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.TileQuantumBridge;
import appeng.tile.qnb.QuantumBridgeTileEntity;
public class QuantumCalculator extends MBCalculator {
private final TileQuantumBridge tqb;
private final QuantumBridgeTileEntity tqb;
public QuantumCalculator(final IAEMultiBlock t) {
super(t);
this.tqb = (TileQuantumBridge) t;
this.tqb = (QuantumBridgeTileEntity) t;
}
@Override
@@ -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 TileQuantumBridge te = (TileQuantumBridge) w.getTileEntity(new BlockPos(x, y, z));
final QuantumBridgeTileEntity te = (QuantumBridgeTileEntity) w.getTileEntity(new BlockPos(x, y, z));
num++;
final byte flags;
@@ -132,7 +132,7 @@ public class QuantumCalculator extends MBCalculator {
@Override
public boolean isValidTile(final TileEntity te) {
return te instanceof TileQuantumBridge;
return te instanceof QuantumBridgeTileEntity;
}
private boolean isBlockAtLocation(final IBlockReader w, final BlockPos pos, final IBlockDefinition def) {
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
+11 -11
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.TileQuantumBridge;
import appeng.tile.qnb.QuantumBridgeTileEntity;
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 TileQuantumBridge[] Ring;
private QuantumBridgeTileEntity[] Ring;
private boolean registered = false;
private ConnectionWrapper connection;
private long thisSide;
private long otherSide;
private TileQuantumBridge center;
private QuantumBridgeTileEntity center;
public QuantumCluster(final WorldCoord min, final WorldCoord max) {
this.min = min;
this.max = max;
this.setRing(new TileQuantumBridge[8]);
this.setRing(new QuantumBridgeTileEntity[8]);
}
@SubscribeEvent
@@ -208,12 +208,12 @@ public class QuantumCluster implements ILocatable, IAECluster {
this.center.updateStatus(null, (byte) -1, this.isUpdateStatus());
for (final TileQuantumBridge r : this.getRing()) {
for (final QuantumBridgeTileEntity r : this.getRing()) {
r.updateStatus(null, (byte) -1, this.isUpdateStatus());
}
this.center = null;
this.setRing(new TileQuantumBridge[8]);
this.setRing(new QuantumBridgeTileEntity[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 TileQuantumBridge tileQuantumBridge) {
public boolean isCorner(final QuantumBridgeTileEntity 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 TileQuantumBridge getCenter() {
public QuantumBridgeTileEntity getCenter() {
return this.center;
}
void setCenter(final TileQuantumBridge c) {
void setCenter(final QuantumBridgeTileEntity 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;
}
TileQuantumBridge[] getRing() {
QuantumBridgeTileEntity[] getRing() {
return this.Ring;
}
private void setRing(final TileQuantumBridge[] ring) {
private void setRing(final QuantumBridgeTileEntity[] ring) {
this.Ring = ring;
}
}
src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
+5 -5
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.TileSpatialPylon;
import appeng.tile.spatial.SpatialPylonTileEntity;
public class SpatialPylonCalculator extends MBCalculator {
private final TileSpatialPylon tqb;
private final SpatialPylonTileEntity tqb;
public SpatialPylonCalculator(final IAEMultiBlock t) {
super(t);
this.tqb = (TileSpatialPylon) t;
this.tqb = (SpatialPylonTileEntity) t;
}
@Override
@@ -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 TileSpatialPylon te = (TileSpatialPylon) w.getTileEntity(new BlockPos(x, y, z));
final SpatialPylonTileEntity te = (SpatialPylonTileEntity) w.getTileEntity(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 TileEntity te) {
return te instanceof TileSpatialPylon;
return te instanceof SpatialPylonTileEntity;
}
}
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.TileSpatialPylon;
import appeng.tile.spatial.SpatialPylonTileEntity;
public class SpatialPylonCluster implements IAECluster {
private final DimensionalCoord min;
private final DimensionalCoord max;
private final List<TileSpatialPylon> line = new ArrayList<>();
private final List<SpatialPylonTileEntity> 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 TileSpatialPylon r : this.getLine()) {
for (final SpatialPylonTileEntity r : this.getLine()) {
r.recalculateDisplay();
}
}
@@ -67,7 +67,7 @@ public class SpatialPylonCluster implements IAECluster {
}
this.isDestroyed = true;
for (final TileSpatialPylon r : this.getLine()) {
for (final SpatialPylonTileEntity r : this.getLine()) {
r.updateStatus(null);
}
}
@@ -105,7 +105,7 @@ public class SpatialPylonCluster implements IAECluster {
return this.min;
}
List<TileSpatialPylon> getLine() {
List<SpatialPylonTileEntity> getLine() {
return this.line;
}