Move NonFunctionAlteringWrapper to api package

And give it a simpler name and purpose
makamys · Oct 22, 2023 · 0939963 · 0939963
1 parent 7fa7ae5
commit 0939963
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/makamys/coretweaks/api/IWrapper.java b/src/main/java/makamys/coretweaks/api/IWrapper.java
@@ -0,0 +1,6 @@
+package makamys.coretweaks.api;
+
+/** An object that wraps another object, and is the same type as it. */
+public interface IWrapper<T> {
+    public T getOriginal();
+}
diff --git a/src/main/java/makamys/coretweaks/optimization/NonFunctionAlteringWrapper.java b/src/main/java/makamys/coretweaks/optimization/NonFunctionAlteringWrapper.java
diff --git a/src/main/java/makamys/coretweaks/optimization/transformerproxy/TransformerProxy.java b/src/main/java/makamys/coretweaks/optimization/transformerproxy/TransformerProxy.java
@@ -3,11 +3,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import makamys.coretweaks.optimization.NonFunctionAlteringWrapper;
+import makamys.coretweaks.api.IWrapper;
 import net.minecraft.launchwrapper.IClassTransformer;
 
 /** <p>A proxy for an {@link IClassTransformer} that intercepts the {@link IClassTransformer#transform(String, String, byte[])} method and redirects it to a series of wrappers who may modify the method call as they wish.</p> */
-public class TransformerProxy implements IClassTransformer, NonFunctionAlteringWrapper<IClassTransformer> {
+public class TransformerProxy implements IClassTransformer, IWrapper<IClassTransformer> {
     protected IClassTransformer original;
 
     private List<ITransformerWrapper> wrappers = new ArrayList<>();

diff --git a/src/main/java/makamys/coretweaks/optimization/transformerproxy/TransformerProxyManager.java b/src/main/java/makamys/coretweaks/optimization/transformerproxy/TransformerProxyManager.java
@@ -10,7 +10,7 @@
 
 import com.google.common.collect.Lists;
 
-import makamys.coretweaks.optimization.NonFunctionAlteringWrapper;
+import makamys.coretweaks.api.IWrapper;
 import makamys.coretweaks.util.PluralUtil;
 import makamys.coretweaks.util.WrappedAddListenableList;
 import makamys.coretweaks.util.WrappedAddListenableList.AdditionEvent;
@@ -64,8 +64,8 @@ public void hookClassLoader(boolean installListener) {
 
     private IClassTransformer createCachedProxy(IClassTransformer transformer, boolean onlyFirst) {
         IClassTransformer realTransformer = transformer;
-        while(realTransformer instanceof NonFunctionAlteringWrapper<?>) {
-            realTransformer = ((NonFunctionAlteringWrapper<IClassTransformer>)realTransformer).getOriginal();
+        while(realTransformer instanceof IWrapper<?>) {
+            realTransformer = ((IWrapper<IClassTransformer>)realTransformer).getOriginal();
         }
         List<ITransformerWrapper> wrappers = new ArrayList<>();
         for(ITransformerWrapperProvider l : (onlyFirst ? Collections.singletonList(listeners.get(0)) : listeners)) {