From 03dd32819baa0aff7511cb49fca04a91b12d3ae4 Mon Sep 17 00:00:00 2001 From: jottyfan Date: Sat, 4 Dec 2021 19:04:49 +0100 Subject: [PATCH] small enhancements --- .../minecraft/quickiefabric/init/RegistryManager.java | 10 ++-------- .../quickiefabric/tools/ToolSpeedpowderHoe.java | 4 +++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 470dfd6..9b40abd 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -22,7 +22,6 @@ import de.jottyfan.minecraft.quickiefabric.event.EventBlockBreak; import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; import de.jottyfan.minecraft.quickiefabric.tools.QuickieTools; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; -import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder; import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback; import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.fabricmc.fabric.api.registry.FuelRegistry; @@ -36,9 +35,6 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.loot.condition.RandomChanceLootCondition; -import net.minecraft.loot.entry.ItemEntry; -import net.minecraft.loot.provider.number.ConstantLootNumberProvider; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.structure.rule.BlockMatchRuleTest; import net.minecraft.structure.rule.TagMatchRuleTest; @@ -305,10 +301,8 @@ public class RegistryManager { public static final void registerLootings() { LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, id, supplier, setter) -> { if (isGrass(id)) { - FabricLootPoolBuilder poolBuilder = FabricLootPoolBuilder.builder().rolls(ConstantLootNumberProvider.create(1)) - .withCondition(RandomChanceLootCondition.builder(0.125f).build()) - .withEntry(ItemEntry.builder(QuickieItems.COTTONSEED).build()); - supplier.withPool(poolBuilder.build()); + supplier.withPool(LootHelper.build(1, QuickieItems.COTTONSEED, 0.125f).build()); + supplier.withPool(LootHelper.build(2, QuickieItems.SALPETER, 0.012f).build()); } }); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java index 093dc06..46083a6 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java @@ -8,6 +8,7 @@ import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; import net.fabricmc.fabric.api.tool.attribute.v1.ToolManager; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.item.HoeItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -58,7 +59,8 @@ public class ToolSpeedpowderHoe extends HoeItem implements ToolRangeable { @Override public boolean canBreakNeighbors(BlockState blockState) { - return ToolManager.handleIsEffectiveOn(blockState, new ItemStack(this), null); + return ToolManager.handleIsEffectiveOn(blockState, new ItemStack(this), null) + || Blocks.GRASS.equals(blockState.getBlock()); }