From d9421d61b147269903d2e0c99bcf7221465cda95 Mon Sep 17 00:00:00 2001 From: jonnymind Date: Tue, 19 Aug 2025 15:41:37 +0100 Subject: [PATCH] Reverting org.redotengine package to org.godotengine The package org.godotengine is used both for the Java portion of the editor launched on Android and for the SDK exposed to third party tools and plugins. The recent change to rename the package to org.redotengine has broken all the binary (and source) dependencies of third party software. This changes reverts the package declarations to org.godotengine. However, this can't be merged as is: we first need to identify all the sources that constitute the editor engine on Android, and move those only to org.redotengine. That is necessary to be able to publish the Redot editor on android separately from Godot (and possibly sign applications built with it). --- .../linux/org.redotengine.Redot.appdata.xml | 4 +- misc/dist/macos/editor_info_plist.template | 2 +- misc/dist/macos_tools.app/Contents/Info.plist | 2 +- .../gdextension_build/SConstruct | 2 +- .../gdextension_build/SConstruct | 2 +- platform/android/dialog_utils_jni.cpp | 4 +- platform/android/dialog_utils_jni.h | 4 +- platform/android/java/app/AndroidManifest.xml | 2 +- .../java/app/src/com/godot/game/GodotApp.java | 3 +- platform/android/java/editor/build.gradle | 4 +- .../org/godotengine/editor/GodotEditor.kt | 2 +- .../org/godotengine/editor/GodotEditor.kt | 2 +- .../org/godotengine/editor/BaseGodotEditor.kt | 32 ++++---- .../org/godotengine/editor/BaseGodotGame.kt | 10 +-- .../editor/EditorMessageDispatcher.kt | 2 +- .../godotengine/editor/EditorWindowInfo.kt | 2 +- .../java/org/godotengine/editor/GodotGame.kt | 10 +-- .../org/godotengine/editor/GodotXRGame.kt | 6 +- .../editor/embed/EmbeddedGodotGame.kt | 8 +- .../editor/embed/GameMenuFragment.kt | 10 +-- .../godotengine/editor/utils/ApkSignerUtil.kt | 6 +- .../org/godotengine/editor/GodotEditor.kt | 2 +- platform/android/java/lib/AndroidManifest.xml | 2 +- platform/android/java/lib/build.gradle | 2 +- ...android.vending.expansion.downloader.patch | 4 +- ...com.google.android.vending.licensing.patch | 2 +- .../vending/expansion/downloader/Helpers.java | 2 +- .../downloader/impl/DownloadNotification.java | 2 +- .../vending/licensing/util/Base64.java | 2 +- .../src/org/godotengine/godot/Dictionary.java | 2 +- .../godotengine/godot/FullScreenGodotApp.java | 2 +- .../lib/src/org/godotengine/godot/Godot.kt | 44 +++++------ .../org/godotengine/godot/GodotActivity.kt | 6 +- .../godot/GodotDownloaderAlarmReceiver.java | 2 +- .../godot/GodotDownloaderService.java | 2 +- .../org/godotengine/godot/GodotFragment.java | 10 +-- .../godotengine/godot/GodotGLRenderView.java | 24 +++--- .../src/org/godotengine/godot/GodotHost.java | 8 +- .../src/org/godotengine/godot/GodotIO.java | 8 +- .../src/org/godotengine/godot/GodotLib.java | 20 ++--- .../godotengine/godot/GodotRenderView.java | 8 +- .../src/org/godotengine/godot/GodotService.kt | 2 +- .../godot/GodotVulkanRenderView.java | 10 +-- .../src/org/godotengine/godot/error/Error.kt | 2 +- .../godotengine/godot/gl/EGLLogWrapper.java | 2 +- .../godotengine/godot/gl/GLSurfaceView.java | 2 +- .../godotengine/godot/gl/GodotRenderer.java | 10 +-- .../godot/input/GodotEditText.java | 6 +- .../godot/input/GodotGestureHandler.kt | 4 +- .../godot/input/GodotInputHandler.java | 12 +-- .../godot/input/GodotTextInputWrapper.java | 6 +- .../godot/input/InputEventRunnable.java | 6 +- .../org/godotengine/godot/input/Joystick.java | 2 +- .../org/godotengine/godot/io/FilePicker.kt | 6 +- .../org/godotengine/godot/io/StorageScope.kt | 4 +- .../io/directory/AssetsDirectoryAccess.kt | 10 +-- .../io/directory/DirectoryAccessHandler.kt | 8 +- .../io/directory/FilesystemDirectoryAccess.kt | 10 +-- .../godotengine/godot/io/file/AssetData.kt | 6 +- .../godotengine/godot/io/file/DataAccess.kt | 6 +- .../godot/io/file/FileAccessFlags.kt | 2 +- .../godot/io/file/FileAccessHandler.kt | 6 +- .../org/godotengine/godot/io/file/FileData.kt | 2 +- .../godot/io/file/MediaStoreData.kt | 2 +- .../godot/plugin/AndroidRuntimePlugin.kt | 6 +- .../godotengine/godot/plugin/GodotPlugin.java | 12 +-- .../godot/plugin/GodotPluginRegistry.java | 6 +- .../godotengine/godot/plugin/SignalInfo.java | 2 +- .../godotengine/godot/plugin/UsedByGodot.java | 2 +- .../org/godotengine/godot/tts/GodotTTS.java | 6 +- .../godotengine/godot/tts/GodotUtterance.java | 2 +- .../godotengine/godot/utils/BenchmarkUtils.kt | 10 +-- .../godot/utils/CommandLineFileParser.kt | 2 +- .../org/godotengine/godot/utils/Crypt.java | 2 +- .../godotengine/godot/utils/DeviceUtils.kt | 2 +- .../godotengine/godot/utils/DialogUtils.kt | 4 +- .../org/godotengine/godot/utils/GLUtils.java | 2 +- .../godotengine/godot/utils/GameMenuUtils.kt | 4 +- .../godot/utils/GodotNetUtils.java | 2 +- .../godot/utils/PermissionsUtil.java | 2 +- .../godot/utils/ProcessPhoenix.java | 2 +- .../org/godotengine/godot/variant/Callable.kt | 2 +- .../godotengine/godot/vulkan/VkRenderer.kt | 6 +- .../godotengine/godot/vulkan/VkSurfaceView.kt | 2 +- .../org/godotengine/godot/vulkan/VkThread.kt | 2 +- .../src/org/godotengine/godot/xr/XRMode.java | 2 +- .../godot/xr/ovr/OvrConfigChooser.java | 6 +- .../godot/xr/ovr/OvrContextFactory.java | 6 +- .../godot/xr/ovr/OvrWindowSurfaceFactory.java | 6 +- .../xr/regular/RegularConfigChooser.java | 8 +- .../xr/regular/RegularContextFactory.java | 8 +- .../regular/RegularFallbackConfigChooser.java | 2 +- .../godot/utils/CommandLineFileParserTest.kt | 2 +- .../java/nativeSrcsConfigs/build.gradle | 2 +- platform/android/java_godot_lib_jni.cpp | 78 +++++++++---------- platform/android/java_godot_lib_jni.h | 78 +++++++++---------- platform/android/java_godot_wrapper.cpp | 4 +- platform/android/jni_utils.cpp | 8 +- platform/android/plugin/godot_plugin_jni.cpp | 8 +- platform/android/plugin/godot_plugin_jni.h | 8 +- .../wayland/display_server_wayland.cpp | 6 +- platform/macos/display_server_macos.mm | 8 +- 102 files changed, 360 insertions(+), 359 deletions(-) diff --git a/misc/dist/linux/org.redotengine.Redot.appdata.xml b/misc/dist/linux/org.redotengine.Redot.appdata.xml index 39375318cdc..ad281c3860a 100644 --- a/misc/dist/linux/org.redotengine.Redot.appdata.xml +++ b/misc/dist/linux/org.redotengine.Redot.appdata.xml @@ -1,12 +1,12 @@ - org.redotengine.Redot + org.godotengine.Redot CC0-1.0 MIT Redot Engine Multi-platform 2D and 3D game engine with a feature-rich editor - org.redotengine.Redot.desktop + org.godotengine.Redot.desktop

Redot is forked from Godot which is an advanced, feature-packed, multi-platform 2D and 3D game diff --git a/misc/dist/macos/editor_info_plist.template b/misc/dist/macos/editor_info_plist.template index 1417618c379..462b85e6648 100644 --- a/misc/dist/macos/editor_info_plist.template +++ b/misc/dist/macos/editor_info_plist.template @@ -11,7 +11,7 @@ CFBundleIconFile Redot.icns CFBundleIdentifier - org.redotengine.redot + org.godotengine.redot CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/misc/dist/macos_tools.app/Contents/Info.plist b/misc/dist/macos_tools.app/Contents/Info.plist index 70af28a5a08..dd44a3bb73a 100644 --- a/misc/dist/macos_tools.app/Contents/Info.plist +++ b/misc/dist/macos_tools.app/Contents/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile Redot.icns CFBundleIdentifier - org.redotengine.redot + org.godotengine.redot CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/modules/text_server_adv/gdextension_build/SConstruct b/modules/text_server_adv/gdextension_build/SConstruct index 729445d29cd..36d210ef899 100644 --- a/modules/text_server_adv/gdextension_build/SConstruct +++ b/modules/text_server_adv/gdextension_build/SConstruct @@ -748,7 +748,7 @@ if env["platform"] == "macos": methods.write_macos_plist( f"./bin/libtextserver_advanced.macos.{env['target']}.framework", f"libtextserver_advanced.macos.{env['target']}", - "org.redotengine.textserver_advanced", + "org.godotengine.textserver_advanced", "ICU / HarfBuzz / Graphite Text Server", ) library = env.SharedLibrary( diff --git a/modules/text_server_fb/gdextension_build/SConstruct b/modules/text_server_fb/gdextension_build/SConstruct index 3f1e5603ddb..5a0adef7c5a 100644 --- a/modules/text_server_fb/gdextension_build/SConstruct +++ b/modules/text_server_fb/gdextension_build/SConstruct @@ -293,7 +293,7 @@ if env["platform"] == "macos": methods.write_macos_plist( f"./bin/libtextserver_fallback.macos.{env['target']}.framework", f"libtextserver_fallback.macos.{env['target']}", - "org.redotengine.textserver_fallback", + "org.godotengine.textserver_fallback", "Fallback Text Server", ) library = env.SharedLibrary( diff --git a/platform/android/dialog_utils_jni.cpp b/platform/android/dialog_utils_jni.cpp index 0ea4b57aaef..b6e0e218184 100644 --- a/platform/android/dialog_utils_jni.cpp +++ b/platform/android/dialog_utils_jni.cpp @@ -37,14 +37,14 @@ extern "C" { -JNIEXPORT void JNICALL Java_org_redotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index) { DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton(); if (ds) { ds->emit_dialog_callback(p_button_index); } } -JNIEXPORT void JNICALL Java_org_redotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text) { DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton(); if (ds) { String text = jstring_to_string(p_text, env); diff --git a/platform/android/dialog_utils_jni.h b/platform/android/dialog_utils_jni.h index f74307701d4..eceea9e3b0f 100644 --- a/platform/android/dialog_utils_jni.h +++ b/platform/android/dialog_utils_jni.h @@ -36,8 +36,8 @@ #include extern "C" { -JNIEXPORT void JNICALL Java_org_redotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index); -JNIEXPORT void JNICALL Java_org_redotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text); +JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index); +JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text); } #endif // DIALOG_UTILS_JNI_H diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/AndroidManifest.xml index 67406cf857d..1d59d15d560 100644 --- a/platform/android/java/app/AndroidManifest.xml +++ b/platform/android/java/app/AndroidManifest.xml @@ -31,7 +31,7 @@ diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle index 482c6570dac..f273105efcb 100644 --- a/platform/android/java/lib/build.gradle +++ b/platform/android/java/lib/build.gradle @@ -29,7 +29,7 @@ android { manifestPlaceholders = [godotLibraryVersion: getGodotLibraryVersionName()] } - namespace = "org.redotengine.godot" + namespace = "org.godotengine.godot" compileOptions { sourceCompatibility versions.javaVersion diff --git a/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch b/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch index 16c2f50b568..49cc41e817f 100644 --- a/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch +++ b/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch @@ -175,7 +175,7 @@ index e4b1b0f1c..36cd6aacf 100644 -import com.android.vending.expansion.downloader.R; +// -- GODOT start -- +//import com.android.vending.expansion.downloader.R; -+import org.redotengine.godot.R; ++import org.godotengine.godot.R; +// -- GODOT end -- import java.io.File; @@ -250,7 +250,7 @@ index f1536e80e..4b214b22d 100644 -import com.android.vending.expansion.downloader.R; +// -- GODOT start -- +//import com.android.vending.expansion.downloader.R; -+import org.redotengine.godot.R; ++import org.godotengine.godot.R; +// -- GODOT end -- + import com.google.android.vending.expansion.downloader.DownloadProgressInfo; diff --git a/platform/android/java/lib/patches/com.google.android.vending.licensing.patch b/platform/android/java/lib/patches/com.google.android.vending.licensing.patch index bd000670a67..4adb81d9519 100644 --- a/platform/android/java/lib/patches/com.google.android.vending.licensing.patch +++ b/platform/android/java/lib/patches/com.google.android.vending.licensing.patch @@ -21,7 +21,7 @@ index a0d2779af..a8bf65f9c 100644 */ +// -- GODOT start -- -import org.redotengine.godot.BuildConfig; +import org.godotengine.godot.BuildConfig; +// -- GODOT end -- + /** diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java index 4d00162d025..9aa65fd7861 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java @@ -26,7 +26,7 @@ // -- GODOT start -- //import com.android.vending.expansion.downloader.R; -import org.redotengine.godot.R; +import org.godotengine.godot.R; // -- GODOT end -- import java.io.File; diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java index 7f75eb1aa2a..d481c222042 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java @@ -18,7 +18,7 @@ // -- GODOT start -- //import com.android.vending.expansion.downloader.R; -import org.redotengine.godot.R; +import org.godotengine.godot.R; // -- GODOT end -- import com.google.android.vending.expansion.downloader.DownloadProgressInfo; diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java b/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java index 2e349b5ef8d..79efca9621d 100644 --- a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java +++ b/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java @@ -32,7 +32,7 @@ */ // -- GODOT start -- -import org.redotengine.godot.BuildConfig; +import org.godotengine.godot.BuildConfig; // -- GODOT end -- /** diff --git a/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java b/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java index 2fbf92e44ea..78e39eec410 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java +++ b/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; import java.util.HashMap; import java.util.Set; diff --git a/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java b/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java index 6df884e99b9..6c6bb129b92 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java +++ b/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; /** * Base abstract activity for Android apps intending to use Godot as the primary screen. diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt index 461dc793a6c..43a2c595387 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot +package org.godotengine.godot import android.annotation.SuppressLint import android.app.Activity @@ -55,27 +55,27 @@ import androidx.core.view.WindowInsetsAnimationCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import com.google.android.vending.expansion.downloader.* -import org.redotengine.godot.error.Error -import org.redotengine.godot.input.GodotEditText -import org.redotengine.godot.input.GodotInputHandler -import org.redotengine.godot.io.FilePicker -import org.redotengine.godot.io.directory.DirectoryAccessHandler -import org.redotengine.godot.io.file.FileAccessHandler -import org.redotengine.godot.plugin.AndroidRuntimePlugin -import org.redotengine.godot.plugin.GodotPlugin -import org.redotengine.godot.plugin.GodotPluginRegistry -import org.redotengine.godot.tts.GodotTTS -import org.redotengine.godot.utils.CommandLineFileParser -import org.redotengine.godot.utils.DialogUtils -import org.redotengine.godot.utils.GodotNetUtils -import org.redotengine.godot.utils.PermissionsUtil -import org.redotengine.godot.utils.PermissionsUtil.requestPermission -import org.redotengine.godot.utils.beginBenchmarkMeasure -import org.redotengine.godot.utils.benchmarkFile -import org.redotengine.godot.utils.dumpBenchmark -import org.redotengine.godot.utils.endBenchmarkMeasure -import org.redotengine.godot.utils.useBenchmark -import org.redotengine.godot.xr.XRMode +import org.godotengine.godot.error.Error +import org.godotengine.godot.input.GodotEditText +import org.godotengine.godot.input.GodotInputHandler +import org.godotengine.godot.io.FilePicker +import org.godotengine.godot.io.directory.DirectoryAccessHandler +import org.godotengine.godot.io.file.FileAccessHandler +import org.godotengine.godot.plugin.AndroidRuntimePlugin +import org.godotengine.godot.plugin.GodotPlugin +import org.godotengine.godot.plugin.GodotPluginRegistry +import org.godotengine.godot.tts.GodotTTS +import org.godotengine.godot.utils.CommandLineFileParser +import org.godotengine.godot.utils.DialogUtils +import org.godotengine.godot.utils.GodotNetUtils +import org.godotengine.godot.utils.PermissionsUtil +import org.godotengine.godot.utils.PermissionsUtil.requestPermission +import org.godotengine.godot.utils.beginBenchmarkMeasure +import org.godotengine.godot.utils.benchmarkFile +import org.godotengine.godot.utils.dumpBenchmark +import org.godotengine.godot.utils.endBenchmarkMeasure +import org.godotengine.godot.utils.useBenchmark +import org.godotengine.godot.xr.XRMode import java.io.File import java.io.FileInputStream import java.io.InputStream diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt index 4d37aa0ee72..ab09139e9f3 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot +package org.godotengine.godot import android.app.Activity import android.content.ComponentName @@ -41,8 +41,8 @@ import android.util.Log import androidx.annotation.CallSuper import androidx.annotation.LayoutRes import androidx.fragment.app.FragmentActivity -import org.redotengine.godot.utils.PermissionsUtil -import org.redotengine.godot.utils.ProcessPhoenix +import org.godotengine.godot.utils.PermissionsUtil +import org.godotengine.godot.utils.ProcessPhoenix /** * Base abstract activity for Android apps intending to use Godot as the primary screen. diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java index 748fb517499..bd2c8e0dced 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java index 357c758de1b..b8612532b75 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; import android.content.Context; import android.content.SharedPreferences; diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java b/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java index f75e359360b..ded33d09c4f 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java @@ -30,7 +30,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; + +import org.godotengine.godot.error.Error; +import org.godotengine.godot.plugin.GodotPlugin; +import org.godotengine.godot.utils.BenchmarkUtils; import android.app.Activity; import android.app.PendingIntent; @@ -69,10 +73,6 @@ import java.util.Locale; import java.util.Set; -import org.redotengine.godot.error.Error; -import org.redotengine.godot.plugin.GodotPlugin; -import org.redotengine.godot.utils.BenchmarkUtils; - /** * Base fragment for Android apps intending to use Godot for part of the app's UI. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java b/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java index e9c279f6457..97f602bd420 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java @@ -30,7 +30,18 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; + +import org.godotengine.godot.gl.GLSurfaceView; +import org.godotengine.godot.gl.GodotRenderer; +import org.godotengine.godot.input.GodotInputHandler; +import org.godotengine.godot.xr.XRMode; +import org.godotengine.godot.xr.ovr.OvrConfigChooser; +import org.godotengine.godot.xr.ovr.OvrContextFactory; +import org.godotengine.godot.xr.ovr.OvrWindowSurfaceFactory; +import org.godotengine.godot.xr.regular.RegularConfigChooser; +import org.godotengine.godot.xr.regular.RegularContextFactory; +import org.godotengine.godot.xr.regular.RegularFallbackConfigChooser; import android.annotation.SuppressLint; import android.content.res.AssetManager; @@ -49,17 +60,6 @@ import java.io.InputStream; -import org.redotengine.godot.gl.GLSurfaceView; -import org.redotengine.godot.gl.GodotRenderer; -import org.redotengine.godot.input.GodotInputHandler; -import org.redotengine.godot.xr.XRMode; -import org.redotengine.godot.xr.ovr.OvrConfigChooser; -import org.redotengine.godot.xr.ovr.OvrContextFactory; -import org.redotengine.godot.xr.ovr.OvrWindowSurfaceFactory; -import org.redotengine.godot.xr.regular.RegularConfigChooser; -import org.redotengine.godot.xr.regular.RegularContextFactory; -import org.redotengine.godot.xr.regular.RegularFallbackConfigChooser; - /** * A simple GLSurfaceView sub-class that demonstrate how to perform * OpenGL ES 2.0 rendering into a GL Surface. Note the following important diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java b/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java index dfae4a46b89..61585507675 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java @@ -30,7 +30,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; + +import org.godotengine.godot.error.Error; +import org.godotengine.godot.plugin.GodotPlugin; import android.app.Activity; @@ -40,9 +43,6 @@ import java.util.List; import java.util.Set; -import org.redotengine.godot.error.Error; -import org.redotengine.godot.plugin.GodotPlugin; - /** * Denotate a component (e.g: Activity, Fragment) that hosts the {@link Godot} engine. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java b/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java index 238985a0abe..ff55d54d152 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java @@ -30,7 +30,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; + +import org.godotengine.godot.error.Error; +import org.godotengine.godot.input.GodotEditText; import android.app.Activity; import android.content.Intent; @@ -53,9 +56,6 @@ import java.util.List; import java.util.Locale; -import org.redotengine.godot.error.Error; -import org.redotengine.godot.input.GodotEditText; - // Wrapper for native library public class GodotIO { diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java b/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java index 6d7adde0e91..8a08f8da9da 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java @@ -30,7 +30,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; + +import org.godotengine.godot.gl.GodotRenderer; +import org.godotengine.godot.io.directory.DirectoryAccessHandler; +import org.godotengine.godot.io.file.FileAccessHandler; +import org.godotengine.godot.tts.GodotTTS; +import org.godotengine.godot.utils.GodotNetUtils; +import org.godotengine.godot.variant.Callable; import android.app.Activity; import android.content.res.AssetManager; @@ -39,13 +46,6 @@ import javax.microedition.khronos.opengles.GL10; -import org.redotengine.godot.gl.GodotRenderer; -import org.redotengine.godot.io.directory.DirectoryAccessHandler; -import org.redotengine.godot.io.file.FileAccessHandler; -import org.redotengine.godot.tts.GodotTTS; -import org.redotengine.godot.utils.GodotNetUtils; -import org.redotengine.godot.variant.Callable; - /** * Wrapper for native library */ @@ -83,7 +83,7 @@ public static native boolean initialize(Activity activity, * @param p_surface * @param p_width * @param p_height - * @see org.redotengine.godot.gl.GLSurfaceView.Renderer#onSurfaceChanged(GL10, int, int) + * @see org.godotengine.godot.gl.GLSurfaceView.Renderer#onSurfaceChanged(GL10, int, int) */ public static native void resize(Surface p_surface, int p_width, int p_height); @@ -100,7 +100,7 @@ public static native boolean initialize(Activity activity, /** * Invoked on the GL thread to draw the current frame. - * @see org.redotengine.godot.gl.GLSurfaceView.Renderer#onDrawFrame(GL10) + * @see org.godotengine.godot.gl.GLSurfaceView.Renderer#onDrawFrame(GL10) */ public static native boolean step(); diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java b/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java index 201ffb2fc89..f97efa48cfc 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java @@ -30,12 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; -import android.view.SurfaceView; +import org.godotengine.godot.input.GodotInputHandler; +import org.godotengine.godot.utils.DeviceUtils; -import org.redotengine.godot.input.GodotInputHandler; -import org.redotengine.godot.utils.DeviceUtils; +import android.view.SurfaceView; public interface GodotRenderView { SurfaceView getView(); diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotService.kt b/platform/android/java/lib/src/org/godotengine/godot/GodotService.kt index 2d49cb5725a..795dc921c7f 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotService.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotService.kt @@ -1,4 +1,4 @@ -package org.redotengine.godot +package org.godotengine.godot import android.app.Service import android.content.Intent diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java b/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java index 07c75cacdd1..2bbc72380c1 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java @@ -30,7 +30,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot; +package org.godotengine.godot; + +import org.godotengine.godot.input.GodotInputHandler; +import org.godotengine.godot.vulkan.VkRenderer; +import org.godotengine.godot.vulkan.VkSurfaceView; import android.annotation.SuppressLint; import android.content.res.AssetManager; @@ -48,10 +52,6 @@ import java.io.InputStream; -import org.redotengine.godot.input.GodotInputHandler; -import org.redotengine.godot.vulkan.VkRenderer; -import org.redotengine.godot.vulkan.VkSurfaceView; - class GodotVulkanRenderView extends VkSurfaceView implements GodotRenderView { private final GodotHost host; private final Godot godot; diff --git a/platform/android/java/lib/src/org/godotengine/godot/error/Error.kt b/platform/android/java/lib/src/org/godotengine/godot/error/Error.kt index a0f65954cda..f6777263133 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/error/Error.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/error/Error.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.error +package org.godotengine.godot.error /** * Godot error list. diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java b/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java index b82b72bdc8c..af16cfce744 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.redotengine.godot.gl; +package org.godotengine.godot.gl; import android.opengl.GLDebugHelper; import android.opengl.GLException; diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java b/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java index 9001ff6fec4..6a4e9da699e 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.redotengine.godot.gl; +package org.godotengine.godot.gl; import android.content.Context; import android.opengl.EGL14; diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java b/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java index a696c3596ff..b40ffa026fa 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java @@ -30,17 +30,17 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.gl; +package org.godotengine.godot.gl; + +import org.godotengine.godot.GodotLib; +import org.godotengine.godot.plugin.GodotPlugin; +import org.godotengine.godot.plugin.GodotPluginRegistry; import android.util.Log; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; -import org.redotengine.godot.GodotLib; -import org.redotengine.godot.plugin.GodotPlugin; -import org.redotengine.godot.plugin.GodotPluginRegistry; - /** * Godot's GL renderer implementation. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java index 88082819a41..c1eb36799b5 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java @@ -30,7 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.input; +package org.godotengine.godot.input; + +import org.godotengine.godot.*; import android.content.Context; import android.content.res.Configuration; @@ -50,8 +52,6 @@ import java.lang.ref.WeakReference; import java.util.Locale; -import org.redotengine.godot.*; - public class GodotEditText extends EditText { // =========================================================== // Constants diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt index d52bca49c8f..a344778e521 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.input +package org.godotengine.godot.input import android.os.Build import android.view.GestureDetector.SimpleOnGestureListener @@ -38,7 +38,7 @@ import android.view.InputDevice import android.view.MotionEvent import android.view.ScaleGestureDetector import android.view.ScaleGestureDetector.OnScaleGestureListener -import org.redotengine.godot.GodotLib +import org.godotengine.godot.GodotLib /** * Handles regular and scale gesture input related events for the [GodotView] view. diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java index adccb17a79e..624d08e82e3 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java @@ -30,9 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.input; +package org.godotengine.godot.input; -import static org.redotengine.godot.utils.GLUtils.DEBUG; +import static org.godotengine.godot.utils.GLUtils.DEBUG; + +import org.godotengine.godot.Godot; +import org.godotengine.godot.GodotLib; +import org.godotengine.godot.GodotRenderView; import android.content.Context; import android.content.res.Configuration; @@ -59,10 +63,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.redotengine.godot.Godot; -import org.redotengine.godot.GodotLib; -import org.redotengine.godot.GodotRenderView; - /** * Handles input related events for the {@link GodotRenderView} view. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java index 16fa4542506..48dbf37eaaf 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java @@ -30,7 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.input; +package org.godotengine.godot.input; + +import org.godotengine.godot.*; import android.content.Context; import android.text.Editable; @@ -41,8 +43,6 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import org.redotengine.godot.*; - public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListener { // =========================================================== // Constants diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/InputEventRunnable.java b/platform/android/java/lib/src/org/godotengine/godot/input/InputEventRunnable.java index d178f3ea87b..a67cdd4b645 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/InputEventRunnable.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/InputEventRunnable.java @@ -30,7 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.input; +package org.godotengine.godot.input; + +import org.godotengine.godot.GodotLib; import android.hardware.Sensor; import android.util.Log; @@ -43,8 +45,6 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.atomic.AtomicInteger; -import org.redotengine.godot.GodotLib; - /** * Used to dispatch input events. * diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java b/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java index 528c6d55eb3..891aae035d0 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.input; +package org.godotengine.godot.input; import android.util.SparseArray; diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/FilePicker.kt b/platform/android/java/lib/src/org/godotengine/godot/io/FilePicker.kt index 122a17d021c..cb8ef98c252 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/FilePicker.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/FilePicker.kt @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io +package org.godotengine.godot.io import android.app.Activity import android.content.Context @@ -39,8 +39,8 @@ import android.provider.DocumentsContract import android.util.Log import android.webkit.MimeTypeMap import androidx.annotation.RequiresApi -import org.redotengine.godot.GodotLib -import org.redotengine.godot.io.file.MediaStoreData +import org.godotengine.godot.GodotLib +import org.godotengine.godot.io.file.MediaStoreData /** * Utility class for managing file selection and file picker activities. diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt b/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt index ea01b27982c..b5a60b0c162 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt @@ -30,13 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io +package org.godotengine.godot.io import android.content.Context import android.os.Build import android.os.Environment import java.io.File -import org.redotengine.godot.GodotLib +import org.godotengine.godot.GodotLib /** * Represents the different storage scopes. diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt b/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt index 2caf2226b11..1b353429512 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt @@ -30,15 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.directory +package org.godotengine.godot.io.directory import android.content.Context import android.util.Log import android.util.SparseArray -import org.redotengine.godot.io.StorageScope -import org.redotengine.godot.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID -import org.redotengine.godot.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID -import org.redotengine.godot.io.file.AssetData +import org.godotengine.godot.io.StorageScope +import org.godotengine.godot.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID +import org.godotengine.godot.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID +import org.godotengine.godot.io.file.AssetData import java.io.File import java.io.IOException diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt index cafa17d0cff..a8a0de9ec13 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt @@ -30,13 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.directory +package org.godotengine.godot.io.directory import android.content.Context import android.util.Log -import org.redotengine.godot.Godot -import org.redotengine.godot.io.StorageScope -import org.redotengine.godot.io.directory.DirectoryAccessHandler.AccessType.ACCESS_RESOURCES +import org.godotengine.godot.Godot +import org.godotengine.godot.io.StorageScope +import org.godotengine.godot.io.directory.DirectoryAccessHandler.AccessType.ACCESS_RESOURCES /** * Handles files and directories access and manipulation for the Android platform diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt b/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt index c065d578114..1db64066721 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.directory +package org.godotengine.godot.io.directory import android.annotation.SuppressLint import android.content.Context @@ -38,10 +38,10 @@ import android.os.Build import android.os.storage.StorageManager import android.util.Log import android.util.SparseArray -import org.redotengine.godot.io.StorageScope -import org.redotengine.godot.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID -import org.redotengine.godot.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID -import org.redotengine.godot.io.file.FileAccessHandler +import org.godotengine.godot.io.StorageScope +import org.godotengine.godot.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID +import org.godotengine.godot.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID +import org.godotengine.godot.io.file.FileAccessHandler import java.io.File /** diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt index 5e5d735dbd8..2ed2b51d0c2 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt @@ -30,13 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.file +package org.godotengine.godot.io.file import android.content.Context import android.content.res.AssetManager import android.util.Log -import org.redotengine.godot.error.Error -import org.redotengine.godot.io.directory.AssetsDirectoryAccess +import org.godotengine.godot.error.Error +import org.godotengine.godot.io.directory.AssetsDirectoryAccess import java.io.IOException import java.io.InputStream import java.lang.UnsupportedOperationException diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt index 4d6c778da18..8696f60eb77 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt @@ -30,13 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.file +package org.godotengine.godot.io.file import android.content.Context import android.os.Build import android.util.Log -import org.redotengine.godot.error.Error -import org.redotengine.godot.io.StorageScope +import org.godotengine.godot.error.Error +import org.godotengine.godot.io.StorageScope import java.io.FileNotFoundException import java.io.IOException import java.io.InputStream diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt index ba0a23c65e4..69bed828beb 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.file +package org.godotengine.godot.io.file /** * Android representation of Godot native access flags. diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt index b97a381d5b8..b1abf89d718 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt @@ -30,13 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.file +package org.godotengine.godot.io.file import android.content.Context import android.util.Log import android.util.SparseArray -import org.redotengine.godot.error.Error -import org.redotengine.godot.io.StorageScope +import org.godotengine.godot.error.Error +import org.godotengine.godot.io.StorageScope import java.io.FileNotFoundException import java.io.InputStream import java.lang.UnsupportedOperationException diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt index 1e5d1db620a..d780732dfe0 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.file +package org.godotengine.godot.io.file import java.io.File import java.io.FileOutputStream diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt index cf9fa6039d8..7f83dda3c20 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.io.file +package org.godotengine.godot.io.file import android.content.ContentUris import android.content.ContentValues diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt b/platform/android/java/lib/src/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt index c8b104c05e8..4b2ae9289d3 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/AndroidRuntimePlugin.kt @@ -30,10 +30,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.plugin +package org.godotengine.godot.plugin -import org.redotengine.godot.Godot -import org.redotengine.godot.variant.Callable +import org.godotengine.godot.Godot +import org.godotengine.godot.variant.Callable /** * Provides access to the Android runtime capabilities. diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java index 35ecaf106b6..16c4b6bddcf 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java @@ -30,7 +30,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.plugin; +package org.godotengine.godot.plugin; + +import org.godotengine.godot.BuildConfig; +import org.godotengine.godot.Godot; import android.app.Activity; import android.content.Intent; @@ -55,9 +58,6 @@ import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; -import org.redotengine.godot.BuildConfig; -import org.redotengine.godot.Godot; - /** * Base class for Godot Android plugins. *

@@ -66,7 +66,7 @@ * - The plugin must have a dependency on the Godot Android library: `implementation "org.godotengine:godot:"` *

* - The plugin must include a tag in its Android manifest with the following format: - * + * *

* Where: *

@@ -169,7 +169,7 @@ public final void onRegisterPluginWithGodotNative() { /** * Invoked once during the initialization process after creation of the - * {@link org.redotengine.godot.GodotRenderView} view. + * {@link org.godotengine.godot.GodotRenderView} view. *

* The plugin can return a non-null {@link View} layout which will be added to the Godot view * hierarchy. diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java index d1c50d3ec36..41df36ee47f 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java @@ -30,7 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.plugin; +package org.godotengine.godot.plugin; + +import org.godotengine.godot.Godot; import android.app.Activity; import android.content.pm.ApplicationInfo; @@ -47,8 +49,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.redotengine.godot.Godot; - /** * Registry used to load and access the registered Godot Android plugins. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java index 03e21f576ad..d5878a41193 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.plugin; +package org.godotengine.godot.plugin; import android.text.TextUtils; diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java index 3e2047ad551..e679860468a 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.plugin; +package org.godotengine.godot.plugin; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java index 8e290963dc4..366fd3083ba 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java +++ b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java @@ -30,7 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.tts; +package org.godotengine.godot.tts; + +import org.godotengine.godot.GodotLib; import android.app.Activity; import android.content.Context; @@ -45,8 +47,6 @@ import java.util.LinkedList; import java.util.Set; -import org.redotengine.godot.GodotLib; - /** * Wrapper for Android Text to Speech API and custom utterance query implementation. *

diff --git a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java index 0ba9d354aba..b89f983056d 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java +++ b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.tts; +package org.godotengine.godot.tts; /** * A speech request for GodotTTS. diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt b/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt index 20ab247ca8f..61e40ca6c66 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt @@ -32,16 +32,16 @@ @file:JvmName("BenchmarkUtils") -package org.redotengine.godot.utils +package org.godotengine.godot.utils import android.os.Build import android.os.SystemClock import android.os.Trace import android.util.Log -import org.redotengine.godot.BuildConfig -import org.redotengine.godot.error.Error -import org.redotengine.godot.io.file.FileAccessFlags -import org.redotengine.godot.io.file.FileAccessHandler +import org.godotengine.godot.BuildConfig +import org.godotengine.godot.error.Error +import org.godotengine.godot.io.file.FileAccessFlags +import org.godotengine.godot.io.file.FileAccessHandler import org.json.JSONObject import java.nio.ByteBuffer import java.util.Collections diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt b/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt index 421f36828e7..4e083efd369 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.utils +package org.godotengine.godot.utils import java.io.InputStream import java.nio.charset.StandardCharsets diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java b/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java index 57250ce1704..3ff220dd77e 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.utils; +package org.godotengine.godot.utils; import java.security.MessageDigest; import java.util.Random; diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt b/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt index 32c0e067587..c455e4b60e6 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/DeviceUtils.kt @@ -35,7 +35,7 @@ */ @file:JvmName("DeviceUtils") -package org.redotengine.godot.utils +package org.godotengine.godot.utils import android.content.Context import android.os.Build diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/DialogUtils.kt b/platform/android/java/lib/src/org/godotengine/godot/utils/DialogUtils.kt index e044c62b83f..0f621914e37 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/DialogUtils.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/DialogUtils.kt @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.utils +package org.godotengine.godot.utils import android.app.Activity import android.app.AlertDialog @@ -46,7 +46,7 @@ import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView -import org.redotengine.godot.R +import org.godotengine.godot.R import kotlin.math.abs /** diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java b/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java index af95a198344..815dedc7e46 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.utils; +package org.godotengine.godot.utils; import android.util.Log; diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/GameMenuUtils.kt b/platform/android/java/lib/src/org/godotengine/godot/utils/GameMenuUtils.kt index 0126f694ac6..f1bbe2fb3c0 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/GameMenuUtils.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/GameMenuUtils.kt @@ -30,10 +30,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.utils +package org.godotengine.godot.utils import android.util.Log -import org.redotengine.godot.GodotLib +import org.godotengine.godot.GodotLib /** * Utility class for accessing and using game menu APIs. diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java b/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java index 779b0c46ef5..e5df219a3e8 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.utils; +package org.godotengine.godot.utils; import android.app.Activity; import android.content.Context; diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java b/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java index 4ba8054b07b..64286c262cd 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.utils; +package org.godotengine.godot.utils; import android.Manifest; import android.app.Activity; diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java b/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java index f9a53177ea3..d9afdf90b13 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redotengine.godot.utils; +package org.godotengine.godot.utils; import android.app.Activity; import android.app.ActivityManager; diff --git a/platform/android/java/lib/src/org/godotengine/godot/variant/Callable.kt b/platform/android/java/lib/src/org/godotengine/godot/variant/Callable.kt index 8b5d591ca65..177a7670764 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/variant/Callable.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/variant/Callable.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.variant +package org.godotengine.godot.variant import androidx.annotation.Keep diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt index 3d06ebf90b9..04e64b21a2d 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt @@ -31,12 +31,12 @@ /**************************************************************************/ @file:JvmName("VkRenderer") -package org.redotengine.godot.vulkan +package org.godotengine.godot.vulkan import android.util.Log import android.view.Surface -import org.redotengine.godot.GodotLib -import org.redotengine.godot.plugin.GodotPluginRegistry +import org.godotengine.godot.GodotLib +import org.godotengine.godot.plugin.GodotPluginRegistry /** * Responsible to setting up and driving the Vulkan rendering logic. diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt index c24b5ac8482..3bfe2a313a2 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt @@ -31,7 +31,7 @@ /**************************************************************************/ @file:JvmName("VkSurfaceView") -package org.redotengine.godot.vulkan +package org.godotengine.godot.vulkan import android.content.Context import android.view.SurfaceHolder diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt index 36d59721617..783fc707dac 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt @@ -31,7 +31,7 @@ /**************************************************************************/ @file:JvmName("VkThread") -package org.redotengine.godot.vulkan +package org.godotengine.godot.vulkan import android.util.Log import java.util.concurrent.locks.ReentrantLock diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java b/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java index 09c35e8aeeb..3e08c6e952b 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.xr; +package org.godotengine.godot.xr; /** * Godot available XR modes. diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java index 91e32b7476e..bb57e0643ff 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java @@ -30,7 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.xr.ovr; +package org.godotengine.godot.xr.ovr; + +import org.godotengine.godot.gl.GLSurfaceView; import android.opengl.EGLExt; @@ -38,8 +40,6 @@ import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLDisplay; -import org.redotengine.godot.gl.GLSurfaceView; - /** * EGL config chooser for the Oculus Mobile VR SDK. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java index e6a0df2cc1d..4c55a66ef32 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java @@ -30,7 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.xr.ovr; +package org.godotengine.godot.xr.ovr; + +import org.godotengine.godot.gl.GLSurfaceView; import android.opengl.EGL14; @@ -39,8 +41,6 @@ import javax.microedition.khronos.egl.EGLContext; import javax.microedition.khronos.egl.EGLDisplay; -import org.redotengine.godot.gl.GLSurfaceView; - /** * EGL Context factory for the Oculus mobile VR SDK. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java index 4fe9d06ebda..00d31f44d85 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java @@ -30,15 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.xr.ovr; +package org.godotengine.godot.xr.ovr; + +import org.godotengine.godot.gl.GLSurfaceView; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLDisplay; import javax.microedition.khronos.egl.EGLSurface; -import org.redotengine.godot.gl.GLSurfaceView; - /** * EGL window surface factory for the Oculus mobile VR SDK. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java index c95e25708c8..76b6eed3378 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java @@ -30,15 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.xr.regular; +package org.godotengine.godot.xr.regular; + +import org.godotengine.godot.gl.GLSurfaceView; +import org.godotengine.godot.utils.GLUtils; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLDisplay; -import org.redotengine.godot.gl.GLSurfaceView; -import org.redotengine.godot.utils.GLUtils; - /** * Used to select the egl config for pancake games. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java index 2ec2a7a1be1..110616a9bbf 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java @@ -30,7 +30,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.xr.regular; +package org.godotengine.godot.xr.regular; + +import org.godotengine.godot.gl.GLSurfaceView; +import org.godotengine.godot.utils.GLUtils; import android.util.Log; @@ -39,9 +42,6 @@ import javax.microedition.khronos.egl.EGLContext; import javax.microedition.khronos.egl.EGLDisplay; -import org.redotengine.godot.gl.GLSurfaceView; -import org.redotengine.godot.utils.GLUtils; - /** * Factory used to setup the opengl context for pancake games. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java index f789c726bad..1a2e68cf0f1 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.xr.regular; +package org.godotengine.godot.xr.regular; import android.util.Log; diff --git a/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt b/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt index f9e858edef1..a4be4d2a069 100644 --- a/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt +++ b/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.redotengine.godot.utils +package org.godotengine.godot.utils import org.junit.Test import org.junit.runner.RunWith diff --git a/platform/android/java/nativeSrcsConfigs/build.gradle b/platform/android/java/nativeSrcsConfigs/build.gradle index bb9df54f697..a7282411810 100644 --- a/platform/android/java/nativeSrcsConfigs/build.gradle +++ b/platform/android/java/nativeSrcsConfigs/build.gradle @@ -9,7 +9,7 @@ android { buildToolsVersion versions.buildTools ndkVersion versions.ndkVersion - namespace = "org.redotengine.godot" + namespace = "org.godotengine.godot" defaultConfig { minSdkVersion versions.minSdk diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index 1c1d99a454d..fdd9710b2fe 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -137,13 +137,13 @@ static void _terminate(JNIEnv *env, bool p_restart = false) { extern "C" { -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height) { if (godot_io_java) { godot_io_java->set_vk_height(p_height); } } -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion) { +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion) { JavaVM *jvm; env->GetJavaVM(&jvm); @@ -163,11 +163,11 @@ JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_initialize(JNIEnv return true; } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz) { _terminate(env, false); } -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts) { +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts) { setup_android_thread(); const char **cmdline = nullptr; @@ -214,7 +214,7 @@ JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_setup(JNIEnv *env return true; } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_resize(JNIEnv *env, jclass clazz, jobject p_surface, jint p_width, jint p_height) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv *env, jclass clazz, jobject p_surface, jint p_width, jint p_height) { if (os_android) { os_android->set_display_size(Size2i(p_width, p_height)); @@ -230,7 +230,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_resize(JNIEnv *env, j } } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_newcontext(JNIEnv *env, jclass clazz, jobject p_surface) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv *env, jclass clazz, jobject p_surface) { if (os_android) { if (step.get() == STEP_SETUP) { // During startup @@ -245,7 +245,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_newcontext(JNIEnv *en } } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_back(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -255,11 +255,11 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_back(JNIEnv *env, jcl } } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos) { TTS_Android::_java_utterance_callback(event, id, pos); } -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_step(JNIEnv *env, jclass clazz) { +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, jclass clazz) { if (step.get() == STEP_TERMINATED) { return true; } @@ -317,7 +317,7 @@ JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_step(JNIEnv *env, } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchMouseEvent(JNIEnv *env, jclass clazz, jint p_event_type, jint p_button_mask, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y, jboolean p_double_click, jboolean p_source_mouse_relative, jfloat p_pressure, jfloat p_tilt_x, jfloat p_tilt_y) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchMouseEvent(JNIEnv *env, jclass clazz, jint p_event_type, jint p_button_mask, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y, jboolean p_double_click, jboolean p_source_mouse_relative, jfloat p_pressure, jfloat p_tilt_x, jfloat p_tilt_y) { if (step.get() <= STEP_SETUP) { return; } @@ -326,7 +326,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchMouseEvent(JN } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchTouchEvent(JNIEnv *env, jclass clazz, jint ev, jint pointer, jint pointer_count, jfloatArray position, jboolean p_double_tap) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchTouchEvent(JNIEnv *env, jclass clazz, jint ev, jint pointer, jint pointer_count, jfloatArray position, jboolean p_double_tap) { if (step.get() <= STEP_SETUP) { return; } @@ -347,7 +347,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchTouchEvent(JN } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnify(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_factor) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnify(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_factor) { if (step.get() <= STEP_SETUP) { return; } @@ -355,7 +355,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnify(JNIEnv *env, } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_pan(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_pan(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y) { if (step.get() <= STEP_SETUP) { return; } @@ -363,7 +363,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_pan(JNIEnv *env, jcla } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed) { if (step.get() <= STEP_SETUP) { return; } @@ -378,7 +378,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joybutton(JNIEnv *env } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value) { if (step.get() <= STEP_SETUP) { return; } @@ -393,7 +393,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyaxis(JNIEnv *env, } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y) { if (step.get() <= STEP_SETUP) { return; } @@ -422,7 +422,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyhat(JNIEnv *env, j } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name) { if (os_android) { String name = jstring_to_string(p_name, env); Input::get_singleton()->joy_connection_changed(p_device, p_connected, name); @@ -430,30 +430,30 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyconnectionchanged( } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_physical_keycode, jint p_unicode, jint p_key_label, jboolean p_pressed, jboolean p_echo) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_physical_keycode, jint p_unicode, jint p_key_label, jboolean p_pressed, jboolean p_echo) { if (step.get() <= STEP_SETUP) { return; } input_handler->process_key_event(p_physical_keycode, p_unicode, p_key_label, p_pressed, p_echo); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { accelerometer = Vector3(x, y, z); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_gravity(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gravity(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { gravity = Vector3(x, y, z); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnetometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnetometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { magnetometer = Vector3(x, y, z); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_gyroscope(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { gyroscope = Vector3(x, y, z); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -461,7 +461,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusin(JNIEnv *env, os_android->main_loop_focusin(); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -469,7 +469,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusout(JNIEnv *env, os_android->main_loop_focusout(); } -JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path) { +JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path) { String js = jstring_to_string(path, env); Variant setting_with_override = GLOBAL_GET(js); @@ -477,7 +477,7 @@ JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getGlobal(JNIEnv * return env->NewStringUTF(setting_value.utf8().get_data()); } -JNIEXPORT jobjectArray JNICALL Java_org_redotengine_godot_GodotLib_getRendererInfo(JNIEnv *env, jclass clazz) { +JNIEXPORT jobjectArray JNICALL Java_org_godotengine_godot_GodotLib_getRendererInfo(JNIEnv *env, jclass clazz) { String rendering_driver = RenderingServer::get_singleton()->get_current_rendering_driver_name(); String rendering_method = RenderingServer::get_singleton()->get_current_rendering_method(); @@ -488,7 +488,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_redotengine_godot_GodotLib_getRendererIn return result; } -JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key) { +JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key) { String editor_setting_value = ""; #ifdef TOOLS_ENABLED String godot_setting_key = jstring_to_string(p_setting_key, env); @@ -501,7 +501,7 @@ JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getEditorSetting(J return env->NewStringUTF(editor_setting_value.utf8().get_data()); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setEditorSetting(JNIEnv *env, jclass clazz, jstring p_key, jobject p_data) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setEditorSetting(JNIEnv *env, jclass clazz, jstring p_key, jobject p_data) { #ifdef TOOLS_ENABLED if (EditorSettings::get_singleton() != nullptr) { String key = jstring_to_string(p_key, env); @@ -513,7 +513,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setEditorSetting(JNIE #endif } -JNIEXPORT jobject JNICALL Java_org_redotengine_godot_GodotLib_getEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_default_value) { +JNIEXPORT jobject JNICALL Java_org_godotengine_godot_GodotLib_getEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_default_value) { jvalret result; #ifdef TOOLS_ENABLED @@ -531,7 +531,7 @@ JNIEXPORT jobject JNICALL Java_org_redotengine_godot_GodotLib_getEditorProjectMe return result.obj; } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_data) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_data) { #ifdef TOOLS_ENABLED if (EditorSettings::get_singleton() != nullptr) { String section = jstring_to_string(p_section, env); @@ -544,14 +544,14 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setEditorProjectMetad #endif } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz) { DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton(); if (ds) { ds->emit_system_theme_changed(); } } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths) { DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton(); if (ds) { Vector selected_paths; @@ -567,7 +567,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_filePickerCallback(JN } } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result) { String permission = jstring_to_string(p_permission, env); if (permission == "android.permission.RECORD_AUDIO" && p_result) { AudioDriver::get_singleton()->input_start(); @@ -578,7 +578,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_requestPermissionResu } } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -590,7 +590,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererResumed(JNI } } -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -600,7 +600,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererPaused(JNIE } } -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz) { +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz) { Input *input = Input::get_singleton(); if (input) { return !input->is_agile_input_event_flushing(); @@ -608,11 +608,11 @@ JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_shouldDispatchInp return false; } -JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getProjectResourceDir(JNIEnv *env, jclass clazz) { +JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getProjectResourceDir(JNIEnv *env, jclass clazz) { const String resource_dir = OS::get_singleton()->get_resource_dir(); return env->NewStringUTF(resource_dir.utf8().get_data()); } -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_isEditorHint(JNIEnv *env, jclass clazz) { +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isEditorHint(JNIEnv *env, jclass clazz) { Engine *engine = Engine::get_singleton(); if (engine) { return engine->is_editor_hint(); @@ -620,7 +620,7 @@ JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_isEditorHint(JNIE return false; } -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_isProjectManagerHint(JNIEnv *env, jclass clazz) { +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isProjectManagerHint(JNIEnv *env, jclass clazz) { Engine *engine = Engine::get_singleton(); if (engine) { return engine->is_project_manager_hint(); diff --git a/platform/android/java_godot_lib_jni.h b/platform/android/java_godot_lib_jni.h index 8623cec6442..53c20113df2 100644 --- a/platform/android/java_godot_lib_jni.h +++ b/platform/android/java_godot_lib_jni.h @@ -39,45 +39,45 @@ // These functions can be called from within JAVA and are the means by which our JAVA implementation calls back into our C++ code. // See java/src/org/godotengine/godot/GodotLib.java for the JAVA side of this (yes that's why we have the long names) extern "C" { -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz); -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_resize(JNIEnv *env, jclass clazz, jobject p_surface, jint p_width, jint p_height); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_newcontext(JNIEnv *env, jclass clazz, jobject p_surface); -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_step(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_back(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchMouseEvent(JNIEnv *env, jclass clazz, jint p_event_type, jint p_button_mask, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y, jboolean p_double_click, jboolean p_source_mouse_relative, jfloat p_pressure, jfloat p_tilt_x, jfloat p_tilt_y); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchTouchEvent(JNIEnv *env, jclass clazz, jint ev, jint pointer, jint pointer_count, jfloatArray positions, jboolean p_double_tap); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnify(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_factor); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_pan(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_physical_keycode, jint p_unicode, jint p_key_label, jboolean p_pressed, jboolean p_echo); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_gravity(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnetometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_gyroscope(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz); -JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path); -JNIEXPORT jobjectArray JNICALL Java_org_redotengine_godot_GodotLib_getRendererInfo(JNIEnv *env, jclass clazz); -JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setEditorSetting(JNIEnv *env, jclass clazz, jstring p_key, jobject p_data); -JNIEXPORT jobject JNICALL Java_org_redotengine_godot_GodotLib_getEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_default_value); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_data); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz); -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz); -JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getProjectResourceDir(JNIEnv *env, jclass clazz); -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_isEditorHint(JNIEnv *env, jclass clazz); -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_isProjectManagerHint(JNIEnv *env, jclass clazz); +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz); +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv *env, jclass clazz, jobject p_surface, jint p_width, jint p_height); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv *env, jclass clazz, jobject p_surface); +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchMouseEvent(JNIEnv *env, jclass clazz, jint p_event_type, jint p_button_mask, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y, jboolean p_double_click, jboolean p_source_mouse_relative, jfloat p_pressure, jfloat p_tilt_x, jfloat p_tilt_y); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchTouchEvent(JNIEnv *env, jclass clazz, jint ev, jint pointer, jint pointer_count, jfloatArray positions, jboolean p_double_tap); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnify(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_factor); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_pan(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_physical_keycode, jint p_unicode, jint p_key_label, jboolean p_pressed, jboolean p_echo); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gravity(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnetometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz); +JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path); +JNIEXPORT jobjectArray JNICALL Java_org_godotengine_godot_GodotLib_getRendererInfo(JNIEnv *env, jclass clazz); +JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setEditorSetting(JNIEnv *env, jclass clazz, jstring p_key, jobject p_data); +JNIEXPORT jobject JNICALL Java_org_godotengine_godot_GodotLib_getEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_default_value); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setEditorProjectMetadata(JNIEnv *env, jclass clazz, jstring p_section, jstring p_key, jobject p_data); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz); +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz); +JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getProjectResourceDir(JNIEnv *env, jclass clazz); +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isEditorHint(JNIEnv *env, jclass clazz); +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isProjectManagerHint(JNIEnv *env, jclass clazz); } #endif // JAVA_GODOT_LIB_JNI_H diff --git a/platform/android/java_godot_wrapper.cpp b/platform/android/java_godot_wrapper.cpp index 0309f278d5e..3cfab55ad6d 100644 --- a/platform/android/java_godot_wrapper.cpp +++ b/platform/android/java_godot_wrapper.cpp @@ -44,7 +44,7 @@ GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_activity, jobject p_ activity = p_env->NewGlobalRef(p_activity); // get info about our Godot class so we can get pointers and stuff... - godot_class = p_env->FindClass("org/redotengine/godot/Godot"); + godot_class = p_env->FindClass("org/godotengine/godot/Godot"); if (godot_class) { godot_class = (jclass)p_env->NewGlobalRef(godot_class); } else { @@ -85,7 +85,7 @@ GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_activity, jobject p_ _on_godot_main_loop_started = p_env->GetMethodID(godot_class, "onGodotMainLoopStarted", "()V"); _on_godot_terminating = p_env->GetMethodID(godot_class, "onGodotTerminating", "()V"); _create_new_godot_instance = p_env->GetMethodID(godot_class, "createNewGodotInstance", "([Ljava/lang/String;)I"); - _get_render_view = p_env->GetMethodID(godot_class, "getRenderView", "()Lorg/redotengine/godot/GodotRenderView;"); + _get_render_view = p_env->GetMethodID(godot_class, "getRenderView", "()Lorg/godotengine/godot/GodotRenderView;"); _begin_benchmark_measure = p_env->GetMethodID(godot_class, "nativeBeginBenchmarkMeasure", "(Ljava/lang/String;Ljava/lang/String;)V"); _end_benchmark_measure = p_env->GetMethodID(godot_class, "nativeEndBenchmarkMeasure", "(Ljava/lang/String;Ljava/lang/String;)V"); _dump_benchmark = p_env->GetMethodID(godot_class, "nativeDumpBenchmark", "(Ljava/lang/String;)V"); diff --git a/platform/android/jni_utils.cpp b/platform/android/jni_utils.cpp index bc7bded721e..d73e1ae6a26 100644 --- a/platform/android/jni_utils.cpp +++ b/platform/android/jni_utils.cpp @@ -161,7 +161,7 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_a case Variant::DICTIONARY: { Dictionary dict = *p_arg; - jclass dclass = env->FindClass("org/redotengine/godot/Dictionary"); + jclass dclass = env->FindClass("org/godotengine/godot/Dictionary"); jmethodID ctor = env->GetMethodID(dclass, "", "()V"); jobject jdict = env->NewObject(dclass, ctor); @@ -425,7 +425,7 @@ Variant _jobject_to_variant(JNIEnv *env, jobject obj) { return varr; } - if (name == "java.util.HashMap" || name == "org.redotengine.godot.Dictionary") { + if (name == "java.util.HashMap" || name == "org.godotengine.godot.Dictionary") { Dictionary ret; jclass oclass = c; jmethodID get_keys = env->GetMethodID(oclass, "get_keys", "()[Ljava/lang/String;"); @@ -478,8 +478,8 @@ Variant::Type get_jni_type(const String &p_type) { { "[D", Variant::PACKED_FLOAT64_ARRAY }, { "[Ljava.lang.String;", Variant::PACKED_STRING_ARRAY }, { "[Ljava.lang.CharSequence;", Variant::PACKED_STRING_ARRAY }, - { "org.redotengine.godot.Dictionary", Variant::DICTIONARY }, - { "org.redotengine.godot.variant.Callable", Variant::CALLABLE }, + { "org.godotengine.godot.Dictionary", Variant::DICTIONARY }, + { "org.godotengine.godot.variant.Callable", Variant::CALLABLE }, { nullptr, Variant::NIL } }; diff --git a/platform/android/plugin/godot_plugin_jni.cpp b/platform/android/plugin/godot_plugin_jni.cpp index 51a8018e67d..cdb9a97e590 100644 --- a/platform/android/plugin/godot_plugin_jni.cpp +++ b/platform/android/plugin/godot_plugin_jni.cpp @@ -54,7 +54,7 @@ void unregister_plugins_singletons() { extern "C" { -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterSingleton(JNIEnv *env, jclass clazz, jstring name, jobject obj) { +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSingleton(JNIEnv *env, jclass clazz, jstring name, jobject obj) { String singname = jstring_to_string(name, env); ERR_FAIL_COND_V(jni_singletons.has(singname), false); @@ -71,7 +71,7 @@ JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeR return true; } -JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterMethod(JNIEnv *env, jclass clazz, jstring sname, jstring name, jstring ret, jobjectArray args) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterMethod(JNIEnv *env, jclass clazz, jstring sname, jstring name, jstring ret, jobjectArray args) { String singname = jstring_to_string(sname, env); ERR_FAIL_COND(!jni_singletons.has(singname)); @@ -93,7 +93,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegis s->add_method(mname, types, get_jni_type(retval)); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types) { String singleton_name = jstring_to_string(j_plugin_name, env); ERR_FAIL_COND(!jni_singletons.has(singleton_name)); @@ -114,7 +114,7 @@ JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegis singleton->add_signal(signal_name, types); } -JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params) { String singleton_name = jstring_to_string(j_plugin_name, env); ERR_FAIL_COND(!jni_singletons.has(singleton_name)); diff --git a/platform/android/plugin/godot_plugin_jni.h b/platform/android/plugin/godot_plugin_jni.h index cb1d2e68420..1e3d54d6ee1 100644 --- a/platform/android/plugin/godot_plugin_jni.h +++ b/platform/android/plugin/godot_plugin_jni.h @@ -39,10 +39,10 @@ void unregister_plugins_singletons(); extern "C" { -JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterSingleton(JNIEnv *env, jclass clazz, jstring name, jobject obj); -JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterMethod(JNIEnv *env, jclass clazz, jstring sname, jstring name, jstring ret, jobjectArray args); -JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types); -JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params); +JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSingleton(JNIEnv *env, jclass clazz, jstring name, jobject obj); +JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterMethod(JNIEnv *env, jclass clazz, jstring sname, jstring name, jstring ret, jobjectArray args); +JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types); +JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params); } #endif // GODOT_PLUGIN_JNI_H diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp index 4e81b68f13c..ce569298661 100644 --- a/platform/linuxbsd/wayland/display_server_wayland.cpp +++ b/platform/linuxbsd/wayland/display_server_wayland.cpp @@ -57,11 +57,11 @@ String DisplayServerWayland::_get_app_id_from_context(Context p_context) { switch (p_context) { case CONTEXT_EDITOR: { - app_id = "org.redotengine.Editor"; + app_id = "org.godotengine.Editor"; } break; case CONTEXT_PROJECTMAN: { - app_id = "org.redotengine.ProjectManager"; + app_id = "org.godotengine.ProjectManager"; } break; case CONTEXT_ENGINE: @@ -70,7 +70,7 @@ String DisplayServerWayland::_get_app_id_from_context(Context p_context) { if (config_name.length() != 0) { app_id = config_name; } else { - app_id = "org.redotengine.Redot"; + app_id = "org.godotengine.Redot"; } } } diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index cdbf5ab9c8c..70eaa254b80 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -3580,7 +3580,7 @@ if (was_empty && popup_list.is_empty()) { // Inform OS that popup was opened, to close other native popups. - [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.beginMenuTrackingNotification" object:@"org.redotengine.godot.popup_window"]; + [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.beginMenuTrackingNotification" object:@"org.godotengine.godot.popup_window"]; } time_since_popup = OS::get_singleton()->get_ticks_msec(); popup_list.push_back(p_window); @@ -3605,7 +3605,7 @@ } if (!was_empty && popup_list.is_empty()) { // Inform OS that all popups are closed. - [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.redotengine.godot.popup_window"]; + [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.godotengine.godot.popup_window"]; } } @@ -3623,7 +3623,7 @@ } if (!was_empty) { // Inform OS that all popups are closed. - [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.redotengine.godot.popup_window"]; + [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.godotengine.godot.popup_window"]; } } else { uint64_t delta = OS::get_singleton()->get_ticks_msec() - time_since_popup; @@ -3655,7 +3655,7 @@ } if (!was_empty && popup_list.is_empty()) { // Inform OS that all popups are closed. - [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.redotengine.godot.popup_window"]; + [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.godotengine.godot.popup_window"]; } } return closed;