diff --git a/.gradle/8.12/executionHistory/executionHistory.bin b/.gradle/8.12/executionHistory/executionHistory.bin index c32653d..3f88241 100644 Binary files a/.gradle/8.12/executionHistory/executionHistory.bin and b/.gradle/8.12/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.12/executionHistory/executionHistory.lock b/.gradle/8.12/executionHistory/executionHistory.lock index 1fe4ec2..a80f962 100644 Binary files a/.gradle/8.12/executionHistory/executionHistory.lock and b/.gradle/8.12/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.12/fileHashes/fileHashes.bin b/.gradle/8.12/fileHashes/fileHashes.bin index 5509fa1..5214932 100644 Binary files a/.gradle/8.12/fileHashes/fileHashes.bin and b/.gradle/8.12/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.12/fileHashes/fileHashes.lock b/.gradle/8.12/fileHashes/fileHashes.lock index 204f949..d4b9c75 100644 Binary files a/.gradle/8.12/fileHashes/fileHashes.lock and b/.gradle/8.12/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.12/fileHashes/resourceHashesCache.bin b/.gradle/8.12/fileHashes/resourceHashesCache.bin index d827b3d..475ad1c 100644 Binary files a/.gradle/8.12/fileHashes/resourceHashesCache.bin and b/.gradle/8.12/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 55d2a70..576a13a 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/GeyserModelEngine.class b/build/classes/java/main/re/imc/geysermodelengine/GeyserModelEngine.class index 5c19ad4..f79f670 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/GeyserModelEngine.class and b/build/classes/java/main/re/imc/geysermodelengine/GeyserModelEngine.class differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/listener/ModelListener.class b/build/classes/java/main/re/imc/geysermodelengine/listener/ModelListener.class index d2b7e2b..3ff07bc 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/listener/ModelListener.class and b/build/classes/java/main/re/imc/geysermodelengine/listener/ModelListener.class differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/managers/model/EntityTaskManager.class b/build/classes/java/main/re/imc/geysermodelengine/managers/model/EntityTaskManager.class index 7c8dc6e..c0a8c32 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/managers/model/EntityTaskManager.class and b/build/classes/java/main/re/imc/geysermodelengine/managers/model/EntityTaskManager.class differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/managers/model/ModelManager.class b/build/classes/java/main/re/imc/geysermodelengine/managers/model/ModelManager.class index c744140..1525513 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/managers/model/ModelManager.class and b/build/classes/java/main/re/imc/geysermodelengine/managers/model/ModelManager.class differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/managers/player/PlayerManager.class b/build/classes/java/main/re/imc/geysermodelengine/managers/player/PlayerManager.class deleted file mode 100644 index 3c94888..0000000 Binary files a/build/classes/java/main/re/imc/geysermodelengine/managers/player/PlayerManager.class and /dev/null differ diff --git a/build/libs/GeyserModelEngine-1.0.0-all.jar b/build/libs/GeyserModelEngine-1.0.0-all.jar index d0eac6b..c83eccf 100644 Binary files a/build/libs/GeyserModelEngine-1.0.0-all.jar and b/build/libs/GeyserModelEngine-1.0.0-all.jar differ diff --git a/build/libs/GeyserModelEngine-1.0.0.jar b/build/libs/GeyserModelEngine-1.0.0.jar index 1c63129..c0f2a9f 100644 Binary files a/build/libs/GeyserModelEngine-1.0.0.jar and b/build/libs/GeyserModelEngine-1.0.0.jar differ diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html index 54e971c..b0aef5c 100644 --- a/build/reports/problems/problems-report.html +++ b/build/reports/problems/problems-report.html @@ -650,7 +650,7 @@ code + .copy-button { diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId13 b/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId13 deleted file mode 100644 index 857e668..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId13 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CommandManager.class.uniqueId12 b/build/tmp/compileJava/compileTransaction/stash-dir/CommandManager.class.uniqueId12 deleted file mode 100644 index ca8f636..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CommandManager.class.uniqueId12 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ConfigManager.class.uniqueId10 b/build/tmp/compileJava/compileTransaction/stash-dir/ConfigManager.class.uniqueId10 deleted file mode 100644 index 4b224a1..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ConfigManager.class.uniqueId10 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId5 b/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId5 deleted file mode 100644 index 2a5e04c..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId5 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskRunnable.class.uniqueId11 b/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskRunnable.class.uniqueId11 deleted file mode 100644 index 1d33c4d..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskRunnable.class.uniqueId11 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngine.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngine.class.uniqueId0 index 5c19ad4..f79f670 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngine.class.uniqueId0 and b/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngine.class.uniqueId0 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineCommandManager.class.uniqueId3 b/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineCommandManager.class.uniqueId3 deleted file mode 100644 index 41bb32e..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineCommandManager.class.uniqueId3 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineReloadCommand.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineReloadCommand.class.uniqueId1 deleted file mode 100644 index d0dfc7e..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineReloadCommand.class.uniqueId1 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelEntityData.class.uniqueId8 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelEntityData.class.uniqueId8 deleted file mode 100644 index ee46170..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ModelEntityData.class.uniqueId8 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId1 similarity index 51% rename from build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 rename to build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId1 index ba7cc7d..4836d0a 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 and b/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId1 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId9 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId9 deleted file mode 100644 index c744140..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId9 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId7 b/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId7 deleted file mode 100644 index 76c9a4f..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId7 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/PlayerManager.class.uniqueId6 b/build/tmp/compileJava/compileTransaction/stash-dir/PlayerManager.class.uniqueId6 deleted file mode 100644 index d9fc723..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/PlayerManager.class.uniqueId6 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId4 deleted file mode 100644 index 692d904..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId4 and /dev/null differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 654222e..ce974ea 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java b/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java index ad831c6..a132a73 100644 --- a/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java +++ b/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java @@ -14,7 +14,6 @@ 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.player.PlayerManager; import re.imc.geysermodelengine.managers.model.data.ModelEntityData; import re.imc.geysermodelengine.runnables.BedrockMountControlRunnable; import re.imc.geysermodelengine.runnables.UpdateTaskRunnable; @@ -31,8 +30,6 @@ public class GeyserModelEngine extends JavaPlugin { private ModelManager modelManager; private EntityTaskManager entityTaskManager; - private PlayerManager playerManager; - @Override public void onLoad() { PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this)); @@ -77,8 +74,6 @@ public class GeyserModelEngine extends JavaPlugin { this.modelManager = new ModelManager(this); this.entityTaskManager = new EntityTaskManager(this); - - this.playerManager = new PlayerManager(); } private void loadRunnables() { @@ -101,8 +96,4 @@ public class GeyserModelEngine extends JavaPlugin { public EntityTaskManager getEntityTaskManager() { return entityTaskManager; } - - public PlayerManager getPlayerManager() { - return playerManager; - } } diff --git a/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java b/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java index 7fae312..370912c 100644 --- a/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java +++ b/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java @@ -55,21 +55,20 @@ public class ModelListener implements Listener { } @EventHandler - public void onWorldLoad(WorldInitEvent event) { + public void onWorldInit(WorldInitEvent event) { World world = event.getWorld(); world.getEntities().forEach(entity -> plugin.getModelManager().processEntities(entity)); } - //TODO Find out why we need this bc uh what? @EventHandler - public void onPlayerLogin(PlayerJoinEvent event) { + public void onPlayerJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); - Bukkit.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> plugin.getPlayerManager().getPlayerJoinedCache().add(player.getUniqueId()), 10); + plugin.getModelManager().getPlayerJoinedCache().add(player.getUniqueId()); } @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { Player player = event.getPlayer(); - Bukkit.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> plugin.getPlayerManager().getPlayerJoinedCache().remove(player.getUniqueId()), 10); + plugin.getModelManager().getPlayerJoinedCache().remove(player.getUniqueId()); } } diff --git a/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java b/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java index 34c83f3..7c9cd02 100644 --- a/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java +++ b/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java @@ -102,7 +102,7 @@ public class EntityTaskManager { private void sendSpawnPacket(ModelEntityData model, Player onlinePlayer) { EntityTaskRunnable task = model.getEntityTask(); - boolean firstJoined = !plugin.getPlayerManager().getPlayerJoinedCache().contains(onlinePlayer.getUniqueId()); + boolean firstJoined = !plugin.getModelManager().getPlayerJoinedCache().contains(onlinePlayer.getUniqueId()); if (firstJoined) { task.sendEntityData(model, onlinePlayer, plugin.getConfigManager().getConfig().getInt("join-send-delay") / 50); @@ -113,7 +113,7 @@ public class EntityTaskManager { public boolean canSee(Player player, PacketEntity entity) { if (!player.isOnline()) return false; - if (!plugin.getPlayerManager().getPlayerJoinedCache().contains(player.getUniqueId())) return false; + if (!plugin.getModelManager().getPlayerJoinedCache().contains(player.getUniqueId())) return false; Location playerLocation = player.getLocation().clone(); Location entityLocation = entity.getLocation().clone(); diff --git a/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java b/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java index bf6089d..8a4f5c7 100644 --- a/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java +++ b/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java @@ -9,19 +9,18 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import re.imc.geysermodelengine.GeyserModelEngine; import re.imc.geysermodelengine.managers.model.data.ModelEntityData; -import re.imc.geysermodelengine.runnables.EntityTaskRunnable; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; public class ModelManager { private final GeyserModelEngine plugin; + private final HashSet playerJoinedCache = new HashSet<>(); + private final ConcurrentHashMap> entitiesCache = new ConcurrentHashMap<>(); - private final Map modelEntitiesCache = new ConcurrentHashMap<>(); + private final ConcurrentHashMap modelEntitiesCache = new ConcurrentHashMap<>(); private final ConcurrentHashMap> driversCache = new ConcurrentHashMap<>(); @@ -54,6 +53,10 @@ public class ModelManager { model.ifPresent(m -> create(modeledEntity, m)); } + public HashSet getPlayerJoinedCache() { + return playerJoinedCache; + } + public ConcurrentHashMap> getEntitiesCache() { return entitiesCache; } diff --git a/src/main/java/re/imc/geysermodelengine/managers/player/PlayerManager.java b/src/main/java/re/imc/geysermodelengine/managers/player/PlayerManager.java deleted file mode 100644 index 978cfe7..0000000 --- a/src/main/java/re/imc/geysermodelengine/managers/player/PlayerManager.java +++ /dev/null @@ -1,13 +0,0 @@ -package re.imc.geysermodelengine.managers.player; - -import java.util.HashSet; -import java.util.UUID; - -public class PlayerManager { - - private final HashSet playerJoinedCache = new HashSet<>(); - - public HashSet getPlayerJoinedCache() { - return playerJoinedCache; - } -}