From 2924577137cd545748baa834962b5056659dc713 Mon Sep 17 00:00:00 2001 From: xSquishyLiam <56977759+xSquishyLiam@users.noreply.github.com> Date: Wed, 10 Dec 2025 12:37:14 +0000 Subject: [PATCH] Major changes alongside PacketEvents API updated for 1.21.11 --- .github/workflows/build.yml | 6 +- .idea/.gitignore | 3 + .idea/encodings.xml | 4 +- .idea/gradle.xml | 2 + .idea/workspace.xml | 123 ++++- build.gradle.kts | 39 +- geyser/build.gradle.kts | 35 ++ .../libs/geyserutils-geyser-1.0-SNAPSHOT.jar | Bin 0 -> 6652213 bytes .../GeyserModelEngineExtension.java | 71 +++ .../managers/ConfigManager.java | 25 + .../resourcepack/ResourcePackManager.java | 446 ++++++++++++++++++ .../resourcepack/generator/Animation.java | 151 ++++++ .../generator/AnimationController.java | 84 ++++ .../resourcepack/generator/Entity.java | 207 ++++++++ .../resourcepack/generator/Geometry.java | 113 +++++ .../resourcepack/generator/Material.java | 38 ++ .../resourcepack/generator/ModelConfig.java | 104 ++++ .../resourcepack/generator/PackManifest.java | 32 ++ .../generator/RenderController.java | 178 +++++++ .../resourcepack/generator/data/BoneData.java | 34 ++ .../generator/data/TextureData.java | 34 ++ .../util/BooleanPacker.java | 68 +++ .../util/FileConfiguration.java | 146 ++++++ .../util/FileUtils.java | 52 ++ .../util/ZipUtil.java | 49 ++ .../resources/Extension/Lang/messages.yml | 4 + .../src/main/resources/Extension/config.yml | 6 + geyser/src/main/resources/extension.yml | 8 + gradle/wrapper/gradle-wrapper.properties | 2 +- paper/build.gradle.kts | 61 +++ .../libs}/geyserutils-spigot-1.0-SNAPSHOT.jar | Bin 6555581 -> 6622413 bytes .../geysermodelengine/GeyserModelEngine.java | 20 +- .../GeyserModelEngineReloadCommand.java | 26 + .../listener/BetterModelListener.java | 38 ++ .../listener/ModelEngineListener.java | 58 +++ .../listener/ModelListener.java | 50 ++ .../listener/MountPacketListener.java | 3 +- .../managers/ConfigManager.java | 0 .../managers/commands/CommandManager.java | 4 +- .../managers/commands/CommandManagers.java | 8 +- .../GeyserModelEngineCommandManager.java | 13 +- .../commands/subcommands/SubCommands.java | 8 +- .../managers/model/EntityTaskManager.java | 102 ++++ .../managers/model/ModelManager.java | 74 +++ .../model/entity/BetterModelEntityData.java | 86 ++++ .../managers/model/entity/EntityData.java | 30 ++ .../model/entity/ModelEngineEntityData.java | 37 +- .../model/model/BetterModelModel.java | 41 ++ .../managers/model/model/Model.java | 28 ++ .../model/model/ModelEngineModel.java | 45 ++ .../modelhandler/BetterModelHandler.java | 66 +++ .../modelhandler/ModelEngineHandler.java | 69 +++ .../model/modelhandler/ModelHandler.java | 23 + .../BetterModelPropertyHandler.java | 167 +++++++ .../ModelEnginePropertyHandler.java | 179 +++++++ .../propertyhandler/PropertyHandler.java | 44 ++ .../taskshandler/BetterModelTaskHandler.java | 171 +++++++ .../taskshandler/ModelEngineTaskHandler.java | 168 +++++++ .../model/taskshandler/TaskHandler.java | 25 + .../packet/entity/PacketEntity.java | 7 +- .../BedrockMountControlRunnable.java | 18 +- .../runnables/UpdateTaskRunnable.java | 34 ++ .../geysermodelengine/util/BedrockUtils.java | 18 + .../geysermodelengine/util/BooleanPacker.java | 10 +- .../geysermodelengine/util/ColourUtils.java | 0 .../src}/main/resources/Lang/messages.yml | 0 paper/src/main/resources/config.yml | 13 + .../src}/main/resources/paper-plugin.yml | 9 +- settings.gradle.kts | 3 + .../GeyserModelEngineReloadCommand.java | 28 -- .../listener/ModelListener.java | 77 --- .../managers/model/EntityTaskManager.java | 152 ------ .../managers/model/ModelManager.java | 76 --- .../runnables/EntityTaskRunnable.java | 268 ----------- .../runnables/UpdateTaskRunnable.java | 29 -- src/main/resources/config.yml | 11 - 76 files changed, 3683 insertions(+), 778 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 geyser/build.gradle.kts create mode 100644 geyser/libs/geyserutils-geyser-1.0-SNAPSHOT.jar create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/GeyserModelEngineExtension.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/ConfigManager.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/ResourcePackManager.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Animation.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/AnimationController.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Entity.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Geometry.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Material.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/ModelConfig.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/PackManifest.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/RenderController.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/data/BoneData.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/data/TextureData.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/util/BooleanPacker.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/util/FileConfiguration.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/util/FileUtils.java create mode 100644 geyser/src/main/java/re/imc/geysermodelengineextension/util/ZipUtil.java create mode 100644 geyser/src/main/resources/Extension/Lang/messages.yml create mode 100644 geyser/src/main/resources/Extension/config.yml create mode 100644 geyser/src/main/resources/extension.yml create mode 100644 paper/build.gradle.kts rename {libs => paper/libs}/geyserutils-spigot-1.0-SNAPSHOT.jar (82%) rename {src => paper/src}/main/java/re/imc/geysermodelengine/GeyserModelEngine.java (79%) create mode 100644 paper/src/main/java/re/imc/geysermodelengine/commands/geysermodelenginecommands/GeyserModelEngineReloadCommand.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/listener/BetterModelListener.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/listener/ModelEngineListener.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java rename {src => paper/src}/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java (93%) rename {src => paper/src}/main/java/re/imc/geysermodelengine/managers/ConfigManager.java (100%) rename {src => paper/src}/main/java/re/imc/geysermodelengine/managers/commands/CommandManager.java (87%) rename {src => paper/src}/main/java/re/imc/geysermodelengine/managers/commands/CommandManagers.java (62%) rename {src => paper/src}/main/java/re/imc/geysermodelengine/managers/commands/managers/geysermodelengine/GeyserModelEngineCommandManager.java (74%) rename {src => paper/src}/main/java/re/imc/geysermodelengine/managers/commands/subcommands/SubCommands.java (54%) create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/entity/BetterModelEntityData.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/entity/EntityData.java rename src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java => paper/src/main/java/re/imc/geysermodelengine/managers/model/entity/ModelEngineEntityData.java (63%) create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/model/BetterModelModel.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/model/Model.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/model/ModelEngineModel.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/modelhandler/BetterModelHandler.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/modelhandler/ModelEngineHandler.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/modelhandler/ModelHandler.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/propertyhandler/BetterModelPropertyHandler.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/propertyhandler/ModelEnginePropertyHandler.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/propertyhandler/PropertyHandler.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/taskshandler/BetterModelTaskHandler.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/taskshandler/ModelEngineTaskHandler.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/managers/model/taskshandler/TaskHandler.java rename {src => paper/src}/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java (93%) rename {src => paper/src}/main/java/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.java (80%) create mode 100644 paper/src/main/java/re/imc/geysermodelengine/runnables/UpdateTaskRunnable.java create mode 100644 paper/src/main/java/re/imc/geysermodelengine/util/BedrockUtils.java rename {src => paper/src}/main/java/re/imc/geysermodelengine/util/BooleanPacker.java (81%) rename {src => paper/src}/main/java/re/imc/geysermodelengine/util/ColourUtils.java (100%) rename {src => paper/src}/main/resources/Lang/messages.yml (100%) create mode 100644 paper/src/main/resources/config.yml rename {src => paper/src}/main/resources/paper-plugin.yml (75%) delete mode 100644 src/main/java/re/imc/geysermodelengine/commands/geysermodelenginecommands/GeyserModelEngineReloadCommand.java delete mode 100644 src/main/java/re/imc/geysermodelengine/listener/ModelListener.java delete mode 100644 src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java delete mode 100644 src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java delete mode 100644 src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java delete mode 100644 src/main/java/re/imc/geysermodelengine/runnables/UpdateTaskRunnable.java delete mode 100644 src/main/resources/config.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c4480e..b27e9d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - bettermodel-support-dev jobs: build: @@ -30,8 +31,9 @@ jobs: - name: Auto release uses: "marvinpinto/action-automatic-releases@latest" with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" + repo_token: "${{secrets.GITHUB_TOKEN}}" automatic_release_tag: latest prerelease: false files: | - build/libs/GeyserModelEngine*.jar + paper/build/libs/GeyserModelEngine*.jar + geyser/build/libs/GeyserModelEngine*.jar diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index aa00ffa..da33708 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce1c62c..79647b7 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,6 +8,8 @@ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 58d74b2..0f855d4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,14 +4,15 @@