Fix fluid stack GUI encoding & machine item saving (GregTechCEu#3132)

Author: screret

src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java

@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.api.block;
 
 import com.gregtechceu.gtceu.api.item.IGTTool;
+import com.gregtechceu.gtceu.api.item.MetaMachineItem;
 import com.gregtechceu.gtceu.api.item.tool.GTToolType;
 import com.gregtechceu.gtceu.api.item.tool.ToolHelper;
 import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
@@ -17,8 +18,6 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.RandomSource;
@@ -30,7 +29,6 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.BlockAndTintGetter;
@@ -126,12 +124,6 @@ public void setPlacedBy(Level pLevel, BlockPos pPos, BlockState pState, @Nullabl
                     machine.markDirty();
                 }
             }
-            if (machine instanceof IDropSaveMachine dropSaveMachine) {
-                CustomData tag = pStack.get(DataComponents.BLOCK_ENTITY_DATA);
-                if (tag != null) {
-                    dropSaveMachine.loadFromItem(tag.copyTag());
-                }
-            }
             if (machine instanceof IMachineLife machineLife) {
                 machineLife.onMachinePlaced(player, pStack);
             }
@@ -189,11 +181,9 @@ public Direction getFrontFacing(BlockState state) {
     public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos,
                                        Player player) {
         ItemStack itemStack = super.getCloneItemStack(state, target, level, pos, player);
-        if (getMachine(level, pos) instanceof IDropSaveMachine dropSaveMachine && dropSaveMachine.savePickClone()) {
-            CompoundTag tag = itemStack.getOrDefault(DataComponents.BLOCK_ENTITY_DATA, CustomData.EMPTY).copyTag();
-            // TODO remove in future version.
-            dropSaveMachine.saveToItem(tag);
-            itemStack.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(tag));
+        MetaMachine machine = getMachine(level, pos);
+        if (machine instanceof IDropSaveMachine dropSaveMachine && dropSaveMachine.savePickClone()) {
+            dropSaveMachine.saveToItem(itemStack, level.registryAccess());
         }
         return itemStack;
     }
@@ -229,13 +219,22 @@ public BlockState rotate(BlockState pState, Rotation pRotation) {
 
     @Override
     public List<ItemStack> getDrops(BlockState state, LootParams.Builder builder) {
-        BlockEntity tileEntity = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
+        BlockEntity blockEntity = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
         var drops = super.getDrops(state, builder);
-        if (tileEntity instanceof IMachineBlockEntity holder) {
+        if (blockEntity instanceof IMachineBlockEntity holder) {
             var machine = holder.getMetaMachine();
             if (machine instanceof IMachineModifyDrops machineModifyDrops) {
                 machineModifyDrops.onDrops(drops);
             }
+            if (machine instanceof IDropSaveMachine dropSaveMachine && dropSaveMachine.saveBreak()) {
+                for (ItemStack drop : drops) {
+                    if (drop.getItem() instanceof MetaMachineItem item && item.getBlock() == this) {
+                        dropSaveMachine.saveToItem(drop, blockEntity.getLevel().registryAccess());
+                        // break here to not dupe contents if a machine drops multiple of itself for whatever reason.
+                        break;
+                    }
+                }
+            }
         }
         return drops;
     }
@@ -351,7 +350,7 @@ public void neighborChanged(BlockState state, Level level, BlockPos pos, Block b
     @Nullable
     @Override
     public BlockState getBlockAppearance(BlockState state, BlockAndTintGetter level, BlockPos pos, Direction side,
-                                         @Nullable BlockState sourceState, BlockPos sourcePos) {
+                                         @Nullable BlockState sourceState, @Nullable BlockPos sourcePos) {
         var machine = getMachine(level, pos);
         if (machine != null) {
             return machine.getBlockAppearance(state, level, pos, side, sourceState, sourcePos);

src/main/java/com/gregtechceu/gtceu/api/blockentity/MetaMachineBlockEntity.java

@@ -12,6 +12,7 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.core.component.DataComponentType;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -81,6 +82,13 @@ protected void collectImplicitComponents(DataComponentMap.Builder components) {
         metaMachine.collectImplicitComponents(components);
     }
 
+    @SuppressWarnings("deprecation")
+    @Override
+    public void removeComponentsFromTag(CompoundTag tag) {
+        super.removeComponentsFromTag(tag);
+        metaMachine.removeItemComponentsFromTag(tag);
+    }
+
     @Override
     public long getOffset() {
         return offset;

src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java

@@ -64,14 +64,7 @@ public static RecipeLogic getRecipeLogic(Level level, BlockPos pos, @Nullable Di
 
     @Nullable
     public static IEnergyStorage getForgeEnergy(Level level, BlockPos pos, @Nullable Direction side) {
-        if (level.getBlockState(pos).hasBlockEntity()) {
-            var blockEntity = level.getBlockEntity(pos);
-            if (blockEntity != null) {
-                return blockEntity.getLevel().getCapability(Capabilities.EnergyStorage.BLOCK, blockEntity.getBlockPos(),
-                        blockEntity.getBlockState(), blockEntity, side);
-            }
-        }
-        return null;
+        return level.getCapability(Capabilities.EnergyStorage.BLOCK, pos, side);
     }
 
     @Nullable

src/main/java/com/gregtechceu/gtceu/api/capability/ICoverable.java

@@ -67,7 +67,7 @@ public interface ICoverable extends ITickSubscription, IAppearance {
 
     /**
      * Internal method, do not call yourself.
-     * <br/>
+     * <br>
      * Use {@link ICoverable#removeCover(boolean, Direction, Player)} and
      * {@link ICoverable#placeCoverOnSide(Direction, ItemStack, CoverDefinition, ServerPlayer)} instead
      * 
@@ -256,7 +256,7 @@ static boolean canPlaceCover(CoverDefinition coverDef, ICoverable coverable) {
     @Override
     default BlockState getBlockAppearance(@NotNull BlockState state, @NotNull BlockAndTintGetter level,
                                           @NotNull BlockPos pos, @NotNull Direction side,
-                                          @Nullable BlockState sourceState, @NotNull BlockPos sourcePos) {
+                                          @Nullable BlockState sourceState, @Nullable BlockPos sourcePos) {
         CoverBehavior cover = getCoverAtSide(side);
         if (cover != null) {
             return cover.getAppearance(sourceState, sourcePos);

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/IRecipeHandler.java

@@ -30,7 +30,7 @@ public interface IRecipeHandler<K> extends IFilteredHandler<K> {
      * @param recipe   recipe.
      * @param left     left contents for to be handled.
      * @param simulate simulate.
-     * @return left contents for continue handling by other proxies. <br/>
+     * @return left contents for continue handling by other proxies. <br>
      *         null - nothing left. handling successful/finish. you should always return null as a handling-done mark.
      */
     List<K> handleRecipeInner(IO io, GTRecipe recipe, List<K> left, boolean simulate);

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java

@@ -13,6 +13,8 @@
 import com.lowdragmc.lowdraglib.gui.widget.Widget;
 import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;
 
+import net.minecraft.core.HolderLookup;
+import net.minecraft.nbt.Tag;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.neoforged.neoforge.network.connection.ConnectionType;
@@ -93,6 +95,14 @@ public T of(Object o) {
         return serializer.of(o);
     }
 
+    public T fromNbt(Tag tag, HolderLookup.Provider provider) {
+        return serializer.fromNbt(tag, provider);
+    }
+
+    public Tag toNbt(Object content, HolderLookup.Provider provider) {
+        return serializer.toNbt(of(content), provider);
+    }
+
     public String slotName(IO io) {
         return "%s_%s".formatted(name, io.name().toLowerCase(Locale.ROOT));
     }

src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java

@@ -212,7 +212,7 @@ public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, I
      * get Appearance. same as IBlockExtension.getAppearance() / IFabricBlock.getAppearance()
      */
     @Nullable
-    public BlockState getAppearance(BlockState sourceState, BlockPos sourcePos) {
+    public BlockState getAppearance(@Nullable BlockState sourceState, @Nullable BlockPos sourcePos) {
         return null;
     }
 

src/main/java/com/gregtechceu/gtceu/api/cover/filter/FluidFilter.java

@@ -24,7 +24,7 @@ static FluidFilter loadFilter(ItemStack itemStack) {
     /**
      * Retrieves the configured fluid amount for the supplied fluid.
      *
-     * @return The amount configured for the supplied fluid stack.<br/>
+     * @return The amount configured for the supplied fluid stack.<br>
      *         If the stack is not matched by this filter, 0 is returned instead.
      */
     int testFluidAmount(FluidStack fluidStack);
@@ -37,7 +37,7 @@ default boolean supportsAmounts() {
     }
 
     /**
-     * An empty fluid filter that allows all fluids.<br/>
+     * An empty fluid filter that allows all fluids.<br>
      * ONLY TO BE USED FOR FLUID MATCHING! All other functionality will throw an exception.
      */
     FluidFilter EMPTY = new FluidFilter() {

src/main/java/com/gregtechceu/gtceu/api/cover/filter/ItemFilter.java

@@ -23,7 +23,7 @@ static ItemFilter loadFilter(ItemStack itemStack) {
     /**
      * Retrieves the configured item count for the supplied item.
      *
-     * @return The amount configured for the supplied item stack.<br/>
+     * @return The amount configured for the supplied item stack.<br>
      *         If the stack is not matched by this filter, 0 is returned instead.
      */
     int testItemCount(ItemStack itemStack);
@@ -36,7 +36,7 @@ default boolean supportsAmounts() {
     }
 
     /**
-     * An empty item filter that allows all items.<br/>
+     * An empty item filter that allows all items.<br>
      * ONLY TO BE USED FOR ITEM MATCHING! All other functionality will throw an exception.
      */
     ItemFilter EMPTY = new ItemFilter() {

src/main/java/com/gregtechceu/gtceu/api/gui/fancy/TitleBarWidget.java

@@ -33,7 +33,7 @@ public class TitleBarWidget extends WidgetGroup {
     /**
      * The button group is rendered behind the main section and contains the back and menu buttons.
      * <p>
-     * For easier texture reuse, the background is applied to the group itself, instead of the individual buttons.<br/>
+     * For easier texture reuse, the background is applied to the group itself, instead of the individual buttons.<br>
      * The button group therefore needs to be rendered behind the main section.
      */
     private final WidgetGroup buttonGroup;