Fix up DataComponent world converter stuff.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/datafixer/GenerationsDataFixUtils.java

@@ -15,8 +15,8 @@
 
 public class GenerationsDataFixUtils {
     public static Dynamic<?> getDiscHolder(Dynamic<?> holder) {
-        var list = holder.asStream().map(dynamic -> Pair.of(dynamic.get("Slot").asInt(-1), dynamic.remove("Slot")))
-                .filter(pair -> pair.getFirst() <= -1).map(a -> a.getSecond()).map(a -> a.renameField("Count", "amount"));
+        var list = holder.asStream().map(dynamic -> Pair.of(dynamic.get("Slot").asInt(-1), dynamic.remove("slot")))
+                .filter(pair -> pair.getFirst() <= -1).map(a -> a.getSecond()).map(a -> a.renameField("Count", "count"));
 
         return holder.createList(list);
     }

common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/datafix/ItemStackComponentizationFixMixin.java

@@ -54,16 +54,14 @@ private static void fixItemStackAddition(ItemStackComponentizationFix.ItemStackD
                 holder.get("Discs").map(GenerationsDataFixUtils::getDiscHolder).result().ifPresent(new Consumer<Dynamic<?>>() {
                     @Override
                     public void accept(Dynamic<?> dynamic) {
-                        itemStackData.setComponent("generations_core:inventory", dynamic);
+                        itemStackData.setComponent("minecraft:container", dynamic);
                         System.out.println("Discs: " + dynamic);
                     }
                 });
-                var newHolder = holder.emptyMap();
-                newHolder = newHolder.set("playing", holder.createBoolean(holder.get("Playing").asBoolean(false)));
-                newHolder = newHolder.set("current_slot", holder.createInt(holder.get("CurrentSlot").asInt(0)));
-                newHolder = newHolder.set("time_until_next_song", holder.createInt(holder.get("TimeUntilNextSong").asInt(0)));
-                newHolder = newHolder.set("title", holder.createString("Walkmon"));
-                itemStackData.setComponent("generations_core:walkmon_data", newHolder);
+                itemStackData.setComponent("generations_core:playing", holder.createBoolean(holder.get("Playing").asBoolean(false)));
+                itemStackData.setComponent("generations_core:current_slot", holder.createInt(holder.get("CurrentSlot").asInt(0)));
+                itemStackData.setComponent("generations_core:time_until_next_song", holder.createInt(holder.get("TimeUntilNextSong").asInt(0)));
+                itemStackData.setComponent("generations_core:title", holder.createString("Walkmon"));
             });
         }