upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add tags supports_beacon and supports_conduit and modify Beacon and Conduit to use these tags (#6266)

Browse Source
This commit is contained in:
DaemonUmbra authored and LexManos committed 2019-11-20 19:15:13 -08:00
1 parent 5d62261082
commit d8d70e8b35
9 files changed
+59 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/common/Tags.java
+6
View File
@@ -112,6 +112,9 @@ public class Tags
public static final Tag<Block> STORAGE_BLOCKS_QUARTZ = tag("storage_blocks/quartz");
public static final Tag<Block> STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone");
public static final Tag<Block> SUPPORTS_BEACON = tag("supports_beacon");
public static final Tag<Block> SUPPORTS_CONDUIT = tag("supports_conduit");
private static Tag<Block> tag(String name)
{
return new BlockTags.Wrapper(new ResourceLocation("forge", name));
@@ -266,6 +269,9 @@ public class Tags
public static final Tag<Item> STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone");
public static final Tag<Item> STRING = tag("string");
public static final Tag<Item> SUPPORTS_BEACON = tag("supports_beacon");
public static final Tag<Item> SUPPORTS_CONDUIT = tag("supports_conduit");
private static Tag<Item> tag(String name)
{
return new ItemTags.Wrapper(new ResourceLocation("forge", name));
src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java
+2
View File
@@ -96,6 +96,8 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
getBuilder(STORAGE_BLOCKS_LAPIS).add(Blocks.LAPIS_BLOCK);
getBuilder(STORAGE_BLOCKS_QUARTZ).add(Blocks.QUARTZ_BLOCK);
getBuilder(STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK);
getBuilder(SUPPORTS_BEACON).add(Blocks.EMERALD_BLOCK, Blocks.GOLD_BLOCK, Blocks.DIAMOND_BLOCK, Blocks.IRON_BLOCK);
getBuilder(SUPPORTS_CONDUIT).add(Blocks.PRISMARINE, Blocks.PRISMARINE_BRICKS, Blocks.SEA_LANTERN, Blocks.DARK_PRISMARINE);
}
private void addColored(Consumer<Block> consumer, Tag<Block> group, String pattern)
src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
+2
View File
@@ -141,6 +141,8 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
copy(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ);
copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE);
getBuilder(Tags.Items.STRING).add(Items.STRING);
copy(Tags.Blocks.SUPPORTS_BEACON, Tags.Items.SUPPORTS_BEACON);
copy(Tags.Blocks.SUPPORTS_CONDUIT, Tags.Items.SUPPORTS_CONDUIT);
}
private void addColored(Consumer<Item> consumer, Tag<Item> group, String pattern)
src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java
+2 -2
View File
@@ -82,6 +82,7 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.Tags;
import net.minecraftforge.common.ToolType;
@SuppressWarnings("deprecation")
@@ -589,8 +590,7 @@ public interface IForgeBlock
*/
default boolean isBeaconBase(BlockState state, IWorldReader world, BlockPos pos, BlockPos beacon)
{
return this.getBlock() == Blocks.EMERALD_BLOCK || this.getBlock() == Blocks.GOLD_BLOCK ||
this.getBlock() == Blocks.DIAMOND_BLOCK || this.getBlock() == Blocks.IRON_BLOCK;
return Tags.Blocks.SUPPORTS_BEACON.contains(state.getBlock());
}
/**
* Gathers how much experience this block drops when broken.