Merge branch 'main' into 26.1.1

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

gradle.properties

@@ -7,14 +7,14 @@ org.gradle.configuration-cache=false
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=26.1-snapshot-3
-loader_version=0.18.4
-loom_version=1.14-SNAPSHOT
+minecraft_version=26.1.1
+loader_version=0.19.2
+loom_version=1.15-SNAPSHOT
 
 # Mod Properties
-mod_version=26.1.3
+mod_version=26.1.1.2
 maven_group=de.jottyfan.minecraft
 archives_base_name=quickly
 
 # Dependencies
-fabric_api_version=0.141.3+26.1
+fabric_api_version=0.145.4+26.1.1

src/main/java/de/jottyfan/minecraft/Quickly.java

@@ -1,5 +1,7 @@
 package de.jottyfan.minecraft;
 
+import java.util.List;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -10,7 +12,10 @@ import de.jottyfan.minecraft.event.QuicklyEvents;
 import de.jottyfan.minecraft.feature.QuicklyFeatures;
 import de.jottyfan.minecraft.item.QuicklyItems;
 import de.jottyfan.minecraft.loot.QuicklyLootTables;
+import de.jottyfan.minecraft.tab.QuicklyTab;
 import net.fabricmc.api.ModInitializer;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 /**
  *
  * @author jotty
@@ -25,11 +30,12 @@ public class Quickly implements ModInitializer {
 	public void onInitialize() {
 		LOGGER.info("loading {}", MOD_ID);
 
-		QuicklyItems.registerModItems();
-		QuicklyBlocks.registerModBlocks();
+		List<Item> items = QuicklyItems.registerModItems();
+		List<Block> blocks = QuicklyBlocks.registerModBlocks();
 		QuicklyBlockEntity.registerBlockEntities();
 		QuicklyFeatures.registerFeatures();
 		QuicklyComposter.registerComposterItems();
+		QuicklyTab.registerItemGroup(items, blocks);
 		QuicklyLootTables.registerChanges();
 		QuicklyEvents.registerBlockBreak();
 	}

src/main/java/de/jottyfan/minecraft/block/BlockDrill.java

@@ -33,6 +33,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition.Builder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.phys.BlockHitResult;
@@ -48,20 +49,21 @@ public class BlockDrill extends FallingBlock implements EntityBlock {
 	private static final Integer MAX_FUEL = 255;
 	public static final IntegerProperty FUEL = IntegerProperty.create("fuel", 0, MAX_FUEL);
 	public static final EnumProperty<Direction> FACING = BlockStateProperties.FACING;
+	public static final BooleanProperty DOWNWARDS = BooleanProperty.create("downwards");
 
 	public BlockDrill(Properties properties) {
 		super(properties.strength(0.5f));
-		registerDefaultState(stateDefinition.any().setValue(FUEL, 0).setValue(FACING, Direction.DOWN));
+		registerDefaultState(stateDefinition.any().setValue(FUEL, 0).setValue(FACING, Direction.DOWN).setValue(DOWNWARDS, true));
 	}
 
 	@Override
 	protected void createBlockStateDefinition(Builder<Block, BlockState> builder) {
-		builder.add(FUEL, FACING);
+		builder.add(FUEL, FACING, DOWNWARDS);
 	}
 
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext context) {
-		return this.defaultBlockState().setValue(FACING, context.getNearestLookingDirection());
+		return this.defaultBlockState().setValue(FACING, context.getNearestLookingDirection()).setValue(DOWNWARDS, true);
 	}
 
 	@Override
@@ -92,8 +94,8 @@ public class BlockDrill extends FallingBlock implements EntityBlock {
 		loadings.put(QuicklyItems.CANOLABOTTLESTACK, 72);
 		Item item = itemStack.getItem();
 		if (QuicklyItems.MAGNIFIER.equals(item)) {
-			if (!level.isClientSide() && player instanceof ServerPlayer serverPlayer) {
-				serverPlayer.displayClientMessage(Component.translatable("info.block.drillfuel", state.getValue(FUEL)), true);
+			if (!level.isClientSide() && player instanceof ServerPlayer serverPlayer && player != null) {
+				serverPlayer.connection.player.sendSystemMessage(Component.translatable("info.block.drillfuel", state.getValue(FUEL)), true);
 			}
 		} else if (loadings.containsKey(item)) {
 			Integer fuelWeight = loadings.get(item);
@@ -112,6 +114,12 @@ public class BlockDrill extends FallingBlock implements EntityBlock {
 				}
 				player.getActiveItem().shrink(1);
 			}
+		} else if (QuicklyItems.COPPERSTUB.equals(item)) {
+			Direction facing = state.getValue(BlockDrill.FACING);
+			level.setBlockAndUpdate(pos, QuicklyBlocks.DRILL.defaultBlockState().setValue(FACING, facing).setValue(BlockDrill.DOWNWARDS, false));
+			if (!level.isClientSide() && player instanceof ServerPlayer serverPlayer && player != null) {
+				serverPlayer.connection.player.sendSystemMessage(Component.translatable("info.block.drillstraight"), true);
+			}
 		} else {
 			Direction newDirection = hitResult.getDirection();
 			newDirection = newDirection.equals(Direction.UP) ? Direction.DOWN : newDirection;

src/main/java/de/jottyfan/minecraft/block/BlockPlant.java

@@ -2,7 +2,6 @@ package de.jottyfan.minecraft.block;
 
 import de.jottyfan.minecraft.item.QuicklyItems;
 import net.minecraft.core.BlockPos;
-import net.minecraft.resources.Identifier;
 import net.minecraft.world.Containers;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
@@ -24,13 +23,13 @@ import net.minecraft.world.phys.shapes.VoxelShape;
  */
 public class BlockPlant extends CropBlock {
 
-	private Identifier seedName;
-	private Identifier fruitName;
+	private DropDefinition seedDefinition;
+	private DropDefinition fruitDefinition;
 
-	public BlockPlant(Properties properties, Identifier seedName, Identifier fruitName) {
+	public BlockPlant(Properties properties, DropDefinition seedDefinition, DropDefinition fruitDefinition) {
 		super(properties.noOcclusion().dynamicShape());
-		this.seedName = seedName;
-		this.fruitName = fruitName;
+		this.seedDefinition = seedDefinition;
+		this.fruitDefinition = fruitDefinition;
 	}
 
 	@Override
@@ -49,11 +48,11 @@ public class BlockPlant extends CropBlock {
 	}
 
 	public ItemLike getSeed() {
-		return QuicklyItems.of(seedName);
+		return QuicklyItems.of(seedDefinition.getIdentifier());
 	}
 
 	public ItemLike getFruit() {
-		return QuicklyItems.of(fruitName);
+		return QuicklyItems.of(fruitDefinition.getIdentifier());
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/block/BlockStacker.java

@@ -1,5 +1,8 @@
 package de.jottyfan.minecraft.block;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.jspecify.annotations.Nullable;
 
 import com.mojang.serialization.MapCodec;
@@ -7,6 +10,7 @@ import com.mojang.serialization.MapCodec;
 import de.jottyfan.minecraft.blockentity.BlockStackerEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
@@ -15,8 +19,9 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.StateDefinition.Builder;
+import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
+import net.minecraft.world.level.storage.loot.LootParams.Builder;
 
 /**
  *
@@ -37,13 +42,21 @@ public class BlockStacker extends Block implements EntityBlock {
 	}
 
 	@Override
-	protected void createBlockStateDefinition(Builder<Block, BlockState> builder) {
+	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
 		builder.add(SOURCE, DEST);
 	}
 
+	@Override
+	protected List<ItemStack> getDrops(BlockState state, Builder params) {
+		List<ItemStack> list = new ArrayList<>();
+		list.add(new ItemStack(QuicklyBlocks.STACKER));
+		return list;
+	}
+
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext context) {
-		return this.defaultBlockState().setValue(SOURCE, context.getNearestLookingDirection()).setValue(DEST, context.getNearestLookingDirection().getOpposite());
+		return this.defaultBlockState().setValue(SOURCE, context.getNearestLookingDirection()).setValue(DEST,
+				context.getNearestLookingDirection().getOpposite());
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/block/DropDefinition.java

@@ -0,0 +1,82 @@
+package de.jottyfan.minecraft.block;
+
+import java.util.Random;
+
+import net.minecraft.resources.Identifier;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class DropDefinition {
+	private Identifier identifier;
+	private Integer minValue;
+	private Integer maxValue;
+
+	/**
+	 * defines the drop definition; the item or block from identifier should be
+	 * dropped x times (minValue <= x <= maxValue)
+	 *
+	 * @param identifier the identifier of the item or block
+	 * @param minValue   the minimum of dropped items or blocks
+	 * @param maxValue   the maximum of dropped items or blocks
+	 */
+	public static final DropDefinition of(Identifier identifier, Integer minValue, Integer maxValue) {
+		DropDefinition bean = new DropDefinition();
+		bean.setIdentifier(identifier);
+		bean.setMinValue(minValue);
+		bean.setMaxValue(maxValue);
+		return bean;
+	}
+
+	public int getRandomSize() {
+		if (maxValue - minValue < 1) {
+			return new Random().nextInt(maxValue);
+		} else {
+			return minValue + new Random().nextInt(maxValue - minValue);
+		}
+	}
+
+	/**
+	 * @return the identifier
+	 */
+	public Identifier getIdentifier() {
+		return identifier;
+	}
+
+	/**
+	 * @param identifier the identifier to set
+	 */
+	public void setIdentifier(Identifier identifier) {
+		this.identifier = identifier;
+	}
+
+	/**
+	 * @return the minValue
+	 */
+	public Integer getMinValue() {
+		return minValue;
+	}
+
+	/**
+	 * @param minValue the minValue to set
+	 */
+	public void setMinValue(Integer minValue) {
+		this.minValue = minValue;
+	}
+
+	/**
+	 * @return the maxValue
+	 */
+	public Integer getMaxValue() {
+		return maxValue;
+	}
+
+	/**
+	 * @param maxValue the maxValue to set
+	 */
+	public void setMaxValue(Integer maxValue) {
+		this.maxValue = maxValue;
+	}
+}

src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java

@@ -56,7 +56,7 @@ public class Itemhoarder extends Block implements EntityBlock {
 	@Override
 	protected InteractionResult useItemOn(ItemStack itemStack, BlockState state, Level level, BlockPos pos, Player player,
 			InteractionHand hand, BlockHitResult hitResult) {
-		if (player instanceof ServerPlayer serverPlayer) {
+		if (player instanceof ServerPlayer serverPlayer && player != null) {
 			if (QuicklyItems.MAGNIFIER.equals(itemStack.getItem())) {
 				MutableComponent message = Component.empty();
 				BlockEntity blockEntity = level.getBlockEntity(pos);
@@ -68,7 +68,7 @@ public class Itemhoarder extends Block implements EntityBlock {
 					}
 				}
 				Component complete = Component.translatable("info.block.itemhoarder", message);
-				serverPlayer.displayClientMessage(complete, false);
+				serverPlayer.connection.player.sendSystemMessage(complete, false);
 			}
 		}
 		return InteractionResult.SUCCESS;

src/main/java/de/jottyfan/minecraft/block/Monsterhoarder.java

@@ -1,5 +1,8 @@
 package de.jottyfan.minecraft.block;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.jspecify.annotations.Nullable;
 
 import de.jottyfan.minecraft.item.QuicklyItems;
@@ -20,8 +23,9 @@ import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.StateDefinition.Builder;
+import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
+import net.minecraft.world.level.storage.loot.LootParams.Builder;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.ticks.ScheduledTick;
@@ -46,10 +50,17 @@ public class Monsterhoarder extends Block {
 	}
 
 	@Override
-	protected void createBlockStateDefinition(Builder<Block, BlockState> builder) {
+	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
 		builder.add(SUCKRADIUS, BURNTICKS);
 	}
 
+	@Override
+	protected List<ItemStack> getDrops(BlockState state, Builder params) {
+		List<ItemStack> list = new ArrayList<>();
+		list.add(new ItemStack(QuicklyBlocks.MONSTERHOARDER));
+		return list;
+	}
+
 	@Override
 	protected InteractionResult useItemOn(ItemStack itemStack, BlockState state, Level level, BlockPos pos, Player player,
 			InteractionHand hand, BlockHitResult hitResult) {
@@ -73,8 +84,8 @@ public class Monsterhoarder extends Block {
 			int suckRadius = state.getValue(SUCKRADIUS);
 			int burnTicks = state.getValue(BURNTICKS);
 			Component message = Component.translatable("info.block.monsterhoarder", suckRadius, burnTicks);
-			if (player instanceof ServerPlayer serverPlayer) {
-				serverPlayer.displayClientMessage(message, true);
+			if (player instanceof ServerPlayer serverPlayer && player != null) {
+				serverPlayer.connection.player.sendSystemMessage(message, true);
 			}
 		}
 		return InteractionResult.SUCCESS;

src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java

@@ -1,5 +1,7 @@
 package de.jottyfan.minecraft.block;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Function;
 
 import de.jottyfan.minecraft.Quickly;
@@ -32,9 +34,11 @@ public class QuicklyBlocks {
 	public static final Block OREDEEPSLATETURQUOISE = registerBlock(ID.OREDEEPSLATETURQUOISE,
 			properties -> new BlockOre(properties, SoundEvents.AMETHYST_BLOCK_CHIME, ID.RAWTURQUOISE));
 	public static final Block COTTONPLANT = registerBlock(ID.BLOCKCOTTONPLANT, Properties.ofFullCopy(Blocks.WHEAT),
-			properties -> new BlockPlant(properties, ID.COTTONSEED, ID.COTTON));
+			properties -> new BlockPlant(properties, DropDefinition.of(ID.COTTONSEED, 1, 1),
+					DropDefinition.of(ID.COTTON, 1, 1)));
 	public static final Block CANOLAPLANT = registerBlock(ID.BLOCKCANOLAPLANT, Properties.ofFullCopy(Blocks.WHEAT),
-			properties -> new BlockPlant(properties, ID.CANOLASEED, ID.CANOLA));
+			properties -> new BlockPlant(properties, DropDefinition.of(ID.CANOLASEED, 1, 1),
+					DropDefinition.of(ID.CANOLA, 1, 1)));
 	public static final Block LAVAHOARDER = registerBlock(ID.LAVAHOARDER,
 			Properties.of().strength(2.5f).lightLevel(state -> state.getValue(Lavahoarder.FILLED) ? 15 : 0),
 			Lavahoarder::new);
@@ -98,7 +102,31 @@ public class QuicklyBlocks {
 		return BuiltInRegistries.BLOCK.getValue(identifier);
 	}
 
-	public static void registerModBlocks() {
-		Quickly.LOGGER.info("forbid the optimizer to ignore static block registration");
+	public static final List<Block> registerModBlocks() {
+		Quickly.LOGGER.debug("register blocks");
+		List<Block> set = new ArrayList<>();
+		set.add(KELPBUNDLE);
+		set.add(TURQUOISEBLOCK);
+		set.add(ORETURQUOISE);
+		set.add(OREDEEPSLATETURQUOISE);
+		set.add(LAVAHOARDER);
+		set.add(QUICKIEPOWDER);
+		set.add(SPEEDPOWDER);
+		set.add(MONSTERHOARDER);
+		set.add(ITEMHOARDER);
+		set.add(DRILL);
+		set.add(STACKER);
+		set.add(DIRTSALPETER);
+		set.add(SANDSALPETER);
+		set.add(OREDEEPSLATESULFOR);
+		set.add(ORENETHERSULFOR);
+		set.add(ORESALPETER);
+		set.add(ORESANDSALPETER);
+		set.add(ORESULFOR);
+		set.add(ORESPEEDPOWDER);
+		set.add(OREDEEPSLATESPEEDPOWDER);
+		set.add(SALPETERBLOCK);
+		set.add(SULFORBLOCK);
+		return set;
 	}
 }

src/main/java/de/jottyfan/minecraft/blockentity/DrillBlockEntity.java

@@ -31,29 +31,32 @@ public class DrillBlockEntity extends BlockEntity {
 	public static void tick(Level level, BlockPos pos, BlockState state, BlockEntity be) {
 		if (be instanceof DrillBlockEntity dbe) {
 			Direction dir = state.getValue(BlockDrill.FACING);
+			Boolean downwards = state.getValue(BlockDrill.DOWNWARDS);
 			List<BlockPos> list = new ArrayList<>();
 			if (Direction.DOWN.equals(dir)) {
 				list = downFrom(pos);
 		  } else if (Direction.EAST.equals(dir)) {
-				list = directedFrom(pos.east());
+				list = directedFrom(pos.east(), downwards);
 			}	else if (Direction.SOUTH.equals(dir)) {
-				list = directedFrom(pos.south());
+				list = directedFrom(pos.south(), downwards);
 			}	else if (Direction.WEST.equals(dir)) {
-				list = directedFrom(pos.west());
+				list = directedFrom(pos.west(), downwards);
 			}	else if (Direction.NORTH.equals(dir)) {
-				list = directedFrom(pos.north());
+				list = directedFrom(pos.north(), downwards);
 			}
 			DrillBlockEntity.tick(level, pos, state, dbe, MAXDRILLSTEP, list);
 		}
 	}
 
-	public static final List<BlockPos> directedFrom(BlockPos pos) {
+	public static final List<BlockPos> directedFrom(BlockPos pos, Boolean downwards) {
 		List<BlockPos> list = new ArrayList<>();
-		list.add(pos);
-		list.add(pos.above());
-		list.add(pos.above(2));
 		list.add(pos.above(3));
+		list.add(pos.above(2));
+		list.add(pos.above());
+		list.add(pos);
+		if (downwards) {
 			list.add(pos.below()); // must be last position
+		}
 		return list;
 	}
 

src/main/java/de/jottyfan/minecraft/item/QHoe.java

@@ -6,8 +6,10 @@ import com.google.common.collect.Lists;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
+import net.minecraft.world.Containers;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.HoeItem;
 import net.minecraft.world.item.ItemStack;
@@ -18,6 +20,8 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.CropBlock;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.loot.LootParams;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.BlockHitResult;
 
 /**
@@ -26,18 +30,19 @@ import net.minecraft.world.phys.BlockHitResult;
  *
  */
 public class QHoe extends HoeItem implements ToolRangeable {
-
 	public QIP properties;
 
 	public QHoe(QIP properties) {
-		super(new ToolMaterial(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, properties.getDurability(), 7f, 1f, 15, ItemTags.DIAMOND_TOOL_MATERIALS), 7f, 3.1f, properties);
+		super(new ToolMaterial(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, properties.getDurability(), 7f, 1f, 15,
+				ItemTags.DIAMOND_TOOL_MATERIALS), 7f, 3.1f, properties);
 		this.properties = properties;
 	}
 
 	@Override
 	public InteractionResult useOn(UseOnContext context) {
 		InteractionResult res = super.useOn(context);
-		boolean isCrop = context.getLevel().getBlockState(context.getClickedPos()).getBlock() instanceof CropBlock;
+		Block block = context.getLevel().getBlockState(context.getClickedPos()).getBlock();
+		boolean isCrop = block instanceof CropBlock;
 		if (!InteractionResult.PASS.equals(res) || isCrop) {
 			HarvestRange range = properties.getHarvestRange();
 			for (int x = -range.getxRange(); x <= range.getxRange(); x++) {
@@ -55,6 +60,7 @@ public class QHoe extends HoeItem implements ToolRangeable {
 					}
 				}
 			}
+			return InteractionResult.SUCCESS;
 		}
 		return res;
 	}
@@ -69,16 +75,24 @@ public class QHoe extends HoeItem implements ToolRangeable {
 	}
 
 	private void harvestIfPossible(BlockPos pos, Level level) {
+		if (!level.isClientSide()) {
 			BlockState blockState = level.getBlockState(pos);
 			Block block = blockState.getBlock();
-		if (block instanceof CropBlock) {
-			CropBlock cBlock = (CropBlock) block;
+			if (block instanceof CropBlock cBlock) {
 				if (cBlock.isMaxAge(blockState)) {
-				Block.dropResources(blockState, level, pos);
+					LootParams.Builder builder = new LootParams.Builder((ServerLevel) level)
+							.withParameter(LootContextParams.ORIGIN, pos.getCenter())
+							.withParameter(LootContextParams.BLOCK_STATE, blockState)
+							.withOptionalParameter(LootContextParams.BLOCK_ENTITY, level.getBlockEntity(pos))
+							.withParameter(LootContextParams.TOOL, ItemStack.EMPTY);
+					for (ItemStack stack : blockState.getDrops(builder)) {
+						Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), stack);
+					}
 					level.setBlockAndUpdate(pos, cBlock.defaultBlockState());
 				}
 			}
 		}
+	}
 
 	@Override
 	public boolean canBreakNeighbors(BlockState blockState) {

src/main/java/de/jottyfan/minecraft/item/QShovel.java

@@ -1,6 +1,7 @@
 package de.jottyfan.minecraft.item;
 
 import java.util.List;
+import java.util.Set;
 
 import com.google.common.collect.Lists;
 
@@ -26,7 +27,7 @@ public class QShovel extends ShovelItem implements ToolRangeable {
 		this.range = properties.getHarvestRange();
 	}
 
-	private void createPathOnGrass(Level level, BlockPos pos, Direction side) {
+	private void createPath(Level level, BlockPos pos, Direction side, Set<Block> validBlocks) {
 		BlockState blockState = level.getBlockState(pos);
 		if (blockState.isAir()) {
 			// try to find one underneath
@@ -39,18 +40,23 @@ public class QShovel extends ShovelItem implements ToolRangeable {
 		if (side != Direction.DOWN) {
 			if (blockState != null && level.getBlockState(pos.above()).isAir()) {
 				if (!level.isClientSide()) {
+					if (validBlocks.contains(blockState.getBlock())) {
 						level.setBlockAndUpdate(pos, Blocks.DIRT_PATH.defaultBlockState());
 					}
 				}
 			}
 		}
+	}
 
 	@Override
 	public InteractionResult useOn(UseOnContext context) {
+		InteractionResult result = super.useOn(context);
+		if (InteractionResult.SUCCESS.equals(result)) {
 			for (BlockPos pos : range.getRangeAsBlockPosArray(context.getClickedPos(), true, new BlockPos(1, 1, 1))) {
-			createPathOnGrass(context.getLevel(), pos, context.getClickedFace());
+				createPath(context.getLevel(), pos, context.getClickedFace(), FLATTENABLES.keySet());
 			}
-		return super.useOn(context);
+		}
+		return result;
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java

@@ -1,5 +1,7 @@
 package de.jottyfan.minecraft.item;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Function;
 
 import de.jottyfan.minecraft.Quickly;
@@ -25,6 +27,7 @@ public class QuicklyItems {
 	public static final Item COTTON = registerItem(ID.COTTON);
 	public static final Item COTTONPLANT = registerItem(ID.COTTONPLANT);
 	public static final Item COTTONSEED = registerItem(ID.COTTONSEED, QIP.of(ID.BLOCKCOTTONPLANT), Plant::new);
+	public static final Item PILLOW = registerItem(ID.PILLOW);
 	public static final Item CANOLA = registerItem(ID.CANOLA);
 	public static final Item CANOLAPLANT = registerItem(ID.CANOLAPLANT);
 	public static final Item CANOLASEED = registerItem(ID.CANOLASEED, QIP.of(ID.BLOCKCANOLAPLANT), Plant::new);
@@ -44,6 +47,7 @@ public class QuicklyItems {
 	public static final Item SALPETER = registerItem(ID.SALPETER);
 	public static final Item SULFOR = registerItem(ID.SULFOR);
 	public static final Item CARROTSTACK = registerItem(ID.CARROTSTACK);
+	public static final Item POTATOSTACK = registerItem(ID.POTATOSTACK);
 
 	// TODO: rename tools to speedaxe and quickaxe instead of the powder version
 
@@ -97,8 +101,51 @@ public class QuicklyItems {
 		return Registry.register(BuiltInRegistries.ITEM, identifier, item);
 	}
 
-	public static final void registerModItems() {
-		Quickly.LOGGER.info("forbid the optimizer to ignore static item registration");
+	public static final List<Item> registerModItems() {
+		Quickly.LOGGER.debug("adding Items");
+		List<Item> set = new ArrayList<>();
+		set.add(STUB);
+		set.add(RAWTURQUOISE);
+		set.add(TURQUOISEINGOT);
+		set.add(COTTON);
+		set.add(COTTONSEED);
+		set.add(PILLOW);
+		set.add(CANOLA);
+		set.add(CANOLASEED);
+		set.add(CANOLABOTTLE);
+		set.add(CANOLABOTTLESTACK);
+		set.add(ROTTENFLESHSTRIPES);
+		set.add(OXIDIZEDCOPPERPOWDER);
+		set.add(COPPERSTRING);
+		set.add(COPPERPOWDER);
+		set.add(COPPERSTUB);
+		set.add(COPPERSTICK);
+		set.add(SPEEDPOWDER);
+		set.add(QUICKIEPOWDER);
+		set.add(SPEEDINGOT);
+		set.add(QUICKIEINGOT);
+		set.add(MAGNIFIER);
+		set.add(SALPETER);
+		set.add(SULFOR);
+		set.add(CARROTSTACK);
+		set.add(POTATOSTACK);
+		set.add(SPEEDAXE);
+		set.add(SPEEDHOE);
+		set.add(SPEEDPICKAXE);
+		set.add(SPEEDSHEARS);
+		set.add(SPEEDSHOVEL);
+		set.add(SPEEDWATERHOE);
+		set.add(QUICKIEAXE);
+		set.add(QUICKIEHOE);
+		set.add(QUICKIEPICKAXE);
+		set.add(QUICKIESHEARS);
+		set.add(QUICKIESHOVEL);
+		set.add(QUICKIEWATERHOE);
+		set.add(ARMOR_TURQUOISE_BOOTS);
+		set.add(ARMOR_TURQUOISE_HELMET);
+		set.add(ARMOR_TURQUOISE_LEGGINGS);
+		set.add(ARMOR_TURQUOISE_CHESTPLATE);
+		return set;
 	}
 
 	/**

src/main/java/de/jottyfan/minecraft/mixin/QuicklyMixin.java

@@ -1,34 +0,0 @@
-package de.jottyfan.minecraft.mixin;
-
-import java.util.Map;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import de.jottyfan.minecraft.block.QuicklyBlocks;
-import net.minecraft.client.renderer.ItemBlockRenderTypes;
-import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
-import net.minecraft.world.level.block.Block;
-
-/**
- *
- * @author jotty
- *
- */
-@Mixin(ItemBlockRenderTypes.class)
-public class QuicklyMixin {
-	@Shadow
-	@Final
-	private static Map<Block, ChunkSectionLayer> TYPE_BY_BLOCK;
-
-	@Inject(method = "<clinit>", at = @At("RETURN"))
-	private static void onStaticInit(CallbackInfo info) {
-		ChunkSectionLayer cutout = ChunkSectionLayer.CUTOUT;
-		TYPE_BY_BLOCK.put(QuicklyBlocks.CANOLAPLANT, cutout);
-		TYPE_BY_BLOCK.put(QuicklyBlocks.COTTONPLANT, cutout);
-	}
-}

src/main/java/de/jottyfan/minecraft/name/ID.java

@@ -16,6 +16,7 @@ public class ID {
 	public static final Identifier COTTON = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "cotton");
 	public static final Identifier COTTONPLANT = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "cottonplant");
 	public static final Identifier COTTONSEED = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "cottonseed");
+	public static final Identifier PILLOW = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "pillow");
 	public static final Identifier CANOLA = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "canola");
 	public static final Identifier CANOLAPLANT = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "canolaplant");
 	public static final Identifier CANOLASEED = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "canolaseed");
@@ -38,6 +39,7 @@ public class ID {
 	public static final Identifier SALPETER = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "salpeter");
 	public static final Identifier SULFOR = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "sulfor");
 	public static final Identifier CARROTSTACK = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "carrotstack");
+	public static final Identifier POTATOSTACK = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "potatostack");
 	public static final Identifier SPEEDPOWDERAXE = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "speedpowderaxe");
 	public static final Identifier SPEEDPOWDERHOE = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "speedpowderhoe");
 	public static final Identifier SPEEDPOWDERPICKAXE = Identifier.fromNamespaceAndPath(Quickly.MOD_ID,

src/main/java/de/jottyfan/minecraft/tab/QuicklyTab.java

@@ -0,0 +1,42 @@
+package de.jottyfan.minecraft.tab;
+
+import java.util.List;
+
+import de.jottyfan.minecraft.Quickly;
+import de.jottyfan.minecraft.item.QuicklyItems;
+import net.fabricmc.fabric.api.creativetab.v1.FabricCreativeModeTab;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class QuicklyTab {
+
+	public static final void registerItemGroup(List<Item> items, List<Block> blocks) {
+		ResourceKey<CreativeModeTab> tabKey = ResourceKey.create(Registries.CREATIVE_MODE_TAB,
+				Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "itemgroup"));
+
+		CreativeModeTab quicklyTab = FabricCreativeModeTab.builder().icon(() -> new ItemStack(QuicklyItems.QUICKIEPICKAXE))
+				.title(Component.translatable("tab.quickly")).displayItems((params, output) -> {
+					for (Item item : items) {
+						output.accept(item);
+					}
+					for (Block block : blocks) {
+						output.accept(block);
+					}
+				}).build();
+
+		Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, tabKey, quicklyTab);
+	}
+}

src/main/resources/assets/quickly/items/pillow.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickly:item/pillow"
+  }
+}

src/main/resources/assets/quickly/items/potatostack.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickly:item/potatostack"
+  }
+}

src/main/resources/assets/quickly/lang/de_de.json

@@ -1,5 +1,6 @@
 {
   "info.block.drillfuel": "Ladung: %s Bohrungen",
+  "info.block.drillstraight": "auf ebenes Bohren umgestellt",
   "info.block.itemhoarder": "enthält: %s",
   "info.block.monsterhoarder": "Radius: %s, Brenndauer: %s Ticks",
 	"item.quickly.blockcanolaplant": "Rapspflanze",
@@ -38,6 +39,8 @@
 	"item.quickly.oresulfor": "Schwefelgestein",
   "item.quickly.oreturquoise": "Türkiserz",
   "item.quickly.oxidizedcopperpowder": "oxidiertes Kupferpulver",
+  "item.quickly.pillow": "Kissen",
+	"item.quickly.potatostack": "Kartoffelbündel",
   "item.quickly.quickieingot": "Eilpulverbarren",
 	"item.quickly.quickiepowder": "Eilpulver",
 	"item.quickly.quickiepowderaxe": "Eilaxt",

src/main/resources/assets/quickly/lang/en_us.json

@@ -1,5 +1,6 @@
 {
   "info.block.drillfuel": "Load: %s drills",
+  "info.block.drillstraight": "switched to face drilling",
   "info.block.itemhoarder": "contains: %s",
   "info.block.monsterhoarder": "radius: %s, burn ticks: %s",
 	"item.quickly.blockcanolaplant": "canola plant",
@@ -38,6 +39,8 @@
 	"item.quickly.oresulfor": "sulfor stone",
   "item.quickly.oreturquoise": "turquoise ore",
   "item.quickly.oxidizedcopperpowder": "oxidized copper powder",
+  "item.quickly.pillow": "pillow",
+	"item.quickly.potatostack": "potato bundle",
   "item.quickly.quickieingot": "quickie powder ingot",
 	"item.quickly.quickiepowder": "quickie powder",
 	"item.quickly.quickiepowderaxe": "hurry axe",

src/main/resources/assets/quickly/models/item/pillow.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "quickly:item/pillow"
+  }
+}

src/main/resources/assets/quickly/models/item/potatostack.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "quickly:item/potatostack"
+  }
+}

src/main/resources/data/quickly/loot_table/blocks/blockcanolaplant.json

@@ -0,0 +1,56 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "quickly:canola",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+						  "count": {
+							  "min": 1,
+							  "max": 2
+						  },
+						  "add": false
+						}
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:location_check",
+              "predicate": {
+                "block": {
+                  "properties": {
+                    "age": "7"
+        				  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "quickly:canolaseed",
+          "functions": [
+            {
+              "function": "minecraft:apply_bonus",
+              "enchantment": "minecraft:fortune",
+              "formula": "minecraft:binomial_with_bonus_count",
+              "parameters": {
+                "extra": 2,
+                "probability": 0.5
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/quickly/loot_table/blocks/blockcottonplant.json

@@ -0,0 +1,55 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "quickly:cotton",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+						  "count": {
+							  "min": 1,
+							  "max": 3
+						  }
+						}
+          ],
+          "conditions": [
+            {
+              "condition": "minecraft:location_check",
+              "predicate": {
+                "block": {
+                  "properties": {
+                    "age": "7"
+        				  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "quickly:cottonseed",
+          "functions": [
+            {
+              "function": "minecraft:apply_bonus",
+              "enchantment": "minecraft:fortune",
+              "formula": "minecraft:binomial_with_bonus_count",
+              "parameters": {
+                "extra": 2,
+                "probability": 0.5
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/quickly/recipe/shaped_bed.json

@@ -0,0 +1,15 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"ppp",
+		"www"
+	],
+	"key": {
+		"p": "quickly:pillow",
+		"w": "#minecraft:planks"
+	},
+	"result": {
+		"id": "minecraft:white_bed",
+		"count": 1
+	}
+}

src/main/resources/data/quickly/recipe/shaped_potatostack_from_potatos.json

@@ -0,0 +1,13 @@
+{
+  "type": "crafting_shaped",
+  "pattern": [
+    "cc",
+    "cc"
+  ],
+  "key": {
+    "c": "minecraft:potato"
+  },
+  "result": {
+    "id": "quickly:potatostack"
+  }
+}

src/main/resources/data/quickly/recipe/shapeless_pillow_from_cotton.json

@@ -0,0 +1,13 @@
+{
+	"type": "minecraft:crafting_shapeless",
+	"ingredients": [
+		"quickly:cotton",
+		"quickly:cotton",
+		"quickly:cotton",
+		"quickly:cotton"
+	],
+	"result": {
+		"id": "quickly:pillow",
+		"count": 1
+	}
+}

src/main/resources/data/quickly/recipe/shapeless_pillow_from_feather.json

@@ -0,0 +1,18 @@
+{
+	"type": "minecraft:crafting_shapeless",
+	"ingredients": [
+		"minecraft:feather",
+		"minecraft:feather",
+		"minecraft:feather",
+		"minecraft:feather",
+		"minecraft:feather",
+		"minecraft:feather",
+		"minecraft:feather",
+		"minecraft:feather",
+		"minecraft:feather"
+	],
+	"result": {
+		"id": "quickly:pillow",
+		"count": 1
+	}
+}

src/main/resources/data/quickly/recipe/shapeless_potatos_from_potatostack.json

@@ -0,0 +1,10 @@
+{
+	"type": "minecraft:crafting_shapeless",
+	"ingredients": [
+		"quickly:potatostack"
+	],
+	"result": {
+		"id": "minecraft:potato",
+		"count": 4
+	}
+}

src/main/resources/data/quickly/recipe/stonecutting_boneblock.json

@@ -0,0 +1,8 @@
+{
+    "type": "minecraft:stonecutting",
+    "ingredient": "minecraft:bone_block",
+    "result": {
+      "id": "quickly:salpeter",
+      "count": 4
+    }
+}

src/main/resources/fabric.mod.json

@@ -22,12 +22,9 @@
 			"de.jottyfan.minecraft.QuicklyClient"
 		]
 	},
-	"mixins": [
-		"quickly.mixins.json"
-	],
 	"depends": {
-		"fabricloader": ">=0.18.4",
-		"minecraft": "~26.1-",
+		"fabricloader": ">=0.19.2",
+		"minecraft": "~26.1.1-",
 		"java": ">=25",
 		"fabric-api": "*"
 	}

src/main/resources/quickly.mixins.json

@@ -1,14 +0,0 @@
-{
-	"required": true,
-	"package": "de.jottyfan.minecraft.mixin",
-	"compatibilityLevel": "JAVA_25",
-	"mixins": [
-		"QuicklyMixin"
-	],
-	"injectors": {
-		"defaultRequire": 1
-	},
-	"overwrites": {
-		"requireAnnotations": true
-	}
-}