Version 0.3

*add support for version 1.21 *fixed suggestions in commands
I-No-oNe · Jun 13, 2024 · 92b6868 · 92b6868
1 parent 52b9dd0
commit 92b6868
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.6
-yarn_mappings=1.20.6+build.3
+minecraft_version=1.21
+yarn_mappings=1.21+build.1
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=0.2-1.20.6-fabric
+mod_version=0.3-1.21-fabric
 maven_group=net.i_no_am.attackblocker
 archives_base_name=attack-blocker
 
 # Dependencies
-fabric_version=0.99.0+1.20.6
+fabric_version=0.100.1+1.21
diff --git a/src/main/java/net/i_no_am/attackblocker/command/CantAttackCommand.java b/src/main/java/net/i_no_am/attackblocker/command/CantAttackCommand.java
@@ -21,12 +21,12 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
 //                    Removing Players from Can't Attack List
                     .then(ClientCommandManager.literal("remove")
                             .then(ClientCommandManager.argument("player name", StringArgumentType.word())
-                                    .suggests(Utils.playerNameSuggestions())
+                                    .suggests(Utils.playersInConfig())
                                     .executes(context -> removeCantAttack(context.getSource(), StringArgumentType.getString(context, "player name")))))
 //                    Color Command
                     .then(ClientCommandManager.literal("color")
                             .then(ClientCommandManager.argument("player name", StringArgumentType.word())
-                                    .suggests(Utils.playerNameSuggestions())
+                                    .suggests(Utils.playersInConfig())
                                     .then(ClientCommandManager.argument("color", StringArgumentType.word())
                                             .suggests(Utils.colorSuggestions())
                                             .executes(context -> setColor(context.getSource(), StringArgumentType.getString(context, "player name"), StringArgumentType.getString(context, "color"))))))

diff --git a/src/main/java/net/i_no_am/attackblocker/utils/Utils.java b/src/main/java/net/i_no_am/attackblocker/utils/Utils.java
@@ -19,16 +19,20 @@ public class Utils {
     public static void clientMessage(String message, FabricClientCommandSource source) {
         source.sendFeedback(Text.of(PREFIX + message));
     }
+
     public static void clientMessageWithoutPrefix(String message, FabricClientCommandSource source) {
         source.sendFeedback(Text.of(message));
     }
-    public static void playerMessage(String message, ClientPlayNetworkHandler clientPlayNetworkHandler){
+
+    public static void playerMessage(String message, ClientPlayNetworkHandler clientPlayNetworkHandler) {
         clientPlayNetworkHandler.sendChatMessage(message);
     }
+
     public static boolean canAttack(PlayerEntity ignoreattacker, PlayerEntity target) {
         String targetName = target.getName().getString();
         return Configuration.isEnabled() && !Configuration.getBlockedPlayers().contains(targetName);
     }
+
     public static SuggestionProvider<FabricClientCommandSource> colorSuggestions() {
         return (context, builder) -> {
             for (String color : COLORS) {
@@ -37,6 +41,13 @@ public static SuggestionProvider<FabricClientCommandSource> colorSuggestions() {
             return builder.buildFuture();
         };
     }
+
+    public static SuggestionProvider<FabricClientCommandSource> playersInConfig() {
+        return (context, builder) -> {
+            Configuration.getBlockedPlayers().forEach(builder::suggest);
+            return builder.buildFuture();
+        };
+}
     public static SuggestionProvider<FabricClientCommandSource> playerNameSuggestions() {
         return (context, builder) -> {
             Objects.requireNonNull(MinecraftClient.getInstance().getNetworkHandler()).getPlayerList().forEach(entry -> {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -27,7 +27,7 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.15.11",
-		"minecraft": "~1.20.6",
+		"minecraft": ">=1.21",
 		"java": ">=21",
 		"fabric-api": "*"
 	},