diff --git a/src/main/generated/data/acesbs/loot_table/blocks/lemonwood_leaves.json b/src/main/generated/data/acesbs/loot_table/blocks/lemonwood_leaves.json index 7727b0d..a63ec64 100644 --- a/src/main/generated/data/acesbs/loot_table/blocks/lemonwood_leaves.json +++ b/src/main/generated/data/acesbs/loot_table/blocks/lemonwood_leaves.json @@ -127,6 +127,63 @@ } ], "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.005, + 0.0055555557, + 0.00625, + 0.008333334, + 0.025 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "name": "acesbs:lemon" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md index 52504ce..749a22a 100644 --- a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md +++ b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md @@ -18,6 +18,7 @@ - Durability calculations have changed to reflect the material's rarity. - Tools have the mining level of the base material with the durability of the next tier. - Hammers get the equivalent durability for the materials put into them. (effectively the durability x6.33) +- Lemonwood Trees now drop lemons. # Known Issues - The Command Core Item does not display the correct texture when activated. diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java index 3424362..a33a85f 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java @@ -77,7 +77,7 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider { addDrop(LemonWoodBlocks.LEMONWOOD_WOOD); addDrop(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD); addDrop(LemonWoodBlocks.LEMONWOOD_SAPLING); - addDrop(LemonWoodBlocks.LEMONWOOD_LEAVES, leavesDrops(LemonWoodBlocks.LEMONWOOD_LEAVES, LemonWoodBlocks.LEMONWOOD_SAPLING, 0.0625f)); + addDrop(LemonWoodBlocks.LEMONWOOD_LEAVES, lemonwoodLeavesDrops(LemonWoodBlocks.LEMONWOOD_LEAVES, LemonWoodBlocks.LEMONWOOD_SAPLING, 0.0625f)); addDrop(LemonWoodBlocks.LEMONWOOD_PLANKS); addDrop(LemonWoodBlocks.LEMONWOOD_STAIRS); @@ -120,6 +120,11 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider { this.addDrop(ModBlocks.TOBACCO_CROP, this.cropDrops(ModBlocks.TOBACCO_CROP, ModItems.TOBACCO, ModItems.TOBACCO_SEEDS, builder2)); } + public LootTable.Builder lemonwoodLeavesDrops(Block leaves, Block sapling, float... saplingChance) { + RegistryWrapper.Impl impl = this.registries.getOrThrow(RegistryKeys.ENCHANTMENT); + return this.leavesDrops(leaves, sapling, saplingChance).pool(LootPool.builder().rolls(ConstantLootNumberProvider.create(1.0F)).conditionally(this.createWithoutShearsOrSilkTouchCondition()).with(((LeafEntry.Builder)this.addSurvivesExplosionCondition(leaves, ItemEntry.builder(ModItems.LEMON))).conditionally(TableBonusLootCondition.builder(impl.getOrThrow(Enchantments.FORTUNE), new float[]{0.005F, 0.0055555557F, 0.00625F, 0.008333334F, 0.025F})))); + } + public LootTable.Builder multipleOreDrops(Block drop, Item item, float minDrops, float maxDrops) { RegistryWrapper.Impl impl = this.registries.getOrThrow(RegistryKeys.ENCHANTMENT); return this.dropsWithSilkTouch(