up 修正控制台权限

Coloryr · Nov 19, 2024 · b826022 · b826022
1 parent 883a368
commit b826022
Show file tree

Hide file tree

Showing 34 changed files with 239 additions and 257 deletions.
diff --git a/core/AllMusic.java b/core/AllMusic.java
@@ -36,7 +36,7 @@ public class AllMusic {
     /**
      * 插件版本号
      */
-    public static final String version = "3.3.0";
+    public static final String version = "3.3.1";
     /**
      * 配置文件版本号
      */

diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java
@@ -206,6 +206,16 @@ else if (args[0].contains("&user"))
             AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.noID);
     }
 
+    private static boolean isAdmin(String name)
+    {
+        for (String item : AllMusic.getConfig().adminList) {
+            if (item.equalsIgnoreCase(name)) {
+                return true;
+            }
+        }
+        return  false;
+    }
+
     /**
      * 执行命令
      *
@@ -224,15 +234,15 @@ public static void ex(Object sender, String name, String[] args) {
             return;
         }
 
-        if (AllMusic.side.checkPermission(name)) {
+        if (isAdmin(name) || AllMusic.side.checkPermission(sender)) {
             command = commandAdminList.get(args[0]);
             if (command != null) {
                 command.ex(sender, name, args);
                 return;
             }
         }
         if (AllMusic.getConfig().needPermission &&
-                !AllMusic.side.checkPermission(name, "allmusic.addmusic"))
+                !AllMusic.side.checkPermission(sender, "allmusic.addmusic"))
             AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.noPer);
         else {
             switch (AllMusic.getConfig().defaultAddMusic) {

diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java
@@ -213,7 +213,6 @@ public void init() {
         minVote = 3;
         voteTime = 30;
         adminList = new HashSet<>();
-        adminList.add("console");
         adminList.add("color_yr");
         muteServer = new HashSet<>();
         mutePlayer = new HashSet<>();

diff --git a/core/side/BaseSide.java b/core/side/BaseSide.java
@@ -39,19 +39,19 @@ public abstract class BaseSide {
     /**
      * 检查权限
      *
-     * @param player 用户名
+     * @param player 用户
      * @return 是否有权限
      */
-    public abstract boolean checkPermission(String player);
+    public abstract boolean checkPermission(Object player);
 
     /**
      * 检查权限
      *
-     * @param player     用户名
+     * @param player     用户
      * @param permission 权限
      * @return 是否有权限
      */
-    public abstract boolean checkPermission(String player, String permission);
+    public abstract boolean checkPermission(Object player, String permission);
 
     /**
      * 是否需要播放

diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java
@@ -16,7 +16,9 @@
 import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent;
 import io.netty.buffer.ByteBuf;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.entity.Entity;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -54,21 +56,18 @@ public void runTask(Runnable run1, int delay) {
     }
 
     @Override
-    public boolean checkPermission(String player) {
-        for (String item : AllMusic.getConfig().adminList) {
-            if (item.equalsIgnoreCase(player)) {
-                return true;
-            }
+    public boolean checkPermission(Object player) {
+        if (player instanceof MinecraftServer) {
+            return true;
         }
-        ServerPlayerEntity player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player);
-        if (player1 == null)
-            return false;
-
-        return player1.hasPermissionLevel(2);
+        if (player instanceof Entity) {
+            return ((Entity) player).hasPermissionLevel(2);
+        }
+        return false;
     }
 
     @Override
-    public boolean checkPermission(String player, String permission) {
+    public boolean checkPermission(Object player, String permission) {
         return checkPermission(player);
     }
 

diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java
@@ -16,7 +16,9 @@
 import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent;
 import io.netty.buffer.ByteBuf;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.entity.Entity;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -54,21 +56,18 @@ public void runTask(Runnable run1, int delay) {
     }
 
     @Override
-    public boolean checkPermission(String player) {
-        for (String item : AllMusic.getConfig().adminList) {
-            if (item.equalsIgnoreCase(player)) {
-                return true;
-            }
+    public boolean checkPermission(Object player) {
+        if (player instanceof MinecraftServer) {
+            return true;
         }
-        ServerPlayerEntity player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player);
-        if (player1 == null)
-            return false;
-
-        return player1.hasPermissionLevel(2);
+        if (player instanceof Entity) {
+            return ((Entity) player).hasPermissionLevel(2);
+        }
+        return false;
     }
 
     @Override
-    public boolean checkPermission(String player, String permission) {
+    public boolean checkPermission(Object player, String permission) {
         return checkPermission(player);
     }
 

diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java
@@ -17,7 +17,9 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.entity.Entity;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -55,21 +57,18 @@ public void runTask(Runnable run1, int delay) {
     }
 
     @Override
-    public boolean checkPermission(String player) {
-        for (String item : AllMusic.getConfig().adminList) {
-            if (item.equalsIgnoreCase(player)) {
-                return true;
-            }
+    public boolean checkPermission(Object player) {
+        if (player instanceof MinecraftServer) {
+            return true;
         }
-        var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player);
-        if (player1 == null)
-            return false;
-
-        return player1.hasPermissionLevel(2);
+        if (player instanceof Entity) {
+            return ((Entity) player).hasPermissionLevel(2);
+        }
+        return false;
     }
 
     @Override
-    public boolean checkPermission(String player, String permission) {
+    public boolean checkPermission(Object player, String permission) {
         return checkPermission(player);
     }
 

diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java
@@ -16,7 +16,9 @@
 import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent;
 import io.netty.buffer.ByteBuf;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.entity.Entity;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -53,21 +55,18 @@ public void runTask(Runnable run1, int delay) {
     }
 
     @Override
-    public boolean checkPermission(String player) {
-        for (String item : AllMusic.getConfig().adminList) {
-            if (item.equalsIgnoreCase(player)) {
-                return true;
-            }
+    public boolean checkPermission(Object player) {
+        if (player instanceof MinecraftServer) {
+            return true;
         }
-        var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player);
-        if (player1 == null)
-            return false;
-
-        return player1.hasPermissionLevel(2);
+        if (player instanceof Entity) {
+            return ((Entity) player).hasPermissionLevel(2);
+        }
+        return false;
     }
 
     @Override
-    public boolean checkPermission(String player, String permission) {
+    public boolean checkPermission(Object player, String permission) {
         return checkPermission(player);
     }
 

diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java
@@ -16,7 +16,9 @@
 import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent;
 import io.netty.buffer.ByteBuf;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.entity.Entity;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -53,21 +55,18 @@ public void runTask(Runnable run1, int delay) {
     }
 
     @Override
-    public boolean checkPermission(String player) {
-        for (String item : AllMusic.getConfig().adminList) {
-            if (item.equalsIgnoreCase(player)) {
-                return true;
-            }
+    public boolean checkPermission(Object player) {
+        if (player instanceof MinecraftServer) {
+            return true;
         }
-        var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player);
-        if (player1 == null)
-            return false;
-
-        return player1.hasPermissionLevel(2);
+        if (player instanceof Entity) {
+            return ((Entity) player).hasPermissionLevel(2);
+        }
+        return false;
     }
 
     @Override
-    public boolean checkPermission(String player, String permission) {
+    public boolean checkPermission(Object player, String permission) {
         return checkPermission(player);
     }
 

diff --git a/fabric_1_20_2/build.gradle b/fabric_1_20_2/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
     id "org.jetbrains.kotlin.jvm" version "1.9.23"
 }

diff --git a/fabric_1_20_2/gradle/wrapper/gradle-wrapper.properties b/fabric_1_20_2/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java
@@ -17,7 +17,9 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -55,21 +57,18 @@ public void runTask(Runnable run1, int delay) {
     }
 
     @Override
-    public boolean checkPermission(String player) {
-        for (String item : AllMusic.getConfig().adminList) {
-            if (item.equalsIgnoreCase(player)) {
-                return true;
-            }
+    public boolean checkPermission(Object player) {
+        if (player instanceof MinecraftServer) {
+            return true;
         }
-        var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player);
-        if (player1 == null)
-            return false;
-
-        return player1.hasPermissionLevel(2);
+        if (player instanceof PlayerEntity) {
+            return ((PlayerEntity) player).hasPermissionLevel(2);
+        }
+        return false;
     }
 
     @Override
-    public boolean checkPermission(String player, String permission) {
+    public boolean checkPermission(Object player, String permission) {
         return checkPermission(player);
     }
 

diff --git a/fabric_1_20_6/build.gradle b/fabric_1_20_6/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
     id "org.jetbrains.kotlin.jvm" version "1.9.23"
 }

diff --git a/fabric_1_20_6/gradle/wrapper/gradle-wrapper.properties b/fabric_1_20_6/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java
@@ -15,6 +15,8 @@
 import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent;
 import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -51,21 +53,18 @@ public void runTask(Runnable run1, int delay) {
     }
 
     @Override
-    public boolean checkPermission(String player) {
-        for (String item : AllMusic.getConfig().adminList) {
-            if (item.equalsIgnoreCase(player)) {
-                return true;
-            }
+    public boolean checkPermission(Object player) {
+        if (player instanceof MinecraftServer) {
+            return true;
         }
-        var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player);
-        if (player1 == null)
-            return false;
-
-        return player1.hasPermissionLevel(2);
+        if (player instanceof PlayerEntity) {
+            return ((PlayerEntity) player).hasPermissionLevel(2);
+        }
+        return false;
     }
 
     @Override
-    public boolean checkPermission(String player, String permission) {
+    public boolean checkPermission(Object player, String permission) {
         return checkPermission(player);
     }
 

diff --git a/fabric_1_21/build.gradle b/fabric_1_21/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
 	id "org.jetbrains.kotlin.jvm" version "2.0.0"
 }

diff --git a/fabric_1_21/gradle/wrapper/gradle-wrapper.properties b/fabric_1_21/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME