diff --git a/src/main/java/appeng/me/cluster/IAECluster.java b/src/main/java/appeng/me/cluster/IAECluster.java index 4cb34f05c..adbe00f7c 100644 --- a/src/main/java/appeng/me/cluster/IAECluster.java +++ b/src/main/java/appeng/me/cluster/IAECluster.java @@ -47,5 +47,5 @@ public interface IAECluster { */ boolean isDestroyed(); - Iterator getTiles(); + Iterator getTiles(); } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java index 2a81b4cdf..2209ae317 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java @@ -90,7 +90,7 @@ public class CraftingCPUCalculator extends MBCalculator i = c.getTiles(); + final Iterator i = c.getTiles(); while (i.hasNext()) { final IGridHost gh = i.next(); final IGridNode n = gh.getGridNode(AEPartLocation.INTERNAL); diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 97c93c8fb..00b404b19 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -185,8 +185,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } @Override - public Iterator getTiles() { - return (Iterator) this.tiles.iterator(); + public Iterator getTiles() { + return this.tiles.iterator(); } void addTile(final CraftingTileEntity te) { diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 6b4f5ea9d..7ab580d98 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -33,7 +33,6 @@ import appeng.api.events.LocatableEventAnnounce; import appeng.api.events.LocatableEventAnnounce.LocatableEvent; import appeng.api.exceptions.FailedConnectionException; import appeng.api.features.ILocatable; -import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; import appeng.core.AELog; @@ -238,7 +237,7 @@ public class QuantumCluster implements ILocatable, IAECluster { } @Override - public Iterator getTiles() { + public Iterator getTiles() { return new ChainedIterator<>(this.getRing()[0], this.getRing()[1], this.getRing()[2], this.getRing()[3], this.getRing()[4], this.getRing()[5], this.getRing()[6], this.getRing()[7], this.center); } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index 2d3ef3ee4..a0c4b3671 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java @@ -25,7 +25,6 @@ import java.util.List; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import appeng.api.networking.IGridHost; import appeng.me.cluster.IAECluster; import appeng.me.cluster.MBCalculator; import appeng.tile.spatial.SpatialPylonTileEntity; @@ -88,8 +87,8 @@ public class SpatialPylonCluster implements IAECluster { } @Override - public Iterator getTiles() { - return (Iterator) this.getLine().iterator(); + public Iterator getTiles() { + return this.getLine().iterator(); } public int tileCount() { diff --git a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java index 9742d1f2c..6cd4ac64c 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java @@ -41,11 +41,10 @@ public class AENetworkProxyMultiblock extends AENetworkProxy implements IGridMul if (this.getCluster() == null) { return new ChainedIterator<>(); } - return new ProxyNodeIterator(this.getCluster().getTiles()); } private IAECluster getCluster() { - return ((IAEMultiBlock) this.getMachine()).getCluster(); + return ((IAEMultiBlock) this.getMachine()).getCluster(); } } diff --git a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java index b9d3685ec..fd117431c 100644 --- a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java @@ -18,14 +18,17 @@ package appeng.tile.crafting; -import java.util.*; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Optional; import javax.annotation.Nonnull; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; @@ -35,15 +38,12 @@ import net.minecraftforge.client.model.data.IModelData; import appeng.api.config.Actionable; import appeng.api.implementations.IPowerChannelState; import appeng.api.networking.GridFlags; -import appeng.api.networking.IGridHost; import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.storage.IMEInventory; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; -import appeng.api.util.AEPartLocation; -import appeng.api.util.WorldCoord; import appeng.block.crafting.AbstractCraftingUnitBlock; import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; import appeng.core.Api; @@ -90,7 +90,7 @@ public class CraftingTileEntity extends AENetworkTileEntity @Override public boolean canBeRotated() { return true;// return BlockCraftingUnit.checkType( world.getBlockMetadata( xCoord, yCoord, - // zCoord ), + // zCoord ), // BlockCraftingUnit.BASE_MONITOR ); } @@ -250,21 +250,18 @@ public class CraftingTileEntity extends AENetworkTileEntity this.cluster.cancel(); final IMEInventory inv = this.cluster.getInventory(); - final LinkedList places = new LinkedList<>(); + final LinkedList places = new LinkedList<>(); - final Iterator i = this.cluster.getTiles(); + final Iterator i = this.cluster.getTiles(); while (i.hasNext()) { - final IGridHost h = i.next(); + final CraftingTileEntity h = i.next(); if (h == this) { - places.add(new WorldCoord(this)); + places.add(pos); } else { - final TileEntity te = (TileEntity) h; - - for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) { - final WorldCoord wc = new WorldCoord(te); - wc.add(d, 1); - if (this.world.isAirBlock(wc.getPos())) { - places.add(wc); + for (Direction d : Direction.values()) { + BlockPos p = h.pos.offset(d); + if (this.world.isAirBlock(p)) { + places.add(p); } } } @@ -288,10 +285,10 @@ public class CraftingTileEntity extends AENetworkTileEntity break; } - final WorldCoord wc = places.poll(); - places.add(wc); + final BlockPos pos = places.poll(); + places.add(pos); - Platform.spawnDrops(this.world, wc.getPos(), Collections.singletonList(g.createItemStack())); + Platform.spawnDrops(this.world, pos, Collections.singletonList(g.createItemStack())); } } diff --git a/src/main/java/appeng/util/iterators/ProxyNodeIterator.java b/src/main/java/appeng/util/iterators/ProxyNodeIterator.java index a9152fc70..b2da7085b 100644 --- a/src/main/java/appeng/util/iterators/ProxyNodeIterator.java +++ b/src/main/java/appeng/util/iterators/ProxyNodeIterator.java @@ -25,9 +25,9 @@ import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; public final class ProxyNodeIterator implements Iterator { - private final Iterator hosts; + private final Iterator hosts; - public ProxyNodeIterator(final Iterator hosts) { + public ProxyNodeIterator(final Iterator hosts) { this.hosts = hosts; }