version 1.21.4

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.3
+minecraft_version=1.21.4
-yarn_mappings=1.21.3+build.2
+yarn_mappings=1.21.4+build.1
 loader_version=0.16.9
 
 # Mod Properties
-mod_version=1.21.3.1
+mod_version=1.21.4.0
 maven_group=de.jottyfan.quickiemod
 archives_base_name=quickiemod
 
 # Dependencies
-fabric_version=0.108.0+1.21.3
+fabric_version=0.110.5+1.21.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/de/jottyfan/quickiemod/event/EventBlockBreak.java

@@ -3,6 +3,7 @@ package de.jottyfan.quickiemod.event;
 import java.util.ArrayList;
 import java.util.List;
 
+import de.jottyfan.quickiemod.Quickiemod;
 import de.jottyfan.quickiemod.item.HarvestRange;
 import de.jottyfan.quickiemod.item.ModItems;
 import de.jottyfan.quickiemod.item.ToolRangeable;
@@ -63,32 +64,38 @@ public class EventBlockBreak {
 			BlockPos pos, PlayerEntity player) {
 		List<Block> validBlocks = tool.getBlockList(currentBlock);
 		HarvestRange range = tool.getRange(itemStack);
-		List<String> visitedBlocks = new ArrayList<>();
+		if (tool instanceof Item) {
-		if (tool instanceof ToolSpeedpowderAxe) {
+			Item toolItem = (Item) tool; // a rangeable tool should always be an item
-			return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.UPWARDS,
+			List<String> visitedBlocks = new ArrayList<>();
-					player, true);
+			if (tool instanceof ToolSpeedpowderAxe) {
-		} else if (ModItems.TOOL_SPEEDPOWDERPICKAXE.getName().equals(tool.getName())) {
-			return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
-					player, false);
-		} else if (ModItems.TOOL_SPEEDPOWDERSHOVEL.getName().equals(tool.getName())) {
-			return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
-					player, false);
-		} else if (ModItems.TOOL_SPEEDPOWDERHOE.getName().equals(tool.getName())) {
-			return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
-					player, false);
-		} else if (ModItems.TOOL_QUICKIEPOWDERAXE.getName().equals(tool.getName())) {
 				return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.UPWARDS,
 						player, true);
-		} else if (ModItems.TOOL_QUICKIEPOWDERPICKAXE.getName().equals(tool.getName())) {
+			} else if (ModItems.TOOL_SPEEDPOWDERPICKAXE.getName().equals(toolItem.getName())) {
-			return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
+				return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
-					player, false);
+						player, false);
-		} else if (ModItems.TOOL_QUICKIEPOWDERSHOVEL.getName().equals(tool.getName())) {
+			} else if (ModItems.TOOL_SPEEDPOWDERSHOVEL.getName().equals(toolItem.getName())) {
-			return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
+				return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
-					player, false);
+						player, false);
-		} else if (ModItems.TOOL_QUICKIEPOWDERHOE.getName().equals(tool.getName())) {
+			} else if (ModItems.TOOL_SPEEDPOWDERHOE.getName().equals(toolItem.getName())) {
-			return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
+				return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
-					player, false);
+						player, false);
+			} else if (ModItems.TOOL_QUICKIEPOWDERAXE.getName().equals(toolItem.getName())) {
+					return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.UPWARDS,
+							player, true);
+			} else if (ModItems.TOOL_QUICKIEPOWDERPICKAXE.getName().equals(toolItem.getName())) {
+				return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
+						player, false);
+			} else if (ModItems.TOOL_QUICKIEPOWDERSHOVEL.getName().equals(toolItem.getName())) {
+				return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
+						player, false);
+			} else if (ModItems.TOOL_QUICKIEPOWDERHOE.getName().equals(toolItem.getName())) {
+				return breakBlockRecursive(visitedBlocks, world, validBlocks, pos, tool, range, BlockBreakDirection.ALL,
+						player, false);
+			} else {
+				return 0;
+			}
 		} else {
+			Quickiemod.LOGGER.warn("using a tool that is not an item - no rangeable operations are possible.");
 			return 0;
 		}
 	}

src/main/java/de/jottyfan/quickiemod/item/ToolRangeable.java

@@ -5,7 +5,6 @@ import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.Text;
 
 /**
  *
@@ -14,13 +13,6 @@ import net.minecraft.text.Text;
  */
 public interface ToolRangeable {
 
-	/**
-	 * dummy to have a getName method that comes with the item
-	 *
-	 * @return the name
-	 */
-	public Text getName();
-
 	/**
 	 * @param stack the item stack that keeps the range
 	 * @return range of blocks to be harvested

src/main/resources/assets/quickiemod/items/blockquickiepowder.json

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

src/main/resources/assets/quickiemod/items/blocksalpeter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blocksalpeter"
+  }
+}

src/main/resources/assets/quickiemod/items/blockspeedpowder.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blockspeedpowder"
+	}
+}

src/main/resources/assets/quickiemod/items/blockstackerdown.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blockstackerdown"
+	}
+}

src/main/resources/assets/quickiemod/items/blockstackereast.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blockstackereast"
+	}
+}

src/main/resources/assets/quickiemod/items/blockstackernorth.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blockstackernorth"
+	}
+}

src/main/resources/assets/quickiemod/items/blockstackersouth.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blockstackersouth"
+	}
+}

src/main/resources/assets/quickiemod/items/blockstackerup.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blockstackerup"
+	}
+}

src/main/resources/assets/quickiemod/items/blockstackerwest.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blockstackerwest"
+	}
+}

src/main/resources/assets/quickiemod/items/blocksulphor.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/blocksulphor"
+	}
+}

src/main/resources/assets/quickiemod/items/canola.json

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

src/main/resources/assets/quickiemod/items/canolabottle.json

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

src/main/resources/assets/quickiemod/items/canolabottlestack.json

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

src/main/resources/assets/quickiemod/items/canolaplant.json

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

src/main/resources/assets/quickiemod/items/canolaseed.json

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

src/main/resources/assets/quickiemod/items/carrotstack.json

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

src/main/resources/assets/quickiemod/items/cotton.json

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

src/main/resources/assets/quickiemod/items/cottonplant.json

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

src/main/resources/assets/quickiemod/items/cottonseed.json

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

src/main/resources/assets/quickiemod/items/dirtsalpeter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/dirtsalpeter"
+	}
+}

src/main/resources/assets/quickiemod/items/drill.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/drill"
+	}
+}

src/main/resources/assets/quickiemod/items/drilleast.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/drilleast"
+	}
+}

src/main/resources/assets/quickiemod/items/drillnorth.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/drillnorth"
+	}
+}

src/main/resources/assets/quickiemod/items/drillsouth.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/drillsouth"
+	}
+}

src/main/resources/assets/quickiemod/items/drillwest.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/drillwest"
+	}
+}

src/main/resources/assets/quickiemod/items/emptylavahoarder.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/emptylavahoarder"
+	}
+}

src/main/resources/assets/quickiemod/items/itemhoarder.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/itemhoarder"
+	}
+}

src/main/resources/assets/quickiemod/items/kelpstack.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/kelpstack"
+  }
+}

src/main/resources/assets/quickiemod/items/lavahoarder.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/lavahoarder"
+	}
+}

src/main/resources/assets/quickiemod/items/monsterhoarder.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/monsterhoarder"
+	}
+}

src/main/resources/assets/quickiemod/items/oredeepslatesulphor.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/oredeepslatesulphor"
+	}
+}

src/main/resources/assets/quickiemod/items/orenethersulphor.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/orenethersulphor"
+	}
+}

src/main/resources/assets/quickiemod/items/oresalpeter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/oresalpeter"
+	}
+}

src/main/resources/assets/quickiemod/items/oresandsalpeter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/oresandsalpeter"
+	}
+}

src/main/resources/assets/quickiemod/items/oresulphor.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/oresulphor"
+  }
+}

src/main/resources/assets/quickiemod/items/oxidizedcopperpowder.json

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

src/main/resources/assets/quickiemod/items/quickieingot.json

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

src/main/resources/assets/quickiemod/items/quickiepowder.json

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

src/main/resources/assets/quickiemod/items/quickiepowderaxe.json

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

src/main/resources/assets/quickiemod/items/quickiepowderhoe.json

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

src/main/resources/assets/quickiemod/items/quickiepowderpickaxe.json

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

src/main/resources/assets/quickiemod/items/quickiepowdershovel.json

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

src/main/resources/assets/quickiemod/items/quickiepowderwaterhoe.json

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

src/main/resources/assets/quickiemod/items/rotten_flesh_stripes.json

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

src/main/resources/assets/quickiemod/items/salpeter.json

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

src/main/resources/assets/quickiemod/items/sandsalpeter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/sandsalpeter"
+	}
+}

src/main/resources/assets/quickiemod/items/speedingot.json

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

src/main/resources/assets/quickiemod/items/speedpowder.json

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

src/main/resources/assets/quickiemod/items/speedpowderaxe.json

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

src/main/resources/assets/quickiemod/items/speedpowderhoe.json

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

src/main/resources/assets/quickiemod/items/speedpowderpickaxe.json

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

src/main/resources/assets/quickiemod/items/speedpowdershears.json

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

src/main/resources/assets/quickiemod/items/speedpowdershovel.json

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

src/main/resources/assets/quickiemod/items/speedpowderwaterhoe.json

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

src/main/resources/assets/quickiemod/items/stub.json

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

src/main/resources/assets/quickiemod/items/sulphor.json

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

src/main/resources/fabric.mod.json

@@ -29,7 +29,7 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.16.9",
-		"minecraft": "~1.21.3",
+		"minecraft": "~1.21.4",
 		"java": ">=21",
 		"fabric-api": "*"
 	},