From 69c52f5bb825164a14c4f7716866d1c467c3077a Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Thu, 29 Jun 2023 20:01:33 +0200 Subject: [PATCH] 1.20.1 --- gradle.properties | 2 +- .../minecraft/quickiefabric/blocks/BlockCottonplant.java | 2 +- .../quickiefabric/blocks/BlockDirtSalpeter.java | 4 +--- .../minecraft/quickiefabric/blocks/BlockDrillDown.java | 7 +++---- .../minecraft/quickiefabric/blocks/BlockDrillEast.java | 9 ++++----- .../minecraft/quickiefabric/blocks/BlockDrillNorth.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockDrillSouth.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockDrillWest.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockDrillstop.java | 6 +++--- .../quickiefabric/blocks/BlockEmptyLavahoarder.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockItemhoarder.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockKelpstack.java | 8 +++----- .../minecraft/quickiefabric/blocks/BlockLavahoarder.java | 5 ++--- .../quickiefabric/blocks/BlockMonsterhoarder.java | 9 ++++----- .../quickiefabric/blocks/BlockOreDeepslateSulphor.java | 6 +++--- .../quickiefabric/blocks/BlockOreNetherSulphor.java | 7 +++---- .../minecraft/quickiefabric/blocks/BlockOreSalpeter.java | 5 ++--- .../quickiefabric/blocks/BlockOreSandSalpeter.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockOreSulphor.java | 6 +++--- .../quickiefabric/blocks/BlockSandSalpeter.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockSpreader.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockStackerDown.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockStackerEast.java | 5 ++--- .../quickiefabric/blocks/BlockStackerNorth.java | 5 ++--- .../quickiefabric/blocks/BlockStackerSouth.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockStackerUp.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockStackerWest.java | 5 ++--- .../minecraft/quickiefabric/blocks/BlockSulphor.java | 5 ++--- 28 files changed, 63 insertions(+), 88 deletions(-) diff --git a/gradle.properties b/gradle.properties index b781744..a096322 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ # Fabric Properties # check these on https://fabricmc.net/versions.html minecraft_version=1.20.1 - yarn_mappings=1.20.1+build.5 + yarn_mappings=1.20.1+build.9 loader_version=0.14.21 # Mod Properties diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCottonplant.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCottonplant.java index 4442d4f..0e4cdfc 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCottonplant.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCottonplant.java @@ -11,6 +11,7 @@ import net.minecraft.block.CropBlock; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.ItemScatterer; @@ -18,7 +19,6 @@ import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.loot.context.LootContextParameterSet.Builder; public class BlockCottonplant extends CropBlock { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDirtSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDirtSalpeter.java index c4137ba..4ff73f5 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDirtSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDirtSalpeter.java @@ -9,10 +9,8 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.GravelBlock; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.item.ToolMaterial; import net.minecraft.loot.context.LootContextParameterSet.Builder; /** @@ -23,7 +21,7 @@ import net.minecraft.loot.context.LootContextParameterSet.Builder; public class BlockDirtSalpeter extends GravelBlock { public BlockDirtSalpeter() { - super(FabricBlockSettings.copyOf(Material.STONE).hardness(3.1f)); + super(FabricBlockSettings.create().hardness(3.1f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java index e8bb736..9968b13 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java @@ -9,24 +9,23 @@ import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** - * + * * @author jotty * */ public class BlockDrillDown extends FallingBlock implements BlockEntityProvider { public BlockDrillDown() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java index c457670..9c4ce61 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java @@ -9,24 +9,23 @@ import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** - * + * * @author jotty * */ public class BlockDrillEast extends FallingBlock implements BlockEntityProvider { - + public BlockDrillEast() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java index 98b4946..9119bd8 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java @@ -9,12 +9,11 @@ import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -26,7 +25,7 @@ import net.minecraft.world.World; public class BlockDrillNorth extends FallingBlock implements BlockEntityProvider { public BlockDrillNorth() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java index 48f32a3..c7f06b7 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java @@ -9,12 +9,11 @@ import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -26,7 +25,7 @@ import net.minecraft.world.World; public class BlockDrillSouth extends FallingBlock implements BlockEntityProvider { public BlockDrillSouth() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java index 36a873d..560a03a 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java @@ -9,12 +9,11 @@ import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -26,7 +25,7 @@ import net.minecraft.world.World; public class BlockDrillWest extends FallingBlock implements BlockEntityProvider { public BlockDrillWest() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillstop.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillstop.java index 49e9f34..71d6601 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillstop.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillstop.java @@ -6,9 +6,9 @@ import java.util.List; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; + /** * @@ -18,7 +18,7 @@ import net.minecraft.loot.context.LootContext.Builder; public class BlockDrillstop extends Block { public BlockDrillstop() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java index 4555c83..64ff887 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java @@ -12,14 +12,13 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.ExperienceOrbEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -31,7 +30,7 @@ import net.minecraft.world.World; public class BlockEmptyLavahoarder extends Block implements BlockEntityProvider { public BlockEmptyLavahoarder() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java index e5e8256..1fbc036 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java @@ -11,13 +11,12 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; @@ -36,7 +35,7 @@ import net.minecraft.world.World; public class BlockItemhoarder extends Block implements BlockEntityProvider { public BlockItemhoarder() { - super(FabricBlockSettings.of(Material.WOOD).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java index 98f3a7a..c58c724 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java @@ -6,22 +6,20 @@ import java.util.List; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.GravelBlock; -import net.minecraft.block.MapColor; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.sound.BlockSoundGroup; /** - * + * * @author jotty * */ public class BlockKelpstack extends GravelBlock { public BlockKelpstack() { - super(FabricBlockSettings.of(Material.SOLID_ORGANIC, MapColor.GREEN).hardness(0.1f).slipperiness(1.0f) + super(FabricBlockSettings.create().hardness(0.1f).slipperiness(1.0f) .breakInstantly().sounds(BlockSoundGroup.WET_GRASS)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java index 1bf29ab..59b449f 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java @@ -9,7 +9,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; @@ -17,7 +16,7 @@ import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -32,7 +31,7 @@ import net.minecraft.world.World; public class BlockLavahoarder extends Block implements BlockEntityProvider { public BlockLavahoarder() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f).luminance(16)); + super(FabricBlockSettings.create().hardness(2.5f).luminance(16)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java index f61f9cb..d4adf3d 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java @@ -9,29 +9,28 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** - * + * * @author jotty * */ public class BlockMonsterhoarder extends Block implements BlockEntityProvider { public BlockMonsterhoarder() { - super(FabricBlockSettings.of(Material.WOOD).hardness(2.5f).luminance(20)); + super(FabricBlockSettings.create().hardness(2.5f).luminance(20)); } - + @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { return new MonsterHoarderBlockEntity(pos, blockState); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java index e9615e9..3d0769b 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java @@ -7,9 +7,9 @@ import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.ExperienceDroppingBlock; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; + /** * @@ -19,7 +19,7 @@ import net.minecraft.loot.context.LootContext.Builder; public class BlockOreDeepslateSulphor extends ExperienceDroppingBlock { public BlockOreDeepslateSulphor() { - super(FabricBlockSettings.of(Material.STONE).hardness(1.9f).requiresTool()); + super(FabricBlockSettings.create().hardness(1.9f).requiresTool()); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java index 9d89021..01263f6 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java @@ -5,12 +5,11 @@ import java.util.List; import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ExperienceDroppingBlock; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; + /** * @@ -20,7 +19,7 @@ import net.minecraft.loot.context.LootContext.Builder; public class BlockOreNetherSulphor extends ExperienceDroppingBlock { public BlockOreNetherSulphor() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.1f).requiresTool()); + super(FabricBlockSettings.create().hardness(2.1f).requiresTool()); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java index 3e7e386..abaee63 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java @@ -7,9 +7,8 @@ import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.ExperienceDroppingBlock; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.random.Random; /** @@ -20,7 +19,7 @@ import net.minecraft.util.math.random.Random; public class BlockOreSalpeter extends ExperienceDroppingBlock { public BlockOreSalpeter() { - super(FabricBlockSettings.of(Material.STONE).hardness(3.1f).requiresTool()); + super(FabricBlockSettings.create().hardness(3.1f).requiresTool()); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java index b2dd3af..e5a9a2a 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java @@ -8,9 +8,8 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.ExperienceDroppingBlock; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.random.Random; /** @@ -21,7 +20,7 @@ import net.minecraft.util.math.random.Random; public class BlockOreSandSalpeter extends ExperienceDroppingBlock { public BlockOreSandSalpeter() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.9f).requiresTool()); + super(FabricBlockSettings.create().hardness(2.9f).requiresTool()); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java index e3263e2..8b503e0 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java @@ -7,9 +7,9 @@ import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.ExperienceDroppingBlock; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; + /** * @@ -19,7 +19,7 @@ import net.minecraft.loot.context.LootContext.Builder; public class BlockOreSulphor extends ExperienceDroppingBlock { public BlockOreSulphor() { - super(FabricBlockSettings.of(Material.STONE).hardness(1.9f).requiresTool()); + super(FabricBlockSettings.create().hardness(1.9f).requiresTool()); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java index 3a643ca..a6ec56c 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java @@ -8,9 +8,8 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.GravelBlock; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.random.Random; /** @@ -21,7 +20,7 @@ import net.minecraft.util.math.random.Random; public class BlockSandSalpeter extends GravelBlock { public BlockSandSalpeter() { - super(FabricBlockSettings.of(Material.STONE).hardness(3.1f).requiresTool()); + super(FabricBlockSettings.create().hardness(3.1f).requiresTool()); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java index d8f4e73..9e6b4eb 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java @@ -8,12 +8,11 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -25,7 +24,7 @@ import net.minecraft.world.World; public class BlockSpreader extends BlockWithEntity { public BlockSpreader() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java index 29ef5f1..792bcd1 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java @@ -9,13 +9,12 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.util.ActionResult; @@ -34,7 +33,7 @@ import net.minecraft.world.World; public class BlockStackerDown extends BlockWithEntity implements BlockStacker { public BlockStackerDown() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java index 280a020..cc8f7db 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java @@ -9,13 +9,12 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.util.ActionResult; @@ -34,7 +33,7 @@ import net.minecraft.world.World; public class BlockStackerEast extends BlockWithEntity implements BlockStacker { public BlockStackerEast() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java index 7fc659c..23f451e 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java @@ -9,13 +9,12 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.util.ActionResult; @@ -34,7 +33,7 @@ import net.minecraft.world.World; public class BlockStackerNorth extends BlockWithEntity implements BlockStacker { public BlockStackerNorth() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java index b0d9304..c08eb1f 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java @@ -9,13 +9,12 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.util.ActionResult; @@ -34,7 +33,7 @@ import net.minecraft.world.World; public class BlockStackerSouth extends BlockWithEntity implements BlockStacker { public BlockStackerSouth() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java index fe4c1b2..029b827 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java @@ -9,13 +9,12 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.util.ActionResult; @@ -34,7 +33,7 @@ import net.minecraft.world.World; public class BlockStackerUp extends BlockWithEntity implements BlockStacker { public BlockStackerUp() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java index 534e0cf..ce8e9ac 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java @@ -9,13 +9,12 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.util.ActionResult; @@ -34,7 +33,7 @@ import net.minecraft.world.World; public class BlockStackerWest extends BlockWithEntity implements BlockStacker { public BlockStackerWest() { - super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + super(FabricBlockSettings.create().hardness(2.5f)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java index 4e76e13..85dcbff 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java @@ -7,9 +7,8 @@ import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.ExperienceDroppingBlock; -import net.minecraft.block.Material; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.loot.context.LootContextParameterSet.Builder; /** * @@ -19,7 +18,7 @@ import net.minecraft.loot.context.LootContext.Builder; public class BlockSulphor extends ExperienceDroppingBlock { public BlockSulphor() { - super(FabricBlockSettings.of(Material.STONE).hardness(0.5f)); + super(FabricBlockSettings.create().hardness(0.5f)); } @Override