Implement DASM redirect set inheritance, and move from json->java redirect sets

.gitignore

@@ -33,3 +33,4 @@ forge*changelog.txt
 
 # Fabric
 .fabric
+.mixin.out

build.gradle

@@ -213,7 +213,7 @@ dependencies {
         targetConfiguration = "testArchivesOutput"
     }
 
-    libraries("com.github.OpenCubicChunks:dasm:4ff381c5a3") {
+    libraries("com.github.OpenCubicChunks:dasm:c08e10a63a") {
         transitive = false
     }
     libraries("io.github.opencubicchunks:regionlib:0.63.0-SNAPSHOT")
@@ -236,6 +236,7 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
+    jvmArgs("-ea", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true", "-Dmixin.checks.interfaces=true")
 }
 
 tasks.withType(ProcessResources).configureEach {

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/CubeAccessAndDescendantsSet.java

@@ -0,0 +1,53 @@
+package io.github.opencubicchunks.cubicchunks.mixin;
+
+import io.github.opencubicchunks.cubicchunks.world.level.cube.CubeAccess;
+import io.github.opencubicchunks.cubicchunks.world.level.cube.ImposterProtoCube;
+import io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube;
+import io.github.opencubicchunks.cubicchunks.world.level.cube.ProtoCube;
+import io.github.opencubicchunks.dasm.api.Ref;
+import io.github.opencubicchunks.dasm.api.redirect.DasmRedirectSet;
+import io.github.opencubicchunks.dasm.api.redirect.FieldRedirect;
+import io.github.opencubicchunks.dasm.api.redirect.MethodRedirect;
+import io.github.opencubicchunks.dasm.api.redirect.TypeRedirect;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ImposterProtoChunk;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.ProtoChunk;
+
+@DasmRedirectSet
+public interface CubeAccessAndDescendantsSet extends GeneralSet {
+    @TypeRedirect(from = @Ref(ChunkAccess.class), to = @Ref(CubeAccess.class))
+    abstract class ChunkAccessToCubeAccessRedirects {
+        @FieldRedirect("cloPos") protected ChunkPos chunkPos;
+
+        @MethodRedirect("cc_getCloPos") public native ChunkPos getPos();
+    }
+
+    @TypeRedirect(from = @Ref(LevelChunk.class), to = @Ref(LevelCube.class))
+    abstract class LevelChunkToLevelCubeRedirects { }
+
+    @TypeRedirect(
+        from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$BoundTickingBlockEntity"),
+        to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$BoundTickingBlockEntity")
+    )
+    abstract class LevelChunk$BoundTickingBlockEntityToLevelCube$BoundTickingBlockEntityRedirects { }
+
+    @TypeRedirect(
+        from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$PostLoadProcessor"),
+        to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$PostLoadProcessor")
+    )
+    abstract class LevelChunk$PostLoadProcessorToLevelCube$PostLoadProcessorRedirects { }
+
+    @TypeRedirect(
+        from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$RebindableTickingBlockEntityWrapper"),
+        to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$RebindableTickingBlockEntityWrapper")
+    )
+    abstract class LevelChunk$RebindableTickingBlockEntityWrapperToLevelCube$RebindableTickingBlockEntityWrapperRedirects { }
+
+    @TypeRedirect(from = @Ref(ProtoChunk.class), to = @Ref(ProtoCube.class))
+    abstract class ProtoChunkToProtoCubeRedirects { }
+
+    @TypeRedirect(from = @Ref(ImposterProtoChunk.class), to = @Ref(ImposterProtoCube.class))
+    abstract class ImposterProtoChunkToImposterProtoCubeRedirects { }
+}

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/GeneralSet.java

@@ -0,0 +1,27 @@
+package io.github.opencubicchunks.cubicchunks.mixin;
+
+import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloAccess;
+import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
+import io.github.opencubicchunks.cubicchunks.world.level.chunklike.LevelClo;
+import io.github.opencubicchunks.dasm.api.Ref;
+import io.github.opencubicchunks.dasm.api.redirect.DasmRedirectSet;
+import io.github.opencubicchunks.dasm.api.redirect.MethodRedirect;
+import io.github.opencubicchunks.dasm.api.redirect.TypeRedirect;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.LevelChunk;
+
+@DasmRedirectSet
+public interface GeneralSet {
+    @TypeRedirect(from = @Ref(ChunkPos.class), to = @Ref(CloPos.class))
+    abstract class ChunkPosToCloPosRedirects { }
+
+    @TypeRedirect(from = @Ref(ChunkAccess.class), to = @Ref(CloAccess.class))
+    abstract class ChunkAccessToCloAccessRedirects {
+        @MethodRedirect("cc_getCloPos")
+        public native ChunkPos getPos();
+    }
+
+    @TypeRedirect(from = @Ref(LevelChunk.class), to = @Ref(LevelClo.class))
+    abstract class LevelChunkToLevelCloRedirects { }
+}

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

@@ -2,9 +2,8 @@
 
 import io.github.opencubicchunks.cc_core.annotation.UsedFromASM;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
-import io.github.opencubicchunks.cubicchunks.mixin.TransformFrom;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
-import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
+import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
 import net.minecraft.server.level.ChunkTaskPriorityQueue;
 import net.minecraft.world.level.ChunkPos;
 import org.spongepowered.asm.mixin.Mixin;

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

@@ -10,9 +10,9 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.github.opencubicchunks.cc_core.annotation.UsedFromASM;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
-import io.github.opencubicchunks.cubicchunks.mixin.TransformFrom;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicTaskPriorityQueueSorter;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
+import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
 import net.minecraft.server.level.ChunkTaskPriorityQueueSorter;
 import net.minecraft.world.level.ChunkPos;
 import org.spongepowered.asm.mixin.Mixin;

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

@@ -6,12 +6,12 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.github.opencubicchunks.cc_core.annotation.UsedFromASM;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
-import io.github.opencubicchunks.cubicchunks.mixin.DasmRedirect;
-import io.github.opencubicchunks.cubicchunks.mixin.TransformFrom;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicDistanceManager;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicTicketType;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicTickingTracker;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
+import io.github.opencubicchunks.dasm.api.transform.DasmRedirect;
+import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
 import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.DistanceManager;
 import net.minecraft.server.level.TicketType;

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

@@ -1,19 +1,11 @@
 package io.github.opencubicchunks.cubicchunks.mixin.core.common.server.level;
 
 
-import io.github.opencubicchunks.cc_core.annotation.UsedFromASM;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
-import io.github.opencubicchunks.cubicchunks.mixin.TransformFrom;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicServerLevel;
-import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ServerLevel.class)
 public abstract class MixinServerLevel extends Level implements CubicServerLevel, MarkableAsCubic {

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

@@ -3,11 +3,11 @@
 import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import io.github.opencubicchunks.cubicchunks.mixin.DasmRedirect;
-import io.github.opencubicchunks.cubicchunks.mixin.TransformFrom;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicTicketType;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicTickingTracker;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
+import io.github.opencubicchunks.dasm.api.transform.DasmRedirect;
+import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
 import net.minecraft.server.level.FullChunkStatus;
 import net.minecraft.server.level.TicketType;
 import net.minecraft.server.level.TickingTracker;