remove all traces of subclass & mixin ideas, those will be handed another day

Author: theminecoder

README.md

@@ -26,8 +26,3 @@ projects.
 </dependencies>	
 ```
 
-## TODO
-- [X] Proxying to NMS Objects
-- [ ] Subclassing NMS Objects _In progress_
-- [ ] Mixin NMS Editing
-

pom.xml

@@ -75,10 +75,5 @@
             <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy</artifactId>
-            <version>1.7.9</version>
-        </dependency>
     </dependencies>
 </project>

src/main/java/me/theminecoder/minecraft/nmsproxy/NMSSubclass.java

@@ -1,29 +1,15 @@
 package me.theminecoder.minecraft.nmsproxy.proxy;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Maps;
 import me.theminecoder.minecraft.nmsproxy.NMSProxy;
-import me.theminecoder.minecraft.nmsproxy.NMSSubclass;
 import me.theminecoder.minecraft.nmsproxy.annotations.NMSClass;
-import net.bytebuddy.ByteBuddy;
-import net.bytebuddy.asm.Advice;
-import net.bytebuddy.dynamic.DynamicType;
-import net.bytebuddy.implementation.FixedValue;
-import net.bytebuddy.implementation.MethodCall;
-import net.bytebuddy.implementation.bytecode.assign.Assigner;
-import net.bytebuddy.pool.TypePool;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author theminecoder
@@ -33,7 +19,6 @@ public final class NMSProxyProvider {
     private static final Map<JavaPlugin, NMSProxyProvider> PLUGIN_INSTANCES = Maps.newHashMap();
 
     private BiMap<Class, Class> proxyToNMSClassMap = HashBiMap.create();
-    private static final Map<Class, DynamicType.Loaded> proxyToNMSSubclassMap = Maps.newHashMap(); //Can't have plugins overwriting each other
     private NMSProxyInvocationMapper invocationMapper = new NMSProxyInvocationMapper(proxyToNMSClassMap);
 
     private NMSProxyProvider() {
@@ -132,65 +117,6 @@ public <T extends NMSProxy> T constructNMSObject(Class<T> clazz, Object... param
         return getNMSObject(clazz, nmsObject);
     }
 
-    /**
-     * Constructs and returns an object that is a subclass of another NMS class.
-     * <p>
-     * Something of note here is that the class you use to define the subclass is not the same class you get back.
-     * This is due to the use of a dynamic class generator to do the backend work with subclassing.
-     *
-     * @param clazz  Class implementing another {@link NMSProxy} and {@link NMSSubclass}
-     * @param params Objects to pass to the constructor of the final subclass
-     * @return The constructed object (Note that this is not wrapped in a proxy)
-     * @throws ReflectiveOperationException
-     */
-    public <T extends NMSSubclass> T constructNMSSubclass(Class<T> clazz, Object... params) throws ReflectiveOperationException {
-        if (clazz.getInterfaces().length == 0 || NMSProxy.class.isAssignableFrom(clazz.getInterfaces()[0])) {
-            throw new IllegalArgumentException("Class does not implement a NMSProxy interface");
-        }
-
-        Class<? extends NMSProxy> proxyClass = (Class<? extends NMSProxy>) clazz.getInterfaces()[0];
-        registerNMSClasses(proxyClass);
-
-        DynamicType.Loaded<Object> dynamicType = proxyToNMSSubclassMap.get(proxyClass);
-        if (dynamicType == null) {
-            Class nmsClass = proxyToNMSClassMap.get(proxyClass);
-            DynamicType.Builder<Object> builder = new ByteBuddy().subclass(nmsClass).name(clazz.getCanonicalName() + "$RuntimeGenerated").implement(clazz.getInterfaces());
-
-            System.out.println("[SUBCLASSING][" + nmsClass.getSimpleName() + "->" + clazz.getSimpleName() + "] NMS Class Modifiers: " + Modifier.toString(nmsClass.getModifiers()));
-            System.out.println("[SUBCLASSING][" + nmsClass.getSimpleName() + "->" + clazz.getSimpleName() + "] Methods needing to be implemented for \"" + nmsClass.getCanonicalName() + "\":");
-            for (Method method : nmsClass.getDeclaredMethods()) {
-                if (Modifier.isAbstract(method.getModifiers())) {
-                    System.out.println("[SUBCLASSING][" + nmsClass.getSimpleName() + "->" + clazz.getSimpleName() + "] \t- " + Modifier.toString(method.getModifiers()) + " " + method.getReturnType().getSimpleName() + " " + method.getName() + "(" + Joiner.on(", ").join(Arrays.stream(method.getParameterTypes()).map(Class::getSimpleName).collect(Collectors.toList())) + ")");
-                }
-            }
-
-            System.out.println("[SUBCLASSING][" + nmsClass.getSimpleName() + "->" + clazz.getSimpleName() + "] Methods being implemented by \"" + clazz.getCanonicalName() + "\":");
-            for (Method method : clazz.getDeclaredMethods()) {
-                System.out.println("[SUBCLASSING][" + nmsClass.getSimpleName() + "->" + clazz.getSimpleName() + "] \t- " + Modifier.toString(method.getModifiers()) + " " + method.getReturnType().getSimpleName() + " " + method.getName() + "(" + Joiner.on(", ").join(Arrays.stream(method.getParameterTypes()).map(Class::getSimpleName).collect(Collectors.toList())) + ")");
-            }
-
-            for (Method method : clazz.getDeclaredMethods()) {
-                builder = builder.defineMethod(method.getName(), method.getReturnType(), method.getModifiers())
-                        .withParameters(Arrays.stream(method.getParameterTypes()).map(type -> {
-                            if (NMSProxy.class.isAssignableFrom(type)) {
-                                registerNMSClasses((Class<? extends NMSProxy>) type);
-                                type = proxyToNMSClassMap.get(type);
-                            }
-
-                            return type;
-                        }).collect(Collectors.toList()))
-                        .intercept(Advice.to(NMSProxySubclassAdvice.class).wrap(MethodCall.invoke(method)));
-            }
-
-            builder = builder.defineMethod("getProxyHandle", Object.class, Modifier.PUBLIC).intercept(FixedValue.self());
-
-            dynamicType = builder.make(TypePool.ClassLoading.of(clazz.getClassLoader())).load(clazz.getClassLoader());
-            proxyToNMSSubclassMap.put(clazz, dynamicType);
-        }
-
-        return (T) dynamicType.getLoaded().getConstructor(Arrays.stream(params).map(Object::getClass).toArray(Class[]::new)).newInstance(params);
-    }
-
     Object[] unwrapArguments(Object[] args) {
         if (args == null) {
             return new Object[]{};
@@ -211,32 +137,4 @@ Object unwrapArgument(Object arg) {
 
         return arg;
     }
-
-    /**
-     * @author theminecoder
-     */
-    static class NMSProxySubclassAdvice {
-
-        @Advice.OnMethodEnter
-        static void enter(@Advice.AllArguments(typing = Assigner.Typing.DYNAMIC) Object[] args) {
-            //Wrap back to proxy for original method
-            for (int i = 0; i < args.length; i++) {
-                Object arg = args[i];
-                if (arg == null) {
-                    continue;
-                }
-                try {
-                    JavaPlugin plugin = JavaPlugin.getProvidingPlugin(args[i].getClass());
-                    NMSProxyProvider proxyProvider = get(plugin);
-                    Class proxyClass = proxyProvider.proxyToNMSClassMap.inverse().get(args[i].getClass());
-                    if (proxyClass != null) {
-                        args[i] = proxyProvider.getNMSObject(proxyClass, arg);
-                    }
-                } catch (Exception e) {
-                }
-            }
-        }
-
-    }
-
 }