diff --git a/gradle.properties b/gradle.properties index d2e8f9b..b9deb11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.6 # Mod Properties - mod_version = 1.17.0 + mod_version = 1.17.1 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/event/EventBlockBreak.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/event/EventBlockBreak.java index f654062..95b0a3b 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/event/EventBlockBreak.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/event/EventBlockBreak.java @@ -69,6 +69,9 @@ public class EventBlockBreak { } else if (QuickieTools.SPEEDPOWDERSHOVEL.equals(tool)) { return breakBlockRecursive(new ArrayList<>(), world, validBlocks, pos, tool, range, BlockBreakDirection.ALL, player, false); + } else if (QuickieTools.SPEEDPOWDERHOE.equals(tool)) { + return breakBlockRecursive(new ArrayList<>(), world, validBlocks, pos, tool, range, BlockBreakDirection.ALL, + player, false); } else { return 0; } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 4366f3e..91e1c20 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -133,6 +133,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERAXE)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERPICKAXE)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERSHOVEL)); + stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERHOE)); stacks.add(new ItemStack(QuickieBlocks.DIRT_SALPETER)); stacks.add(new ItemStack(QuickieBlocks.ORE_NETHER_SULPHOR)); stacks.add(new ItemStack(QuickieBlocks.ORE_SALPETER)); @@ -256,6 +257,7 @@ public class RegistryManager { registerItem(QuickieTools.SPEEDPOWDERAXE, "speedpowderaxe"); registerItem(QuickieTools.SPEEDPOWDERPICKAXE, "speedpowderpickaxe"); registerItem(QuickieTools.SPEEDPOWDERSHOVEL, "speedpowdershovel"); + registerItem(QuickieTools.SPEEDPOWDERHOE, "speedpowderhoe"); } public static final void registerContainer() { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/QuickieTools.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/QuickieTools.java index a6a56cc..12ebb04 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/QuickieTools.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/QuickieTools.java @@ -9,4 +9,5 @@ public class QuickieTools { public static final ToolSpeedpowderAxe SPEEDPOWDERAXE = new ToolSpeedpowderAxe(); public static final ToolSpeedpowderPickaxe SPEEDPOWDERPICKAXE = new ToolSpeedpowderPickaxe(); public static final ToolSpeedpowderShovel SPEEDPOWDERSHOVEL = new ToolSpeedpowderShovel(); + public static final ToolSpeedpowderHoe SPEEDPOWDERHOE = new ToolSpeedpowderHoe(); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeable.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeable.java index d7e2e48..0aba38d 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeable.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeable.java @@ -32,6 +32,12 @@ public interface ToolRangeable { Byg.createFromStrings("black_sand", "white_sand", "peat", "meadow_dirt", "mud_block", "blue_sand", "purple_sand"), Terrestria.createFromStrings("basalt_sand")); + public static final Set HOE_EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.BAMBOO, Blocks.BAMBOO_SAPLING, + Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM, Blocks.SUNFLOWER, Blocks.CORNFLOWER, Blocks.SEAGRASS, + Blocks.TALL_GRASS, Blocks.TALL_SEAGRASS, Blocks.GRASS, Blocks.KELP_PLANT, Blocks.KELP}); + + public static final Set HOE_EXTERNAL_EFFECTIVE_ON = mergeSets(); + public static final List> AXE_EFFECTIVE_ON = Lists.newArrayList( Arrays.asList(Blocks.ACACIA_LOG, Blocks.STRIPPED_ACACIA_LOG, Blocks.ACACIA_WOOD, Blocks.STRIPPED_ACACIA_WOOD), Arrays.asList(Blocks.BIRCH_LOG, Blocks.STRIPPED_BIRCH_LOG, Blocks.BIRCH_WOOD, Blocks.STRIPPED_BIRCH_WOOD), @@ -54,8 +60,7 @@ public interface ToolRangeable { Terrestria.createFromSet(Terrestria.WOOD.getGroups("log", "quarter_log", "log_bare", "log_top", "wood", "")), // only because terrestria leaves are not instanceof LeavesBlock Terrestria.createFromSet(Terrestria.WOOD.getGroups("leaves")), - Byg.createFromSet(Byg.WOOD.getGroups("log", "wood")), - Byg.createFromSet(Byg.MUSHROOM.getGroups("block", "stem"))); + Byg.createFromSet(Byg.WOOD.getGroups("log", "wood")), Byg.createFromSet(Byg.MUSHROOM.getGroups("block", "stem"))); public static final Set PICKAXE_EFFECTIVE_ON = Sets .newHashSet(new Block[] { Blocks.GLOWSTONE, QuickieBlocks.ORE_NETHER_SULPHOR, QuickieBlocks.ORE_SALPETER, diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index 811283d..2adae57 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -3,6 +3,7 @@ "item.quickiefabric.speedpowderaxe": "Fluchtpulveraxt", "item.quickiefabric.speedpowderpickaxe": "Fluchtpulverspitzhacke", "item.quickiefabric.speedpowdershovel": "Fluchtpulverschaufel", + "item.quickiefabric.speedpowderhoe": "Fluchtpulverfeldhacke", "item.quickiefabric.speedpowder": "Fluchtpulver", "item.quickiefabric.sulphor": "Schwefel", "item.quickiefabric.salpeter": "Salpeter", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index 7956c0d..7ae4d50 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -3,6 +3,7 @@ "item.quickiefabric.speedpowderaxe": "speedpowder axe", "item.quickiefabric.speedpowderpickaxe": "speedpowder pickaxe", "item.quickiefabric.speedpowdershovel": "speedpowder shovel", + "item.quickiefabric.speedpowderhoe": "speedpowder hoe", "item.quickiefabric.speedpowder": "speedpowder", "item.quickiefabric.sulphor": "sulfur", "item.quickiefabric.salpeter": "salpeter", diff --git a/src/main/resources/data/quickiefabric/recipes/speedpowderaxe.json b/src/main/resources/data/quickiefabric/recipes/speedpowderaxe.json index 3eb4172..1b52963 100644 --- a/src/main/resources/data/quickiefabric/recipes/speedpowderaxe.json +++ b/src/main/resources/data/quickiefabric/recipes/speedpowderaxe.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "ss ", - "s| ", - " | " + "ss", + "s|", + " |" ], "key": { "s": { diff --git a/src/main/resources/data/quickiefabric/recipes/speedpowdershovel.json b/src/main/resources/data/quickiefabric/recipes/speedpowdershovel.json index 9cd51db..3a563a2 100644 --- a/src/main/resources/data/quickiefabric/recipes/speedpowdershovel.json +++ b/src/main/resources/data/quickiefabric/recipes/speedpowdershovel.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " s ", - " | ", - " | " + "s", + "|", + "|" ], "key": { "s": {