Make pick block copy components, and remove some tags that get copied when doing a full copy that don't make sense to persist

Author: pupnewfster

src/main/java/mekanism/common/block/BlockMekanism.java

@@ -86,11 +86,10 @@ protected boolean canBeReplaced(@NotNull BlockState state, @NotNull Fluid fluid)
     @Override
     public ItemStack getCloneItemStack(@NotNull BlockState state, @NotNull HitResult target, @NotNull LevelReader world, @NotNull BlockPos pos, @NotNull Player player) {
         ItemStack stack = super.getCloneItemStack(state, target, world, pos, player);
-        //TODO - 1.20.5: Figure this out, we want to make sure we copy components
-        /*TileEntityUpdateable tile = WorldUtils.getTileEntity(TileEntityUpdateable.class, world, pos);
+        TileEntityUpdateable tile = WorldUtils.getTileEntity(TileEntityUpdateable.class, world, pos);
         if (tile != null) {
-            tile.writeToStack(stack);
-        }*/
+            stack.applyComponents(tile.collectComponents());
+        }
         return stack;
     }
 

src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java

@@ -175,6 +175,13 @@ public void loadAdditional(@NotNull CompoundTag nbt, @NotNull HolderLookup.Provi
         }
     }
 
+    @Override
+    @Deprecated
+    public void removeComponentsFromTag(@NotNull CompoundTag tag) {
+        super.removeComponentsFromTag(tag);
+        tag.remove(SerializationConstants.ROUND_ROBIN_TARGET);
+    }
+
     @Override
     protected boolean canPlaySound() {
         return false;//handle own sounds

src/main/java/mekanism/common/tile/base/TileEntityMekanism.java

@@ -861,6 +861,26 @@ public List<DataComponentType<?>> getRemapEntries() {
         return remapEntries;
     }
 
+    @Override
+    @Deprecated
+    public void removeComponentsFromTag(@NotNull CompoundTag tag) {
+        super.removeComponentsFromTag(tag);
+        for (ITileComponent component : components) {
+            tag.remove(component.getComponentKey());
+        }
+        tag.remove(SerializationConstants.REDSTONE);
+        if (supportsComparator()) {
+            tag.remove(SerializationConstants.CURRENT_REDSTONE);
+        }
+        if (isActivatable()) {
+            tag.remove(SerializationConstants.ACTIVE_STATE);
+            tag.remove(SerializationConstants.UPDATE_DELAY);
+        }
+        if (supportsRedstone()) {
+            tag.remove(SerializationConstants.CONTROL_TYPE);
+        }
+    }
+
     @Override//TODO - 1.20.5: Do we need to override removeComponentsFromTag??
     protected void collectImplicitComponents(@NotNull DataComponentMap.Builder builder) {
         super.collectImplicitComponents(builder);

src/main/java/mekanism/common/tile/laser/TileEntityBasicLaser.java

@@ -423,6 +423,13 @@ public void saveAdditional(@NotNull CompoundTag nbtTags, @NotNull HolderLookup.P
         nbtTags.putString(SerializationConstants.LAST_FIRED, lastFired.toString());
     }
 
+    @Override
+    @Deprecated
+    public void removeComponentsFromTag(@NotNull CompoundTag tag) {
+        super.removeComponentsFromTag(tag);
+        tag.remove(SerializationConstants.LAST_FIRED);
+    }
+
     @NotNull
     @Override
     public CompoundTag getReducedUpdateTag(@NotNull HolderLookup.Provider provider) {

src/main/java/mekanism/common/tile/machine/TileEntityDigitalMiner.java

@@ -864,6 +864,14 @@ public void loadAdditional(@NotNull CompoundTag nbt, @NotNull HolderLookup.Provi
         energyContainer.updateMinerEnergyPerTick();
     }
 
+    @Override
+    @Deprecated
+    public void removeComponentsFromTag(@NotNull CompoundTag tag) {
+        super.removeComponentsFromTag(tag);
+        tag.remove(SerializationConstants.NUM_POWERING);
+        tag.remove(SerializationConstants.STATE);
+    }
+
     @Override
     public void setLevel(@NotNull Level world) {
         super.setLevel(world);

src/main/java/mekanism/common/tile/machine/TileEntityElectricPump.java

@@ -338,6 +338,13 @@ public void loadAdditional(@NotNull CompoundTag nbt, @NotNull HolderLookup.Provi
         NBTUtils.readBlockPositions(nbt, SerializationConstants.RECURRING_NODES, recurringNodes);
     }
 
+    @Override
+    @Deprecated
+    public void removeComponentsFromTag(@NotNull CompoundTag tag) {
+        super.removeComponentsFromTag(tag);
+        tag.remove(SerializationConstants.RECURRING_NODES);
+    }
+
     @Override
     public InteractionResult onSneakRightClick(Player player) {
         reset();

src/main/java/mekanism/common/tile/machine/TileEntityFluidicPlenisher.java

@@ -255,6 +255,15 @@ public void loadAdditional(@NotNull CompoundTag nbt, @NotNull HolderLookup.Provi
         NBTUtils.readBlockPositions(nbt, SerializationConstants.USED_NODES, usedNodes);
     }
 
+    @Override
+    @Deprecated
+    public void removeComponentsFromTag(@NotNull CompoundTag tag) {
+        super.removeComponentsFromTag(tag);
+        tag.remove(SerializationConstants.ACTIVE_NODES);
+        tag.remove(SerializationConstants.USED_NODES);
+        tag.remove(SerializationConstants.FINISHED);
+    }
+
     public void reset() {
         activeNodes.clear();
         usedNodes.clear();

src/main/java/mekanism/common/tile/qio/TileEntityQIOExporter.java

@@ -194,6 +194,13 @@ public void loadAdditional(@NotNull CompoundTag nbt, @NotNull HolderLookup.Provi
         }
     }
 
+    @Override
+    @Deprecated
+    public void removeComponentsFromTag(@NotNull CompoundTag tag) {
+        super.removeComponentsFromTag(tag);
+        tag.remove(SerializationConstants.ROUND_ROBIN_TARGET);
+    }
+
     @Override
     public void writeSustainedData(HolderLookup.Provider provider, CompoundTag dataMap) {
         super.writeSustainedData(provider, dataMap);