Commands slight refactor, move OOB config to gamerules

robotgryphon · robotgryphon · commit ba899635d4f1 · 2024-11-22T19:38:55.000-05:00
diff --git a/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java b/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java
@@ -30,7 +30,7 @@ public static String id(String path) {
 		return ResourceLocation.isValidPath(path) ? (MOD_ID + ":" + path) : MOD_ID + ":invalid";
 	}
 
-	public static String langPrefix(String path) {
+	public static String dotPrefix(String path) {
 		return MOD_ID + "." + path;
 	}
 
diff --git a/core-api/src/main/java/dev/compactmods/machines/api/room/template/RoomTemplate.java b/core-api/src/main/java/dev/compactmods/machines/api/room/template/RoomTemplate.java
@@ -7,7 +7,6 @@
 import dev.compactmods.machines.api.room.RoomDimensions;
 import dev.compactmods.machines.api.room.RoomStructureInfo;
 import net.minecraft.ChatFormatting;
-import net.minecraft.Util;
 import net.minecraft.core.Registry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
@@ -81,8 +80,8 @@ public AABB getBoundariesCenteredAt(Vec3 center) {
                 .inflate(1);
     }
 
-    public static final String I18N_INTERNAL_ROOM_DIMS = CompactMachines.langPrefix("rooms.templates.room_dimensions");
-    public static final String I18N_STRUCTURE_GEN_TOOLTIP = CompactMachines.langPrefix("rooms.templates.structure_tooltip");
+    public static final String I18N_INTERNAL_ROOM_DIMS = CompactMachines.dotPrefix("rooms.templates.room_dimensions");
+    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) {
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java b/neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java
@@ -4,6 +4,7 @@
 import dev.compactmods.machines.command.Commands;
 import dev.compactmods.machines.compat.InterModCompat;
 import dev.compactmods.machines.feature.CMFeaturePacks;
+import dev.compactmods.machines.gamerule.CMGameRules;
 import dev.compactmods.machines.server.ServerConfig;
 import dev.compactmods.machines.dimension.Dimension;
 import dev.compactmods.machines.dimension.WorldBorderFixer;
@@ -33,6 +34,7 @@ public CompactMachinesCommon(IEventBus modBus, ModContainer modContainer) {
         registerEvents(modBus);
 
         CMRegistries.setup(modBus);
+        CMGameRules.register();
     }
 
     private static void initConfigs(ModContainer modContainer) {
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/client/CompactMachinesClient.java b/neoforge-main/src/main/java/dev/compactmods/machines/client/CompactMachinesClient.java
@@ -1,6 +1,7 @@
 package dev.compactmods.machines.client;
 
 import dev.compactmods.machines.api.CompactMachines;
+import dev.compactmods.machines.client.command.CMClientCommands;
 import dev.compactmods.machines.client.config.ClientConfig;
 import dev.compactmods.machines.client.creative.CreativeTabs;
 import dev.compactmods.machines.client.machine.MachinesClient;
@@ -10,6 +11,7 @@
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.config.ModConfig;
+import net.neoforged.neoforge.common.NeoForge;
 
 @Mod(value = CompactMachines.MOD_ID, dist = Dist.CLIENT)
 public class CompactMachinesClient {
@@ -25,5 +27,7 @@ public CompactMachinesClient(ModContainer modContainer, IEventBus modBus) {
    public static void registerEvents(IEventBus modBus) {
 	  MachinesClient.registerEvents(modBus);
 	  RoomsClient.registerEvents(modBus);
+
+	  NeoForge.EVENT_BUS.addListener(CMClientCommands::registerClientCommands);
    }
 }
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/client/command/CMClientCommands.java b/neoforge-main/src/main/java/dev/compactmods/machines/client/command/CMClientCommands.java
@@ -0,0 +1,14 @@
+package dev.compactmods.machines.client.command;
+
+import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent;
+
+public class CMClientCommands {
+    public static void registerClientCommands(RegisterClientCommandsEvent evt) {
+        final var dispatcher = evt.getDispatcher();
+
+        if (!FMLEnvironment.production) {
+            ScreenSizesCommand.registerScreenSizesCommands(dispatcher);
+        }
+    }
+}
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/client/command/ScreenSizesCommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/client/command/ScreenSizesCommand.java
@@ -0,0 +1,28 @@
+package dev.compactmods.machines.client.command;
+
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.client.Minecraft;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+
+public class ScreenSizesCommand {
+    public static void registerScreenSizesCommands(CommandDispatcher<CommandSourceStack> dispatcher) {
+        final var squareScreen = Commands.literal("square").executes(ctx -> {
+            final var cl = Minecraft.getInstance();
+            cl.getWindow().setWindowed(1920, 1920);
+            return 0;
+        });
+
+        final var hdScreen = Commands.literal("hd").executes(ctx -> {
+            final var cl = Minecraft.getInstance();
+            cl.getWindow().setWindowed( 1920, 1080);
+            return 0;
+        });
+
+        final var setScreenSizeCmd = Commands.literal("setScreenSize")
+                .then(squareScreen)
+                .then(hdScreen);
+
+        dispatcher.register(setScreenSizeCmd);
+    }
+}
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/CMEjectSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/CMEjectSubcommand.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.command.subcommand;
+package dev.compactmods.machines.command;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/CMGiveMachineSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/CMGiveMachineSubcommand.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.command.subcommand;
+package dev.compactmods.machines.command;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/CMRebindSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/CMRebindSubcommand.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.command.subcommand;
+package dev.compactmods.machines.command;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/CMTeleportSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/CMTeleportSubcommand.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.command.subcommand;
+package dev.compactmods.machines.command;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/CMUnbindSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/CMUnbindSubcommand.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.command.subcommand;
+package dev.compactmods.machines.command;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
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
@@ -2,14 +2,7 @@
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import dev.compactmods.machines.api.CompactMachines;
-import dev.compactmods.machines.command.subcommand.RoomUpgradesSubcommand;
-import dev.compactmods.machines.command.subcommand.CMEjectSubcommand;
-import dev.compactmods.machines.command.subcommand.CMGiveMachineSubcommand;
-import dev.compactmods.machines.command.subcommand.CMRebindSubcommand;
-import dev.compactmods.machines.command.subcommand.CMRoomsSubcommand;
-import dev.compactmods.machines.command.subcommand.CMTeleportSubcommand;
-import dev.compactmods.machines.command.subcommand.CMUnbindSubcommand;
-import dev.compactmods.machines.command.subcommand.SpawnSubcommand;
+import dev.compactmods.machines.command.rooms.CMRoomsSubcommand;
 import net.minecraft.commands.CommandSourceStack;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/RoomUpgradesSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/RoomUpgradesSubcommand.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.command.subcommand;
+package dev.compactmods.machines.command;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/SpawnSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/SpawnSubcommand.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.command.subcommand;
+package dev.compactmods.machines.command;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/rooms/CMFindRoomSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/rooms/CMFindRoomSubcommand.java
@@ -1,13 +1,12 @@
-package dev.compactmods.machines.command.subcommand;
+package dev.compactmods.machines.command.rooms;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dev.compactmods.machines.api.CompactMachines;
-import dev.compactmods.machines.i18n.MachineTranslations;
-import dev.compactmods.machines.i18n.CommandTranslations;
 import dev.compactmods.machines.api.dimension.CompactDimension;
 import dev.compactmods.machines.api.machine.MachineConstants;
+import dev.compactmods.machines.i18n.MachineTranslations;
 import dev.compactmods.machines.i18n.RoomTranslations;
 import dev.compactmods.machines.machine.block.BoundCompactMachineBlockEntity;
 import net.minecraft.commands.CommandSourceStack;
@@ -16,77 +15,39 @@
 import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
 import net.minecraft.commands.arguments.coordinates.ColumnPosArgument;
 import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.stream.LongStream;
-
-public class CMRoomsSubcommand {
-
-    public static LiteralArgumentBuilder<CommandSourceStack> make() {
-        // /cm rooms
-        final LiteralArgumentBuilder<CommandSourceStack> subRoot = LiteralArgumentBuilder.literal("rooms");
-
-        // /cm rooms summary
-        final var summary = Commands.literal("summary")
-                .executes(CMRoomsSubcommand::exec);
-
+public class CMFindRoomSubcommand {
+    static @NotNull LiteralArgumentBuilder<CommandSourceStack> create() {
         // /cm rooms find ...
         final var find = Commands.literal("find");
 
         // /cm rooms find chunk
         find.then(Commands.literal("chunk").then(
                 // /cm rooms find chunk [pos]
                 Commands.argument("chunk", ColumnPosArgument.columnPos())
-                        .executes(CMRoomsSubcommand::fetchByChunkPos)
+                        .executes(CMFindRoomSubcommand::fetchByChunkPos)
         ));
 
         // /cm rooms find connected_to
         find.then(Commands.literal("connected_to").then(
                 // /cm rooms find connected_to [pos]
                 Commands.argument("pos", BlockPosArgument.blockPos())
-                        .executes(CMRoomsSubcommand::fetchByMachineBlock)
+                        .executes(CMFindRoomSubcommand::fetchByMachineBlock)
         ));
 
         // /cm rooms find player
         find.then(Commands.literal("player").then(
                 // /cm rooms find player [@p]
                 Commands.argument("player", EntityArgument.player())
-                        .executes(CMRoomsSubcommand::findByContainingPlayer)
+                        .executes(CMFindRoomSubcommand::findByContainingPlayer)
         ));
 
 //        find.then(Commands.literal("owner").then(
 //                Commands.argument("owner", EntityArgument.player())
 //                        .executes(CMRoomsSubcommand::findByOwner)
 //        ));
-
-        subRoot.then(summary);
-        subRoot.then(find);
-        return subRoot;
-    }
-
-    private static int exec(CommandContext<CommandSourceStack> ctx) {
-        var src = ctx.getSource();
-        var serv = src.getServer();
-
-        final var ls = LongStream.builder();
-
-        // FIXME: Per-dimension machine count
-//        serv.getAllLevels().forEach(sl -> {
-//            final var machineData = DimensionMachineGraph.forDimension(sl);
-//            long numRegistered = machineData.machines().count();
-//
-//            if(numRegistered > 0) {
-//                src.sendSuccess(() -> TranslationUtil.command(CMCommands.MACHINE_REG_DIM, sl.dimension().location().toString(), numRegistered), false);
-//                ls.add(numRegistered);
-//            }
-//        });
-
-//        long grandTotal = ls.build().sum();
-//        src.sendSuccess(() -> Component.translatable(CommandTranslations.IDs.MACHINE_REG_TOTAL, grandTotal).withStyle(ChatFormatting.GOLD), false);
-
-        final var roomCount = CompactMachines.roomApi().registrar().count();
-        src.sendSuccess(() -> Component.translatable(CommandTranslations.IDs.ROOM_COUNT, roomCount), false);
-
-        return 0;
+        return find;
     }
 
     private static int fetchByChunkPos(CommandContext<CommandSourceStack> ctx) {
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/command/rooms/CMRoomsSubcommand.java b/neoforge-main/src/main/java/dev/compactmods/machines/command/rooms/CMRoomsSubcommand.java
@@ -0,0 +1,56 @@
+package dev.compactmods.machines.command.rooms;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import dev.compactmods.machines.api.CompactMachines;
+import dev.compactmods.machines.i18n.CommandTranslations;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.Component;
+
+import java.util.stream.LongStream;
+
+public class CMRoomsSubcommand {
+
+    public static LiteralArgumentBuilder<CommandSourceStack> make() {
+        // /cm rooms
+        final LiteralArgumentBuilder<CommandSourceStack> subRoot = LiteralArgumentBuilder.literal("rooms");
+
+        // TODO: /cm rooms create [size]
+
+        // /cm rooms summary
+        final var summary = Commands.literal("summary")
+                .executes(CMRoomsSubcommand::execRoomSummary);
+
+        subRoot.then(summary);
+        subRoot.then(CMFindRoomSubcommand.create());
+        return subRoot;
+    }
+
+    private static int execRoomSummary(CommandContext<CommandSourceStack> ctx) {
+        var src = ctx.getSource();
+        var serv = src.getServer();
+
+        final var ls = LongStream.builder();
+
+        // FIXME: Per-dimension machine count
+//        serv.getAllLevels().forEach(sl -> {
+//            final var machineData = DimensionMachineGraph.forDimension(sl);
+//            long numRegistered = machineData.machines().count();
+//
+//            if(numRegistered > 0) {
+//                src.sendSuccess(() -> TranslationUtil.command(CMCommands.MACHINE_REG_DIM, sl.dimension().location().toString(), numRegistered), false);
+//                ls.add(numRegistered);
+//            }
+//        });
+
+//        long grandTotal = ls.build().sum();
+//        src.sendSuccess(() -> Component.translatable(CommandTranslations.IDs.MACHINE_REG_TOTAL, grandTotal).withStyle(ChatFormatting.GOLD), false);
+
+        final var roomCount = CompactMachines.roomApi().registrar().count();
+        src.sendSuccess(() -> Component.translatable(CommandTranslations.IDs.ROOM_COUNT, roomCount), false);
+
+        return 0;
+    }
+
+}
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/dimension/VoidAirBlock.java b/neoforge-main/src/main/java/dev/compactmods/machines/dimension/VoidAirBlock.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/gamerule/CMGameRules.java b/neoforge-main/src/main/java/dev/compactmods/machines/gamerule/CMGameRules.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/machine/block/BoundCompactMachineBlock.java b/neoforge-main/src/main/java/dev/compactmods/machines/machine/block/BoundCompactMachineBlock.java
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/server/ServerConfig.java b/neoforge-main/src/main/java/dev/compactmods/machines/server/ServerConfig.java

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static String id(String path) {`
`30`	`30`	`return ResourceLocation.isValidPath(path) ? (MOD_ID + ":" + path) : MOD_ID + ":invalid";`
`31`	`31`	`}`
`32`	`32`
`33`		`- public static String langPrefix(String path) {`
	`33`	`+ public static String dotPrefix(String path) {`
`34`	`34`	`return MOD_ID + "." + path;`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.compactmods.machines.command.subcommand;`
	`1`	`+package dev.compactmods.machines.command;`
`2`	`2`
`3`	`3`	`import com.mojang.brigadier.builder.ArgumentBuilder;`
`4`	`4`	`import com.mojang.brigadier.context.CommandContext;`