0.8.15

Author: burningtnt

gradle.properties

@@ -34,7 +34,7 @@ mod_name=Area Control
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=BSD-3-Clause
 # The mod version. See https://semver.org/
-mod_version=0.8.14
+mod_version=0.8.15
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/org/teacon/areacontrol/AreaControlCommand.java

@@ -33,6 +33,7 @@
 import org.teacon.areacontrol.impl.command.arguments.AreaPropertyArgument;
 import org.teacon.areacontrol.impl.command.arguments.DirectionArgument;
 import org.teacon.areacontrol.impl.command.arguments.GroupArgument;
+import org.teacon.areacontrol.impl.seizer.AreaControlBorderControl;
 import org.teacon.areacontrol.impl.seizer.ConfiscationInvMenuProvider;
 import org.teacon.areacontrol.mixin.CommandSourceStackAccessor;
 import org.teacon.areacontrol.network.ACNetworking;
@@ -162,12 +163,21 @@ public AreaControlCommand(CommandDispatcher<CommandSourceStack> dispatcher) {
                                 .then(Commands.literal("mark").requires(OWNER_OR_ADMIN).then(
                                         Commands.argument("pos", Vec3Argument.vec3()).executes(AreaControlCommand::mark)))
                                 .then(Commands.literal("unclaim").requires(OWNER_OR_ADMIN).executes(AreaControlCommand::unclaim))
-                                .then(Commands.literal("safe").executes(AreaControlCommand::openConfiscatedItemInv))
+                                .then(Commands.literal("safe")
+                                        .then(Commands.literal("clear").executes(AreaControlCommand::clearConfiscatedItemInv)
+                                        )
+                                        .executes(AreaControlCommand::openConfiscatedItemInv))
                         )
                 )
         );
     }
 
+    private static int clearConfiscatedItemInv(CommandContext<CommandSourceStack> context) throws CommandSyntaxException{
+        var player = context.getSource().getPlayerOrException();
+        player.getData(AreaControlBorderControl.CONFISCATION_INV.get()).clear();
+        return Command.SINGLE_SUCCESS;
+    }
+
     private static int openConfiscatedItemInv(CommandContext<CommandSourceStack> context) throws CommandSyntaxException{
         var player = context.getSource().getPlayerOrException();
         player.openMenu(new ConfiscationInvMenuProvider());

src/main/java/org/teacon/areacontrol/impl/seizer/ConfiscationInv.java

@@ -11,6 +11,7 @@
 import net.neoforged.neoforge.common.util.INBTSerializable;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Collections;
 import java.util.Optional;
 
 public class ConfiscationInv implements INBTSerializable<CompoundTag> {
@@ -61,6 +62,10 @@ public void add(ItemStack seized) {
         }
     }
 
+    public void clear() {
+        Collections.fill(this.seizedItems, ItemStack.EMPTY);
+    }
+
     final class ContainerWrapper implements Container {
 
         @Override