diff --git a/JavaApp/ .gitignore b/JavaApp/ .gitignore new file mode 100644 index 00000000..9dec6f85 --- /dev/null +++ b/JavaApp/ .gitignore @@ -0,0 +1,22 @@ +robovm-logs/ +robovm-build/ + +## Java + +*.class +*.war +*.ear +hs_err_pid* + +## Gradle +.gradle/ +/build +**/build + +## Idea +.idea/ +*.ipr +*.iws +*.iml + +.DS_STORE \ No newline at end of file diff --git a/build.gradle b/JavaApp/build.gradle similarity index 100% rename from build.gradle rename to JavaApp/build.gradle diff --git a/gradle.properties b/JavaApp/gradle.properties similarity index 100% rename from gradle.properties rename to JavaApp/gradle.properties diff --git a/gradle/wrapper/gradle-wrapper.jar b/JavaApp/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle/wrapper/gradle-wrapper.jar rename to JavaApp/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/JavaApp/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle/wrapper/gradle-wrapper.properties rename to JavaApp/gradle/wrapper/gradle-wrapper.properties diff --git a/gradlew b/JavaApp/gradlew similarity index 100% rename from gradlew rename to JavaApp/gradlew diff --git a/gradlew.bat b/JavaApp/gradlew.bat similarity index 100% rename from gradlew.bat rename to JavaApp/gradlew.bat diff --git a/libs/ExagearApacheCommons.jar b/JavaApp/libs/ExagearApacheCommons.jar similarity index 100% rename from libs/ExagearApacheCommons.jar rename to JavaApp/libs/ExagearApacheCommons.jar diff --git a/libs/compat-1.0.0.jar b/JavaApp/libs/compat-1.0.0.jar similarity index 100% rename from libs/compat-1.0.0.jar rename to JavaApp/libs/compat-1.0.0.jar diff --git a/libs/javafx-mx.jar b/JavaApp/libs/javafx-mx.jar similarity index 100% rename from libs/javafx-mx.jar rename to JavaApp/libs/javafx-mx.jar diff --git a/libs/jfxrt.jar b/JavaApp/libs/jfxrt.jar similarity index 100% rename from libs/jfxrt.jar rename to JavaApp/libs/jfxrt.jar diff --git a/libs/jfxswt.jar b/JavaApp/libs/jfxswt.jar similarity index 100% rename from libs/jfxswt.jar rename to JavaApp/libs/jfxswt.jar diff --git a/libs/jsr305-1.0.jar b/JavaApp/libs/jsr305-1.0.jar similarity index 100% rename from libs/jsr305-1.0.jar rename to JavaApp/libs/jsr305-1.0.jar diff --git a/libs/sfntly-1.0.0.jar b/JavaApp/libs/sfntly-1.0.0.jar similarity index 100% rename from libs/sfntly-1.0.0.jar rename to JavaApp/libs/sfntly-1.0.0.jar diff --git a/robovm.properties b/JavaApp/robovm.properties similarity index 100% rename from robovm.properties rename to JavaApp/robovm.properties diff --git a/robovm.xml b/JavaApp/robovm.xml similarity index 100% rename from robovm.xml rename to JavaApp/robovm.xml diff --git a/settings.gradle b/JavaApp/settings.gradle similarity index 100% rename from settings.gradle rename to JavaApp/settings.gradle diff --git a/src/main/java/android/util/ArrayMap.java b/JavaApp/src/main/java/android/util/ArrayMap.java similarity index 100% rename from src/main/java/android/util/ArrayMap.java rename to JavaApp/src/main/java/android/util/ArrayMap.java diff --git a/src/main/java/android/util/ContainerHelpers.java b/JavaApp/src/main/java/android/util/ContainerHelpers.java similarity index 100% rename from src/main/java/android/util/ContainerHelpers.java rename to JavaApp/src/main/java/android/util/ContainerHelpers.java diff --git a/src/main/java/android/util/EmptyArray.java b/JavaApp/src/main/java/android/util/EmptyArray.java similarity index 100% rename from src/main/java/android/util/EmptyArray.java rename to JavaApp/src/main/java/android/util/EmptyArray.java diff --git a/src/main/java/android/util/MapCollections.java b/JavaApp/src/main/java/android/util/MapCollections.java similarity index 100% rename from src/main/java/android/util/MapCollections.java rename to JavaApp/src/main/java/android/util/MapCollections.java diff --git a/src/main/java/android/util/Objects.java b/JavaApp/src/main/java/android/util/Objects.java similarity index 100% rename from src/main/java/android/util/Objects.java rename to JavaApp/src/main/java/android/util/Objects.java diff --git a/src/main/java/com/oracle/dalvik/VMLauncher.java b/JavaApp/src/main/java/com/oracle/dalvik/VMLauncher.java similarity index 100% rename from src/main/java/com/oracle/dalvik/VMLauncher.java rename to JavaApp/src/main/java/com/oracle/dalvik/VMLauncher.java diff --git a/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/InstallerTask.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/InstallerTask.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/InstallerTask.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/InstallerTask.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/JAssetInfo.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java diff --git a/src/main/java/net/kdt/pojavlaunch/JAssets.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/JAssets.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/JAssets.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/JAssets.java diff --git a/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java diff --git a/src/main/java/net/kdt/pojavlaunch/JVersion.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/JVersion.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/JVersion.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/JVersion.java diff --git a/src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java diff --git a/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/PLaunchApp.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java diff --git a/src/main/java/net/kdt/pojavlaunch/PLaunchJFXApp.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchJFXApp.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/PLaunchJFXApp.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchJFXApp.java diff --git a/src/main/java/net/kdt/pojavlaunch/PojavProfile.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/PojavProfile.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/PojavProfile.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/PojavProfile.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/Tools.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/Tools.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/Msa.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/Msa.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/Msa.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/Msa.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginListener.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginListener.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginListener.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginListener.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshListener.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshListener.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshListener.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshListener.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateRequest.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateRequest.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateRequest.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateRequest.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateResponse.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateResponse.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateResponse.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateResponse.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/ErrorResponse.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/ErrorResponse.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/ErrorResponse.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/ErrorResponse.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/NetworkResponse.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/NetworkResponse.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/NetworkResponse.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/NetworkResponse.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/Profile.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/Profile.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/Profile.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/Profile.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshRequest.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshRequest.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshRequest.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshRequest.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshResponse.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshResponse.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshResponse.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshResponse.java diff --git a/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java diff --git a/src/main/java/net/kdt/pojavlaunch/installers/BaseInstaller.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/installers/BaseInstaller.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/installers/BaseInstaller.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/installers/BaseInstaller.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/installers/Legacy1p12p2ForgeInstaller.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/installers/Legacy1p12p2ForgeInstaller.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/installers/Legacy1p12p2ForgeInstaller.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/installers/Legacy1p12p2ForgeInstaller.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/installers/LegacyForgeInstaller.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/installers/LegacyForgeInstaller.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/installers/LegacyForgeInstaller.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/installers/LegacyForgeInstaller.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/installers/NewForgeInstaller.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/installers/NewForgeInstaller.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/installers/NewForgeInstaller.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/installers/NewForgeInstaller.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java diff --git a/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/tasks/RefreshVersionListTask.java.todo b/JavaApp/src/main/java/net/kdt/pojavlaunch/tasks/RefreshVersionListTask.java.todo similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/tasks/RefreshVersionListTask.java.todo rename to JavaApp/src/main/java/net/kdt/pojavlaunch/tasks/RefreshVersionListTask.java.todo diff --git a/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java diff --git a/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java diff --git a/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java diff --git a/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java diff --git a/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java diff --git a/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java similarity index 100% rename from src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java rename to JavaApp/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java diff --git a/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java similarity index 100% rename from src/main/java/org/lwjgl/glfw/CallbackBridge.java rename to JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java diff --git a/src/main/jni/CMakeLists.txt b/NativeLib/CMakeLists.txt similarity index 100% rename from src/main/jni/CMakeLists.txt rename to NativeLib/CMakeLists.txt diff --git a/src/main/jni/egl_bridge.c b/NativeLib/egl_bridge.c similarity index 100% rename from src/main/jni/egl_bridge.c rename to NativeLib/egl_bridge.c diff --git a/src/main/jni/input_bridge_v3.c b/NativeLib/input_bridge_v3.c similarity index 100% rename from src/main/jni/input_bridge_v3.c rename to NativeLib/input_bridge_v3.c diff --git a/src/main/jni/jni.h b/NativeLib/jni.h similarity index 100% rename from src/main/jni/jni.h rename to NativeLib/jni.h diff --git a/src/main/jni/jre_launcher.c b/NativeLib/jre_launcher.c similarity index 100% rename from src/main/jni/jre_launcher.c rename to NativeLib/jre_launcher.c diff --git a/src/main/jni/log.h b/NativeLib/log.h similarity index 100% rename from src/main/jni/log.h rename to NativeLib/log.h diff --git a/src/main/jni/utils.c b/NativeLib/utils.c similarity index 100% rename from src/main/jni/utils.c rename to NativeLib/utils.c diff --git a/src/main/jni/utils.h b/NativeLib/utils.h similarity index 100% rename from src/main/jni/utils.h rename to NativeLib/utils.h diff --git a/iOSApp/PojavLauncher.xcodeproj/project.pbxproj b/iOSApp/PojavLauncher.xcodeproj/project.pbxproj new file mode 100644 index 00000000..2b814a89 --- /dev/null +++ b/iOSApp/PojavLauncher.xcodeproj/project.pbxproj @@ -0,0 +1,344 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 8578E4851B71082B0037F3E0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8578E4841B71082B0037F3E0 /* main.m */; }; + 8578E4881B71082B0037F3E0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8578E4871B71082B0037F3E0 /* AppDelegate.m */; }; + 8578E48B1B71082B0037F3E0 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8578E48A1B71082B0037F3E0 /* ViewController.m */; }; + 8578E48E1B71082B0037F3E0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8578E48C1B71082B0037F3E0 /* Main.storyboard */; }; + 8578E4901B71082B0037F3E0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8578E48F1B71082B0037F3E0 /* Images.xcassets */; }; + 8578E4931B71082C0037F3E0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8578E4911B71082C0037F3E0 /* LaunchScreen.xib */; }; + 8578E4A91B7108630037F3E0 /* MyJavaFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8578E4A81B7108630037F3E0 /* MyJavaFramework.framework */; }; + 8578E4AF1B710D9C0037F3E0 /* CounterService.m in Sources */ = {isa = PBXBuildFile; fileRef = 8578E4AE1B710D9C0037F3E0 /* CounterService.m */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 8578E47F1B71082B0037F3E0 /* PojavLauncher.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PojavLauncher.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8578E4831B71082B0037F3E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 8578E4841B71082B0037F3E0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 8578E4861B71082B0037F3E0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 8578E4871B71082B0037F3E0 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 8578E4891B71082B0037F3E0 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + 8578E48A1B71082B0037F3E0 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + 8578E48D1B71082B0037F3E0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 8578E48F1B71082B0037F3E0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 8578E4921B71082C0037F3E0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; + 8578E4A81B7108630037F3E0 /* MyJavaFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MyJavaFramework.framework; path = ../target/robovm/MyJavaFramework.framework; sourceTree = ""; }; + 8578E4AC1B710D5A0037F3E0 /* jni.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni.h; sourceTree = ""; }; + 8578E4AD1B710D9C0037F3E0 /* CounterService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CounterService.h; sourceTree = ""; }; + 8578E4AE1B710D9C0037F3E0 /* CounterService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CounterService.m; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8578E47C1B71082B0037F3E0 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8578E4A91B7108630037F3E0 /* MyJavaFramework.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 8578E4761B71082B0037F3E0 = { + isa = PBXGroup; + children = ( + 8578E4A81B7108630037F3E0 /* MyJavaFramework.framework */, + 8578E4811B71082B0037F3E0 /* PojavLauncher */, + 8578E4801B71082B0037F3E0 /* Products */, + ); + sourceTree = ""; + }; + 8578E4801B71082B0037F3E0 /* Products */ = { + isa = PBXGroup; + children = ( + 8578E47F1B71082B0037F3E0 /* PojavLauncher.app */, + ); + name = Products; + sourceTree = ""; + }; + 8578E4811B71082B0037F3E0 /* PojavLauncher */ = { + isa = PBXGroup; + children = ( + 8578E4861B71082B0037F3E0 /* AppDelegate.h */, + 8578E4871B71082B0037F3E0 /* AppDelegate.m */, + 8578E4AD1B710D9C0037F3E0 /* CounterService.h */, + 8578E4AE1B710D9C0037F3E0 /* CounterService.m */, + 8578E4891B71082B0037F3E0 /* ViewController.h */, + 8578E48A1B71082B0037F3E0 /* ViewController.m */, + 8578E48C1B71082B0037F3E0 /* Main.storyboard */, + 8578E48F1B71082B0037F3E0 /* Images.xcassets */, + 8578E4911B71082C0037F3E0 /* LaunchScreen.xib */, + 8578E4821B71082B0037F3E0 /* Supporting Files */, + ); + path = PojavLauncher; + sourceTree = ""; + }; + 8578E4821B71082B0037F3E0 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 8578E4831B71082B0037F3E0 /* Info.plist */, + 8578E4AC1B710D5A0037F3E0 /* jni.h */, + 8578E4841B71082B0037F3E0 /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8578E47E1B71082B0037F3E0 /* PojavLauncher */ = { + isa = PBXNativeTarget; + buildConfigurationList = 8578E4A21B71082C0037F3E0 /* Build configuration list for PBXNativeTarget "PojavLauncher" */; + buildPhases = ( + 8578E47B1B71082B0037F3E0 /* Sources */, + 8578E47C1B71082B0037F3E0 /* Frameworks */, + 8578E47D1B71082B0037F3E0 /* Resources */, + 8578E4AA1B71086F0037F3E0 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = PojavLauncher; + productName = PojavLauncher; + productReference = 8578E47F1B71082B0037F3E0 /* PojavLauncher.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 8578E4771B71082B0037F3E0 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0640; + ORGANIZATIONNAME = RoboVM; + TargetAttributes = { + 8578E47E1B71082B0037F3E0 = { + CreatedOnToolsVersion = 6.4; + }; + }; + }; + buildConfigurationList = 8578E47A1B71082B0037F3E0 /* Build configuration list for PBXProject "PojavLauncher" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 8578E4761B71082B0037F3E0; + productRefGroup = 8578E4801B71082B0037F3E0 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8578E47E1B71082B0037F3E0 /* PojavLauncher */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8578E47D1B71082B0037F3E0 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8578E48E1B71082B0037F3E0 /* Main.storyboard in Resources */, + 8578E4931B71082C0037F3E0 /* LaunchScreen.xib in Resources */, + 8578E4901B71082B0037F3E0 /* Images.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 8578E4AA1B71086F0037F3E0 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/../target/robovm/MyJavaFramework.framework", + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8578E47B1B71082B0037F3E0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8578E4AF1B710D9C0037F3E0 /* CounterService.m in Sources */, + 8578E48B1B71082B0037F3E0 /* ViewController.m in Sources */, + 8578E4881B71082B0037F3E0 /* AppDelegate.m in Sources */, + 8578E4851B71082B0037F3E0 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 8578E48C1B71082B0037F3E0 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8578E48D1B71082B0037F3E0 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 8578E4911B71082C0037F3E0 /* LaunchScreen.xib */ = { + isa = PBXVariantGroup; + children = ( + 8578E4921B71082C0037F3E0 /* Base */, + ); + name = LaunchScreen.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 8578E4A01B71082C0037F3E0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 8578E4A11B71082C0037F3E0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 8578E4A31B71082C0037F3E0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + ../target/robovm, + ); + INFOPLIST_FILE = PojavLauncher/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 8578E4A41B71082C0037F3E0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + ../target/robovm, + ); + INFOPLIST_FILE = PojavLauncher/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 8578E47A1B71082B0037F3E0 /* Build configuration list for PBXProject "PojavLauncher" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8578E4A01B71082C0037F3E0 /* Debug */, + 8578E4A11B71082C0037F3E0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 8578E4A21B71082C0037F3E0 /* Build configuration list for PBXNativeTarget "PojavLauncher" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8578E4A31B71082C0037F3E0 /* Debug */, + 8578E4A41B71082C0037F3E0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 8578E4771B71082B0037F3E0 /* Project object */; +} diff --git a/iOSApp/PojavLauncher.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iOSApp/PojavLauncher.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..accdaad4 --- /dev/null +++ b/iOSApp/PojavLauncher.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/iOSApp/PojavLauncher/AppDelegate.h b/iOSApp/PojavLauncher/AppDelegate.h new file mode 100644 index 00000000..edd63c61 --- /dev/null +++ b/iOSApp/PojavLauncher/AppDelegate.h @@ -0,0 +1,13 @@ +// +// AppDelegate.h +// + +#import + +@interface AppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + + +@end + diff --git a/iOSApp/PojavLauncher/AppDelegate.m b/iOSApp/PojavLauncher/AppDelegate.m new file mode 100644 index 00000000..8f2b6433 --- /dev/null +++ b/iOSApp/PojavLauncher/AppDelegate.m @@ -0,0 +1,23 @@ +// +// AppDelegate.m +// + +#import "AppDelegate.h" +#import "CounterService.h" + +@interface AppDelegate () + +@end + +@implementation AppDelegate + + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + + // Initialize the CounterService + [CounterService init]; + + return YES; +} + +@end diff --git a/iOSApp/PojavLauncher/Base.lproj/LaunchScreen.xib.z b/iOSApp/PojavLauncher/Base.lproj/LaunchScreen.xib.z new file mode 100644 index 00000000..8065da23 --- /dev/null +++ b/iOSApp/PojavLauncher/Base.lproj/LaunchScreen.xib.z @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iOSApp/PojavLauncher/Base.lproj/Main.storyboard.z b/iOSApp/PojavLauncher/Base.lproj/Main.storyboard.z new file mode 100644 index 00000000..abee94d1 --- /dev/null +++ b/iOSApp/PojavLauncher/Base.lproj/Main.storyboard.z @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iOSApp/PojavLauncher/CounterService.h b/iOSApp/PojavLauncher/CounterService.h new file mode 100644 index 00000000..8951aad6 --- /dev/null +++ b/iOSApp/PojavLauncher/CounterService.h @@ -0,0 +1,15 @@ +// +// CounterService.h +// + +#import + +@interface CounterService : NSObject + ++ (void)init; + ++ (int)increase; + ++ (int)getCount; + +@end diff --git a/iOSApp/PojavLauncher/CounterService.m b/iOSApp/PojavLauncher/CounterService.m new file mode 100644 index 00000000..2c9d19c7 --- /dev/null +++ b/iOSApp/PojavLauncher/CounterService.m @@ -0,0 +1,67 @@ +// +// CounterService.m +// + +#import "jni.h" +#import "CounterService.h" + +static JavaVM *vm; +static jclass counterServiceClass; +static jmethodID increaseMethod; +static jmethodID getCountMethod; + +@implementation CounterService + ++ (void)init { + + JavaVMInitArgs vm_args; + vm_args.version = JNI_VERSION_1_2; + vm_args.nOptions = 0; + vm_args.options = NULL; + + jint res; + JNIEnv *env; + res = JNI_CreateJavaVM(&vm, &env, &vm_args); + if (res != JNI_OK) { + [NSException raise:@"JNI_CreateJavaVM() failed" format:@"%d", res]; + } + + counterServiceClass = (*env)->FindClass(env, "org/robovm/samples/myjavaframework/CounterService"); + if (!counterServiceClass) { + [NSException raise:@"Failed to find class org.robovm.samples.myjavaframework.CounterService" format:@""]; + } + increaseMethod = (*env)->GetStaticMethodID(env, counterServiceClass, "increase", "()I"); + if (!increaseMethod) { + [NSException raise:@"Failed to find method org.robovm.samples.myjavaframework.CounterService.increase()I" format:@""]; + } + getCountMethod = (*env)->GetStaticMethodID(env, counterServiceClass, "getCount", "()I"); + if (!getCountMethod) { + [NSException raise:@"Failed to find method org.robovm.samples.myjavaframework.CounterService.getCount()I" format:@""]; + } +} + ++ (int)increase { + // Calls CounterService.increase() + JNIEnv *env; + jint res = (*vm)->AttachCurrentThread(vm, (void**) &env, NULL); + if (res != JNI_OK) { + [NSException raise:@"AttachCurrentThread() failed" format:@"%d", res]; + } + jint result = (*env)->CallStaticIntMethod(env, counterServiceClass, increaseMethod); + (*vm)->DetachCurrentThread(vm); + return result; +} + ++ (int)getCount { + // Calls CounterService.getCount() + JNIEnv *env; + jint res = (*vm)->AttachCurrentThread(vm, (void**) &env, NULL); + if (res != JNI_OK) { + [NSException raise:@"AttachCurrentThread() failed" format:@"%d", res]; + } + jint result = (*env)->CallStaticIntMethod(env, counterServiceClass, getCountMethod); + (*vm)->DetachCurrentThread(vm); + return result; +} + +@end diff --git a/resources/Frameworks/libGL.dylib b/iOSApp/PojavLauncher/Frameworks/libGL.dylib similarity index 100% rename from resources/Frameworks/libGL.dylib rename to iOSApp/PojavLauncher/Frameworks/libGL.dylib diff --git a/resources/Frameworks/liblwjgl.dylib b/iOSApp/PojavLauncher/Frameworks/liblwjgl.dylib similarity index 100% rename from resources/Frameworks/liblwjgl.dylib rename to iOSApp/PojavLauncher/Frameworks/liblwjgl.dylib diff --git a/resources/Frameworks/liblwjgl_opengl.dylib b/iOSApp/PojavLauncher/Frameworks/liblwjgl_opengl.dylib similarity index 100% rename from resources/Frameworks/liblwjgl_opengl.dylib rename to iOSApp/PojavLauncher/Frameworks/liblwjgl_opengl.dylib diff --git a/resources/Frameworks/liblwjgl_stb.dylib b/iOSApp/PojavLauncher/Frameworks/liblwjgl_stb.dylib similarity index 100% rename from resources/Frameworks/liblwjgl_stb.dylib rename to iOSApp/PojavLauncher/Frameworks/liblwjgl_stb.dylib diff --git a/resources/Frameworks/liblwjgl_tinyfd.dylib b/iOSApp/PojavLauncher/Frameworks/liblwjgl_tinyfd.dylib similarity index 100% rename from resources/Frameworks/liblwjgl_tinyfd.dylib rename to iOSApp/PojavLauncher/Frameworks/liblwjgl_tinyfd.dylib diff --git a/iOSApp/PojavLauncher/Images.xcassets/AppIcon.appiconset/Contents.json b/iOSApp/PojavLauncher/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..36d2c80d --- /dev/null +++ b/iOSApp/PojavLauncher/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Info.plist.xml b/iOSApp/PojavLauncher/Info.plist similarity index 89% rename from Info.plist.xml rename to iOSApp/PojavLauncher/Info.plist index 5a4c2bd4..5ccd7790 100644 --- a/Info.plist.xml +++ b/iOSApp/PojavLauncher/Info.plist @@ -5,23 +5,23 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - ${app.name} + PojavLauncher CFBundleExecutable - ${app.executable} + PojavLauncher CFBundleIdentifier - ${app.id} + net.kdt.pojavlaunch CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${app.name} + PojavLauncher CFBundlePackageType APPL CFBundleShortVersionString - ${app.version} + 1.0 CFBundleSignature ???? CFBundleVersion - ${app.build} + 1 LSRequiresIPhoneOS UIDeviceFamily diff --git a/iOSApp/PojavLauncher/Info.plist.z b/iOSApp/PojavLauncher/Info.plist.z new file mode 100644 index 00000000..1deedc6a --- /dev/null +++ b/iOSApp/PojavLauncher/Info.plist.z @@ -0,0 +1,47 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + org.robovm.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/iOSApp/PojavLauncher/ViewController.h.z b/iOSApp/PojavLauncher/ViewController.h.z new file mode 100644 index 00000000..e523b8ba --- /dev/null +++ b/iOSApp/PojavLauncher/ViewController.h.z @@ -0,0 +1,13 @@ +// +// ViewController.h +// + +#import + +@interface ViewController : UIViewController + +@property (strong, nonatomic) IBOutlet UILabel *label; + +- (IBAction)clicked:(id)sender; + +@end diff --git a/iOSApp/PojavLauncher/ViewController.m.z b/iOSApp/PojavLauncher/ViewController.m.z new file mode 100644 index 00000000..eaa7ae25 --- /dev/null +++ b/iOSApp/PojavLauncher/ViewController.m.z @@ -0,0 +1,15 @@ +// +// ViewController.m +// + +#import "CounterService.h" +#import "ViewController.h" + +@implementation ViewController + +- (IBAction)clicked:(id)sender { + [CounterService increase]; + self.label.text = [NSString stringWithFormat:@"Click Nr. %d", [CounterService getCount]]; +} + +@end diff --git a/iOSApp/PojavLauncher/jni.h b/iOSApp/PojavLauncher/jni.h new file mode 100644 index 00000000..11e43e3d --- /dev/null +++ b/iOSApp/PojavLauncher/jni.h @@ -0,0 +1,1142 @@ +/* + * Copyright (C) 2006 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * JNI specification, as defined by Sun: + * http://java.sun.com/javase/6/docs/technotes/guides/jni/spec/jniTOC.html + * + * Everything here is expected to be VM-neutral. + */ + +#pragma once + +#include +#include + +/* Primitive types that match up with Java equivalents. */ +typedef uint8_t jboolean; /* unsigned 8 bits */ +typedef int8_t jbyte; /* signed 8 bits */ +typedef uint16_t jchar; /* unsigned 16 bits */ +typedef int16_t jshort; /* signed 16 bits */ +typedef int32_t jint; /* signed 32 bits */ +typedef int64_t jlong; /* signed 64 bits */ +typedef float jfloat; /* 32-bit IEEE 754 */ +typedef double jdouble; /* 64-bit IEEE 754 */ + +/* "cardinal indices and sizes" */ +typedef jint jsize; + +#ifdef __cplusplus +/* + * Reference types, in C++ + */ +class _jobject {}; +class _jclass : public _jobject {}; +class _jstring : public _jobject {}; +class _jarray : public _jobject {}; +class _jobjectArray : public _jarray {}; +class _jbooleanArray : public _jarray {}; +class _jbyteArray : public _jarray {}; +class _jcharArray : public _jarray {}; +class _jshortArray : public _jarray {}; +class _jintArray : public _jarray {}; +class _jlongArray : public _jarray {}; +class _jfloatArray : public _jarray {}; +class _jdoubleArray : public _jarray {}; +class _jthrowable : public _jobject {}; + +typedef _jobject* jobject; +typedef _jclass* jclass; +typedef _jstring* jstring; +typedef _jarray* jarray; +typedef _jobjectArray* jobjectArray; +typedef _jbooleanArray* jbooleanArray; +typedef _jbyteArray* jbyteArray; +typedef _jcharArray* jcharArray; +typedef _jshortArray* jshortArray; +typedef _jintArray* jintArray; +typedef _jlongArray* jlongArray; +typedef _jfloatArray* jfloatArray; +typedef _jdoubleArray* jdoubleArray; +typedef _jthrowable* jthrowable; +typedef _jobject* jweak; + + +#else /* not __cplusplus */ + +/* + * Reference types, in C. + */ +typedef void* jobject; +typedef jobject jclass; +typedef jobject jstring; +typedef jobject jarray; +typedef jarray jobjectArray; +typedef jarray jbooleanArray; +typedef jarray jbyteArray; +typedef jarray jcharArray; +typedef jarray jshortArray; +typedef jarray jintArray; +typedef jarray jlongArray; +typedef jarray jfloatArray; +typedef jarray jdoubleArray; +typedef jobject jthrowable; +typedef jobject jweak; + +#endif /* not __cplusplus */ + +struct _jfieldID; /* opaque structure */ +typedef struct _jfieldID* jfieldID; /* field IDs */ + +struct _jmethodID; /* opaque structure */ +typedef struct _jmethodID* jmethodID; /* method IDs */ + +struct JNIInvokeInterface; + +typedef union jvalue { + jboolean z; + jbyte b; + jchar c; + jshort s; + jint i; + jlong j; + jfloat f; + jdouble d; + jobject l; +} jvalue; + +typedef enum jobjectRefType { + JNIInvalidRefType = 0, + JNILocalRefType = 1, + JNIGlobalRefType = 2, + JNIWeakGlobalRefType = 3 +} jobjectRefType; + +typedef struct { + const char* name; + const char* signature; + void* fnPtr; +} JNINativeMethod; + +struct _JNIEnv; +struct _JavaVM; +typedef const struct JNINativeInterface* C_JNIEnv; + +#if defined(__cplusplus) +typedef _JNIEnv JNIEnv; +typedef _JavaVM JavaVM; +#else +typedef const struct JNINativeInterface* JNIEnv; +typedef const struct JNIInvokeInterface* JavaVM; +#endif + +/* + * Table of interface function pointers. + */ +struct JNINativeInterface { + void* reserved0; + void* reserved1; + void* reserved2; + void* reserved3; + + jint (*GetVersion)(JNIEnv *); + + jclass (*DefineClass)(JNIEnv*, const char*, jobject, const jbyte*, + jsize); + jclass (*FindClass)(JNIEnv*, const char*); + + jmethodID (*FromReflectedMethod)(JNIEnv*, jobject); + jfieldID (*FromReflectedField)(JNIEnv*, jobject); + /* spec doesn't show jboolean parameter */ + jobject (*ToReflectedMethod)(JNIEnv*, jclass, jmethodID, jboolean); + + jclass (*GetSuperclass)(JNIEnv*, jclass); + jboolean (*IsAssignableFrom)(JNIEnv*, jclass, jclass); + + /* spec doesn't show jboolean parameter */ + jobject (*ToReflectedField)(JNIEnv*, jclass, jfieldID, jboolean); + + jint (*Throw)(JNIEnv*, jthrowable); + jint (*ThrowNew)(JNIEnv *, jclass, const char *); + jthrowable (*ExceptionOccurred)(JNIEnv*); + void (*ExceptionDescribe)(JNIEnv*); + void (*ExceptionClear)(JNIEnv*); + void (*FatalError)(JNIEnv*, const char*); + + jint (*PushLocalFrame)(JNIEnv*, jint); + jobject (*PopLocalFrame)(JNIEnv*, jobject); + + jobject (*NewGlobalRef)(JNIEnv*, jobject); + void (*DeleteGlobalRef)(JNIEnv*, jobject); + void (*DeleteLocalRef)(JNIEnv*, jobject); + jboolean (*IsSameObject)(JNIEnv*, jobject, jobject); + + jobject (*NewLocalRef)(JNIEnv*, jobject); + jint (*EnsureLocalCapacity)(JNIEnv*, jint); + + jobject (*AllocObject)(JNIEnv*, jclass); + jobject (*NewObject)(JNIEnv*, jclass, jmethodID, ...); + jobject (*NewObjectV)(JNIEnv*, jclass, jmethodID, va_list); + jobject (*NewObjectA)(JNIEnv*, jclass, jmethodID, const jvalue*); + + jclass (*GetObjectClass)(JNIEnv*, jobject); + jboolean (*IsInstanceOf)(JNIEnv*, jobject, jclass); + jmethodID (*GetMethodID)(JNIEnv*, jclass, const char*, const char*); + + jobject (*CallObjectMethod)(JNIEnv*, jobject, jmethodID, ...); + jobject (*CallObjectMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jobject (*CallObjectMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + jboolean (*CallBooleanMethod)(JNIEnv*, jobject, jmethodID, ...); + jboolean (*CallBooleanMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jboolean (*CallBooleanMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + jbyte (*CallByteMethod)(JNIEnv*, jobject, jmethodID, ...); + jbyte (*CallByteMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jbyte (*CallByteMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + jchar (*CallCharMethod)(JNIEnv*, jobject, jmethodID, ...); + jchar (*CallCharMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jchar (*CallCharMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + jshort (*CallShortMethod)(JNIEnv*, jobject, jmethodID, ...); + jshort (*CallShortMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jshort (*CallShortMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + jint (*CallIntMethod)(JNIEnv*, jobject, jmethodID, ...); + jint (*CallIntMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jint (*CallIntMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + jlong (*CallLongMethod)(JNIEnv*, jobject, jmethodID, ...); + jlong (*CallLongMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jlong (*CallLongMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + jfloat (*CallFloatMethod)(JNIEnv*, jobject, jmethodID, ...); + jfloat (*CallFloatMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jfloat (*CallFloatMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + jdouble (*CallDoubleMethod)(JNIEnv*, jobject, jmethodID, ...); + jdouble (*CallDoubleMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jdouble (*CallDoubleMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + void (*CallVoidMethod)(JNIEnv*, jobject, jmethodID, ...); + void (*CallVoidMethodV)(JNIEnv*, jobject, jmethodID, va_list); + void (*CallVoidMethodA)(JNIEnv*, jobject, jmethodID, const jvalue*); + + jobject (*CallNonvirtualObjectMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jobject (*CallNonvirtualObjectMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jobject (*CallNonvirtualObjectMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + jboolean (*CallNonvirtualBooleanMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jboolean (*CallNonvirtualBooleanMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jboolean (*CallNonvirtualBooleanMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + jbyte (*CallNonvirtualByteMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jbyte (*CallNonvirtualByteMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jbyte (*CallNonvirtualByteMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + jchar (*CallNonvirtualCharMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jchar (*CallNonvirtualCharMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jchar (*CallNonvirtualCharMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + jshort (*CallNonvirtualShortMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jshort (*CallNonvirtualShortMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jshort (*CallNonvirtualShortMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + jint (*CallNonvirtualIntMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jint (*CallNonvirtualIntMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jint (*CallNonvirtualIntMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + jlong (*CallNonvirtualLongMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jlong (*CallNonvirtualLongMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jlong (*CallNonvirtualLongMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + jfloat (*CallNonvirtualFloatMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jfloat (*CallNonvirtualFloatMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jfloat (*CallNonvirtualFloatMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + jdouble (*CallNonvirtualDoubleMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + jdouble (*CallNonvirtualDoubleMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + jdouble (*CallNonvirtualDoubleMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + void (*CallNonvirtualVoidMethod)(JNIEnv*, jobject, jclass, + jmethodID, ...); + void (*CallNonvirtualVoidMethodV)(JNIEnv*, jobject, jclass, + jmethodID, va_list); + void (*CallNonvirtualVoidMethodA)(JNIEnv*, jobject, jclass, + jmethodID, const jvalue*); + + jfieldID (*GetFieldID)(JNIEnv*, jclass, const char*, const char*); + + jobject (*GetObjectField)(JNIEnv*, jobject, jfieldID); + jboolean (*GetBooleanField)(JNIEnv*, jobject, jfieldID); + jbyte (*GetByteField)(JNIEnv*, jobject, jfieldID); + jchar (*GetCharField)(JNIEnv*, jobject, jfieldID); + jshort (*GetShortField)(JNIEnv*, jobject, jfieldID); + jint (*GetIntField)(JNIEnv*, jobject, jfieldID); + jlong (*GetLongField)(JNIEnv*, jobject, jfieldID); + jfloat (*GetFloatField)(JNIEnv*, jobject, jfieldID); + jdouble (*GetDoubleField)(JNIEnv*, jobject, jfieldID); + + void (*SetObjectField)(JNIEnv*, jobject, jfieldID, jobject); + void (*SetBooleanField)(JNIEnv*, jobject, jfieldID, jboolean); + void (*SetByteField)(JNIEnv*, jobject, jfieldID, jbyte); + void (*SetCharField)(JNIEnv*, jobject, jfieldID, jchar); + void (*SetShortField)(JNIEnv*, jobject, jfieldID, jshort); + void (*SetIntField)(JNIEnv*, jobject, jfieldID, jint); + void (*SetLongField)(JNIEnv*, jobject, jfieldID, jlong); + void (*SetFloatField)(JNIEnv*, jobject, jfieldID, jfloat); + void (*SetDoubleField)(JNIEnv*, jobject, jfieldID, jdouble); + + jmethodID (*GetStaticMethodID)(JNIEnv*, jclass, const char*, const char*); + + jobject (*CallStaticObjectMethod)(JNIEnv*, jclass, jmethodID, ...); + jobject (*CallStaticObjectMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jobject (*CallStaticObjectMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + jboolean (*CallStaticBooleanMethod)(JNIEnv*, jclass, jmethodID, ...); + jboolean (*CallStaticBooleanMethodV)(JNIEnv*, jclass, jmethodID, + va_list); + jboolean (*CallStaticBooleanMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + jbyte (*CallStaticByteMethod)(JNIEnv*, jclass, jmethodID, ...); + jbyte (*CallStaticByteMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jbyte (*CallStaticByteMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + jchar (*CallStaticCharMethod)(JNIEnv*, jclass, jmethodID, ...); + jchar (*CallStaticCharMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jchar (*CallStaticCharMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + jshort (*CallStaticShortMethod)(JNIEnv*, jclass, jmethodID, ...); + jshort (*CallStaticShortMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jshort (*CallStaticShortMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + jint (*CallStaticIntMethod)(JNIEnv*, jclass, jmethodID, ...); + jint (*CallStaticIntMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jint (*CallStaticIntMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + jlong (*CallStaticLongMethod)(JNIEnv*, jclass, jmethodID, ...); + jlong (*CallStaticLongMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jlong (*CallStaticLongMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + jfloat (*CallStaticFloatMethod)(JNIEnv*, jclass, jmethodID, ...); + jfloat (*CallStaticFloatMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jfloat (*CallStaticFloatMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + jdouble (*CallStaticDoubleMethod)(JNIEnv*, jclass, jmethodID, ...); + jdouble (*CallStaticDoubleMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jdouble (*CallStaticDoubleMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + void (*CallStaticVoidMethod)(JNIEnv*, jclass, jmethodID, ...); + void (*CallStaticVoidMethodV)(JNIEnv*, jclass, jmethodID, va_list); + void (*CallStaticVoidMethodA)(JNIEnv*, jclass, jmethodID, const jvalue*); + + jfieldID (*GetStaticFieldID)(JNIEnv*, jclass, const char*, + const char*); + + jobject (*GetStaticObjectField)(JNIEnv*, jclass, jfieldID); + jboolean (*GetStaticBooleanField)(JNIEnv*, jclass, jfieldID); + jbyte (*GetStaticByteField)(JNIEnv*, jclass, jfieldID); + jchar (*GetStaticCharField)(JNIEnv*, jclass, jfieldID); + jshort (*GetStaticShortField)(JNIEnv*, jclass, jfieldID); + jint (*GetStaticIntField)(JNIEnv*, jclass, jfieldID); + jlong (*GetStaticLongField)(JNIEnv*, jclass, jfieldID); + jfloat (*GetStaticFloatField)(JNIEnv*, jclass, jfieldID); + jdouble (*GetStaticDoubleField)(JNIEnv*, jclass, jfieldID); + + void (*SetStaticObjectField)(JNIEnv*, jclass, jfieldID, jobject); + void (*SetStaticBooleanField)(JNIEnv*, jclass, jfieldID, jboolean); + void (*SetStaticByteField)(JNIEnv*, jclass, jfieldID, jbyte); + void (*SetStaticCharField)(JNIEnv*, jclass, jfieldID, jchar); + void (*SetStaticShortField)(JNIEnv*, jclass, jfieldID, jshort); + void (*SetStaticIntField)(JNIEnv*, jclass, jfieldID, jint); + void (*SetStaticLongField)(JNIEnv*, jclass, jfieldID, jlong); + void (*SetStaticFloatField)(JNIEnv*, jclass, jfieldID, jfloat); + void (*SetStaticDoubleField)(JNIEnv*, jclass, jfieldID, jdouble); + + jstring (*NewString)(JNIEnv*, const jchar*, jsize); + jsize (*GetStringLength)(JNIEnv*, jstring); + const jchar* (*GetStringChars)(JNIEnv*, jstring, jboolean*); + void (*ReleaseStringChars)(JNIEnv*, jstring, const jchar*); + jstring (*NewStringUTF)(JNIEnv*, const char*); + jsize (*GetStringUTFLength)(JNIEnv*, jstring); + /* JNI spec says this returns const jbyte*, but that's inconsistent */ + const char* (*GetStringUTFChars)(JNIEnv*, jstring, jboolean*); + void (*ReleaseStringUTFChars)(JNIEnv*, jstring, const char*); + jsize (*GetArrayLength)(JNIEnv*, jarray); + jobjectArray (*NewObjectArray)(JNIEnv*, jsize, jclass, jobject); + jobject (*GetObjectArrayElement)(JNIEnv*, jobjectArray, jsize); + void (*SetObjectArrayElement)(JNIEnv*, jobjectArray, jsize, jobject); + + jbooleanArray (*NewBooleanArray)(JNIEnv*, jsize); + jbyteArray (*NewByteArray)(JNIEnv*, jsize); + jcharArray (*NewCharArray)(JNIEnv*, jsize); + jshortArray (*NewShortArray)(JNIEnv*, jsize); + jintArray (*NewIntArray)(JNIEnv*, jsize); + jlongArray (*NewLongArray)(JNIEnv*, jsize); + jfloatArray (*NewFloatArray)(JNIEnv*, jsize); + jdoubleArray (*NewDoubleArray)(JNIEnv*, jsize); + + jboolean* (*GetBooleanArrayElements)(JNIEnv*, jbooleanArray, jboolean*); + jbyte* (*GetByteArrayElements)(JNIEnv*, jbyteArray, jboolean*); + jchar* (*GetCharArrayElements)(JNIEnv*, jcharArray, jboolean*); + jshort* (*GetShortArrayElements)(JNIEnv*, jshortArray, jboolean*); + jint* (*GetIntArrayElements)(JNIEnv*, jintArray, jboolean*); + jlong* (*GetLongArrayElements)(JNIEnv*, jlongArray, jboolean*); + jfloat* (*GetFloatArrayElements)(JNIEnv*, jfloatArray, jboolean*); + jdouble* (*GetDoubleArrayElements)(JNIEnv*, jdoubleArray, jboolean*); + + void (*ReleaseBooleanArrayElements)(JNIEnv*, jbooleanArray, + jboolean*, jint); + void (*ReleaseByteArrayElements)(JNIEnv*, jbyteArray, + jbyte*, jint); + void (*ReleaseCharArrayElements)(JNIEnv*, jcharArray, + jchar*, jint); + void (*ReleaseShortArrayElements)(JNIEnv*, jshortArray, + jshort*, jint); + void (*ReleaseIntArrayElements)(JNIEnv*, jintArray, + jint*, jint); + void (*ReleaseLongArrayElements)(JNIEnv*, jlongArray, + jlong*, jint); + void (*ReleaseFloatArrayElements)(JNIEnv*, jfloatArray, + jfloat*, jint); + void (*ReleaseDoubleArrayElements)(JNIEnv*, jdoubleArray, + jdouble*, jint); + + void (*GetBooleanArrayRegion)(JNIEnv*, jbooleanArray, + jsize, jsize, jboolean*); + void (*GetByteArrayRegion)(JNIEnv*, jbyteArray, + jsize, jsize, jbyte*); + void (*GetCharArrayRegion)(JNIEnv*, jcharArray, + jsize, jsize, jchar*); + void (*GetShortArrayRegion)(JNIEnv*, jshortArray, + jsize, jsize, jshort*); + void (*GetIntArrayRegion)(JNIEnv*, jintArray, + jsize, jsize, jint*); + void (*GetLongArrayRegion)(JNIEnv*, jlongArray, + jsize, jsize, jlong*); + void (*GetFloatArrayRegion)(JNIEnv*, jfloatArray, + jsize, jsize, jfloat*); + void (*GetDoubleArrayRegion)(JNIEnv*, jdoubleArray, + jsize, jsize, jdouble*); + + /* spec shows these without const; some jni.h do, some don't */ + void (*SetBooleanArrayRegion)(JNIEnv*, jbooleanArray, + jsize, jsize, const jboolean*); + void (*SetByteArrayRegion)(JNIEnv*, jbyteArray, + jsize, jsize, const jbyte*); + void (*SetCharArrayRegion)(JNIEnv*, jcharArray, + jsize, jsize, const jchar*); + void (*SetShortArrayRegion)(JNIEnv*, jshortArray, + jsize, jsize, const jshort*); + void (*SetIntArrayRegion)(JNIEnv*, jintArray, + jsize, jsize, const jint*); + void (*SetLongArrayRegion)(JNIEnv*, jlongArray, + jsize, jsize, const jlong*); + void (*SetFloatArrayRegion)(JNIEnv*, jfloatArray, + jsize, jsize, const jfloat*); + void (*SetDoubleArrayRegion)(JNIEnv*, jdoubleArray, + jsize, jsize, const jdouble*); + + jint (*RegisterNatives)(JNIEnv*, jclass, const JNINativeMethod*, + jint); + jint (*UnregisterNatives)(JNIEnv*, jclass); + jint (*MonitorEnter)(JNIEnv*, jobject); + jint (*MonitorExit)(JNIEnv*, jobject); + jint (*GetJavaVM)(JNIEnv*, JavaVM**); + + void (*GetStringRegion)(JNIEnv*, jstring, jsize, jsize, jchar*); + void (*GetStringUTFRegion)(JNIEnv*, jstring, jsize, jsize, char*); + + void* (*GetPrimitiveArrayCritical)(JNIEnv*, jarray, jboolean*); + void (*ReleasePrimitiveArrayCritical)(JNIEnv*, jarray, void*, jint); + + const jchar* (*GetStringCritical)(JNIEnv*, jstring, jboolean*); + void (*ReleaseStringCritical)(JNIEnv*, jstring, const jchar*); + + jweak (*NewWeakGlobalRef)(JNIEnv*, jobject); + void (*DeleteWeakGlobalRef)(JNIEnv*, jweak); + + jboolean (*ExceptionCheck)(JNIEnv*); + + jobject (*NewDirectByteBuffer)(JNIEnv*, void*, jlong); + void* (*GetDirectBufferAddress)(JNIEnv*, jobject); + jlong (*GetDirectBufferCapacity)(JNIEnv*, jobject); + + /* added in JNI 1.6 */ + jobjectRefType (*GetObjectRefType)(JNIEnv*, jobject); +}; + +/* + * C++ object wrapper. + * + * This is usually overlaid on a C struct whose first element is a + * JNINativeInterface*. We rely somewhat on compiler behavior. + */ +struct _JNIEnv { + /* do not rename this; it does not seem to be entirely opaque */ + const struct JNINativeInterface* functions; + +#if defined(__cplusplus) + + jint GetVersion() + { return functions->GetVersion(this); } + + jclass DefineClass(const char *name, jobject loader, const jbyte* buf, + jsize bufLen) + { return functions->DefineClass(this, name, loader, buf, bufLen); } + + jclass FindClass(const char* name) + { return functions->FindClass(this, name); } + + jmethodID FromReflectedMethod(jobject method) + { return functions->FromReflectedMethod(this, method); } + + jfieldID FromReflectedField(jobject field) + { return functions->FromReflectedField(this, field); } + + jobject ToReflectedMethod(jclass cls, jmethodID methodID, jboolean isStatic) + { return functions->ToReflectedMethod(this, cls, methodID, isStatic); } + + jclass GetSuperclass(jclass clazz) + { return functions->GetSuperclass(this, clazz); } + + jboolean IsAssignableFrom(jclass clazz1, jclass clazz2) + { return functions->IsAssignableFrom(this, clazz1, clazz2); } + + jobject ToReflectedField(jclass cls, jfieldID fieldID, jboolean isStatic) + { return functions->ToReflectedField(this, cls, fieldID, isStatic); } + + jint Throw(jthrowable obj) + { return functions->Throw(this, obj); } + + jint ThrowNew(jclass clazz, const char* message) + { return functions->ThrowNew(this, clazz, message); } + + jthrowable ExceptionOccurred() + { return functions->ExceptionOccurred(this); } + + void ExceptionDescribe() + { functions->ExceptionDescribe(this); } + + void ExceptionClear() + { functions->ExceptionClear(this); } + + void FatalError(const char* msg) + { functions->FatalError(this, msg); } + + jint PushLocalFrame(jint capacity) + { return functions->PushLocalFrame(this, capacity); } + + jobject PopLocalFrame(jobject result) + { return functions->PopLocalFrame(this, result); } + + jobject NewGlobalRef(jobject obj) + { return functions->NewGlobalRef(this, obj); } + + void DeleteGlobalRef(jobject globalRef) + { functions->DeleteGlobalRef(this, globalRef); } + + void DeleteLocalRef(jobject localRef) + { functions->DeleteLocalRef(this, localRef); } + + jboolean IsSameObject(jobject ref1, jobject ref2) + { return functions->IsSameObject(this, ref1, ref2); } + + jobject NewLocalRef(jobject ref) + { return functions->NewLocalRef(this, ref); } + + jint EnsureLocalCapacity(jint capacity) + { return functions->EnsureLocalCapacity(this, capacity); } + + jobject AllocObject(jclass clazz) + { return functions->AllocObject(this, clazz); } + + jobject NewObject(jclass clazz, jmethodID methodID, ...) + { + va_list args; + va_start(args, methodID); + jobject result = functions->NewObjectV(this, clazz, methodID, args); + va_end(args); + return result; + } + + jobject NewObjectV(jclass clazz, jmethodID methodID, va_list args) + { return functions->NewObjectV(this, clazz, methodID, args); } + + jobject NewObjectA(jclass clazz, jmethodID methodID, const jvalue* args) + { return functions->NewObjectA(this, clazz, methodID, args); } + + jclass GetObjectClass(jobject obj) + { return functions->GetObjectClass(this, obj); } + + jboolean IsInstanceOf(jobject obj, jclass clazz) + { return functions->IsInstanceOf(this, obj, clazz); } + + jmethodID GetMethodID(jclass clazz, const char* name, const char* sig) + { return functions->GetMethodID(this, clazz, name, sig); } + +#define CALL_TYPE_METHOD(_jtype, _jname) \ + _jtype Call##_jname##Method(jobject obj, jmethodID methodID, ...) \ + { \ + _jtype result; \ + va_list args; \ + va_start(args, methodID); \ + result = functions->Call##_jname##MethodV(this, obj, methodID, \ + args); \ + va_end(args); \ + return result; \ + } +#define CALL_TYPE_METHODV(_jtype, _jname) \ + _jtype Call##_jname##MethodV(jobject obj, jmethodID methodID, \ + va_list args) \ + { return functions->Call##_jname##MethodV(this, obj, methodID, args); } +#define CALL_TYPE_METHODA(_jtype, _jname) \ + _jtype Call##_jname##MethodA(jobject obj, jmethodID methodID, \ + const jvalue* args) \ + { return functions->Call##_jname##MethodA(this, obj, methodID, args); } + +#define CALL_TYPE(_jtype, _jname) \ + CALL_TYPE_METHOD(_jtype, _jname) \ + CALL_TYPE_METHODV(_jtype, _jname) \ + CALL_TYPE_METHODA(_jtype, _jname) + + CALL_TYPE(jobject, Object) + CALL_TYPE(jboolean, Boolean) + CALL_TYPE(jbyte, Byte) + CALL_TYPE(jchar, Char) + CALL_TYPE(jshort, Short) + CALL_TYPE(jint, Int) + CALL_TYPE(jlong, Long) + CALL_TYPE(jfloat, Float) + CALL_TYPE(jdouble, Double) + + void CallVoidMethod(jobject obj, jmethodID methodID, ...) + { + va_list args; + va_start(args, methodID); + functions->CallVoidMethodV(this, obj, methodID, args); + va_end(args); + } + void CallVoidMethodV(jobject obj, jmethodID methodID, va_list args) + { functions->CallVoidMethodV(this, obj, methodID, args); } + void CallVoidMethodA(jobject obj, jmethodID methodID, const jvalue* args) + { functions->CallVoidMethodA(this, obj, methodID, args); } + +#define CALL_NONVIRT_TYPE_METHOD(_jtype, _jname) \ + _jtype CallNonvirtual##_jname##Method(jobject obj, jclass clazz, \ + jmethodID methodID, ...) \ + { \ + _jtype result; \ + va_list args; \ + va_start(args, methodID); \ + result = functions->CallNonvirtual##_jname##MethodV(this, obj, \ + clazz, methodID, args); \ + va_end(args); \ + return result; \ + } +#define CALL_NONVIRT_TYPE_METHODV(_jtype, _jname) \ + _jtype CallNonvirtual##_jname##MethodV(jobject obj, jclass clazz, \ + jmethodID methodID, va_list args) \ + { return functions->CallNonvirtual##_jname##MethodV(this, obj, clazz, \ + methodID, args); } +#define CALL_NONVIRT_TYPE_METHODA(_jtype, _jname) \ + _jtype CallNonvirtual##_jname##MethodA(jobject obj, jclass clazz, \ + jmethodID methodID, const jvalue* args) \ + { return functions->CallNonvirtual##_jname##MethodA(this, obj, clazz, \ + methodID, args); } + +#define CALL_NONVIRT_TYPE(_jtype, _jname) \ + CALL_NONVIRT_TYPE_METHOD(_jtype, _jname) \ + CALL_NONVIRT_TYPE_METHODV(_jtype, _jname) \ + CALL_NONVIRT_TYPE_METHODA(_jtype, _jname) + + CALL_NONVIRT_TYPE(jobject, Object) + CALL_NONVIRT_TYPE(jboolean, Boolean) + CALL_NONVIRT_TYPE(jbyte, Byte) + CALL_NONVIRT_TYPE(jchar, Char) + CALL_NONVIRT_TYPE(jshort, Short) + CALL_NONVIRT_TYPE(jint, Int) + CALL_NONVIRT_TYPE(jlong, Long) + CALL_NONVIRT_TYPE(jfloat, Float) + CALL_NONVIRT_TYPE(jdouble, Double) + + void CallNonvirtualVoidMethod(jobject obj, jclass clazz, + jmethodID methodID, ...) + { + va_list args; + va_start(args, methodID); + functions->CallNonvirtualVoidMethodV(this, obj, clazz, methodID, args); + va_end(args); + } + void CallNonvirtualVoidMethodV(jobject obj, jclass clazz, + jmethodID methodID, va_list args) + { functions->CallNonvirtualVoidMethodV(this, obj, clazz, methodID, args); } + void CallNonvirtualVoidMethodA(jobject obj, jclass clazz, + jmethodID methodID, const jvalue* args) + { functions->CallNonvirtualVoidMethodA(this, obj, clazz, methodID, args); } + + jfieldID GetFieldID(jclass clazz, const char* name, const char* sig) + { return functions->GetFieldID(this, clazz, name, sig); } + + jobject GetObjectField(jobject obj, jfieldID fieldID) + { return functions->GetObjectField(this, obj, fieldID); } + jboolean GetBooleanField(jobject obj, jfieldID fieldID) + { return functions->GetBooleanField(this, obj, fieldID); } + jbyte GetByteField(jobject obj, jfieldID fieldID) + { return functions->GetByteField(this, obj, fieldID); } + jchar GetCharField(jobject obj, jfieldID fieldID) + { return functions->GetCharField(this, obj, fieldID); } + jshort GetShortField(jobject obj, jfieldID fieldID) + { return functions->GetShortField(this, obj, fieldID); } + jint GetIntField(jobject obj, jfieldID fieldID) + { return functions->GetIntField(this, obj, fieldID); } + jlong GetLongField(jobject obj, jfieldID fieldID) + { return functions->GetLongField(this, obj, fieldID); } + jfloat GetFloatField(jobject obj, jfieldID fieldID) + { return functions->GetFloatField(this, obj, fieldID); } + jdouble GetDoubleField(jobject obj, jfieldID fieldID) + { return functions->GetDoubleField(this, obj, fieldID); } + + void SetObjectField(jobject obj, jfieldID fieldID, jobject value) + { functions->SetObjectField(this, obj, fieldID, value); } + void SetBooleanField(jobject obj, jfieldID fieldID, jboolean value) + { functions->SetBooleanField(this, obj, fieldID, value); } + void SetByteField(jobject obj, jfieldID fieldID, jbyte value) + { functions->SetByteField(this, obj, fieldID, value); } + void SetCharField(jobject obj, jfieldID fieldID, jchar value) + { functions->SetCharField(this, obj, fieldID, value); } + void SetShortField(jobject obj, jfieldID fieldID, jshort value) + { functions->SetShortField(this, obj, fieldID, value); } + void SetIntField(jobject obj, jfieldID fieldID, jint value) + { functions->SetIntField(this, obj, fieldID, value); } + void SetLongField(jobject obj, jfieldID fieldID, jlong value) + { functions->SetLongField(this, obj, fieldID, value); } + void SetFloatField(jobject obj, jfieldID fieldID, jfloat value) + { functions->SetFloatField(this, obj, fieldID, value); } + void SetDoubleField(jobject obj, jfieldID fieldID, jdouble value) + { functions->SetDoubleField(this, obj, fieldID, value); } + + jmethodID GetStaticMethodID(jclass clazz, const char* name, const char* sig) + { return functions->GetStaticMethodID(this, clazz, name, sig); } + +#define CALL_STATIC_TYPE_METHOD(_jtype, _jname) \ + _jtype CallStatic##_jname##Method(jclass clazz, jmethodID methodID, \ + ...) \ + { \ + _jtype result; \ + va_list args; \ + va_start(args, methodID); \ + result = functions->CallStatic##_jname##MethodV(this, clazz, \ + methodID, args); \ + va_end(args); \ + return result; \ + } +#define CALL_STATIC_TYPE_METHODV(_jtype, _jname) \ + _jtype CallStatic##_jname##MethodV(jclass clazz, jmethodID methodID, \ + va_list args) \ + { return functions->CallStatic##_jname##MethodV(this, clazz, methodID, \ + args); } +#define CALL_STATIC_TYPE_METHODA(_jtype, _jname) \ + _jtype CallStatic##_jname##MethodA(jclass clazz, jmethodID methodID, \ + const jvalue* args) \ + { return functions->CallStatic##_jname##MethodA(this, clazz, methodID, \ + args); } + +#define CALL_STATIC_TYPE(_jtype, _jname) \ + CALL_STATIC_TYPE_METHOD(_jtype, _jname) \ + CALL_STATIC_TYPE_METHODV(_jtype, _jname) \ + CALL_STATIC_TYPE_METHODA(_jtype, _jname) + + CALL_STATIC_TYPE(jobject, Object) + CALL_STATIC_TYPE(jboolean, Boolean) + CALL_STATIC_TYPE(jbyte, Byte) + CALL_STATIC_TYPE(jchar, Char) + CALL_STATIC_TYPE(jshort, Short) + CALL_STATIC_TYPE(jint, Int) + CALL_STATIC_TYPE(jlong, Long) + CALL_STATIC_TYPE(jfloat, Float) + CALL_STATIC_TYPE(jdouble, Double) + + void CallStaticVoidMethod(jclass clazz, jmethodID methodID, ...) + { + va_list args; + va_start(args, methodID); + functions->CallStaticVoidMethodV(this, clazz, methodID, args); + va_end(args); + } + void CallStaticVoidMethodV(jclass clazz, jmethodID methodID, va_list args) + { functions->CallStaticVoidMethodV(this, clazz, methodID, args); } + void CallStaticVoidMethodA(jclass clazz, jmethodID methodID, const jvalue* args) + { functions->CallStaticVoidMethodA(this, clazz, methodID, args); } + + jfieldID GetStaticFieldID(jclass clazz, const char* name, const char* sig) + { return functions->GetStaticFieldID(this, clazz, name, sig); } + + jobject GetStaticObjectField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticObjectField(this, clazz, fieldID); } + jboolean GetStaticBooleanField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticBooleanField(this, clazz, fieldID); } + jbyte GetStaticByteField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticByteField(this, clazz, fieldID); } + jchar GetStaticCharField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticCharField(this, clazz, fieldID); } + jshort GetStaticShortField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticShortField(this, clazz, fieldID); } + jint GetStaticIntField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticIntField(this, clazz, fieldID); } + jlong GetStaticLongField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticLongField(this, clazz, fieldID); } + jfloat GetStaticFloatField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticFloatField(this, clazz, fieldID); } + jdouble GetStaticDoubleField(jclass clazz, jfieldID fieldID) + { return functions->GetStaticDoubleField(this, clazz, fieldID); } + + void SetStaticObjectField(jclass clazz, jfieldID fieldID, jobject value) + { functions->SetStaticObjectField(this, clazz, fieldID, value); } + void SetStaticBooleanField(jclass clazz, jfieldID fieldID, jboolean value) + { functions->SetStaticBooleanField(this, clazz, fieldID, value); } + void SetStaticByteField(jclass clazz, jfieldID fieldID, jbyte value) + { functions->SetStaticByteField(this, clazz, fieldID, value); } + void SetStaticCharField(jclass clazz, jfieldID fieldID, jchar value) + { functions->SetStaticCharField(this, clazz, fieldID, value); } + void SetStaticShortField(jclass clazz, jfieldID fieldID, jshort value) + { functions->SetStaticShortField(this, clazz, fieldID, value); } + void SetStaticIntField(jclass clazz, jfieldID fieldID, jint value) + { functions->SetStaticIntField(this, clazz, fieldID, value); } + void SetStaticLongField(jclass clazz, jfieldID fieldID, jlong value) + { functions->SetStaticLongField(this, clazz, fieldID, value); } + void SetStaticFloatField(jclass clazz, jfieldID fieldID, jfloat value) + { functions->SetStaticFloatField(this, clazz, fieldID, value); } + void SetStaticDoubleField(jclass clazz, jfieldID fieldID, jdouble value) + { functions->SetStaticDoubleField(this, clazz, fieldID, value); } + + jstring NewString(const jchar* unicodeChars, jsize len) + { return functions->NewString(this, unicodeChars, len); } + + jsize GetStringLength(jstring string) + { return functions->GetStringLength(this, string); } + + const jchar* GetStringChars(jstring string, jboolean* isCopy) + { return functions->GetStringChars(this, string, isCopy); } + + void ReleaseStringChars(jstring string, const jchar* chars) + { functions->ReleaseStringChars(this, string, chars); } + + jstring NewStringUTF(const char* bytes) + { return functions->NewStringUTF(this, bytes); } + + jsize GetStringUTFLength(jstring string) + { return functions->GetStringUTFLength(this, string); } + + const char* GetStringUTFChars(jstring string, jboolean* isCopy) + { return functions->GetStringUTFChars(this, string, isCopy); } + + void ReleaseStringUTFChars(jstring string, const char* utf) + { functions->ReleaseStringUTFChars(this, string, utf); } + + jsize GetArrayLength(jarray array) + { return functions->GetArrayLength(this, array); } + + jobjectArray NewObjectArray(jsize length, jclass elementClass, + jobject initialElement) + { return functions->NewObjectArray(this, length, elementClass, + initialElement); } + + jobject GetObjectArrayElement(jobjectArray array, jsize index) + { return functions->GetObjectArrayElement(this, array, index); } + + void SetObjectArrayElement(jobjectArray array, jsize index, jobject value) + { functions->SetObjectArrayElement(this, array, index, value); } + + jbooleanArray NewBooleanArray(jsize length) + { return functions->NewBooleanArray(this, length); } + jbyteArray NewByteArray(jsize length) + { return functions->NewByteArray(this, length); } + jcharArray NewCharArray(jsize length) + { return functions->NewCharArray(this, length); } + jshortArray NewShortArray(jsize length) + { return functions->NewShortArray(this, length); } + jintArray NewIntArray(jsize length) + { return functions->NewIntArray(this, length); } + jlongArray NewLongArray(jsize length) + { return functions->NewLongArray(this, length); } + jfloatArray NewFloatArray(jsize length) + { return functions->NewFloatArray(this, length); } + jdoubleArray NewDoubleArray(jsize length) + { return functions->NewDoubleArray(this, length); } + + jboolean* GetBooleanArrayElements(jbooleanArray array, jboolean* isCopy) + { return functions->GetBooleanArrayElements(this, array, isCopy); } + jbyte* GetByteArrayElements(jbyteArray array, jboolean* isCopy) + { return functions->GetByteArrayElements(this, array, isCopy); } + jchar* GetCharArrayElements(jcharArray array, jboolean* isCopy) + { return functions->GetCharArrayElements(this, array, isCopy); } + jshort* GetShortArrayElements(jshortArray array, jboolean* isCopy) + { return functions->GetShortArrayElements(this, array, isCopy); } + jint* GetIntArrayElements(jintArray array, jboolean* isCopy) + { return functions->GetIntArrayElements(this, array, isCopy); } + jlong* GetLongArrayElements(jlongArray array, jboolean* isCopy) + { return functions->GetLongArrayElements(this, array, isCopy); } + jfloat* GetFloatArrayElements(jfloatArray array, jboolean* isCopy) + { return functions->GetFloatArrayElements(this, array, isCopy); } + jdouble* GetDoubleArrayElements(jdoubleArray array, jboolean* isCopy) + { return functions->GetDoubleArrayElements(this, array, isCopy); } + + void ReleaseBooleanArrayElements(jbooleanArray array, jboolean* elems, + jint mode) + { functions->ReleaseBooleanArrayElements(this, array, elems, mode); } + void ReleaseByteArrayElements(jbyteArray array, jbyte* elems, + jint mode) + { functions->ReleaseByteArrayElements(this, array, elems, mode); } + void ReleaseCharArrayElements(jcharArray array, jchar* elems, + jint mode) + { functions->ReleaseCharArrayElements(this, array, elems, mode); } + void ReleaseShortArrayElements(jshortArray array, jshort* elems, + jint mode) + { functions->ReleaseShortArrayElements(this, array, elems, mode); } + void ReleaseIntArrayElements(jintArray array, jint* elems, + jint mode) + { functions->ReleaseIntArrayElements(this, array, elems, mode); } + void ReleaseLongArrayElements(jlongArray array, jlong* elems, + jint mode) + { functions->ReleaseLongArrayElements(this, array, elems, mode); } + void ReleaseFloatArrayElements(jfloatArray array, jfloat* elems, + jint mode) + { functions->ReleaseFloatArrayElements(this, array, elems, mode); } + void ReleaseDoubleArrayElements(jdoubleArray array, jdouble* elems, + jint mode) + { functions->ReleaseDoubleArrayElements(this, array, elems, mode); } + + void GetBooleanArrayRegion(jbooleanArray array, jsize start, jsize len, + jboolean* buf) + { functions->GetBooleanArrayRegion(this, array, start, len, buf); } + void GetByteArrayRegion(jbyteArray array, jsize start, jsize len, + jbyte* buf) + { functions->GetByteArrayRegion(this, array, start, len, buf); } + void GetCharArrayRegion(jcharArray array, jsize start, jsize len, + jchar* buf) + { functions->GetCharArrayRegion(this, array, start, len, buf); } + void GetShortArrayRegion(jshortArray array, jsize start, jsize len, + jshort* buf) + { functions->GetShortArrayRegion(this, array, start, len, buf); } + void GetIntArrayRegion(jintArray array, jsize start, jsize len, + jint* buf) + { functions->GetIntArrayRegion(this, array, start, len, buf); } + void GetLongArrayRegion(jlongArray array, jsize start, jsize len, + jlong* buf) + { functions->GetLongArrayRegion(this, array, start, len, buf); } + void GetFloatArrayRegion(jfloatArray array, jsize start, jsize len, + jfloat* buf) + { functions->GetFloatArrayRegion(this, array, start, len, buf); } + void GetDoubleArrayRegion(jdoubleArray array, jsize start, jsize len, + jdouble* buf) + { functions->GetDoubleArrayRegion(this, array, start, len, buf); } + + void SetBooleanArrayRegion(jbooleanArray array, jsize start, jsize len, + const jboolean* buf) + { functions->SetBooleanArrayRegion(this, array, start, len, buf); } + void SetByteArrayRegion(jbyteArray array, jsize start, jsize len, + const jbyte* buf) + { functions->SetByteArrayRegion(this, array, start, len, buf); } + void SetCharArrayRegion(jcharArray array, jsize start, jsize len, + const jchar* buf) + { functions->SetCharArrayRegion(this, array, start, len, buf); } + void SetShortArrayRegion(jshortArray array, jsize start, jsize len, + const jshort* buf) + { functions->SetShortArrayRegion(this, array, start, len, buf); } + void SetIntArrayRegion(jintArray array, jsize start, jsize len, + const jint* buf) + { functions->SetIntArrayRegion(this, array, start, len, buf); } + void SetLongArrayRegion(jlongArray array, jsize start, jsize len, + const jlong* buf) + { functions->SetLongArrayRegion(this, array, start, len, buf); } + void SetFloatArrayRegion(jfloatArray array, jsize start, jsize len, + const jfloat* buf) + { functions->SetFloatArrayRegion(this, array, start, len, buf); } + void SetDoubleArrayRegion(jdoubleArray array, jsize start, jsize len, + const jdouble* buf) + { functions->SetDoubleArrayRegion(this, array, start, len, buf); } + + jint RegisterNatives(jclass clazz, const JNINativeMethod* methods, + jint nMethods) + { return functions->RegisterNatives(this, clazz, methods, nMethods); } + + jint UnregisterNatives(jclass clazz) + { return functions->UnregisterNatives(this, clazz); } + + jint MonitorEnter(jobject obj) + { return functions->MonitorEnter(this, obj); } + + jint MonitorExit(jobject obj) + { return functions->MonitorExit(this, obj); } + + jint GetJavaVM(JavaVM** vm) + { return functions->GetJavaVM(this, vm); } + + void GetStringRegion(jstring str, jsize start, jsize len, jchar* buf) + { functions->GetStringRegion(this, str, start, len, buf); } + + void GetStringUTFRegion(jstring str, jsize start, jsize len, char* buf) + { return functions->GetStringUTFRegion(this, str, start, len, buf); } + + void* GetPrimitiveArrayCritical(jarray array, jboolean* isCopy) + { return functions->GetPrimitiveArrayCritical(this, array, isCopy); } + + void ReleasePrimitiveArrayCritical(jarray array, void* carray, jint mode) + { functions->ReleasePrimitiveArrayCritical(this, array, carray, mode); } + + const jchar* GetStringCritical(jstring string, jboolean* isCopy) + { return functions->GetStringCritical(this, string, isCopy); } + + void ReleaseStringCritical(jstring string, const jchar* carray) + { functions->ReleaseStringCritical(this, string, carray); } + + jweak NewWeakGlobalRef(jobject obj) + { return functions->NewWeakGlobalRef(this, obj); } + + void DeleteWeakGlobalRef(jweak obj) + { functions->DeleteWeakGlobalRef(this, obj); } + + jboolean ExceptionCheck() + { return functions->ExceptionCheck(this); } + + jobject NewDirectByteBuffer(void* address, jlong capacity) + { return functions->NewDirectByteBuffer(this, address, capacity); } + + void* GetDirectBufferAddress(jobject buf) + { return functions->GetDirectBufferAddress(this, buf); } + + jlong GetDirectBufferCapacity(jobject buf) + { return functions->GetDirectBufferCapacity(this, buf); } + + /* added in JNI 1.6 */ + jobjectRefType GetObjectRefType(jobject obj) + { return functions->GetObjectRefType(this, obj); } +#endif /*__cplusplus*/ +}; + + +/* + * JNI invocation interface. + */ +struct JNIInvokeInterface { + void* reserved0; + void* reserved1; + void* reserved2; + + jint (*DestroyJavaVM)(JavaVM*); + jint (*AttachCurrentThread)(JavaVM*, JNIEnv**, void*); + jint (*DetachCurrentThread)(JavaVM*); + jint (*GetEnv)(JavaVM*, void**, jint); + jint (*AttachCurrentThreadAsDaemon)(JavaVM*, JNIEnv**, void*); +}; + +/* + * C++ version. + */ +struct _JavaVM { + const struct JNIInvokeInterface* functions; + +#if defined(__cplusplus) + jint DestroyJavaVM() + { return functions->DestroyJavaVM(this); } + jint AttachCurrentThread(JNIEnv** p_env, void* thr_args) + { return functions->AttachCurrentThread(this, p_env, thr_args); } + jint DetachCurrentThread() + { return functions->DetachCurrentThread(this); } + jint GetEnv(void** env, jint version) + { return functions->GetEnv(this, env, version); } + jint AttachCurrentThreadAsDaemon(JNIEnv** p_env, void* thr_args) + { return functions->AttachCurrentThreadAsDaemon(this, p_env, thr_args); } +#endif /*__cplusplus*/ +}; + +struct JavaVMAttachArgs { + jint version; /* must be >= JNI_VERSION_1_2 */ + const char* name; /* NULL or name of thread as modified UTF-8 str */ + jobject group; /* global ref of a ThreadGroup object, or NULL */ +}; +typedef struct JavaVMAttachArgs JavaVMAttachArgs; + +/* + * JNI 1.2+ initialization. (As of 1.6, the pre-1.2 structures are no + * longer supported.) + */ +typedef struct JavaVMOption { + const char* optionString; + void* extraInfo; +} JavaVMOption; + +typedef struct JavaVMInitArgs { + jint version; /* use JNI_VERSION_1_2 or later */ + + jint nOptions; + JavaVMOption* options; + jboolean ignoreUnrecognized; +} JavaVMInitArgs; + +#ifdef __cplusplus +extern "C" { +#endif +/* + * VM initialization functions. + * + * Note these are the only symbols exported for JNI by the VM. + */ +jint JNI_GetDefaultJavaVMInitArgs(void*); +jint JNI_CreateJavaVM(JavaVM**, JNIEnv**, void*); +jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*); + +#define JNIIMPORT +#define JNIEXPORT __attribute__ ((visibility ("default"))) +#define JNICALL + +/* + * Prototypes for functions exported by loadable shared libs. These are + * called by JNI, not provided by JNI. + */ +JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved); +JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved); + +#ifdef __cplusplus +} +#endif + + +/* + * Manifest constants. + */ +#define JNI_FALSE 0 +#define JNI_TRUE 1 + +#define JNI_VERSION_1_1 0x00010001 +#define JNI_VERSION_1_2 0x00010002 +#define JNI_VERSION_1_4 0x00010004 +#define JNI_VERSION_1_6 0x00010006 +#define JNI_VERSION_1_8 0x00010008 + +#define JNI_OK (0) /* no error */ +#define JNI_ERR (-1) /* generic error */ +#define JNI_EDETACHED (-2) /* thread detached from the VM */ +#define JNI_EVERSION (-3) /* JNI version error */ +#define JNI_ENOMEM (-4) /* Out of memory */ +#define JNI_EEXIST (-5) /* VM already created */ +#define JNI_EINVAL (-6) /* Invalid argument */ + +#define JNI_COMMIT 1 /* copy content, do not free buffer */ +#define JNI_ABORT 2 /* free buffer w/o copying back */ + diff --git a/iOSApp/PojavLauncher/main.m b/iOSApp/PojavLauncher/main.m new file mode 100644 index 00000000..2e91bc36 --- /dev/null +++ b/iOSApp/PojavLauncher/main.m @@ -0,0 +1,12 @@ +// +// main.m +// + +#import +#import "AppDelegate.h" + +int main(int argc, char * argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/src/main/jniLibs/libglass.a b/jniLibs/libglass.a similarity index 100% rename from src/main/jniLibs/libglass.a rename to jniLibs/libglass.a diff --git a/src/main/jniLibs/libjavafx_font.a b/jniLibs/libjavafx_font.a similarity index 100% rename from src/main/jniLibs/libjavafx_font.a rename to jniLibs/libjavafx_font.a diff --git a/src/main/jniLibs/libjavafx_iio.a b/jniLibs/libjavafx_iio.a similarity index 100% rename from src/main/jniLibs/libjavafx_iio.a rename to jniLibs/libjavafx_iio.a diff --git a/src/main/jniLibs/libjavafx_ios_webnode.a b/jniLibs/libjavafx_ios_webnode.a similarity index 100% rename from src/main/jniLibs/libjavafx_ios_webnode.a rename to jniLibs/libjavafx_ios_webnode.a diff --git a/src/main/jniLibs/libjfxmedia.a b/jniLibs/libjfxmedia.a similarity index 100% rename from src/main/jniLibs/libjfxmedia.a rename to jniLibs/libjfxmedia.a diff --git a/src/main/jniLibs/libprism_common.a b/jniLibs/libprism_common.a similarity index 100% rename from src/main/jniLibs/libprism_common.a rename to jniLibs/libprism_common.a diff --git a/src/main/jniLibs/libprism_es2.a b/jniLibs/libprism_es2.a similarity index 100% rename from src/main/jniLibs/libprism_es2.a rename to jniLibs/libprism_es2.a diff --git a/src/main/jniLibs/libprism_sw.a b/jniLibs/libprism_sw.a similarity index 100% rename from src/main/jniLibs/libprism_sw.a rename to jniLibs/libprism_sw.a