PojavLauncherTeam/PojavLauncher_iOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forge 1.17+ support

Browse Source
This commit is contained in:
Duy Tran Khanh committed 2022-05-29 20:03:04 +07:00
1 parent 984647084b
commit 5d7c77d697
16 files changed
+146 -247
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
+18 -4
View File
@@ -6,6 +6,7 @@ import android.util.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.uikit.UIKit;
import net.kdt.pojavlaunch.utils.MCOptionUtils;
public class CallbackBridge {
public static final int CLIPBOARD_COPY = 2000;
@@ -36,7 +37,19 @@ public class CallbackBridge {
static {
System.load(System.getenv("BUNDLE_PATH") + "/PojavLauncher");
// Forge 1.17+ initialize their very own space (both Java and JNI) so we re-init stuff here
MCOptionUtils.load();
Tools.mGLFWWindowWidth = Integer.parseInt(MCOptionUtils.get("overrideWidth"));
Tools.mGLFWWindowHeight = Integer.parseInt(MCOptionUtils.get("overrideHeight"));
MCOptionUtils.save(); // Free the loaded data
CallbackBridge.setClass();
try {
Class.forName("net.kdt.pojavlaunch.uikit.UIKit");
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
INPUT_DEBUG_ENABLED = Boolean.parseBoolean(System.getProperty("glfwstub.debugInput", "false"));
}
@@ -184,8 +197,8 @@ public class CallbackBridge {
nativeSetGrabbing(grab, xset, yset);
}
// Called from native code
public static void receiveCallback(int type, float i1, float i2, int i3, int i4) {
// Called from native code
public static void receiveCallback(int type, float i1, float i2, int i3, int i4) {
/*
if (INPUT_DEBUG_ENABLED) {
System.out.println("LWJGL GLFW Callback received type=" + Integer.toString(type) + ", data=" + i1 + ", " + i2 + ", " + i3 + ", " + i4);
@@ -201,7 +214,7 @@ public class CallbackBridge {
PENDING_EVENT_LIST.add(new Object[]{type, (int)i1, (int)i2, i3, i4});
}
} // else System.out.println("Event input is not ready yet!");
}
}
// public static native void nativeSendData(boolean isAndroid, int type, String data);
public static boolean nativeSetInputReady(boolean ready) {
@@ -211,5 +224,6 @@ public class CallbackBridge {
public static native String nativeClipboard(int action, String copy);
private static native void nativeSetGrabbing(boolean grab, float xset, float yset);
public static native void setClass();
}
JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
+3 -10
View File
@@ -14,7 +14,6 @@ import javax.annotation.*;
import net.kdt.pojavlaunch.Tools;
import org.lwjgl.*;
import org.lwjgl.opengl.GL;
import org.lwjgl.system.*;
import static org.lwjgl.system.APIUtil.*;
@@ -508,9 +507,8 @@ public class GLFW
}
// Minecraft triggers a glfwPollEvents() on splash screen, so update window size there.
// TODO objc-rewrite: commented out for testing only
//CallbackBridge.receiveCallback(CallbackBridge.EVENT_TYPE_FRAMEBUFFER_SIZE, Tools.mGLFWWindowWidth, Tools.mGLFWWindowHeight, 0, 0);
//CallbackBridge.receiveCallback(CallbackBridge.EVENT_TYPE_WINDOW_SIZE, Tools.mGLFWWindowWidth, Tools.mGLFWWindowHeight, 0, 0);
CallbackBridge.receiveCallback(CallbackBridge.EVENT_TYPE_FRAMEBUFFER_SIZE, Tools.mGLFWWindowWidth, Tools.mGLFWWindowHeight, 0, 0);
CallbackBridge.receiveCallback(CallbackBridge.EVENT_TYPE_WINDOW_SIZE, Tools.mGLFWWindowWidth, Tools.mGLFWWindowHeight, 0, 0);
mGLFWErrorCallback = GLFWErrorCallback.createPrint();
mGLFWKeyCodes = new ArrayMap<>();
@@ -1060,12 +1058,7 @@ public class GLFW
// Indirect event
while (CallbackBridge.PENDING_EVENT_LIST.size() > 0) {
Object[] dataArr = CallbackBridge.PENDING_EVENT_LIST.remove(0);
if (dataArr == null) { // It should not be null, but still should be catched
// System.out.println("GLFW: popped callback is null, skipping");
continue;
}
for (Long ptr : mGLFWWindowMap.keySet()) {
switch ((int)dataArr[0]) {
case CallbackBridge.EVENT_TYPE_CHAR: