Merge pull request #1 from m4gr3d/godot_4_2_plugin_refactor

Godot 4.2 plugin refactor

12 files changed, 127 insertions, 80 deletions

diff --git a/hello_world/build.gradle b/hello_world/build.gradle
index 71da365..003ea6f 100644
--- a/hello_world/build.gradle
+++ b/hello_world/build.gradle
@@ -1,12 +1,14 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.1"
+    compileSdk versions.compileSdk
 
     defaultConfig {
-        minSdkVersion 18
-        targetSdkVersion 29
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
         versionCode 1
         versionName "1.0"
     }
@@ -21,14 +23,21 @@ android {
 }
 
 dependencies {
-    /*
-    Used to provide dependency on the Godot Android library. A version of that
-    library will be made available for each stable release of Godot.
-
-    `compileOnly` is used instead of `implementation` to ensure that the
-     godot library is not bundled with the generated plugin AAR file. This is
-     necessary since the Godot editor will also provide a version of the godot
-     library when building the final binary.
-     */
-    compileOnly fileTree(dir: '../libs', include: ['godot-lib*.aar'])
+    compileOnly "org.godotengine:godot:$versions.godotLibVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlinVersion"
+}
+
+task copyDebugAARToAddons(type: Copy) {
+    from 'build/outputs/aar'
+    include 'HelloWorld.debug.aar'
+    into 'demo/addons/hello_world_plugin'
 }
+
+task copyReleaseAARToAddons(type: Copy) {
+    from 'build/outputs/aar'
+    include 'HelloWorld.release.aar'
+    into 'demo/addons/hello_world_plugin'
+}
+
+assemble.finalizedBy(copyDebugAARToAddons)
+assemble.finalizedBy(copyReleaseAARToAddons)
diff --git a/hello_world/demo/Main.tscn b/hello_world/demo/Main.tscn
index bcb42ad..57d3eb0 100644
--- a/hello_world/demo/Main.tscn
+++ b/hello_world/demo/Main.tscn
@@ -1,20 +1,19 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=2 format=3 uid="uid://bgtr75kiyu5fh"]
 
-[ext_resource path="res://Main.gd" type="Script" id=1]
+[ext_resource type="Script" path="res://Main.gd" id="1"]
 
 [node name="Main" type="Node2D"]
-script = ExtResource( 1 )
+script = ExtResource("1")
 
 [node name="Button" type="Button" parent="."]
+anchors_preset = 14
 anchor_top = 0.5
 anchor_right = 1.0
 anchor_bottom = 0.5
-margin_left = 40.0
-margin_top = 250.0
-margin_right = 320.0
-margin_bottom = 312.0
+offset_left = 40.0
+offset_top = 250.0
+offset_right = 320.0
+offset_bottom = 312.0
 text = "Hello World"
-__meta__ = {
-"_edit_use_anchors_": true
-}
+
 [connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]
diff --git a/hello_world/demo/addons/hello_world_plugin/.gdignore b/hello_world/demo/addons/hello_world_plugin/.gdignore
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/hello_world/demo/addons/hello_world_plugin/.gdignore
@@ -0,0 +1 @@
+
diff --git a/hello_world/demo/addons/hello_world_plugin/HelloWorld.debug.aar b/hello_world/demo/addons/hello_world_plugin/HelloWorld.debug.aar
new file mode 100644
index 0000000..ddb9986
--- /dev/null
+++ b/hello_world/demo/addons/hello_world_plugin/HelloWorld.debug.aar
diff --git a/hello_world/demo/addons/hello_world_plugin/HelloWorld.release.aar b/hello_world/demo/addons/hello_world_plugin/HelloWorld.release.aar
new file mode 100644
index 0000000..8277aa5
--- /dev/null
+++ b/hello_world/demo/addons/hello_world_plugin/HelloWorld.release.aar
diff --git a/hello_world/demo/addons/hello_world_plugin/hello_world_export_plugin.gd b/hello_world/demo/addons/hello_world_plugin/hello_world_export_plugin.gd
new file mode 100644
index 0000000..6749497
--- /dev/null
+++ b/hello_world/demo/addons/hello_world_plugin/hello_world_export_plugin.gd
@@ -0,0 +1,16 @@
+@tool
+extends EditorExportPlugin
+
+func _supports_platform(platform):
+	if platform is EditorExportPlatformAndroid:
+		return true
+	return false
+	
+func _get_android_libraries(platform, debug):
+	if debug:
+		return PackedStringArray(["hello_world_plugin/HelloWorld.debug.aar"])
+	else:
+		return PackedStringArray(["hello_world_plugin/HelloWorld.release.aar"])
+	
+func _get_name():
+	return "HelloWorldPlugin"
diff --git a/hello_world/demo/addons/hello_world_plugin/hello_world_plugin.gd b/hello_world/demo/addons/hello_world_plugin/hello_world_plugin.gd
new file mode 100644
index 0000000..05bb37a
--- /dev/null
+++ b/hello_world/demo/addons/hello_world_plugin/hello_world_plugin.gd
@@ -0,0 +1,17 @@
+@tool
+extends EditorPlugin
+
+# A class member to hold the export plugin during its lifecycle.
+var export_plugin : EditorExportPlugin
+
+func _enter_tree():
+	# Initialization of the plugin goes here.
+	export_plugin = preload("hello_world_export_plugin.gd").new()
+	add_export_plugin(export_plugin)
+	pass
+
+
+func _exit_tree():
+	# Clean-up of the plugin goes here.
+	remove_export_plugin(export_plugin)
+	export_plugin = null
diff --git a/hello_world/demo/addons/hello_world_plugin/plugin.cfg b/hello_world/demo/addons/hello_world_plugin/plugin.cfg
new file mode 100644
index 0000000..0024e5f
--- /dev/null
+++ b/hello_world/demo/addons/hello_world_plugin/plugin.cfg
@@ -0,0 +1,7 @@
+[plugin]
+
+name="HelloWorldPlugin"
+description="Sample to showcase how to package a Godot Android plugin	"
+author="Fredia Huya-Kouadio (m4gr3d)"
+version=""
+script="hello_world_plugin.gd"
diff --git a/hello_world/demo/default_env.tres b/hello_world/demo/default_env.tres
index 20207a4..3868def 100644
--- a/hello_world/demo/default_env.tres
+++ b/hello_world/demo/default_env.tres
@@ -1,7 +1,7 @@
-[gd_resource type="Environment" load_steps=2 format=2]
+[gd_resource type="Environment" load_steps=2 format=3 uid="uid://bi2meuxrf37pv"]
 
-[sub_resource type="ProceduralSky" id=1]
+[sub_resource type="Sky" id="1"]
 
 [resource]
 background_mode = 2
-background_sky = SubResource( 1 )
+sky = SubResource("1")
diff --git a/hello_world/demo/export_presets.cfg b/hello_world/demo/export_presets.cfg
index 45a64ca..3892c84 100644
--- a/hello_world/demo/export_presets.cfg
+++ b/hello_world/demo/export_presets.cfg
@@ -3,56 +3,56 @@
 name="Android"
 platform="Android"
 runnable=true
+dedicated_server=false
 custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path=""
-patch_list=PoolStringArray(  )
-script_export_mode=1
-script_encryption_key=""
+export_path="android/Hello World Plugin Demo.apk"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
 
 [preset.0.options]
 
-graphics/32_bits_framebuffer=true
-xr_features/xr_mode=0
-xr_features/degrees_of_freedom=0
-xr_features/hand_tracking=0
-one_click_deploy/clear_previous_install=false
 custom_template/debug=""
 custom_template/release=""
-custom_template/use_custom_build=true
-custom_template/plugins="HelloWorld"
-command_line/extra_args=""
+gradle_build/use_gradle_build=true
+gradle_build/export_format=0
+gradle_build/min_sdk=""
+gradle_build/target_sdk=""
+architectures/armeabi-v7a=true
+architectures/arm64-v8a=true
+architectures/x86=false
+architectures/x86_64=false
 version/code=1
 version/name="1.0"
 package/unique_name="fhuyakou.godot.plugin.android.helloworld.demo"
 package/name=""
 package/signed=true
+package/app_category=2
+package/retain_data_on_uninstall=false
+package/exclude_from_recents=false
+launcher_icons/main_192x192=""
+launcher_icons/adaptive_foreground_432x432=""
+launcher_icons/adaptive_background_432x432=""
+graphics/opengl_debug=false
+xr_features/xr_mode=0
+xr_features/hand_tracking=0
+xr_features/hand_tracking_frequency=0
+xr_features/passthrough=0
 screen/immersive_mode=true
-screen/orientation=0
 screen/support_small=true
 screen/support_normal=true
 screen/support_large=true
 screen/support_xlarge=true
-screen/opengl_debug=false
-launcher_icons/main_192x192=""
-launcher_icons/adaptive_foreground_432x432=""
-launcher_icons/adaptive_background_432x432=""
-keystore/debug=""
-keystore/debug_user=""
-keystore/debug_password=""
-keystore/release=""
-keystore/release_user=""
-keystore/release_password=""
+user_data_backup/allow=false
+command_line/extra_args=""
 apk_expansion/enable=false
 apk_expansion/SALT=""
 apk_expansion/public_key=""
-architectures/armeabi-v7a=true
-architectures/arm64-v8a=true
-architectures/x86=false
-architectures/x86_64=false
-permissions/custom_permissions=PoolStringArray(  )
+permissions/custom_permissions=PackedStringArray()
 permissions/access_checkin_properties=false
 permissions/access_coarse_location=false
 permissions/access_fine_location=false
@@ -125,6 +125,7 @@ permissions/location_hardware=false
 permissions/manage_accounts=false
 permissions/manage_app_tokens=false
 permissions/manage_documents=false
+permissions/manage_external_storage=false
 permissions/master_clear=false
 permissions/media_content_control=false
 permissions/modify_audio_settings=false
diff --git a/hello_world/demo/project.godot b/hello_world/demo/project.godot
index b0f5fb8..a9cf847 100644
--- a/hello_world/demo/project.godot
+++ b/hello_world/demo/project.godot
@@ -6,22 +6,27 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=4
-
-_global_script_classes=[  ]
-_global_script_class_icons={
-
-}
+config_version=5
 
 [application]
 
 config/name="Hello World Plugin Demo"
 run/main_scene="res://Main.tscn"
+config/features=PackedStringArray("4.1")
 config/icon="res://icon.png"
 
+[debug]
+
+settings/stdout/verbose_stdout=true
+
+[editor_plugins]
+
+enabled=PackedStringArray("res://addons/hello_world_plugin/plugin.cfg")
+
 [rendering]
 
+renderer/rendering_method="gl_compatibility"
+textures/vram_compression/import_etc2_astc=true
+environment/defaults/default_environment="res://default_env.tres"
 quality/driver/driver_name="GLES2"
 vram_compression/import_etc=true
-vram_compression/import_etc2=false
-environment/default_environment="res://default_env.tres"
diff --git a/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java b/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java
index fe0a319..1dfa1b2 100644
--- a/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java
+++ b/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java
@@ -2,10 +2,9 @@ package fhuyakou.godot.plugin.android.helloworld;
 
 import android.app.Activity;
 import android.view.View;
-import java.util.Collections;
-import java.util.List;
 import org.godotengine.godot.Godot;
 import org.godotengine.godot.plugin.GodotPlugin;
+import org.godotengine.godot.plugin.UsedByGodot;
 
 public class HelloWorldPlugin extends GodotPlugin {
 
@@ -23,12 +22,7 @@ public class HelloWorldPlugin extends GodotPlugin {
   }
 
   @Override
-  public List<String> getPluginMethods() {
-    return Collections.singletonList("helloWorld");
-  }
-
-  @Override
-  public View onMainCreateView(Activity activity) {
+  public View onMainCreate(Activity activity) {
     View view = activity.getLayoutInflater().inflate(R.layout.hello_world_view, null);
     helloWorldContainer = view.findViewById(R.id.hello_world_container);
     return view;
@@ -37,16 +31,14 @@ public class HelloWorldPlugin extends GodotPlugin {
   /**
    * Show/hide, print and return "Hello World".
    */
+  @UsedByGodot
   public String helloWorld() {
     if (helloWorldContainer != null) {
-      helloWorldContainer.post(new Runnable() {
-        @Override
-        public void run() {
-          if (helloWorldContainer.getVisibility() == View.VISIBLE) {
-            helloWorldContainer.setVisibility(View.GONE);
-          } else {
-            helloWorldContainer.setVisibility(View.VISIBLE);
-          }
+      helloWorldContainer.post(() -> {
+        if (helloWorldContainer.getVisibility() == View.VISIBLE) {
+          helloWorldContainer.setVisibility(View.GONE);
+        } else {
+          helloWorldContainer.setVisibility(View.VISIBLE);
         }
       });
     }