diff --git a/src/generated/resources/data/botania/loot_tables/blocks/black_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/black_double_flower.json index 6cecb794d..57d1fd6de 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/black_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/black_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/blue_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/blue_double_flower.json index 827bbb41e..ddee32eef 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/blue_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/blue_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/brown_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/brown_double_flower.json index 6ef83d7d5..ae64f09c7 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/brown_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/brown_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/cyan_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/cyan_double_flower.json index 14d263fec..89bfdf6bb 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/cyan_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/cyan_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/gray_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/gray_double_flower.json index 9a48fa9b3..c0d9b2d74 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/gray_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/gray_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/green_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/green_double_flower.json index 417b9b61a..51e30bc37 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/green_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/green_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/light_blue_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/light_blue_double_flower.json index 2c10a93b1..b722ae8cc 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/light_blue_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/light_blue_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/light_gray_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/light_gray_double_flower.json index c481a40fd..dde698293 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/light_gray_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/light_gray_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/lime_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/lime_double_flower.json index 2da083545..186bae0cb 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/lime_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/lime_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/magenta_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/magenta_double_flower.json index 60fa5cc67..0e73fb4e0 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/magenta_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/magenta_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/orange_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/orange_double_flower.json index 78a273f2d..08359065b 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/orange_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/orange_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/pink_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/pink_double_flower.json index d6d840edc..5adcc516b 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/pink_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/pink_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/purple_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/purple_double_flower.json index 4dd36beaf..64994b04c 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/purple_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/purple_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/red_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/red_double_flower.json index d4fbe3ff4..11a9d58ee 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/red_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/red_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/white_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/white_double_flower.json index 0800f6ca8..fdbd0cc1e 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/white_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/white_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/botania/loot_tables/blocks/yellow_double_flower.json b/src/generated/resources/data/botania/loot_tables/blocks/yellow_double_flower.json index 66f2d06bb..9a9b88dd1 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/yellow_double_flower.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/yellow_double_flower.json @@ -18,7 +18,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "minecraft:shears" + "tag": "forge:shears" } } ], diff --git a/src/generated/resources/data/forge/tags/items/shears.json b/src/generated/resources/data/forge/tags/items/shears.json new file mode 100644 index 000000000..689176b88 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/shears.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:shears", + "botania:elementium_shears", + "botania:manasteel_shears" + ] +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index 4f2cd6e06..07b904fec 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -58,6 +58,8 @@ public class ModTags { public static final Tag MAGNET_RING_BLACKLIST = tag("magnet_ring_blacklist"); public static final Tag LOONIUM_BLACKLIST = tag("loonium_blacklist"); + public static final Tag SHEARS = forgeTag("shears"); + public static final Tag DISPOSABLE = tag("disposable"); public static final Tag SEMI_DISPOSABLE = tag("semi_disposable"); diff --git a/src/main/java/vazkii/botania/data/BlockLootProvider.java b/src/main/java/vazkii/botania/data/BlockLootProvider.java index d161cf92e..0b236d6bb 100644 --- a/src/main/java/vazkii/botania/data/BlockLootProvider.java +++ b/src/main/java/vazkii/botania/data/BlockLootProvider.java @@ -23,7 +23,6 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.DirectoryCache; import net.minecraft.data.IDataProvider; import net.minecraft.enchantment.Enchantments; -import net.minecraft.item.Items; import net.minecraft.state.properties.DoubleBlockHalf; import net.minecraft.state.properties.SlabType; import net.minecraft.util.ResourceLocation; @@ -60,6 +59,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; @@ -213,7 +213,7 @@ public class BlockLootProvider implements IDataProvider { private static LootTable.Builder genDoubleFlower(Block b) { LootEntry.Builder entry = ItemLootEntry.builder(b) .acceptCondition(BlockStateProperty.builder(b).func_227567_a_(StatePropertiesPredicate.Builder.create().exactMatch(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER))) - .acceptCondition(MatchTool.builder(ItemPredicate.Builder.create().item(Items.SHEARS))); + .acceptCondition(MatchTool.builder(ItemPredicate.Builder.create().tag(ModTags.Items.SHEARS))); LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry) .acceptCondition(SurvivesExplosion.builder()); return LootTable.builder().addLootPool(pool); diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index 583ad1ea3..9ab1c521e 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -12,6 +12,7 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.ItemTagsProvider; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; +import net.minecraft.item.Items; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; @@ -37,6 +38,8 @@ public class ItemTagProvider extends ItemTagsProvider { this.copy(BlockTags.WALLS, ItemTags.WALLS); this.copy(BlockTags.FENCES, ItemTags.FENCES); + this.getBuilder(ModTags.Items.SHEARS).add(Items.SHEARS).add(ModItems.elementiumShears).add(ModItems.manasteelShears); + this.copy(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS, ModTags.Items.MUNDANE_FLOATING_FLOWERS); this.copy(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS, ModTags.Items.SPECIAL_FLOATING_FLOWERS); this.copy(ModTags.Blocks.FLOATING_FLOWERS, ModTags.Items.FLOATING_FLOWERS);