Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Conduit to the commonly used forge:relocation_not_supported tag #584

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Added Conduit to the commonly used forge:relocation_not_supported tag #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/conduits/java/com/enderio/conduits/common/tag/ConduitTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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"));
}
}
3 changes: 3 additions & 0 deletions src/conduits/java/com/enderio/conduits/data/ConduitTagProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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());
}
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"enderio:conduit"
]
}