Skip to content

Commit 4abc985

Browse files
authored
Merge pull request #29 from Paceski/main
Add a reload command
2 parents 5840a63 + 50bb561 commit 4abc985

15 files changed

+65
-263
lines changed

.idea/.gitignore

-3
This file was deleted.

.idea/checkstyle-idea.xml

-16
This file was deleted.

.idea/compiler.xml

-13
This file was deleted.

.idea/discord.xml

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/easycode.ignore

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

-7
This file was deleted.

.idea/jarRepositories.xml

-65
This file was deleted.

.idea/misc.xml

-18
This file was deleted.

.idea/modules.xml

-8
This file was deleted.

.idea/uiDesigner.xml

-124
This file was deleted.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import com.github.retrooper.packetevents.PacketEvents;
44
import com.github.retrooper.packetevents.event.PacketListenerPriority;
5-
import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
6-
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
75
import com.google.common.cache.Cache;
86
import com.google.common.cache.CacheBuilder;
97
import com.ticxo.modelengine.api.ModelEngineAPI;
@@ -18,6 +16,7 @@
1816
import org.bukkit.entity.Entity;
1917
import org.bukkit.entity.Player;
2018
import org.bukkit.plugin.java.JavaPlugin;
19+
import re.imc.geysermodelengine.commands.ReloadCommand;
2120
import re.imc.geysermodelengine.listener.ModelListener;
2221
import re.imc.geysermodelengine.listener.MountPacketListener;
2322
import re.imc.geysermodelengine.model.BedrockMountControl;
@@ -118,6 +117,7 @@ public void onEnable() {
118117
}, 10, entityPositionUpdatePeriod, TimeUnit.MILLISECONDS);
119118

120119

120+
getCommand("geysermodelengine").setExecutor(new ReloadCommand(this));
121121
Bukkit.getPluginManager().registerEvents(new ModelListener(), this);
122122
Bukkit.getScheduler()
123123
.runTaskLater(GeyserModelEngine.getInstance(), () -> {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package re.imc.geysermodelengine.commands;
2+
3+
import org.bukkit.command.Command;
4+
import org.bukkit.command.CommandExecutor;
5+
import org.bukkit.command.CommandSender;
6+
import org.bukkit.entity.Player;
7+
import re.imc.geysermodelengine.GeyserModelEngine;
8+
9+
public class ReloadCommand implements CommandExecutor {
10+
11+
private final GeyserModelEngine plugin;
12+
13+
public ReloadCommand(GeyserModelEngine plugin) {
14+
this.plugin = plugin;
15+
}
16+
17+
@Override
18+
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
19+
20+
if (sender instanceof Player && !sender.hasPermission("geysermodelengine.reload")) {
21+
sender.sendMessage("§cYou don't have permission to use this command.");
22+
return true;
23+
}
24+
25+
plugin.reloadConfig();
26+
plugin.onEnable();
27+
28+
sender.sendMessage("§aGeyserModelEngine configuration reloaded!");
29+
return true;
30+
}
31+
}

src/main/java/re/imc/geysermodelengine/model/EntityTask.java

-4
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,17 @@
44
import com.google.common.cache.CacheBuilder;
55
import com.ticxo.modelengine.api.animation.BlueprintAnimation;
66
import com.ticxo.modelengine.api.animation.handler.AnimationHandler;
7-
import com.ticxo.modelengine.api.entity.CullType;
87
import com.ticxo.modelengine.api.generator.blueprint.BlueprintBone;
98
import com.ticxo.modelengine.api.model.ActiveModel;
109
import com.ticxo.modelengine.api.model.ModeledEntity;
11-
import com.ticxo.modelengine.api.model.bone.BoneBehaviorTypes;
1210
import com.ticxo.modelengine.api.model.bone.ModelBone;
13-
import com.ticxo.modelengine.api.model.bone.type.Mount;
1411
import com.ticxo.modelengine.api.model.render.DisplayRenderer;
1512
import lombok.Getter;
1613
import lombok.Setter;
1714
import me.zimzaza4.geyserutils.spigot.api.EntityUtils;
1815
import org.bukkit.Bukkit;
1916
import org.bukkit.Location;
2017
import org.bukkit.entity.Player;
21-
import org.bukkit.scheduler.BukkitRunnable;
2218
import org.geysermc.floodgate.api.FloodgateApi;
2319
import org.joml.Vector3f;
2420
import re.imc.geysermodelengine.GeyserModelEngine;

src/main/java/re/imc/geysermodelengine/model/ModelEntity.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
44
import com.google.common.collect.Sets;
5-
import com.ticxo.modelengine.api.entity.BukkitEntity;
65
import com.ticxo.modelengine.api.model.ActiveModel;
76
import com.ticxo.modelengine.api.model.ModeledEntity;
8-
import io.github.retrooper.packetevents.util.SpigotConversionUtil;
97
import lombok.Getter;
108
import org.bukkit.Location;
119
import org.bukkit.entity.Player;

0 commit comments

Comments
 (0)