use CubePos in places that don't require CloPos

Author: CursedFlames

CubicChunksCore

@@ -11,7 +11,6 @@
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddFieldToSets;
 import io.github.notstirred.dasm.api.annotations.selector.FieldSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
-import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cc_core.api.CubePos;
 import io.github.opencubicchunks.cc_core.api.CubicConstants;
 import io.github.opencubicchunks.cubicchunks.CanBeCubic;
@@ -57,7 +56,7 @@ public abstract class MixinClientChunkCache extends MixinChunkSource implements
     private void cc_onConstruct(ClientLevel level, int viewDistance, CallbackInfo ci) {
         if (((CanBeCubic) level).cc_isCubic()) {
             cc_emptyCube = new EmptyLevelCube(
-                level, CloPos.cube(0, 0, 0), level.registryAccess().registryOrThrow(Registries.BIOME).getHolderOrThrow(Biomes.PLAINS)
+                level, CubePos.of(0, 0, 0), level.registryAccess().registryOrThrow(Registries.BIOME).getHolderOrThrow(Biomes.PLAINS)
             );
             cc_cubeStorage = new ClientCubeCache.Storage(calculateStorageRange(viewDistance), level);
             // TODO we could redirect the initial construction instead of immediately resizing. doesn't really matter
@@ -132,7 +131,7 @@ public void cc_replaceBiomes(int x, int y, int z, FriendlyByteBuf buffer) {
             LevelCube levelCube = this.cc_cubeStorage.chunks.get(i);
             CubePos cubePos = CubePos.of(x, y, z);
             if (!cc_isValidCube(levelCube, x, y, z)) {
-                levelCube = new LevelCube(this.level, CloPos.cube(cubePos));
+                levelCube = new LevelCube(this.level, cubePos);
                 levelCube.replaceWithPacketData(buffer, tag, consumer);
                 this.cc_cubeStorage.replace(i, levelCube);
             } else {

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/client/multiplayer/MixinClientChunkCache.java

@@ -5,13 +5,17 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.github.notstirred.dasm.api.annotations.Dasm;
+import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddMethodToSets;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddTransformToSets;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
+import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.annotation.UsedFromASM;
+import io.github.opencubicchunks.cc_core.api.CubePos;
 import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ChunkToCloSet;
+import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ChunkToCubeSet;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.GlobalSet;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicDistanceManager;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicTicketType;
@@ -72,38 +76,81 @@ public void cc_setCubic() {
 
     @Override
     @UsedFromASM
-    @AddTransformToSets(GlobalSet.class) @TransformFromMethod(@MethodSig("addTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
+    @AddTransformToSets(ChunkToCloSet.class) @TransformFromMethod(@MethodSig("addTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void cc_addTicket(TicketType<T> type, CloPos pos, int level, T value);
 
     @Override
     @UsedFromASM
-    @AddTransformToSets(GlobalSet.class) @TransformFromMethod(@MethodSig("removeTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
+    @AddTransformToSets(ChunkToCloSet.class) @TransformFromMethod(@MethodSig("removeTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void cc_removeTicket(TicketType<T> type, CloPos pos, int level, T value);
 
     @Override
     @UsedFromASM
-    @AddTransformToSets(GlobalSet.class) @TransformFromMethod(@MethodSig("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
+    @AddTransformToSets(ChunkToCloSet.class) @TransformFromMethod(@MethodSig("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void cc_addRegionTicket(TicketType<T> type, CloPos pos, int distance, T value);
 
     @Override
     @UsedFromASM
-    @AddTransformToSets(GlobalSet.class) @TransformFromMethod(@MethodSig("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V"))
+    @AddTransformToSets(ChunkToCloSet.class) @TransformFromMethod(@MethodSig("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V"))
     public abstract <T> void cc_addRegionTicket(TicketType<T> type, CloPos pos, int distance, T value, boolean forceTicks);
 
     @Override
     @UsedFromASM
-    @AddTransformToSets(GlobalSet.class) @TransformFromMethod(@MethodSig("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
+    @AddTransformToSets(ChunkToCloSet.class) @TransformFromMethod(@MethodSig("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void cc_removeRegionTicket(TicketType<T> type, CloPos pos, int distance, T value);
 
     @Override
     @UsedFromASM
-    @AddTransformToSets(GlobalSet.class) @TransformFromMethod(@MethodSig("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V"))
+    @AddTransformToSets(ChunkToCloSet.class) @TransformFromMethod(@MethodSig("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V"))
     public abstract <T> void cc_removeRegionTicket(TicketType<T> type, CloPos pos, int distance, T value, boolean forceTicks);
 
     @UsedFromASM
-    @AddTransformToSets(GlobalSet.class) @TransformFromMethod(@MethodSig("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)V"))
+    @AddTransformToSets(ChunkToCloSet.class) @TransformFromMethod(@MethodSig("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)V"))
     public abstract void cc_updateCubeForced(CloPos pos, boolean add);
 
+    // CubePos equivalents that delegate to their corresponding CloPos method
+    @UsedFromASM
+    @AddMethodToSets(sets = ChunkToCubeSet.class, owner = @Ref(DistanceManager.class), method = @MethodSig("addTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
+    public <T> void cc_addTicket(TicketType<T> type, CubePos pos, int level, T value) {
+        cc_addTicket(type, CloPos.cube(pos), level, value);
+    }
+
+    @UsedFromASM
+    @AddMethodToSets(sets = ChunkToCubeSet.class, owner = @Ref(DistanceManager.class), method = @MethodSig("removeTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
+    public <T> void cc_removeTicket(TicketType<T> type, CubePos pos, int level, T value) {
+        cc_removeTicket(type, CloPos.cube(pos), level, value);
+    }
+
+    @UsedFromASM
+    @AddMethodToSets(sets = ChunkToCubeSet.class, owner = @Ref(DistanceManager.class), method = @MethodSig("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
+    public <T> void cc_addRegionTicket(TicketType<T> type, CubePos pos, int distance, T value) {
+        cc_addRegionTicket(type, CloPos.cube(pos), distance, value);
+    }
+
+    @UsedFromASM
+    @AddMethodToSets(sets = ChunkToCubeSet.class, owner = @Ref(DistanceManager.class), method = @MethodSig("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V"))
+    public <T> void cc_addRegionTicket(TicketType<T> type, CubePos pos, int distance, T value, boolean forceTicks) {
+        cc_addRegionTicket(type, CloPos.cube(pos), distance, value, forceTicks);
+    }
+
+    @UsedFromASM
+    @AddMethodToSets(sets = ChunkToCubeSet.class, owner = @Ref(DistanceManager.class), method = @MethodSig("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
+    public <T> void cc_removeRegionTicket(TicketType<T> type, CubePos pos, int distance, T value) {
+        cc_removeRegionTicket(type, CloPos.cube(pos), distance, value);
+    }
+
+    @UsedFromASM
+    @AddMethodToSets(sets = ChunkToCubeSet.class, owner = @Ref(DistanceManager.class), method = @MethodSig("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V"))
+    public <T> void cc_removeRegionTicket(TicketType<T> type, CubePos pos, int distance, T value, boolean forceTicks) {
+        cc_removeRegionTicket(type, CloPos.cube(pos), distance, value, forceTicks);
+    }
+
+    @UsedFromASM
+    @AddMethodToSets(sets = ChunkToCubeSet.class, owner = @Ref(DistanceManager.class), method = @MethodSig("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)V"))
+    public void cc_updateCubeForced(CubePos pos, boolean add) {
+        cc_updateCubeForced(CloPos.cube(pos), add);
+    }
+
     /**
      * This function replaces a TicketType with a CubicTicketType.
      */

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java

@@ -23,6 +23,7 @@
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.notstirred.dasm.api.annotations.transform.AddUnusedParam;
 import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
+import io.github.opencubicchunks.cc_core.api.CubePos;
 import io.github.opencubicchunks.cc_core.utils.Coords;
 import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.CanBeCubic;
@@ -130,7 +131,7 @@ private void cc_getCube_supplyAsync(int pChunkX, int pChunkY, int pChunkZ, Chunk
     }
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the params of getCube
-    @Dynamic @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/world/level/CloPos;chunkAsLong(II)J"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
     private long cc_getCube_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CloPos.cubeAsLong(pX, pY, pZ);
     }
@@ -145,7 +146,7 @@ private CompletableFuture cc_getCube_getChunkFutureMainThread(ServerChunkCache i
     @Override @Nullable public native LevelCube cc_getCubeNow(int pChunkX, @AddUnusedParam int chunkY, int pChunkZ);
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the params of getCubeNow
-    @Dynamic @Redirect(method = "cc_dasm$cc_getCubeNow", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/world/level/CloPos;chunkAsLong(II)J"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_getCubeNow", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
     private long cc_getCubeNow_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CloPos.cubeAsLong(pX, pY, pZ);
     }
@@ -196,18 +197,18 @@ private native CompletableFuture<Either<CubeAccess, ChunkHolder.ChunkLoadingFail
     );
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the params of cc_getCubeFutureMainThread
-    @Dynamic @Redirect(method = "cc_dasm$cc_getCubeFutureMainThread", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/world/level/CloPos;chunk(II)Lio/github/opencubicchunks/cc_core/world/level/CloPos;"))
-    private CloPos cc_getCubeFutureMainThread_chunkPosConstruct(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
-        return CloPos.cube(pX, pY, pZ);
+    @Dynamic @Redirect(method = "cc_dasm$cc_getCubeFutureMainThread", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
+    private CubePos cc_getCubeFutureMainThread_chunkPosConstruct(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
+        return CubePos.of(pX, pY, pZ);
     }
 
     @TransformFromMethod(@MethodSig("hasChunk(II)Z"))
     public native boolean cc_hasCube(int pX, @AddUnusedParam int y, int pZ);
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the params of cc_hasCube
-    @Dynamic @Redirect(method = "cc_dasm$cc_hasCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/world/level/CloPos;chunk(II)Lio/github/opencubicchunks/cc_core/world/level/CloPos;"))
-    private CloPos cc_hasCube_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
-        return CloPos.cube(pX, pY, pZ);
+    @Dynamic @Redirect(method = "cc_dasm$cc_hasCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
+    private CubePos cc_hasCube_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
+        return CubePos.of(pX, pY, pZ);
     }
 
     // TODO (P2) - lighting; currently unused. can probably be done with dasm and @AddUnusedParam

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java

@@ -0,0 +1,24 @@
+package io.github.opencubicchunks.cubicchunks.mixin.core.common.world.level;
+
+import io.github.opencubicchunks.cc_core.annotation.Public;
+import io.github.opencubicchunks.cc_core.api.CubePos;
+import org.spongepowered.asm.mixin.Mixin;
+
+/**
+ * When DASM redirects ChunkPos to CubePos, some methods do not have reasonable equivalents that can be automatically redirected to.
+ * In these cases, we call dummy methods that throw errors, and require that mixins are used to manually replace these method calls with whatever the correct method is.
+ */
+@Mixin(CubePos.class)
+public class MixinCubePos {
+    @Public private static CubePos dummy_fromChunkCoords(int x, int z) {
+        throw new IllegalStateException(
+            "This method should never be called, and indicates that something has been transformed incorrectly"
+                + " - all calls to this method should be manually redirected to CubePos.of(x, y, z)");
+    }
+
+    @Public private static long dummy_chunkAsLong(int x, int z) {
+        throw new IllegalStateException(
+            "This method should never be called, and indicates that something has been transformed incorrectly"
+                + " - all calls to this method should be manually redirected to CubePos.asLong(x, y, z)");
+    }
+}

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinCubePos.java

@@ -3,10 +3,13 @@
 import javax.annotation.Nullable;
 
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.ConstructorToFactoryRedirect;
+import io.github.notstirred.dasm.api.annotations.redirect.redirects.FieldRedirect;
+import io.github.notstirred.dasm.api.annotations.redirect.redirects.FieldToMethodRedirect;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.MethodRedirect;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.TypeRedirect;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.RedirectSet;
 import io.github.notstirred.dasm.api.annotations.selector.ConstructorMethodSig;
+import io.github.notstirred.dasm.api.annotations.selector.FieldSig;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.opencubicchunks.cc_core.world.level.CloPos;
@@ -45,6 +48,28 @@
  */
 @RedirectSet
 public interface ChunkToCloSet extends GlobalSet {
+    @TypeRedirect(from = @Ref(ChunkPos.class), to = @Ref(CloPos.class))
+    abstract class ChunkPos_to_CloPos_redirects {
+        @FieldRedirect(@FieldSig(type = @Ref(long.class), name = "INVALID_CHUNK_POS"))
+        static final long INVALID_CLO_POS = Long.MAX_VALUE;
+
+        @FieldToMethodRedirect(@FieldSig(type = @Ref(int.class), name = "x"))
+        native int getX();
+
+        @FieldToMethodRedirect(@FieldSig(type = @Ref(int.class), name = "z"))
+        native int getZ();
+
+        // Note that this relies on ChunkPos and CloPos encoding to longs in the same way
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(long.class) }))
+        static native CloPos fromLong(long cloPos);
+
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(int.class), @Ref(int.class) }))
+        static native CloPos chunk(int x, int z);
+
+        @MethodRedirect(@MethodSig("asLong(II)J"))
+        static native long chunkAsLong(int x, int z);
+    }
+
     @TypeRedirect(from = @Ref(ChunkAccess.class), to = @Ref(CloAccess.class))
     interface ChunkAccess_to_CloAccess_redirects {
         @MethodRedirect(@MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;"))