mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Update forge mappings to 20201028-1.16.3 (#7435)
This commit is contained in:
1 parent
6e0e67b14d
commit
53eedb0f10
93 files changed
+598
-588
No files matched your search
@@ -46,57 +46,57 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
|
||||
@Override
|
||||
public void registerTags()
|
||||
{
|
||||
func_240522_a_(CHESTS).addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN);
|
||||
func_240522_a_(CHESTS_ENDER).func_240534_a_(Blocks.ENDER_CHEST);
|
||||
func_240522_a_(CHESTS_TRAPPED).func_240534_a_(Blocks.TRAPPED_CHEST);
|
||||
func_240522_a_(CHESTS_WOODEN).func_240534_a_(Blocks.CHEST, Blocks.TRAPPED_CHEST);
|
||||
func_240522_a_(COBBLESTONE).func_240534_a_(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE, Blocks.MOSSY_COBBLESTONE);
|
||||
func_240522_a_(DIRT).func_240534_a_(Blocks.DIRT, Blocks.GRASS_BLOCK, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.MYCELIUM);
|
||||
func_240522_a_(END_STONES).func_240534_a_(Blocks.END_STONE);
|
||||
func_240522_a_(FENCE_GATES).addTags(FENCE_GATES_WOODEN);
|
||||
func_240522_a_(FENCE_GATES_WOODEN).func_240534_a_(Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.ACACIA_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE, Blocks.field_235354_mM_, Blocks.field_235355_mN_);
|
||||
func_240522_a_(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN);
|
||||
func_240522_a_(FENCES_NETHER_BRICK).func_240534_a_(Blocks.NETHER_BRICK_FENCE);
|
||||
func_240522_a_(FENCES_WOODEN).func_240534_a_(Blocks.OAK_FENCE, Blocks.SPRUCE_FENCE, Blocks.BIRCH_FENCE, Blocks.JUNGLE_FENCE, Blocks.ACACIA_FENCE, Blocks.DARK_OAK_FENCE, Blocks.field_235350_mI_, Blocks.field_235351_mJ_);
|
||||
func_240522_a_(GLASS).addTags(GLASS_COLORLESS, STAINED_GLASS);
|
||||
func_240522_a_(GLASS_COLORLESS).func_240534_a_(Blocks.GLASS);
|
||||
addColored(func_240522_a_(STAINED_GLASS)::func_240534_a_, GLASS, "{color}_stained_glass");
|
||||
func_240522_a_(GLASS_PANES).addTags(GLASS_PANES_COLORLESS, STAINED_GLASS_PANES);
|
||||
func_240522_a_(GLASS_PANES_COLORLESS).func_240534_a_(Blocks.GLASS_PANE);
|
||||
addColored(func_240522_a_(STAINED_GLASS_PANES)::func_240534_a_, GLASS_PANES, "{color}_stained_glass_pane");
|
||||
func_240522_a_(GRAVEL).func_240534_a_(Blocks.GRAVEL);
|
||||
func_240522_a_(NETHERRACK).func_240534_a_(Blocks.NETHERRACK);
|
||||
func_240522_a_(OBSIDIAN).func_240534_a_(Blocks.OBSIDIAN);
|
||||
func_240522_a_(ORES).addTags(ORES_COAL, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_REDSTONE, ORES_QUARTZ, ORES_NETHERITE_SCRAP);
|
||||
func_240522_a_(ORES_COAL).func_240534_a_(Blocks.COAL_ORE);
|
||||
func_240522_a_(ORES_DIAMOND).func_240534_a_(Blocks.DIAMOND_ORE);
|
||||
func_240522_a_(ORES_EMERALD).func_240534_a_(Blocks.EMERALD_ORE);
|
||||
func_240522_a_(ORES_GOLD).func_240531_a_(BlockTags.field_232866_P_);
|
||||
func_240522_a_(ORES_IRON).func_240534_a_(Blocks.IRON_ORE);
|
||||
func_240522_a_(ORES_LAPIS).func_240534_a_(Blocks.LAPIS_ORE);
|
||||
func_240522_a_(ORES_QUARTZ).func_240534_a_(Blocks.NETHER_QUARTZ_ORE);
|
||||
func_240522_a_(ORES_REDSTONE).func_240534_a_(Blocks.REDSTONE_ORE);
|
||||
func_240522_a_(ORES_NETHERITE_SCRAP).func_240534_a_(Blocks.field_235398_nh_);
|
||||
func_240522_a_(SAND).addTags(SAND_COLORLESS, SAND_RED);
|
||||
func_240522_a_(SAND_COLORLESS).func_240534_a_(Blocks.SAND);
|
||||
func_240522_a_(SAND_RED).func_240534_a_(Blocks.RED_SAND);
|
||||
func_240522_a_(SANDSTONE).func_240534_a_(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE);
|
||||
func_240522_a_(STONE).func_240534_a_(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.INFESTED_STONE, Blocks.STONE, Blocks.POLISHED_ANDESITE, Blocks.POLISHED_DIORITE, Blocks.POLISHED_GRANITE);
|
||||
func_240522_a_(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_QUARTZ, STORAGE_BLOCKS_REDSTONE, STORAGE_BLOCKS_NETHERITE);
|
||||
func_240522_a_(STORAGE_BLOCKS_COAL).func_240534_a_(Blocks.COAL_BLOCK);
|
||||
func_240522_a_(STORAGE_BLOCKS_DIAMOND).func_240534_a_(Blocks.DIAMOND_BLOCK);
|
||||
func_240522_a_(STORAGE_BLOCKS_EMERALD).func_240534_a_(Blocks.EMERALD_BLOCK);
|
||||
func_240522_a_(STORAGE_BLOCKS_GOLD).func_240534_a_(Blocks.GOLD_BLOCK);
|
||||
func_240522_a_(STORAGE_BLOCKS_IRON).func_240534_a_(Blocks.IRON_BLOCK);
|
||||
func_240522_a_(STORAGE_BLOCKS_LAPIS).func_240534_a_(Blocks.LAPIS_BLOCK);
|
||||
func_240522_a_(STORAGE_BLOCKS_QUARTZ).func_240534_a_(Blocks.QUARTZ_BLOCK);
|
||||
func_240522_a_(STORAGE_BLOCKS_REDSTONE).func_240534_a_(Blocks.REDSTONE_BLOCK);
|
||||
func_240522_a_(STORAGE_BLOCKS_NETHERITE).func_240534_a_(Blocks.field_235397_ng_);
|
||||
getOrCreateBuilder(CHESTS).addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN);
|
||||
getOrCreateBuilder(CHESTS_ENDER).add(Blocks.ENDER_CHEST);
|
||||
getOrCreateBuilder(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST);
|
||||
getOrCreateBuilder(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST);
|
||||
getOrCreateBuilder(COBBLESTONE).add(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE, Blocks.MOSSY_COBBLESTONE);
|
||||
getOrCreateBuilder(DIRT).add(Blocks.DIRT, Blocks.GRASS_BLOCK, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.MYCELIUM);
|
||||
getOrCreateBuilder(END_STONES).add(Blocks.END_STONE);
|
||||
getOrCreateBuilder(FENCE_GATES).addTags(FENCE_GATES_WOODEN);
|
||||
getOrCreateBuilder(FENCE_GATES_WOODEN).add(Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.ACACIA_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE, Blocks.CRIMSON_FENCE_GATE, Blocks.WARPED_FENCE_GATE);
|
||||
getOrCreateBuilder(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN);
|
||||
getOrCreateBuilder(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE);
|
||||
getOrCreateBuilder(FENCES_WOODEN).add(Blocks.OAK_FENCE, Blocks.SPRUCE_FENCE, Blocks.BIRCH_FENCE, Blocks.JUNGLE_FENCE, Blocks.ACACIA_FENCE, Blocks.DARK_OAK_FENCE, Blocks.CRIMSON_FENCE, Blocks.WARPED_FENCE);
|
||||
getOrCreateBuilder(GLASS).addTags(GLASS_COLORLESS, STAINED_GLASS);
|
||||
getOrCreateBuilder(GLASS_COLORLESS).add(Blocks.GLASS);
|
||||
addColored(getOrCreateBuilder(STAINED_GLASS)::add, GLASS, "{color}_stained_glass");
|
||||
getOrCreateBuilder(GLASS_PANES).addTags(GLASS_PANES_COLORLESS, STAINED_GLASS_PANES);
|
||||
getOrCreateBuilder(GLASS_PANES_COLORLESS).add(Blocks.GLASS_PANE);
|
||||
addColored(getOrCreateBuilder(STAINED_GLASS_PANES)::add, GLASS_PANES, "{color}_stained_glass_pane");
|
||||
getOrCreateBuilder(GRAVEL).add(Blocks.GRAVEL);
|
||||
getOrCreateBuilder(NETHERRACK).add(Blocks.NETHERRACK);
|
||||
getOrCreateBuilder(OBSIDIAN).add(Blocks.OBSIDIAN);
|
||||
getOrCreateBuilder(ORES).addTags(ORES_COAL, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_REDSTONE, ORES_QUARTZ, ORES_NETHERITE_SCRAP);
|
||||
getOrCreateBuilder(ORES_COAL).add(Blocks.COAL_ORE);
|
||||
getOrCreateBuilder(ORES_DIAMOND).add(Blocks.DIAMOND_ORE);
|
||||
getOrCreateBuilder(ORES_EMERALD).add(Blocks.EMERALD_ORE);
|
||||
getOrCreateBuilder(ORES_GOLD).addTag(BlockTags.GOLD_ORES);
|
||||
getOrCreateBuilder(ORES_IRON).add(Blocks.IRON_ORE);
|
||||
getOrCreateBuilder(ORES_LAPIS).add(Blocks.LAPIS_ORE);
|
||||
getOrCreateBuilder(ORES_QUARTZ).add(Blocks.NETHER_QUARTZ_ORE);
|
||||
getOrCreateBuilder(ORES_REDSTONE).add(Blocks.REDSTONE_ORE);
|
||||
getOrCreateBuilder(ORES_NETHERITE_SCRAP).add(Blocks.ANCIENT_DEBRIS);
|
||||
getOrCreateBuilder(SAND).addTags(SAND_COLORLESS, SAND_RED);
|
||||
getOrCreateBuilder(SAND_COLORLESS).add(Blocks.SAND);
|
||||
getOrCreateBuilder(SAND_RED).add(Blocks.RED_SAND);
|
||||
getOrCreateBuilder(SANDSTONE).add(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE);
|
||||
getOrCreateBuilder(STONE).add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.INFESTED_STONE, Blocks.STONE, Blocks.POLISHED_ANDESITE, Blocks.POLISHED_DIORITE, Blocks.POLISHED_GRANITE);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_QUARTZ, STORAGE_BLOCKS_REDSTONE, STORAGE_BLOCKS_NETHERITE);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_COAL).add(Blocks.COAL_BLOCK);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_DIAMOND).add(Blocks.DIAMOND_BLOCK);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_EMERALD).add(Blocks.EMERALD_BLOCK);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_GOLD).add(Blocks.GOLD_BLOCK);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_IRON).add(Blocks.IRON_BLOCK);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_LAPIS).add(Blocks.LAPIS_BLOCK);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_QUARTZ).add(Blocks.QUARTZ_BLOCK);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK);
|
||||
getOrCreateBuilder(STORAGE_BLOCKS_NETHERITE).add(Blocks.NETHERITE_BLOCK);
|
||||
}
|
||||
|
||||
private void addColored(Consumer<Block> consumer, ITag.INamedTag<Block> group, String pattern)
|
||||
{
|
||||
String prefix = group.func_230234_a_().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
String prefix = group.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (DyeColor color : DyeColor.values())
|
||||
{
|
||||
ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getTranslationKey()));
|
||||
@@ -104,7 +104,7 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
|
||||
Block block = ForgeRegistries.BLOCKS.getValue(key);
|
||||
if (block == null || block == Blocks.AIR)
|
||||
throw new IllegalStateException("Unknown vanilla block: " + key.toString());
|
||||
func_240522_a_(tag).func_240534_a_(block);
|
||||
getOrCreateBuilder(tag).add(block);
|
||||
consumer.accept(block);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,103 +45,103 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
@Override
|
||||
public void registerTags()
|
||||
{
|
||||
func_240522_a_(Tags.Items.BONES).func_240534_a_(Items.BONE);
|
||||
func_240522_a_(Tags.Items.BOOKSHELVES).func_240534_a_(Items.BOOKSHELF);
|
||||
func_240521_a_(Tags.Blocks.CHESTS, Tags.Items.CHESTS);
|
||||
func_240521_a_(Tags.Blocks.CHESTS_ENDER, Tags.Items.CHESTS_ENDER);
|
||||
func_240521_a_(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED);
|
||||
func_240521_a_(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN);
|
||||
func_240521_a_(Tags.Blocks.COBBLESTONE, Tags.Items.COBBLESTONE);
|
||||
func_240522_a_(Tags.Items.CROPS).addTags(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_WHEAT);
|
||||
func_240522_a_(Tags.Items.CROPS_BEETROOT).func_240534_a_(Items.BEETROOT);
|
||||
func_240522_a_(Tags.Items.CROPS_CARROT).func_240534_a_(Items.CARROT);
|
||||
func_240522_a_(Tags.Items.CROPS_NETHER_WART).func_240534_a_(Items.NETHER_WART);
|
||||
func_240522_a_(Tags.Items.CROPS_POTATO).func_240534_a_(Items.POTATO);
|
||||
func_240522_a_(Tags.Items.CROPS_WHEAT).func_240534_a_(Items.WHEAT);
|
||||
func_240522_a_(Tags.Items.DUSTS).addTags(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_PRISMARINE, Tags.Items.DUSTS_REDSTONE);
|
||||
func_240522_a_(Tags.Items.DUSTS_GLOWSTONE).func_240534_a_(Items.GLOWSTONE_DUST);
|
||||
func_240522_a_(Tags.Items.DUSTS_PRISMARINE).func_240534_a_(Items.PRISMARINE_SHARD);
|
||||
func_240522_a_(Tags.Items.DUSTS_REDSTONE).func_240534_a_(Items.REDSTONE);
|
||||
addColored(func_240522_a_(Tags.Items.DYES)::addTags, Tags.Items.DYES, "{color}_dye");
|
||||
func_240522_a_(Tags.Items.EGGS).func_240534_a_(Items.EGG);
|
||||
func_240521_a_(Tags.Blocks.END_STONES, Tags.Items.END_STONES);
|
||||
func_240522_a_(Tags.Items.ENDER_PEARLS).func_240534_a_(Items.ENDER_PEARL);
|
||||
func_240522_a_(Tags.Items.FEATHERS).func_240534_a_(Items.FEATHER);
|
||||
func_240521_a_(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES);
|
||||
func_240521_a_(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN);
|
||||
func_240521_a_(Tags.Blocks.FENCES, Tags.Items.FENCES);
|
||||
func_240521_a_(Tags.Blocks.FENCES_NETHER_BRICK, Tags.Items.FENCES_NETHER_BRICK);
|
||||
func_240521_a_(Tags.Blocks.FENCES_WOODEN, Tags.Items.FENCES_WOODEN);
|
||||
func_240522_a_(Tags.Items.GEMS).addTags(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ);
|
||||
func_240522_a_(Tags.Items.GEMS_DIAMOND).func_240534_a_(Items.DIAMOND);
|
||||
func_240522_a_(Tags.Items.GEMS_EMERALD).func_240534_a_(Items.EMERALD);
|
||||
func_240522_a_(Tags.Items.GEMS_LAPIS).func_240534_a_(Items.LAPIS_LAZULI);
|
||||
func_240522_a_(Tags.Items.GEMS_PRISMARINE).func_240534_a_(Items.PRISMARINE_CRYSTALS);
|
||||
func_240522_a_(Tags.Items.GEMS_QUARTZ).func_240534_a_(Items.QUARTZ);
|
||||
func_240521_a_(Tags.Blocks.GLASS, Tags.Items.GLASS);
|
||||
getOrCreateBuilder(Tags.Items.BONES).add(Items.BONE);
|
||||
getOrCreateBuilder(Tags.Items.BOOKSHELVES).add(Items.BOOKSHELF);
|
||||
copy(Tags.Blocks.CHESTS, Tags.Items.CHESTS);
|
||||
copy(Tags.Blocks.CHESTS_ENDER, Tags.Items.CHESTS_ENDER);
|
||||
copy(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED);
|
||||
copy(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN);
|
||||
copy(Tags.Blocks.COBBLESTONE, Tags.Items.COBBLESTONE);
|
||||
getOrCreateBuilder(Tags.Items.CROPS).addTags(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_WHEAT);
|
||||
getOrCreateBuilder(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT);
|
||||
getOrCreateBuilder(Tags.Items.CROPS_CARROT).add(Items.CARROT);
|
||||
getOrCreateBuilder(Tags.Items.CROPS_NETHER_WART).add(Items.NETHER_WART);
|
||||
getOrCreateBuilder(Tags.Items.CROPS_POTATO).add(Items.POTATO);
|
||||
getOrCreateBuilder(Tags.Items.CROPS_WHEAT).add(Items.WHEAT);
|
||||
getOrCreateBuilder(Tags.Items.DUSTS).addTags(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_PRISMARINE, Tags.Items.DUSTS_REDSTONE);
|
||||
getOrCreateBuilder(Tags.Items.DUSTS_GLOWSTONE).add(Items.GLOWSTONE_DUST);
|
||||
getOrCreateBuilder(Tags.Items.DUSTS_PRISMARINE).add(Items.PRISMARINE_SHARD);
|
||||
getOrCreateBuilder(Tags.Items.DUSTS_REDSTONE).add(Items.REDSTONE);
|
||||
addColored(getOrCreateBuilder(Tags.Items.DYES)::addTags, Tags.Items.DYES, "{color}_dye");
|
||||
getOrCreateBuilder(Tags.Items.EGGS).add(Items.EGG);
|
||||
copy(Tags.Blocks.END_STONES, Tags.Items.END_STONES);
|
||||
getOrCreateBuilder(Tags.Items.ENDER_PEARLS).add(Items.ENDER_PEARL);
|
||||
getOrCreateBuilder(Tags.Items.FEATHERS).add(Items.FEATHER);
|
||||
copy(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES);
|
||||
copy(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN);
|
||||
copy(Tags.Blocks.FENCES, Tags.Items.FENCES);
|
||||
copy(Tags.Blocks.FENCES_NETHER_BRICK, Tags.Items.FENCES_NETHER_BRICK);
|
||||
copy(Tags.Blocks.FENCES_WOODEN, Tags.Items.FENCES_WOODEN);
|
||||
getOrCreateBuilder(Tags.Items.GEMS).addTags(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ);
|
||||
getOrCreateBuilder(Tags.Items.GEMS_DIAMOND).add(Items.DIAMOND);
|
||||
getOrCreateBuilder(Tags.Items.GEMS_EMERALD).add(Items.EMERALD);
|
||||
getOrCreateBuilder(Tags.Items.GEMS_LAPIS).add(Items.LAPIS_LAZULI);
|
||||
getOrCreateBuilder(Tags.Items.GEMS_PRISMARINE).add(Items.PRISMARINE_CRYSTALS);
|
||||
getOrCreateBuilder(Tags.Items.GEMS_QUARTZ).add(Items.QUARTZ);
|
||||
copy(Tags.Blocks.GLASS, Tags.Items.GLASS);
|
||||
func_240521_a_Colored(Tags.Blocks.GLASS, Tags.Items.GLASS);
|
||||
func_240521_a_(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES);
|
||||
copy(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES);
|
||||
func_240521_a_Colored(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES);
|
||||
func_240521_a_(Tags.Blocks.GRAVEL, Tags.Items.GRAVEL);
|
||||
func_240522_a_(Tags.Items.GUNPOWDER).func_240534_a_(Items.GUNPOWDER);
|
||||
func_240522_a_(Tags.Items.HEADS).func_240534_a_(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD);
|
||||
func_240522_a_(Tags.Items.INGOTS).addTags(Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_BRICK, Tags.Items.INGOTS_NETHER_BRICK, Tags.Items.INGOTS_NETHERITE);
|
||||
func_240522_a_(Tags.Items.INGOTS_BRICK).func_240534_a_(Items.BRICK);
|
||||
func_240522_a_(Tags.Items.INGOTS_GOLD).func_240534_a_(Items.GOLD_INGOT);
|
||||
func_240522_a_(Tags.Items.INGOTS_IRON).func_240534_a_(Items.IRON_INGOT);
|
||||
func_240522_a_(Tags.Items.INGOTS_NETHERITE).func_240534_a_(Items.field_234759_km_);
|
||||
func_240522_a_(Tags.Items.INGOTS_NETHER_BRICK).func_240534_a_(Items.NETHER_BRICK);
|
||||
func_240522_a_(Tags.Items.LEATHER).func_240534_a_(Items.LEATHER);
|
||||
func_240522_a_(Tags.Items.MUSHROOMS).func_240534_a_(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM);
|
||||
func_240522_a_(Tags.Items.NETHER_STARS).func_240534_a_(Items.NETHER_STAR);
|
||||
func_240521_a_(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK);
|
||||
func_240522_a_(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD);
|
||||
func_240522_a_(Tags.Items.NUGGETS_IRON).func_240534_a_(Items.IRON_NUGGET);
|
||||
func_240522_a_(Tags.Items.NUGGETS_GOLD).func_240534_a_(Items.GOLD_NUGGET);
|
||||
func_240521_a_(Tags.Blocks.OBSIDIAN, Tags.Items.OBSIDIAN);
|
||||
func_240521_a_(Tags.Blocks.ORES, Tags.Items.ORES);
|
||||
func_240521_a_(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL);
|
||||
func_240521_a_(Tags.Blocks.ORES_DIAMOND, Tags.Items.ORES_DIAMOND);
|
||||
func_240521_a_(Tags.Blocks.ORES_EMERALD, Tags.Items.ORES_EMERALD);
|
||||
func_240521_a_(Tags.Blocks.ORES_GOLD, Tags.Items.ORES_GOLD);
|
||||
func_240521_a_(Tags.Blocks.ORES_IRON, Tags.Items.ORES_IRON);
|
||||
func_240521_a_(Tags.Blocks.ORES_LAPIS, Tags.Items.ORES_LAPIS);
|
||||
func_240521_a_(Tags.Blocks.ORES_QUARTZ, Tags.Items.ORES_QUARTZ);
|
||||
func_240521_a_(Tags.Blocks.ORES_REDSTONE, Tags.Items.ORES_REDSTONE);
|
||||
func_240521_a_(Tags.Blocks.ORES_NETHERITE_SCRAP, Tags.Items.ORES_NETHERITE_SCRAP);
|
||||
func_240522_a_(Tags.Items.RODS).addTags(Tags.Items.RODS_BLAZE, Tags.Items.RODS_WOODEN);
|
||||
func_240522_a_(Tags.Items.RODS_BLAZE).func_240534_a_(Items.BLAZE_ROD);
|
||||
func_240522_a_(Tags.Items.RODS_WOODEN).func_240534_a_(Items.STICK);
|
||||
func_240521_a_(Tags.Blocks.SAND, Tags.Items.SAND);
|
||||
func_240521_a_(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS);
|
||||
func_240521_a_(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED);
|
||||
func_240521_a_(Tags.Blocks.SANDSTONE, Tags.Items.SANDSTONE);
|
||||
func_240522_a_(Tags.Items.SEEDS).addTags(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_WHEAT);
|
||||
func_240522_a_(Tags.Items.SEEDS_BEETROOT).func_240534_a_(Items.BEETROOT_SEEDS);
|
||||
func_240522_a_(Tags.Items.SEEDS_MELON).func_240534_a_(Items.MELON_SEEDS);
|
||||
func_240522_a_(Tags.Items.SEEDS_PUMPKIN).func_240534_a_(Items.PUMPKIN_SEEDS);
|
||||
func_240522_a_(Tags.Items.SEEDS_WHEAT).func_240534_a_(Items.WHEAT_SEEDS);
|
||||
func_240522_a_(Tags.Items.SHEARS).func_240534_a_(Items.SHEARS);
|
||||
func_240522_a_(Tags.Items.SLIMEBALLS).func_240534_a_(Items.SLIME_BALL);
|
||||
func_240521_a_(Tags.Blocks.STAINED_GLASS, Tags.Items.STAINED_GLASS);
|
||||
func_240521_a_(Tags.Blocks.STAINED_GLASS_PANES, Tags.Items.STAINED_GLASS_PANES);
|
||||
func_240521_a_(Tags.Blocks.STONE, Tags.Items.STONE);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_COAL, Tags.Items.STORAGE_BLOCKS_COAL);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_DIAMOND, Tags.Items.STORAGE_BLOCKS_DIAMOND);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_EMERALD, Tags.Items.STORAGE_BLOCKS_EMERALD);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_GOLD, Tags.Items.STORAGE_BLOCKS_GOLD);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_IRON, Tags.Items.STORAGE_BLOCKS_IRON);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_LAPIS, Tags.Items.STORAGE_BLOCKS_LAPIS);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE);
|
||||
func_240521_a_(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE);
|
||||
func_240522_a_(Tags.Items.STRING).func_240534_a_(Items.STRING);
|
||||
copy(Tags.Blocks.GRAVEL, Tags.Items.GRAVEL);
|
||||
getOrCreateBuilder(Tags.Items.GUNPOWDER).add(Items.GUNPOWDER);
|
||||
getOrCreateBuilder(Tags.Items.HEADS).add(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD);
|
||||
getOrCreateBuilder(Tags.Items.INGOTS).addTags(Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_BRICK, Tags.Items.INGOTS_NETHER_BRICK, Tags.Items.INGOTS_NETHERITE);
|
||||
getOrCreateBuilder(Tags.Items.INGOTS_BRICK).add(Items.BRICK);
|
||||
getOrCreateBuilder(Tags.Items.INGOTS_GOLD).add(Items.GOLD_INGOT);
|
||||
getOrCreateBuilder(Tags.Items.INGOTS_IRON).add(Items.IRON_INGOT);
|
||||
getOrCreateBuilder(Tags.Items.INGOTS_NETHERITE).add(Items.NETHERITE_INGOT);
|
||||
getOrCreateBuilder(Tags.Items.INGOTS_NETHER_BRICK).add(Items.NETHER_BRICK);
|
||||
getOrCreateBuilder(Tags.Items.LEATHER).add(Items.LEATHER);
|
||||
getOrCreateBuilder(Tags.Items.MUSHROOMS).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM);
|
||||
getOrCreateBuilder(Tags.Items.NETHER_STARS).add(Items.NETHER_STAR);
|
||||
copy(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK);
|
||||
getOrCreateBuilder(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD);
|
||||
getOrCreateBuilder(Tags.Items.NUGGETS_IRON).add(Items.IRON_NUGGET);
|
||||
getOrCreateBuilder(Tags.Items.NUGGETS_GOLD).add(Items.GOLD_NUGGET);
|
||||
copy(Tags.Blocks.OBSIDIAN, Tags.Items.OBSIDIAN);
|
||||
copy(Tags.Blocks.ORES, Tags.Items.ORES);
|
||||
copy(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL);
|
||||
copy(Tags.Blocks.ORES_DIAMOND, Tags.Items.ORES_DIAMOND);
|
||||
copy(Tags.Blocks.ORES_EMERALD, Tags.Items.ORES_EMERALD);
|
||||
copy(Tags.Blocks.ORES_GOLD, Tags.Items.ORES_GOLD);
|
||||
copy(Tags.Blocks.ORES_IRON, Tags.Items.ORES_IRON);
|
||||
copy(Tags.Blocks.ORES_LAPIS, Tags.Items.ORES_LAPIS);
|
||||
copy(Tags.Blocks.ORES_QUARTZ, Tags.Items.ORES_QUARTZ);
|
||||
copy(Tags.Blocks.ORES_REDSTONE, Tags.Items.ORES_REDSTONE);
|
||||
copy(Tags.Blocks.ORES_NETHERITE_SCRAP, Tags.Items.ORES_NETHERITE_SCRAP);
|
||||
getOrCreateBuilder(Tags.Items.RODS).addTags(Tags.Items.RODS_BLAZE, Tags.Items.RODS_WOODEN);
|
||||
getOrCreateBuilder(Tags.Items.RODS_BLAZE).add(Items.BLAZE_ROD);
|
||||
getOrCreateBuilder(Tags.Items.RODS_WOODEN).add(Items.STICK);
|
||||
copy(Tags.Blocks.SAND, Tags.Items.SAND);
|
||||
copy(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS);
|
||||
copy(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED);
|
||||
copy(Tags.Blocks.SANDSTONE, Tags.Items.SANDSTONE);
|
||||
getOrCreateBuilder(Tags.Items.SEEDS).addTags(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_WHEAT);
|
||||
getOrCreateBuilder(Tags.Items.SEEDS_BEETROOT).add(Items.BEETROOT_SEEDS);
|
||||
getOrCreateBuilder(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS);
|
||||
getOrCreateBuilder(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS);
|
||||
getOrCreateBuilder(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS);
|
||||
getOrCreateBuilder(Tags.Items.SHEARS).add(Items.SHEARS);
|
||||
getOrCreateBuilder(Tags.Items.SLIMEBALLS).add(Items.SLIME_BALL);
|
||||
copy(Tags.Blocks.STAINED_GLASS, Tags.Items.STAINED_GLASS);
|
||||
copy(Tags.Blocks.STAINED_GLASS_PANES, Tags.Items.STAINED_GLASS_PANES);
|
||||
copy(Tags.Blocks.STONE, Tags.Items.STONE);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_COAL, Tags.Items.STORAGE_BLOCKS_COAL);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_DIAMOND, Tags.Items.STORAGE_BLOCKS_DIAMOND);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_EMERALD, Tags.Items.STORAGE_BLOCKS_EMERALD);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_GOLD, Tags.Items.STORAGE_BLOCKS_GOLD);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_IRON, Tags.Items.STORAGE_BLOCKS_IRON);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_LAPIS, Tags.Items.STORAGE_BLOCKS_LAPIS);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE);
|
||||
copy(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE);
|
||||
getOrCreateBuilder(Tags.Items.STRING).add(Items.STRING);
|
||||
}
|
||||
|
||||
private void addColored(Consumer<ITag.INamedTag<Item>> consumer, ITag.INamedTag<Item> group, String pattern)
|
||||
{
|
||||
String prefix = group.func_230234_a_().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
String prefix = group.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (DyeColor color : DyeColor.values())
|
||||
{
|
||||
ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getTranslationKey()));
|
||||
@@ -149,22 +149,22 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
Item item = ForgeRegistries.ITEMS.getValue(key);
|
||||
if (item == null || item == Items.AIR)
|
||||
throw new IllegalStateException("Unknown vanilla item: " + key.toString());
|
||||
func_240522_a_(tag).func_240534_a_(item);
|
||||
getOrCreateBuilder(tag).add(item);
|
||||
consumer.accept(tag);
|
||||
}
|
||||
}
|
||||
|
||||
private void func_240521_a_Colored(ITag.INamedTag<Block> blockGroup, ITag.INamedTag<Item> itemGroup)
|
||||
{
|
||||
String blockPre = blockGroup.func_230234_a_().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
String itemPre = itemGroup.func_230234_a_().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
String blockPre = blockGroup.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
String itemPre = itemGroup.getName().getPath().toUpperCase(Locale.ENGLISH) + '_';
|
||||
for (DyeColor color : DyeColor.values())
|
||||
{
|
||||
ITag.INamedTag<Block> from = getForgeBlockTag(blockPre + color.getTranslationKey());
|
||||
ITag.INamedTag<Item> to = getForgeItemTag(itemPre + color.getTranslationKey());
|
||||
func_240521_a_(from, to);
|
||||
copy(from, to);
|
||||
}
|
||||
func_240521_a_(getForgeBlockTag(blockPre + "colorless"), getForgeItemTag(itemPre + "colorless"));
|
||||
copy(getForgeBlockTag(blockPre + "colorless"), getForgeItemTag(itemPre + "colorless"));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
@@ -76,7 +76,7 @@ public class ForgeRecipeProvider extends RecipeProvider
|
||||
replace(Items.STICK, Tags.Items.RODS_WOODEN);
|
||||
replace(Items.GOLD_INGOT, Tags.Items.INGOTS_GOLD);
|
||||
replace(Items.IRON_INGOT, Tags.Items.INGOTS_IRON);
|
||||
replace(Items.field_234759_km_, Tags.Items.INGOTS_NETHERITE);
|
||||
replace(Items.NETHERITE_INGOT, Tags.Items.INGOTS_NETHERITE);
|
||||
replace(Items.DIAMOND, Tags.Items.GEMS_DIAMOND);
|
||||
replace(Items.EMERALD, Tags.Items.GEMS_EMERALD);
|
||||
replace(Items.CHEST, Tags.Items.CHESTS_WOODEN);
|
||||
@@ -88,7 +88,7 @@ public class ForgeRecipeProvider extends RecipeProvider
|
||||
exclude(Items.IRON_NUGGET);
|
||||
exclude(Blocks.DIAMOND_BLOCK);
|
||||
exclude(Blocks.EMERALD_BLOCK);
|
||||
exclude(Blocks.field_235397_ng_);
|
||||
exclude(Blocks.NETHERITE_BLOCK);
|
||||
|
||||
exclude(Blocks.COBBLESTONE_STAIRS);
|
||||
exclude(Blocks.COBBLESTONE_SLAB);
|
||||
|
||||
Reference in new issue
Block a user