Fix active field fields persistence

Author: robotgryphon

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

@@ -0,0 +1,48 @@
+package dev.compactmods.crafting.command;
+
+import com.mojang.brigadier.builder.ArgumentBuilder;
+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 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;
+
+public class ProjectorInfoCommand {
+    public static ArgumentBuilder<CommandSourceStack, ?> create() {
+
+        var fieldInfo = Commands.literal("fieldinfo");
+        fieldInfo.then(Commands.argument("block", BlockPosArgument.blockPos())
+                .executes(ProjectorInfoCommand::exe));
+
+        return fieldInfo;
+    }
+
+    private static int exe(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);
+                    });
+                });
+            }
+        } else {
+            src.sendFailure(new TranslatableComponent("messages." + CompactCrafting.MOD_ID + ".not_a_projector", pos));
+        }
+
+        return 0;
+    }
+}

src/main/java/dev/compactmods/crafting/field/events/ActiveWorldFieldsAttacher.java

@@ -1,17 +1,9 @@
 package dev.compactmods.crafting.field.events;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import dev.compactmods.crafting.CompactCrafting;
-import dev.compactmods.crafting.api.field.IActiveWorldFields;
-import dev.compactmods.crafting.core.CCCapabilities;
 import dev.compactmods.crafting.field.ActiveWorldFields;
-import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.ICapabilityProvider;
-import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -24,21 +16,10 @@ public static void onCapWorldAttach(final AttachCapabilitiesEvent<Level> event)
         Level level = event.getObject();
 
         ActiveWorldFields inst = new ActiveWorldFields(level);
+        final LevelFieldsProvider provider = new LevelFieldsProvider(inst);
 
-        LazyOptional<ActiveWorldFields> opt = LazyOptional.of(() -> inst);
-        final Capability<IActiveWorldFields> capInstance = CCCapabilities.FIELDS;
+        event.addCapability(new ResourceLocation(CompactCrafting.MOD_ID, "fields"), provider);
 
-        event.addCapability(new ResourceLocation(CompactCrafting.MOD_ID, "world_fields"), new ICapabilityProvider() {
-            @Nonnull
-            @Override
-            public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-                if(capInstance == cap)
-                    return opt.cast();
-
-                return LazyOptional.empty();
-            }
-        });
-
-        event.addListener(opt::invalidate);
+        event.addListener(provider::invalidate);
     }
 }

src/main/java/dev/compactmods/crafting/field/events/LevelFieldsProvider.java

@@ -0,0 +1,45 @@
+package dev.compactmods.crafting.field.events;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import dev.compactmods.crafting.api.field.IActiveWorldFields;
+import dev.compactmods.crafting.core.CCCapabilities;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.ListTag;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ICapabilitySerializable;
+import net.minecraftforge.common.util.INBTSerializable;
+import net.minecraftforge.common.util.LazyOptional;
+
+class LevelFieldsProvider implements ICapabilitySerializable<ListTag> {
+
+    private final LazyOptional<IActiveWorldFields> inst;
+
+    LevelFieldsProvider(IActiveWorldFields inst) {
+        this.inst = LazyOptional.of(() -> inst);
+    }
+
+    @Nonnull
+    @Override
+    public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+
+        if (cap == CCCapabilities.FIELDS)
+            return inst.cast();
+
+        return LazyOptional.empty();
+    }
+
+    @Override
+    public ListTag serializeNBT() {
+        return inst.map(INBTSerializable::serializeNBT).orElse(new ListTag());
+    }
+
+    @Override
+    public void deserializeNBT(ListTag nbt) {
+        inst.ifPresent(i -> i.deserializeNBT(nbt));
+    }
+
+    public void invalidate() {
+        inst.invalidate();
+    }
+}