(MAJOR) Initial port to 21.8

Author: robotgryphon

core-api/src/main/java/dev/compactmods/machines/api/attachment/CMDataAttachments.java

@@ -2,6 +2,8 @@
 
 import com.google.common.base.Predicates;
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.PrimitiveCodec;
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.api.machine.MachineColor;
 import dev.compactmods.machines.api.room.history.RoomEntryPoint;
@@ -13,6 +15,7 @@
 import net.minecraft.core.GlobalPos;
 import net.minecraft.core.UUIDUtil;
 import net.minecraft.util.CommonColors;
+import net.minecraft.world.entity.animal.Cod;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.attachment.AttachmentType;
 import net.neoforged.neoforge.registries.DeferredRegister;
@@ -36,27 +39,22 @@ public interface CMDataAttachments {
 
     Supplier<AttachmentType<GlobalPos>> OPEN_MACHINE_POS = ATTACHMENT_TYPES.register("open_machine", () -> AttachmentType
             .builder(() -> GlobalPos.of(Level.OVERWORLD, BlockPos.ZERO))
-            .serialize(GlobalPos.CODEC, Predicates.alwaysFalse())
+            .serialize(GlobalPos.MAP_CODEC, Predicates.alwaysFalse())
             .build());
 
     Supplier<AttachmentType<RoomUpgradeComponentList>> PERMANENT_UPGRADES = ATTACHMENT_TYPES.register("permanent_upgrades", () -> AttachmentType
             .builder(() -> new RoomUpgradeComponentList(List.of()))
-            .serialize(RoomUpgradeComponentList.CODEC)
+            .serialize(RoomUpgradeComponentList.CODEC.fieldOf("upgrades"))
             .build());
 
     Supplier<AttachmentType<String>> CURRENT_ROOM_CODE = ATTACHMENT_TYPES.register("current_room_code", () -> AttachmentType
             .<String>builder(() -> null)
-            .serialize(Codec.STRING)
+            .serialize(Codec.STRING.fieldOf("code"))
             .build());
 
     Supplier<AttachmentType<UUID>> ROOM_OWNER = ATTACHMENT_TYPES.register("room_owner", () -> AttachmentType
             .builder(() -> Util.NIL_UUID)
-            .serialize(UUIDUtil.CODEC)
-            .build());
-
-    Supplier<AttachmentType<MachineColor>> MACHINE_COLOR = ATTACHMENT_TYPES.register("machine_color", () -> AttachmentType
-            .builder(() -> MachineColor.fromARGB(CommonColors.WHITE))
-            .serialize(MachineColor.CODEC)
+            .serialize(UUIDUtil.CODEC.fieldOf("owner"))
             .build());
 
     Supplier<AttachmentType<RoomUpgradeInstance>> UPGRADE_INSTANCE = ATTACHMENT_TYPES.register("room_upgrade_instance", () -> AttachmentType

core-api/src/main/java/dev/compactmods/machines/api/attachment/IForwardingAttachmentHolder.java

@@ -2,6 +2,7 @@
 
 import net.neoforged.neoforge.attachment.AttachmentType;
 import net.neoforged.neoforge.attachment.IAttachmentHolder;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
@@ -40,4 +41,14 @@ default <T> Optional<T> getExistingData(AttachmentType<T> attachmentType) {
     default <T> @Nullable T removeData(AttachmentType<T> attachmentType) {
         return attachmentHolder().get().removeData(attachmentType);
     }
+
+    @Override
+    default <T> @Nullable T getExistingDataOrNull(Supplier<AttachmentType<T>> type) {
+        return attachmentHolder().get().getExistingDataOrNull(type);
+    }
+
+    @Override
+    default <T> @Nullable T getExistingDataOrNull(@NotNull AttachmentType<T> attachmentType) {
+        return attachmentHolder().get().getExistingDataOrNull(attachmentType);
+    }
 }

core-api/src/main/java/dev/compactmods/machines/api/dimension/CompactDimension.java

@@ -10,6 +10,7 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.saveddata.SavedData;
 import net.minecraft.world.level.storage.DimensionDataStorage;
 import net.minecraft.world.level.storage.LevelResource;
 import net.minecraft.world.level.storage.LevelStorageSource;
@@ -35,21 +36,6 @@ public static ServerLevel forServer(MinecraftServer server) throws MissingDimens
         return level;
     }
 
-    public static Path getDataDirectory(@NotNull MinecraftServer server) {
-        return DimensionType.getStorageFolder(CompactDimension.LEVEL_KEY, server.getWorldPath(LevelResource.ROOT));
-    }
-
-    public static Path getDataDirectory(@NotNull LevelStorageSource.LevelDirectory levelDir) {
-        return DimensionType.getStorageFolder(CompactDimension.LEVEL_KEY, levelDir.path());
-    }
-
-    @NotNull
-    public static DimensionDataStorage getDataStorage(@NotNull LevelStorageSource.LevelDirectory levelDir, HolderLookup.Provider holderLookup) {
-        final var dimPath = DimensionType.getStorageFolder(CompactDimension.LEVEL_KEY, levelDir.path());
-        final var fixer = DataFixers.getDataFixer();
-        return new DimensionDataStorage(dimPath.resolve("data").toFile(), fixer, holderLookup);
-    }
-
     public static boolean isLevelCompact(Level level) {
         return isLevelCompact(level.dimension());
     }

core-api/src/main/java/dev/compactmods/machines/api/machine/MachineColor.java

@@ -5,17 +5,19 @@
 import io.netty.buffer.ByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.util.FastColor;
+import net.minecraft.util.ARGB;
 import net.minecraft.world.item.DyeColor;
 
 import java.util.Locale;
 
 public record MachineColor(int red, int green, int blue) {
 
+    public static final MachineColor DEFAULT = fromDyeColor(DyeColor.WHITE);
+
     public static MachineColor fromARGB(int argb) {
-        var red = FastColor.ARGB32.red(argb);
-        var green = FastColor.ARGB32.green(argb);
-        var blue = FastColor.ARGB32.blue(argb);
+        var red = ARGB.red(argb);
+        var green = ARGB.green(argb);
+        var blue = ARGB.blue(argb);
         return new MachineColor(red, green, blue);
     }
 
@@ -47,7 +49,7 @@ public static MachineColor fromDyeColor(DyeColor color) {
     }
 
     public int rgb() {
-        return FastColor.ARGB32.color(red, green, blue);
+        return ARGB.color(red, green, blue);
     }
 
     private String formatValue() {

core-api/src/main/java/dev/compactmods/machines/api/machine/block/ICompactMachineBlockEntity.java

@@ -1,3 +1,9 @@
 package dev.compactmods.machines.api.machine.block;
 
-public interface ICompactMachineBlockEntity {}
+import dev.compactmods.machines.api.machine.MachineColor;
+
+public interface ICompactMachineBlockEntity {
+    MachineColor getMachineColor();
+
+    void setMachineColor(MachineColor newColor);
+}

core-api/src/main/java/dev/compactmods/machines/api/room/CompactRoomGenerator.java

@@ -45,7 +45,7 @@ public static void generateCompactWall(LevelAccessor world, AABB outerBounds, Di
      * @param outerBounds Outer dimensions of the room.
      */
     public static void generateRoom(LevelAccessor world, AABB outerBounds) {
-        final var block = BuiltInRegistries.BLOCK.get(WallConstants.SOLID_WALL);
+        final var block = BuiltInRegistries.BLOCK.getValue(WallConstants.SOLID_WALL);
         if (block != null) {
             final var solidWall = block.defaultBlockState();
             generateRoom(world, outerBounds, solidWall);

core-api/src/main/java/dev/compactmods/machines/api/room/RoomInstance.java

@@ -14,7 +14,11 @@
 
 import java.util.function.Supplier;
 
-public record RoomInstance(MinecraftServer server, ResourceKey<Level> levelKey, String code, MachineColor defaultMachineColor, IRoomBoundaries boundaries) implements IForwardingAttachmentHolder {
+public record RoomInstance(
+        MinecraftServer server, ResourceKey<Level> levelKey,
+        String code, MachineColor defaultMachineColor,
+        IRoomBoundaries boundaries
+) implements IForwardingAttachmentHolder {
 
     public ServerLevel level() {
         return server.getLevel(levelKey);

core-api/src/main/java/dev/compactmods/machines/api/room/history/RoomEntryPoint.java

@@ -1,6 +1,7 @@
 package dev.compactmods.machines.api.room.history;
 
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.compactmods.machines.api.location.GlobalPosWithRotation;
 import net.minecraft.util.StringRepresentable;
@@ -12,7 +13,7 @@ public record RoomEntryPoint(GlobalPosWithRotation entryLocation, EntryMethod me
     public static final RoomEntryPoint INVALID = new RoomEntryPoint(GlobalPosWithRotation.INVALID, EntryMethod.OTHER);
 
 
-    public static final Codec<RoomEntryPoint> CODEC = RecordCodecBuilder.create(i -> i.group(
+    public static final MapCodec<RoomEntryPoint> CODEC = RecordCodecBuilder.mapCodec(i -> i.group(
             GlobalPosWithRotation.CODEC.fieldOf("entry_location").forGetter(RoomEntryPoint::entryLocation),
             EntryMethod.CODEC.fieldOf("method").forGetter(RoomEntryPoint::method)
     ).apply(i, RoomEntryPoint::new));

core-api/src/main/java/dev/compactmods/machines/api/room/template/RoomTemplate.java

@@ -8,6 +8,7 @@
 import dev.compactmods.machines.api.room.RoomStructureInfo;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.Registry;
+import net.minecraft.core.component.DataComponentGetter;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -84,7 +85,7 @@ public AABB getBoundariesCenteredAt(Vec3 center) {
     public static final String I18N_STRUCTURE_GEN_TOOLTIP = CompactMachines.dotPrefix("rooms.templates.structure_tooltip");
 
     @Override
-    public void addToTooltip(Item.TooltipContext ctx, Consumer<Component> tooltips, TooltipFlag flags) {
+    public void addToTooltip(Item.TooltipContext ctx, Consumer<Component> tooltips, TooltipFlag flags, DataComponentGetter data) {
         final var roomDimensions = internalDimensions();
 
         tooltips.accept(Component.translatableWithFallback(I18N_INTERNAL_ROOM_DIMS, "Internal Size: %s", roomDimensions.toString())

core-api/src/main/java/dev/compactmods/machines/api/room/template/RoomTemplateHelper.java

@@ -22,17 +22,16 @@ public static RoomTemplate getTemplate(RegistryAccess registryAccess, ResourceLo
 	}
 
     public static Stream<RoomTemplate> getTemplates(RegistryAccess registryAccess) {
-        return registryAccess.registryOrThrow(RoomTemplate.REGISTRY_KEY).stream();
+        return registryAccess.lookupOrThrow(RoomTemplate.REGISTRY_KEY).stream();
     }
 
     public static Stream<Holder.Reference<RoomTemplate>> getTemplateHolders(RegistryAccess registryAccess) {
-        return registryAccess.registryOrThrow(RoomTemplate.REGISTRY_KEY)
-                .asLookup()
+        return registryAccess.lookupOrThrow(RoomTemplate.REGISTRY_KEY)
                 .listElements();
     }
 
 	public static Optional<RoomTemplate> getTemplateOptional(RegistryAccess registryAccess, ResourceLocation id) {
-		return registryAccess.registryOrThrow(RoomTemplate.REGISTRY_KEY)
+		return registryAccess.lookupOrThrow(RoomTemplate.REGISTRY_KEY)
 			.getOptional(id);
 	}
 
@@ -41,7 +40,7 @@ public static Holder.Reference<RoomTemplate> getTemplateHolder(LevelReader level
 	}
 
 	public static Holder.Reference<RoomTemplate> getTemplateHolder(RegistryAccess registryAccess, ResourceLocation id) {
-		return registryAccess.registryOrThrow(RoomTemplate.REGISTRY_KEY)
-			.getHolderOrThrow(ResourceKey.create(RoomTemplate.REGISTRY_KEY, id));
+		return registryAccess.lookupOrThrow(RoomTemplate.REGISTRY_KEY)
+                .getOrThrow(ResourceKey.create(RoomTemplate.REGISTRY_KEY, id));
 	}
 }