initial port to 1.21.11

Author: Z0rdak

build.gradle

@@ -1,8 +1,8 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.11-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.13-SNAPSHOT' apply false
     // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
-    id 'net.neoforged.moddev' version '2.0.115' apply false
+    id 'net.neoforged.moddev' version '2.0.123' apply false
 }
 
 

changelog.md

@@ -389,7 +389,7 @@ some great advantages for the future:
 
 ## Fixed
 
-* Fix ResourceLocation/Identifier entries in `covered_block_entities` not correctly considered in some versions (1.20+).
+* Fix Identifier/Identifier entries in `covered_block_entities` not correctly considered in some versions (1.20+).
 * Tags included in the list `covered_block_entity_tags` inside the config `yawp-flags.toml` are now considered for the `break-blocks` and `place-blocks` flag
 * Fix RegionMarker not working properly
 * Fix NPE when checking for player related flags which caused (beside others) issues with Minecolonies

common/src/main/java/de/z0rdak/yawp/api/Flag.java

@@ -1,9 +1,9 @@
 package de.z0rdak.yawp.api;
 
 import de.z0rdak.yawp.core.flag.FlagMetaInfo;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
-public record Flag(ResourceLocation id, FlagMetaInfo flagInfo) {
+public record Flag(Identifier id, FlagMetaInfo flagInfo) {
 
     public String name() {
         return id.toString();

common/src/main/java/de/z0rdak/yawp/api/FlagRegister.java

@@ -2,8 +2,8 @@
 
 import de.z0rdak.yawp.constants.Constants;
 import de.z0rdak.yawp.core.flag.*;
-import net.minecraft.ResourceLocationException;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.IdentifierException;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -15,21 +15,21 @@ public class FlagRegister {
     private FlagRegister() {
     }
 
-    private static final Map<ResourceLocation, Flag> flagRegister = new HashMap<>();
+    private static final Map<Identifier, Flag> flagRegister = new HashMap<>();
 
-    private static ResourceLocation flagId(final String flagName) {
-        return ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, flagName);
+    private static Identifier flagId(final String flagName) {
+        return Identifier.fromNamespaceAndPath(Constants.MOD_ID, flagName);
     }
 
     /**
      * Checks if the given flag ID matches the specified Flag.
      *
      * @param flagId The string representation of the flag ID.
      * @param flag   The flag to compare against.
-     * @return True if the flag ID matches the flag's ResourceLocation, false otherwise.
+     * @return True if the flag ID matches the flag's Identifier, false otherwise.
      */
     public static boolean isSame(String flagId, Flag flag) {
-        ResourceLocation left = ResourceLocation.parse(flagId);
+        Identifier left = Identifier.parse(flagId);
         return left.equals(flag.id());
     }
 
@@ -38,20 +38,20 @@ public static boolean isSame(String flagId, Flag flag) {
      *
      * @param left  The first flag.
      * @param right The second flag.
-     * @return True if both flags have the same ResourceLocation, false otherwise.
+     * @return True if both flags have the same Identifier, false otherwise.
      */
     public static boolean isSame(Flag left, Flag right) {
         return isSame(left.id(), right);
     }
 
     /**
-     * Checks if the given ResourceLocation matches the specified Flag.
+     * Checks if the given Identifier matches the specified Flag.
      *
-     * @param flagId The ResourceLocation of the flag.
+     * @param flagId The Identifier of the flag.
      * @param flag   The flag to compare against.
-     * @return True if the ResourceLocation matches the flag's ResourceLocation, false otherwise.
+     * @return True if the Identifier matches the flag's Identifier, false otherwise.
      */
-    public static boolean isSame(ResourceLocation flagId, Flag flag) {
+    public static boolean isSame(Identifier flagId, Flag flag) {
         return flagId.equals(flag.id());
     }
 
@@ -71,14 +71,14 @@ private static boolean registerFlag(Flag flag) {
     }
 
     /**
-     * Registers a flag in the internal flag registry using a {@link ResourceLocation} and {@link FlagMetaInfo}.
+     * Registers a flag in the internal flag registry using a {@link Identifier} and {@link FlagMetaInfo}.
      * If a flag with the same resource location already exists, registration is skipped.
      *
      * @param flagRl       The unique resource location of the flag.
      * @param flagMetaInfo The metadata associated with the flag.
      * @return {@code true} if the flag was successfully registered, {@code false} if it was already registered.
      */
-    public static boolean registerFlag(@NotNull ResourceLocation flagRl, @NotNull FlagMetaInfo flagMetaInfo) {
+    public static boolean registerFlag(@NotNull Identifier flagRl, @NotNull FlagMetaInfo flagMetaInfo) {
         if (flagRl.getNamespace().equalsIgnoreCase(Constants.MOD_ID)) {
             throw new IllegalArgumentException("You are not permitted to register flags with the YAWP namespace!");
         }
@@ -95,7 +95,7 @@ public static boolean registerFlag(@NotNull ResourceLocation flagRl, @NotNull Fl
      * @return {@code true} if the flag was successfully registered, {@code false} if it was already registered.
      */
     public static boolean registerFlag(@NotNull String modId, @NotNull String flagId, @NotNull FlagMetaInfo flagMetaInfo) {
-        var rl = ResourceLocation.fromNamespaceAndPath(modId, flagId);
+        var rl = Identifier.fromNamespaceAndPath(modId, flagId);
         return registerFlag(rl, flagMetaInfo);
     }
 
@@ -112,12 +112,12 @@ public static Set<Flag> getFlagsByFrequency(FlagFrequency frequency) {
     }
 
     /**
-     * Checks if a flag is registered based on its ResourceLocation.
+     * Checks if a flag is registered based on its Identifier.
      *
-     * @param rl The ResourceLocation of the flag.
+     * @param rl The Identifier of the flag.
      * @return True if the flag is registered, false otherwise.
      */
-    public static boolean isFlagRegistered(ResourceLocation rl) {
+    public static boolean isFlagRegistered(Identifier rl) {
         return flagRegister.containsKey(rl);
     }
 
@@ -129,9 +129,9 @@ public static boolean isFlagRegistered(ResourceLocation rl) {
      */
     public static boolean isRegistered(String flagIdentifier) {
         try {
-            ResourceLocation rl = ResourceLocation.parse(flagIdentifier);
+            Identifier rl = Identifier.parse(flagIdentifier);
             return isFlagRegistered(rl);
-        } catch (ResourceLocationException rle) {
+        } catch (IdentifierException rle) {
             return false;
         }
     }
@@ -145,29 +145,29 @@ public static boolean isRegistered(String flagIdentifier) {
      */
     public static Flag byId(String flagIdentifier) throws IllegalArgumentException {
         if (isRegistered(flagIdentifier)) {
-            return flagRegister.get(ResourceLocation.parse(flagIdentifier));
+            return flagRegister.get(Identifier.parse(flagIdentifier));
         }
         throw new IllegalArgumentException("Invalid region flag identifier supplied");
     }
 
     /**
      * Retrieves an Optional containing the Flag if it exists.
      *
-     * @param rl The ResourceLocation of the flag.
+     * @param rl The Identifier of the flag.
      * @return An Optional containing the flag if registered, otherwise empty.
      */
-    public static Optional<Flag> getFlagOptional(ResourceLocation rl) {
+    public static Optional<Flag> getFlagOptional(Identifier rl) {
         return isFlagRegistered(rl) ? Optional.of(flagRegister.get(rl)) : Optional.empty();
     }
 
     /**
-     * Retrieves a Flag by its ResourceLocation, or null if not found.
+     * Retrieves a Flag by its Identifier, or null if not found.
      *
-     * @param rl The ResourceLocation of the flag.
+     * @param rl The Identifier of the flag.
      * @return The corresponding Flag if registered, otherwise null.
      */
     @Nullable
-    public static Flag getFlag(ResourceLocation rl) {
+    public static Flag getFlag(Identifier rl) {
         return isFlagRegistered(rl) ? flagRegister.get(rl) : null;
     }
 
@@ -178,7 +178,7 @@ public static Flag getFlag(ResourceLocation rl) {
      */
     public static List<String> getFlagNames() {
         return flagRegister.keySet().stream()
-                .map(ResourceLocation::toString)
+                .map(Identifier::toString)
                 .collect(Collectors.toList());
     }
 

common/src/main/java/de/z0rdak/yawp/api/FlagTagRegister.java

@@ -1,14 +1,14 @@
 package de.z0rdak.yawp.api;
 
 import de.z0rdak.yawp.core.flag.FlagTag;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public final class FlagTagRegister {
 
-    private static final Map<ResourceLocation, FlagTag> REGISTRY = new ConcurrentHashMap<>();
+    private static final Map<Identifier, FlagTag> REGISTRY = new ConcurrentHashMap<>();
 
     /**
      * Flags that evaluate per-player context or directly
@@ -17,7 +17,7 @@ public final class FlagTagRegister {
      * {@code USE_ITEM}, etc. </p>
      */
     public static final FlagTag PLAYER = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "player"),
+            Identifier.fromNamespaceAndPath("yawp", "player"),
             "Flags that evaluate per-player context or directly affect player actions. Examples: BREAK_BLOCKS, PLACE_BLOCKS, USE_ITEM, etc."
     ));
 
@@ -30,7 +30,7 @@ public final class FlagTagRegister {
      * Usually combined with {@link #PLAYER}.
      */
     public static final FlagTag BENEFICIAL = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "beneficial"),
+            Identifier.fromNamespaceAndPath("yawp", "beneficial"),
             "Flags granting advantages or permissions to players. Denying these feels wrong from a player perspective. Usually combined with PLAYER. Examples: INVINCIBLE, KEEP_INV, KEEP_XP."
     ));
 
@@ -41,7 +41,7 @@ public final class FlagTagRegister {
      * Always implies {@link #PLAYER}.
      */
     public static final FlagTag PLAYER_PREVENTION = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "prevention"),
+            Identifier.fromNamespaceAndPath("yawp", "prevention"),
             "Flags that actively block or prevent a player’s attempted action. Always implies PLAYER. Examples: BREAK_BLOCKS, PLACE_BLOCKS, USE_ITEM."
     ));
 
@@ -51,7 +51,7 @@ public final class FlagTagRegister {
      * {@code BLOCK_BREAK}, etc.</p>
      */
     public static final FlagTag BLOCK = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "block"),
+            Identifier.fromNamespaceAndPath("yawp", "block"),
             "Flags concerning block-based events or world state. Examples: FIRE_SPREAD, TNT_EXPLODE, BLOCK_BREAK."
     ));
 
@@ -62,7 +62,7 @@ public final class FlagTagRegister {
      * Often combined with {@link #PLAYER}.
      */
     public static final FlagTag ITEM = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "item"),
+            Identifier.fromNamespaceAndPath("yawp", "item"),
             "Flags tied to item actions or mechanics. Examples: USE_ITEM, DROP_ITEM, PICKUP_ITEM. Often combined with PLAYER."
     ));
 
@@ -71,7 +71,7 @@ public final class FlagTagRegister {
      * <p>Examples: {@code INTERACT_ENTITY}.</p>
      */
     public static final FlagTag ENTITY = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "entity"),
+            Identifier.fromNamespaceAndPath("yawp", "entity"),
             "Flags involving entities as targets or sources. Examples: INTERACT_ENTITY."
     ));
 
@@ -82,7 +82,7 @@ public final class FlagTagRegister {
      * {@code FLUID_FLOW}, {@code ICE_MELT}.</p>
      */
     public static final FlagTag ENVIRONMENT = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "environment"),
+            Identifier.fromNamespaceAndPath("yawp", "environment"),
             "Flags controlling world-level effects or non-entity mechanics. Examples: FIRE_TICK, LEAF_DECAY, FLUID_FLOW, ICE_MELT."
     ));
 
@@ -92,7 +92,7 @@ public final class FlagTagRegister {
      * <p>Examples: {@code MOVE}, {@code FIRE_TICK}, {@code FLUID_FLOW}.</p>
      */
     public static final FlagTag HIGH_FREQUENCY = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "high-frequency"),
+            Identifier.fromNamespaceAndPath("yawp", "high-frequency"),
             "Flags checked repeatedly per n-ticks, usually for movement or environment updates. Examples: MOVE, FIRE_TICK, FLUID_FLOW."
     ));
 
@@ -102,7 +102,7 @@ public final class FlagTagRegister {
      * <p>Examples: {@code BLOCK_EXPLODE}, {@code griefing}, etc.</p>
      */
     public static final FlagTag PROTECTION = register(new FlagTag(
-            ResourceLocation.fromNamespaceAndPath("yawp", "protection"),
+            Identifier.fromNamespaceAndPath("yawp", "protection"),
             "Flags defining preventive or defensive behavior rather than granting permissions. Examples: BLOCK_EXPLODE, griefing."
     ));
 
@@ -112,8 +112,8 @@ public static FlagTag register(FlagTag tag) {
         return tag;
     }
 
-    /** Retrieves a FlagTag by its ResourceLocation. */
-    public static FlagTag from(ResourceLocation rl) throws IllegalArgumentException {
+    /** Retrieves a FlagTag by its Identifier. */
+    public static FlagTag from(Identifier rl) throws IllegalArgumentException {
         FlagTag tag = REGISTRY.get(rl);
         if (tag == null) throw new IllegalArgumentException("Invalid flag tag: " + rl);
         return tag;

common/src/main/java/de/z0rdak/yawp/api/commands/Commands.java

@@ -7,13 +7,9 @@
 import de.z0rdak.yawp.core.flag.RegionFlag;
 import de.z0rdak.yawp.core.group.GroupType;
 import de.z0rdak.yawp.core.region.IMarkableRegion;
-import de.z0rdak.yawp.core.region.IMarkableRegion;
 import de.z0rdak.yawp.core.region.IProtectedRegion;
 import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.Level;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 import static de.z0rdak.yawp.api.commands.CommandConstants.*;
 import static de.z0rdak.yawp.util.ChatComponentBuilder.commandBlockPosStr;
@@ -35,10 +31,10 @@ public static String buildRegionBaseCmd(IProtectedRegion region) {
                 return buildCommandStr(GLOBAL.toString());
             }
             case DIMENSION: {
-                return buildCommandStr(DIM.toString(), region.getDim().location().toString());
+                return buildCommandStr(DIM.toString(), region.getDim().identifier().toString());
             }
             case LOCAL: {
-                return buildCommandStr(LOCAL.toString(), region.getDim().location().toString(), region.getName());
+                return buildCommandStr(LOCAL.toString(), region.getDim().identifier().toString(), region.getName());
             }
             default:
                 throw new IllegalArgumentException("Unexpected value: " + region.getRegionType());
@@ -51,10 +47,10 @@ public static String buildFlagBaseCmd(IProtectedRegion region, String flag) {
                 return buildCommandStr(FLAG.toString(), GLOBAL.toString(), flag);
             }
             case DIMENSION: {
-                return buildCommandStr(FLAG.toString(), DIM.toString(), region.getDim().location().toString(), flag);
+                return buildCommandStr(FLAG.toString(), DIM.toString(), region.getDim().identifier().toString(), flag);
             }
             case LOCAL: {
-                return buildCommandStr(FLAG.toString(), LOCAL.toString(), region.getDim().location().toString(), region.getName(), flag);
+                return buildCommandStr(FLAG.toString(), LOCAL.toString(), region.getDim().identifier().toString(), region.getName(), flag);
             }
             default:
                 throw new IllegalArgumentException("Unexpected value: " + region.getRegionType());
@@ -155,7 +151,7 @@ public static String buildSetDisplayBlockCommand(IMarkableRegion region) {
         return buildDisplaySubCommand(region, subCmd);
     }
 
-    public static String buildSetDisplayBlockCommand(IMarkableRegion region, ResourceLocation block) {
+    public static String buildSetDisplayBlockCommand(IMarkableRegion region, Identifier block) {
         String subCmd = buildSubCmdStr(BLOCK.toString(), block.toString());
         return buildDisplaySubCommand(region, subCmd);
     }
@@ -185,7 +181,7 @@ public static String buildVisualizationShowCommand(IMarkableRegion region, Displ
         return buildShowSubCommand(region, subCmd);
     }
 
-    public static String buildAdvancedVisualizationShowCommand(IMarkableRegion region, DisplayType displayType, ResourceLocation block, boolean glow, int lightLevel) {
+    public static String buildAdvancedVisualizationShowCommand(IMarkableRegion region, DisplayType displayType, Identifier block, boolean glow, int lightLevel) {
         String subCmd = buildSubCmdStr(LOCAL.toString(), displayType.name, block.toString(), String.valueOf(glow), String.valueOf(lightLevel));
         return buildShowSubCommand(region, subCmd);
     }
@@ -347,7 +343,7 @@ public static String buildRemoveTeleportAnchorCommand(IMarkableRegion region, St
         return buildRemoveCommand(region, subCmd);
     }
 
-    public static String buildListLocalRegionCommand(ResourceLocation levelRl) {
+    public static String buildListLocalRegionCommand(Identifier levelRl) {
         return buildCommandStr(DIM.toString(), levelRl.toString(), LIST.toString(), LOCAL.toString());
     }
 

common/src/main/java/de/z0rdak/yawp/api/core/IRegionManager.java

@@ -4,7 +4,7 @@
 import de.z0rdak.yawp.core.region.IProtectedRegion;
 import de.z0rdak.yawp.data.region.LevelRegionData;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.level.Level;
 
 import java.util.Optional;
@@ -61,7 +61,7 @@ public interface IRegionManager {
 
     /**
      * Create the corresponding ResourceKey for the provided resource key string (e.g. 'minecraft:overworld')
-     * Basically a wrapper around `ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(dimKey));`
+     * Basically a wrapper around `ResourceKey.create(Registries.DIMENSION, Identifier.parse(dimKey));`
      * @param dimKey resource key of the level/dimension
      * @return the corresponding ResourceKey for the level/dimension
      */
@@ -87,7 +87,7 @@ public interface IRegionManager {
      * Returns a set of resource keys for all created Dimensional Regions
      * @return a set of resource keys corresponding to registered DimensionalRegions
      */
-    Set<ResourceLocation> getLevels();
+    Set<Identifier> getLevels();
 
     /**
      * Resets the DimensionalRegion as well as all LocalRegions of the corresponding level.