Fixed Simple Compacting Drawers not respecting Downgrades, closes #323

Buuz135 · Oct 28, 2024 · 2cb4708 · 2cb4708
1 parent 39f9726
commit 2cb4708
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Added obsidian generator upgrade, closes #334
 * Fixed compacting recipes generating in the wrong path
 * Added a tick for access points to update connections, closes #327
+* Fixed NBT getting readded every time drawers get placed and broken, closes #330
 
 # VERSION 1.3.3
 * Added dripping upgrade that will fill fluid drawers with lava

diff --git a/src/main/java/com/buuz135/functionalstorage/FunctionalStorage.java b/src/main/java/com/buuz135/functionalstorage/FunctionalStorage.java
@@ -73,6 +73,7 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
@@ -110,6 +111,7 @@
 import net.neoforged.neoforge.common.crafting.IngredientType;
 import net.neoforged.neoforge.common.util.Lazy;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
+import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import net.neoforged.neoforge.registries.NeoForgeRegistries;

diff --git a/src/main/java/com/buuz135/functionalstorage/block/Drawer.java b/src/main/java/com/buuz135/functionalstorage/block/Drawer.java
@@ -10,12 +10,14 @@
 import com.buuz135.functionalstorage.item.LinkingToolItem;
 import com.hrznstudio.titanium.block.RotatableBlock;
 import com.hrznstudio.titanium.datagenerator.loot.block.BasicBlockLootTables;
+import com.hrznstudio.titanium.nbthandler.NBTManager;
 import com.hrznstudio.titanium.util.RayTraceUtils;
 import com.hrznstudio.titanium.util.TileUtil;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.NonNullList;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.InteractionHand;
@@ -42,6 +44,7 @@
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.checkerframework.checker.units.qual.C;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
@@ -138,7 +141,7 @@ public NonNullList<ItemStack> getDynamicDrops(BlockState state, Level worldIn, B
 
     protected void copyTo(T tile, ItemStack stack) {
         if (!tile.isEverythingEmpty()) {
-            stack.set(FSAttachments.TILE, tile.saveWithoutMetadata(tile.getLevel().registryAccess()));
+            stack.set(FSAttachments.TILE, NBTManager.getInstance().writeTileEntity(tile, new CompoundTag()));
         }
         if (tile.isLocked()) {
             stack.set(FSAttachments.LOCKED, tile.isLocked());