feat: datafixer for componentization

1.20.6 release is waiting on Trinkets release

CHANGELOG.md

@@ -1,4 +1,7 @@
-- Remove the Baubly dependency
-  - This also fixes #42
-- Drop Forge and Quilt support (see Discord for reasoning). This was done pre-1.20.6 to reduce the
-  work needed to remove Baubly.
+- Port to 1.20.6
+    - It should be safe to update worlds from 1.20.4 to 1.20.6 **ON FABRIC** as a datafixer has been
+      implemented
+      to migrate from NBT to components, but as always make a backup in case.
+    - If [Curios#411](https://github.com/TheIllusiveC4/Curios/issues/411) is implemented, it will be
+      safe to do so on Neoforge. For now, upgrading Neoforge worlds **WILL CAUSE LOSS OF ITEMS IN
+      THE BELT**.

common/build.gradle

@@ -2,6 +2,10 @@ architectury {
     common(rootProject.enabled_platforms.split(","))
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/utility_belt.accesswidener")
+}
+
 dependencies {
     modImplementation libs.fabric.loader
     modApi libs.architectury.common

common/src/main/java/io/github/jamalam360/utility_belt/mixin/datafixer/ItemStackComponentizationFixMixin.java

@@ -0,0 +1,24 @@
+package io.github.jamalam360.utility_belt.mixin.datafixer;
+
+import com.mojang.serialization.Dynamic;
+import io.github.jamalam360.utility_belt.UtilityBelt;
+import java.util.stream.Stream;
+import net.minecraft.util.datafix.fixes.ItemStackComponentizationFix;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ItemStackComponentizationFix.class)
+public class ItemStackComponentizationFixMixin {
+    @Inject(
+          method = "fixItemStack",
+          at = @At("TAIL")
+    )
+    private static void utilitybelt$moveNbtToComponent(ItemStackComponentizationFix.ItemStackData itemStackData, Dynamic<?> dynamic, CallbackInfo ci) {
+        if (itemStackData.is(UtilityBelt.id("utility_belt").toString())) {
+            System.out.println("fixed belt");
+            itemStackData.moveTagToComponent("Inventory", "utility_belt:utility_belt_inventory", dynamic.createList(Stream.empty()));
+        }
+    }
+}

common/src/main/resources/architectury.common.json

@@ -0,0 +1,3 @@
+{
+  "accessWidener": "utility_belt.accesswidener"
+}

common/src/main/resources/utility_belt.accesswidener

@@ -0,0 +1,3 @@
+accessWidener v2 named
+
+accessible class net/minecraft/util/datafix/fixes/ItemStackComponentizationFix$ItemStackData

common/src/main/resources/utility_belt.mixins.json

@@ -8,7 +8,8 @@
     "LivingEntityMixin",
     "PlayerMixin",
     "ServerGamePacketListenerImplMixin",
-    "ServerPlayerMixin"
+    "ServerPlayerMixin",
+    "datafixer.ItemStackComponentizationFixMixin"
   ],
   "client": [
     "client.ClientPacketListenerMixin",

fabric/build.gradle

@@ -8,6 +8,10 @@ architectury {
     fabric()
 }
 
+loom {
+    accessWidenerPath = project(":common").loom.accessWidenerPath
+}
+
 base {
     archivesName = "utility-belt-fabric"
 }

fabric/src/main/resources/fabric.mod.json

@@ -26,6 +26,7 @@
     "mixins": [
         "utility_belt.mixins.json"
     ],
+    "accessWidener": "utility_belt.accesswidener",
     "depends": {
         "fabricloader": ">=0.15.0",
         "fabric": ">=${fabric_api_version}",

neoforge/build.gradle

@@ -8,6 +8,10 @@ architectury {
     neoForge()
 }
 
+loom {
+    accessWidenerPath = project(":common").loom.accessWidenerPath
+}
+
 base {
     archivesName = "utility-belt-neoforge"
 }
@@ -108,6 +112,7 @@ shadowJar {
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
+    atAccessWideners.add "utility_belt.accesswidener"
 }
 
 sourcesJar {