PR comments

Author: LordIdra

src/main/java/io/github/pylonmc/pylon/base/items/fluid/gui/FluidSelector.java

@@ -3,6 +3,7 @@
 
 import io.github.pylonmc.pylon.core.fluid.PylonFluid;
 import io.github.pylonmc.pylon.core.registry.PylonRegistry;
+import io.github.pylonmc.pylon.core.util.gui.GuiItems;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -35,7 +36,7 @@ public static Gui make(@NotNull Supplier<PylonFluid> getFluid, @NotNull Consumer
                         ". . . . . . . . .",
                         ". . . . . . . . ."
                 )
-                .addIngredient('x', new ItemBuilder(Material.GRAY_STAINED_GLASS_PANE))
+                .addIngredient('x', GuiItems.background())
                 .addIngredient('b', fluidItem.apply(null))
                 .addIngredient('c', currentItem)
                 .build();

src/main/java/io/github/pylonmc/pylon/base/items/fluid/items/PortableFluidTank.java

@@ -7,8 +7,8 @@
 import io.github.pylonmc.pylon.core.block.base.PylonEntityHolderBlock;
 import io.github.pylonmc.pylon.core.block.base.PylonFluidBlock;
 import io.github.pylonmc.pylon.core.block.base.PylonInteractableBlock;
-import io.github.pylonmc.pylon.core.block.context.BlockBreakContext;
 import io.github.pylonmc.pylon.core.block.context.BlockCreateContext;
+import io.github.pylonmc.pylon.core.block.context.BlockItemContext;
 import io.github.pylonmc.pylon.core.block.waila.WailaConfig;
 import io.github.pylonmc.pylon.core.datatypes.PylonSerializers;
 import io.github.pylonmc.pylon.core.entity.EntityStorage;
@@ -262,11 +262,7 @@ public void updateFluidDisplayHeight() {
     }
 
     @Override
-    public void onBreak(@NotNull List<ItemStack> drops, @NotNull BlockBreakContext context) {
-        PylonEntityHolderBlock.super.onBreak(drops, context);
-
-        drops.clear();
-
+    public @Nullable ItemStack getItem(@NotNull BlockItemContext context) {
         ItemStack stack = Map.of(
                 PORTABLE_FLUID_TANK_WOOD_KEY, Item.PORTABLE_FLUID_TANK_WOOD_STACK,
                 PORTABLE_FLUID_TANK_COPPER_KEY, Item.PORTABLE_FLUID_TANK_COPPER_STACK
@@ -276,7 +272,7 @@ public void onBreak(@NotNull List<ItemStack> drops, @NotNull BlockBreakContext c
         item.setFluid(fluidType);
         item.setAmount(fluidAmount);
 
-        drops.add(stack);
+        return stack;
     }
 
     @Override