minecraft/quickiefabric
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

added speedpowder hoe

Browse Source
This commit is contained in:
Jörg Henke 2021-08-15 15:11:18 +02:00
parent 633484f22d
commit f1949e811b
9 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -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

3
src/main/java/de/jottyfan/minecraft/quickiefabric/event/EventBlockBreak.java
View File

@ -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;
}

2
src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java
View File

@ -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() {

1
src/main/java/de/jottyfan/minecraft/quickiefabric/tools/QuickieTools.java
View File

@ -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();
}

9
src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeable.java
View File

@ -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<Block> 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<Identifier> HOE_EXTERNAL_EFFECTIVE_ON = mergeSets();
public static final List<List<Block>> 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<Block> PICKAXE_EFFECTIVE_ON = Sets
.newHashSet(new Block[] { Blocks.GLOWSTONE, QuickieBlocks.ORE_NETHER_SULPHOR, QuickieBlocks.ORE_SALPETER,

1
src/main/resources/assets/quickiefabric/lang/de_de.json
View File

@ -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",

1
src/main/resources/assets/quickiefabric/lang/en_us.json
View File

@ -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",

6
src/main/resources/data/quickiefabric/recipes/speedpowderaxe.json
View File

@ -1,9 +1,9 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ss ",
"s| ",
" | "
"ss",
"s|",
" |"
],
"key": {
"s": {

6
src/main/resources/data/quickiefabric/recipes/speedpowdershovel.json
View File

@ -1,9 +1,9 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" s ",
" | ",
" | "
"s",
"|",
"|"
],
"key": {
"s": {