Cleanup and expand Forge tags (#7004)

This commit is contained in:
Cyborgmas 2020-08-21 14:30:21 -04:00 committed by GitHub
parent 07ffc890e5
commit e803006360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 93 additions and 47 deletions

View File

@ -6,6 +6,8 @@
"minecraft:birch_fence_gate",
"minecraft:jungle_fence_gate",
"minecraft:acacia_fence_gate",
"minecraft:dark_oak_fence_gate"
"minecraft:dark_oak_fence_gate",
"minecraft:crimson_fence_gate",
"minecraft:warped_fence_gate"
]
}

View File

@ -6,6 +6,8 @@
"minecraft:birch_fence",
"minecraft:jungle_fence",
"minecraft:acacia_fence",
"minecraft:dark_oak_fence"
"minecraft:dark_oak_fence",
"minecraft:crimson_fence",
"minecraft:warped_fence"
]
}

View File

@ -8,6 +8,7 @@
"#forge:ores/iron",
"#forge:ores/lapis",
"#forge:ores/redstone",
"#forge:ores/quartz"
"#forge:ores/quartz",
"#forge:ores/netherite_scrap"
]
}

View File

@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gold_ore"
"#minecraft:gold_ores"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:ancient_debris"
]
}

View File

@ -8,6 +8,7 @@
"#forge:storage_blocks/iron",
"#forge:storage_blocks/lapis",
"#forge:storage_blocks/quartz",
"#forge:storage_blocks/redstone"
"#forge:storage_blocks/redstone",
"#forge:storage_blocks/netherite"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:netherite_block"
]
}

View File

@ -1,8 +0,0 @@
{
"replace": false,
"values": [
"minecraft:arrow",
"minecraft:tipped_arrow",
"minecraft:spectral_arrow"
]
}

View File

@ -6,6 +6,8 @@
"minecraft:birch_fence_gate",
"minecraft:jungle_fence_gate",
"minecraft:acacia_fence_gate",
"minecraft:dark_oak_fence_gate"
"minecraft:dark_oak_fence_gate",
"minecraft:crimson_fence_gate",
"minecraft:warped_fence_gate"
]
}

View File

@ -6,6 +6,8 @@
"minecraft:birch_fence",
"minecraft:jungle_fence",
"minecraft:acacia_fence",
"minecraft:dark_oak_fence"
"minecraft:dark_oak_fence",
"minecraft:crimson_fence",
"minecraft:warped_fence"
]
}

View File

@ -4,6 +4,7 @@
"#forge:ingots/iron",
"#forge:ingots/gold",
"#forge:ingots/brick",
"#forge:ingots/nether_brick"
"#forge:ingots/nether_brick",
"#forge:ingots/netherite"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:netherite_ingot"
]
}

View File

@ -1,17 +0,0 @@
{
"replace": false,
"values": [
"minecraft:music_disc_13",
"minecraft:music_disc_cat",
"minecraft:music_disc_blocks",
"minecraft:music_disc_chirp",
"minecraft:music_disc_far",
"minecraft:music_disc_mall",
"minecraft:music_disc_mellohi",
"minecraft:music_disc_stal",
"minecraft:music_disc_strad",
"minecraft:music_disc_ward",
"minecraft:music_disc_11",
"minecraft:music_disc_wait"
]
}

View File

@ -8,6 +8,7 @@
"#forge:ores/iron",
"#forge:ores/lapis",
"#forge:ores/redstone",
"#forge:ores/quartz"
"#forge:ores/quartz",
"#forge:ores/netherite_scrap"
]
}

View File

@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gold_ore"
"#minecraft:gold_ores"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:ancient_debris"
]
}

View File

@ -8,6 +8,7 @@
"#forge:storage_blocks/iron",
"#forge:storage_blocks/lapis",
"#forge:storage_blocks/quartz",
"#forge:storage_blocks/redstone"
"#forge:storage_blocks/redstone",
"#forge:storage_blocks/netherite"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:netherite_block"
]
}

View File

@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"SSS",
"S#S",
"SSS"
],
"key": {
"S": {
"item": "minecraft:chiseled_stone_bricks"
},
"#": {
"tag": "forge:ingots/netherite"
}
},
"result": {
"item": "minecraft:lodestone"
}
}

View File

@ -100,6 +100,7 @@ public class Tags
public static final IOptionalNamedTag<Block> ORES_GOLD = tag("ores/gold");
public static final IOptionalNamedTag<Block> ORES_IRON = tag("ores/iron");
public static final IOptionalNamedTag<Block> ORES_LAPIS = tag("ores/lapis");
public static final IOptionalNamedTag<Block> ORES_NETHERITE_SCRAP = tag("ores/netherite_scrap");
public static final IOptionalNamedTag<Block> ORES_QUARTZ = tag("ores/quartz");
public static final IOptionalNamedTag<Block> ORES_REDSTONE = tag("ores/redstone");
@ -118,6 +119,7 @@ public class Tags
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_GOLD = tag("storage_blocks/gold");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_IRON = tag("storage_blocks/iron");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_NETHERITE = tag("storage_blocks/netherite");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_QUARTZ = tag("storage_blocks/quartz");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone");
@ -130,7 +132,7 @@ public class Tags
public static class Items
{
private static void init(){}
public static final IOptionalNamedTag<Item> ARROWS = tag("arrows");
public static final IOptionalNamedTag<Item> BONES = tag("bones");
public static final IOptionalNamedTag<Item> BOOKSHELVES = tag("bookshelves");
public static final IOptionalNamedTag<Item> CHESTS = tag("chests");
@ -228,10 +230,10 @@ public class Tags
public static final IOptionalNamedTag<Item> INGOTS_BRICK = tag("ingots/brick");
public static final IOptionalNamedTag<Item> INGOTS_GOLD = tag("ingots/gold");
public static final IOptionalNamedTag<Item> INGOTS_IRON = tag("ingots/iron");
public static final IOptionalNamedTag<Item> INGOTS_NETHERITE = tag("ingots/netherite");
public static final IOptionalNamedTag<Item> INGOTS_NETHER_BRICK = tag("ingots/nether_brick");
public static final IOptionalNamedTag<Item> LEATHER = tag("leather");
public static final IOptionalNamedTag<Item> MUSHROOMS = tag("mushrooms");
public static final IOptionalNamedTag<Item> MUSIC_DISCS = tag("music_discs");
public static final IOptionalNamedTag<Item> NETHER_STARS = tag("nether_stars");
public static final IOptionalNamedTag<Item> NETHERRACK = tag("netherrack");
public static final IOptionalNamedTag<Item> NUGGETS = tag("nuggets");
@ -245,6 +247,7 @@ public class Tags
public static final IOptionalNamedTag<Item> ORES_GOLD = tag("ores/gold");
public static final IOptionalNamedTag<Item> ORES_IRON = tag("ores/iron");
public static final IOptionalNamedTag<Item> ORES_LAPIS = tag("ores/lapis");
public static final IOptionalNamedTag<Item> ORES_NETHERITE_SCRAP = tag("ores/netherite_scrap");
public static final IOptionalNamedTag<Item> ORES_QUARTZ = tag("ores/quartz");
public static final IOptionalNamedTag<Item> ORES_REDSTONE = tag("ores/redstone");
public static final IOptionalNamedTag<Item> RODS = tag("rods");
@ -273,6 +276,7 @@ public class Tags
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_GOLD = tag("storage_blocks/gold");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_IRON = tag("storage_blocks/iron");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_NETHERITE = tag("storage_blocks/netherite");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_QUARTZ = tag("storage_blocks/quartz");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone");
public static final IOptionalNamedTag<Item> STRING = tag("string");

View File

@ -21,6 +21,7 @@ package net.minecraftforge.common.data;
import net.minecraft.data.DataGenerator;
import net.minecraft.item.DyeColor;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ITag;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.Tags;
@ -61,10 +62,10 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
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);
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);
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");
@ -74,21 +75,22 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
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);
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_240534_a_(Blocks.GOLD_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);
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);
@ -97,6 +99,7 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
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_);
}
private void addColored(Consumer<Block> consumer, ITag.INamedTag<Block> group, String pattern)

View File

@ -33,7 +33,6 @@ import net.minecraft.item.DyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.Items;
import net.minecraft.tags.ITag;
import net.minecraft.tags.Tag;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.Tags;
import net.minecraftforge.registries.ForgeRegistries;
@ -54,7 +53,6 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
super.registerTags();
filter = this.tagToBuilder.entrySet().stream().map(e -> e.getKey()).collect(Collectors.toSet());
func_240522_a_(Tags.Items.ARROWS).func_240534_a_(Items.ARROW, Items.TIPPED_ARROW, Items.SPECTRAL_ARROW);
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);
@ -95,14 +93,14 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
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);
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.MUSIC_DISCS).func_240534_a_(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT);
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);
@ -118,6 +116,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
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);
@ -144,6 +143,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
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);
}

View File

@ -77,6 +77,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.DIAMOND, Tags.Items.GEMS_DIAMOND);
replace(Items.EMERALD, Tags.Items.GEMS_EMERALD);
replace(Items.CHEST, Tags.Items.CHESTS_WOODEN);
@ -88,6 +89,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.COBBLESTONE_STAIRS);
exclude(Blocks.COBBLESTONE_SLAB);