misc: 更新issues链接、修复构建、修复权限、优化import

build.gradle.kts

@@ -155,7 +155,13 @@ bukkit {
 
     val opPermsStrList = listOf(
             permissionRoot + "disguise_revealing",
+
             permissionRoot + "manage",
+            permissionRoot + "manage.grant",
+            permissionRoot + "manage.revoke",
+            permissionRoot + "manage.unmorph",
+            permissionRoot + "manage.morph",
+
             permissionRoot + "query",
             permissionRoot + "queryall",
             permissionRoot + "reload",

src/main/java/xyz/nifeather/morph/MorphManager.java

@@ -24,19 +24,16 @@
 import xyz.nifeather.morph.backends.server.ServerBackend;
 import xyz.nifeather.morph.events.api.gameplay.*;
 import xyz.nifeather.morph.misc.*;
-import xyz.nifeather.morph.morph.events.api.gameplay.*;
 import xyz.nifeather.morph.misc.playerList.PlayerListHandler;
 import xyz.nifeather.morph.config.ConfigOption;
 import xyz.nifeather.morph.config.MorphConfigManager;
-import xiamomc.morph.events.api.gameplay.*;
 import xyz.nifeather.morph.events.api.lifecycle.ManagerFinishedInitializeEvent;
 import xyz.nifeather.morph.interfaces.IManagePlayerData;
 import xyz.nifeather.morph.messages.CommandStrings;
 import xyz.nifeather.morph.messages.HintStrings;
 import xyz.nifeather.morph.messages.MessageUtils;
 import xyz.nifeather.morph.messages.MorphStrings;
 import xyz.nifeather.morph.messages.vanilla.VanillaMessageStore;
-import xiamomc.morph.misc.*;
 import xyz.nifeather.morph.misc.disguiseProperty.DisguiseProperties;
 import xyz.nifeather.morph.misc.disguiseProperty.SingleProperty;
 import xyz.nifeather.morph.misc.permissions.CommonPermissions;
@@ -213,7 +210,7 @@ private void tryBackends()
         {
             logger.error("Unable to initialize ServerBackend as our disguise backend: " + t.getMessage());
             logger.error("Using NilBackend, displaying disguises at the server side will not be supported this run.");
-            logger.error("Please consider reporting this issue to our GitHub: https://github.com/XiaMoZhiShi/MorphPlugin/issues");
+            logger.error("Please consider reporting this issue to our GitHub: https://github.com/MATRIX-feather/FeatherMorph/issues");
 
             t.printStackTrace();
         }

src/main/java/xyz/nifeather/morph/MorphPlugin.java

@@ -11,7 +11,6 @@
 import xyz.nifeather.morph.abilities.AbilityManager;
 import xyz.nifeather.morph.commands.MorphCommandManager;
 import xyz.nifeather.morph.config.MorphConfigManager;
-import xiamomc.morph.events.*;
 import xyz.nifeather.morph.events.*;
 import xyz.nifeather.morph.interfaces.IManagePlayerData;
 import xyz.nifeather.morph.interfaces.IManageRequests;

src/main/java/xyz/nifeather/morph/abilities/AbilityManager.java

@@ -9,13 +9,10 @@
 import org.jetbrains.annotations.Nullable;
 import xyz.nifeather.morph.MorphManager;
 import xyz.nifeather.morph.MorphPluginObject;
-import xiamomc.morph.abilities.impl.*;
 import xyz.nifeather.morph.abilities.impl.*;
 import xyz.nifeather.morph.abilities.impl.potion.*;
 import xyz.nifeather.morph.abilities.impl.onAttack.ExtraKnockbackAbility;
 import xyz.nifeather.morph.abilities.impl.onAttack.PotionOnAttackAbility;
-import xiamomc.morph.abilities.impl.potion.*;
-import xyz.nifeather.morph.morph.abilities.impl.potion.*;
 import xyz.nifeather.morph.events.api.lifecycle.AbilitiesFinishedInitializeEvent;
 import xyz.nifeather.morph.storage.skill.SkillAbilityConfiguration;
 import xyz.nifeather.morph.storage.skill.SkillAbilityConfigurationStore;

src/main/java/xyz/nifeather/morph/backends/DisguiseBackend.java

@@ -6,8 +6,8 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import xyz.nifeather.morph.MorphPluginObject;
 import xiamomc.pluginbase.Messages.FormattableMessage;
+import xyz.nifeather.morph.MorphPluginObject;
 
 import java.util.Collection;
 

src/main/java/xyz/nifeather/morph/backends/fallback/NilBackend.java

@@ -8,16 +8,16 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xiamomc.morph.network.commands.S2C.clientrender.S2CRenderMapAddCommand;
+import xiamomc.morph.network.commands.S2C.clientrender.S2CRenderMapRemoveCommand;
+import xiamomc.pluginbase.Annotations.Resolved;
+import xiamomc.pluginbase.Messages.FormattableMessage;
 import xyz.nifeather.morph.backends.DisguiseBackend;
 import xyz.nifeather.morph.backends.DisguiseWrapper;
 import xyz.nifeather.morph.backends.WrapperAttribute;
 import xyz.nifeather.morph.messages.BackendStrings;
 import xyz.nifeather.morph.misc.NetworkingHelper;
-import xiamomc.morph.network.commands.S2C.clientrender.S2CRenderMapAddCommand;
-import xiamomc.morph.network.commands.S2C.clientrender.S2CRenderMapRemoveCommand;
 import xyz.nifeather.morph.network.server.MorphClientHandler;
-import xiamomc.pluginbase.Annotations.Resolved;
-import xiamomc.pluginbase.Messages.FormattableMessage;
 
 import java.util.Collection;
 import java.util.Map;

src/main/java/xyz/nifeather/morph/backends/modelengine/MEBackend.java

@@ -8,12 +8,12 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xiamomc.pluginbase.Messages.FormattableMessage;
 import xyz.nifeather.morph.backends.DisguiseBackend;
 import xyz.nifeather.morph.backends.DisguiseWrapper;
 import xyz.nifeather.morph.backends.modelengine.vanish.IVanishSource;
 import xyz.nifeather.morph.backends.modelengine.vanish.ProtocolLibVanishSource;
 import xyz.nifeather.morph.backends.modelengine.vanish.VanillaVanishSource;
-import xiamomc.pluginbase.Messages.FormattableMessage;
 
 import java.util.Collection;
 import java.util.Map;

src/main/java/xyz/nifeather/morph/backends/server/ServerBackend.java

@@ -6,6 +6,7 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import xiamomc.pluginbase.Messages.FormattableMessage;
 import xyz.nifeather.morph.backends.DisguiseBackend;
 import xyz.nifeather.morph.backends.DisguiseWrapper;
 import xyz.nifeather.morph.backends.WrapperEvent;
@@ -14,7 +15,6 @@
 import xyz.nifeather.morph.messages.BackendStrings;
 import xyz.nifeather.morph.misc.playerList.PlayerListHandler;
 import xyz.nifeather.morph.utilities.NbtUtils;
-import xiamomc.pluginbase.Messages.FormattableMessage;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;

src/main/java/xyz/nifeather/morph/backends/server/ServerDisguiseWrapper.java

@@ -24,8 +24,8 @@
 import xyz.nifeather.morph.backends.server.renderer.utilties.WatcherUtils;
 import xyz.nifeather.morph.misc.DisguiseEquipment;
 import xyz.nifeather.morph.misc.DisguiseState;
-import xyz.nifeather.morph.misc.playerList.PlayerListHandler;
 import xyz.nifeather.morph.misc.disguiseProperty.SingleProperty;
+import xyz.nifeather.morph.misc.playerList.PlayerListHandler;
 import xyz.nifeather.morph.utilities.NbtUtils;
 
 import java.util.Map;

src/main/java/xyz/nifeather/morph/backends/server/renderer/ServerRenderer.java

@@ -8,6 +8,8 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.jetbrains.annotations.Nullable;
+import xiamomc.pluginbase.Annotations.Initializer;
+import xiamomc.pluginbase.Bindables.Bindable;
 import xyz.nifeather.morph.MorphPluginObject;
 import xyz.nifeather.morph.backends.server.renderer.network.PacketFactory;
 import xyz.nifeather.morph.backends.server.renderer.network.ProtocolHandler;
@@ -18,8 +20,6 @@
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RenderRegistry;
 import xyz.nifeather.morph.config.ConfigOption;
 import xyz.nifeather.morph.config.MorphConfigManager;
-import xiamomc.pluginbase.Annotations.Initializer;
-import xiamomc.pluginbase.Bindables.Bindable;
 
 import java.util.List;
 

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/PacketFactory.java

@@ -26,7 +26,9 @@
 import xyz.nifeather.morph.utilities.EntityTypeUtils;
 import xyz.nifeather.morph.utilities.NmsUtils;
 
-import java.util.*;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 public class PacketFactory extends MorphPluginObject

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/ProtocolHandler.java

@@ -2,11 +2,9 @@
 
 import com.comphenix.protocol.ProtocolLibrary;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import xyz.nifeather.morph.MorphPluginObject;
-import xiamomc.morph.backends.server.renderer.network.listeners.*;
 import xiamomc.pluginbase.Annotations.Initializer;
+import xyz.nifeather.morph.MorphPluginObject;
 import xyz.nifeather.morph.backends.server.renderer.network.listeners.*;
-import xyz.nifeather.morph.morph.backends.server.renderer.network.listeners.*;
 
 import java.util.List;
 

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/TestPacketListener.java

@@ -7,9 +7,9 @@
 import com.comphenix.protocol.injector.GamePhase;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.bukkit.plugin.Plugin;
+import xiamomc.pluginbase.Annotations.Initializer;
 import xyz.nifeather.morph.MorphPlugin;
 import xyz.nifeather.morph.MorphPluginObject;
-import xiamomc.pluginbase.Annotations.Initializer;
 
 public class TestPacketListener extends MorphPluginObject implements PacketListener
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/datawatcher/watchers/SingleWatcher.java

@@ -10,6 +10,9 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xiamomc.pluginbase.Annotations.Initializer;
+import xiamomc.pluginbase.Annotations.Resolved;
+import xiamomc.pluginbase.Exceptions.NullDependencyException;
 import xyz.nifeather.morph.MorphPluginObject;
 import xyz.nifeather.morph.backends.server.renderer.network.PacketFactory;
 import xyz.nifeather.morph.backends.server.renderer.network.datawatcher.values.AbstractValues;
@@ -18,9 +21,6 @@
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RenderRegistry;
 import xyz.nifeather.morph.backends.server.renderer.utilties.WatcherUtils;
 import xyz.nifeather.morph.misc.disguiseProperty.SingleProperty;
-import xiamomc.pluginbase.Annotations.Initializer;
-import xiamomc.pluginbase.Annotations.Resolved;
-import xiamomc.pluginbase.Exceptions.NullDependencyException;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/datawatcher/watchers/types/FrogWatcher.java

@@ -15,14 +15,14 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Frog;
 import org.bukkit.entity.Player;
+import xiamomc.pluginbase.Exceptions.NullDependencyException;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.CustomEntries;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RegistryKey;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.ValueIndex;
 import xyz.nifeather.morph.misc.AnimationNames;
 import xyz.nifeather.morph.misc.disguiseProperty.DisguiseProperties;
 import xyz.nifeather.morph.misc.disguiseProperty.SingleProperty;
 import xyz.nifeather.morph.misc.disguiseProperty.values.FrogProperties;
-import xiamomc.pluginbase.Exceptions.NullDependencyException;
 
 public class FrogWatcher extends LivingEntityWatcher
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/datawatcher/watchers/types/InventoryLivingWatcher.java

@@ -2,10 +2,10 @@
 
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import xiamomc.pluginbase.Annotations.Resolved;
 import xyz.nifeather.morph.backends.server.renderer.network.PacketFactory;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.CustomEntries;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RegistryKey;
-import xiamomc.pluginbase.Annotations.Resolved;
 
 public class InventoryLivingWatcher extends LivingEntityWatcher
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/datawatcher/watchers/types/PlayerWatcher.java

@@ -11,8 +11,8 @@
 import xyz.nifeather.morph.backends.server.renderer.network.registries.CustomEntries;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RegistryKey;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.ValueIndex;
-import xyz.nifeather.morph.misc.NmsRecord;
 import xyz.nifeather.morph.misc.AnimationNames;
+import xyz.nifeather.morph.misc.NmsRecord;
 
 public class PlayerWatcher extends InventoryLivingWatcher
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/datawatcher/watchers/types/WardenWatcher.java

@@ -14,8 +14,8 @@
 import xyz.nifeather.morph.backends.server.renderer.network.registries.CustomEntries;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RegistryKey;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.ValueIndex;
-import xyz.nifeather.morph.misc.NmsRecord;
 import xyz.nifeather.morph.misc.AnimationNames;
+import xyz.nifeather.morph.misc.NmsRecord;
 
 public class WardenWatcher extends EHasAttackAnimationWatcher
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/datawatcher/watchers/types/WolfWatcher.java

@@ -12,14 +12,14 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Wolf;
+import xiamomc.pluginbase.Exceptions.NullDependencyException;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.CustomEntries;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RegistryKey;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.ValueIndex;
 import xyz.nifeather.morph.misc.AnimationNames;
 import xyz.nifeather.morph.misc.disguiseProperty.DisguiseProperties;
 import xyz.nifeather.morph.misc.disguiseProperty.SingleProperty;
 import xyz.nifeather.morph.misc.disguiseProperty.values.WolfProperties;
-import xiamomc.pluginbase.Exceptions.NullDependencyException;
 
 public class WolfWatcher extends TameableAnimalWatcher
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/listeners/AnimationPacketListener.java

@@ -6,8 +6,8 @@
 import com.comphenix.protocol.injector.GamePhase;
 import net.minecraft.network.protocol.game.ClientboundAnimatePacket;
 import org.bukkit.entity.Player;
-import xyz.nifeather.morph.backends.server.renderer.network.registries.RenderRegistry;
 import xiamomc.pluginbase.Annotations.Resolved;
+import xyz.nifeather.morph.backends.server.renderer.network.registries.RenderRegistry;
 
 public class AnimationPacketListener extends ProtocolListener
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/listeners/EquipmentPacketListener.java

@@ -7,9 +7,9 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
 import org.bukkit.entity.Player;
+import xiamomc.pluginbase.Annotations.Resolved;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.CustomEntries;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RenderRegistry;
-import xiamomc.pluginbase.Annotations.Resolved;
 
 import java.util.Map;
 

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/listeners/MetaPacketListener.java

@@ -7,9 +7,9 @@
 import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import xiamomc.pluginbase.Annotations.Resolved;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RenderRegistry;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.ValueIndex;
-import xiamomc.pluginbase.Annotations.Resolved;
 
 public class MetaPacketListener extends ProtocolListener
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/listeners/PlayerLookPacketListener.java

@@ -10,9 +10,9 @@
 import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import xiamomc.pluginbase.Annotations.Resolved;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RenderRegistry;
 import xyz.nifeather.morph.utilities.NmsUtils;
-import xiamomc.pluginbase.Annotations.Resolved;
 
 public class PlayerLookPacketListener extends ProtocolListener
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/listeners/ProtocolListener.java

@@ -8,15 +8,15 @@
 import net.minecraft.world.entity.player.Player;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.Nullable;
+import xiamomc.pluginbase.Annotations.Initializer;
+import xiamomc.pluginbase.Annotations.Resolved;
+import xiamomc.pluginbase.Bindables.Bindable;
 import xyz.nifeather.morph.MorphPlugin;
 import xyz.nifeather.morph.MorphPluginObject;
 import xyz.nifeather.morph.backends.server.renderer.network.PacketFactory;
 import xyz.nifeather.morph.config.ConfigOption;
 import xyz.nifeather.morph.config.MorphConfigManager;
 import xyz.nifeather.morph.utilities.NmsUtils;
-import xiamomc.pluginbase.Annotations.Initializer;
-import xiamomc.pluginbase.Annotations.Resolved;
-import xiamomc.pluginbase.Bindables.Bindable;
 
 public abstract class ProtocolListener extends MorphPluginObject implements PacketListener
 {

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/listeners/SoundListener.java

@@ -11,9 +11,9 @@
 import net.minecraft.sounds.SoundEvent;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.Nullable;
+import xiamomc.pluginbase.Annotations.Resolved;
 import xyz.nifeather.morph.backends.server.renderer.network.registries.RenderRegistry;
 import xyz.nifeather.morph.utilities.EntityTypeUtils;
-import xiamomc.pluginbase.Annotations.Resolved;
 
 import java.util.concurrent.atomic.AtomicReference;
 

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/listeners/SpawnPacketHandler.java

@@ -16,6 +16,8 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xiamomc.pluginbase.Annotations.Resolved;
+import xiamomc.pluginbase.Exceptions.NullDependencyException;
 import xyz.nifeather.morph.backends.server.renderer.network.DisplayParameters;
 import xyz.nifeather.morph.backends.server.renderer.network.datawatcher.watchers.SingleWatcher;
 import xyz.nifeather.morph.backends.server.renderer.network.datawatcher.watchers.types.PlayerWatcher;
@@ -24,8 +26,6 @@
 import xyz.nifeather.morph.backends.server.renderer.utilties.WatcherUtils;
 import xyz.nifeather.morph.misc.NmsRecord;
 import xyz.nifeather.morph.misc.skins.PlayerSkinProvider;
-import xiamomc.pluginbase.Annotations.Resolved;
-import xiamomc.pluginbase.Exceptions.NullDependencyException;
 
 import java.util.List;
 import java.util.UUID;

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/queue/PacketQueue.java

@@ -5,8 +5,8 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.bukkit.entity.Player;
-import xyz.nifeather.morph.MorphPluginObject;
 import xiamomc.pluginbase.Annotations.Initializer;
+import xyz.nifeather.morph.MorphPluginObject;
 
 import java.util.List;
 import java.util.Map;

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/registries/RenderRegistry.java

@@ -7,12 +7,12 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xiamomc.pluginbase.Annotations.Resolved;
+import xiamomc.pluginbase.Bindables.Bindable;
 import xyz.nifeather.morph.MorphPluginObject;
 import xyz.nifeather.morph.backends.server.renderer.network.datawatcher.watchers.SingleWatcher;
 import xyz.nifeather.morph.config.ConfigOption;
 import xyz.nifeather.morph.config.MorphConfigManager;
-import xiamomc.pluginbase.Annotations.Resolved;
-import xiamomc.pluginbase.Bindables.Bindable;
 
 import java.util.List;
 import java.util.Map;

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/registries/ValueIndex.java

@@ -1,10 +1,7 @@
 package xyz.nifeather.morph.backends.server.renderer.network.registries;
 
-import xiamomc.morph.backends.server.renderer.network.datawatcher.values.*;
-import xiamomc.morph.backends.server.renderer.network.datawatcher.values.basetypes.*;
 import xyz.nifeather.morph.backends.server.renderer.network.datawatcher.values.*;
 import xyz.nifeather.morph.backends.server.renderer.network.datawatcher.values.basetypes.*;
-import xyz.nifeather.morph.morph.backends.server.renderer.network.datawatcher.values.basetypes.*;
 
 public class ValueIndex
 {