Scantool resource list feature (#803)

Author: someaddons

src/main/java/com/ldtteam/structurize/api/ItemStackUtils.java

@@ -7,6 +7,7 @@
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.decoration.ItemFrame;
@@ -21,7 +22,11 @@
 import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.items.wrapper.InvWrapper;
 import org.jetbrains.annotations.Nullable;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.function.Consumer;
 
 /**
@@ -379,4 +384,34 @@ public static boolean compareItemStacksIgnoreStackSize(
         }
         return false;
     }
+
+    /**
+     * Item serializer helper, including air
+     *
+     * @param stack
+     * @param buf
+     */
+    public static void serializeToBuffer(final ItemStack stack, RegistryFriendlyByteBuf buf)
+    {
+        buf.writeBoolean(stack.isEmpty());
+        if (!stack.isEmpty())
+        {
+            ItemStack.STREAM_CODEC.encode(buf, stack);
+        }
+    }
+
+    /**
+     * Item deserializer helper, including air. Must be serialized with the above util
+     *
+     * @param buf
+     */
+    public static ItemStack deserializeFromBuffer(RegistryFriendlyByteBuf buf)
+    {
+        if (!buf.readBoolean())
+        {
+            return ItemStack.STREAM_CODEC.decode(buf);
+        }
+
+        return ItemStack.EMPTY;
+    }
 }

src/main/java/com/ldtteam/structurize/api/ItemStorage.java

@@ -1,5 +1,6 @@
 package com.ldtteam.structurize.api;
 
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 
@@ -39,11 +40,11 @@ public class ItemStorage
      * @param amount            the amount.
      * @param ignoreDamageValue should the damage value be ignored?
      */
-    public ItemStorage(final ItemStack stack, final int amount, final boolean ignoreDamageValue)
+    public ItemStorage(final ItemStack stack, final int amount, final boolean ignoreDamageValue, final boolean shouldIgnoreNBTValue)
     {
         this.stack = stack;
         this.shouldIgnoreDamageValue = ignoreDamageValue;
-        this.shouldIgnoreNBTValue = ignoreDamageValue;
+        this.shouldIgnoreNBTValue = shouldIgnoreNBTValue;
         this.amount = amount;
     }
 
@@ -88,6 +89,19 @@ public ItemStorage(final ItemStack stack)
         this.amount = ItemStackUtils.getSize(stack);
     }
 
+    /**
+     * Reads an itemstorage from a buffer
+     *
+     * @param buf
+     */
+    public ItemStorage(final RegistryFriendlyByteBuf buf)
+    {
+        this.stack = ItemStackUtils.deserializeFromBuffer(buf);
+        this.shouldIgnoreDamageValue = buf.readBoolean();
+        this.shouldIgnoreNBTValue = buf.readBoolean();
+        this.amount = buf.readInt();
+    }
+
     /**
      * Check a list for an ItemStack matching a predicate.
      *
@@ -147,6 +161,16 @@ public boolean ignoreDamageValue()
         return shouldIgnoreDamageValue;
     }
 
+    /**
+     * Getter for the should ignore nbt.
+     *
+     * @return true if should ignore.
+     */
+    public boolean ignoreNBTValue()
+    {
+        return shouldIgnoreNBTValue;
+    }
+
     @Override
     public int hashCode()
     {
@@ -191,6 +215,19 @@ public int getDamageValue()
         return stack.getDamageValue();
     }
 
+    /**
+     * Serialize itemstorage to buffer
+     *
+     * @param buf
+     */
+    public void serialize(final RegistryFriendlyByteBuf buf)
+    {
+        ItemStackUtils.serializeToBuffer(getItemStack(), buf);
+        buf.writeBoolean(ignoreDamageValue());
+        buf.writeBoolean(ignoreNBTValue());
+        buf.writeInt(getAmount());
+    }
+
     /**
      * Adder for the quantity.
      *

src/main/java/com/ldtteam/structurize/api/constants/WindowConstants.java

@@ -319,6 +319,21 @@ public final class WindowConstants
 
     public static final String BUTTON_CONTENTS = "contents";
 
+    /**
+     * Display visible blocks checkbox
+     */
+    public static final String VISIBLE_CHECKBOX = "showvisisble";
+
+    /**
+     * Display hidden blocks checkbox
+     */
+    public static final String HIDDEN_CHECKBOX = "showhidden";
+
+    /**
+     * Shows the block in the world button
+     */
+    public static final String BUTTON_SHOWBLOCK = "showBlock";
+
     /**
      * public constructor to hide implicit public one.
      */

src/main/java/com/ldtteam/structurize/client/gui/AbstractBlueprintManipulationWindow.java

@@ -7,7 +7,6 @@
 import com.ldtteam.blockui.controls.Image;
 import com.ldtteam.blockui.controls.Text;
 import com.ldtteam.blockui.controls.TextFieldVanilla;
-import com.ldtteam.blockui.controls.TextField.Filter;
 import com.ldtteam.blockui.views.BOWindow;
 import com.ldtteam.blockui.views.ScrollingList;
 import com.ldtteam.structurize.Structurize;
@@ -26,7 +25,7 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.*;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.Mirror;
@@ -37,11 +36,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.ldtteam.structurize.api.constants.Constants.*;
 import static com.ldtteam.structurize.api.constants.GUIConstants.*;
 import static com.ldtteam.structurize.api.constants.WindowConstants.*;
+import static com.ldtteam.structurize.client.gui.util.InputFilters.ONLY_NUMBERS;
 
 /**
  * BuildTool window.
@@ -379,20 +380,7 @@ else if (setting.get() instanceof Number)
                 buttonImage.off();
                 inputField.on();
                 inputField.setText(typedSetting.get().toString());
-                inputField.setFilter(new Filter()
-                {
-                    @Override
-                    public String filter(final String s)
-                    {
-                        return s;
-                    }
-
-                    @Override
-                    public boolean isAllowedCharacter(final char c)
-                    {
-                        return Character.isDigit(c) || c == '-' || c == '.';
-                    }
-                });
+                inputField.setFilter(ONLY_NUMBERS);
                 inputField.setHandler(a -> {
                     if (inputField.getText().isBlank())
                     {

src/main/java/com/ldtteam/structurize/client/gui/AbstractWindowSkeleton.java

@@ -1,6 +1,7 @@
 package com.ldtteam.structurize.client.gui;
 
-import com.ldtteam.blockui.controls.*;
+import com.ldtteam.blockui.controls.Button;
+import com.ldtteam.blockui.controls.ButtonHandler;
 import com.ldtteam.blockui.views.BOWindow;
 import com.ldtteam.structurize.api.Log;
 import net.minecraft.resources.ResourceLocation;
@@ -26,6 +27,17 @@ public AbstractWindowSkeleton(final String resource)
         buttons = new HashMap<>();
     }
 
+    /**
+     * Constructor for the skeleton class of the windows.
+     *
+     * @param resource Resource location
+     */
+    public AbstractWindowSkeleton(final ResourceLocation resource)
+    {
+        super(resource);
+        buttons = new HashMap<>();
+    }
+
     /**
      * Register a button on the window.
      *

src/main/java/com/ldtteam/structurize/client/gui/WindowBlockGetterContents.java

@@ -21,12 +21,8 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.Nullable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 
 /**
  * Computes as exact as possible contents of given AABB. This should be used as base for item related analysis
@@ -117,7 +113,7 @@ private void addAmountToMap(final Map<Item, ItemStorage> itemSet, @Nullable fina
     {
         if (blockAsItem != null)
         {
-            itemSet.computeIfAbsent(blockAsItem.getItem(), i -> new ItemStorage(blockAsItem.copyWithCount(1), 0, true))
+            itemSet.computeIfAbsent(blockAsItem.getItem(), i -> new ItemStorage(blockAsItem.copyWithCount(1), 0, true, true))
                 .addAmount(Math.max(1, blockAsItem.getCount()));
         }
     }