Skip to content

refactor(GLConstants): leverage Optional java class #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiroZDP wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(GLConstants): leverage Optional java class #249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 15 additions & 28 deletions src/main/java/org/mcphackers/mcp/tools/injector/GLConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package org.mcphackers.mcp.tools.injector;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.io.InputStream;
import java.util.*;
import java.util.Map.Entry;

import org.json.JSONArray;
Expand All @@ -15,14 +11,7 @@
import org.mcphackers.rdi.util.IdentifyCall;
import org.mcphackers.rdi.util.Pair;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.FieldInsnNode;
import org.objectweb.asm.tree.InsnList;
import org.objectweb.asm.tree.InsnNode;
import org.objectweb.asm.tree.IntInsnNode;
import org.objectweb.asm.tree.LdcInsnNode;
import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.*;

public final class GLConstants extends ClassVisitor {

Expand All @@ -33,18 +22,14 @@ public final class GLConstants extends ClassVisitor {
private static final char[] OPERATORS = {'|', '&', '^'};

static {
JSONObject json = JSONUtil.getJSON(GLConstants.class.getClassLoader().getResourceAsStream("gl_constants.json"));
if (json != null) {
CONSTANTS = getConstants(json.optJSONArray("CONSTANTS"));
CONSTANTS_KEYBOARD = JSONUtil.toMap(json.optJSONObject("CONSTANTS_KEYBOARD"));
PACKAGES = getPackages(CONSTANTS);
INIT = true;
} else {
CONSTANTS = null;
CONSTANTS_KEYBOARD = null;
PACKAGES = null;
INIT = false;
}
final Optional<InputStream> jsonStream = Optional
.ofNullable(GLConstants.class.getClassLoader().getResourceAsStream("gl_constants.json"));

final Optional<JSONObject> json = Optional.ofNullable(JSONUtil.getJSON(jsonStream.get()));
CONSTANTS = json.map(js -> getConstants(js.optJSONArray("CONSTANTS"))).orElse(null);
CONSTANTS_KEYBOARD = json.map(js -> JSONUtil.toMap(js.optJSONObject("CONSTANTS_KEYBOARD"))).orElse(null);
PACKAGES = json.map(js -> getPackages(CONSTANTS)).orElse(null);
INIT = json.isPresent();
}

public GLConstants(ClassVisitor classVisitor) {
Expand Down Expand Up @@ -99,8 +84,10 @@ public static Integer intValue(AbstractInsnNode insn) {
}

public static FieldInsnNode getKeyboardInsn(int constant) {
String constantString = CONSTANTS_KEYBOARD.get(constant);
return constantString == null ? null : new FieldInsnNode(Opcodes.GETSTATIC, "org/lwjgl/input/Keyboard", constantString, "I");
final Optional<String> constantString = Optional.ofNullable(CONSTANTS_KEYBOARD.get(constant));
return constantString
.map(str -> new FieldInsnNode(Opcodes.GETSTATIC, "org/lwjgl/input/Keyboard", str, "I"))
.orElse(null);
}

public static InsnList getGLInsn(MethodInsnNode invoke, int constant) {
Expand Down
Loading