uhh beta 4 i guess

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/LootTableModifierCommon.java

@@ -15,7 +15,7 @@
 import top.offsetmonkey538.loottablemodifier.common.api.resource.predicate.LootModifierPredicateTypes;
 import top.offsetmonkey538.loottablemodifier.common.api.resource.LootModifier;
 import top.offsetmonkey538.loottablemodifier.common.api.resource.util.LootModifierContext;
-import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 import top.offsetmonkey538.loottablemodifier.common.api.wrapper.ResourceManager;
 import top.offsetmonkey538.loottablemodifier.common.api.wrapper.loot.LootPool;
 import top.offsetmonkey538.loottablemodifier.common.api.wrapper.loot.LootTable;
@@ -235,4 +235,8 @@ public static <T> T load(Class<T> clazz) {
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("Failed to load service for " + clazz.getName()));
     }
+
+	public static Identifier id(String path) {
+		return Identifier.of(MOD_ID, path);
+	}
 }

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/api/resource/LootModifier.java

@@ -12,7 +12,7 @@
 import top.offsetmonkey538.loottablemodifier.common.api.resource.predicate.LootModifierPredicate;
 import top.offsetmonkey538.loottablemodifier.common.api.resource.predicate.table.TablePredicate;
 import top.offsetmonkey538.loottablemodifier.common.api.resource.util.LootModifierContext;
-import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 import top.offsetmonkey538.loottablemodifier.common.api.wrapper.loot.LootPool;
 
 import java.util.*;
@@ -27,7 +27,7 @@
  */
 public record LootModifier(@NotNull @UnmodifiableView List<LootModifierAction> actions, @NotNull LootModifierPredicate predicate) implements Predicate<LootModifierContext> {
     private static final Codec<LootModifier> LEGACY_CODEC = RecordCodecBuilder.create(instance -> instance.group(
-            Codec.either(Identifier.CODEC_PROVIDER.get(), Identifier.CODEC_PROVIDER.get().listOf()).fieldOf("modifies").forGetter(modifier -> {
+            Codec.either(Identifier.CODEC, Identifier.CODEC.listOf()).fieldOf("modifies").forGetter(modifier -> {
                 throw new IllegalStateException("Tried using legacy loot table modifier codec for serialization for some reason!");
             }),
             LootPool.CODEC_PROVIDER.get().listOf().optionalFieldOf("pools").forGetter(lootModifier -> Optional.empty()),
@@ -60,7 +60,7 @@ public record LootModifier(@NotNull @UnmodifiableView List<LootModifierAction> a
     private static @NotNull LootModifierPredicate getPredicateFromLegacyCodec(@NotNull Either<Identifier, List<Identifier>> modifiesEither) {
         final TablePredicate.Builder predicateBuilder = TablePredicate.builder();
         for (final Identifier currentId : modifiesEither.map(List::of, it -> it)) {
-            predicateBuilder.name(currentId.asString());
+            predicateBuilder.name(currentId.toString());
         }
         return predicateBuilder.build();
     }

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/api/resource/action/LootModifierActionType.java

@@ -4,7 +4,7 @@
 import com.mojang.serialization.MapCodec;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 
 import java.util.function.Supplier;
 

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/api/resource/action/LootModifierActionTypes.java

@@ -8,7 +8,7 @@
 import top.offsetmonkey538.loottablemodifier.common.api.resource.action.entry.EntryItemSetAction;
 import top.offsetmonkey538.loottablemodifier.common.api.resource.action.pool.PoolRemoveAction;
 
-import static top.offsetmonkey538.loottablemodifier.common.platform.PlatformMain.id;
+import static top.offsetmonkey538.loottablemodifier.common.LootTableModifierCommon.id;
 
 /**
  * Contains all {@link LootModifierAction} types available in Loot Table Modifier.

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/api/resource/predicate/LootModifierPredicateType.java

@@ -4,7 +4,7 @@
 import com.mojang.serialization.MapCodec;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 
 import java.util.function.Supplier;
 

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/api/resource/predicate/LootModifierPredicateTypes.java

@@ -7,7 +7,7 @@
 import top.offsetmonkey538.loottablemodifier.common.api.resource.predicate.op.InvertedPredicate;
 import top.offsetmonkey538.loottablemodifier.common.api.resource.predicate.table.TablePredicate;
 
-import static top.offsetmonkey538.loottablemodifier.common.platform.PlatformMain.id;
+import static top.offsetmonkey538.loottablemodifier.common.LootTableModifierCommon.id;
 
 /**
  * Contains all {@link LootModifierPredicate} types available in Loot Table Modifier

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/api/resource/util/LootModifierContext.java

@@ -1,6 +1,6 @@
 package top.offsetmonkey538.loottablemodifier.common.api.resource.util;
 
-import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 import top.offsetmonkey538.loottablemodifier.common.api.wrapper.loot.LootPool;
 import top.offsetmonkey538.loottablemodifier.common.api.wrapper.loot.LootTable;
 import top.offsetmonkey538.loottablemodifier.common.api.wrapper.loot.entry.LootPoolEntry;

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/api/resource/util/RegexPattern.java

@@ -5,7 +5,7 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
-import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 
 import java.util.regex.Pattern;
 
@@ -19,7 +19,7 @@
  * @param pattern the compiled pattern
  */
 public record RegexPattern(boolean isRegex, @NotNull String patternString, @NotNull Pattern pattern) {
-    private static final Codec<RegexPattern> INLINE_CODEC = Identifier.CODEC_PROVIDER.get().xmap(identifier -> RegexPattern.literal(identifier.toString()), instance -> Identifier.of(instance.patternString()));
+    private static final Codec<RegexPattern> INLINE_CODEC = Identifier.CODEC.xmap(identifier -> RegexPattern.literal(identifier.toString()), instance -> Identifier.of(instance.patternString()));
     private static final Codec<RegexPattern> FULL_CODEC = RecordCodecBuilder.create(instance -> instance.group(
             Codec.STRING.fieldOf("regexPattern").forGetter(RegexPattern::patternString)
     ).apply(instance, RegexPattern::compile));

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/api/wrapper/ResourceManager.java

@@ -1,6 +1,7 @@
 package top.offsetmonkey538.loottablemodifier.common.api.wrapper;
 
 import it.unimi.dsi.fastutil.Pair;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 
 import java.io.BufferedReader;
 import java.util.function.Predicate;

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/platform/PlatformCommandUtils.java

@@ -4,7 +4,7 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.serialization.DynamicOps;
 import org.jetbrains.annotations.ApiStatus;
-import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 import top.offsetmonkey538.loottablemodifier.common.api.wrapper.loot.LootTable;
 
 import static top.offsetmonkey538.loottablemodifier.common.LootTableModifierCommon.load;

common/src/main/java/top/offsetmonkey538/loottablemodifier/common/platform/PlatformMain.java

@@ -3,7 +3,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.stream.JsonWriter;
 import org.jetbrains.annotations.ApiStatus;
-import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
+import top.offsetmonkey538.monkeylib538.common.api.wrapper.Identifier;
 
 import java.io.IOException;
 
@@ -17,10 +17,5 @@ static void writeSorted(JsonWriter jsonWriter, JsonElement json) throws IOExcept
         INSTANCE.writeSortedImpl(jsonWriter, json);
     }
 
-    static Identifier id(String path) {
-        return INSTANCE.idImpl(path);
-    }
-
     void writeSortedImpl(JsonWriter jsonWriter, JsonElement json) throws IOException;
-    Identifier idImpl(String path);
 }

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel          = true
 
 # Dependencies
 # MonkeyLib538, check at https://github.com/OffsetMods538/MonkeyLib538
-monkeylib538_version         = 3.0.0-beta.1
+monkeylib538_version         = 3.0.0-beta.2
 ## DataFixerUpper, check at https://github.com/Mojang/DataFixerUpper
 datafixerupper_version       = 8.0.16
 ## Brigadier, check at https://github.com/Mojang/Brigadier
@@ -14,7 +14,7 @@ commonsio_version            = 2.17.0
 ## JetBrains Annotations, check at https://github.com/JetBrains/java-annotations
 jetbrainsannotations_version = 26.0.2
 ## DevAuth, check at https://github.com/DJtheRedstoner/DevAuth
-devauth_version              = 1.2.1
+devauth_version              = 1.2.2
 
 # Mod Properties
-mod_version                  = 2.0.0-beta.3
+mod_version                  = 2.0.0-beta.4

loader/fabric/1.20.1/gradle.properties

@@ -11,4 +11,4 @@ supported_minecraft_versions = 1.20.1
 # These should be automatically updated, unless the environment
 #  variable "DISABLE_PROPERTIES_UPDATE" is set.
 loader_version               = 0.18.4
-fapi_version                 = 0.92.6+1.20.1
+fapi_version                 = 0.92.7+1.20.1

loader/fabric/1.20.1/src/main/java/top/offsetmonkey538/loottablemodifier/fabric/v1201/mixin/LootDataManagerMixin.java

@@ -12,9 +12,9 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.offsetmonkey538.loottablemodifier.common.LootTableModifierCommon;
-import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.IdentifierWrapper;
 import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.ResourceManagerWrapper;
 import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.loot.LootTableWrapper;
+import top.offsetmonkey538.monkeylib538.modded.api.wrapper.ModdedIdentifier;
 
 import java.util.Map;
 
@@ -39,7 +39,7 @@ public abstract class LootDataManagerMixin {
                 lootRegistry.entrySet()
                         .stream()
                         .map(entry -> Pair.of(
-                                new IdentifierWrapper(entry.getKey()),
+                                ModdedIdentifier.of(entry.getKey()), // TODO: can do like this?
                                 new LootTableWrapper(entry.getValue())
                         )),
                 JsonOps.INSTANCE // TODO: Is a RegistryOps not needed on 1.20.1? Doesn't look like the loot table loader uses it so maybe not?

loader/fabric/1.20.2/src/main/java/top/offsetmonkey538/loottablemodifier/fabric/v1202/mixin/LootDataManagerMixin.java

@@ -12,9 +12,10 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.offsetmonkey538.loottablemodifier.common.LootTableModifierCommon;
-import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.IdentifierWrapper;
 import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.ResourceManagerWrapper;
 import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.loot.LootTableWrapper;
+import top.offsetmonkey538.monkeylib538.modded.api.wrapper.ModdedIdentifier;
+import top.offsetmonkey538.monkeylib538.modded.v1201.api.wrapper.ModdedVersionIdentifier;
 
 import java.util.Map;
 
@@ -39,7 +40,7 @@ public abstract class LootDataManagerMixin {
                 lootRegistry.entrySet()
                         .stream()
                         .map(entry -> Pair.of(
-                                new IdentifierWrapper(entry.getKey()),
+                                ModdedIdentifier.of(entry.getKey()),
                                 new LootTableWrapper(entry.getValue())
                         )),
                 JsonOps.INSTANCE // TODO: Is a RegistryOps not needed on 1.20.1? Doesn't look like the loot table loader uses it so maybe not?

loader/fabric/1.20.5/src/main/java/top/offsetmonkey538/loottablemodifier/fabric/v1205/mixin/ReloadableRegistriesMixin.java

@@ -14,9 +14,9 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import top.offsetmonkey538.loottablemodifier.common.LootTableModifierCommon;
-import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.IdentifierWrapper;
 import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.ResourceManagerWrapper;
 import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.loot.LootTableWrapper;
+import top.offsetmonkey538.monkeylib538.modded.api.wrapper.ModdedIdentifier;
 
 @Mixin(
         value = ReloadableServerRegistries.class,
@@ -39,7 +39,7 @@ public abstract class ReloadableRegistriesMixin {
                 lootRegistry.asLookup()
                         .listElements()
                         .map(registryEntry -> Pair.of(
-                                new IdentifierWrapper(registryEntry.key().location()),
+                                ModdedIdentifier.of(registryEntry.key().location()), // TODO: can I do it like this?
                                 new LootTableWrapper(lootRegistry.get(registryEntry.key()))
                         )),
                 registryOps

loader/fabric/1.21.11/gradle.properties

@@ -0,0 +1,14 @@
+project_name                 = fabric-1.21.11
+commonModdedVersion          = 1.21.2
+fabricDatagenEntrypoint      = top.offsetmonkey538.loottablemodifier.fabric.v12111.datagen.LootTableModifierDatagen
+
+monkeylib538_suffix          = 1.21.11
+
+# Miminum Minecraft version supported, check at https://fabricmc.net/develop
+minecraft_version            = 1.21.11
+supported_minecraft_versions = 1.21.11
+
+# These should be automatically updated, unless the environment
+#  variable "DISABLE_PROPERTIES_UPDATE" is set.
+loader_version               = 0.18.4
+fapi_version                 = 0.141.1+1.21.11