Refactor variable names in MethodHandles reflection

CommandAPI · willkroboth · Nov 19, 2022 · Nov 19, 2022 · Nov 19, 2022 · Nov 20, 2022
commit e40d9bbf6e9b62e877e6d8cc578373f7eb689a7d
diff --git a/...1.15/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_15.java b/...1.15/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_15.java
@@ -17,7 +17,7 @@
 import java.nio.charset.StandardCharsets;
 
 public class ExceptionHandlingArgumentSerializer_1_15<T> implements ArgumentSerializer<ExceptionHandlingArgumentType<T>> {
-	private static final MethodHandle ArgumentRegistry_getInfo;
+	private static final MethodHandle getArgumentTypeInformation;
 
 	// Compute all var handles all in one go so we don't do this during main server runtime
 	static {
@@ -33,22 +33,22 @@ public class ExceptionHandlingArgumentSerializer_1_15<T> implements ArgumentSeri
 			e.printStackTrace();
 		}
 
-		MethodHandle ar_a = null;
+		MethodHandle argumentRegistryGet = null;
 		try {
-			ar_a = MethodHandles.privateLookupIn(ArgumentRegistry.class, MethodHandles.lookup())
+			argumentRegistryGet = MethodHandles.privateLookupIn(ArgumentRegistry.class, MethodHandles.lookup())
 				.findStatic(ArgumentRegistry.class, "a", MethodType.methodType(entryClass, ArgumentType.class));
 		} catch (ReflectiveOperationException e) {
 			e.printStackTrace();
 		}
-		ArgumentRegistry_getInfo = ar_a;
+		getArgumentTypeInformation = argumentRegistryGet;
 	}
 
 	@Override
 	// serializeToNetwork
 	public void a(ExceptionHandlingArgumentType<T> argument, PacketDataSerializer packetDataSerializer) {
 		try {
 			// Remove this key from packet
-			Object myInfo = ArgumentRegistry_getInfo.invoke(argument);
+			Object myInfo = getArgumentTypeInformation.invoke(argument);
 
 			// TODO: This Field reflection (and others in this class) acts on the class ArgumentRegistry.a. This inner
 			//  class is package-private, and the @RequireField annotation doesn't currently support that. We would like
@@ -61,7 +61,7 @@ public void a(ExceptionHandlingArgumentType<T> argument, PacketDataSerializer pa
 
 			// Add baseType key instead
 			ArgumentType<T> baseType = argument.baseType();
-			Object baseInfo = ArgumentRegistry_getInfo.invoke(argument);
+			Object baseInfo = getArgumentTypeInformation.invoke(argument);
 			String baseKey = keyField.get(baseInfo).toString();
 			packetDataSerializer.a(baseKey);
 
@@ -80,7 +80,7 @@ public void a(ExceptionHandlingArgumentType<T> argument, JsonObject properties)
 		try {
 			ArgumentType<T> baseType = argument.baseType();
 
-			Object baseInfo = ArgumentRegistry_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 
 			Field keyField = CommandAPIHandler.getField(baseInfo.getClass(), "c");
 			properties.addProperty("baseType", keyField.get(baseInfo).toString());

diff --git a/...1/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_16_R1.java b/...1/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_16_R1.java
@@ -17,7 +17,7 @@
 import java.nio.charset.StandardCharsets;
 
 public class ExceptionHandlingArgumentSerializer_1_16_R1<T> implements ArgumentSerializer<ExceptionHandlingArgumentType<T>> {
-	private static final MethodHandle ArgumentRegistry_getInfo;
+	private static final MethodHandle getArgumentTypeInformation;
 
 	// Compute all var handles all in one go so we don't do this during main server runtime
 	static {
@@ -33,21 +33,21 @@ public class ExceptionHandlingArgumentSerializer_1_16_R1<T> implements ArgumentS
 			e.printStackTrace();
 		}
 
-		MethodHandle ar_a = null;
+		MethodHandle argumentRegistryGet = null;
 		try {
-			ar_a = MethodHandles.privateLookupIn(ArgumentRegistry.class, MethodHandles.lookup())
+			argumentRegistryGet = MethodHandles.privateLookupIn(ArgumentRegistry.class, MethodHandles.lookup())
 				.findStatic(ArgumentRegistry.class, "a", MethodType.methodType(entryClass, ArgumentType.class));
 		} catch (ReflectiveOperationException e) {
 			e.printStackTrace();
 		}
-		ArgumentRegistry_getInfo = ar_a;
+		getArgumentTypeInformation = argumentRegistryGet;
 	}
 
 	@Override
 	// serializeToNetwork
 	public void a(ExceptionHandlingArgumentType<T> argument, PacketDataSerializer packetDataSerializer) {
 		try {
-			Object myInfo = ArgumentRegistry_getInfo.invoke(argument);
+			Object myInfo = getArgumentTypeInformation.invoke(argument);
 
 			// TODO: This Field reflection (and others in this class) acts on the class ArgumentRegistry.a. This inner
 			//  class is package-private, and the @RequireField annotation doesn't currently support that. We would like
@@ -60,7 +60,7 @@ public void a(ExceptionHandlingArgumentType<T> argument, PacketDataSerializer pa
 
 			// Add baseType key instead
 			ArgumentType<T> baseType = argument.baseType();
-			Object baseInfo = ArgumentRegistry_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 			String baseKey = keyField.get(baseInfo).toString();
 			packetDataSerializer.a(baseKey);
 
@@ -79,7 +79,7 @@ public void a(ExceptionHandlingArgumentType<T> argument, JsonObject properties)
 		try {
 			ArgumentType<T> baseType = argument.baseType();
 
-			Object baseInfo = ArgumentRegistry_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 
 			Field keyField = CommandAPIHandler.getField(baseInfo.getClass(), "c");
 			properties.addProperty("baseType", keyField.get(baseInfo).toString());

diff --git a/...2/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_16_R2.java b/...2/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_16_R2.java
@@ -19,7 +19,7 @@
 
 @Differs(from = {"1.15", "1.16.2"}, by = "Renamed ArgumentRegistry#a(ArgumentType) to ArgumentRegistry#b(ArgumentType)")
 public class ExceptionHandlingArgumentSerializer_1_16_R2<T> implements ArgumentSerializer<ExceptionHandlingArgumentType<T>> {
-	private static final MethodHandle ArgumentRegistry_getInfo;
+	private static final MethodHandle getArgumentTypeInformation;
 
 	// Compute all var handles all in one go so we don't do this during main server runtime
 	static {
@@ -35,14 +35,14 @@ public class ExceptionHandlingArgumentSerializer_1_16_R2<T> implements ArgumentS
 			e.printStackTrace();
 		}
 
-		MethodHandle ar_b = null;
+		MethodHandle argumentRegistryGet = null;
 		try {
-			ar_b = MethodHandles.privateLookupIn(ArgumentRegistry.class, MethodHandles.lookup())
+			argumentRegistryGet = MethodHandles.privateLookupIn(ArgumentRegistry.class, MethodHandles.lookup())
 				.findStatic(ArgumentRegistry.class, "b", MethodType.methodType(entryClass, ArgumentType.class));
 		} catch (ReflectiveOperationException e) {
 			e.printStackTrace();
 		}
-		ArgumentRegistry_getInfo = ar_b;
+		getArgumentTypeInformation = argumentRegistryGet;
 	}
 
 	@Override
@@ -51,7 +51,7 @@ public class ExceptionHandlingArgumentSerializer_1_16_R2<T> implements ArgumentS
 	public void a(ExceptionHandlingArgumentType<T> argument, PacketDataSerializer packetDataSerializer) {
 		try {
 			// Remove this key from packet
-			Object myInfo = ArgumentRegistry_getInfo.invoke(argument);
+			Object myInfo = getArgumentTypeInformation.invoke(argument);
 
 			// TODO: This Field reflection (and others in this class) acts on the class ArgumentRegistry.a. This inner
 			//  class is package-private, and the @RequireField annotation doesn't currently support that. We would like
@@ -64,7 +64,7 @@ public void a(ExceptionHandlingArgumentType<T> argument, PacketDataSerializer pa
 
 			// Add baseType key instead
 			ArgumentType<T> baseType = argument.baseType();
-			Object baseInfo = ArgumentRegistry_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 			String baseKey = keyField.get(baseInfo).toString();
 			packetDataSerializer.a(baseKey);
 
@@ -84,7 +84,7 @@ public void a(ExceptionHandlingArgumentType<T> argument, JsonObject properties)
 		try {
 			ArgumentType<T> baseType = argument.baseType();
 
-			Object baseInfo = ArgumentRegistry_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 
 			Field keyField = CommandAPIHandler.getField(baseInfo.getClass(), "c");
 			properties.addProperty("baseType", keyField.get(baseInfo).toString());

diff --git a/...src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_16_4_R3.java b/...src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_16_4_R3.java
@@ -17,7 +17,7 @@
 import java.nio.charset.StandardCharsets;
 
 public class ExceptionHandlingArgumentSerializer_1_16_4_R3<T> implements ArgumentSerializer<ExceptionHandlingArgumentType<T>> {
-	private static final MethodHandle ArgumentRegistry_getInfo;
+	private static final MethodHandle getArgumentTypeInformation;
 
 	// Compute all var handles all in one go so we don't do this during main server runtime
 	static {
@@ -33,22 +33,22 @@ public class ExceptionHandlingArgumentSerializer_1_16_4_R3<T> implements Argumen
 			e.printStackTrace();
 		}
 
-		MethodHandle ar_b = null;
+		MethodHandle argumentRegistryGet = null;
 		try {
-			ar_b = MethodHandles.privateLookupIn(ArgumentRegistry.class, MethodHandles.lookup())
+			argumentRegistryGet = MethodHandles.privateLookupIn(ArgumentRegistry.class, MethodHandles.lookup())
 				.findStatic(ArgumentRegistry.class, "b", MethodType.methodType(entryClass, ArgumentType.class));
 		} catch (ReflectiveOperationException e) {
 			e.printStackTrace();
 		}
-		ArgumentRegistry_getInfo = ar_b;
+		getArgumentTypeInformation = argumentRegistryGet;
 	}
 
 	@Override
 	// serializeToNetwork
 	public void a(ExceptionHandlingArgumentType<T> argument, PacketDataSerializer packetDataSerializer) {
 		try {
 			// Remove this key from packet
-			Object myInfo = ArgumentRegistry_getInfo.invoke(argument);
+			Object myInfo = getArgumentTypeInformation.invoke(argument);
 
 			// TODO: This Field reflection (and others in this class) acts on the class ArgumentRegistry.a. This inner
 			//  class is package-private, and the @RequireField annotation doesn't currently support that. We would like
@@ -61,7 +61,7 @@ public void a(ExceptionHandlingArgumentType<T> argument, PacketDataSerializer pa
 
 			// Add baseType key instead
 			ArgumentType<T> baseType = argument.baseType();
-			Object baseInfo = ArgumentRegistry_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 			String baseKey = keyField.get(baseInfo).toString();
 			packetDataSerializer.a(baseKey);
 
@@ -80,7 +80,7 @@ public void a(ExceptionHandlingArgumentType<T> argument, JsonObject properties)
 		try {
 			ArgumentType<T> baseType = argument.baseType();
 
-			Object baseInfo = ArgumentRegistry_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 
 			Field keyField = CommandAPIHandler.getField(baseInfo.getClass(), "c");
 			properties.addProperty("baseType", keyField.get(baseInfo).toString());

diff --git a/...c/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_17_Common.java b/...c/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_17_Common.java
@@ -17,7 +17,7 @@
 import java.nio.charset.StandardCharsets;
 
 public class ExceptionHandlingArgumentSerializer_1_17_Common<T> implements ArgumentSerializer<ExceptionHandlingArgumentType<T>> {
-	private static final MethodHandle ArgumentTypes_getInfo;
+	private static final MethodHandle getArgumentTypeInformation;
 
 	// Compute all var handles all in one go so we don't do this during main server runtime
 	static {
@@ -33,21 +33,21 @@ public class ExceptionHandlingArgumentSerializer_1_17_Common<T> implements Argum
 			e.printStackTrace();
 		}
 
-		MethodHandle ar_b = null;
+		MethodHandle argumentTypesGet = null;
 		try {
-			ar_b = MethodHandles.privateLookupIn(ArgumentTypes.class, MethodHandles.lookup())
+			argumentTypesGet = MethodHandles.privateLookupIn(ArgumentTypes.class, MethodHandles.lookup())
 				.findStatic(ArgumentTypes.class, "b", MethodType.methodType(entryClass, ArgumentType.class));
 		} catch (ReflectiveOperationException e) {
 			e.printStackTrace();
 		}
-		ArgumentTypes_getInfo = ar_b;
+		getArgumentTypeInformation = argumentTypesGet;
 	}
 
 	@Override
 	public void serializeToNetwork(ExceptionHandlingArgumentType<T> argument, FriendlyByteBuf friendlyByteBuf) {
 		try {
 			// Remove this key from packet
-			Object myInfo = ArgumentTypes_getInfo.invoke(argument);
+			Object myInfo = getArgumentTypeInformation.invoke(argument);
 
 			// TODO: This Field reflection (and others in this class) acts on the class ArgumentTypes.Entry. This inner
 			//  class is private, and the @RequireField annotation doesn't currently support that. We would like
@@ -60,7 +60,7 @@ public void serializeToNetwork(ExceptionHandlingArgumentType<T> argument, Friend
 
 			// Add baseType key instead
 			ArgumentType<T> baseType = argument.baseType();
-			Object baseInfo = ArgumentTypes_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 			String baseKey = keyField.get(baseInfo).toString();
 			friendlyByteBuf.writeUtf(baseKey);
 
@@ -78,7 +78,7 @@ public void serializeToJson(ExceptionHandlingArgumentType<T> argument, JsonObjec
 		try {
 			ArgumentType<T> baseType = argument.baseType();
 
-			Object baseInfo = ArgumentTypes_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 
 			Field keyField = CommandAPIHandler.getField(baseInfo.getClass(), "c");
 			properties.addProperty("baseType", keyField.get(baseInfo).toString());

diff --git a/...2/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_18_R2.java b/...2/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_18_R2.java
@@ -18,7 +18,7 @@
 import java.nio.charset.StandardCharsets;
 
 public class ExceptionHandlingArgumentSerializer_1_18_R2<T> implements ArgumentSerializer<ExceptionHandlingArgumentType<T>> {
-	private static final MethodHandle ArgumentTypes_getInfo;
+	private static final MethodHandle getArgumentTypeInformation;
 
 	// Compute all var handles all in one go so we don't do this during main server runtime
 	static {
@@ -34,14 +34,14 @@ public class ExceptionHandlingArgumentSerializer_1_18_R2<T> implements ArgumentS
 			e.printStackTrace();
 		}
 
-		MethodHandle ar_b = null;
+		MethodHandle argumentTypesGet = null;
 		try {
-			ar_b = MethodHandles.privateLookupIn(ArgumentTypes.class, MethodHandles.lookup())
+			argumentTypesGet = MethodHandles.privateLookupIn(ArgumentTypes.class, MethodHandles.lookup())
 				.findStatic(ArgumentTypes.class, "b", MethodType.methodType(entryClass, ArgumentType.class));
 		} catch (ReflectiveOperationException e) {
 			e.printStackTrace();
 		}
-		ArgumentTypes_getInfo = ar_b;
+		getArgumentTypeInformation = argumentTypesGet;
 	}
 
 	@Override
@@ -50,7 +50,7 @@ public class ExceptionHandlingArgumentSerializer_1_18_R2<T> implements ArgumentS
 	public void serializeToNetwork(ExceptionHandlingArgumentType<T> argument, FriendlyByteBuf friendlyByteBuf) {
 		try {
 			// Remove this key from packet
-			Object myInfo = ArgumentTypes_getInfo.invoke(argument);
+			Object myInfo = getArgumentTypeInformation.invoke(argument);
 
 			// TODO: This Field reflection (and others in this class) acts on the class ArgumentTypes.Entry. This inner
 			//  class is private, and the @RequireField annotation doesn't currently support that. We would like
@@ -63,7 +63,7 @@ public void serializeToNetwork(ExceptionHandlingArgumentType<T> argument, Friend
 
 			// Add baseType key instead
 			ArgumentType<T> baseType = argument.baseType();
-			Object baseInfo = ArgumentTypes_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 			String baseKey = keyField.get(baseInfo).toString();
 			friendlyByteBuf.writeUtf(baseKey);
 
@@ -83,7 +83,7 @@ public void serializeToJson(ExceptionHandlingArgumentType<T> argument, JsonObjec
 		try {
 			ArgumentType<T> baseType = argument.baseType();
 
-			Object baseInfo = ArgumentTypes_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
1241
 			Field keyField = CommandAPIHandler.getField(baseInfo.getClass(), "b");
 			properties.addProperty("baseType", keyField.get(baseInfo).toString());

diff --git a/...8/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_18_R1.java b/...8/src/main/java/dev/jorel/commandapi/nms/ExceptionHandlingArgumentSerializer_1_18_R1.java
@@ -17,7 +17,7 @@
 import java.nio.charset.StandardCharsets;
 
 public class ExceptionHandlingArgumentSerializer_1_18_R1<T> implements ArgumentSerializer<ExceptionHandlingArgumentType<T>> {
-	private static final MethodHandle ArgumentTypes_getInfo;
+	private static final MethodHandle getArgumentTypeInformation;
 
 	// Compute all var handles all in one go so we don't do this during main server runtime
 	static {
@@ -33,21 +33,21 @@ public class ExceptionHandlingArgumentSerializer_1_18_R1<T> implements ArgumentS
 			e.printStackTrace();
 		}
 
-		MethodHandle at_b = null;
+		MethodHandle argumentTypesGet = null;
 		try {
-			at_b = MethodHandles.privateLookupIn(ArgumentTypes.class, MethodHandles.lookup())
+			argumentTypesGet = MethodHandles.privateLookupIn(ArgumentTypes.class, MethodHandles.lookup())
 				.findStatic(ArgumentTypes.class, "b", MethodType.methodType(entryClass, ArgumentType.class));
 		} catch (ReflectiveOperationException e) {
 			e.printStackTrace();
 		}
-		ArgumentTypes_getInfo = at_b;
+		getArgumentTypeInformation = argumentTypesGet;
 	}
 
 	@Override
 	public void serializeToNetwork(ExceptionHandlingArgumentType<T> argument, FriendlyByteBuf friendlyByteBuf) {
 		try {
 			// Remove this key from packet
-			Object myInfo = ArgumentTypes_getInfo.invoke(argument);
+			Object myInfo = getArgumentTypeInformation.invoke(argument);
 
 			// TODO: This Field reflection (and others in this class) acts on the class ArgumentTypes.Entry. This inner
 			//  class is private, and the @RequireField annotation doesn't currently support that. We would like
@@ -60,7 +60,7 @@ public void serializeToNetwork(ExceptionHandlingArgumentType<T> argument, Friend
 
 			// Add baseType key instead
 			ArgumentType<T> baseType = argument.baseType();
-			Object baseInfo = ArgumentTypes_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 			String baseKey = keyField.get(baseInfo).toString();
 			friendlyByteBuf.writeUtf(baseKey);
 
@@ -78,7 +78,7 @@ public void serializeToJson(ExceptionHandlingArgumentType<T> argument, JsonObjec
 		try {
 			ArgumentType<T> baseType = argument.baseType();
 
-			Object baseInfo = ArgumentTypes_getInfo.invoke(baseType);
+			Object baseInfo = getArgumentTypeInformation.invoke(baseType);
 
 			Field keyField = CommandAPIHandler.getField(baseInfo.getClass(), "c");
 			properties.addProperty("baseType", keyField.get(baseInfo).toString());