feat: expanded ClassProxies, now all fields and methods include classproxies to represent their parents (as well as parameters and return type for methods)

1 files changed, 22 insertions, 11 deletions

diff --git a/src/main/java/ftbsc/lll/proxies/AbstractProxy.java b/src/main/java/ftbsc/lll/proxies/AbstractProxy.java
index 4dd2a72..93eaec8 100644
--- a/src/main/java/ftbsc/lll/proxies/AbstractProxy.java
+++ b/src/main/java/ftbsc/lll/proxies/AbstractProxy.java
@@ -14,7 +14,6 @@ public abstract class AbstractProxy {
 	 */
 	public final String name;
 
-
 	/**
 	 * The {@link Type} corresponding to this element.
 	 */
@@ -24,7 +23,7 @@ public abstract class AbstractProxy {
 	 * The fully qualified name (i.e. java.lang.String) of
 	 * the parent class.
 	 */
-	public final String parent;
+	public final QualifiableProxy parent;
 
 	/**
 	 * The modifiers of the element, as a packed int.
@@ -39,7 +38,7 @@ public abstract class AbstractProxy {
 	 * @param modifiers the modifiers, as a packed int
 	 * @param parent the FQN of the parent class
 	 */
-	protected AbstractProxy(String name, Type type, int modifiers, String parent) {
+	protected AbstractProxy(String name, Type type, int modifiers, QualifiableProxy parent) {
 		this.name = name;
 		this.type = type;
 		this.modifiers = modifiers;
@@ -47,6 +46,22 @@ public abstract class AbstractProxy {
 	}
 
 	/**
+	 * Indicates whether the given object is a proxy for the same element as this.
+	 * @param obj the object to perform
+	 * @return true if it's equal
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if(obj instanceof AbstractProxy) {
+			AbstractProxy p = (AbstractProxy) obj;
+			return p.parent.equals(this.parent)
+				&& p.name.equals(this.name)
+				&& p.modifiers == this.modifiers
+				&& p.type.equals(this.type);
+		} else return false;
+	}
+
+	/**
 	 * A Builder for the generic proxy.
 	 * @param <T> the type of proxy
 	 */
@@ -65,7 +80,7 @@ public abstract class AbstractProxy {
 		/**
 		 * The fully qualified name of the parent.
 		 */
-		protected String parent;
+		protected QualifiableProxy parent;
 
 		/**
 		 * The {@link Type} corresponding to the element.
@@ -81,7 +96,6 @@ public abstract class AbstractProxy {
 			this.modifiers = 0;
 		}
 
-
 		/**
 		 * @param newModifier the modifier to add
 		 * @return the current state of the builder
@@ -101,11 +115,11 @@ public abstract class AbstractProxy {
 		}
 
 		/**
-		 * @param parentFQN the fully qualified name of the parent
+		 * @param parent the {@link QualifiableProxy} representing the parent
 		 * @return the current state of the builder
 		 */
-		public Builder<T> setParent(String parentFQN) {
-			this.parent = parentFQN;
+		public Builder<T> setParent(QualifiableProxy parent) {
+			this.parent = parent;
 			return this;
 		}
 
@@ -118,7 +132,6 @@ public abstract class AbstractProxy {
 			return this;
 		}
 
-
 		/**
 		 * Sets {@link Type} for this element from the descriptor, passed as a {@link String}.
 		 * @param descriptor the descriptor passed as a {@link String}
@@ -128,8 +141,6 @@ public abstract class AbstractProxy {
 			return this.setType(Type.getType(descriptor));
 		}
 
-
-
 		/**
 		 * @return the built proxy object
 		 */