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 655e9ae35..6cecb794d 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:black_double_flower" 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 207954d02..827bbb41e 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:blue_double_flower" 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 dd84c03f5..6ef83d7d5 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:brown_double_flower" 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 f1569a1af..14d263fec 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:cyan_double_flower" 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 579cd491e..9a48fa9b3 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:gray_double_flower" 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 4baa48e5c..417b9b61a 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:green_double_flower" 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 c6385dae0..2c10a93b1 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:light_blue_double_flower" 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 4071901f5..c481a40fd 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:light_gray_double_flower" 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 fac84ad97..2da083545 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:lime_double_flower" 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 c3f1316d3..60fa5cc67 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:magenta_double_flower" 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 eabb45e65..78a273f2d 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:orange_double_flower" 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 182dbfd38..d6d840edc 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:pink_double_flower" 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 0e5b753ee..4dd36beaf 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:purple_double_flower" 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 41b6cb384..d4fbe3ff4 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:red_double_flower" 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 0516d0f65..0800f6ca8 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:white_double_flower" 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 1bcfd2d20..66f2d06bb 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 @@ -14,6 +14,12 @@ "properties": { "half": "lower" } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } } ], "name": "botania:yellow_double_flower" diff --git a/src/main/java/vazkii/botania/data/BlockLootProvider.java b/src/main/java/vazkii/botania/data/BlockLootProvider.java index 771a60051..d161cf92e 100644 --- a/src/main/java/vazkii/botania/data/BlockLootProvider.java +++ b/src/main/java/vazkii/botania/data/BlockLootProvider.java @@ -8,7 +8,6 @@ */ package vazkii.botania.data; -import com.google.common.base.Stopwatch; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -24,6 +23,7 @@ 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; @@ -78,7 +78,6 @@ public class BlockLootProvider implements IDataProvider { public BlockLootProvider(DataGenerator generator) { this.generator = generator; - Stopwatch s = Stopwatch.createStarted(); for (Block b : ForgeRegistries.BLOCKS) { if (!LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace())) { continue; @@ -126,12 +125,10 @@ public class BlockLootProvider implements IDataProvider { functionTable.put(ModSubtiles.spectrolusFloating, b -> genCopyNbt(b, SubTileSpectrolus.TAG_NEXT_COLOR)); functionTable.put(ModSubtiles.thermalily, b -> genCopyNbt(b, SubTileHydroangeas.TAG_COOLDOWN)); functionTable.put(ModSubtiles.thermalilyFloating, b -> genCopyNbt(b, SubTileHydroangeas.TAG_COOLDOWN)); - Botania.LOGGER.info("BLP constructed in {}", s.elapsed(TimeUnit.MILLISECONDS)); } @Override public void act(DirectoryCache cache) throws IOException { - Stopwatch s = Stopwatch.createStarted(); Map tables = new HashMap<>(); for (Block b : ForgeRegistries.BLOCKS) { @@ -141,13 +138,11 @@ public class BlockLootProvider implements IDataProvider { Function func = functionTable.getOrDefault(b, BlockLootProvider::genRegular); tables.put(b.getRegistryName(), func.apply(b)); } - Botania.LOGGER.info("BLP run in {}", s.elapsed(TimeUnit.MILLISECONDS)); for (Map.Entry e : tables.entrySet()) { Path path = getPath(generator.getOutputFolder(), e.getKey()); IDataProvider.save(GSON, cache, LootTableManager.toJson(e.getValue().setParameterSet(LootParameterSets.BLOCK).build()), path); } - Botania.LOGGER.info("BLP written in {}", s.elapsed(TimeUnit.MILLISECONDS)); } private static Path getPath(Path root, ResourceLocation id) { @@ -217,7 +212,8 @@ 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(BlockStateProperty.builder(b).func_227567_a_(StatePropertiesPredicate.Builder.create().exactMatch(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER))) + .acceptCondition(MatchTool.builder(ItemPredicate.Builder.create().item(Items.SHEARS))); LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry) .acceptCondition(SurvivesExplosion.builder()); return LootTable.builder().addLootPool(pool);