From b18d0a5fc99519ea73c2f530847de0f49f51c31a Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 27 Aug 2023 22:56:41 +0200 Subject: [PATCH] Fix the android lib's package locations. --- misc/dist/osx_tools.app/Contents/Info.plist | 2 +- .../com/pandemonium/game/PandemoniumApp.java | 2 +- .../editor/PandemoniumEditor.kt | 8 ++++---- platform/android/java/lib/AndroidManifest.xml | 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 +- .../android/vending/licensing/util/Base64.java | 2 +- .../pandemonium/Dictionary.java | 2 +- .../pandemonium/FullScreenPandemoniumApp.java | 4 ++-- .../pandemonium/Pandemonium.java | 18 +++++++++--------- .../PandemoniumDownloaderAlarmReceiver.java | 2 +- .../PandemoniumDownloaderService.java | 2 +- .../pandemonium/PandemoniumHost.java | 2 +- .../pandemonium/PandemoniumIO.java | 4 ++-- .../pandemonium/PandemoniumLib.java | 8 ++++---- .../pandemonium/PandemoniumRenderer.java | 10 +++++----- .../pandemonium/PandemoniumView.java | 14 +++++++------- .../config/RegularConfigChooser.java | 6 +++--- .../config/RegularContextFactory.java | 8 ++++---- .../config/RegularFallbackConfigChooser.java | 4 ++-- .../pandemonium/gl/EGLLogWrapper.java | 2 +- .../gl/PandemoniumGLSurfaceView.java | 4 ++-- .../pandemonium/input/Joystick.java | 2 +- .../pandemonium/input/PandemoniumEditText.java | 4 ++-- .../input/PandemoniumGestureHandler.kt | 4 ++-- .../input/PandemoniumInputHandler.java | 8 ++++---- .../input/PandemoniumTextInputWrapper.java | 4 ++-- .../pandemonium/io/StorageScope.kt | 2 +- .../io/directory/AssetsDirectoryAccess.kt | 6 +++--- .../io/directory/DirectoryAccessHandler.kt | 6 +++--- .../io/directory/FilesystemDirectoryAccess.kt | 10 +++++----- .../pandemonium/io/file/DataAccess.kt | 4 ++-- .../pandemonium/io/file/FileAccessFlags.kt | 2 +- .../pandemonium/io/file/FileAccessHandler.kt | 4 ++-- .../pandemonium/io/file/FileData.kt | 2 +- .../pandemonium/io/file/MediaStoreData.kt | 2 +- .../pandemonium/plugin/PandemoniumPlugin.java | 8 ++++---- .../plugin/PandemoniumPluginInfoProvider.java | 2 +- .../plugin/PandemoniumPluginRegistry.java | 4 ++-- .../pandemonium/plugin/SignalInfo.java | 2 +- .../pandemonium/plugin/UsedByPandemonium.java | 2 +- .../pandemonium/utils/BenchmarkUtils.kt | 8 ++++---- .../pandemonium/utils/Crypt.java | 2 +- .../pandemonium/utils/GLUtils.java | 2 +- .../pandemonium/utils/PandemoniumNetUtils.java | 2 +- .../pandemonium/utils/PermissionsUtil.java | 2 +- .../pandemonium/utils/ProcessPhoenix.java | 2 +- .../java/nativeSrcsConfigs/AndroidManifest.xml | 2 +- platform/android/jni_utils.cpp | 6 +++--- 51 files changed, 110 insertions(+), 110 deletions(-) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/Dictionary.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/FullScreenPandemoniumApp.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/Pandemonium.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/PandemoniumDownloaderAlarmReceiver.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/PandemoniumDownloaderService.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/PandemoniumHost.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/PandemoniumIO.java (99%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/PandemoniumLib.java (96%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/PandemoniumRenderer.java (92%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/PandemoniumView.java (95%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/config/RegularConfigChooser.java (96%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/config/RegularContextFactory.java (94%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/config/RegularFallbackConfigChooser.java (96%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/gl/EGLLogWrapper.java (99%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/gl/PandemoniumGLSurfaceView.java (99%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/input/Joystick.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/input/PandemoniumEditText.java (99%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/input/PandemoniumGestureHandler.kt (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/input/PandemoniumInputHandler.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/input/PandemoniumTextInputWrapper.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/StorageScope.kt (99%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/directory/AssetsDirectoryAccess.kt (95%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/directory/DirectoryAccessHandler.kt (96%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/directory/FilesystemDirectoryAccess.kt (94%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/file/DataAccess.kt (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/file/FileAccessFlags.kt (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/file/FileAccessHandler.kt (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/file/FileData.kt (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/io/file/MediaStoreData.kt (99%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/plugin/PandemoniumPlugin.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/plugin/PandemoniumPluginInfoProvider.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/plugin/PandemoniumPluginRegistry.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/plugin/SignalInfo.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/plugin/UsedByPandemonium.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/utils/BenchmarkUtils.kt (95%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/utils/Crypt.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/utils/GLUtils.java (99%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/utils/PandemoniumNetUtils.java (98%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/utils/PermissionsUtil.java (99%) rename platform/android/java/lib/src/{net/relintai/pandemonium => org/pandemoniumengine}/pandemonium/utils/ProcessPhoenix.java (99%) diff --git a/misc/dist/osx_tools.app/Contents/Info.plist b/misc/dist/osx_tools.app/Contents/Info.plist index 6412e0451..0d28c8f59 100644 --- a/misc/dist/osx_tools.app/Contents/Info.plist +++ b/misc/dist/osx_tools.app/Contents/Info.plist @@ -13,7 +13,7 @@ CFBundleIconFile Pandemonium.icns CFBundleIdentifier - net.relintai.pandemonium.pandemonium + org.pandemoniumengine.pandemonium CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/platform/android/java/app/src/com/pandemonium/game/PandemoniumApp.java b/platform/android/java/app/src/com/pandemonium/game/PandemoniumApp.java index b1b145415..1fbaf9854 100644 --- a/platform/android/java/app/src/com/pandemonium/game/PandemoniumApp.java +++ b/platform/android/java/app/src/com/pandemonium/game/PandemoniumApp.java @@ -30,7 +30,7 @@ package com.pandemonium.game; -import net.relintai.pandemonium.pandemonium.FullScreenPandemoniumApp; +import org.pandemoniumengine.pandemonium.FullScreenPandemoniumApp; import android.os.Bundle; diff --git a/platform/android/java/editor/src/main/java/org/pandemoniumengine/editor/PandemoniumEditor.kt b/platform/android/java/editor/src/main/java/org/pandemoniumengine/editor/PandemoniumEditor.kt index 65c65628e..0a5277ee7 100644 --- a/platform/android/java/editor/src/main/java/org/pandemoniumengine/editor/PandemoniumEditor.kt +++ b/platform/android/java/editor/src/main/java/org/pandemoniumengine/editor/PandemoniumEditor.kt @@ -30,10 +30,10 @@ package org.pandemoniumengine.editor -import net.relintai.pandemonium.pandemonium.FullScreenPandemoniumApp -import net.relintai.pandemonium.pandemonium.utils.PermissionsUtil -import net.relintai.pandemonium.pandemonium.utils.ProcessPhoenix -import net.relintai.pandemonium.pandemonium.PandemoniumLib +import org.pandemoniumengine.pandemonium.FullScreenPandemoniumApp +import org.pandemoniumengine.pandemonium.utils.PermissionsUtil +import org.pandemoniumengine.pandemonium.utils.ProcessPhoenix +import org.pandemoniumengine.pandemonium.PandemoniumLib import android.Manifest import android.app.ActivityManager diff --git a/platform/android/java/lib/AndroidManifest.xml b/platform/android/java/lib/AndroidManifest.xml index b8451db86..d354656a9 100644 --- a/platform/android/java/lib/AndroidManifest.xml +++ b/platform/android/java/lib/AndroidManifest.xml @@ -1,6 +1,6 @@ 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 ae410a5c0..c0b19abd7 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; +// -- PANDEMONIUM start -- +//import com.android.vending.expansion.downloader.R; -+import net.relintai.pandemonium.pandemonium.R; ++import org.pandemoniumengine.pandemonium.R; +// -- PANDEMONIUM end -- import java.io.File; @@ -250,7 +250,7 @@ index f1536e80e..4b214b22d 100644 -import com.android.vending.expansion.downloader.R; +// -- PANDEMONIUM start -- +//import com.android.vending.expansion.downloader.R; -+import net.relintai.pandemonium.pandemonium.R; ++import org.pandemoniumengine.pandemonium.R; +// -- PANDEMONIUM 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 8085fd2e3..8ae188dff 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 */ +// -- PANDEMONIUM start -- -import net.relintai.pandemonium.pandemonium.BuildConfig; +import org.pandemoniumengine.pandemonium.BuildConfig; +// -- PANDEMONIUM 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 6656966a8..237b2c999 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 @@ import android.util.Log; // -- PANDEMONIUM start -- //import com.android.vending.expansion.downloader.R; -import net.relintai.pandemonium.pandemonium.R; +import org.pandemoniumengine.pandemonium.R; // -- PANDEMONIUM 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 3f79ae984..0efd8f354 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 @@ package com.google.android.vending.expansion.downloader.impl; // -- PANDEMONIUM start -- //import com.android.vending.expansion.downloader.R; -import net.relintai.pandemonium.pandemonium.R; +import org.pandemoniumengine.pandemonium.R; // -- PANDEMONIUM 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 374583349..50eb409c9 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 @@ package com.google.android.vending.licensing.util; */ // -- PANDEMONIUM start -- -import net.relintai.pandemonium.pandemonium.BuildConfig; +import org.pandemoniumengine.pandemonium.BuildConfig; // -- PANDEMONIUM end -- /** diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Dictionary.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Dictionary.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Dictionary.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Dictionary.java index 931d0f03b..300058637 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Dictionary.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Dictionary.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; import java.util.HashMap; import java.util.Set; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/FullScreenPandemoniumApp.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/FullScreenPandemoniumApp.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/FullScreenPandemoniumApp.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/FullScreenPandemoniumApp.java index 84a0a6851..46388cb48 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/FullScreenPandemoniumApp.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/FullScreenPandemoniumApp.java @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; -import net.relintai.pandemonium.pandemonium.utils.ProcessPhoenix; +import org.pandemoniumengine.pandemonium.utils.ProcessPhoenix; import android.content.Intent; import android.os.Bundle; import android.util.Log; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Pandemonium.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Pandemonium.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Pandemonium.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Pandemonium.java index 632a5c2ef..05ded74a2 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Pandemonium.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Pandemonium.java @@ -28,19 +28,19 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; import static android.content.Context.MODE_PRIVATE; import static android.content.Context.WINDOW_SERVICE; -import net.relintai.pandemonium.pandemonium.input.PandemoniumEditText; -import net.relintai.pandemonium.pandemonium.io.directory.DirectoryAccessHandler; -import net.relintai.pandemonium.pandemonium.io.file.FileAccessHandler; -import net.relintai.pandemonium.pandemonium.plugin.PandemoniumPlugin; -import net.relintai.pandemonium.pandemonium.plugin.PandemoniumPluginRegistry; -import net.relintai.pandemonium.pandemonium.utils.BenchmarkUtils; -import net.relintai.pandemonium.pandemonium.utils.PandemoniumNetUtils; -import net.relintai.pandemonium.pandemonium.utils.PermissionsUtil; +import org.pandemoniumengine.pandemonium.input.PandemoniumEditText; +import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler; +import org.pandemoniumengine.pandemonium.io.file.FileAccessHandler; +import org.pandemoniumengine.pandemonium.plugin.PandemoniumPlugin; +import org.pandemoniumengine.pandemonium.plugin.PandemoniumPluginRegistry; +import org.pandemoniumengine.pandemonium.utils.BenchmarkUtils; +import org.pandemoniumengine.pandemonium.utils.PandemoniumNetUtils; +import org.pandemoniumengine.pandemonium.utils.PermissionsUtil; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumDownloaderAlarmReceiver.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumDownloaderAlarmReceiver.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumDownloaderAlarmReceiver.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumDownloaderAlarmReceiver.java index a62a2535f..e3f37e6da 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumDownloaderAlarmReceiver.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumDownloaderAlarmReceiver.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumDownloaderService.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumDownloaderService.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumDownloaderService.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumDownloaderService.java index f7859730d..c6c45f480 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumDownloaderService.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumDownloaderService.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; import android.content.Context; import android.content.SharedPreferences; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumHost.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumHost.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumHost.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumHost.java index c571512e5..0f0d35b09 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumHost.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumHost.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; import java.util.Collections; import java.util.List; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumIO.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumIO.java similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumIO.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumIO.java index 55cfebb90..acf12ae05 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumIO.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumIO.java @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; -import net.relintai.pandemonium.pandemonium.input.PandemoniumEditText; +import org.pandemoniumengine.pandemonium.input.PandemoniumEditText; import android.app.Activity; import android.content.ActivityNotFoundException; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumLib.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumLib.java similarity index 96% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumLib.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumLib.java index 8936b4c20..1215b9439 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumLib.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumLib.java @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; -import net.relintai.pandemonium.pandemonium.io.directory.DirectoryAccessHandler; -import net.relintai.pandemonium.pandemonium.io.file.FileAccessHandler; -import net.relintai.pandemonium.pandemonium.utils.PandemoniumNetUtils; +import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler; +import org.pandemoniumengine.pandemonium.io.file.FileAccessHandler; +import org.pandemoniumengine.pandemonium.utils.PandemoniumNetUtils; import android.app.Activity; import android.content.res.AssetManager; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumRenderer.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumRenderer.java similarity index 92% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumRenderer.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumRenderer.java index 9046ed5ae..af54dd794 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumRenderer.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumRenderer.java @@ -28,13 +28,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; -import net.relintai.pandemonium.pandemonium.gl.PandemoniumGLSurfaceView; +import org.pandemoniumengine.pandemonium.gl.PandemoniumGLSurfaceView; -import net.relintai.pandemonium.pandemonium.plugin.PandemoniumPlugin; -import net.relintai.pandemonium.pandemonium.plugin.PandemoniumPluginRegistry; -import net.relintai.pandemonium.pandemonium.utils.GLUtils; +import org.pandemoniumengine.pandemonium.plugin.PandemoniumPlugin; +import org.pandemoniumengine.pandemonium.plugin.PandemoniumPluginRegistry; +import org.pandemoniumengine.pandemonium.utils.GLUtils; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumView.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumView.java similarity index 95% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumView.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumView.java index 089ed400a..746df0917 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/PandemoniumView.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/PandemoniumView.java @@ -28,14 +28,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium; +package org.pandemoniumengine.pandemonium; -import net.relintai.pandemonium.pandemonium.gl.PandemoniumGLSurfaceView; -import net.relintai.pandemonium.pandemonium.input.PandemoniumInputHandler; -import net.relintai.pandemonium.pandemonium.utils.GLUtils; -import net.relintai.pandemonium.pandemonium.config.RegularConfigChooser; -import net.relintai.pandemonium.pandemonium.config.RegularContextFactory; -import net.relintai.pandemonium.pandemonium.config.RegularFallbackConfigChooser; +import org.pandemoniumengine.pandemonium.gl.PandemoniumGLSurfaceView; +import org.pandemoniumengine.pandemonium.input.PandemoniumInputHandler; +import org.pandemoniumengine.pandemonium.utils.GLUtils; +import org.pandemoniumengine.pandemonium.config.RegularConfigChooser; +import org.pandemoniumengine.pandemonium.config.RegularContextFactory; +import org.pandemoniumengine.pandemonium.config.RegularFallbackConfigChooser; import android.annotation.SuppressLint; import android.content.Context; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularConfigChooser.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularConfigChooser.java similarity index 96% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularConfigChooser.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularConfigChooser.java index 985285769..0566c51d1 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularConfigChooser.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularConfigChooser.java @@ -28,10 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.config; +package org.pandemoniumengine.pandemonium.config; -import net.relintai.pandemonium.pandemonium.utils.GLUtils; -import net.relintai.pandemonium.pandemonium.gl.PandemoniumGLSurfaceView; +import org.pandemoniumengine.pandemonium.utils.GLUtils; +import org.pandemoniumengine.pandemonium.gl.PandemoniumGLSurfaceView; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularContextFactory.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularContextFactory.java similarity index 94% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularContextFactory.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularContextFactory.java index 5f67de588..ba447f934 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularContextFactory.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularContextFactory.java @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.config; +package org.pandemoniumengine.pandemonium.config; -import net.relintai.pandemonium.pandemonium.PandemoniumLib; -import net.relintai.pandemonium.pandemonium.utils.GLUtils; -import net.relintai.pandemonium.pandemonium.gl.PandemoniumGLSurfaceView; +import org.pandemoniumengine.pandemonium.PandemoniumLib; +import org.pandemoniumengine.pandemonium.utils.GLUtils; +import org.pandemoniumengine.pandemonium.gl.PandemoniumGLSurfaceView; import android.util.Log; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularFallbackConfigChooser.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularFallbackConfigChooser.java similarity index 96% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularFallbackConfigChooser.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularFallbackConfigChooser.java index 7264bdba3..062ef38f6 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/config/RegularFallbackConfigChooser.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/config/RegularFallbackConfigChooser.java @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.config; +package org.pandemoniumengine.pandemonium.config; -import net.relintai.pandemonium.pandemonium.utils.GLUtils; +import org.pandemoniumengine.pandemonium.utils.GLUtils; import android.util.Log; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/gl/EGLLogWrapper.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/gl/EGLLogWrapper.java similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/gl/EGLLogWrapper.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/gl/EGLLogWrapper.java index b558b210a..7f3efb42b 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/gl/EGLLogWrapper.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/gl/EGLLogWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.relintai.pandemonium.pandemonium.gl; +package org.pandemoniumengine.pandemonium.gl; import android.opengl.GLDebugHelper; import android.opengl.GLException; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/gl/PandemoniumGLSurfaceView.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/gl/PandemoniumGLSurfaceView.java similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/gl/PandemoniumGLSurfaceView.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/gl/PandemoniumGLSurfaceView.java index 872760b3e..10b52bb92 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/gl/PandemoniumGLSurfaceView.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/gl/PandemoniumGLSurfaceView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.relintai.pandemonium.pandemonium.gl; +package org.pandemoniumengine.pandemonium.gl; //import android.compat.annotation.UnsupportedAppUsage; @@ -27,7 +27,7 @@ import android.view.SurfaceView; import android.opengl.GLDebugHelper; import android.opengl.EGL14; import android.opengl.EGLExt; -import net.relintai.pandemonium.pandemonium.gl.EGLLogWrapper; +import org.pandemoniumengine.pandemonium.gl.EGLLogWrapper; import java.io.Writer; import java.lang.ref.WeakReference; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/Joystick.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/Joystick.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/Joystick.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/Joystick.java index c1fce8728..b9f50f6e4 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/Joystick.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/Joystick.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.input; +package org.pandemoniumengine.pandemonium.input; import android.util.SparseArray; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumEditText.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumEditText.java similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumEditText.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumEditText.java index 19dfbca2a..157a4ddb2 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumEditText.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumEditText.java @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.input; +package org.pandemoniumengine.pandemonium.input; -import net.relintai.pandemonium.pandemonium.*; +import org.pandemoniumengine.pandemonium.*; import android.content.Context; import android.os.Handler; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumGestureHandler.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumGestureHandler.kt similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumGestureHandler.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumGestureHandler.kt index 0c41d2803..0953561a7 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumGestureHandler.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumGestureHandler.kt @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.input +package org.pandemoniumengine.pandemonium.input import android.os.Build import android.view.GestureDetector.SimpleOnGestureListener @@ -36,7 +36,7 @@ import android.view.InputDevice import android.view.MotionEvent import android.view.ScaleGestureDetector import android.view.ScaleGestureDetector.OnScaleGestureListener -import net.relintai.pandemonium.pandemonium.PandemoniumLib +import org.pandemoniumengine.pandemonium.PandemoniumLib /** * Handles regular and scale gesture input related events for the [PandemoniumView] view. diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumInputHandler.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumInputHandler.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumInputHandler.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumInputHandler.java index 105228ea4..cde6c35a6 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumInputHandler.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumInputHandler.java @@ -28,12 +28,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.input; +package org.pandemoniumengine.pandemonium.input; -import static net.relintai.pandemonium.pandemonium.utils.GLUtils.DEBUG; +import static org.pandemoniumengine.pandemonium.utils.GLUtils.DEBUG; -import net.relintai.pandemonium.pandemonium.PandemoniumLib; -import net.relintai.pandemonium.pandemonium.PandemoniumView; +import org.pandemoniumengine.pandemonium.PandemoniumLib; +import org.pandemoniumengine.pandemonium.PandemoniumView; import android.os.Build; import android.util.Log; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumTextInputWrapper.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumTextInputWrapper.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumTextInputWrapper.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumTextInputWrapper.java index c8f0af120..ef914a24e 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumTextInputWrapper.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/input/PandemoniumTextInputWrapper.java @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.input; +package org.pandemoniumengine.pandemonium.input; -import net.relintai.pandemonium.pandemonium.*; +import org.pandemoniumengine.pandemonium.*; import android.content.Context; import android.text.Editable; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/StorageScope.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/StorageScope.kt similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/StorageScope.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/StorageScope.kt index d8075be0d..6ee847302 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/StorageScope.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/StorageScope.kt @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io +package org.pandemoniumengine.pandemonium.io import android.content.Context import android.os.Build diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/directory/AssetsDirectoryAccess.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/AssetsDirectoryAccess.kt similarity index 95% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/directory/AssetsDirectoryAccess.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/AssetsDirectoryAccess.kt index 45675d16d..f21eb5fb2 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/directory/AssetsDirectoryAccess.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/AssetsDirectoryAccess.kt @@ -28,13 +28,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io.directory +package org.pandemoniumengine.pandemonium.io.directory import android.content.Context import android.util.Log import android.util.SparseArray -import net.relintai.pandemonium.pandemonium.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID -import net.relintai.pandemonium.pandemonium.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID +import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID +import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID import java.io.File import java.io.IOException diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/directory/DirectoryAccessHandler.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/DirectoryAccessHandler.kt similarity index 96% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/directory/DirectoryAccessHandler.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/DirectoryAccessHandler.kt index 2d5758d78..7347edb63 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/directory/DirectoryAccessHandler.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/DirectoryAccessHandler.kt @@ -28,12 +28,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io.directory +package org.pandemoniumengine.pandemonium.io.directory import android.content.Context import android.util.Log -import net.relintai.pandemonium.pandemonium.io.directory.DirectoryAccessHandler.AccessType.ACCESS_FILESYSTEM -import net.relintai.pandemonium.pandemonium.io.directory.DirectoryAccessHandler.AccessType.ACCESS_RESOURCES +import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler.AccessType.ACCESS_FILESYSTEM +import org.pandemoniumengine.pandemonium.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/net/relintai/pandemonium/pandemonium/io/directory/FilesystemDirectoryAccess.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/FilesystemDirectoryAccess.kt similarity index 94% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/directory/FilesystemDirectoryAccess.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/FilesystemDirectoryAccess.kt index 65b10c495..a8960ad3d 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/directory/FilesystemDirectoryAccess.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/directory/FilesystemDirectoryAccess.kt @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io.directory +package org.pandemoniumengine.pandemonium.io.directory import android.annotation.SuppressLint import android.content.Context @@ -36,10 +36,10 @@ import android.os.Build import android.os.storage.StorageManager import android.util.Log import android.util.SparseArray -import net.relintai.pandemonium.pandemonium.io.StorageScope -import net.relintai.pandemonium.pandemonium.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID -import net.relintai.pandemonium.pandemonium.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID -import net.relintai.pandemonium.pandemonium.io.file.FileAccessHandler +import org.pandemoniumengine.pandemonium.io.StorageScope +import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID +import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID +import org.pandemoniumengine.pandemonium.io.file.FileAccessHandler import java.io.File /** diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/DataAccess.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/DataAccess.kt similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/DataAccess.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/DataAccess.kt index a4588eb69..7a36f02ea 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/DataAccess.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/DataAccess.kt @@ -28,12 +28,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io.file +package org.pandemoniumengine.pandemonium.io.file import android.content.Context import android.os.Build import android.util.Log -import net.relintai.pandemonium.pandemonium.io.StorageScope +import org.pandemoniumengine.pandemonium.io.StorageScope import java.io.IOException import java.nio.ByteBuffer import java.nio.channels.FileChannel diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileAccessFlags.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileAccessFlags.kt similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileAccessFlags.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileAccessFlags.kt index 2befbc98c..dbef45a76 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileAccessFlags.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileAccessFlags.kt @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io.file +package org.pandemoniumengine.pandemonium.io.file /** * Android representation of Godot native access flags. diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileAccessHandler.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileAccessHandler.kt similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileAccessHandler.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileAccessHandler.kt index c5bb5c6e9..39e4469c3 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileAccessHandler.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileAccessHandler.kt @@ -28,12 +28,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io.file +package org.pandemoniumengine.pandemonium.io.file import android.content.Context import android.util.Log import android.util.SparseArray -import net.relintai.pandemonium.pandemonium.io.StorageScope +import org.pandemoniumengine.pandemonium.io.StorageScope import java.io.FileNotFoundException import java.nio.ByteBuffer diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileData.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileData.kt similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileData.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileData.kt index aa413f0df..f465db174 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/FileData.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/FileData.kt @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io.file +package org.pandemoniumengine.pandemonium.io.file import java.io.File import java.io.FileOutputStream diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/MediaStoreData.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/MediaStoreData.kt similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/MediaStoreData.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/MediaStoreData.kt index 6d264cb64..ed4b7eb20 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/file/MediaStoreData.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/io/file/MediaStoreData.kt @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.io.file +package org.pandemoniumengine.pandemonium.io.file import android.content.ContentUris import android.content.ContentValues diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPlugin.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPlugin.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPlugin.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPlugin.java index 66afdb2ef..d7caf20c1 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPlugin.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPlugin.java @@ -28,10 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.plugin; +package org.pandemoniumengine.pandemonium.plugin; -import net.relintai.pandemonium.pandemonium.BuildConfig; -import net.relintai.pandemonium.pandemonium.Pandemonium; +import org.pandemoniumengine.pandemonium.BuildConfig; +import org.pandemoniumengine.pandemonium.Pandemonium; import android.app.Activity; import android.content.Intent; @@ -185,7 +185,7 @@ public abstract class PandemoniumPlugin { /** * Invoked once during the Pandemonium Android initialization process after creation of the - * {@link net.relintai.pandemonium.pandemonium.PandemoniumView} view. + * {@link org.pandemoniumengine.pandemonium.PandemoniumView} view. *

* The plugin can return a non-null {@link View} layout in order to add it to the Pandemonium view * hierarchy. diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginInfoProvider.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginInfoProvider.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginInfoProvider.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginInfoProvider.java index e3728385d..b6be9463c 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginInfoProvider.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginInfoProvider.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.plugin; +package org.pandemoniumengine.pandemonium.plugin; import androidx.annotation.NonNull; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginRegistry.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginRegistry.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginRegistry.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginRegistry.java index c705d2166..31ef388b7 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginRegistry.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginRegistry.java @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.plugin; +package org.pandemoniumengine.pandemonium.plugin; -import net.relintai.pandemonium.pandemonium.Pandemonium; +import org.pandemoniumengine.pandemonium.Pandemonium; import android.app.Activity; import android.content.pm.ApplicationInfo; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/SignalInfo.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/SignalInfo.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/SignalInfo.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/SignalInfo.java index 29b6bbbc4..4ad5a9e8f 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/SignalInfo.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/SignalInfo.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.plugin; +package org.pandemoniumengine.pandemonium.plugin; import android.text.TextUtils; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/UsedByPandemonium.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/UsedByPandemonium.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/UsedByPandemonium.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/UsedByPandemonium.java index 8e9cb1285..cdecfee90 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/UsedByPandemonium.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/UsedByPandemonium.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.plugin; +package org.pandemoniumengine.pandemonium.plugin; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/BenchmarkUtils.kt b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/BenchmarkUtils.kt similarity index 95% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/BenchmarkUtils.kt rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/BenchmarkUtils.kt index 80d5d5174..2b81a8345 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/BenchmarkUtils.kt +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/BenchmarkUtils.kt @@ -30,15 +30,15 @@ @file:JvmName("BenchmarkUtils") -package net.relintai.pandemonium.pandemonium.utils +package org.pandemoniumengine.pandemonium.utils import android.os.Build import android.os.SystemClock import android.os.Trace import android.util.Log -import net.relintai.pandemonium.pandemonium.BuildConfig -import net.relintai.pandemonium.pandemonium.io.file.FileAccessFlags -import net.relintai.pandemonium.pandemonium.io.file.FileAccessHandler +import org.pandemoniumengine.pandemonium.BuildConfig +import org.pandemoniumengine.pandemonium.io.file.FileAccessFlags +import org.pandemoniumengine.pandemonium.io.file.FileAccessHandler import org.json.JSONObject import java.nio.ByteBuffer import java.util.concurrent.ConcurrentSkipListMap diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/Crypt.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/Crypt.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/Crypt.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/Crypt.java index 86860e345..9d85bccca 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/Crypt.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/Crypt.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.utils; +package org.pandemoniumengine.pandemonium.utils; import java.security.MessageDigest; import java.util.Random; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/GLUtils.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/GLUtils.java similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/GLUtils.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/GLUtils.java index 73b8b074b..c7635b493 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/GLUtils.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/GLUtils.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.utils; +package org.pandemoniumengine.pandemonium.utils; import android.util.Log; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/PandemoniumNetUtils.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/PandemoniumNetUtils.java similarity index 98% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/PandemoniumNetUtils.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/PandemoniumNetUtils.java index 51dc75480..ee128fd9e 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/PandemoniumNetUtils.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/PandemoniumNetUtils.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.utils; +package org.pandemoniumengine.pandemonium.utils; import android.app.Activity; import android.content.Context; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/PermissionsUtil.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/PermissionsUtil.java similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/PermissionsUtil.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/PermissionsUtil.java index c4be96a9b..9a837ea10 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/PermissionsUtil.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/PermissionsUtil.java @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package net.relintai.pandemonium.pandemonium.utils; +package org.pandemoniumengine.pandemonium.utils; import android.Manifest; import android.app.Activity; diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/ProcessPhoenix.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/ProcessPhoenix.java similarity index 99% rename from platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/ProcessPhoenix.java rename to platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/ProcessPhoenix.java index 70ffff91f..d41c91cca 100644 --- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/utils/ProcessPhoenix.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/utils/ProcessPhoenix.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package net.relintai.pandemonium.pandemonium.utils; +package org.pandemoniumengine.pandemonium.utils; import android.app.Activity; import android.app.ActivityManager; diff --git a/platform/android/java/nativeSrcsConfigs/AndroidManifest.xml b/platform/android/java/nativeSrcsConfigs/AndroidManifest.xml index e61b1631e..ba35ea364 100644 --- a/platform/android/java/nativeSrcsConfigs/AndroidManifest.xml +++ b/platform/android/java/nativeSrcsConfigs/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/platform/android/jni_utils.cpp b/platform/android/jni_utils.cpp index 6b10f9e2a..716c01b8f 100644 --- a/platform/android/jni_utils.cpp +++ b/platform/android/jni_utils.cpp @@ -308,7 +308,7 @@ Variant _jobject_to_variant(JNIEnv *env, jobject obj) { return varr; }; - if (name == "java.util.HashMap" || name == "net.relintai.pandemonium.pandemonium.Dictionary") { + if (name == "java.util.HashMap" || name == "org.pandemoniumengine.pandemonium.Dictionary") { Dictionary ret; jclass oclass = c; jmethodID get_keys = env->GetMethodID(oclass, "get_keys", "()[Ljava/lang/String;"); @@ -350,7 +350,7 @@ Variant::Type get_jni_type(const String &p_type) { { "[B", Variant::POOL_BYTE_ARRAY }, { "[F", Variant::POOL_REAL_ARRAY }, { "[Ljava.lang.String;", Variant::POOL_STRING_ARRAY }, - { "net.relintai.pandemonium.pandemonium.Dictionary", Variant::DICTIONARY }, + { "org.pandemoniumengine.pandemonium.Dictionary", Variant::DICTIONARY }, { NULL, Variant::NIL } }; @@ -377,7 +377,7 @@ const char *get_jni_sig(const String &p_type) { { "float", "F" }, { "double", "D" }, { "java.lang.String", "Ljava/lang/String;" }, - { "net.relintai.pandemonium.pandemonium.Dictionary", "Lnet/relintai/pandemonium/pandemonium/Dictionary;" }, + { "org.pandemoniumengine.pandemonium.Dictionary", "Lnet/relintai/pandemonium/pandemonium/Dictionary;" }, { "[I", "[I" }, { "[B", "[B" }, { "[F", "[F" },