From 40ab94d4feef7683454b3821fb45d515cf924d0f Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 17 May 2023 14:45:44 +0200 Subject: [PATCH] LootTable related changes --- .../org/betterx/bclib/blocks/BaseAnvilBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseBarrelBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseBlock.java | 4 ++-- .../betterx/bclib/blocks/BaseBlockWithEntity.java | 4 ++-- .../org/betterx/bclib/blocks/BaseBookshelfBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseButtonBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseChainBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseChestBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseComposterBlock.java | 4 ++-- .../betterx/bclib/blocks/BaseCraftingTableBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseCropBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseDoorBlock.java | 4 ++-- .../betterx/bclib/blocks/BaseDoublePlantBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseFenceBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseFurnaceBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseGateBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseGlassBlock.java | 12 ++++++------ .../org/betterx/bclib/blocks/BaseLadderBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseLeavesBlock.java | 6 +++--- .../org/betterx/bclib/blocks/BaseMetalBarsBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseOreBlock.java | 6 +++--- .../java/org/betterx/bclib/blocks/BasePathBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BasePlantBlock.java | 4 ++-- .../betterx/bclib/blocks/BasePressurePlateBlock.java | 4 ++-- .../betterx/bclib/blocks/BaseRotatedPillarBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseSignBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseSlabBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseStairsBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseTerrainBlock.java | 4 ++-- .../org/betterx/bclib/blocks/BaseTrapdoorBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseVineBlock.java | 4 ++-- .../java/org/betterx/bclib/blocks/BaseWallBlock.java | 4 ++-- .../betterx/bclib/blocks/BaseWeightedPlateBlock.java | 4 ++-- .../betterx/bclib/blocks/FeatureSaplingBlock.java | 4 ++-- .../betterx/bclib/blocks/UnderwaterPlantBlock.java | 4 ++-- .../org/betterx/bclib/blocks/UpDownPlantBlock.java | 4 ++-- .../org/betterx/bclib/blocks/WallMushroomBlock.java | 4 ++-- .../betterx/bclib/mixin/common/LootPoolMixin.java | 6 +++--- src/main/java/org/betterx/bclib/util/LootUtil.java | 10 +++++----- 39 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java index 1647e537..5b56756e 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java @@ -23,7 +23,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.fabricmc.api.EnvType; @@ -102,7 +102,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { int destruction = state.getValue(DESTRUCTION); int durability = state.getValue(getDurabilityProp()); int value = destruction * getMaxDurability() + durability; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java index 5da62bd3..d96a85af 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java @@ -29,7 +29,7 @@ import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.phys.BlockHitResult; import net.fabricmc.api.EnvType; @@ -56,7 +56,7 @@ public class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider { @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { List drop = super.getDrops(state, builder); drop.add(new ItemStack(this.asItem())); return drop; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBlock.java index 4ea45c76..d1f48f8f 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBlock.java @@ -8,7 +8,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import java.util.Collections; import java.util.List; @@ -40,7 +40,7 @@ public class BaseBlock extends Block implements BlockModelProvider { */ @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java b/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java index 5900b454..f2e8b8d4 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java @@ -5,7 +5,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.BaseEntityBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import java.util.Collections; import java.util.List; @@ -22,7 +22,7 @@ public class BaseBlockWithEntity extends BaseEntityBlock { @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java index 32067e76..b4ffd10e 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java @@ -13,7 +13,7 @@ import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.fabricmc.api.EnvType; @@ -50,7 +50,7 @@ public class BaseBookshelfBlock extends BaseBlock { } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null) { int silk = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java index 60345937..b6d8ea5f 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java @@ -16,7 +16,7 @@ import net.minecraft.world.level.block.ButtonBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.AttachFace; import net.minecraft.world.level.block.state.properties.BlockSetType; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -49,7 +49,7 @@ public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelP @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java index 855b18b8..490c1604 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java @@ -17,7 +17,7 @@ import net.minecraft.world.level.block.ChainBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -39,7 +39,7 @@ public class BaseChainBlock extends ChainBlock implements BlockModelProvider, Re @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java index d3e7f898..c07f0683 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.ChestBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -39,7 +39,7 @@ public class BaseChestBlock extends ChestBlock implements BlockModelProvider { @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { List drop = super.getDrops(state, builder); drop.add(new ItemStack(this.asItem())); return drop; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java index 6072e984..1be44650 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.ComposterBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -30,7 +30,7 @@ public class BaseComposterBlock extends ComposterBlock implements BlockModelProv @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this.asItem())); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java index c5ca01ab..8b13a170 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.CraftingTableBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -34,7 +34,7 @@ public class BaseCraftingTableBlock extends CraftingTableBlock implements BlockM @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this.asItem())); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java index b3f03f02..8ee1fdc2 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java @@ -19,7 +19,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.IntegerProperty; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -63,7 +63,7 @@ public class BaseCropBlock extends BasePlantBlock { } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { if (state.getValue(AGE) < 3) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java index 6e1635c8..74825a7b 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java @@ -26,7 +26,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockSetType; import net.minecraft.world.level.block.state.properties.DoorHingeSide; import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -48,7 +48,7 @@ public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, Blo @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { if (state.getValue(HALF) == DoubleBlockHalf.LOWER) return Collections.singletonList(new ItemStack(this.asItem())); else return Collections.emptyList(); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java index 4b5f8df1..b009b5a9 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java @@ -28,7 +28,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.IntegerProperty; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; @@ -113,7 +113,7 @@ public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements R } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel( Enchantments.SILK_TOUCH, diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java index 089f2e37..44d3e3ab 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java @@ -14,7 +14,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FenceBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -35,7 +35,7 @@ public class BaseFenceBlock extends FenceBlock implements BlockModelProvider { @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java index ba784476..b2e4cb0d 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java @@ -26,7 +26,7 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.fabricmc.api.EnvType; @@ -109,7 +109,7 @@ public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { List drop = Lists.newArrayList(new ItemStack(this)); BlockEntity blockEntity = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY); if (blockEntity instanceof BaseFurnaceBlockEntity) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java index bf222a44..28900c10 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FenceGateBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.WoodType; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -35,7 +35,7 @@ public class BaseGateBlock extends FenceGateBlock implements BlockModelProvider @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java index 751e9684..531d53dc 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.fabricmc.api.EnvType; @@ -28,10 +28,10 @@ public class BaseGlassBlock extends BaseBlockNotFull implements AddMineablePicka public BaseGlassBlock(Block block, float resistance) { super(Properties.copy(block) - .explosionResistance(resistance) - .noOcclusion() - .isSuffocating((arg1, arg2, arg3) -> false) - .isViewBlocking((arg1, arg2, arg3) -> false)); + .explosionResistance(resistance) + .noOcclusion() + .isSuffocating((arg1, arg2, arg3) -> false) + .isViewBlocking((arg1, arg2, arg3) -> false)); } @Environment(EnvType.CLIENT) @@ -50,7 +50,7 @@ public class BaseGlassBlock extends BaseBlockNotFull implements AddMineablePicka } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) { return Collections.singletonList(new ItemStack(this)); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java index 6db903be..d0bddcd8 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -67,7 +67,7 @@ public class BaseLadderBlock extends LadderBlock implements RenderLayerProvider, @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java index ef67d865..402a985d 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java @@ -25,7 +25,7 @@ import net.minecraft.world.level.block.LeavesBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import com.google.common.collect.Lists; @@ -83,14 +83,14 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return BaseLeavesBlock.getLeaveDrops(this, this.sapling, builder, 16, 16); } public static List getLeaveDrops( ItemLike leaveBlock, Block sapling, - LootContext.Builder builder, + LootParams.Builder builder, int fortuneRate, int dropRate ) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java index bed783e7..0177eeb0 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.IronBarsBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -40,7 +40,7 @@ public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvi @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java index 4d599a72..f3e1e0d9 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java @@ -26,7 +26,7 @@ import net.minecraft.world.level.block.DropExperienceBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import java.util.Collections; @@ -76,7 +76,7 @@ public class BaseOreBlock extends DropExperienceBlock implements BlockModelProvi @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return LootUtil .getDrops(this, state, builder) .orElseGet( @@ -99,7 +99,7 @@ public class BaseOreBlock extends DropExperienceBlock implements BlockModelProvi int minCount, int miningLevel, BlockState state, - LootContext.Builder builder + LootParams.Builder builder ) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && tool.isCorrectToolForDrops(state)) { diff --git a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java index c99e59f3..5fdea577 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java @@ -16,7 +16,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -48,7 +48,7 @@ public class BasePathBlock extends BaseBlockNotFull { } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) { return Collections.singletonList(new ItemStack(this)); diff --git a/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java index 6160183a..f4014ef9 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java @@ -28,7 +28,7 @@ import net.minecraft.world.level.block.BonemealableBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; @@ -154,7 +154,7 @@ public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderL } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel( Enchantments.SILK_TOUCH, diff --git a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java index 42fd9ab2..34c765fc 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.PressurePlateBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockSetType; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -38,7 +38,7 @@ public class BasePressurePlateBlock extends PressurePlateBlock implements BlockM @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java index 7731088d..57da8422 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java @@ -11,7 +11,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.RotatedPillarBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -33,7 +33,7 @@ public class BaseRotatedPillarBlock extends RotatedPillarBlock implements BlockM @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java index 07851c6e..97dd7107 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java @@ -35,7 +35,7 @@ import net.minecraft.world.level.block.state.properties.WoodType; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -178,7 +178,7 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, Cust } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java index 0482e035..b9b7f51d 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.SlabType; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -45,7 +45,7 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, Cust @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { int count = state.getValue(TYPE) == SlabType.DOUBLE ? 2 : 1; return Collections.singletonList(new ItemStack(this, count)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java index 2acb7f31..d52c3238 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java @@ -19,7 +19,7 @@ import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.Half; import net.minecraft.world.level.block.state.properties.StairsShape; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -46,7 +46,7 @@ public class BaseStairsBlock extends StairBlock implements BlockModelProvider, C @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java index 30399adc..81a0ae55 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java @@ -32,7 +32,7 @@ import net.minecraft.world.level.block.SnowLayerBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.lighting.LightEngine; import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.BlockHitResult; @@ -93,7 +93,7 @@ public class BaseTerrainBlock extends BaseBlock { } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) { return Collections.singletonList(new ItemStack(this)); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java index a591720e..b658f925 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockSetType; import net.minecraft.world.level.block.state.properties.Half; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -37,7 +37,7 @@ public class BaseTrapdoorBlock extends TrapDoorBlock implements RenderLayerProvi @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java index 7ccddf45..a65727a2 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java @@ -27,7 +27,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; @@ -118,7 +118,7 @@ public class BaseVineBlock extends BaseBlockNotFull implements RenderLayerProvid } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel( Enchantments.SILK_TOUCH, diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java index a8a10036..9ae064d6 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.WallBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.WallSide; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -36,7 +36,7 @@ public class BaseWallBlock extends WallBlock implements BlockModelProvider { @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java index a6e99105..c0b60d0c 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.WeightedPressurePlateBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockSetType; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -43,7 +43,7 @@ public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implement @Override @SuppressWarnings("deprecation") - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java b/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java index 2332494b..87e8336a 100644 --- a/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java @@ -27,7 +27,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -79,7 +79,7 @@ public class FeatureSaplingBlock, FC extends FeatureConfig } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Collections.singletonList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java index edafd9da..b62f2896 100644 --- a/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java @@ -26,7 +26,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; @@ -130,7 +130,7 @@ public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements R } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel( Enchantments.SILK_TOUCH, diff --git a/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java b/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java index 2c9f502d..d4efabac 100644 --- a/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java @@ -22,7 +22,7 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -83,7 +83,7 @@ public abstract class UpDownPlantBlock extends BaseBlockNotFull implements Rende } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel( Enchantments.SILK_TOUCH, diff --git a/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java b/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java index 016362a2..67e56def 100644 --- a/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import com.google.common.collect.Lists; @@ -23,7 +23,7 @@ public abstract class WallMushroomBlock extends BaseWallPlantBlock { } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { return Lists.newArrayList(new ItemStack(this)); } diff --git a/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java b/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java index a0cbd667..f39390a3 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java @@ -3,7 +3,7 @@ package org.betterx.bclib.mixin.common; import org.betterx.bclib.interfaces.LootPoolAccessor; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; import net.minecraft.world.level.storage.loot.functions.LootItemFunction; @@ -29,13 +29,13 @@ public class LootPoolMixin implements LootPoolAccessor { public LootItemCondition[] conditions; @Shadow @Final - private Predicate compositeCondition; + private Predicate compositeCondition; @Shadow @Final public LootItemFunction[] functions; @Shadow @Final - private BiFunction compositeFunction; + private BiFunction compositeFunction; @Shadow @Final public NumberProvider rolls; diff --git a/src/main/java/org/betterx/bclib/util/LootUtil.java b/src/main/java/org/betterx/bclib/util/LootUtil.java index 7d1b16a2..83180629 100644 --- a/src/main/java/org/betterx/bclib/util/LootUtil.java +++ b/src/main/java/org/betterx/bclib/util/LootUtil.java @@ -9,7 +9,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.loot.BuiltInLootTables; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; @@ -25,17 +25,17 @@ public class LootUtil { public static Optional> getDrops( BlockBehaviour block, BlockState state, - LootContext.Builder builder + LootParams.Builder builder ) { ResourceLocation tableID = block.getLootTable(); if (tableID == BuiltInLootTables.EMPTY) { return Optional.empty(); } - final LootContext ctx = builder.withParameter(LootContextParams.BLOCK_STATE, state) - .create(LootContextParamSets.BLOCK); + final LootParams ctx = builder.withParameter(LootContextParams.BLOCK_STATE, state) + .create(LootContextParamSets.BLOCK); final ServerLevel level = ctx.getLevel(); - final LootTable table = level.getServer().getLootTables().get(tableID); + final LootTable table = level.getServer().getLootData().getLootTable(tableID); if (table == LootTable.EMPTY) return Optional.empty(); return Optional.of(table.getRandomItems(ctx));