Add field informational commands, <ref> and <center>

Author: robotgryphon

src/main/java/dev/compactmods/crafting/command/CraftingCommandRoot.java

@@ -28,9 +28,9 @@ public static void onCommandsRegister(final RegisterCommandsEvent event) {
 
     private static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
         final LiteralArgumentBuilder<CommandSourceStack> root = LiteralArgumentBuilder.literal(CompactCrafting.MOD_ID);
-//        root.then(Commands.literal("test")
-//                .requires(cs -> cs.hasPermission(2))
-//                .executes(CraftingCommandRoot::test));
+
+        root.then(FieldInfoCommand.create());
+
         dispatcher.register(root);
     }
 

src/main/java/dev/compactmods/crafting/command/FieldInfoCommand.java

@@ -4,45 +4,75 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dev.compactmods.crafting.CompactCrafting;
-import dev.compactmods.crafting.projector.FieldProjectorBlock;
-import dev.compactmods.crafting.projector.FieldProjectorEntity;
+import dev.compactmods.crafting.api.field.IMiniaturizationField;
+import dev.compactmods.crafting.core.CCCapabilities;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.entity.BlockEntity;
 
-public class ProjectorInfoCommand {
+public class FieldInfoCommand {
     public static ArgumentBuilder<CommandSourceStack, ?> create() {
 
-        var fieldInfo = Commands.literal("fieldinfo");
-        fieldInfo.then(Commands.argument("block", BlockPosArgument.blockPos())
-                .executes(ProjectorInfoCommand::exe));
+        var field = Commands.literal("field");
 
-        return fieldInfo;
+        field.then(Commands.literal("ref")
+                .then(Commands.argument("block", BlockPosArgument.blockPos())
+                        .executes(FieldInfoCommand::byReference)));
+
+        field.then(Commands.literal("center")
+                .then(Commands.argument("center", BlockPosArgument.blockPos())
+                        .executes(FieldInfoCommand::byCenter)));
+
+        return field;
+    }
+
+    private static int byCenter(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
+        final BlockPos pos = BlockPosArgument.getLoadedBlockPos(ctx, "center");
+        final CommandSourceStack src = ctx.getSource();
+        final ServerLevel level = src.getLevel();
+
+        level.getCapability(CCCapabilities.FIELDS).ifPresent(fields -> {
+            if (!fields.hasActiveField(pos)) {
+                src.sendFailure(new TranslatableComponent("messages." + CompactCrafting.MOD_ID + ".no_field_found", pos));
+                return;
+            }
+
+            fields.get(pos).ifPresent(field -> outputStdFieldInfo(src, field));
+        });
+
+        return 0;
     }
 
-    private static int exe(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
+    private static int byReference(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
         final BlockPos pos = BlockPosArgument.getLoadedBlockPos(ctx, "block");
         final CommandSourceStack src = ctx.getSource();
         final ServerLevel level = src.getLevel();
 
-        if (level.getBlockState(pos).getBlock() instanceof FieldProjectorBlock fpb) {
-            if (level.getBlockEntity(pos) instanceof FieldProjectorEntity proj) {
-                proj.getField().ifPresent(field -> {
-                    src.sendSuccess(new TextComponent("Center: " + field.getCenter().toString()), false);
-                    src.sendSuccess(new TextComponent("Size: " + field.getFieldSize().getName()), false);
-                    field.getCurrentRecipe().ifPresent(rec -> {
-                        src.sendSuccess(new TextComponent("Recipe: " + rec.getRecipeIdentifier()), false);
-                    });
-                });
+        if (level.getBlockState(pos).hasBlockEntity()) {
+            final BlockEntity ent = level.getBlockEntity(pos);
+            if (ent == null) {
+                src.sendFailure(new TranslatableComponent("messages." + CompactCrafting.MOD_ID + ".no_field_cap", pos));
+                return 0;
             }
+
+            ent.getCapability(CCCapabilities.MINIATURIZATION_FIELD).ifPresent(field -> outputStdFieldInfo(src, field));
         } else {
-            src.sendFailure(new TranslatableComponent("messages." + CompactCrafting.MOD_ID + ".not_a_projector", pos));
+            src.sendFailure(new TranslatableComponent("messages." + CompactCrafting.MOD_ID + ".no_field_cap", pos));
         }
 
         return 0;
     }
+
+    private static void outputStdFieldInfo(CommandSourceStack src, IMiniaturizationField field) {
+        src.sendSuccess(new TextComponent("Center: " + field.getCenter().toString()), false);
+        src.sendSuccess(new TextComponent("Size: " + field.getFieldSize().getName()), false);
+        field.getCurrentRecipe().ifPresent(rec -> {
+            src.sendSuccess(new TextComponent("Recipe: " + rec.getRecipeIdentifier()), false);
+        });
+    }
 }

src/main/resources/assets/compactcrafting/lang/en_us.json

@@ -19,5 +19,8 @@
   "tooltip.compactcrafting.proxy_bound": "Bound to: %s",
   "tooltip.compactcrafting.proxy_hint": "Use proxies for field automation with redstone.",
   "tooltip.compactcrafting.proxy_bind_hint": "Shift-use on a projector to bind to a field.",
-  "tooltip.compactcrafting.proxy_unbind_hint": "Shift-use in the air to unbind from field."
+  "tooltip.compactcrafting.proxy_unbind_hint": "Shift-use in the air to unbind from field.",
+
+  "messages.compactcrafting.no_field_cap": "The block at %s does not have a field reference.",
+  "messages.compactcrafting.no_field_found": "The miniaturization field info could not be found."
 }