From 8bf0525020687b23fd0073a2054124530d0e057e Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Sat, 9 Apr 2022 17:56:41 +0200
Subject: [PATCH] [godot] Move spine_godot outside the Godot source tree.

---
 .gitignore                                    | 12 ++++------
 spine-godot/.idea/misc.xml                    |  4 +++-
 spine-godot/.idea/tools/External Tools.xml    |  2 +-
 spine-godot/.idea/workspace.xml               | 23 +++++++++++++++----
 spine-godot/{godot => }/custom.py             |  0
 spine-godot/setup.sh                          | 14 +++++------
 .../spine_godot/GodotSpineExtension.cpp       |  0
 .../spine_godot/GodotSpineExtension.h         |  0
 .../{godot/modules => }/spine_godot/SCsub     |  2 +-
 .../spine_godot/SpineAnimation.cpp            |  0
 .../modules => }/spine_godot/SpineAnimation.h |  0
 .../spine_godot/SpineAnimationState.cpp       |  0
 .../spine_godot/SpineAnimationState.h         |  0
 .../spine_godot/SpineAtlasResource.cpp        |  0
 .../spine_godot/SpineAtlasResource.h          |  0
 .../spine_godot/SpineAttachment.cpp           |  0
 .../spine_godot/SpineAttachment.h             |  0
 .../modules => }/spine_godot/SpineBone.cpp    |  0
 .../modules => }/spine_godot/SpineBone.h      |  0
 .../spine_godot/SpineBoneData.cpp             |  0
 .../modules => }/spine_godot/SpineBoneData.h  |  0
 .../spine_godot/SpineCollisionShapeProxy.cpp  |  0
 .../spine_godot/SpineCollisionShapeProxy.h    |  0
 .../spine_godot/SpineConstant.cpp             |  0
 .../modules => }/spine_godot/SpineConstant.h  |  0
 .../spine_godot/SpineConstraintData.cpp       |  0
 .../spine_godot/SpineConstraintData.h         |  0
 .../spine_godot/SpineEditorPlugin.cpp         |  0
 .../spine_godot/SpineEditorPlugin.h           |  0
 .../modules => }/spine_godot/SpineEvent.cpp   |  0
 .../modules => }/spine_godot/SpineEvent.h     |  0
 .../spine_godot/SpineEventData.cpp            |  0
 .../modules => }/spine_godot/SpineEventData.h |  0
 .../spine_godot/SpineIkConstraint.cpp         |  0
 .../spine_godot/SpineIkConstraint.h           |  0
 .../spine_godot/SpineIkConstraintData.cpp     |  0
 .../spine_godot/SpineIkConstraintData.h       |  0
 .../spine_godot/SpinePathConstraint.cpp       |  0
 .../spine_godot/SpinePathConstraint.h         |  0
 .../spine_godot/SpinePathConstraintData.cpp   |  0
 .../spine_godot/SpinePathConstraintData.h     |  0
 .../spine_godot/SpineRendererObject.h         |  0
 .../spine_godot/SpineSkeleton.cpp             |  0
 .../modules => }/spine_godot/SpineSkeleton.h  |  0
 .../spine_godot/SpineSkeletonDataResource.cpp |  0
 .../spine_godot/SpineSkeletonDataResource.h   |  0
 .../spine_godot/SpineSkeletonFileResource.cpp |  0
 .../spine_godot/SpineSkeletonFileResource.h   |  0
 .../modules => }/spine_godot/SpineSkin.cpp    |  0
 .../modules => }/spine_godot/SpineSkin.h      |  0
 .../SpineSkinAttachmentMapEntries.cpp         |  0
 .../SpineSkinAttachmentMapEntries.h           |  0
 .../modules => }/spine_godot/SpineSlot.cpp    |  0
 .../modules => }/spine_godot/SpineSlot.h      |  0
 .../spine_godot/SpineSlotData.cpp             |  0
 .../modules => }/spine_godot/SpineSlotData.h  |  0
 .../modules => }/spine_godot/SpineSprite.cpp  |  0
 .../modules => }/spine_godot/SpineSprite.h    |  0
 .../spine_godot/SpineTimeline.cpp             |  0
 .../modules => }/spine_godot/SpineTimeline.h  |  0
 .../spine_godot/SpineTrackEntry.cpp           |  0
 .../spine_godot/SpineTrackEntry.h             |  0
 .../spine_godot/SpineTransformConstraint.cpp  |  0
 .../spine_godot/SpineTransformConstraint.h    |  0
 .../SpineTransformConstraintData.cpp          |  0
 .../SpineTransformConstraintData.h            |  0
 .../{godot/modules => }/spine_godot/config.py |  0
 .../spine_godot/register_types.cpp            |  0
 .../modules => }/spine_godot/register_types.h |  0
 69 files changed, 33 insertions(+), 24 deletions(-)
 rename spine-godot/{godot => }/custom.py (100%)
 rename spine-godot/{godot/modules => }/spine_godot/GodotSpineExtension.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/GodotSpineExtension.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SCsub (66%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineAnimation.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineAnimation.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineAnimationState.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineAnimationState.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineAtlasResource.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineAtlasResource.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineAttachment.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineAttachment.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineBone.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineBone.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineBoneData.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineBoneData.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineCollisionShapeProxy.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineCollisionShapeProxy.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineConstant.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineConstant.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineConstraintData.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineConstraintData.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineEditorPlugin.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineEditorPlugin.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineEvent.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineEvent.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineEventData.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineEventData.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineIkConstraint.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineIkConstraint.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineIkConstraintData.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineIkConstraintData.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpinePathConstraint.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpinePathConstraint.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpinePathConstraintData.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpinePathConstraintData.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineRendererObject.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkeleton.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkeleton.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkeletonDataResource.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkeletonDataResource.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkeletonFileResource.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkeletonFileResource.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkin.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkin.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkinAttachmentMapEntries.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSkinAttachmentMapEntries.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSlot.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSlot.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSlotData.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSlotData.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSprite.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineSprite.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineTimeline.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineTimeline.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineTrackEntry.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineTrackEntry.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineTransformConstraint.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineTransformConstraint.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineTransformConstraintData.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/SpineTransformConstraintData.h (100%)
 rename spine-godot/{godot/modules => }/spine_godot/config.py (100%)
 rename spine-godot/{godot/modules => }/spine_godot/register_types.cpp (100%)
 rename spine-godot/{godot/modules => }/spine_godot/register_types.h (100%)

diff --git a/.gitignore b/.gitignore
index 5dd22adf2..e1ea5131f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,12 +164,8 @@ spine-cocos2dx/example-v4/build-macos
 spine-cocos2dx/example/build-ios
 spine-cocos2dx/example/proj.android/app/.cxx
 spine-cocos2dx/example/build-win
-spine-godot/godot/*
-!spine-godot/godot/modules/
-spine-godot/godot/modules/*
-!spine-godot/godot/modules/spine_godot/
-spine-godot/godot/modules/spine_godot/*.o
-spine-godot/godot/modules/spine_godot/__pycache__
-spine-godot/godot/modules/spine_godot/spine-cpp
-spine-godot/godot/modules/godot-copy
+spine-godot/godot
+spine-godot/spine_godot/*.o
+spine-godot/spine_godot/spine-cpp
+spine-godot/spine_godot/__pycache__
 spine-godot/example/.import
diff --git a/spine-godot/.idea/misc.xml b/spine-godot/.idea/misc.xml
index 8067168ab..f2e9f7c04 100644
--- a/spine-godot/.idea/misc.xml
+++ b/spine-godot/.idea/misc.xml
@@ -12,6 +12,8 @@
       </CompDBProjectSettings>
     </option>
   </component>
-  <component name="CompDBWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="CompDBWorkspace" PROJECT_DIR="$PROJECT_DIR$">
+    <contentRoot DIR="$PROJECT_DIR$/.." />
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
 </project>
\ No newline at end of file
diff --git a/spine-godot/.idea/tools/External Tools.xml b/spine-godot/.idea/tools/External Tools.xml
index 258fa71c5..e8ef4983b 100644
--- a/spine-godot/.idea/tools/External Tools.xml	
+++ b/spine-godot/.idea/tools/External Tools.xml	
@@ -2,7 +2,7 @@
   <tool name="scons debug" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
     <exec>
       <option name="COMMAND" value="scons" />
-      <option name="PARAMETERS" value="target=debug -j8" />
+      <option name="PARAMETERS" value="target=debug custom_modules=&quot;../spine_godot&quot; -j8" />
       <option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
     </exec>
   </tool>
diff --git a/spine-godot/.idea/workspace.xml b/spine-godot/.idea/workspace.xml
index 529c1a0ce..9478bbd3e 100644
--- a/spine-godot/.idea/workspace.xml
+++ b/spine-godot/.idea/workspace.xml
@@ -8,7 +8,7 @@
   </component>
   <component name="CMakeSettings">
     <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" ENABLED="true" />
+      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" />
     </configurations>
   </component>
   <component name="ChangeListManager">
@@ -53,6 +53,17 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectId" id="1yu64nUS0zjllOk9AGzuegMkIMx" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -64,6 +75,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="cf.advertisement.text.overridden" value="true" />
     <property name="cf.first.check.clang-format" value="false" />
     <property name="cidr.known.project.marker" value="true" />
     <property name="node.js.detected.package.eslint" value="true" />
@@ -71,9 +83,9 @@
     <property name="settings.editor.selected.configurable" value="CLionExternalConfigurable" />
   </component>
   <component name="RunManager">
-    <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
+    <configuration default="true" type="GradleAppRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
       <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
+        <option name="com.jetbrains.cidr.cpp.gradle.execution.GradleNativeBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
     <configuration name="godot debug" type="CLionExternalRunConfiguration" factoryName="Application" PROGRAM_PARAMS="--editor --path $ProjectFileDir$/../example" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="godot" TARGET_NAME="scons debug" CONFIG_NAME="scons debug" RUN_PATH="$PROJECT_DIR$/bin/godot.osx.tools.64">
@@ -81,9 +93,9 @@
         <option name="CLION.EXTERNAL.BUILD" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="GradleAppRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
+    <configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
       <method v="2">
-        <option name="com.jetbrains.cidr.cpp.gradle.execution.GradleNativeBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
   </component>
@@ -96,6 +108,7 @@
       <option name="presentableId" value="Default" />
       <updated>1633088939732</updated>
       <workItem from="1633088942825" duration="326000" />
+      <workItem from="1649519095761" duration="518000" />
     </task>
     <servers />
   </component>
diff --git a/spine-godot/godot/custom.py b/spine-godot/custom.py
similarity index 100%
rename from spine-godot/godot/custom.py
rename to spine-godot/custom.py
diff --git a/spine-godot/setup.sh b/spine-godot/setup.sh
index 9f0bc593c..65094a665 100755
--- a/spine-godot/setup.sh
+++ b/spine-godot/setup.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 set -e
-git clean -x -f -d
-cp -r ../spine-cpp/spine-cpp godot/modules/spine_godot
-git clone --depth 1 https://github.com/godotengine/godot.git -b 3.4.4-stable godot-copy
-rm -rf godot-copy/.git
-cp -r godot-copy/* godot
-rm -rf godot-copy
+#git clean -x -f -d
+git clone --depth 1 https://github.com/godotengine/godot.git -b 3.4.4-stable
 cp -r .idea godot
+cp custom.py godot
+cp -r ../spine-cpp/spine-cpp spine_godot
 pushd godot
-scons -Q compiledb
-scons target=debug --jobs=$(sysctl -n hw.logicalcpu)
+scons -Q compiledb custom_modules="../spine_godot"
+scons target=debug custom_modules="../spine_godot" --jobs=$(sysctl -n hw.logicalcpu)
 popd
\ No newline at end of file
diff --git a/spine-godot/godot/modules/spine_godot/GodotSpineExtension.cpp b/spine-godot/spine_godot/GodotSpineExtension.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/GodotSpineExtension.cpp
rename to spine-godot/spine_godot/GodotSpineExtension.cpp
diff --git a/spine-godot/godot/modules/spine_godot/GodotSpineExtension.h b/spine-godot/spine_godot/GodotSpineExtension.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/GodotSpineExtension.h
rename to spine-godot/spine_godot/GodotSpineExtension.h
diff --git a/spine-godot/godot/modules/spine_godot/SCsub b/spine-godot/spine_godot/SCsub
similarity index 66%
rename from spine-godot/godot/modules/spine_godot/SCsub
rename to spine-godot/spine_godot/SCsub
index 05decba4a..bf234472f 100644
--- a/spine-godot/godot/modules/spine_godot/SCsub
+++ b/spine-godot/spine_godot/SCsub
@@ -2,6 +2,6 @@ Import('env')
 
 env_spine_runtime = env.Clone()
 
-env_spine_runtime.Prepend(CPPPATH=["spine-cpp/include", "modules/spine_godot/spine-cpp/include"])
+env_spine_runtime.Prepend(CPPPATH=["spine-cpp/include", "spine_godot/spine-cpp/include"])
 env_spine_runtime.add_source_files(env.modules_sources, "spine-cpp/src/spine/*.cpp")
 env_spine_runtime.add_source_files(env.modules_sources, "*.cpp")
diff --git a/spine-godot/godot/modules/spine_godot/SpineAnimation.cpp b/spine-godot/spine_godot/SpineAnimation.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineAnimation.cpp
rename to spine-godot/spine_godot/SpineAnimation.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineAnimation.h b/spine-godot/spine_godot/SpineAnimation.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineAnimation.h
rename to spine-godot/spine_godot/SpineAnimation.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineAnimationState.cpp b/spine-godot/spine_godot/SpineAnimationState.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineAnimationState.cpp
rename to spine-godot/spine_godot/SpineAnimationState.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineAnimationState.h b/spine-godot/spine_godot/SpineAnimationState.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineAnimationState.h
rename to spine-godot/spine_godot/SpineAnimationState.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineAtlasResource.cpp b/spine-godot/spine_godot/SpineAtlasResource.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineAtlasResource.cpp
rename to spine-godot/spine_godot/SpineAtlasResource.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineAtlasResource.h b/spine-godot/spine_godot/SpineAtlasResource.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineAtlasResource.h
rename to spine-godot/spine_godot/SpineAtlasResource.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineAttachment.cpp b/spine-godot/spine_godot/SpineAttachment.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineAttachment.cpp
rename to spine-godot/spine_godot/SpineAttachment.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineAttachment.h b/spine-godot/spine_godot/SpineAttachment.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineAttachment.h
rename to spine-godot/spine_godot/SpineAttachment.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineBone.cpp b/spine-godot/spine_godot/SpineBone.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineBone.cpp
rename to spine-godot/spine_godot/SpineBone.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineBone.h b/spine-godot/spine_godot/SpineBone.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineBone.h
rename to spine-godot/spine_godot/SpineBone.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineBoneData.cpp b/spine-godot/spine_godot/SpineBoneData.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineBoneData.cpp
rename to spine-godot/spine_godot/SpineBoneData.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineBoneData.h b/spine-godot/spine_godot/SpineBoneData.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineBoneData.h
rename to spine-godot/spine_godot/SpineBoneData.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.cpp b/spine-godot/spine_godot/SpineCollisionShapeProxy.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.cpp
rename to spine-godot/spine_godot/SpineCollisionShapeProxy.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.h b/spine-godot/spine_godot/SpineCollisionShapeProxy.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.h
rename to spine-godot/spine_godot/SpineCollisionShapeProxy.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineConstant.cpp b/spine-godot/spine_godot/SpineConstant.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineConstant.cpp
rename to spine-godot/spine_godot/SpineConstant.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineConstant.h b/spine-godot/spine_godot/SpineConstant.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineConstant.h
rename to spine-godot/spine_godot/SpineConstant.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineConstraintData.cpp b/spine-godot/spine_godot/SpineConstraintData.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineConstraintData.cpp
rename to spine-godot/spine_godot/SpineConstraintData.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineConstraintData.h b/spine-godot/spine_godot/SpineConstraintData.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineConstraintData.h
rename to spine-godot/spine_godot/SpineConstraintData.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineEditorPlugin.cpp b/spine-godot/spine_godot/SpineEditorPlugin.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineEditorPlugin.cpp
rename to spine-godot/spine_godot/SpineEditorPlugin.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineEditorPlugin.h b/spine-godot/spine_godot/SpineEditorPlugin.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineEditorPlugin.h
rename to spine-godot/spine_godot/SpineEditorPlugin.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineEvent.cpp b/spine-godot/spine_godot/SpineEvent.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineEvent.cpp
rename to spine-godot/spine_godot/SpineEvent.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineEvent.h b/spine-godot/spine_godot/SpineEvent.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineEvent.h
rename to spine-godot/spine_godot/SpineEvent.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineEventData.cpp b/spine-godot/spine_godot/SpineEventData.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineEventData.cpp
rename to spine-godot/spine_godot/SpineEventData.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineEventData.h b/spine-godot/spine_godot/SpineEventData.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineEventData.h
rename to spine-godot/spine_godot/SpineEventData.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineIkConstraint.cpp b/spine-godot/spine_godot/SpineIkConstraint.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineIkConstraint.cpp
rename to spine-godot/spine_godot/SpineIkConstraint.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineIkConstraint.h b/spine-godot/spine_godot/SpineIkConstraint.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineIkConstraint.h
rename to spine-godot/spine_godot/SpineIkConstraint.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineIkConstraintData.cpp b/spine-godot/spine_godot/SpineIkConstraintData.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineIkConstraintData.cpp
rename to spine-godot/spine_godot/SpineIkConstraintData.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineIkConstraintData.h b/spine-godot/spine_godot/SpineIkConstraintData.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineIkConstraintData.h
rename to spine-godot/spine_godot/SpineIkConstraintData.h
diff --git a/spine-godot/godot/modules/spine_godot/SpinePathConstraint.cpp b/spine-godot/spine_godot/SpinePathConstraint.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpinePathConstraint.cpp
rename to spine-godot/spine_godot/SpinePathConstraint.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpinePathConstraint.h b/spine-godot/spine_godot/SpinePathConstraint.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpinePathConstraint.h
rename to spine-godot/spine_godot/SpinePathConstraint.h
diff --git a/spine-godot/godot/modules/spine_godot/SpinePathConstraintData.cpp b/spine-godot/spine_godot/SpinePathConstraintData.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpinePathConstraintData.cpp
rename to spine-godot/spine_godot/SpinePathConstraintData.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpinePathConstraintData.h b/spine-godot/spine_godot/SpinePathConstraintData.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpinePathConstraintData.h
rename to spine-godot/spine_godot/SpinePathConstraintData.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineRendererObject.h b/spine-godot/spine_godot/SpineRendererObject.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineRendererObject.h
rename to spine-godot/spine_godot/SpineRendererObject.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkeleton.cpp b/spine-godot/spine_godot/SpineSkeleton.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkeleton.cpp
rename to spine-godot/spine_godot/SpineSkeleton.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkeleton.h b/spine-godot/spine_godot/SpineSkeleton.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkeleton.h
rename to spine-godot/spine_godot/SpineSkeleton.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkeletonDataResource.cpp b/spine-godot/spine_godot/SpineSkeletonDataResource.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkeletonDataResource.cpp
rename to spine-godot/spine_godot/SpineSkeletonDataResource.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkeletonDataResource.h b/spine-godot/spine_godot/SpineSkeletonDataResource.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkeletonDataResource.h
rename to spine-godot/spine_godot/SpineSkeletonDataResource.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkeletonFileResource.cpp b/spine-godot/spine_godot/SpineSkeletonFileResource.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkeletonFileResource.cpp
rename to spine-godot/spine_godot/SpineSkeletonFileResource.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkeletonFileResource.h b/spine-godot/spine_godot/SpineSkeletonFileResource.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkeletonFileResource.h
rename to spine-godot/spine_godot/SpineSkeletonFileResource.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkin.cpp b/spine-godot/spine_godot/SpineSkin.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkin.cpp
rename to spine-godot/spine_godot/SpineSkin.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkin.h b/spine-godot/spine_godot/SpineSkin.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkin.h
rename to spine-godot/spine_godot/SpineSkin.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkinAttachmentMapEntries.cpp b/spine-godot/spine_godot/SpineSkinAttachmentMapEntries.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkinAttachmentMapEntries.cpp
rename to spine-godot/spine_godot/SpineSkinAttachmentMapEntries.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineSkinAttachmentMapEntries.h b/spine-godot/spine_godot/SpineSkinAttachmentMapEntries.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSkinAttachmentMapEntries.h
rename to spine-godot/spine_godot/SpineSkinAttachmentMapEntries.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineSlot.cpp b/spine-godot/spine_godot/SpineSlot.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSlot.cpp
rename to spine-godot/spine_godot/SpineSlot.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineSlot.h b/spine-godot/spine_godot/SpineSlot.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSlot.h
rename to spine-godot/spine_godot/SpineSlot.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineSlotData.cpp b/spine-godot/spine_godot/SpineSlotData.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSlotData.cpp
rename to spine-godot/spine_godot/SpineSlotData.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineSlotData.h b/spine-godot/spine_godot/SpineSlotData.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSlotData.h
rename to spine-godot/spine_godot/SpineSlotData.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineSprite.cpp b/spine-godot/spine_godot/SpineSprite.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSprite.cpp
rename to spine-godot/spine_godot/SpineSprite.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineSprite.h b/spine-godot/spine_godot/SpineSprite.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineSprite.h
rename to spine-godot/spine_godot/SpineSprite.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineTimeline.cpp b/spine-godot/spine_godot/SpineTimeline.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineTimeline.cpp
rename to spine-godot/spine_godot/SpineTimeline.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineTimeline.h b/spine-godot/spine_godot/SpineTimeline.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineTimeline.h
rename to spine-godot/spine_godot/SpineTimeline.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineTrackEntry.cpp b/spine-godot/spine_godot/SpineTrackEntry.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineTrackEntry.cpp
rename to spine-godot/spine_godot/SpineTrackEntry.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineTrackEntry.h b/spine-godot/spine_godot/SpineTrackEntry.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineTrackEntry.h
rename to spine-godot/spine_godot/SpineTrackEntry.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineTransformConstraint.cpp b/spine-godot/spine_godot/SpineTransformConstraint.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineTransformConstraint.cpp
rename to spine-godot/spine_godot/SpineTransformConstraint.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineTransformConstraint.h b/spine-godot/spine_godot/SpineTransformConstraint.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineTransformConstraint.h
rename to spine-godot/spine_godot/SpineTransformConstraint.h
diff --git a/spine-godot/godot/modules/spine_godot/SpineTransformConstraintData.cpp b/spine-godot/spine_godot/SpineTransformConstraintData.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineTransformConstraintData.cpp
rename to spine-godot/spine_godot/SpineTransformConstraintData.cpp
diff --git a/spine-godot/godot/modules/spine_godot/SpineTransformConstraintData.h b/spine-godot/spine_godot/SpineTransformConstraintData.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/SpineTransformConstraintData.h
rename to spine-godot/spine_godot/SpineTransformConstraintData.h
diff --git a/spine-godot/godot/modules/spine_godot/config.py b/spine-godot/spine_godot/config.py
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/config.py
rename to spine-godot/spine_godot/config.py
diff --git a/spine-godot/godot/modules/spine_godot/register_types.cpp b/spine-godot/spine_godot/register_types.cpp
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/register_types.cpp
rename to spine-godot/spine_godot/register_types.cpp
diff --git a/spine-godot/godot/modules/spine_godot/register_types.h b/spine-godot/spine_godot/register_types.h
similarity index 100%
rename from spine-godot/godot/modules/spine_godot/register_types.h
rename to spine-godot/spine_godot/register_types.h