Add basic room templates command and warning message, saving closables

robotgryphon · robotgryphon · commit a4d95b232757 · 2025-09-03T23:24:42.000-04:00
diff --git a/core-api/src/main/java/dev/compactmods/machines/api/room/template/RoomTemplateHelper.java b/core-api/src/main/java/dev/compactmods/machines/api/room/template/RoomTemplateHelper.java
@@ -7,6 +7,7 @@
 import net.minecraft.world.level.LevelReader;
 
 import java.util.Optional;
+import java.util.stream.Stream;
 
 public class RoomTemplateHelper {
 
@@ -20,6 +21,10 @@ public static RoomTemplate getTemplate(RegistryAccess registryAccess, ResourceLo
 			.orElse(RoomTemplate.INVALID_TEMPLATE);
 	}
 
+    public static Stream<RoomTemplate> getTemplates(RegistryAccess registryAccess) {
+        return registryAccess.registryOrThrow(RoomTemplate.REGISTRY_KEY).stream();
+    }
+
 	public static Optional<RoomTemplate> getTemplateOptional(RegistryAccess registryAccess, ResourceLocation id) {
 		return registryAccess.registryOrThrow(RoomTemplate.REGISTRY_KEY)
 			.getOptional(id);
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,6 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=true
 #org.gradle.parallel=true
 org.gradle.configuration-cache=true
-
 neogradle.subsystems.parchment.minecraftVersion=1.21
 neogradle.subsystems.parchment.mappingsVersion=2024.07.28
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,9 @@
 [versions]
 jnanoid = "[2.0.0, 3)"
-parchmentMC = "1.21"
-parchment = "2024.07.28"
+
+# Get versions from https://parchmentmc.org/docs/getting-started
+parchmentMC = "1.21.1"
+parchment = "2024.11.17"
 
 [libraries.jnanoid]
 module = "com.aventrix.jnanoid:jnanoid"
diff --git a/gradle/mods.versions.toml b/gradle/mods.versions.toml
@@ -21,7 +21,7 @@ jei = ["jeiCommon", "jeiNeo"]
 # Kube JS
 [libraries.kubeJS]
 module = "dev.latvian.mods:kubejs-neoforge"
-version = "2101.7.1-build.181"
+version = "2101.7.2-build.247"
 
 [libraries.rhino]
 module = "dev.latvian.mods:rhino"
diff --git a/gradle/neoforged.versions.toml b/gradle/neoforged.versions.toml
@@ -1,7 +1,8 @@
 [versions]
-neoforge = "21.1.122"
+neoforge = "21.1.206"
 mdg = "2.0.78"
-neoforgeRange = { require = "[21.1.122,)", prefer = "21.1.122" }
+neoforgeRange = { require = "[21.1.206,)", prefer = "21.1.206" }
+neoform = "1.21-20240613.152323"
 
 [libraries.testframework]
 module = "net.neoforged:testframework"
@@ -10,4 +11,3 @@ version.ref = "neoforge"
 [plugins.moddev]
 id = "net.neoforged.moddev"
 version.ref = "mdg"
-
diff --git a/neoforge-main/build.gradle.kts b/neoforge-main/build.gradle.kts
@@ -96,7 +96,7 @@ neoForge {
             additional.dependencies.add(compactmods.feather.get())
             additional.dependencies.add(libs.jnanoid.get())
         }
-
+        
         create("client") {
             client()
             gameDirectory.set(file("runs/client"))
@@ -265,19 +265,15 @@ tasks.withType<Jar> {
         val now = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date())
         attributes(
             mapOf(
-                "Specification-Title" to "Compact Machines",
-                "Specification-Vendor" to "CompactMods",
-                "Specification-Version" to "2",
-                "Implementation-Title" to "Compact Machines",
                 "Implementation-Version" to archiveVersion,
-                "Implementation-Vendor" to "CompactMods",
                 "Implementation-Timestamp" to now,
                 "Minecraft-Version" to mojang.versions.minecraft.get(),
                 "NeoForge-Version" to neoforged.versions.neoforge.get(),
-                "Main-Commit" to gitVersion,
-                "MixinConfigs" to "compactmachines.mixins.json"
+                "Main-Commit" to gitVersion.trimEnd()
             )
         )
+
+        from("src/main/resources/META-INF/MANIFEST.MF")
     }
 }
 
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java b/neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java
@@ -17,6 +17,7 @@
 import dev.compactmods.machines.room.capability.BasicRoomCapabilities;
 import dev.compactmods.machines.room.upgrade.RoomUpgradeEventHandlers;
 import dev.compactmods.machines.room.upgrade.RoomUpgrades;
+import dev.compactmods.machines.server.event.RoomTemplatesCheckEventHandler;
 import dev.compactmods.machines.shrinking.Shrinking;
 import dev.compactmods.machines.villager.Villagers;
 import net.minecraft.util.FastColor;
@@ -52,7 +53,7 @@ private static void prepare() {
         RoomUpgrades.prepare();
         Dimension.prepare();
         Commands.prepare();
-        Villagers.prepare();
+//        Villagers.prepare();
 
         CMDataComponents.prepare();
         CMDataAttachments.prepare();
@@ -64,6 +65,8 @@ private static void registerEvents(IEventBus modBus) {
         WorldBorderFixer.registerEvents();
         PlayerEventHandler.registerEvents();
 
+        RoomTemplatesCheckEventHandler.registerEvents();
+
         modBus.addListener(CompactMachinesCommon::commonSetup);
         modBus.addListener(CMFeaturePacks::addFeaturePacks);
         modBus.addListener(CMNetworks::onPacketRegistration);
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/Commands.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/Commands.java
@@ -31,6 +31,7 @@ public static void onCommandsRegister(final RegisterCommandsEvent event) {
         Commands.CM_COMMAND_ROOT.then(CMGiveMachineSubcommand.make());
         Commands.CM_COMMAND_ROOT.then(SpawnSubcommand.make());
         Commands.CM_COMMAND_ROOT.then(RoomUpgradesSubcommand.make());
+        Commands.CM_COMMAND_ROOT.then(EnableBasicTemplatesSubcommand.make());
 
         event.getDispatcher().register(Commands.CM_COMMAND_ROOT);
     }
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/EnableBasicTemplatesSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/EnableBasicTemplatesSubcommand.java
@@ -0,0 +1,46 @@
+package dev.compactmods.machines.command;
+
+import com.google.common.collect.Lists;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import dev.compactmods.machines.api.CompactMachines;
+import dev.compactmods.machines.api.room.template.RoomTemplateHelper;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.commands.ReloadCommand;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackRepository;
+
+import java.util.List;
+
+public class EnableBasicTemplatesSubcommand {
+
+    final static String PACK_ID = "mod/compactmachines:data/compactmachines/datapacks/basic_templates";
+
+    public static LiteralArgumentBuilder<CommandSourceStack> make() {
+        return Commands.literal("enable_basic_templates")
+                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS) &&
+                        RoomTemplateHelper.getTemplates(cs.registryAccess()).findAny().isEmpty())
+                .executes(EnableBasicTemplatesSubcommand::exec);
+    }
+
+    private static int exec(CommandContext<CommandSourceStack> ctx) {
+        PackRepository packrepository = ctx.getSource().getServer().getPackRepository();
+
+        List<Pack> list = Lists.newArrayList(packrepository.getSelectedPacks());
+        if(!packrepository.getSelectedIds().contains(PACK_ID)) {
+            final var pack = packrepository.getPack(PACK_ID);
+            if (pack != null) {
+                pack.getDefaultPosition().insert(list, pack, Pack::selectionConfig, false);
+                ReloadCommand.reloadPacks(list.stream().map(Pack::getId).toList(), ctx.getSource());
+
+                ctx.getSource().sendSuccess(() -> Component.literal("Enabled basic templates, restart game to sync changes."), false);
+            }
+        } else {
+            ctx.getSource().sendFailure(Component.literal("Already enabled, restart game to sync changes."));
+        }
+
+        return 0;
+    }
+}
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/data/CloseableAttachmentHolder.java b/neoforge-main/src/main/java/dev/compactmods/machines/data/CloseableAttachmentHolder.java
@@ -0,0 +1,10 @@
+package dev.compactmods.machines.data;
+
+import net.neoforged.neoforge.attachment.IAttachmentHolder;
+
+public record CloseableAttachmentHolder(IAttachmentHolder holder) implements AutoCloseable {
+    @Override
+    public void close() throws Exception {
+
+    }
+}
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/CMRoomRegistrar.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/CMRoomRegistrar.java
@@ -20,7 +20,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-public class CMRoomRegistrar implements IRoomRegistrar {
+public class CMRoomRegistrar implements IRoomRegistrar, AutoCloseable {
 
     private final MinecraftServer server;
     private final CMSingletonDataFileManager<RoomRegistrarData> ROOM_REGISTRAR_DATA;
@@ -112,4 +112,9 @@ private RoomInstance getOrMakeRoomInstance(RoomRegistrationNode regNode) {
         instanceCache.put(regNode.code(), inst);
         return inst;
     }
+
+    @Override
+    public void close() throws Exception {
+        save();
+    }
 }
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/attachment/RoomDataAttachments.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/attachment/RoomDataAttachments.java
@@ -16,10 +16,15 @@
 import java.nio.file.Path;
 import java.util.function.Function;
 
-public class RoomDataAttachments extends AttachmentBasedDataFile<RoomDataAttachments, RoomDataAttachments.AdditionalData> {
+public class RoomDataAttachments extends AttachmentBasedDataFile<RoomDataAttachments, RoomDataAttachments.AdditionalData> implements AutoCloseable {
 
     private final String roomCode;
 
+    @Override
+    public void close() throws Exception {
+        // save
+    }
+
     public record AdditionalData(String roomCode) {
         public static final MapCodec<AdditionalData> CODEC = RecordCodecBuilder.mapCodec(i -> i.group(
                 Codec.STRING.fieldOf("room_code").forGetter(x -> x.roomCode)
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/room/upgrade/RoomUpgradeEventHandlers.java b/neoforge-main/src/main/java/dev/compactmods/machines/room/upgrade/RoomUpgradeEventHandlers.java
@@ -43,7 +43,7 @@ public static void collectUpgradeEvents() {
                 .get()
                 .forEach(upgradeType -> {
                     var inst = upgradeType.constructor().get();
-                    if(inst instanceof NeoForgeEventListener listener) {
+                    if (inst instanceof NeoForgeEventListener listener) {
                         var eventTypes = listener.gatherNeoEvents()
                                 .map(NeoForgeEventHandler::eventType)
                                 .distinct()
@@ -63,8 +63,8 @@ private static void doRoomUpgradeLoop(BiConsumer<RoomInstance, RoomUpgradeInvent
                     .collect(Collectors.toUnmodifiableSet());
 
             for (var room : registeredRooms) {
-                CompactMachines.existingRoomData(room.code())
-                        .flatMap(rd -> rd.getExistingData(CMDataAttachments.UPGRADE_ITEMS))
+                room.getCapability(RoomCapabilities.ROOM_DATA_ATTACHMENTS)
+                        .getExistingData(CMDataAttachments.UPGRADE_ITEMS)
                         .ifPresent(i -> forEach.accept(room, i));
             }
         }
@@ -113,7 +113,7 @@ private static <Evt extends RoomUpgradeComponentEvent> void handleBasicEvent(Roo
                 .collect(Collectors.toUnmodifiableSet());
 
         final var upgradeAccessor = room.getCapability(RoomCapabilities.UPGRADES);
-        if(upgradeAccessor != null) {
+        if (upgradeAccessor != null) {
             for (final var upgradeId : upgradeInstances) {
                 final var instance = upgradeAccessor.getOrCreateInstance(upgradeId);
                 if (instance.upgradeItem().isEmpty()) {
@@ -141,7 +141,7 @@ public static void onTooltips(ItemTooltipEvent evt) {
 
         ItemStack stack = evt.getItemStack();
 
-        if(stack.has(CMDataComponents.UPGRADE_INSTANCE_ID)) {
+        if (stack.has(CMDataComponents.UPGRADE_INSTANCE_ID)) {
             var id = stack.get(CMDataComponents.UPGRADE_INSTANCE_ID);
             tooltips.accept(Component.literal("ID: " + id).withColor(CommonColors.GRAY));
         }
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/server/CompactMachinesServer.java b/neoforge-main/src/main/java/dev/compactmods/machines/server/CompactMachinesServer.java
@@ -4,6 +4,7 @@
 import dev.compactmods.machines.api.data.Saveable;
 import dev.compactmods.machines.api.dimension.CompactDimension;
 import dev.compactmods.machines.room.upgrade.RoomUpgradeHelper;
+import dev.compactmods.machines.server.event.RoomTemplatesCheckEventHandler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.Level;
 import net.neoforged.api.distmarker.Dist;
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/server/event/RoomTemplatesCheckEventHandler.java b/neoforge-main/src/main/java/dev/compactmods/machines/server/event/RoomTemplatesCheckEventHandler.java
@@ -0,0 +1,62 @@
+package dev.compactmods.machines.server.event;
+
+import dev.compactmods.machines.api.CompactMachines;
+import dev.compactmods.machines.api.room.template.RoomTemplate;
+import dev.compactmods.machines.api.room.template.RoomTemplateHelper;
+import dev.compactmods.machines.player.PlayerEventHandler;
+import dev.compactmods.machines.room.Rooms;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.CommonColors;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.PlayerEvent;
+import net.neoforged.neoforge.event.level.LevelEvent;
+import net.neoforged.neoforge.event.server.ServerStartedEvent;
+
+public class RoomTemplatesCheckEventHandler {
+
+    public static void onAdminJoinedLevel(final PlayerEvent.PlayerLoggedInEvent event) {
+        final var player = event.getEntity();
+        if (!(player instanceof ServerPlayer serverPlayer))
+            return;
+
+        final var serv = serverPlayer.getServer();
+        if (serv == null)
+            return;
+
+        final var isOp = serv.getPlayerList()
+                .isOp(serverPlayer.getGameProfile());
+
+        if(!isOp) return;
+
+        final var numTemplates = RoomTemplateHelper.getTemplates(serv.registryAccess())
+                .count();
+
+        if(numTemplates == 0 && isOp)
+        {
+            final var displayName = Component.translatableWithFallback("compactmachines.display_name", "Compact Machines");
+
+            final var action = Component.translatableWithFallback("compactmachines.warning.no_templates.action", "[click here]")
+                    .withStyle(s -> s.withColor(CommonColors.SOFT_YELLOW)
+                            .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/compactmachines enable_basic_templates"))
+                            .withUnderlined(true));
+
+            final var warning = Component.translatableWithFallback("compactmachines.warning.no_templates_registered", "No Room Templates are registered! " +
+                    "If you believe this is a mistake, %s to enable the built-in templates and hide this message.", action)
+                    .withColor(CommonColors.SOFT_RED);
+
+            final var message = Component.literal("[").append(displayName).append("] ")
+                    .append(warning)
+                    .append(CommonComponents.NEW_LINE);
+
+            serverPlayer.sendSystemMessage(message);
+        }
+    }
+
+    public static void registerEvents() {
+        NeoForge.EVENT_BUS.addListener(RoomTemplatesCheckEventHandler::onAdminJoinedLevel);
+    }
+}
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/server/service/CMServerRoomUpgradeDataAccessor.java b/neoforge-main/src/main/java/dev/compactmods/machines/server/service/CMServerRoomUpgradeDataAccessor.java
@@ -10,7 +10,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-public class CMServerRoomUpgradeDataAccessor implements IRoomUpgradeDataAttachmentAccessor {
+public class CMServerRoomUpgradeDataAccessor implements IRoomUpgradeDataAttachmentAccessor, AutoCloseable {
     private final CMKeyedDataFileManager<RoomUpgradeInstanceKey, RoomUpgradeDataAttachments> DATA_ATTACHMENTS;
 
     public CMServerRoomUpgradeDataAccessor() {
@@ -36,4 +36,9 @@ public IAttachmentHolder getOrCreate(String roomCode, UUID instanceId) {
     public void save() {
         DATA_ATTACHMENTS.save();
     }
+
+    @Override
+    public void close() {
+        save();
+    }
 }
diff --git a/neoforge-main/src/main/resources/META-INF/MANIFEST.MF b/neoforge-main/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Specification-Title: Compact Machines
+Specification-Vendor: CompactMods
+Specification-Version: 2
+Implementation-Title: Compact Machines
+Implementation-Vendor: CompactMods
+MixinConfigs: compactmachines.mixins.json
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -41,4 +41,4 @@ fun addVersionCatalog(dependencyResolutionManagement: DependencyResolutionManage
     dependencyResolutionManagement.versionCatalogs.create(name) {
         from(files("./gradle/$name.versions.toml"))
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public static void onCommandsRegister(final RegisterCommandsEvent event) {`
`31`	`31`	`Commands.CM_COMMAND_ROOT.then(CMGiveMachineSubcommand.make());`
`32`	`32`	`Commands.CM_COMMAND_ROOT.then(SpawnSubcommand.make());`
`33`	`33`	`Commands.CM_COMMAND_ROOT.then(RoomUpgradesSubcommand.make());`
	`34`	`+ Commands.CM_COMMAND_ROOT.then(EnableBasicTemplatesSubcommand.make());`
`34`	`35`
`35`	`36`	`event.getDispatcher().register(Commands.CM_COMMAND_ROOT);`
`36`	`37`	`}`