Update to 1.21.1 (#92)

* feat: update to minecraft 1.21.1 * chore: bump version to 1.6.12 * fix: adjust version constraint in fabric.mod.json
NucleoidMC · Sep 6, 2024 · 0e54089 · 0e54089
1 parent 9774e4e
commit 0e54089
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.21
-yarn_mappings=1.21+build.2
-loader_version=0.15.11
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.3
+loader_version=0.16.4
 
 # Fabric api
-fabric_version=0.100.1+1.21
+fabric_version=0.103.0+1.21.1
 
 # Mod Properties
-mod_version=1.6.11
+mod_version=1.6.12
 maven_group=dev.gegy
 archives_base_name=player-roles
diff --git a/...ty_selectors/EntityArgumentTypeMixin.java → ..._selectors/EntitySelectorReaderMixin.java b/...ty_selectors/EntityArgumentTypeMixin.java → ..._selectors/EntitySelectorReaderMixin.java
@@ -5,15 +5,15 @@
 import dev.gegy.roles.PlayerRoles;
 import dev.gegy.roles.api.PlayerRolesApi;
 import net.minecraft.command.CommandSource;
-import net.minecraft.command.argument.EntityArgumentType;
+import net.minecraft.command.EntitySelectorReader;
 import net.minecraft.server.command.ServerCommandSource;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(EntityArgumentType.class)
-public class EntityArgumentTypeMixin {
-    @WrapOperation(method = "listSuggestions", at = @At(value = "INVOKE", target = "Lnet/minecraft/command/CommandSource;hasPermissionLevel(I)Z"))
-    private boolean hasPermissionLevel(CommandSource source, int level, Operation<Boolean> original) {
+@Mixin(EntitySelectorReader.class)
+public class EntitySelectorReaderMixin {
+    @WrapOperation(method = "shouldAllowAtSelectors", at = @At(value = "INVOKE", target = "Lnet/minecraft/command/CommandSource;hasPermissionLevel(I)Z"))
+    private static boolean hasPermissionLevel(CommandSource source, int level, Operation<Boolean> original) {
         if (original.call(source, level)) {
             return true;
         }

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -14,7 +14,7 @@
   "depends": {
     "fabricloader": ">=0.15",
     "fabric": ">=0.99",
-    "minecraft": ">=1.21",
+    "minecraft": ">=1.21.1",
     "java": ">=21"
   }
 }
diff --git a/src/main/resources/roles.mixins.json b/src/main/resources/roles.mixins.json
@@ -15,7 +15,7 @@
     "command.CommandDispatcherMixin",
     "command.CommandManagerMixin",
     "command.ServerCommandSourceMixin",
-    "entity_selectors.EntityArgumentTypeMixin",
+    "entity_selectors.EntitySelectorReaderMixin",
     "entity_selectors.EntitySelectorMixin",
     "entity_selectors.MessageArgumentTypeMixin",
     "mute.MessageCommandMixin",