addedd namespace support

Updated PE to 2.9.5 & added bstats & fixed build.yml

.github/workflows/build.yml

@@ -8,10 +8,10 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       
       # Setup JDK
       - name: Setup Java JDK
@@ -19,20 +19,14 @@ jobs:
         with:
           java-version: 17
           distribution: 'zulu'
-          
+
-      - name: Restore Maven cache
-        uses: skjolber/maven-cache-github-action@v1
-        with:
-          step: restore
-          
       # Build
-      - name: Build with Maven
+      - name: Make gradlew executable
-        run: mvn package
+        run: chmod +x gradlew
-        
+
-      - name: Save Maven cache
+      - name: Build with Gradle
-        uses: skjolber/maven-cache-github-action@v1
+        run: ./gradlew build
-        with:
+
-          step: save
       - name: Auto release
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
@@ -40,4 +34,4 @@ jobs:
           automatic_release_tag: latest
           prerelease: false
           files: |
-            target/GeyserModelEngine*.jar
+            build/libs/GeyserModelEngine*.jar

.gitignore

@@ -1,2 +1,42 @@
-# 项目排除路径
+.gradle
-/target/
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue May 27 16:38:57 BST 2025
-gradle.version=8.12

.idea/workspace.xml

@@ -6,7 +6,6 @@
   <component name="ChangeListManager">
     <list default="true" id="ff2e9770-ec88-4715-adeb-b9dbda130e1a" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/commands/geysermodelenginecommands/GeyserModelEngineReloadCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/commands/geysermodelenginecommands/GeyserModelEngineReloadCommand.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -60,9 +59,13 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GradleScriptDefinitionsStorage" workingDir="$PROJECT_DIR$" gradleHome="$USER_HOME$/.gradle/wrapper/dists/gradle-8.12-bin/cetblhg4pflnnks72fxwobvgv/gradle-8.12" javaHome="$USER_HOME$/.jdks/openjdk-21.0.1" gradleVersion="8.12" />
   <component name="MavenRunner">
     <option name="delegateBuildToMaven" value="true" />
   </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="DEPENDENCY_CHECKER_PROBLEMS_TAB" />
+  </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 8
 }</component>
@@ -76,6 +79,8 @@
   </component>
   <component name="PropertiesComponent">{
   &quot;keyToString&quot;: {
+    &quot;Gradle.Download Sources.executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.GeyserModelEngine [build].executor&quot;: &quot;Run&quot;,
     &quot;Gradle.GeyserModelEngine [jar].executor&quot;: &quot;Run&quot;,
     &quot;Maven.GeyserModelEngine [install...].executor&quot;: &quot;Run&quot;,
     &quot;Maven.GeyserModelEngine [install].executor&quot;: &quot;Run&quot;,
@@ -83,6 +88,7 @@
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
     &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
     &quot;last_opened_file_path&quot;: &quot;D:/Coding/Forks/Minecraft/GeyserModelEngine&quot;,
     &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
     &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
@@ -94,8 +100,34 @@
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Coding\Forks\Minecraft\GeyserModelEngine" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Coding\Forks\Minecraft\GeyserModelEngine\.github\workflows" />
+      <recent name="D:\Coding\Forks\Minecraft\GeyserModelEngine\libs" />
+    </key>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Gradle.GeyserModelEngine [build]">
+    <configuration name="GeyserModelEngine [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value="build" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>false</RunAsTest>
+      <method v="2" />
+    </configuration>
     <configuration name="GeyserModelEngine [jar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -120,6 +152,7 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Gradle.GeyserModelEngine [build]" />
         <item itemvalue="Gradle.GeyserModelEngine [jar]" />
       </list>
     </recent_temporary>

README.md

@@ -20,27 +20,22 @@ Download the following plugins according to what server software you use.
 - Put `GeyserModelEngine` in the plugins folder (only Spigot or forks of Spigot supported)
 - Put either `geyserutils-spigot` in your plugins folder aswell (`geyserutils-velocity`/`geyserutils-bungeecord` in your Velocity/Bungeecord plugins folder if you use it)
 - Put `GeyserModelEnginePackGenerator` and `geyserutils-geyser` into `plugins/[Geyser-Folder]/extensions`
+- Inside `floodgate` set `send-floodgate-data` to `true` in your Velocity/Bungeecord folder and copy over the key.pem into your backend `floodgate` folders
 
 Start the server to generate the relevant configuration files, and then shut down the server to convert any models.
 
 # Convert Models
-This is old method to convert model:
-
 `GeyserModelEnginePackGenerator` is capable of generating models all by itself. After generating it will also apply this pack automatically.
 
-- First go to `plugins/[Geyser-Folder]/extensions/geysermodelenginepackgenerator/input/`
+- Firstly, install [packer plugin](https://github.com/GeyserExtensionists/GeyserModelEngineBlockbenchPacker) for your blockbench.
-- Create a folder in this directory with the ID of the model. (this is the same name as your model within ModelEngine 4.)
+
+- Then, open your bbmodel, go `File -> Export -> Export GeyserModelEngine Model`, you will get a zip, just unzip it to `input` folder.
 
 <img src="docsimg/example.jpg" width="500">
 
 > Each model should have a separate model folder
 > Subfolders are supported if you want to categorize them
 
-- Now use BlockBench and convert your model to a Bedrock Entity, this will allow you to export the Bedrock Geometry and Animations.
-- Put the geometry, animations and texture file in this folder you've made.
-
-<img src="docsimg/example1.jpg" width="500">
-
 - Restart the server or reload geyser to start generating the resource pack.
 - Go to  `plugins/[Geyser-Folder]/extensions/geysermodelenginepackgenerator`, and you should see your pack generated!
 
@@ -49,12 +44,6 @@ This is old method to convert model:
 - Final step, reload Geyser or restart the server to load the resource pack.
 - Congratulations, you've completed this tutorial!
 
-# Model Packer
-
-This is new way to convert model
-- Firstly, install [packer plugin](https://github.com/GeyserExtensionists/GeyserModelEngineBlockbenchPacker) for your blockbench.
-- Then, open your bbmodel, go `File -> Export -> Export GeyserModelEngine Model`, you will get a zip, just unzip it to `input` folder.
-
 # Tips
 
 * Pay attention! The pack only regenerates when the number of models changes, you can technically speaking remove the generated_pack folder to force a reload aswell.

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.github.goooler.shadow") version "8.1.7"
+    id("io.github.goooler.shadow") version "8.1.8"
 }
 
 group = "re.imc"
@@ -13,24 +13,23 @@ repositories {
 
     maven("https://mvn.lumine.io/repository/maven-public/")
 
-    maven("https://repo.opencollab.dev/maven-releases/")
+    maven("https://repo.opencollab.dev/main/")
-    maven("https://repo.opencollab.dev/maven-snapshots/")
 
     maven("https://repo.codemc.io/repository/maven-public/")
     maven("https://repo.codemc.io/repository/maven-releases/")
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
+    implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:10.1.2")
 
-    implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:10.1.1")
+    compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.9")
-
-    compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.4")
 
     compileOnly(files("libs/geyserutils-spigot-1.0-SNAPSHOT.jar"))
     compileOnly("org.geysermc.floodgate:api:2.2.4-SNAPSHOT")
 
-    implementation("com.github.retrooper:packetevents-spigot:2.9.0-SNAPSHOT")
+    implementation("com.github.retrooper:packetevents-spigot:2.9.5")
+    implementation("org.bstats:bstats-bukkit:3.0.2")
 
     implementation("org.reflections:reflections:0.10.2")
 }
@@ -44,14 +43,18 @@ tasks.compileJava {
 }
 
 tasks.shadowJar {
+    archiveFileName.set("${rootProject.name}-${version}.jar")
+
     relocate("dev.jorel.commandapi", "re.imc.geysermodelengine.libs.commandapi")
 
     relocate("com.github.retrooper", "re.imc.geysermodelengine.libs.com.github.retrooper.packetevents")
     relocate("io.github.retrooper", "re.imc.geysermodelengine.libs.io.github.retrooper.packetevents")
 
+    relocate("org.bstats", "re.imc.geysermodelengine.libs.bstats")
+
     relocate("org.reflections", "re.imc.geysermodelengine.libs.reflections")
 }
 
-tasks.jar {
+tasks.build {
-    dependsOn(tasks.shadowJar)
+    dependsOn("shadowJar")
 }

build/resources/main/Lang/messages.yml

@@ -1,4 +0,0 @@
-
-commands:
-  reload:
-    successfully-reloaded: "<#55FF55>GeyserModelEngine configuration reloaded!"

build/resources/main/config.yml

@@ -1,8 +0,0 @@
-data-send-delay: 5
-entity-view-distance: 50
-join-send-delay: 20
-entity-position-update-period: 35
-model-entity-type: BAT # must be a living entity
-enable-part-visibility-models:
-  - example
-debug: false

build/resources/main/paper-plugin.yml

@@ -1,22 +0,0 @@
-main: re.imc.geysermodelengine.GeyserModelEngine
-name: GeyserModelEngine
-version: '1.0.0'
-api-version: '1.21'
-
-authors:
-  - zimzaza4
-  - willem.dev
-  - TheLividaProject
-
-load: STARTUP
-
-dependencies:
-  server:
-    GeyserUtils:
-      required: true
-    packetevents:
-      required: true
-    ModelEngine:
-      required: true
-    floodgate:
-      required: true

build/tmp/jar/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

build/tmp/shadowJar/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

pom.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>re.imc</groupId>
+    <artifactId>GeyserModelEngine</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>GeyserModelEngine</name>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.4.1</version>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.github.retrooper.packetevents</pattern>
+                            <shadedPattern>re.imc.geysermodelengine.libs.com.github.retrooper.packetevents</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>io.github.retrooper.packetevents</pattern>
+                            <shadedPattern>re.imc.geysermodelengine.libs.io.github.retrooper.packetevents</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>papermc-repo</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>nexus</id>
+            <name>Lumine Public</name>
+            <url>https://mvn.lumine.io/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>md_5-public</id>
+            <url>https://repo.md-5.net/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>opencollab-release-repo</id>
+            <url>https://repo.opencollab.dev/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>opencollab-snapshot-repo</id>
+            <url>https://repo.opencollab.dev/maven-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/repository/public/</url>
+        </repository>
+        <repository>
+            <id>codemc-releases</id>
+            <url>https://repo.codemc.io/repository/maven-releases/</url>
+        </repository>
+        <repository>
+            <id>codemc-snapshots</id>
+            <url>https://repo.codemc.io/repository/maven-snapshots/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.ticxo.modelengine</groupId>
+            <artifactId>ModelEngine</artifactId>
+            <version>R4.0.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.geyserextensionists</groupId>
+            <artifactId>geyserutils-spigot</artifactId>
+            <version>1.0.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/geyserutils-spigot-1.0-SNAPSHOT.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>org.geysermc.floodgate</groupId>
+            <artifactId>api</artifactId>
+            <version>2.2.2-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.retrooper</groupId>
+            <artifactId>packetevents-spigot</artifactId>
+            <version>2.8.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

src/main/java/re/imc/geysermodelengine/Events/GeyserModelEngineModelSpawn.java

@@ -0,0 +1,6 @@
+package re.imc.geysermodelengine.Events;
+
+public class GeyserModelEngineModelSpawn {
+
+    //Spawn Event
+}

src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java

@@ -2,10 +2,10 @@ package re.imc.geysermodelengine;
 
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.PacketListenerPriority;
-import com.ticxo.modelengine.api.model.ActiveModel;
 import dev.jorel.commandapi.CommandAPI;
 import dev.jorel.commandapi.CommandAPIBukkitConfig;
 import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 import re.imc.geysermodelengine.listener.ModelListener;
@@ -14,11 +14,9 @@ import re.imc.geysermodelengine.managers.ConfigManager;
 import re.imc.geysermodelengine.managers.commands.CommandManager;
 import re.imc.geysermodelengine.managers.model.EntityTaskManager;
 import re.imc.geysermodelengine.managers.model.ModelManager;
-import re.imc.geysermodelengine.managers.model.data.ModelEntityData;
 import re.imc.geysermodelengine.runnables.BedrockMountControlRunnable;
 import re.imc.geysermodelengine.runnables.UpdateTaskRunnable;
 
-import java.util.*;
 import java.util.concurrent.*;
 
 public class GeyserModelEngine extends JavaPlugin {
@@ -30,6 +28,8 @@ public class GeyserModelEngine extends JavaPlugin {
     private ModelManager modelManager;
     private EntityTaskManager entityTaskManager;
 
+    private ScheduledExecutorService schedulerPool;
+
     @Override
     public void onLoad() {
         PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this));
@@ -44,6 +44,8 @@ public class GeyserModelEngine extends JavaPlugin {
         loadManagers();
         loadRunnables();
 
+        loadBStats();
+
         PacketEvents.getAPI().getEventManager().registerListener(new MountPacketListener(this), PacketListenerPriority.NORMAL);
 
         Bukkit.getPluginManager().registerEvents(new ModelListener(this), this);
@@ -53,11 +55,7 @@ public class GeyserModelEngine extends JavaPlugin {
     public void onDisable() {
         PacketEvents.getAPI().terminate();
 
-        for (Map<ActiveModel, ModelEntityData> entities : modelManager.getEntitiesCache().values()) {
+        this.modelManager.removeEntities();
-            entities.forEach((model, modelEntity) -> {
-                modelEntity.getEntity().remove();
-            });
-        }
 
         CommandAPI.onDisable();
     }
@@ -67,6 +65,10 @@ public class GeyserModelEngine extends JavaPlugin {
         CommandAPI.onEnable();
     }
 
+    private void loadBStats() {
+        if (configManager.getConfig().getBoolean("bstats", true)) new Metrics(this, 26981);
+    }
+
     private void loadManagers() {
         this.configManager = new ConfigManager(this);
 
@@ -77,6 +79,8 @@ public class GeyserModelEngine extends JavaPlugin {
     }
 
     private void loadRunnables() {
+        this.schedulerPool = Executors.newScheduledThreadPool(configManager.getConfig().getInt("thread-pool-size", 4));
+
         Bukkit.getAsyncScheduler().runAtFixedRate(this, new UpdateTaskRunnable(this), 10, configManager.getConfig().getLong("entity-position-update-period", 35), TimeUnit.MILLISECONDS);
         Bukkit.getAsyncScheduler().runAtFixedRate(this, new BedrockMountControlRunnable(this), 1, 1, TimeUnit.MILLISECONDS);
     }
@@ -96,4 +100,8 @@ public class GeyserModelEngine extends JavaPlugin {
     public EntityTaskManager getEntityTaskManager() {
         return entityTaskManager;
     }
+
+    public ScheduledExecutorService getSchedulerPool() {
+        return schedulerPool;
+    }
 }

src/main/java/re/imc/geysermodelengine/listener/ModelListener.java

@@ -1,8 +1,6 @@
 package re.imc.geysermodelengine.listener;
 
-import com.ticxo.modelengine.api.events.AddModelEvent;
+import com.ticxo.modelengine.api.events.*;
-import com.ticxo.modelengine.api.events.ModelDismountEvent;
-import com.ticxo.modelengine.api.events.ModelMountEvent;
 import com.ticxo.modelengine.api.model.ActiveModel;
 import org.apache.commons.lang3.tuple.Pair;
 import org.bukkit.Bukkit;
@@ -14,7 +12,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.world.WorldInitEvent;
-import org.bukkit.event.world.WorldLoadEvent;
+import org.geysermc.floodgate.api.FloodgateApi;
 import re.imc.geysermodelengine.GeyserModelEngine;
 import re.imc.geysermodelengine.managers.model.data.ModelEntityData;
 
@@ -31,7 +29,6 @@ public class ModelListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR)
     public void onAddModel(AddModelEvent event) {
         if (event.isCancelled()) return;
-
         plugin.getModelManager().create(event.getTarget(), event.getModel());
     }
 
@@ -43,32 +40,43 @@ public class ModelListener implements Listener {
         ModelEntityData model = map.get(event.getVehicle());
 
         if (model != null && event.getPassenger() instanceof Player player) {
-            plugin.getModelManager().getDriversCache().put(player, Pair.of(event.getVehicle(), event.getSeat()));
+            plugin.getModelManager().getDriversCache().put(player.getUniqueId(), Pair.of(event.getVehicle(), event.getSeat()));
         }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onModelDismount(ModelDismountEvent event) {
         if (event.getPassenger() instanceof Player player) {
-            plugin.getModelManager().getDriversCache().remove(player);
+            plugin.getModelManager().getDriversCache().remove(player.getUniqueId());
         }
     }
 
+    /*
+     / xSquishyLiam:
+     / I'm wondering if we could move this to more of a player loading chunks instead of checking all worlds via PlayerChunkLoadEvent?
+    */
     @EventHandler
     public void onWorldInit(WorldInitEvent event) {
         World world = event.getWorld();
         world.getEntities().forEach(entity -> plugin.getModelManager().processEntities(entity));
     }
 
+    /*
+     / xSquishyLiam - conclusion:
+     / I'm assuming when a player joins the server the packet for mob spawning is instant so the client resyncs itself
+     / hence why the pig is shown instead of going invisible and not displaying the texture of the modeled mob
+    */
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        plugin.getModelManager().getPlayerJoinedCache().add(player.getUniqueId());
+        if (!FloodgateApi.getInstance().isFloodgatePlayer(player.getUniqueId())) return;
+        Bukkit.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> plugin.getModelManager().getPlayerJoinedCache().add(player.getUniqueId()), 10);
     }
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
+        if (!FloodgateApi.getInstance().isFloodgatePlayer(player.getUniqueId())) return;
         plugin.getModelManager().getPlayerJoinedCache().remove(player.getUniqueId());
     }
 }

src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java

@@ -28,11 +28,11 @@ public class MountPacketListener implements PacketListener {
         Player player = event.getPlayer();
 
         WrapperPlayClientEntityAction action = new WrapperPlayClientEntityAction(event);
-        Pair<ActiveModel, Mount> seat = plugin.getModelManager().getDriversCache().get(player);
+        Pair<ActiveModel, Mount> seat = plugin.getModelManager().getDriversCache().get(player.getUniqueId());
 
         if (seat == null) return;
         if (action.getAction() != WrapperPlayClientEntityAction.Action.START_SNEAKING) return;
 
-        ModelEngineAPI.getMountPairManager().tryDismount(event.getPlayer());
+        ModelEngineAPI.getMountPairManager().tryDismount(player);
     }
 }

src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java

@@ -60,9 +60,7 @@ public class EntityTaskManager {
             for (Player player : players) {
                 EntityUtils.sendCustomScale(player, model.getEntity().getEntityId(), average);
             }
-        } catch (Throwable t) {
+        } catch (Throwable ignored) {}
-            // ignore
-        }
     }
 
     public void sendColor(ModelEntityData model, Collection<Player> players, Color lastColor, boolean firstSend) {
@@ -82,19 +80,17 @@ public class EntityTaskManager {
 
     public void checkViewers(ModelEntityData model, Set<Player> viewers) {
         for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            if (FloodgateApi.getInstance().isFloodgatePlayer(onlinePlayer.getUniqueId())) {
+            if (!FloodgateApi.getInstance().isFloodgatePlayer(onlinePlayer.getUniqueId())) continue;
 
-                if (canSee(onlinePlayer, model.getEntity())) {
+            if (canSee(onlinePlayer, model.getEntity())) {
-
+                if (!viewers.contains(onlinePlayer)) {
-                    if (!viewers.contains(onlinePlayer)) {
+                    sendSpawnPacket(model, onlinePlayer);
-                        sendSpawnPacket(model, onlinePlayer);
+                    viewers.add(onlinePlayer);
-                        viewers.add(onlinePlayer);
+                }
-                    }
+            } else {
-                } else {
+                if (viewers.contains(onlinePlayer)) {
-                    if (viewers.contains(onlinePlayer)) {
+                    model.getEntity().sendEntityDestroyPacket(Collections.singletonList(onlinePlayer));
-                        model.getEntity().sendEntityDestroyPacket(Collections.singletonList(onlinePlayer));
+                    viewers.remove(onlinePlayer);
-                        viewers.remove(onlinePlayer);
-                    }
                 }
             }
         }

src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java

@@ -6,7 +6,6 @@ import com.ticxo.modelengine.api.model.ModeledEntity;
 import com.ticxo.modelengine.api.model.bone.type.Mount;
 import org.apache.commons.lang3.tuple.Pair;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
 import re.imc.geysermodelengine.GeyserModelEngine;
 import re.imc.geysermodelengine.managers.model.data.ModelEntityData;
 
@@ -22,7 +21,7 @@ public class ModelManager {
     private final ConcurrentHashMap<Integer, Map<ActiveModel, ModelEntityData>> entitiesCache = new ConcurrentHashMap<>();
     private final ConcurrentHashMap<Integer, ModelEntityData> modelEntitiesCache = new ConcurrentHashMap<>();
 
-    private final ConcurrentHashMap<Player, Pair<ActiveModel, Mount>> driversCache = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<UUID, Pair<ActiveModel, Mount>> driversCache = new ConcurrentHashMap<>();
 
     public ModelManager(GeyserModelEngine plugin) {
         this.plugin = plugin;
@@ -53,6 +52,12 @@ public class ModelManager {
         model.ifPresent(m -> create(modeledEntity, m));
     }
 
+    public void removeEntities() {
+        for (Map<ActiveModel, ModelEntityData> entities : entitiesCache.values()) {
+            entities.forEach((model, modelEntity) -> modelEntity.getEntity().remove());
+        }
+    }
+
     public HashSet<UUID> getPlayerJoinedCache() {
         return playerJoinedCache;
     }
@@ -65,7 +70,7 @@ public class ModelManager {
         return modelEntitiesCache;
     }
 
-    public ConcurrentHashMap<Player, Pair<ActiveModel, Mount>> getDriversCache() {
+    public ConcurrentHashMap<UUID, Pair<ActiveModel, Mount>> getDriversCache() {
         return driversCache;
     }
 }

src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java

@@ -4,7 +4,6 @@ import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import com.google.common.collect.Sets;
 import com.ticxo.modelengine.api.model.ActiveModel;
 import com.ticxo.modelengine.api.model.ModeledEntity;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import re.imc.geysermodelengine.GeyserModelEngine;
@@ -12,7 +11,6 @@ import re.imc.geysermodelengine.packet.entity.PacketEntity;
 import re.imc.geysermodelengine.runnables.EntityTaskRunnable;
 
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 public class ModelEntityData {
 
@@ -50,7 +48,6 @@ public class ModelEntityData {
 
     public void runEntityTask() {
         entityTask = new EntityTaskRunnable(plugin, this);
-        Bukkit.getAsyncScheduler().runAtFixedRate(plugin, entityTask, 0, 20, TimeUnit.MILLISECONDS);
     }
 
     public PacketEntity getEntity() {

src/main/java/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.java

@@ -28,7 +28,7 @@ public class BedrockMountControlRunnable implements Consumer<ScheduledTask> {
             if (!FloodgateApi.getInstance().isFloodgatePlayer(player.getUniqueId())) continue;
 
             float pitch = player.getLocation().getPitch();
-            Pair<ActiveModel, Mount> seat = plugin.getModelManager().getDriversCache().get(player);
+            Pair<ActiveModel, Mount> seat = plugin.getModelManager().getDriversCache().get(player.getUniqueId());
 
             if (seat == null) continue;
 

src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java

@@ -8,9 +8,7 @@ import com.ticxo.modelengine.api.generator.blueprint.BlueprintBone;
 import com.ticxo.modelengine.api.model.ActiveModel;
 import com.ticxo.modelengine.api.model.ModeledEntity;
 import com.ticxo.modelengine.api.model.bone.ModelBone;
-import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
 import me.zimzaza4.geyserutils.spigot.api.EntityUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import re.imc.geysermodelengine.GeyserModelEngine;
 import re.imc.geysermodelengine.managers.model.data.ModelEntityData;
@@ -21,10 +19,10 @@ import java.awt.*;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
-public class EntityTaskRunnable implements Consumer<ScheduledTask> {
+public class EntityTaskRunnable {
 
     private final GeyserModelEngine plugin;
 
@@ -43,16 +41,19 @@ public class EntityTaskRunnable implements Consumer<ScheduledTask> {
 
     private final BooleanPacker booleanPacker = new BooleanPacker();
 
+    private final ScheduledFuture scheduledFuture;
+
     public EntityTaskRunnable(GeyserModelEngine plugin, ModelEntityData model) {
         this.plugin = plugin;
 
         this.model = model;
 
         plugin.getEntityTaskManager().sendHitBoxToAll(model);
+
+        scheduledFuture = plugin.getSchedulerPool().scheduleAtFixedRate(this::runAsync, 0, 20, TimeUnit.MILLISECONDS);
     }
 
-    @Override
+    public void runAsync() {
-    public void accept(ScheduledTask scheduledTask) {
         plugin.getEntityTaskManager().checkViewers(model, model.getViewers());
 
         PacketEntity entity = model.getEntity();
@@ -70,7 +71,7 @@ public class EntityTaskRunnable implements Consumer<ScheduledTask> {
 
             plugin.getModelManager().getEntitiesCache().remove(modeledEntity.getBase().getEntityId());
             plugin.getModelManager().getModelEntitiesCache().remove(entity.getEntityId());
-            scheduledTask.cancel();
+            cancel();
             return;
         }
 
@@ -96,13 +97,17 @@ public class EntityTaskRunnable implements Consumer<ScheduledTask> {
         plugin.getEntityTaskManager().sendColor(model, viewers, lastColor, false);
     }
 
-    public void sendEntityData(ModelEntityData model, Player player, int delay) {
+    public void cancel() {
-        EntityUtils.setCustomEntity(player, model.getEntity().getEntityId(), "modelengine:" + model.getActiveModel().getBlueprint().getName().toLowerCase());
+        scheduledFuture.cancel(true);
+    }
 
-        Bukkit.getAsyncScheduler().runDelayed(plugin, scheduledTask -> {
+    public void sendEntityData(ModelEntityData model, Player player, int delay) {
+        EntityUtils.setCustomEntity(player, model.getEntity().getEntityId(), plugin.getConfigManager().getConfig().getString("namespace") + ":" + model.getActiveModel().getBlueprint().getName().toLowerCase());
+
+        plugin.getSchedulerPool().schedule(() -> {
             model.getEntity().sendSpawnPacket(Collections.singletonList(player));
 
-            Bukkit.getAsyncScheduler().runDelayed(plugin, scheduledTask1 -> {
+            plugin.getSchedulerPool().schedule(() -> {
                 plugin.getEntityTaskManager().sendHitBox(model, player);
                 plugin.getEntityTaskManager().sendScale(model, Collections.singleton(player), lastScale, true);
                 plugin.getEntityTaskManager().sendColor(model, Collections.singleton(player), lastColor, true);
@@ -157,14 +162,15 @@ public class EntityTaskRunnable implements Consumer<ScheduledTask> {
 
         Map<String, Integer> intUpdates = new HashMap<>();
         int i = 0;
+
         for (Integer integer : booleanPacker.mapBooleansToInts(boneUpdates)) {
-            intUpdates.put("modelengine:bone" + i, integer);
+            intUpdates.put(plugin.getConfigManager().getConfig().getString("namespace") + ":bone" + i, integer);
             i++;
         }
 
         i = 0;
         for (Integer integer : booleanPacker.mapBooleansToInts(animUpdates)) {
-            intUpdates.put("modelengine:anim" + i, integer);
+            intUpdates.put(plugin.getConfigManager().getConfig().getString("namespace") + ":anim" + i, integer);
             i++;
         }
 
@@ -255,4 +261,8 @@ public class EntityTaskRunnable implements Consumer<ScheduledTask> {
     public Cache<String, Boolean> getLastPlayedAnim() {
         return lastPlayedAnim;
     }
+
+    public ScheduledFuture getScheduledFuture() {
+        return scheduledFuture;
+    }
 }

src/main/resources/config.yml

@@ -1,8 +1,13 @@
+bstats: true
+
+namespace: "modelengine"
 data-send-delay: 5
 entity-view-distance: 50
 join-send-delay: 20
 entity-position-update-period: 35
+thread-pool-size: 4
 model-entity-type: BAT # must be a living entity
 enable-part-visibility-models:
   - example
+
 debug: false

src/main/resources/paper-plugin.yml

@@ -6,7 +6,6 @@ api-version: '1.21'
 authors:
   - zimzaza4
   - willem.dev
-  - TheLividaProject
 
 load: STARTUP