Use field names instead of value ids for ValueAccessor

If multiple fields had the same id, but different parents, they would all have the same value.
This uses field name to retrieve getter/setter lambda functions rather than label id to prevent conflict.

Author: ZeroMemes

src/main/java/clientapi/load/transform/impl/ValueAccessorTransformer.java

@@ -83,11 +83,7 @@ public final void transform(ClassNode cn) {
                 if (!an.desc.equals("Lclientapi/util/annotation/Label;"))
                     continue;
 
-                for (int i = 0; i < an.values.size(); i++) {
-                    if (i % 2 == 0 && an.values.get(i).equals("id")) {
-                        fieldCache.put(an.values.get(i + 1).toString(), fn);
-                    }
-                }
+                fieldCache.put(fn.name, fn);
             }
         }
 
@@ -135,7 +131,7 @@ private void createFieldGetter(ClassNode cn) {
             // Create label for IF statement jump
             Label skip = new Label();
 
-            // Compare the target value with the expected valu
+            // Compare the target value with the expected value
             mn.visitVarInsn(ALOAD, 1);
             mn.visitLdcInsn(id);
             mn.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "equals", "(Ljava/lang/Object;)Z", false);

src/main/java/clientapi/value/Value.java

@@ -105,8 +105,8 @@ public Value(String name, String parent, String id, String description, Object o
 
         // Accessor
         this.direct = object instanceof ValueAccessor;
-        this.setter = direct ? ((ValueAccessor) object).getFieldSetter(id) : null;
-        this.getter = direct ? ((ValueAccessor) object).getFieldGetter(id) : null;
+        this.setter = direct ? ((ValueAccessor) object).getFieldSetter(field.getName()) : null;
+        this.getter = direct ? ((ValueAccessor) object).getFieldGetter(field.getName()) : null;
     }
 
     @Override

src/main/java/clientapi/value/holder/ValueAccessor.java

@@ -35,19 +35,19 @@ public interface ValueAccessor {
 
     /**
      * Returns a supplier that can be used to get
-     * the value of the target field. (By id)
+     * the value of the target field. (By field name)
      *
-     * @param id The ID of the field
+     * @param field The name of the field
      * @return The supplier "getter"
      */
-    Supplier<Object> getFieldGetter(String id);
+    Supplier<Object> getFieldGetter(String field);
 
     /**
      * Returns a consumer that can be used to set the
-     * value of the target field. (By id)
+     * value of the target field. (By field name)
      *
-     * @param id The ID of the field
+     * @param field The name of the field
      * @return The consumer "setter"
      */
-    Consumer<Object> getFieldSetter(String id);
+    Consumer<Object> getFieldSetter(String field);
 }