Remove WorldCoord (#6814)

AppliedEnergistics · Dec 10, 2022 · 68f0bee · 68f0bee
1 parent 80a9cba
commit 68f0bee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 178 deletions.
diff --git a/src/main/java/appeng/api/util/WorldCoord.java b/src/main/java/appeng/api/util/WorldCoord.java
diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java
@@ -41,7 +41,6 @@
 import appeng.api.ids.AETags;
 import appeng.api.movable.BlockEntityMoveStrategies;
 import appeng.api.movable.IBlockEntityMoveStrategy;
-import appeng.api.util.WorldCoord;
 import appeng.core.AELog;
 import appeng.core.definitions.AEBlocks;
 import appeng.server.services.compass.CompassService;
@@ -61,7 +60,7 @@ public class CachedPlane {
     private final List<BlockEntityMoveRecord> blockEntities = new ArrayList<>();
     private final List<ScheduledTick<Block>> ticks = new ArrayList<>();
     private final ServerLevel level;
-    private final List<WorldCoord> updates = new ArrayList<>();
+    private final List<BlockPos> updates = new ArrayList<>();
     private final BlockState matrixBlockState;
 
     public CachedPlane(ServerLevel level, int minX, int minY, int minZ, int maxX,
@@ -239,9 +238,9 @@ void swap(CachedPlane dst) {
     }
 
     private void markForUpdate(int x, int y, int z) {
-        this.updates.add(new WorldCoord(x, y, z));
+        this.updates.add(new BlockPos(x, y, z));
         for (Direction d : Direction.values()) {
-            this.updates.add(new WorldCoord(x + d.getStepX(), y + d.getStepY(), z + d.getStepZ()));
+            this.updates.add(new BlockPos(x + d.getStepX(), y + d.getStepY(), z + d.getStepZ()));
         }
     }
 
@@ -329,7 +328,7 @@ private void updateChunks() {
         level.getChunkSource().tick(() -> false, false);
     }
 
-    List<WorldCoord> getUpdates() {
+    List<BlockPos> getUpdates() {
         return this.updates;
     }
 

diff --git a/src/main/java/appeng/spatial/SpatialStorageHelper.java b/src/main/java/appeng/spatial/SpatialStorageHelper.java
@@ -36,7 +36,6 @@
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
-import appeng.api.util.WorldCoord;
 import appeng.core.definitions.AEBlocks;
 import appeng.core.stats.AdvancementTriggers;
 
@@ -176,12 +175,12 @@ public void swapRegions(ServerLevel srcLevel, int srcX, int srcY, int srcZ,
                     -srcX + dstX, -srcY + dstY, -srcZ + dstZ));
         }
 
-        for (WorldCoord wc : cDst.getUpdates()) {
-            cSrc.getLevel().updateNeighborsAt(wc.getPos(), Blocks.AIR);
+        for (BlockPos pos : cDst.getUpdates()) {
+            cSrc.getLevel().updateNeighborsAt(pos, Blocks.AIR);
         }
 
-        for (WorldCoord wc : cSrc.getUpdates()) {
-            cSrc.getLevel().updateNeighborsAt(wc.getPos(), Blocks.AIR);
+        for (BlockPos pos : cSrc.getUpdates()) {
+            cSrc.getLevel().updateNeighborsAt(pos, Blocks.AIR);
         }
 
         this.transverseEdges(srcX - 1, srcY - 1, srcZ - 1, srcX + scaleX + 1, srcY + scaleY + 1, srcZ + scaleZ + 1,