refactor: remove obsolete ASM transformations

RelativityMC · Oct 29, 2024 · 4022b7e · 4022b7e
1 parent eff9efe
commit 4022b7e
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 205 deletions.
diff --git a/c2me-base/src/main/java/com/ishland/c2me/base/common/util/ASMUtils.java b/c2me-base/src/main/java/com/ishland/c2me/base/common/util/ASMUtils.java
diff --git a/...java/com/ishland/c2me/fixes/worldgen/threading_issues/asm/ASMTransformerMakeVolatile.java b/...java/com/ishland/c2me/fixes/worldgen/threading_issues/asm/ASMTransformerMakeVolatile.java
@@ -1,17 +1,12 @@
 package com.ishland.c2me.fixes.worldgen.threading_issues.asm;
 
-import com.ishland.c2me.base.common.util.ASMUtils;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class ASMTransformerMakeVolatile {

diff --git a/c2me-opts-allocs/src/main/java/com/ishland/c2me/opts/allocs/MixinPlugin.java b/c2me-opts-allocs/src/main/java/com/ishland/c2me/opts/allocs/MixinPlugin.java
@@ -1,7 +1,6 @@
 package com.ishland.c2me.opts.allocs;
 
 import com.ishland.c2me.base.common.ModuleMixinPlugin;
-import com.ishland.c2me.opts.allocs.asm.ASMTransformerNbtOpsMapBuilderFastUtilMap;
 import net.fabricmc.loader.api.FabricLoader;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -27,7 +26,6 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
     @Override
     public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
         super.preApply(targetClassName, targetClass, mixinClassName, mixinInfo);
-        ASMTransformerNbtOpsMapBuilderFastUtilMap.transform(targetClass);
     }
 
 }
diff --git a/...main/java/com/ishland/c2me/opts/allocs/asm/ASMTransformerNbtOpsMapBuilderFastUtilMap.java b/...main/java/com/ishland/c2me/opts/allocs/asm/ASMTransformerNbtOpsMapBuilderFastUtilMap.java
diff --git a/c2me-opts-allocs/src/main/java/com/ishland/c2me/opts/allocs/mixin/asm/ASMTargets.java b/c2me-opts-allocs/src/main/java/com/ishland/c2me/opts/allocs/mixin/asm/ASMTargets.java
diff --git a/c2me-opts-allocs/src/main/resources/c2me-opts-allocs.mixins.json b/c2me-opts-allocs/src/main/resources/c2me-opts-allocs.mixins.json
@@ -9,7 +9,6 @@
     "MixinNbtCompound1",
     "MixinNbtList",
     "MixinUtil",
-    "asm.ASMTargets",
     "object_pooling_caching.MixinConfiguredFeature",
     "object_pooling_caching.MixinOreFeature",
     "surfacebuilder.MixinMaterialRuleContext",

diff --git a/c2me-opts-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/MixinPlugin.java b/c2me-opts-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/MixinPlugin.java
@@ -1,7 +1,6 @@
 package com.ishland.c2me.opts.chunk_access;
 
 import com.ishland.c2me.base.common.ModuleMixinPlugin;
-import com.ishland.c2me.opts.chunk_access.asm.ASMTransformerLithiumChunkAccessWorkaround;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
@@ -10,7 +9,6 @@ public class MixinPlugin extends ModuleMixinPlugin {
     @Override
     public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
         super.postApply(targetClassName, targetClass, mixinClassName, mixinInfo);
-        ASMTransformerLithiumChunkAccessWorkaround.transform(targetClass);
     }
 
 }
diff --git a/...va/com/ishland/c2me/opts/chunk_access/asm/ASMTransformerLithiumChunkAccessWorkaround.java b/...va/com/ishland/c2me/opts/chunk_access/asm/ASMTransformerLithiumChunkAccessWorkaround.java
diff --git a/...s-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/mixin/asm/ASMTargets.java b/...s-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/mixin/asm/ASMTargets.java
diff --git a/c2me-opts-chunk-access/src/main/resources/c2me-opts-chunk-access.mixins.json b/c2me-opts-chunk-access/src/main/resources/c2me-opts-chunk-access.mixins.json
@@ -4,7 +4,6 @@
   "package": "com.ishland.c2me.opts.chunk_access.mixin",
   "plugin": "com.ishland.c2me.opts.chunk_access.MixinPlugin",
   "mixins": [
-    "asm.ASMTargets",
     "region_capture.MixinChunkGenerationStep"
   ]
 }