diff --git a/.gitignore b/.gitignore index 55ab2ccd..5e324446 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /artifacts /JavaApp/.gradle /JavaApp/build -/JavaApp/local_out /Natives/PojavLauncher /Natives/build .DS_Store diff --git a/JavaApp/Makefile b/JavaApp/Makefile new file mode 100644 index 00000000..62eed400 --- /dev/null +++ b/JavaApp/Makefile @@ -0,0 +1,39 @@ +# Prerequisite variables +SOURCEDIR := src +OUTPUTDIR := build +SOURCES := $(shell find $(SOURCEDIR) -type f -name '*.java') +CLASSES := $(SOURCES:$(SOURCEDIR)/%.java=$(OUTPUTDIR)/%.class) + +# Add all jars to classpath and allow compiling with private API +JCFLAGS := -cp "$(subst $() $(),:,$(wildcard $(SOURCEDIR)/*/):$(wildcard libs/*/*.jar))" -XDignore.symbol.file + +all: $(OUTPUTDIR)/launcher.jar $(OUTPUTDIR)/lwjgl.jar + +# Rules for building java class +$(CLASSES): $(OUTPUTDIR)/%.class: $(SOURCEDIR)/%.java + @set -e + $(eval TARGET=$(word 2, $(subst /, ,$@))) + @mkdir -p $(OUTPUTDIR)/classes + @mkdir -p $(dir $@) + @echo "Compiling $<" + @$(BOOTJDK)/javac $(JCFLAGS) -d $(OUTPUTDIR)/classes $< + @cp $(@:$(OUTPUTDIR)/$(TARGET)/%.class=$(OUTPUTDIR)/classes/%*.class) $(dir $@)/ + +$(OUTPUTDIR)/launcher.jar: $(CLASSES) + @set -e + @echo "Creating $@" + $(BOOTJDK)/jar -cf $@ -C $(basename $@) . + +$(OUTPUTDIR)/lwjgl.jar: $(CLASSES) + @set -e + @echo "Creating $@" + @mkdir -p $(OUTPUTDIR)/lwjgl_lib + @cd $(OUTPUTDIR)/lwjgl_lib && find ../../libs/lwjgl -name 'lwjgl*.jar' -exec $(BOOTJDK)/jar -xf {} \; && rm -rf META-INF + @cp -R $(OUTPUTDIR)/lwjgl/* $(OUTPUTDIR)/lwjgl_lib/ + @$(BOOTJDK)/jar -cf $@ -C $(OUTPUTDIR)/lwjgl_lib . + +clean: + rm -rf $(OUTPUTDIR) + +.SUFFIXES: .java +.PHONY: all clean diff --git a/JavaApp/libs_caciocavallo/ResConfHack.jar b/JavaApp/libs/caciocavallo/ResConfHack.jar similarity index 100% rename from JavaApp/libs_caciocavallo/ResConfHack.jar rename to JavaApp/libs/caciocavallo/ResConfHack.jar diff --git a/JavaApp/libs_caciocavallo/cacio-androidnw-1.10-SNAPSHOT.jar b/JavaApp/libs/caciocavallo/cacio-androidnw-1.10-SNAPSHOT.jar similarity index 100% rename from JavaApp/libs_caciocavallo/cacio-androidnw-1.10-SNAPSHOT.jar rename to JavaApp/libs/caciocavallo/cacio-androidnw-1.10-SNAPSHOT.jar diff --git a/JavaApp/libs_caciocavallo/cacio-shared-1.10-SNAPSHOT.jar b/JavaApp/libs/caciocavallo/cacio-shared-1.10-SNAPSHOT.jar similarity index 100% rename from JavaApp/libs_caciocavallo/cacio-shared-1.10-SNAPSHOT.jar rename to JavaApp/libs/caciocavallo/cacio-shared-1.10-SNAPSHOT.jar diff --git a/JavaApp/libs_caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar b/JavaApp/libs/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar similarity index 100% rename from JavaApp/libs_caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar rename to JavaApp/libs/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar diff --git a/JavaApp/libs_caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar b/JavaApp/libs/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar similarity index 100% rename from JavaApp/libs_caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar rename to JavaApp/libs/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-freetype.jar b/JavaApp/libs/lwjgl/lwjgl-freetype.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-freetype.jar rename to JavaApp/libs/lwjgl/lwjgl-freetype.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-glfw.jar b/JavaApp/libs/lwjgl/lwjgl-glfw.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-glfw.jar rename to JavaApp/libs/lwjgl/lwjgl-glfw.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-lwjglx.jar b/JavaApp/libs/lwjgl/lwjgl-lwjglx.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-lwjglx.jar rename to JavaApp/libs/lwjgl/lwjgl-lwjglx.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-nanovg.jar b/JavaApp/libs/lwjgl/lwjgl-nanovg.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-nanovg.jar rename to JavaApp/libs/lwjgl/lwjgl-nanovg.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-openal.jar b/JavaApp/libs/lwjgl/lwjgl-openal.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-openal.jar rename to JavaApp/libs/lwjgl/lwjgl-openal.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-opengl.jar b/JavaApp/libs/lwjgl/lwjgl-opengl.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-opengl.jar rename to JavaApp/libs/lwjgl/lwjgl-opengl.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-shaderc.jar b/JavaApp/libs/lwjgl/lwjgl-shaderc.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-shaderc.jar rename to JavaApp/libs/lwjgl/lwjgl-shaderc.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-stb.jar b/JavaApp/libs/lwjgl/lwjgl-stb.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-stb.jar rename to JavaApp/libs/lwjgl/lwjgl-stb.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-tinyfd.jar b/JavaApp/libs/lwjgl/lwjgl-tinyfd.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-tinyfd.jar rename to JavaApp/libs/lwjgl/lwjgl-tinyfd.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-vma.jar b/JavaApp/libs/lwjgl/lwjgl-vma.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-vma.jar rename to JavaApp/libs/lwjgl/lwjgl-vma.jar diff --git a/JavaApp/libs_lwjgl/lwjgl-vulkan.jar b/JavaApp/libs/lwjgl/lwjgl-vulkan.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl-vulkan.jar rename to JavaApp/libs/lwjgl/lwjgl-vulkan.jar diff --git a/JavaApp/libs_lwjgl/lwjgl.jar b/JavaApp/libs/lwjgl/lwjgl.jar similarity index 100% rename from JavaApp/libs_lwjgl/lwjgl.jar rename to JavaApp/libs/lwjgl/lwjgl.jar diff --git a/JavaApp/libs/arc_dns_injector.jar b/JavaApp/libs/others/arc_dns_injector.jar similarity index 100% rename from JavaApp/libs/arc_dns_injector.jar rename to JavaApp/libs/others/arc_dns_injector.jar diff --git a/JavaApp/libs/gson-2.10.1.jar b/JavaApp/libs/others/gson-2.10.1.jar similarity index 100% rename from JavaApp/libs/gson-2.10.1.jar rename to JavaApp/libs/others/gson-2.10.1.jar diff --git a/JavaApp/libs/jsr305.jar b/JavaApp/libs/others/jsr305.jar similarity index 100% rename from JavaApp/libs/jsr305.jar rename to JavaApp/libs/others/jsr305.jar diff --git a/JavaApp/src/main/java/android/util/ArrayMap.java b/JavaApp/src/launcher/android/util/ArrayMap.java similarity index 100% rename from JavaApp/src/main/java/android/util/ArrayMap.java rename to JavaApp/src/launcher/android/util/ArrayMap.java diff --git a/JavaApp/src/main/java/android/util/ContainerHelpers.java b/JavaApp/src/launcher/android/util/ContainerHelpers.java similarity index 100% rename from JavaApp/src/main/java/android/util/ContainerHelpers.java rename to JavaApp/src/launcher/android/util/ContainerHelpers.java diff --git a/JavaApp/src/main/java/android/util/EmptyArray.java b/JavaApp/src/launcher/android/util/EmptyArray.java similarity index 100% rename from JavaApp/src/main/java/android/util/EmptyArray.java rename to JavaApp/src/launcher/android/util/EmptyArray.java diff --git a/JavaApp/src/main/java/android/util/MapCollections.java b/JavaApp/src/launcher/android/util/MapCollections.java similarity index 100% rename from JavaApp/src/main/java/android/util/MapCollections.java rename to JavaApp/src/launcher/android/util/MapCollections.java diff --git a/JavaApp/src/main/java/android/util/Objects.java b/JavaApp/src/launcher/android/util/Objects.java similarity index 100% rename from JavaApp/src/main/java/android/util/Objects.java rename to JavaApp/src/launcher/android/util/Objects.java diff --git a/JavaApp/src/main/java/com/mojang/text2speech/Narrator.java b/JavaApp/src/launcher/com/mojang/text2speech/Narrator.java similarity index 100% rename from JavaApp/src/main/java/com/mojang/text2speech/Narrator.java rename to JavaApp/src/launcher/com/mojang/text2speech/Narrator.java diff --git a/JavaApp/src/main/java/com/mojang/text2speech/NarratorDummy.java b/JavaApp/src/launcher/com/mojang/text2speech/NarratorDummy.java similarity index 100% rename from JavaApp/src/main/java/com/mojang/text2speech/NarratorDummy.java rename to JavaApp/src/launcher/com/mojang/text2speech/NarratorDummy.java diff --git a/JavaApp/src/main/java/com/mojang/text2speech/NarratorLinux.java b/JavaApp/src/launcher/com/mojang/text2speech/NarratorLinux.java similarity index 100% rename from JavaApp/src/main/java/com/mojang/text2speech/NarratorLinux.java rename to JavaApp/src/launcher/com/mojang/text2speech/NarratorLinux.java diff --git a/JavaApp/src/main/java/com/mojang/text2speech/NarratorOSX.java b/JavaApp/src/launcher/com/mojang/text2speech/NarratorOSX.java similarity index 100% rename from JavaApp/src/main/java/com/mojang/text2speech/NarratorOSX.java rename to JavaApp/src/launcher/com/mojang/text2speech/NarratorOSX.java diff --git a/JavaApp/src/main/java/com/mojang/text2speech/NarratorWindows.java b/JavaApp/src/launcher/com/mojang/text2speech/NarratorWindows.java similarity index 100% rename from JavaApp/src/main/java/com/mojang/text2speech/NarratorWindows.java rename to JavaApp/src/launcher/com/mojang/text2speech/NarratorWindows.java diff --git a/JavaApp/src/main/java/com/mojang/text2speech/Text2Speech.java b/JavaApp/src/launcher/com/mojang/text2speech/Text2Speech.java similarity index 100% rename from JavaApp/src/main/java/com/mojang/text2speech/Text2Speech.java rename to JavaApp/src/launcher/com/mojang/text2speech/Text2Speech.java diff --git a/JavaApp/src/main/java/com/sun/jna/Platform.java b/JavaApp/src/launcher/com/sun/jna/Platform.java similarity index 100% rename from JavaApp/src/main/java/com/sun/jna/Platform.java rename to JavaApp/src/launcher/com/sun/jna/Platform.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/JAssetInfo.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/JAssetInfo.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/JAssets.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/JAssets.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/JAssets.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/JAssets.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/JMinecraftVersionList.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/JMinecraftVersionList.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/JVersion.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/JVersion.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/JVersion.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/JVersion.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/PojavClassLoader.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/PojavClassLoader.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/PojavClassLoader.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/PojavClassLoader.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/PojavLauncher.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/PojavLauncher.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/PojavLauncher.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/PojavLauncher.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/Tools.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/Tools.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/uikit/UIKit.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/uikit/UIKit.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKitCallback.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/uikit/UIKitCallback.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKitCallback.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/uikit/UIKitCallback.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/utils/JSONUtils.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/utils/JSONUtils.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/utils/MCOptionUtils.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/utils/MCOptionUtils.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/DependentLibrary.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/DependentLibrary.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/ForgeInstallProfile.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/ForgeInstallProfile.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/MinecraftAccount.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/MinecraftAccount.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/MinecraftClientInfo.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/MinecraftClientInfo.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java b/JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java similarity index 100% rename from JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java rename to JavaApp/src/launcher/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/JavaApp/src/lwjgl/org/lwjgl/glfw/CallbackBridge.java similarity index 100% rename from JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java rename to JavaApp/src/lwjgl/org/lwjgl/glfw/CallbackBridge.java diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/Callbacks.java b/JavaApp/src/lwjgl/org/lwjgl/glfw/Callbacks.java similarity index 100% rename from JavaApp/src/main/java/org/lwjgl/glfw/Callbacks.java rename to JavaApp/src/lwjgl/org/lwjgl/glfw/Callbacks.java diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java b/JavaApp/src/lwjgl/org/lwjgl/glfw/GLFW.java similarity index 99% rename from JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java rename to JavaApp/src/lwjgl/org/lwjgl/glfw/GLFW.java index 7dc55e64..39f4781a 100644 --- a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java +++ b/JavaApp/src/lwjgl/org/lwjgl/glfw/GLFW.java @@ -815,6 +815,11 @@ public class GLFW return invokeP(__functionAddress); } + public static void nglfwGetFramebufferSize(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("int *") long width, @Nullable @NativeType("int *") long height) { + memPutInt(width, internalGetWindow(window).width); + memPutInt(height, internalGetWindow(window).height); + } + public static void glfwGetFramebufferSize(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("int *") IntBuffer width, @Nullable @NativeType("int *") IntBuffer height) { if (CHECKS) { checkSafe(width, 1); diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFWNativeCocoa.java b/JavaApp/src/lwjgl/org/lwjgl/glfw/GLFWNativeCocoa.java similarity index 100% rename from JavaApp/src/main/java/org/lwjgl/glfw/GLFWNativeCocoa.java rename to JavaApp/src/lwjgl/org/lwjgl/glfw/GLFWNativeCocoa.java diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFWNativeEGL.java b/JavaApp/src/lwjgl/org/lwjgl/glfw/GLFWNativeEGL.java similarity index 100% rename from JavaApp/src/main/java/org/lwjgl/glfw/GLFWNativeEGL.java rename to JavaApp/src/lwjgl/org/lwjgl/glfw/GLFWNativeEGL.java diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFWVulkan.java b/JavaApp/src/lwjgl/org/lwjgl/glfw/GLFWVulkan.java similarity index 100% rename from JavaApp/src/main/java/org/lwjgl/glfw/GLFWVulkan.java rename to JavaApp/src/lwjgl/org/lwjgl/glfw/GLFWVulkan.java diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFWWindowProperties.java b/JavaApp/src/lwjgl/org/lwjgl/glfw/GLFWWindowProperties.java similarity index 100% rename from JavaApp/src/main/java/org/lwjgl/glfw/GLFWWindowProperties.java rename to JavaApp/src/lwjgl/org/lwjgl/glfw/GLFWWindowProperties.java diff --git a/JavaApp/src/main/java/org/lwjgl/input/InfdevMouse.java b/JavaApp/src/lwjgl/org/lwjgl/input/InfdevMouse.java similarity index 100% rename from JavaApp/src/main/java/org/lwjgl/input/InfdevMouse.java rename to JavaApp/src/lwjgl/org/lwjgl/input/InfdevMouse.java diff --git a/Makefile b/Makefile index fb09b7d7..50312150 100644 --- a/Makefile +++ b/Makefile @@ -268,18 +268,7 @@ native: java: echo '[PojavLauncher v$(VERSION)] java - start' - cd $(SOURCEDIR)/JavaApp; \ - rm -rf local_out/lwjgl; \ - mkdir -p local_out/{classes,lwjgl}; \ - $(BOOTJDK)/javac -cp "libs/*:libs_lwjgl/*:libs_caciocavallo/*" -d local_out/classes $$(find src -type f -name "*.java" -print) -XDignore.symbol.file || exit 1; \ - cd local_out/classes; \ - $(BOOTJDK)/jar -cf ../launcher.jar android com net || exit 1; \ - cp $(SOURCEDIR)/JavaApp/libs_lwjgl/lwjgl.jar .. || exit 1; \ - cd ../lwjgl; \ - find $(SOURCEDIR)/JavaApp/libs_lwjgl -name 'lwjgl-*.jar' -exec $(BOOTJDK)/jar -xf {} \; || exit 1; \ - rm -rf META-INF; \ - cp -R ../classes/org ./; \ - $(BOOTJDK)/jar -uf ../lwjgl.jar . || exit 1; + $(MAKE) -C JavaApp -j$(JOBS) echo '[PojavLauncher v$(VERSION)] java - end' jre: native @@ -326,9 +315,9 @@ payload: native java jre assets cp -R $(SOURCEDIR)/Natives/resources/en.lproj/LaunchScreen.storyboardc $(WORKINGDIR)/PojavLauncher.app/Base.lproj/ || exit 1 cp -R $(SOURCEDIR)/Natives/resources/* $(WORKINGDIR)/PojavLauncher.app/ || exit 1 cp $(WORKINGDIR)/*.dylib $(WORKINGDIR)/PojavLauncher.app/Frameworks/ || exit 1 - cp -R $(SOURCEDIR)/JavaApp/libs/* $(WORKINGDIR)/PojavLauncher.app/libs/ || exit 1 - cp $(SOURCEDIR)/JavaApp/local_out/*.jar $(WORKINGDIR)/PojavLauncher.app/libs/ || exit 1 - cp -R $(SOURCEDIR)/JavaApp/libs_caciocavallo* $(WORKINGDIR)/PojavLauncher.app/ || exit 1 + cp -R $(SOURCEDIR)/JavaApp/libs/others/* $(WORKINGDIR)/PojavLauncher.app/libs/ || exit 1 + cp $(SOURCEDIR)/JavaApp/build/*.jar $(WORKINGDIR)/PojavLauncher.app/libs/ || exit 1 + cp -R $(SOURCEDIR)/JavaApp/libs/caciocavallo* $(WORKINGDIR)/PojavLauncher.app/ || exit 1 $(call METHOD_DIRCHECK,$(OUTPUTDIR)/Payload) cp -R $(WORKINGDIR)/PojavLauncher.app $(OUTPUTDIR)/Payload if [ '$(SLIMMED_ONLY)' != '1' ]; then \ @@ -355,7 +344,7 @@ deploy: ldid -S$(SOURCEDIR)/entitlements.trollstore.xml $(WORKINGDIR)/PojavLauncher.app/PojavLauncher || exit 1; \ sudo mv $(WORKINGDIR)/*.dylib $(PREFIX)Applications/PojavLauncher.app/Frameworks/ || exit 1; \ sudo mv $(WORKINGDIR)/PojavLauncher.app/PojavLauncher $(PREFIX)Applications/PojavLauncher.app/PojavLauncher || exit 1; \ - sudo mv $(SOURCEDIR)/JavaApp/local_out/*.jar $(PREFIX)Applications/PojavLauncher.app/libs/ || exit 1; \ + sudo mv $(SOURCEDIR)/JavaApp/build/*.jar $(PREFIX)Applications/PojavLauncher.app/libs/ || exit 1; \ cd $(PREFIX)Applications/PojavLauncher.app/Frameworks || exit 1; \ sudo chown -R 501:501 $(PREFIX)Applications/PojavLauncher.app/* || exit 1; \ elif [ '$(IOS)' = '0' ] && [ '$(DETECTPLAT)' = 'Darwin' ]; then \ @@ -408,4 +397,6 @@ clean: rm -rf $(OUTPUTDIR) echo '[PojavLauncher v$(VERSION)] clean - end' + + .PHONY: all clean check native java jre package dsym deploy help