chore: update to 1.21.6

Author: BlueZeeKing

gradle.properties

@@ -1,23 +1,23 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.10
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.16.14
 
 # Mod Properties
-mod_version = 2.9.0
+mod_version = 2.9.1
 maven_group = io.icker
 archives_base_name = factions
 
 # Dependencies
-fabric_version=0.119.5+1.21.5
-lucko_permissions_version=0.3.1
+fabric_version=0.127.0+1.21.6
+lucko_permissions_version=0.4.0
 dynmap_api_version=3.7-SNAPSHOT
 papi_version=2.4.1+1.21
-styled_chat_version=E1RdcKyb
+styled_chat_version=4iEiOcnO
 bluemap_api_version=2.7.1
 squaremap_api_version=1.2.3
-sgui_version=1.9.0+1.21.5
-stapi_version=2.5.0+1.21.5-rc1
+sgui_version=1.10.0+1.21.6
+stapi_version=2.5.1+1.21.5
 flow_version=1.0.3

src/main/java/io/icker/factions/FactionsMod.java

@@ -43,11 +43,11 @@
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FactionsMod implements ModInitializer {
-    public static Logger LOGGER = LogManager.getLogger("Factions");
+    public static Logger LOGGER = LoggerFactory.getLogger("Factions");
     public static final String MODID = "factions";
 
     public static Config CONFIG = Config.load();

src/main/java/io/icker/factions/database/SerializerRegistry.java

@@ -1,5 +1,9 @@
 package io.icker.factions.database;
 
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+
+import io.icker.factions.FactionsMod;
 import io.icker.factions.api.persistents.Relationship.Permissions;
 import io.icker.factions.api.persistents.Relationship.Status;
 import io.icker.factions.api.persistents.User.ChatMode;
@@ -22,12 +26,18 @@
 import net.minecraft.nbt.NbtLongArray;
 import net.minecraft.nbt.NbtShort;
 import net.minecraft.nbt.NbtString;
+import net.minecraft.storage.NbtReadView;
+import net.minecraft.storage.NbtWriteView;
+import net.minecraft.storage.ReadView;
+import net.minecraft.storage.ReadView.TypedListReadView;
+import net.minecraft.storage.WriteView.ListAppender;
+import net.minecraft.util.ErrorReporter;
 import net.minecraft.util.Uuids;
+import net.minecraft.util.dynamic.Codecs;
 
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.HashMap;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
 
@@ -134,49 +144,72 @@ private static <T extends Enum<T>> Serializer<T, NbtString> createEnumSerializer
                 el -> Enum.valueOf(clazz, el.asString().orElse("")));
     }
 
+    public record InventoryItem(int slot, ItemStack stack) {
+        public static final Codec<InventoryItem> CODEC =
+                RecordCodecBuilder.create(
+                        (instance) -> {
+                            return instance.group(
+                                            Codecs.UNSIGNED_BYTE
+                                                    .fieldOf("Slot")
+                                                    .orElse(0)
+                                                    .forGetter(InventoryItem::slot),
+                                            ItemStack.MAP_CODEC
+                                                    .fieldOf("Data")
+                                                    .forGetter(InventoryItem::stack))
+                                    .apply(instance, InventoryItem::new);
+                        });
+    }
+
     private static Serializer<SimpleInventory, NbtList> createInventorySerializer(int size) {
         return new Serializer<SimpleInventory, NbtList>(
                 val -> {
-                    NbtList nbtList = new NbtList();
+                    ErrorReporter.Logging reporter = new ErrorReporter.Logging(FactionsMod.LOGGER);
+                    NbtWriteView view =
+                            NbtWriteView.create(
+                                    reporter,
+                                    WorldUtils.getWorld("minecraft:overworld")
+                                            .getRegistryManager());
+                    ListAppender<InventoryItem> appender =
+                            view.getListAppender("Data", InventoryItem.CODEC);
 
                     for (int i = 0; i < val.size(); ++i) {
                         ItemStack itemStack = val.getStack(i);
                         if (!itemStack.isEmpty()) {
-                            NbtCompound nbtCompound = new NbtCompound();
-                            nbtCompound.putByte("Slot", (byte) i);
-                            nbtCompound.put(
-                                    "Data",
-                                    itemStack.toNbt(WorldUtils.server.getRegistryManager()));
-                            nbtList.add(nbtCompound);
+                            appender.add(new InventoryItem(i, itemStack));
                         }
                     }
 
-                    return nbtList;
+                    reporter.close();
+
+                    return view.getNbt().getList("Data").get();
                 },
                 el -> {
+                    NbtCompound compound = new NbtCompound();
+                    compound.put("Data", el);
+
+                    ErrorReporter.Logging reporter = new ErrorReporter.Logging(FactionsMod.LOGGER);
+
+                    ReadView view =
+                            NbtReadView.create(
+                                    reporter,
+                                    WorldUtils.getWorld("minecraft:overworld").getRegistryManager(),
+                                    compound);
+
                     SimpleInventory inventory = new SimpleInventory(size);
 
                     for (int i = 0; i < size; ++i) {
                         inventory.setStack(i, ItemStack.EMPTY);
                     }
 
-                    for (int i = 0; i < el.size(); ++i) {
-                        Optional<NbtCompound> optionalNbtCompound = el.getCompound(i);
-                        if (optionalNbtCompound.isEmpty()) {
-                            continue;
-                        }
-                        NbtCompound nbtCompound = optionalNbtCompound.get();
-                        int slot = nbtCompound.getByte("Slot").orElse((byte) size) & 255;
-                        if (slot >= 0 && slot < size) {
-                            inventory.setStack(
-                                    slot,
-                                    ItemStack.fromNbt(
-                                                    WorldUtils.server.getRegistryManager(),
-                                                    nbtCompound.get("Data"))
-                                            .get());
-                        }
+                    TypedListReadView<InventoryItem> list_view =
+                            view.getTypedListView("Data", InventoryItem.CODEC);
+
+                    for (InventoryItem item : list_view) {
+                        inventory.setStack(item.slot(), item.stack());
                     }
 
+                    reporter.close();
+
                     return inventory;
                 });
     }

src/main/resources/fabric.mod.json

@@ -30,7 +30,7 @@
 
   "depends": {
     "fabricloader": ">=0.13.3",
-    "minecraft": ">=1.21.4",
+    "minecraft": ">=1.21.6",
     "java": ">=17",
     "fabric-api": "*"
   },