Merge pull request #29 from Paceski/main

Add a reload command
GeyserExtensionists · Dec 19, 2024 · 4abc985 · 4abc985
2 parents 5840a63 + 50bb561
commit 4abc985
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 263 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/discord.xml b/.idea/discord.xml
diff --git a/.idea/easycode.ignore b/.idea/easycode.ignore
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java b/src/main/java/re/imc/geysermodelengine/GeyserModelEngine.java
@@ -2,8 +2,6 @@
 
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.PacketListenerPriority;
-import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
-import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.ticxo.modelengine.api.ModelEngineAPI;
@@ -18,6 +16,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
+import re.imc.geysermodelengine.commands.ReloadCommand;
 import re.imc.geysermodelengine.listener.ModelListener;
 import re.imc.geysermodelengine.listener.MountPacketListener;
 import re.imc.geysermodelengine.model.BedrockMountControl;
@@ -118,6 +117,7 @@ public void onEnable() {
         }, 10, entityPositionUpdatePeriod, TimeUnit.MILLISECONDS);
 
 
+        getCommand("geysermodelengine").setExecutor(new ReloadCommand(this));
         Bukkit.getPluginManager().registerEvents(new ModelListener(), this);
         Bukkit.getScheduler()
                 .runTaskLater(GeyserModelEngine.getInstance(), () -> {

diff --git a/src/main/java/re/imc/geysermodelengine/commands/ReloadCommand.java b/src/main/java/re/imc/geysermodelengine/commands/ReloadCommand.java
@@ -0,0 +1,31 @@
+package re.imc.geysermodelengine.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import re.imc.geysermodelengine.GeyserModelEngine;
+
+public class ReloadCommand implements CommandExecutor {
+
+    private final GeyserModelEngine plugin;
+
+    public ReloadCommand(GeyserModelEngine plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
+        if (sender instanceof Player && !sender.hasPermission("geysermodelengine.reload")) {
+            sender.sendMessage("§cYou don't have permission to use this command.");
+            return true;
+        }
+
+        plugin.reloadConfig();
+        plugin.onEnable();
+
+        sender.sendMessage("§aGeyserModelEngine configuration reloaded!");
+        return true;
+    }
+}
diff --git a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
@@ -4,21 +4,17 @@
 import com.google.common.cache.CacheBuilder;
 import com.ticxo.modelengine.api.animation.BlueprintAnimation;
 import com.ticxo.modelengine.api.animation.handler.AnimationHandler;
-import com.ticxo.modelengine.api.entity.CullType;
 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.BoneBehaviorTypes;
 import com.ticxo.modelengine.api.model.bone.ModelBone;
-import com.ticxo.modelengine.api.model.bone.type.Mount;
 import com.ticxo.modelengine.api.model.render.DisplayRenderer;
 import lombok.Getter;
 import lombok.Setter;
 import me.zimzaza4.geyserutils.spigot.api.EntityUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.geysermc.floodgate.api.FloodgateApi;
 import org.joml.Vector3f;
 import re.imc.geysermodelengine.GeyserModelEngine;

diff --git a/src/main/java/re/imc/geysermodelengine/model/ModelEntity.java b/src/main/java/re/imc/geysermodelengine/model/ModelEntity.java
@@ -2,10 +2,8 @@
 
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import com.google.common.collect.Sets;
-import com.ticxo.modelengine.api.entity.BukkitEntity;
 import com.ticxo.modelengine.api.model.ActiveModel;
 import com.ticxo.modelengine.api.model.ModeledEntity;
-import io.github.retrooper.packetevents.util.SpigotConversionUtil;
 import lombok.Getter;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;