Merge pull request #49 from TheLividaProject/main

Bumped PacketEvents to 2.9.4

.idea/workspace.xml

@@ -4,10 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ff2e9770-ec88-4715-adeb-b9dbda130e1a" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/managers/model/data/ModelEntityData.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/re/imc/geysermodelengine/runnables/EntityTaskRunnable.java" afterDir="false" />
-    </list>
+    <list default="true" id="ff2e9770-ec88-4715-adeb-b9dbda130e1a" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -79,6 +76,7 @@
   </component>
   <component name="PropertiesComponent">{
   &quot;keyToString&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;,
@@ -101,7 +99,29 @@
       <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" />
@@ -126,6 +146,7 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Gradle.GeyserModelEngine [build]" />
         <item itemvalue="Gradle.GeyserModelEngine [jar]" />
       </list>
     </recent_temporary>

build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
     compileOnly("org.geysermc.floodgate:api:2.2.4-SNAPSHOT")
 
 
-    implementation("com.github.retrooper:packetevents-spigot:2.9.3")
+    implementation("com.github.retrooper:packetevents-spigot:2.9.4")
 
     implementation("org.reflections:reflections:0.10.2")
 }
@@ -43,6 +43,8 @@ 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")
@@ -51,10 +53,6 @@ tasks.shadowJar {
     relocate("org.reflections", "re.imc.geysermodelengine.libs.reflections")
 }
 
-tasks.jar {
-    enabled = false
-}
-
 tasks.build {
     dependsOn("shadowJar")
 }

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

@@ -2,7 +2,6 @@ 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;
@@ -14,11 +13,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 {
@@ -55,11 +52,7 @@ public class GeyserModelEngine extends JavaPlugin {
     public void onDisable() {
         PacketEvents.getAPI().terminate();
 
-        for (Map<ActiveModel, ModelEntityData> entities : modelManager.getEntitiesCache().values()) {
-            entities.forEach((model, modelEntity) -> {
-                modelEntity.getEntity().remove();
-            });
-        }
+        this.modelManager.removeEntities();
 
         CommandAPI.onDisable();
     }

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

@@ -14,13 +14,11 @@ 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;
 
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 public class ModelListener implements Listener {
 
@@ -62,12 +60,22 @@ public class ModelListener implements Listener {
         world.getEntities().forEach(entity -> plugin.getModelManager().processEntities(entity));
     }
 
+    /*
+     / Temp fix till a better solution is found -
+     / the issue is when a player logs out and the mob is there,
+     / the player logs back in sometimes it can display as a pig only
+     / this issues mainly comes from the functions from EntityTaskManager
+     / sendSpawnPacket() and canSee()
+     /
+     / TheLividaProject - 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();
         if (!FloodgateApi.getInstance().isFloodgatePlayer(player.getUniqueId())) return;
-        //TODO temp fix bc like why? - the issue is when a player logs out and the mob is there, the player logs back in sometimes it can display as a pig only
-        Bukkit.getAsyncScheduler().runDelayed(plugin, scheduledTask -> plugin.getModelManager().getPlayerJoinedCache().add(player.getUniqueId()), 10, TimeUnit.MILLISECONDS);
+        Bukkit.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> plugin.getModelManager().getPlayerJoinedCache().add(player.getUniqueId()), 10);
     }
 
     @EventHandler

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

@@ -96,7 +96,6 @@ public class EntityTaskManager {
         }
     }
 
-    // Issue here - start: See ModelListener.class and look at function onPlayerJoin
     private void sendSpawnPacket(ModelEntityData model, Player onlinePlayer) {
         EntityTaskRunnable task = model.getEntityTask();
         boolean firstJoined = !plugin.getModelManager().getPlayerJoinedCache().contains(onlinePlayer.getUniqueId());
@@ -122,7 +121,6 @@ public class EntityTaskManager {
 
         return true;
     }
-    // Issue here - end
 
     public void sendHitBoxToAll(ModelEntityData model) {
         for (Player viewer : model.getViewers()) {

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

@@ -52,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;
     }

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

@@ -114,8 +114,8 @@ public class EntityTaskRunnable {
                 plugin.getEntityTaskManager().sendColor(model, Collections.singleton(player), lastColor, true);
 
                 updateEntityProperties(model, Collections.singleton(player), true);
-            }, delay * 50L, TimeUnit.MILLISECONDS);
-        }, 500, TimeUnit.MILLISECONDS);
+            }, 500, TimeUnit.MILLISECONDS);
+        }, delay * 50L, TimeUnit.MILLISECONDS);
     }
 
     public void updateEntityProperties(ModelEntityData model, Collection<Player> players, boolean firstSend, String... forceAnims) {