Add basic room templates command and warning message, saving closables

Author: robotgryphon

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);

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
 

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"

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"

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"
-

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")
     }
 }
 

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);

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);
     }

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;
+    }
+}

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 {
+
+    }
+}