Update to 1.21.11

Author: DrexHD

build.gradle.kts

@@ -2,9 +2,9 @@ import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.ChangelogPluginExtension
 
 plugins {
-    id("fabric-loom") version "1.11-SNAPSHOT"
+    id("fabric-loom") version "1.14-SNAPSHOT"
     id("maven-publish")
-    id("me.modmuss50.mod-publish-plugin") version "0.8.4"
+    id("me.modmuss50.mod-publish-plugin") version "1.1.0"
     id("org.jetbrains.changelog")
 }
 
@@ -52,6 +52,13 @@ dependencies {
     includeMod("maven.modrinth:message-api:${findProperty("message_api_version")}")
 }
 
+stonecutter {
+    replacements.string(eval(current.version, "<=1.21.10")) {
+        replace("Identifier", "ResourceLocation")
+        replace("identifier()", "location()")
+    }
+}
+
 publishMods {
     file.set(tasks.remapJar.get().archiveFile)
     type.set(STABLE)

gradle.properties

@@ -6,7 +6,7 @@ minecraft_version=[VERSIONED]
 curseforge_minecraft_versions=[VERSIONED]
 modrinth_minecraft_versions=[VERSIONED]
 java_version=[VERSIONED]
-loader_version=0.17.3
+loader_version=0.18.1
 # Mod Properties
 mod_version=1.4.6
 maven_group=me.drex

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle settings.gradle.ktssettings.gradle renamed to settings.gradle.kts

@@ -1,21 +1,19 @@
 pluginManagement {
     repositories {
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
+        maven("https://maven.fabricmc.net/")
         mavenCentral()
         gradlePluginPortal()
+        maven("https://maven.kikugie.dev/snapshots")
     }
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.7.6"
+    id("dev.kikugie.stonecutter") version "0.8-alpha.14"
 }
 
 stonecutter {
     create(rootProject) {
-        versions("1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10")
-        vcsVersion = "1.21.10"
+        versions("1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11")
+        vcsVersion = "1.21.11"
     }
 }

src/main/java/me/drex/essentials/command/Command.java

@@ -8,12 +8,16 @@
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
+//? if > 1.21.10 {
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
+//? }
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import me.drex.essentials.EssentialsMod;
 import me.drex.essentials.config.Config;
 import me.drex.essentials.config.ConfigManager;
-import me.drex.essentials.util.IdentifierUtil;
+import me.drex.essentials.util.PermissionUtil;
 import org.slf4j.Logger;
 
 import java.util.function.Predicate;
@@ -57,7 +61,11 @@ public Predicate<CommandSourceStack> require(@Nullable String permission, int de
                 return Permissions.check(src, permission(permission), defaultRequiredLevel);
             } catch (Throwable ignored) {
                 // Fallback for datapack compatibility
-                return src.hasPermission(defaultRequiredLevel);
+                //? if > 1.21.10 {
+                return src.permissions().hasPermission(new Permission.HasCommandLevel(PermissionLevel.byId(defaultRequiredLevel)));
+                //?} else {
+                /*return src.hasPermission(defaultRequiredLevel);
+                *///? }
             }
         };
     }
@@ -87,9 +95,9 @@ public boolean check(CommandSourceStack src, String permission, boolean fallback
 
     public String permission(@Nullable String permission) {
         if (permission == null) {
-            return IdentifierUtil.permission("command." + commandProperties.literal());
+            return PermissionUtil.permission("command." + commandProperties.literal());
         } else {
-            return IdentifierUtil.permission("command." + commandProperties.literal() + "." + permission);
+            return PermissionUtil.permission("command." + commandProperties.literal() + "." + permission);
         }
     }
 

src/main/java/me/drex/essentials/command/impl/misc/HatCommand.java

@@ -7,7 +7,7 @@
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -39,8 +39,8 @@ protected int setHat(CommandContext<CommandSourceStack> ctx) throws CommandSynta
         //?} else {
         /*ItemStack selected = inventory.getSelected();
         *///?}
-        ResourceLocation resourceLocation = BuiltInRegistries.ITEM.getKey(selected.getItem());
-        if (!check(ctx.getSource(), "item." + resourceLocation.getPath())) {
+        Identifier identifier = BuiltInRegistries.ITEM.getKey(selected.getItem());
+        if (!check(ctx.getSource(), "item." + identifier.getPath())) {
             ctx.getSource().sendFailure(localized("fabric-essentials.commands.hat.no_permission"));
             return FAILURE;
         }

src/main/java/me/drex/essentials/command/impl/misc/WhoIsCommand.java

@@ -64,7 +64,7 @@ private int whois(CommandSourceStack source, Collection</*? if >= 1.21.9 {*/ Nam
 
     private ServerPlayer loadPlayer(MinecraftServer server, /*? if >= 1.21.9 {*/ NameAndId /*?} else {*/ /*GameProfile *//*?}*/ target) {
         PlayerList playerList = server.getPlayerList();
-        ServerPlayer player = playerList.getPlayer(/*? if >= 1.21.9 {*/ target.id()/*?} else {*/ /*target.getId()*/ /*?}*/);
+        ServerPlayer player = playerList.getPlayer(/*? if >= 1.21.9 {*/ target.id()/*?} else {*/ /*target.getId() *//*?}*/);
         if (player != null) return player;
 
         ServerPlayer serverPlayer = new ServerPlayer(server, server.overworld(), /*? if >= 1.21.9 {*/ new GameProfile(target.id(), target.name()) /*?} else {*/ /*target *//*?}*/, ClientInformation.createDefault());

src/main/java/me/drex/essentials/command/impl/misc/admin/importer/EssentialCommandsImporter.java

@@ -8,7 +8,7 @@
 import me.drex.essentials.util.teleportation.Warp;
 import net.minecraft.nbt.NbtAccounter;
 import net.minecraft.nbt.NbtIo;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.storage.LevelResource;
 import net.minecraft.world.phys.Vec3;
@@ -58,7 +58,7 @@ public void importData(MinecraftServer server) {
                                 var z = home.getDouble("z").orElseThrow();
                                 var yaw = home.getFloat("headYaw").orElseThrow();
                                 var pitch = home.getFloat("pitch").orElseThrow();
-                                homes.put(homeName, new Home(new Location(new Vec3(x, y, z), yaw, pitch, ResourceLocation.parse(world))));
+                                homes.put(homeName, new Home(new Location(new Vec3(x, y, z), yaw, pitch, Identifier.parse(world))));
                             }
                             //?} else {
                             /*var data = tag.getCompound("data");
@@ -114,7 +114,7 @@ public void importData(MinecraftServer server) {
                         var z = home.getDouble("z").orElseThrow();
                         var yaw = home.getFloat("headYaw").orElseThrow();
                         var pitch = home.getFloat("pitch").orElseThrow();
-                        warps.put(homeName, new Warp(new Location(new Vec3(x, y, z), yaw, pitch, ResourceLocation.parse(world))));
+                        warps.put(homeName, new Warp(new Location(new Vec3(x, y, z), yaw, pitch, Identifier.parse(world))));
                     }
                     //?} else {
                     /*var data = tag.getCompound("data");

src/main/java/me/drex/essentials/command/impl/misc/admin/importer/KiloEssentialsImporter.java

@@ -10,7 +10,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtAccounter;
 import net.minecraft.nbt.NbtIo;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.phys.Vec3;
 
@@ -65,7 +65,7 @@ public void importData(MinecraftServer server) {
                                     ),
                                     view.getFloat("yaw").orElseThrow(),
                                     view.getFloat("pitch").orElseThrow(),
-                                    ResourceLocation.parse(loc.getString("dim").orElseThrow())
+                                    Identifier.parse(loc.getString("dim").orElseThrow())
                                 )
                             )
                         );
@@ -122,7 +122,7 @@ public void importData(MinecraftServer server) {
                                 ),
                                 view.getFloat("yaw").orElseThrow(),
                                 view.getFloat("pitch").orElseThrow(),
-                                ResourceLocation.parse(loc.getString("dim").orElseThrow())
+                                Identifier.parse(loc.getString("dim").orElseThrow())
                             )
                         )
                     );

src/main/java/me/drex/essentials/item/ModItemTags.java

@@ -2,7 +2,7 @@
 
 import me.drex.essentials.EssentialsMod;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 
@@ -11,7 +11,7 @@ public class ModItemTags {
     public static final TagKey<Item> HAT_DENY = bind("hat_deny");
 
     private static TagKey<Item> bind(String string) {
-        return TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(EssentialsMod.MOD_ID, string));
+        return TagKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(EssentialsMod.MOD_ID, string));
     }
 
 }