From b6de5f553a1056931f7415d9cc1efb138a1912a9 Mon Sep 17 00:00:00 2001
From: aeonic <ericknwash@gmail.com>
Date: Fri, 10 Jun 2022 18:26:18 -0500
Subject: [PATCH] Add non-colored blocks to Forge relocation blacklist tag

---
 src/generated/resources/.cache/cache          |  2 +-
 .../tags/blocks/relocation_not_supported.json | 47 ++++++++++++++-----
 .../datageneration/BlockTagGenerator.java     |  7 +--
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
index c61070a25..148beee01 100644
--- a/src/generated/resources/.cache/cache
+++ b/src/generated/resources/.cache/cache
@@ -767,7 +767,7 @@ bbae585b79552836f291bd7a254bb5311362b717 assets/refinedstorage/models/item/yello
 8bf5c07f71be511207cb3338cd9ab569f23d89d6 assets/refinedstorage/models/item/yellow_relay.json
 031da071bd54f6bbd6bd726ae8e54dcb31d93dd7 assets/refinedstorage/models/item/yellow_security_manager.json
 8cd04b5fd0ef2456369a59326d87b5067a6b7cf5 assets/refinedstorage/models/item/yellow_wireless_transmitter.json
-b611c0ad3d661929db0e1e4dd723c6f218964690 data/forge/tags/blocks/relocation_not_supported.json
+346cf6402101b92a94df091df36ea44fb526776e data/forge/tags/blocks/relocation_not_supported.json
 24e9450a858ed0e2268fee8f5d37a168f92e73bc data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_controller.json
 0e90c4471c953dbb46ae3f87b713f107a4b5c6ed data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter.json
 6645b1e1c826d9147b0c81d3169ab0e8e1ef6ef2 data/refinedstorage/advancements/recipes/refinedstorage/coloring_recipes/black_crafter_manager.json
diff --git a/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json b/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json
index 367d0a506..054628461 100644
--- a/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json
+++ b/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json
@@ -1,21 +1,42 @@
 {
   "replace": false,
   "values": [
-    "#refinedstorage:detector",
-    "#refinedstorage:disk_manipulator",
-    "#refinedstorage:security_manager",
-    "#refinedstorage:pattern_grid",
-    "#refinedstorage:creative_controller",
-    "#refinedstorage:wireless_transmitter",
-    "#refinedstorage:crafter_manager",
-    "#refinedstorage:network_transmitter",
-    "#refinedstorage:grid",
-    "#refinedstorage:relay",
-    "#refinedstorage:network_receiver",
-    "#refinedstorage:crafting_grid",
     "#refinedstorage:controller",
     "#refinedstorage:crafting_monitor",
+    "#refinedstorage:relay",
+    "#refinedstorage:crafter_manager",
     "#refinedstorage:crafter",
-    "#refinedstorage:fluid_grid"
+    "#refinedstorage:crafting_grid",
+    "#refinedstorage:network_receiver",
+    "#refinedstorage:disk_manipulator",
+    "#refinedstorage:creative_controller",
+    "#refinedstorage:pattern_grid",
+    "#refinedstorage:network_transmitter",
+    "#refinedstorage:security_manager",
+    "#refinedstorage:fluid_grid",
+    "#refinedstorage:detector",
+    "#refinedstorage:grid",
+    "#refinedstorage:wireless_transmitter",
+    "refinedstorage:1k_storage_block",
+    "refinedstorage:4k_storage_block",
+    "refinedstorage:16k_storage_block",
+    "refinedstorage:64k_storage_block",
+    "refinedstorage:creative_storage_block",
+    "refinedstorage:64k_fluid_storage_block",
+    "refinedstorage:256k_fluid_storage_block",
+    "refinedstorage:1024k_fluid_storage_block",
+    "refinedstorage:4096k_fluid_storage_block",
+    "refinedstorage:creative_fluid_storage_block",
+    "refinedstorage:importer",
+    "refinedstorage:exporter",
+    "refinedstorage:external_storage",
+    "refinedstorage:disk_drive",
+    "refinedstorage:interface",
+    "refinedstorage:fluid_interface",
+    "refinedstorage:storage_monitor",
+    "refinedstorage:constructor",
+    "refinedstorage:destructor",
+    "refinedstorage:portable_grid",
+    "refinedstorage:creative_portable_grid"
   ]
 }
\ No newline at end of file
diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockTagGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockTagGenerator.java
index 19c56ccb1..e12188871 100644
--- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockTagGenerator.java
+++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockTagGenerator.java
@@ -1,13 +1,10 @@
 package com.refinedmods.refinedstorage.datageneration;
 
 import com.refinedmods.refinedstorage.RSBlocks;
-import com.refinedmods.refinedstorage.RSItems;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.tags.BlockTagsProvider;
-import net.minecraft.data.tags.ItemTagsProvider;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
 import net.minecraftforge.common.data.ExistingFileHelper;
 
@@ -25,5 +22,9 @@ public class BlockTagGenerator extends BlockTagsProvider {
             map.values().forEach(block -> tag(tag).add(block.get()));
             noRelocationTag.addTags(tag);
         });
+        RSBlocks.STORAGE_BLOCKS.forEach((tag, block) -> noRelocationTag.add(block.get()));
+        RSBlocks.FLUID_STORAGE_BLOCKS.forEach((tag, block) -> noRelocationTag.add(block.get()));
+
+        noRelocationTag.add(RSBlocks.IMPORTER.get(), RSBlocks.EXPORTER.get(), RSBlocks.EXTERNAL_STORAGE.get(), RSBlocks.DISK_DRIVE.get(), RSBlocks.INTERFACE.get(), RSBlocks.FLUID_INTERFACE.get(), RSBlocks.STORAGE_MONITOR.get(), RSBlocks.CONSTRUCTOR.get(), RSBlocks.DESTRUCTOR.get(), RSBlocks.PORTABLE_GRID.get(), RSBlocks.CREATIVE_PORTABLE_GRID.get());
     }
 }