bump dasm to 2.0.1

OpenCubicChunks · Feb 21, 2024 · fd34ce4 · fd34ce4
1 parent 6a485b9
commit fd34ce4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -236,7 +236,7 @@ dependencies {
         targetConfiguration = "testArchivesOutput"
     }
 
-    libraries("io.github.notstirred:dasm:2.0.0-SNAPSHOT") {
+    libraries("io.github.notstirred:dasm:2.0.1") {
         transitive = false
     }
     libraries("io.github.opencubicchunks:regionlib:0.63.0-SNAPSHOT")

diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
@@ -23,9 +23,9 @@
 import io.github.notstirred.dasm.api.provider.MappingsProvider;
 import io.github.notstirred.dasm.exception.DasmException;
 import io.github.notstirred.dasm.exception.wrapped.DasmWrappedExceptions;
-import io.github.notstirred.dasm.transformer.ClassTransform;
-import io.github.notstirred.dasm.transformer.MethodTransform;
 import io.github.notstirred.dasm.transformer.Transformer;
+import io.github.notstirred.dasm.transformer.data.ClassTransform;
+import io.github.notstirred.dasm.transformer.data.MethodTransform;
 import io.github.notstirred.dasm.util.CachingClassProvider;
 import io.github.notstirred.dasm.util.ClassNodeProvider;
 import io.github.notstirred.dasm.util.Either;

diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ForgeSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ForgeSet.java
@@ -1,7 +1,7 @@
 package io.github.opencubicchunks.cubicchunks.mixin;
 
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.ConstructorToFactoryRedirect;
-import io.github.notstirred.dasm.api.annotations.redirect.sets.RedirectContainer;
+import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
 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.Ref;
@@ -13,7 +13,7 @@
 // TODO once redirect sets can be applied conditionally, this should be in the forge sourceset and GlobalSet should no longer extend it
 @RedirectSet
 public interface ForgeSet {
-    @RedirectContainer(owner = @Ref(ChunkEvent.Load.class), newOwner = @Ref(EventConstructorDelegates.class))
+    @InterOwnerContainer(owner = @Ref(ChunkEvent.Load.class), newOwner = @Ref(EventConstructorDelegates.class))
     abstract class ChunkEvent$Load_delegateConstruction {
         @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(ChunkAccess.class), @Ref(boolean.class) }))
         static native ChunkEvent.Load create_ChunkEvent$Load(CloAccess cloAccess, boolean newChunk);

diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/GlobalSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/GlobalSet.java
@@ -11,7 +11,8 @@
 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.RedirectContainer;
+import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
+import io.github.notstirred.dasm.api.annotations.redirect.sets.IntraOwnerContainer;
 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;
@@ -61,7 +62,7 @@ abstract class LevelChangeListenerChunkHolder_to_CubicChunkHolder_redirects { }
     @TypeRedirect(from = @Ref(ChunkHolder.PlayerProvider.class), to = @Ref(CubicChunkHolder.PlayerProvider.class))
     abstract class PlayerProviderChunkHolder_to_CubicChunkHolder_redirects { }
 
-    @RedirectContainer(owner = @Ref(TicketType.class), newOwner = @Ref(CubicTicketType.class))
+    @InterOwnerContainer(owner = @Ref(TicketType.class), newOwner = @Ref(CubicTicketType.class))
     abstract class ChunkTicketType_to_CloTicketType_redirects {
         @FieldRedirect(@FieldSig(type = @Ref(TicketType.class), name = "PLAYER"))
         public static TicketType<CloPos> PLAYER;
@@ -73,7 +74,7 @@ abstract class ChunkTicketType_to_CloTicketType_redirects {
         public static TicketType<CloPos> UNKNOWN;
     }
 
-    @RedirectContainer(owner = @Ref(ChunkStatus.class))
+    @IntraOwnerContainer(owner = @Ref(ChunkStatus.class))
     abstract class ChunkStatus_redirects {
         @MethodRedirect(@MethodSig("generate(Ljava/util/concurrent/Executor;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager;Lnet/minecraft/server/level/ThreadedLevelLightEngine;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;"))
         public abstract CompletableFuture<Either<CloAccess, ChunkHolder.ChunkLoadingFailure>> cc_generate(