make Remapper accessing method static since itself is static

ZZZank · Apr 14, 2024 · d715b93 · d715b93
1 parent a599f4a
commit d715b93
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/common/src/main/java/dev/latvian/mods/rhino/Context.java b/common/src/main/java/dev/latvian/mods/rhino/Context.java
@@ -1982,7 +1982,7 @@ public static void setRemapper(Remapper remapper) {
 		ContextFactory.remapper = remapper;
 	}
 
-	public Remapper getRemapper() {
+	public static Remapper getRemapper() {
 		return ContextFactory.remapper;
 	}
 

diff --git a/common/src/main/java/dev/latvian/mods/rhino/JavaMembers.java b/common/src/main/java/dev/latvian/mods/rhino/JavaMembers.java
@@ -396,7 +396,7 @@ private void reflect(Context cx, Scriptable scope, boolean includeProtected, boo
 			int mods = method.getModifiers();
 			boolean isStatic = Modifier.isStatic(mods);
 			Map<String, Object> ht = isStatic ? staticMembers : members;
-			final String mappedMethod = cx.getRemapper().getMappedMethod(cl, method);
+			final String mappedMethod = Context.getRemapper().getMappedMethod(cl, method);
 			String name = mappedMethod.isEmpty()?method.getName():mappedMethod;
 
 			Object value = ht.get(name);
@@ -453,7 +453,7 @@ private void reflect(Context cx, Scriptable scope, boolean includeProtected, boo
 
 		// Reflect fields.
 		for (Field field : getAccessibleFields(includeProtected, includePrivate)) {
-			String mappedField = cx.getRemapper().getMappedField(cl, field);
+			String mappedField = Context.getRemapper().getMappedField(cl, field);
 			String name = mappedField.isEmpty() ? field.getName() : mappedField;
 
 			int mods = field.getModifiers();

diff --git a/common/src/main/java/dev/latvian/mods/rhino/NativeJSON.java b/common/src/main/java/dev/latvian/mods/rhino/NativeJSON.java
@@ -391,7 +391,7 @@ private static JsonElement stringify0(Context cx, Scriptable scope, Object v) {
 			}
 			type(fName, field.getType());
 			fName.append(' ');
-			String mappedField = cx.getRemapper().getMappedField(cl, field);
+			String mappedField = Context.getRemapper().getMappedField(cl, field);
 			if (mappedField.isEmpty()) {
 				fName.append(field.getName());
 			}else{
@@ -420,7 +420,7 @@ private static JsonElement stringify0(Context cx, Scriptable scope, Object v) {
 			type(builder, method.getReturnType());
 			builder.append(' ');
 
-			final String mappedMethod = cx.getRemapper().getMappedMethod(cl, method);
+			final String mappedMethod = Context.getRemapper().getMappedMethod(cl, method);
 			builder.append(mappedMethod.isEmpty()?method.getName():mappedMethod);
 
 			params(builder, method.getParameterTypes());