diff --git a/.gitignore b/.gitignore
index 28307bde..9c2b1c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,8 @@ forge*changelog.txt
 
 # Fabric
 .fabric
-.mixin.out
\ No newline at end of file
+.mixin.out
+
+# Dasm
+.dasm.out
+
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0f16be14..c4f04e83 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,7 +2,7 @@
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
     <option name="RIGHT_MARGIN" value="190" />
-    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
+    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <GroovyCodeStyleSettings>
       <option name="USE_FQ_CLASS_NAMES_IN_JAVADOC" value="false" />
diff --git a/build.gradle b/build.gradle
index e21bd083..d3bf3fcb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -213,6 +213,7 @@ runs {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
+    mavenLocal()
     maven { setUrl("https://oss.sonatype.org/content/repositories/snapshots/") }
     maven { setUrl("https://jitpack.io") }
     maven { setUrl("https://maven.fabricmc.net/") }
@@ -235,7 +236,7 @@ dependencies {
         targetConfiguration = "testArchivesOutput"
     }
 
-    libraries("com.github.OpenCubicChunks:dasm:c08e10a63a") {
+    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
index f6fea3ef..6f68356d 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
@@ -1,29 +1,42 @@
 package io.github.opencubicchunks.cubicchunks.mixin;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
+import io.github.notstirred.dasm.annotation.AnnotationParser;
+import io.github.notstirred.dasm.api.annotations.transform.ApplicationStage;
+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.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;
 import io.github.opencubicchunks.cubicchunks.CubicChunks;
-import io.github.opencubicchunks.dasm.AnnotationParser;
-import io.github.opencubicchunks.dasm.Transformer;
-import io.github.opencubicchunks.dasm.api.provider.CachingClassProvider;
-import io.github.opencubicchunks.dasm.api.provider.ClassProvider;
-import io.github.opencubicchunks.dasm.api.provider.MappingsProvider;
-import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
-import io.github.opencubicchunks.dasm.transformer.redirect.RedirectSet;
-import io.github.opencubicchunks.dasm.transformer.target.TargetClass;
 import net.neoforged.fml.loading.FMLEnvironment;
+import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+import org.spongepowered.asm.mixin.transformer.ClassInfo;
 import org.spongepowered.asm.service.MixinService;
 
 public class ASMConfigPlugin implements IMixinConfigPlugin {
@@ -31,37 +44,27 @@ public class ASMConfigPlugin implements IMixinConfigPlugin {
     private final Transformer transformer;
     private final AnnotationParser annotationParser;
 
+    private final Map<String, Either<ClassTransform, Collection<MethodTransform>>> preApplyTargets = new HashMap<>();
+    private final Map<String, Either<ClassTransform, Collection<MethodTransform>>> postApplyTargets = new HashMap<>();
+
     public ASMConfigPlugin() {
         boolean developmentEnvironment = false;
         try {
             developmentEnvironment = !FMLEnvironment.production;
         } catch (Throwable ignored) {
         }
-        MappingsProvider mappings = new MappingsProvider() {
-
-            @Override public String mapFieldName(String owner, String fieldName, String descriptor) {
-                return fieldName;
-            }
-
-            @Override public String mapMethodName(String owner, String methodName, String descriptor) {
-                return methodName;
-            }
-
-            @Override public String mapClassName(String className) {
-                return className;
-            }
-        };
+        MappingsProvider mappings = MappingsProvider.IDENTITY;
 
         // TODO: breaks on fabric (remapped at runtime)
-        ClassProvider classProvider = new CachingClassProvider(s -> {
+        ClassNodeProvider classProvider = new CachingClassProvider(s -> {
             try (var classStream = ASMConfigPlugin.class.getClassLoader().getResourceAsStream(s.replace(".", "/") + ".class")) {
-                return classStream.readAllBytes();
+                return Optional.ofNullable(classStream.readAllBytes());
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
         });
-        this.transformer = new Transformer(mappings, classProvider, developmentEnvironment);
-        this.annotationParser = new AnnotationParser(classProvider, GeneralSet.class);
+        this.transformer = new Transformer(classProvider, mappings);
+        this.annotationParser = new AnnotationParser(classProvider);
     }
 
     @Override public void onLoad(String mixinPackage) {
@@ -72,6 +75,47 @@ public ASMConfigPlugin() {
     }
 
     @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        try {
+            ClassNode targetClass = MixinService.getService().getBytecodeProvider().getClassNode(targetClassName);
+            ClassNode mixinClass = MixinService.getService().getBytecodeProvider().getClassNode(mixinClassName);
+            // rename the mixin class to get dasm to generate owners correctly
+            mixinClass.name = targetClass.name;
+
+            // PRE_APPLY
+            this.annotationParser.findRedirectSets(mixinClass);
+            var methodTransformsMixin = this.annotationParser.buildMethodTargets(mixinClass, "cc_dasm$");
+            this.annotationParser.findRedirectSets(targetClass);
+            var classTransform = this.annotationParser.buildClassTarget(targetClass);
+            var methodTransformsTarget = this.annotationParser.buildMethodTargets(targetClass, "cc_dasm$");
+
+            var methodTransforms = Stream.of(methodTransformsTarget, methodTransformsMixin)
+                .filter(Optional::isPresent).map(Optional::get)
+                .flatMap(Collection::stream).toList();
+
+            String key = mixinClassName + "|" + targetClassName;
+            if (classTransform.isPresent())  {
+                // TODO: nice error
+                assert methodTransformsMixin.isEmpty() && methodTransforms.isEmpty() : "Whole class transform WITH method transforms?";
+                ClassTransform transform = classTransform.get();
+                if (transform.stage() == ApplicationStage.PRE_APPLY) {
+                    this.preApplyTargets.put(key, Either.left(transform));
+                } else {
+                    this.postApplyTargets.put(key, Either.left(transform));
+                }
+            } else {
+                Collection<MethodTransform> preTransforms = this.preApplyTargets.computeIfAbsent(key, k -> Either.right(new ArrayList<>())).right().get();
+                Collection<MethodTransform> postTransforms = this.postApplyTargets.computeIfAbsent(key, k -> Either.right(new ArrayList<>())).right().get();
+                methodTransforms.forEach(transform -> {
+                    if (transform.stage() == ApplicationStage.PRE_APPLY) {
+                        preTransforms.add(transform);
+                    } else {
+                        postTransforms.add(transform);
+                    }
+                });
+            }
+        } catch (ClassNotFoundException | IOException | DasmWrappedExceptions e) {
+            throw new RuntimeException(e);
+        }
         return true;
     }
 
@@ -83,14 +127,46 @@ public ASMConfigPlugin() {
     }
 
     @Override public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-        var wasTransformed = transformClass(targetClassName, targetClass, mixinClassName, TransformFrom.ApplicationStage.PRE_APPLY);
+        boolean wasTransformed;
+        try {
+            wasTransformed = transformClass(targetClassName, targetClass, mixinClassName, ApplicationStage.PRE_APPLY);
+        } catch (DasmException e) {
+            throw new RuntimeException(e);
+        }
         dasmTransformedInPreApply.put(mixinClassName + "|" + targetClassName, wasTransformed);
+
+        try {
+            // ugly hack to add class metadata to mixin
+            // based on https://github.com/Chocohead/OptiFabric/blob/54fc2ef7533e43d1982e14bc3302bcf156f590d8/src/main/java/me/modmuss50/optifabric/compat/fabricrendererapi
+            // /RendererMixinPlugin.java#L25:L44
+            Method addMethod = ClassInfo.class.getDeclaredMethod("addMethod", MethodNode.class, boolean.class);
+            addMethod.setAccessible(true);
+
+            ClassInfo ci = ClassInfo.forName(targetClassName);
+            Set<String> existingMethods = ci.getMethods().stream().map(x -> x.getName() + x.getDesc()).collect(Collectors.toSet());
+            for (MethodNode method : targetClass.methods) {
+                if (!existingMethods.contains(method.name + method.desc)) {
+                    addMethod.invoke(ci, method, false);
+                }
+            }
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     @Override public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
         // Apply POST_APPLY dasm transforms
-        boolean wasTransformed = transformClass(targetClassName, targetClass, mixinClassName, TransformFrom.ApplicationStage.POST_APPLY);
-
+        boolean wasTransformed;
+        try {
+            wasTransformed = transformClass(targetClassName, targetClass, mixinClassName, ApplicationStage.POST_APPLY);
+        } catch (DasmException e) {
+            throw new RuntimeException(e);
+        }
+        for (MethodNode methodNode : targetClass.methods) {
+            if (methodNode.name.contains("cc_dasm$")) {
+                int asd = 0;
+            }
+        }
         // If no DASM transformation happened to this class, we can skip removing the prefixed methods
         if (!(wasTransformed | dasmTransformedInPreApply.get(mixinClassName + "|" + targetClassName)))
             return;
@@ -117,41 +193,54 @@ record PrefixMethodPair(MethodNode dasmAddedMethod, MethodNode mixinAddedMethod)
             if (prefixMethodPair.mixinAddedMethod != null) {
                 targetClass.methods.remove(prefixMethodPair.mixinAddedMethod);
             }
-            prefixMethodPair.dasmAddedMethod.name = prefixMethodPair.dasmAddedMethod.name.substring(
-                prefixMethodPair.dasmAddedMethod.name.indexOf("$") + 1
-            );
+
+            prefixMethodPair.dasmAddedMethod.name = prefixMethodPair.dasmAddedMethod.name
+                .replace("__init__", "<init>")
+                .replace("__clinit__", "<clinit>");
+
+            // remove the prefix
+            prefixMethodPair.dasmAddedMethod.name = prefixMethodPair.dasmAddedMethod.name.substring("cc_dasm$".length());
         });
+
+        ClassWriter classWriter = new ClassWriter(0);
+        targetClass.accept(classWriter);
+        try {
+            Path path = Path.of(".dasm.out/" + "POSTIER_APPLY" + "/" + targetClassName.replace('.', '/') + ".class").toAbsolutePath();
+            Files.createDirectories(path.getParent());
+            Files.write(path, classWriter.toByteArray());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * @return Whether any transformation was done to the targetClass
      */
-    private boolean transformClass(String targetClassName, ClassNode targetClass, String mixinClassName, TransformFrom.ApplicationStage stage) {
-        ClassNode mixinClass;
-        try {
-            mixinClass = MixinService.getService().getBytecodeProvider().getClassNode(mixinClassName);
-        } catch (IOException | ClassNotFoundException e) {
-            throw new RuntimeException(e);
+    private boolean transformClass(String targetClassName, ClassNode targetClass, String mixinClassName, ApplicationStage stage) throws DasmException {
+        Either<ClassTransform, Collection<MethodTransform>> target = null;
+        switch (stage) {
+            case PRE_APPLY -> target = preApplyTargets.get(mixinClassName + "|" + targetClassName);
+            case POST_APPLY -> target = postApplyTargets.get(mixinClassName + "|" + targetClassName);
         }
-
-        var target = new TargetClass(targetClassName);
-        Set<RedirectSet> redirectSets = new HashSet<>();
-
-        this.annotationParser.findRedirectSets(targetClassName, mixinClass, redirectSets);
-        this.annotationParser.buildClassTarget(mixinClass, target, stage, "cc_dasm$");
-        this.annotationParser.findRedirectSets(targetClassName, targetClass, redirectSets);
-        this.annotationParser.buildClassTarget(targetClass, target, stage, "cc_dasm$");
-        redirectSets.forEach(target::addRedirectSet);
-
-        if (target.targetMethods().isEmpty() && target.wholeClass() == null) {
+        if (target == null) {
             return false;
         }
 
-        if (target.wholeClass() != null) {
-            this.transformer.transformClass(targetClass, target);
+        if (target.isLeft()) {
+            this.transformer.transform(targetClass, target.left().get());
         } else {
-            this.transformer.transformClass(targetClass, target);
+            this.transformer.transform(targetClass, target.right().get());
         }
+        ClassWriter classWriter = new ClassWriter(0);
+        targetClass.accept(classWriter);
+        try {
+            Path path = Path.of(".dasm.out/" + stage + "/" + targetClassName.replace('.', '/') + ".class").toAbsolutePath();
+            Files.createDirectories(path.getParent());
+            Files.write(path, classWriter.toByteArray());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
         return true;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/CubeAccessAndDescendantsSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/CubeAccessAndDescendantsSet.java
index 769871d2..f16afae5 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/CubeAccessAndDescendantsSet.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/CubeAccessAndDescendantsSet.java
@@ -1,53 +1,56 @@
 package io.github.opencubicchunks.cubicchunks.mixin;
 
+import io.github.notstirred.dasm.api.annotations.redirect.redirects.FieldRedirect;
+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.FieldSig;
+import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
+import io.github.notstirred.dasm.api.annotations.selector.Ref;
+import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
 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
+@RedirectSet
 public interface CubeAccessAndDescendantsSet extends GeneralSet {
     @TypeRedirect(from = @Ref(ChunkAccess.class), to = @Ref(CubeAccess.class))
-    abstract class ChunkAccessToCubeAccessRedirects {
-        @FieldRedirect("cloPos") protected ChunkPos chunkPos;
+    abstract class ChunkAccess_to_CubeAccess_redirects {
+        @FieldRedirect(@FieldSig(type = @Ref(ChunkPos.class), name = "chunkPos")) protected CloPos cloPos;
 
-        @MethodRedirect("cc_getCloPos") public native ChunkPos getPos();
+        @MethodRedirect(@MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;")) public native CloPos cc_getCloPos();
     }
 
     @TypeRedirect(from = @Ref(LevelChunk.class), to = @Ref(LevelCube.class))
-    abstract class LevelChunkToLevelCubeRedirects { }
+    abstract class LevelChunk_to_LevelCube_redirects { }
 
     @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 { }
+    abstract class LevelChunk$BoundTickingBlockEntity_to_LevelCube$BoundTickingBlockEntity_redirects { }
 
     @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 { }
+    abstract class LevelChunk$PostLoadProcessor_to_LevelCube$PostLoadProcessor_redirects { }
 
     @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 { }
+    abstract class LevelChunk$RebindableTickingBlockEntityWrapper_to_LevelCube$RebindableTickingBlockEntityWrapper_redirects { }
 
     @TypeRedirect(from = @Ref(ProtoChunk.class), to = @Ref(ProtoCube.class))
-    abstract class ProtoChunkToProtoCubeRedirects { }
+    abstract class ProtoChunk_to_ProtoCube_redirects { }
 
     @TypeRedirect(from = @Ref(ImposterProtoChunk.class), to = @Ref(ImposterProtoCube.class))
-    abstract class ImposterProtoChunkToImposterProtoCubeRedirects { }
+    abstract class ImposterProtoChunk_to_ImposterProtoCube_redirects { }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/GeneralSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/GeneralSet.java
index 5654b1cc..03d9c5a6 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/GeneralSet.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/GeneralSet.java
@@ -1,27 +1,28 @@
 package io.github.opencubicchunks.cubicchunks.mixin;
 
+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.MethodSig;
+import io.github.notstirred.dasm.api.annotations.selector.Ref;
 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
+@RedirectSet
 public interface GeneralSet {
     @TypeRedirect(from = @Ref(ChunkPos.class), to = @Ref(CloPos.class))
-    abstract class ChunkPosToCloPosRedirects { }
+    abstract class ChunkPos_to_CloPos_redirects { }
 
     @TypeRedirect(from = @Ref(ChunkAccess.class), to = @Ref(CloAccess.class))
-    abstract class ChunkAccessToCloAccessRedirects {
-        @MethodRedirect("cc_getCloPos")
-        public native ChunkPos getPos();
+    abstract class ChunkAccess_to_CloAccess_redirects {
+        @MethodRedirect(@MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;"))
+        public native CloPos cc_getCloPos();
     }
 
     @TypeRedirect(from = @Ref(LevelChunk.class), to = @Ref(LevelClo.class))
-    abstract class LevelChunkToLevelCloRedirects { }
+    abstract class LevelChunk_to_LevelClo_redirects { }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueue.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueue.java
index 453f96e4..db98e74d 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueue.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueue.java
@@ -1,9 +1,10 @@
 package io.github.opencubicchunks.cubicchunks.mixin.core.common.server.level;
 
+import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
+import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.annotation.UsedFromASM;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
-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;
@@ -29,6 +30,6 @@ private void cc_onResortChunkTasks(int queueLevel, ChunkPos chunkPos, int ticket
     }
 
     @UsedFromASM
-    @TransformFrom("resortChunkTasks(ILnet/minecraft/world/level/ChunkPos;I)V")
+    @TransformFromMethod(@MethodSig("resortChunkTasks(ILnet/minecraft/world/level/ChunkPos;I)V"))
     protected abstract <T> void resortCubicTasks(int queueLevel, CloPos cloPos, int ticketLevel);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueueSorter.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueueSorter.java
index b5d8f768..5a3c6193 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueueSorter.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueueSorter.java
@@ -8,18 +8,26 @@
 
 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.AddTransformToSets;
+import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
+import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.annotation.UsedFromASM;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
+import io.github.opencubicchunks.cubicchunks.mixin.GeneralSet;
 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.ChunkHolder;
 import net.minecraft.server.level.ChunkTaskPriorityQueueSorter;
+import net.minecraft.util.Unit;
+import net.minecraft.util.thread.ProcessorHandle;
 import net.minecraft.world.level.ChunkPos;
 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;
 
+@Dasm(GeneralSet.class)
 @Mixin(ChunkTaskPriorityQueueSorter.class)
 public abstract class MixinChunkTaskPriorityQueueSorter implements CubicTaskPriorityQueueSorter, MarkableAsCubic {
     protected boolean cc_isCubic;
@@ -32,6 +40,14 @@ public abstract class MixinChunkTaskPriorityQueueSorter implements CubicTaskPrio
         return cc_isCubic;
     }
 
+    @AddTransformToSets(GeneralSet.class) @TransformFromMethod(
+        @MethodSig("message(Lnet/minecraft/server/level/ChunkHolder;Ljava/lang/Runnable;)Lnet/minecraft/server/level/ChunkTaskPriorityQueueSorter$Message;"))
+    private static native ChunkTaskPriorityQueueSorter.Message<Runnable> cc_message(ChunkHolder pChunkHolder, Runnable pTask);
+
+    @AddTransformToSets(GeneralSet.class) @TransformFromMethod(
+        @MethodSig("message(Lnet/minecraft/server/level/ChunkHolder;Ljava/util/function/Function;)Lnet/minecraft/server/level/ChunkTaskPriorityQueueSorter$Message;"))
+    private static native <T> ChunkTaskPriorityQueueSorter.Message<T> cc_message(ChunkHolder pChunkHolder, Function<ProcessorHandle<Unit>, T> pTask);
+
     /**
      * This is a method that is only used for debugging, so we don't currently test it.
      */
@@ -48,6 +64,6 @@ private void cc_onChunkOnLevelChange(ChunkPos chunkPos, IntSupplier p_140617_, i
 
     @Override
     @UsedFromASM
-    @TransformFrom("onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V")
+    @TransformFromMethod(@MethodSig("onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V"))
     public abstract <T> void onLevelChange(CloPos cloPos, IntSupplier p_140617_, int p_140618_, IntConsumer p_140619_);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
index 5941bf8b..6333d8c6 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
@@ -4,14 +4,16 @@
 import com.llamalad7.mixinextras.injector.WrapWithCondition;
 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.selector.MethodSig;
+import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.annotation.UsedFromASM;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
+import io.github.opencubicchunks.cubicchunks.mixin.GeneralSet;
 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;
@@ -30,7 +32,7 @@
  * <br><br>
  * This mixin mostly just replaces calls to ChunkPos with CloPos and TicketType with CubicTicketType.
  */
-@DasmRedirect()
+@Dasm(GeneralSet.class)
 @Mixin(DistanceManager.class)
 public abstract class MixinDistanceManager implements CubicDistanceManager, MarkableAsCubic {
     protected boolean cc_isCubic;
@@ -57,36 +59,36 @@ private void cc_onUseChunkPos(CallbackInfo ci){
 
     @Override
     @UsedFromASM
-    @TransformFrom("addTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V")
+    @TransformFromMethod(@MethodSig("addTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void addTicket(TicketType<T> type, CloPos pos, int level, T value);
 
     @Override
     @UsedFromASM
-    @TransformFrom("removeTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V")
+    @TransformFromMethod(@MethodSig("removeTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void removeTicket(TicketType<T> type, CloPos pos, int level, T value);
 
     @Override
     @UsedFromASM
-    @TransformFrom("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V")
+    @TransformFromMethod(@MethodSig("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void addRegionTicket(TicketType<T> type, CloPos pos, int distance, T value);
 
     @Override
     @UsedFromASM
-    @TransformFrom("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V")
+    @TransformFromMethod(@MethodSig("addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V"))
     public abstract <T> void addRegionTicket(TicketType<T> type, CloPos pos, int distance, T value, boolean forceTicks);
 
     @Override
     @UsedFromASM
-    @TransformFrom("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V")
+    @TransformFromMethod(@MethodSig("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void removeRegionTicket(TicketType<T> type, CloPos pos, int distance, T value);
 
     @Override
     @UsedFromASM
-    @TransformFrom("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V")
+    @TransformFromMethod(@MethodSig("removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V"))
     public abstract <T> void removeRegionTicket(TicketType<T> type, CloPos pos, int distance, T value, boolean forceTicks);
 
     @UsedFromASM
-    @TransformFrom("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)V")
+    @TransformFromMethod(@MethodSig("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)V"))
     protected abstract void updateCubeForced(CloPos pos, boolean add);
 
     /**
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinTickingTracker.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinTickingTracker.java
index fbd3a3dc..b182ab3f 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinTickingTracker.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinTickingTracker.java
@@ -3,11 +3,13 @@
 import com.llamalad7.mixinextras.injector.WrapWithCondition;
 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.selector.MethodSig;
+import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
+import io.github.opencubicchunks.cubicchunks.mixin.GeneralSet;
 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;
@@ -31,7 +33,7 @@
  * <br><br>
  * This mixin is used to convert {@link TickingTracker} to use {@link CloPos} instead of {@link ChunkPos}.
  */
-@DasmRedirect()
+@Dasm(GeneralSet.class)
 @Mixin(TickingTracker.class)
 public abstract class MixinTickingTracker extends MixinChunkTracker implements CubicTickingTracker {
     @Inject(method = "setLevel", at = @At("HEAD"))
@@ -67,12 +69,12 @@ private TicketType<?> cc_replaceTicketType(Operation<TicketType<ChunkPos>> origi
         return CubicTicketType.PLAYER;
     }
 
-    @TransformFrom("addTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V")
+    @TransformFromMethod(@MethodSig("addTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void addTicket(TicketType<T> type, CloPos cloPos, int ticketLevel, T key);
 
-    @TransformFrom("removeTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V")
+    @TransformFromMethod(@MethodSig("removeTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V"))
     public abstract <T> void removeTicket(TicketType<T> type, CloPos cloPos, int ticketLevel, T key);
 
-    @TransformFrom("getLevel(Lnet/minecraft/world/level/ChunkPos;)I")
+    @TransformFromMethod(@MethodSig("getLevel(Lnet/minecraft/world/level/ChunkPos;)I"))
     public abstract int getLevel(CloPos cloPos);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
index 3fdf9b0c..6dcff9da 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
@@ -6,16 +6,18 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
+import io.github.notstirred.dasm.api.annotations.Dasm;
+import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
+import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.utils.Coords;
-import io.github.opencubicchunks.cc_core.world.CubicLevelHeightAccessor;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
-import io.github.opencubicchunks.cubicchunks.world.level.cube.CubicChunkSource;
+import io.github.opencubicchunks.cubicchunks.mixin.GeneralSet;
 import io.github.opencubicchunks.cubicchunks.world.level.CubicLevel;
 import io.github.opencubicchunks.cubicchunks.world.level.cube.CubeAccess;
+import io.github.opencubicchunks.cubicchunks.world.level.cube.CubicChunkSource;
 import io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube;
-import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.DifficultyInstance;
@@ -36,6 +38,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+@Dasm(GeneralSet.class)
 @Mixin(Level.class)
 public abstract class MixinLevel implements CubicLevel, MarkableAsCubic, LevelAccessor {
     @Shadow @Nullable public abstract ChunkAccess getChunk(int p_46502_, int p_46503_, ChunkStatus p_46504_, boolean p_46505_);
@@ -104,7 +107,7 @@ private boolean cc_replaceLevelChunkInMarkAndNotifyBlock(Level level, BlockPos b
         return true;
     }
 
-    @TransformFrom("markAndNotifyBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;II)V")
+    @TransformFromMethod(@MethodSig("markAndNotifyBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;II)V"))
     public native void markAndNotifyBlock(BlockPos blockPos, @Nullable LevelCube levelCube, BlockState blockStatePrev, BlockState blockStateNew, int flags, int p_46608_);
 
     // getBlockState
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
index ff3de75e..e24aa00d 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
@@ -10,15 +10,16 @@
 import java.util.function.Supplier;
 
 import com.google.common.collect.Maps;
+import io.github.notstirred.dasm.api.annotations.Dasm;
+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.api.CubicConstants;
 import io.github.opencubicchunks.cc_core.utils.Coords;
 import io.github.opencubicchunks.cubicchunks.CubicChunks;
 import io.github.opencubicchunks.cubicchunks.mixin.CubeAccessAndDescendantsSet;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloAccess;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
-import io.github.opencubicchunks.dasm.api.Ref;
-import io.github.opencubicchunks.dasm.api.transform.DasmRedirect;
-import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import it.unimi.dsi.fastutil.shorts.ShortList;
 import net.minecraft.core.BlockPos;
@@ -51,7 +52,7 @@
 import net.minecraft.world.ticks.TickContainerAccess;
 import org.jetbrains.annotations.Nullable;
 
-@DasmRedirect(CubeAccessAndDescendantsSet.class)
+@Dasm(CubeAccessAndDescendantsSet.class)
 public abstract class CubeAccess implements CloAccess {
     // Fields copied from ChunkAccess, except ChunkPos -> CloPos
     protected final ShortList[] postProcessing;
@@ -107,14 +108,17 @@ public CubeAccess(
     }
 
     private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelChunkSection[] sections) {
-        for(int i = 0; i < sections.length; ++i) {
+        for (int i = 0; i < sections.length; ++i) {
             if (sections[i] == null) {
                 sections[i] = new LevelChunkSection(biomeRegistry);
             }
         }
     }
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getListenerRegistry(I)Lnet/minecraft/world/level/gameevent/GameEventListenerRegistry;")
+    @TransformFromMethod(
+        value = @MethodSig("getListenerRegistry(I)Lnet/minecraft/world/level/gameevent/GameEventListenerRegistry;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native GameEventListenerRegistry getListenerRegistry(int sectionY);
 
     @Override @Nullable public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean isMoving);
@@ -133,13 +137,22 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
         return this.getMinBuildHeight();
     }
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getBlockEntitiesPos()Ljava/util/Set;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockEntitiesPos()Ljava/util/Set;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native Set<BlockPos> getBlockEntitiesPos();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getSections()[Lnet/minecraft/world/level/chunk/LevelChunkSection;")
+    @TransformFromMethod(
+        value = @MethodSig("getSections()[Lnet/minecraft/world/level/chunk/LevelChunkSection;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native LevelChunkSection[] getSections();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getSection(I)Lnet/minecraft/world/level/chunk/LevelChunkSection;")
+    @TransformFromMethod(
+        value = @MethodSig("getSection(I)Lnet/minecraft/world/level/chunk/LevelChunkSection;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native LevelChunkSection getSection(int index);
 
     // TODO (P2) heightmap methods on cubes
@@ -167,31 +180,52 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
         return cloPos;
     }
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)"
-        + "Lnet/minecraft/world/level/levelgen/structure/StructureStart;")
+    @TransformFromMethod(
+        value = @MethodSig("getStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)Lnet/minecraft/world/level/levelgen/structure/StructureStart;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override @Nullable public native StructureStart getStartForStructure(Structure structure);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "setStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;"
-        + "Lnet/minecraft/world/level/levelgen/structure/StructureStart;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;Lnet/minecraft/world/level/levelgen/structure/StructureStart;)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void setStartForStructure(Structure structure, StructureStart structureStart);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getAllStarts()Ljava/util/Map;")
+    @TransformFromMethod(
+        value = @MethodSig("getAllStarts()Ljava/util/Map;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native Map<Structure, StructureStart> getAllStarts();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "setAllStarts(Ljava/util/Map;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setAllStarts(Ljava/util/Map;)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void setAllStarts(Map<Structure, StructureStart> structureStarts);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getReferencesForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)"
-        + "Lit/unimi/dsi/fastutil/longs/LongSet;")
+    @TransformFromMethod(
+        value = @MethodSig("getReferencesForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)Lit/unimi/dsi/fastutil/longs/LongSet;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native LongSet getReferencesForStructure(Structure structure);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "addReferenceForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;J)V")
+    @TransformFromMethod(
+        value = @MethodSig("addReferenceForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;J)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void addReferenceForStructure(Structure structure, long reference);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getAllReferences()Ljava/util/Map;")
+    @TransformFromMethod(
+        value = @MethodSig("getAllReferences()Ljava/util/Map;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native Map<Structure, LongSet> getAllReferences();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "setAllReferences(Ljava/util/Map;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setAllReferences(Ljava/util/Map;)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void setAllReferences(Map<Structure, LongSet> structureReferencesMap);
 
     @Override public boolean isYSpaceEmpty(int startY, int endY) {
@@ -199,10 +233,16 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
         return false;
     }
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "setUnsaved(Z)V")
+    @TransformFromMethod(
+        value = @MethodSig("setUnsaved(Z)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void setUnsaved(boolean unsaved);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "isUnsaved()Z")
+    @TransformFromMethod(
+        value = @MethodSig("isUnsaved()Z"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native boolean isUnsaved();
 
     @Override public abstract ChunkStatus getStatus();
@@ -214,28 +254,52 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
 
     @Override public abstract void removeBlockEntity(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V")
+    @TransformFromMethod(
+        value = @MethodSig("markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void markPosForPostprocessing(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getPostProcessing()[Lit/unimi/dsi/fastutil/shorts/ShortList;")
+    @TransformFromMethod(
+        value = @MethodSig("getPostProcessing()[Lit/unimi/dsi/fastutil/shorts/ShortList;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native ShortList[] getPostProcessing();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "addPackedPostProcess(SI)V")
+    @TransformFromMethod(
+        value = @MethodSig("addPackedPostProcess(SI)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void addPackedPostProcess(short packedPosition, int index);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "setBlockEntityNbt(Lnet/minecraft/nbt/CompoundTag;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setBlockEntityNbt(Lnet/minecraft/nbt/CompoundTag;)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void setBlockEntityNbt(CompoundTag tag);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getBlockEntityNbt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockEntityNbt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override @Nullable public native CompoundTag getBlockEntityNbt(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override @Nullable public native CompoundTag getBlockEntityNbtForSaving(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "findBlockLightSources(Ljava/util/function/BiConsumer;)V")
+    @TransformFromMethod(
+        value = @MethodSig("findBlockLightSources(Ljava/util/function/BiConsumer;)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void findBlockLightSources(BiConsumer<BlockPos, BlockState> output);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "findBlocks(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V")
+    @TransformFromMethod(
+        value = @MethodSig("findBlocks(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void findBlocks(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> output);
 
     @Override public void findBlocks(BiPredicate<BlockState, BlockPos> predicate, BiConsumer<BlockPos, BlockState> output) {
@@ -248,9 +312,9 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
                     if (levelchunksection.maybeHas((state) -> predicate.test(state, BlockPos.ZERO))) {
                         BlockPos blockpos = this.cloPos.cubePos().asSectionPos().offset(x, y, z).origin();
 
-                        for(int sectionLocalY = 0; sectionLocalY < SectionPos.SECTION_SIZE; ++sectionLocalY) {
-                            for(int sectionLocalZ = 0; sectionLocalZ < SectionPos.SECTION_SIZE; ++sectionLocalZ) {
-                                for(int sectionLocalX = 0; sectionLocalX < SectionPos.SECTION_SIZE; ++sectionLocalX) {
+                        for (int sectionLocalY = 0; sectionLocalY < SectionPos.SECTION_SIZE; ++sectionLocalY) {
+                            for (int sectionLocalZ = 0; sectionLocalZ < SectionPos.SECTION_SIZE; ++sectionLocalZ) {
+                                for (int sectionLocalX = 0; sectionLocalX < SectionPos.SECTION_SIZE; ++sectionLocalX) {
                                     BlockState blockstate = levelchunksection.getBlockState(sectionLocalX, sectionLocalY, sectionLocalZ);
                                     mutableBlockPos.setWithOffset(blockpos, sectionLocalX, sectionLocalY, sectionLocalZ);
                                     if (predicate.test(blockstate, mutableBlockPos.immutable())) {
@@ -271,40 +335,76 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
 
     @Override public abstract ChunkAccess.TicksToSave getTicksForSerialization();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getUpgradeData()Lnet/minecraft/world/level/chunk/UpgradeData;")
+    @TransformFromMethod(
+        value = @MethodSig("getUpgradeData()Lnet/minecraft/world/level/chunk/UpgradeData;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native UpgradeData getUpgradeData();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "isOldNoiseGeneration()Z")
+    @TransformFromMethod(
+        value = @MethodSig("isOldNoiseGeneration()Z"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native boolean isOldNoiseGeneration();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getBlendingData()Lnet/minecraft/world/level/levelgen/blending/BlendingData;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlendingData()Lnet/minecraft/world/level/levelgen/blending/BlendingData;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override @Nullable public native BlendingData getBlendingData();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "setBlendingData(Lnet/minecraft/world/level/levelgen/blending/BlendingData;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setBlendingData(Lnet/minecraft/world/level/levelgen/blending/BlendingData;)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void setBlendingData(BlendingData blendingData);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getInhabitedTime()J")
+    @TransformFromMethod(
+        value = @MethodSig("getInhabitedTime()J"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native long getInhabitedTime();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "incrementInhabitedTime(J)V")
+    @TransformFromMethod(
+        value = @MethodSig("incrementInhabitedTime(J)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void incrementInhabitedTime(long amount);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "setInhabitedTime(J)V")
+    @TransformFromMethod(
+        value = @MethodSig("setInhabitedTime(J)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void setInhabitedTime(long inhabitedTime);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getOrCreateOffsetList([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList;")
+    @TransformFromMethod(
+        value = @MethodSig("getOrCreateOffsetList([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     public static native ShortList getOrCreateOffsetList(ShortList[] packedPositions, int index);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "isLightCorrect()Z")
+    @TransformFromMethod(
+        value = @MethodSig("isLightCorrect()Z"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native boolean isLightCorrect();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "setLightCorrect(Z)V")
+    @TransformFromMethod(
+        value = @MethodSig("setLightCorrect(Z)V"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native void setLightCorrect(boolean lightCorrect);
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getMinBuildHeight()I")
+    @TransformFromMethod(
+        value = @MethodSig("getMinBuildHeight()I"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native int getMinBuildHeight();
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getHeight()I")
+    @TransformFromMethod(
+        value = @MethodSig("getHeight()I"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native int getHeight();
 
     @Override public NoiseChunk getOrCreateNoiseChunk(Function<CloAccess, NoiseChunk> noiseChunkCreator) {
@@ -323,7 +423,10 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
         throw new UnsupportedOperationException(); // TODO P3
     }
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "hasAnyStructureReferences()Z")
+    @TransformFromMethod(
+        value = @MethodSig("hasAnyStructureReferences()Z"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native boolean hasAnyStructureReferences();
 
     @Override @Nullable public BelowZeroRetrogen getBelowZeroRetrogen() {
@@ -334,7 +437,10 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
         return false; // Used for below-zero retrogen; not applicable to cubes
     }
 
-    @TransformFrom(copyFrom = @Ref(ChunkAccess.class), value = "getHeightAccessorForGeneration()Lnet/minecraft/world/level/LevelHeightAccessor;")
+    @TransformFromMethod(
+        value = @MethodSig("getHeightAccessorForGeneration()Lnet/minecraft/world/level/LevelHeightAccessor;"),
+        copyFrom = @Ref(ChunkAccess.class)
+    )
     @Override public native LevelHeightAccessor getHeightAccessorForGeneration();
 
     @Override public void initializeLightSources() {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ImposterProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ImposterProtoCube.java
index f7ba42d2..a8a3b206 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ImposterProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ImposterProtoCube.java
@@ -1,16 +1,14 @@
 package io.github.opencubicchunks.cubicchunks.world.level.cube;
 
+import io.github.notstirred.dasm.api.annotations.selector.Ref;
+import io.github.notstirred.dasm.api.annotations.transform.TransformFromClass;
 import io.github.opencubicchunks.cubicchunks.mixin.CubeAccessAndDescendantsSet;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.ImposterProtoClo;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.LevelClo;
-import io.github.opencubicchunks.dasm.api.Ref;
-import io.github.opencubicchunks.dasm.api.transform.DasmRedirect;
-import io.github.opencubicchunks.dasm.api.transform.TransformFromClass;
 import net.minecraft.world.level.chunk.ImposterProtoChunk;
 
 // Whole class redirect
-@DasmRedirect(CubeAccessAndDescendantsSet.class)
-@TransformFromClass(@Ref(ImposterProtoChunk.class))
+@TransformFromClass(value = @Ref(ImposterProtoChunk.class), sets = CubeAccessAndDescendantsSet.class)
 public class ImposterProtoCube extends ProtoCube implements ImposterProtoClo {
     // Field cleared and re-generated by DASM; we just need it here because otherwise mixin does not detect that the field exists.
     private LevelCube wrapped;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
index 5364666c..26f8984b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
@@ -9,14 +9,15 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.mojang.logging.LogUtils;
+import io.github.notstirred.dasm.api.annotations.Dasm;
+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.TransformFromClass;
+import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.utils.Coords;
 import io.github.opencubicchunks.cubicchunks.mixin.CubeAccessAndDescendantsSet;
 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.transform.DasmRedirect;
-import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
-import io.github.opencubicchunks.dasm.api.transform.TransformFromClass;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.core.BlockPos;
@@ -49,7 +50,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
-@DasmRedirect(CubeAccessAndDescendantsSet.class)
+@Dasm(CubeAccessAndDescendantsSet.class)
 public class LevelCube extends CubeAccess implements LevelClo {
     // Fields matching LevelChunk
     static final Logger LOGGER = LogUtils.getLogger();
@@ -148,28 +149,28 @@ public LevelCube(ServerLevel level, ProtoCube cube, @Nullable PostLoadProcessor
         this.unsaved = true;
     }
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getBlockTicks()Lnet/minecraft/world/ticks/TickContainerAccess;")
+    @TransformFromMethod(value = @MethodSig("getBlockTicks()Lnet/minecraft/world/ticks/TickContainerAccess;"), copyFrom = @Ref(LevelChunk.class))
     @Override public native TickContainerAccess<Block> getBlockTicks();
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getFluidTicks()Lnet/minecraft/world/ticks/TickContainerAccess;")
+    @TransformFromMethod(value = @MethodSig("getFluidTicks()Lnet/minecraft/world/ticks/TickContainerAccess;"), copyFrom = @Ref(LevelChunk.class))
     @Override public native TickContainerAccess<Fluid> getFluidTicks();
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getTicksForSerialization()Lnet/minecraft/world/level/chunk/ChunkAccess$TicksToSave;")
+    @TransformFromMethod(value = @MethodSig("getTicksForSerialization()Lnet/minecraft/world/level/chunk/ChunkAccess$TicksToSave;"), copyFrom = @Ref(LevelChunk.class))
     @Override public native ChunkAccess.TicksToSave getTicksForSerialization();
 
     // TODO should this actually be dasm'd?
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getListenerRegistry(I)Lnet/minecraft/world/level/gameevent/GameEventListenerRegistry;")
+    @TransformFromMethod(value = @MethodSig("getListenerRegistry(I)Lnet/minecraft/world/level/gameevent/GameEventListenerRegistry;"), copyFrom = @Ref(LevelChunk.class))
     @Override public native GameEventListenerRegistry getListenerRegistry(int sectionY);
 
     // dasm + mixin
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;")
+    @TransformFromMethod(value = @MethodSig("getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"), copyFrom = @Ref(LevelChunk.class))
     @Override public native @NotNull BlockState getBlockState(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;")
+    @TransformFromMethod(value = @MethodSig("getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;"), copyFrom = @Ref(LevelChunk.class))
     @Override public native @NotNull FluidState getFluidState(BlockPos pos);
 
     // dasm + mixin
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getFluidState(III)Lnet/minecraft/world/level/material/FluidState;")
+    @TransformFromMethod(value = @MethodSig("getFluidState(III)Lnet/minecraft/world/level/material/FluidState;"), copyFrom = @Ref(LevelChunk.class))
     @Override public native FluidState getFluidState(int x, int y, int z);
 
     // TODO might be dasm-able eventually, if we get more powerful mixin tools
@@ -223,53 +224,57 @@ public LevelCube(ServerLevel level, ProtoCube cube, @Nullable PostLoadProcessor
         }
     }
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "addEntity(Lnet/minecraft/world/entity/Entity;)V")
+    @TransformFromMethod(value = @MethodSig("addEntity(Lnet/minecraft/world/entity/Entity;)V"), copyFrom = @Ref(LevelChunk.class))
     @Deprecated @Override public native void addEntity(Entity entity);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "createBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;")
+    @TransformFromMethod(value = @MethodSig("createBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), copyFrom = @Ref(LevelChunk.class))
     @Nullable private native BlockEntity createBlockEntity(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;")
+    @TransformFromMethod(value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), copyFrom = @Ref(LevelChunk.class))
     @Override @Nullable public native BlockEntity getBlockEntity(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)"
-        + "Lnet/minecraft/world/level/block/entity/BlockEntity;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)"
+            + "Lnet/minecraft/world/level/block/entity/BlockEntity;"),
+        copyFrom = @Ref(LevelChunk.class)
+    )
     @Nullable public native BlockEntity getBlockEntity(BlockPos pos, LevelChunk.EntityCreationType creationType);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "addAndRegisterBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V")
+    @TransformFromMethod(value = @MethodSig("addAndRegisterBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"), copyFrom = @Ref(LevelChunk.class))
     public native void addAndRegisterBlockEntity(BlockEntity blockEntity);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "isInLevel()Z")
+    @TransformFromMethod(value = @MethodSig("isInLevel()Z"), copyFrom = @Ref(LevelChunk.class))
     private native boolean isInLevel();
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "isTicking(Lnet/minecraft/core/BlockPos;)Z")
+    @TransformFromMethod(value = @MethodSig("isTicking(Lnet/minecraft/core/BlockPos;)Z"), copyFrom = @Ref(LevelChunk.class))
     public native boolean isTicking(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "setBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V")
+    @TransformFromMethod(value = @MethodSig("setBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"), copyFrom = @Ref(LevelChunk.class))
     @Override public native void setBlockEntity(BlockEntity blockEntity);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;")
+    @TransformFromMethod(value = @MethodSig("getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;"), copyFrom = @Ref(LevelChunk.class))
     @Override @Nullable public native CompoundTag getBlockEntityNbtForSaving(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "removeBlockEntity(Lnet/minecraft/core/BlockPos;)V")
+    @TransformFromMethod(value = @MethodSig("removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"), copyFrom = @Ref(LevelChunk.class))
     @Override public native void removeBlockEntity(BlockPos pos);
 
     // TODO maybe shouldn't be dasm
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "removeGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;"
-        + "Lnet/minecraft/server/level/ServerLevel;"
-        + ")V")
+    @TransformFromMethod(
+        value = @MethodSig("removeGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/server/level/ServerLevel;)V"),
+        copyFrom = @Ref(LevelChunk.class)
+    )
     private native <T extends BlockEntity> void removeGameEventListener(T blockEntity, ServerLevel level);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "removeGameEventListenerRegistry(I)V")
+    @TransformFromMethod(value = @MethodSig("removeGameEventListenerRegistry(I)V"), copyFrom = @Ref(LevelChunk.class))
     private native void removeGameEventListenerRegistry(int p_283355_);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "removeBlockEntityTicker(Lnet/minecraft/core/BlockPos;)V")
+    @TransformFromMethod(value = @MethodSig("removeBlockEntityTicker(Lnet/minecraft/core/BlockPos;)V"), copyFrom = @Ref(LevelChunk.class))
     private native void removeBlockEntityTicker(BlockPos pos);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "runPostLoad()V")
+    @TransformFromMethod(value = @MethodSig("runPostLoad()V"), copyFrom = @Ref(LevelChunk.class))
     public native void runPostLoad();
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "isEmpty()Z")
+    @TransformFromMethod(value = @MethodSig("isEmpty()Z"), copyFrom = @Ref(LevelChunk.class))
     public native boolean isEmpty();
 
     public void replaceWithPacketData(
@@ -293,16 +298,16 @@ public void replaceWithPacketData(
         });
     }
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "replaceBiomes(Lnet/minecraft/network/FriendlyByteBuf;)V")
+    @TransformFromMethod(value = @MethodSig("replaceBiomes(Lnet/minecraft/network/FriendlyByteBuf;)V"), copyFrom = @Ref(LevelChunk.class))
     public native void replaceBiomes(FriendlyByteBuf buffer);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "setLoaded(Z)V")
+    @TransformFromMethod(value = @MethodSig("setLoaded(Z)V"), copyFrom = @Ref(LevelChunk.class))
     public native void setLoaded(boolean loaded);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getLevel()Lnet/minecraft/world/level/Level;")
+    @TransformFromMethod(value = @MethodSig("getLevel()Lnet/minecraft/world/level/Level;"), copyFrom = @Ref(LevelChunk.class))
     public native Level getLevel();
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getBlockEntities()Ljava/util/Map;")
+    @TransformFromMethod(value = @MethodSig("getBlockEntities()Ljava/util/Map;"), copyFrom = @Ref(LevelChunk.class))
     public native Map<BlockPos, BlockEntity> getBlockEntities();
 
     // TODO P2 or P3 figure this out later - stub method for now
@@ -320,46 +325,52 @@ public void postProcessGeneration() {
         this.pendingBlockEntities.clear();
     }
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "promotePendingBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/nbt/CompoundTag;)"
-        + "Lnet/minecraft/world/level/block/entity/BlockEntity;")
+    @TransformFromMethod(
+        value = @MethodSig("promotePendingBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/block/entity/BlockEntity;"),
+        copyFrom = @Ref(LevelChunk.class)
+    )
     @Nullable private native BlockEntity promotePendingBlockEntity(BlockPos pos, CompoundTag tag);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "unpackTicks(J)V")
+    @TransformFromMethod(value = @MethodSig("unpackTicks(J)V"), copyFrom = @Ref(LevelChunk.class))
     public native void unpackTicks(long pos);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "registerTickContainerInLevel(Lnet/minecraft/server/level/ServerLevel;)V")
+    @TransformFromMethod(value = @MethodSig("registerTickContainerInLevel(Lnet/minecraft/server/level/ServerLevel;)V"), copyFrom = @Ref(LevelChunk.class))
     public native void registerTickContainerInLevel(ServerLevel level);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "unregisterTickContainerFromLevel(Lnet/minecraft/server/level/ServerLevel;)V")
+    @TransformFromMethod(value = @MethodSig("unregisterTickContainerFromLevel(Lnet/minecraft/server/level/ServerLevel;)V"), copyFrom = @Ref(LevelChunk.class))
     public native void unregisterTickContainerFromLevel(ServerLevel level);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getStatus()Lnet/minecraft/world/level/chunk/ChunkStatus;")
+    @TransformFromMethod(value = @MethodSig("getStatus()Lnet/minecraft/world/level/chunk/ChunkStatus;"), copyFrom = @Ref(LevelChunk.class))
     @Override public native ChunkStatus getStatus();
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "getFullStatus()Lnet/minecraft/server/level/FullChunkStatus;")
+    @TransformFromMethod(value = @MethodSig("getFullStatus()Lnet/minecraft/server/level/FullChunkStatus;"), copyFrom = @Ref(LevelChunk.class))
     public native FullChunkStatus getFullStatus();
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "setFullStatus(Ljava/util/function/Supplier;)V")
+    @TransformFromMethod(value = @MethodSig("setFullStatus(Ljava/util/function/Supplier;)V"), copyFrom = @Ref(LevelChunk.class))
     public native void setFullStatus(Supplier<FullChunkStatus> fullStatus);
 
     // TODO a bit concerning
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "clearAllBlockEntities()V")
+    @TransformFromMethod(value = @MethodSig("clearAllBlockEntities()V"), copyFrom = @Ref(LevelChunk.class))
     public native void clearAllBlockEntities();
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "registerAllBlockEntitiesAfterLevelLoad()V")
+    @TransformFromMethod(value = @MethodSig("registerAllBlockEntitiesAfterLevelLoad()V"), copyFrom = @Ref(LevelChunk.class))
     public native void registerAllBlockEntitiesAfterLevelLoad();
 
     // TODO (P3): GameEvent stuff is a bit concerning
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "addGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;"
-        + "Lnet/minecraft/server/level/ServerLevel;)V")
+    @TransformFromMethod(
+        value = @MethodSig("addGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/server/level/ServerLevel;)V"),
+        copyFrom = @Ref(LevelChunk.class)
+    )
     private native <T extends BlockEntity> void addGameEventListener(T blockEntity, ServerLevel level);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "updateBlockEntityTicker(Lnet/minecraft/world/level/block/entity/BlockEntity;)V")
+    @TransformFromMethod(value = @MethodSig("updateBlockEntityTicker(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"), copyFrom = @Ref(LevelChunk.class))
     private native <T extends BlockEntity> void updateBlockEntityTicker(T blockEntity);
 
-    @TransformFrom(copyFrom = @Ref(LevelChunk.class), value = "createTicker(Lnet/minecraft/world/level/block/entity/BlockEntity;"
-        + "Lnet/minecraft/world/level/block/entity/BlockEntityTicker;)"
-        + "Lnet/minecraft/world/level/block/entity/TickingBlockEntity;")
+    @TransformFromMethod(
+        value = @MethodSig("createTicker(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/level/block/entity/BlockEntityTicker;)"
+            + "Lnet/minecraft/world/level/block/entity/TickingBlockEntity;"),
+        copyFrom = @Ref(LevelChunk.class)
+    )
     private native <T extends BlockEntity> TickingBlockEntity createTicker(T blockEntity, BlockEntityTicker<T> ticker);
 
     // TODO forge stuff
@@ -384,8 +395,7 @@ public void postProcessGeneration() {
 //    }
     // FORGE END
 
-    @DasmRedirect(CubeAccessAndDescendantsSet.class)
-    @TransformFromClass(@Ref(string = "net.minecraft.world.level.chunk.LevelChunk$BoundTickingBlockEntity"))
+    @TransformFromClass(value = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$BoundTickingBlockEntity"), sets = CubeAccessAndDescendantsSet.class)
     class BoundTickingBlockEntity<T extends BlockEntity> implements TickingBlockEntity {
         private final T blockEntity;
         private final BlockEntityTicker<T> ticker;
@@ -411,8 +421,7 @@ public interface PostLoadProcessor {
         void run(LevelCube cube);
     }
 
-    @DasmRedirect(CubeAccessAndDescendantsSet.class)
-    @TransformFromClass(@Ref(string = "net.minecraft.world.level.chunk.LevelChunk$RebindableTickingBlockEntityWrapper"))
+    @TransformFromClass(value = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$RebindableTickingBlockEntityWrapper"), sets = CubeAccessAndDescendantsSet.class)
     public class RebindableTickingBlockEntityWrapper implements TickingBlockEntity {
         private TickingBlockEntity ticker;
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
index 0d07a7ad..a190faa5 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
@@ -6,13 +6,14 @@
 import javax.annotation.Nullable;
 
 import com.google.common.collect.Lists;
+import io.github.notstirred.dasm.api.annotations.Dasm;
+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.utils.Coords;
 import io.github.opencubicchunks.cubicchunks.mixin.CubeAccessAndDescendantsSet;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos;
 import io.github.opencubicchunks.cubicchunks.world.level.chunklike.ProtoClo;
-import io.github.opencubicchunks.dasm.api.Ref;
-import io.github.opencubicchunks.dasm.api.transform.DasmRedirect;
-import io.github.opencubicchunks.dasm.api.transform.TransformFrom;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
@@ -43,7 +44,7 @@
 import net.minecraft.world.ticks.ProtoChunkTicks;
 import net.minecraft.world.ticks.TickContainerAccess;
 
-@DasmRedirect(CubeAccessAndDescendantsSet.class)
+@Dasm(CubeAccessAndDescendantsSet.class)
 public class ProtoCube extends CubeAccess implements ProtoClo {
     // Fields matching ProtoChunk
     @Nullable
@@ -71,21 +72,36 @@ public ProtoCube(CloPos cloPos, UpgradeData upgradeData, @Nullable LevelChunkSec
         this.fluidTicks = liquidTicks;
     }
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getBlockTicks()Lnet/minecraft/world/ticks/TickContainerAccess;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockTicks()Lnet/minecraft/world/ticks/TickContainerAccess;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native TickContainerAccess<Block> getBlockTicks();
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getFluidTicks()Lnet/minecraft/world/ticks/TickContainerAccess;")
+    @TransformFromMethod(
+        value = @MethodSig("getFluidTicks()Lnet/minecraft/world/ticks/TickContainerAccess;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native TickContainerAccess<Fluid> getFluidTicks();
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getTicksForSerialization()Lnet/minecraft/world/level/chunk/ChunkAccess$TicksToSave;")
+    @TransformFromMethod(
+        value = @MethodSig("getTicksForSerialization()Lnet/minecraft/world/level/chunk/ChunkAccess$TicksToSave;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native ChunkAccess.TicksToSave getTicksForSerialization();
 
     // dasm + mixin
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native BlockState getBlockState(BlockPos pos);
 
     // dasm + mixin
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;")
+    @TransformFromMethod(
+        value = @MethodSig("getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native FluidState getFluidState(BlockPos pos);
 
     @Nullable
@@ -108,80 +124,146 @@ public ProtoCube(CloPos cloPos, UpgradeData upgradeData, @Nullable LevelChunkSec
         }
     }
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "setBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native void setBlockEntity(BlockEntity pBlockEntity);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override @Nullable public native BlockEntity getBlockEntity(BlockPos pPos);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getBlockEntities()Ljava/util/Map;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockEntities()Ljava/util/Map;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native Map<BlockPos, BlockEntity> getBlockEntities();
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "addEntity(Lnet/minecraft/nbt/CompoundTag;)V")
+    @TransformFromMethod(
+        value = @MethodSig("addEntity(Lnet/minecraft/nbt/CompoundTag;)V"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native void addEntity(CompoundTag pTag);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "addEntity(Lnet/minecraft/world/entity/Entity;)V")
+    @TransformFromMethod(
+        value = @MethodSig("addEntity(Lnet/minecraft/world/entity/Entity;)V"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native void addEntity(Entity pEntity);
 
     // setStartForStructure: ProtoChunk logic handles below-zero retrogen then calls super, so we don't need to override
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getEntities()Ljava/util/List;")
+    @TransformFromMethod(
+        value = @MethodSig("getEntities()Ljava/util/List;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native List<CompoundTag> getEntities();
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getStatus()Lnet/minecraft/world/level/chunk/ChunkStatus;")
+    @TransformFromMethod(
+        value = @MethodSig("getStatus()Lnet/minecraft/world/level/chunk/ChunkStatus;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native ChunkStatus getStatus();
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "setStatus(Lnet/minecraft/world/level/chunk/ChunkStatus;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setStatus(Lnet/minecraft/world/level/chunk/ChunkStatus;)V"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native void setStatus(ChunkStatus pStatus);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getNoiseBiome(III)Lnet/minecraft/core/Holder;")
+    @TransformFromMethod(
+        value = @MethodSig("getNoiseBiome(III)Lnet/minecraft/core/Holder;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native Holder<Biome> getNoiseBiome(int pX, int pY, int pZ);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "packOffsetCoordinates(Lnet/minecraft/core/BlockPos;)S")
+    @TransformFromMethod(
+        value = @MethodSig("packOffsetCoordinates(Lnet/minecraft/core/BlockPos;)S"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     public native static short packOffsetCoordinates(BlockPos pPos);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "unpackOffsetCoordinates(SILnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/core/BlockPos;")
+    @TransformFromMethod(
+        value = @MethodSig("unpackOffsetCoordinates(SILnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/core/BlockPos;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     public native static BlockPos unpackOffsetCoordinates(short pPackedPos, int pYOffset, ChunkPos pChunkPos);
 
     // dasm + mixin
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V")
+    @TransformFromMethod(
+        value = @MethodSig("markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native void markPosForPostprocessing(BlockPos pPos);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "addPackedPostProcess(SI)V")
+    @TransformFromMethod(
+        value = @MethodSig("addPackedPostProcess(SI)V"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native void addPackedPostProcess(short pPackedPosition, int pIndex);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getBlockEntityNbts()Ljava/util/Map;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockEntityNbts()Ljava/util/Map;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native Map<BlockPos, CompoundTag> getBlockEntityNbts();
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;")
+    @TransformFromMethod(
+        value = @MethodSig("getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override @Nullable public native CompoundTag getBlockEntityNbtForSaving(BlockPos pPos);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "removeBlockEntity(Lnet/minecraft/core/BlockPos;)V")
+    @TransformFromMethod(
+        value = @MethodSig("removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native void removeBlockEntity(BlockPos pPos);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getCarvingMask(Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/chunk/CarvingMask;")
+    @TransformFromMethod(
+        value = @MethodSig("getCarvingMask(Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/chunk/CarvingMask;"),
+        copyFrom = @Ref(ProtoChunk.class))
     @Override @Nullable public native CarvingMask getCarvingMask(GenerationStep.Carving pStep);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "getOrCreateCarvingMask(Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/chunk/CarvingMask;")
+    @TransformFromMethod(
+        value = @MethodSig("getOrCreateCarvingMask(Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/chunk/CarvingMask;"),
+        copyFrom = @Ref(ProtoChunk.class))
     @Override public native CarvingMask getOrCreateCarvingMask(GenerationStep.Carving pStep);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "setCarvingMask(Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;Lnet/minecraft/world/level/chunk/CarvingMask;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setCarvingMask(Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;Lnet/minecraft/world/level/chunk/CarvingMask;)V"),
+        copyFrom = @Ref(ProtoChunk.class))
     @Override public native void setCarvingMask(GenerationStep.Carving pStep, CarvingMask pCarvingMask);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "setLightEngine(Lnet/minecraft/world/level/lighting/LevelLightEngine;)V")
+    @TransformFromMethod(
+        value = @MethodSig("setLightEngine(Lnet/minecraft/world/level/lighting/LevelLightEngine;)V"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native void setLightEngine(LevelLightEngine pLightEngine);
 
     @Override public void setBelowZeroRetrogen(@Nullable BelowZeroRetrogen pBelowZeroRetrogen) {
         // Below-zero retrogen is unused in CC, hence empty method body
     }
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "unpackTicks(Lnet/minecraft/world/ticks/ProtoChunkTicks;)Lnet/minecraft/world/ticks/LevelChunkTicks;")
+    @TransformFromMethod(
+        value = @MethodSig("unpackTicks(Lnet/minecraft/world/ticks/ProtoChunkTicks;)Lnet/minecraft/world/ticks/LevelChunkTicks;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     private static native <T> LevelChunkTicks<T> unpackTicks(ProtoChunkTicks<T> pTicks);
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "unpackBlockTicks()Lnet/minecraft/world/ticks/LevelChunkTicks;")
+    @TransformFromMethod(
+        value = @MethodSig("unpackBlockTicks()Lnet/minecraft/world/ticks/LevelChunkTicks;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native LevelChunkTicks<Block> unpackBlockTicks();
 
-    @TransformFrom(copyFrom = @Ref(ProtoChunk.class), value = "unpackFluidTicks()Lnet/minecraft/world/ticks/LevelChunkTicks;")
+    @TransformFromMethod(
+        value = @MethodSig("unpackFluidTicks()Lnet/minecraft/world/ticks/LevelChunkTicks;"),
+        copyFrom = @Ref(ProtoChunk.class)
+    )
     @Override public native LevelChunkTicks<Fluid> unpackFluidTicks();
 
     @Override public LevelHeightAccessor getHeightAccessorForGeneration() {