Merge pull request #584 from Team-EnderIO/fix/conduit_relocation

Added Conduit to the commonly used forge:relocation_not_supported tag
Team-EnderIO · Jan 9, 2024 · 91b6719 · 91b6719
2 parents 096741b + 9c297cf
commit 91b6719
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/conduits/java/com/enderio/conduits/common/tag/ConduitTags.java b/src/conduits/java/com/enderio/conduits/common/tag/ConduitTags.java
@@ -7,6 +7,7 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import net.minecraftforge.common.ForgeMod;
 
 public class ConduitTags {
 
@@ -30,5 +31,6 @@ private static void init() {}
 
         public static final TagKey<Block> REDSTONE_CONNECTABLE = BlockTags.create(EnderIO.loc("redstone_connectable"));
         public static final TagKey<Block> ENERGY_CABLE = BlockTags.create(EnderIO.loc("energy_cable"));
+        public static final TagKey<Block> RELOCATION_NOT_SUPPORTED = BlockTags.create(new ResourceLocation("forge", "relocation_not_supported"));
     }
 }
diff --git a/src/conduits/java/com/enderio/conduits/data/ConduitTagProvider.java b/src/conduits/java/com/enderio/conduits/data/ConduitTagProvider.java
@@ -1,6 +1,7 @@
 package com.enderio.conduits.data;
 
 import com.enderio.EnderIO;
+import com.enderio.conduits.common.init.ConduitBlocks;
 import com.enderio.conduits.common.tag.ConduitTags;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
@@ -32,5 +33,7 @@ protected void addTags(HolderLookup.Provider pProvider) {
             .addOptional(new ResourceLocation("mekanism", "ultimate_universal_cable"))
             .addOptional(new ResourceLocation("pipez", "energy_pipe"))
             .addOptional(new ResourceLocation("pipez", "universal_pipe"));
+
+        tag(ConduitTags.Blocks.RELOCATION_NOT_SUPPORTED).add(ConduitBlocks.CONDUIT.get());
     }
 }
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
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "enderio:conduit"
+  ]
+}