Tweaks

- Actually commit toString this time
- Remove proxy reuse until a non memory leak version of it can be created
- Add a static only proxy getter so users don't have to provide an object to get to static methods

Author: theminecoder

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

@@ -5,6 +5,14 @@
  */
 public interface NMSProxy {
 
+    /**
+     * @return An static only compatible version of the proxy.
+     */
+    NMSProxy getStaticProxyObject();
+
+    /**
+     * @return The original object used to create the proxy
+     */
     Object getProxyHandle();
 
 }

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

@@ -31,6 +31,18 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
             return handle;
         }
 
+        if (method.getName().equals("getStaticProxyObject")) {
+            if (handle == null) {
+                return this;
+            }
+
+            return proxyProvider.getStaticNMSObject((Class<? extends NMSProxy>) proxy.getClass().getInterfaces()[0]);
+        }
+
+        if (handle == null && method.getAnnotation(NMSStatic.class) == null) {
+            throw new IllegalStateException("Proxy method \""+method+"\" is attempting to call to instance method/field on a static proxy. Please mark the proxy method with @NMSStatic");
+        }
+
         if (method.getAnnotation(NMSMethod.class) != null || method.getDeclaringClass() == Object.class) {
             NMSMethod nmsMethodAnnotation = method.getAnnotation(NMSMethod.class);
 
@@ -46,6 +58,10 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                 return null;
             }
 
+            if (method.getName().equals("toString") && method.getParameterCount() == 0) {
+                return "Proxy|" + proxy.getClass().getInterfaces()[0].getCanonicalName() + "(" + returnObject + ")";
+            }
+
             if (NMSProxy.class.isAssignableFrom(method.getReturnType())) {
                 returnObject = proxyProvider.getNMSObject((Class<? extends NMSProxy>) method.getReturnType(), returnObject);
             }

src/main/java/me/theminecoder/minecraft/nmsproxy/proxy/NMSProxyInvocationHandler.java

@@ -20,7 +20,6 @@
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.Map;
-import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -34,8 +33,6 @@ public final class NMSProxyProvider {
     private final Map<Class, DynamicType.Loaded> proxyToNMSSubclassMap = Maps.newHashMap();
     private NMSProxyInvocationMapper invocationMapper = new NMSProxyInvocationMapper(proxyToNMSClassMap);
 
-    private Map<Object, NMSProxy> proxyInstances = new WeakHashMap<>();
-
     private NMSProxyProvider() {
     }
 
@@ -68,20 +65,20 @@ private void registerNMSClasses(Class<? extends NMSProxy> clazz) {
         proxyToNMSClassMap.put(clazz, nmsClass);
     }
 
-    public <T extends NMSProxy> T getNMSObject(Class<T> clazz, Object object) {
+    public <T extends NMSProxy> T getStaticNMSObject(Class<T> clazz) {
         registerNMSClasses(clazz);
 
-        T proxyObject = (T) proxyInstances.get(object);
+        return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[]{clazz}, new NMSProxyInvocationHandler(null, invocationMapper, this));
+    }
 
-        if (proxyObject == null) {
-            if (!proxyToNMSClassMap.get(clazz).isAssignableFrom(object.getClass())) {
-                throw new IllegalStateException("Object is not of type " + proxyToNMSClassMap.get(clazz).getCanonicalName() + "!");
-            }
-            proxyObject = (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[]{clazz}, new NMSProxyInvocationHandler(object, invocationMapper, this));
-            proxyInstances.put(object, proxyObject);
+    public <T extends NMSProxy> T getNMSObject(Class<T> clazz, Object object) {
+        registerNMSClasses(clazz);
+
+        if (!proxyToNMSClassMap.get(clazz).isAssignableFrom(object.getClass())) {
+            throw new IllegalStateException("Object is not of type " + proxyToNMSClassMap.get(clazz).getCanonicalName() + "!");
         }
 
-        return proxyObject;
+        return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[]{clazz}, new NMSProxyInvocationHandler(object, invocationMapper, this));
     }
 
     public <T extends NMSProxy> T constructNMSObject(Class<T> clazz, Object... params) throws ReflectiveOperationException {