support mod shears with "forge:shears" tag & add manasteel and elementium shears to loot tables of double flowers (#3258)

This commit is contained in:
cech12 authored and GitHub committed 2020-04-21 09:18:41 -05:00
1 parent 984e2448c8
commit bf41f5cc38
20 files changed
+31 -18

No files matched your search

@@ -58,6 +58,8 @@ public class ModTags {
public static final Tag<Item> MAGNET_RING_BLACKLIST = tag("magnet_ring_blacklist");
public static final Tag<Item> LOONIUM_BLACKLIST = tag("loonium_blacklist");
public static final Tag<Item> SHEARS = forgeTag("shears");
public static final Tag<Item> DISPOSABLE = tag("disposable");
public static final Tag<Item> SEMI_DISPOSABLE = tag("semi_disposable");
@@ -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);
@@ -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);