From 3943381b2cd64a61acf9e7411a25ddce3ee9d026 Mon Sep 17 00:00:00 2001
From: xSquishyLiam <56977759+xSquishyLiam@users.noreply.github.com>
Date: Thu, 21 Aug 2025 00:12:29 +0100
Subject: [PATCH] added bstats

---
 .idea/workspace.xml                                    | 10 +++++++++-
 build.gradle.kts                                       |  3 +++
 .../re/imc/geysermodelengine/GeyserModelEngine.java    |  8 ++++++++
 .../imc/geysermodelengine/listener/ModelListener.java  |  4 +---
 .../listener/MountPacketListener.java                  |  2 +-
 src/main/resources/paper-plugin.yml                    |  1 -
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 51a680c..7e3000f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ff2e9770-ec88-4715-adeb-b9dbda130e1a" name="Changes" comment="" />
+    <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$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/paper-plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/paper-plugin.yml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -76,6 +83,7 @@
   </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;,
diff --git a/build.gradle.kts b/build.gradle.kts
index 3b73d9b..16b05ec 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     compileOnly("org.geysermc.floodgate:api:2.2.4-SNAPSHOT")
 
     implementation("com.github.retrooper:packetevents-spigot:2.9.4")
+    implementation("org.bstats:bstats-bukkit:3.0.2")
 
     implementation("org.reflections:reflections:0.10.2")
 }
@@ -49,6 +50,8 @@ tasks.shadowJar {
     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")
 }
 
diff --git a/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java b/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java
index b816bc1..a1db30b 100644
--- a/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java
+++ b/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java
@@ -5,6 +5,8 @@ import com.github.retrooper.packetevents.event.PacketListenerPriority;
 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.bstats.charts.CustomChart;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 import re.imc.geysermodelengine.listener.ModelListener;
@@ -43,6 +45,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);
@@ -62,6 +66,10 @@ public class GeyserModelEngine extends JavaPlugin {
         CommandAPI.onEnable();
     }
 
+    private void loadBStats() {
+        new Metrics(this, 26981);
+    }
+
     private void loadManagers() {
         this.configManager = new ConfigManager(this);
 
diff --git a/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java b/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java
index 842a81c..c11e512 100644
--- a/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java
+++ b/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.ModelDismountEvent;
-import com.ticxo.modelengine.api.events.ModelMountEvent;
+import com.ticxo.modelengine.api.events.*;
 import com.ticxo.modelengine.api.model.ActiveModel;
 import org.apache.commons.lang3.tuple.Pair;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java b/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java
index cb8ab83..cdda581 100644
--- a/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java
+++ b/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java
@@ -33,6 +33,6 @@ public class MountPacketListener implements PacketListener {
         if (seat == null) return;
         if (action.getAction() != WrapperPlayClientEntityAction.Action.START_SNEAKING) return;
 
-        ModelEngineAPI.getMountPairManager().tryDismount(event.getPlayer());
+        ModelEngineAPI.getMountPairManager().tryDismount(player);
     }
 }
diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml
index f45e067..015a6c6 100644
--- a/src/main/resources/paper-plugin.yml
+++ b/src/main/resources/paper-plugin.yml
@@ -6,7 +6,6 @@ api-version: '1.21'
 authors:
   - zimzaza4
   - willem.dev
-  - TheLividaProject
 
 load: STARTUP