From a0252d4608141ae0278ebfd1f6758906a27a7174 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sat, 25 Nov 2023 23:13:14 +0100 Subject: [PATCH] added quickiepowder pickaxe, axe and shovel --- gradle.properties | 2 +- .../blocks/BlockQuickiepowder.java | 42 ++++++++ .../quickiefabric/blocks/QuickieBlocks.java | 3 +- .../quickiefabric/event/EventBlockBreak.java | 9 ++ .../quickiefabric/init/RegistryManager.java | 8 ++ .../quickiefabric/tools/QuickieTools.java | 3 + .../tools/ToolQuickiepowderAxe.java | 23 +++++ .../tools/ToolQuickiepowderPickaxe.java | 71 +++++++++++++ .../tools/ToolQuickiepowderShovel.java | 96 ++++++++++++++++++ .../quickiefabric/tools/ToolRangeableAxe.java | 2 +- .../tools/ToolSpeedpowderAxe.java | 7 ++ .../blockstates/blockquickiepowder.json | 7 ++ .../assets/quickiefabric/lang/de_de.json | 4 + .../assets/quickiefabric/lang/en_us.json | 4 + .../models/block/blockquickiepowder.json | 6 ++ .../models/item/blockquickiepowder.json | 10 ++ .../models/item/quickiepowderaxe.json | 6 ++ .../models/item/quickiepowderpickaxe.json | 6 ++ .../models/item/quickiepowdershovel.json | 6 ++ .../textures/block/blockquickiepowder.png | Bin 0 -> 5013 bytes .../{quickieaxe.png => quickiepowderaxe.png} | Bin .../{quickiehoe.png => quickiepowderhoe.png} | Bin ...iepickaxe.png => quickiepowderpickaxe.png} | Bin ...ckieshovel.png => quickiepowdershovel.png} | Bin ...waterhoe.png => quickiepowderwaterhoe.png} | Bin .../data/fabric/tags/items/axes.json | 3 +- .../data/fabric/tags/items/pickaxes.json | 3 +- .../data/fabric/tags/items/shovels.json | 3 +- ...blockquickiepowder_from_quickiepowder.json | 17 ++++ ...er_from_slimeblockandspeedpowderblock.json | 15 +++ .../recipes/quickiepowder_from_block.json | 12 +++ .../recipes/quickiepowderaxe.json | 20 ++++ .../recipes/quickiepowderpickaxe.json | 20 ++++ .../recipes/quickiepowdershovel.json | 20 ++++ 34 files changed, 422 insertions(+), 6 deletions(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockQuickiepowder.java create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderAxe.java create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderPickaxe.java create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderShovel.java create mode 100644 src/main/resources/assets/quickiefabric/blockstates/blockquickiepowder.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/blockquickiepowder.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/blockquickiepowder.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/quickiepowderaxe.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/quickiepowderpickaxe.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/quickiepowdershovel.json create mode 100644 src/main/resources/assets/quickiefabric/textures/block/blockquickiepowder.png rename src/main/resources/assets/quickiefabric/textures/item/{quickieaxe.png => quickiepowderaxe.png} (100%) rename src/main/resources/assets/quickiefabric/textures/item/{quickiehoe.png => quickiepowderhoe.png} (100%) rename src/main/resources/assets/quickiefabric/textures/item/{quickiepickaxe.png => quickiepowderpickaxe.png} (100%) rename src/main/resources/assets/quickiefabric/textures/item/{quickieshovel.png => quickiepowdershovel.png} (100%) rename src/main/resources/assets/quickiefabric/textures/item/{quickiewaterhoe.png => quickiepowderwaterhoe.png} (100%) create mode 100644 src/main/resources/data/quickiefabric/recipes/blockquickiepowder_from_quickiepowder.json create mode 100644 src/main/resources/data/quickiefabric/recipes/blockquickiepowder_from_slimeblockandspeedpowderblock.json create mode 100644 src/main/resources/data/quickiefabric/recipes/quickiepowder_from_block.json create mode 100644 src/main/resources/data/quickiefabric/recipes/quickiepowderaxe.json create mode 100644 src/main/resources/data/quickiefabric/recipes/quickiepowderpickaxe.json create mode 100644 src/main/resources/data/quickiefabric/recipes/quickiepowdershovel.json diff --git a/gradle.properties b/gradle.properties index 8f2377f..dab30e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.20.3-pre2+build.5 loader_version=0.14.24 # Mod Properties - mod_version = 1.20.3.1 + mod_version = 1.20.3.2 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockQuickiepowder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockQuickiepowder.java new file mode 100644 index 0000000..62a5d98 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockQuickiepowder.java @@ -0,0 +1,42 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.Arrays; +import java.util.List; + +import com.mojang.serialization.MapCodec; + +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.FallingBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContextParameterSet.Builder; +import net.minecraft.world.explosion.Explosion; + +/** + * + * @author jotty + * + */ +public class BlockQuickiepowder extends FallingBlock { + + public BlockQuickiepowder() { + super(FabricBlockSettings.create().luminance(state -> 12)); + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.QUICKIEPOWDER, 9) }); + } + + @Override + public boolean shouldDropItemsOnExplosion(Explosion explosion) { + return true; + } + + @Override + protected MapCodec getCodec() { + // TODO Auto-generated method stub + return null; + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java index 9e32174..edee31c 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -34,5 +34,6 @@ public class QuickieBlocks { public static final BlockStackerNorth BLOCKSTACKERNORTH = new BlockStackerNorth(); public static final BlockStackerSouth BLOCKSTACKERSOUTH = new BlockStackerSouth(); public static final BlockSpreader BLOCKSPREADER = new BlockSpreader(); - public static final BlockSpeedpowder BLOCKSPEEDPOWDER = new BlockSpeedpowder();; + public static final BlockSpeedpowder BLOCKSPEEDPOWDER = new BlockSpeedpowder(); + public static final BlockQuickiepowder BLOCKQUICKIEPOWDER = new BlockQuickiepowder(); } 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 b13aa50..8491270 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/event/EventBlockBreak.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/event/EventBlockBreak.java @@ -72,6 +72,15 @@ public class EventBlockBreak { } else if (QuickieTools.SPEEDPOWDERHOE.equals(tool)) { return breakBlockRecursive(new ArrayList<>(), world, validBlocks, pos, tool, range, BlockBreakDirection.ALL, player, false); + } else if (QuickieTools.QUICKIEPOWDERAXE.equals(tool)) { + return breakBlockRecursive(new ArrayList<>(), world, validBlocks, pos, tool, range, BlockBreakDirection.UPWARDS, + player, true); + } else if (QuickieTools.QUICKIEPOWDERPICKAXE.equals(tool)) { + return breakBlockRecursive(new ArrayList<>(), world, validBlocks, pos, tool, range, BlockBreakDirection.ALL, + player, false); + } else if (QuickieTools.QUICKIEPOWDERSHOVEL.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 eb6cfc4..a43eef4 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -107,6 +107,9 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERSHOVEL)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERHOE)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERWATERHOE)); + stacks.add(new ItemStack(QuickieTools.QUICKIEPOWDERAXE)); + stacks.add(new ItemStack(QuickieTools.QUICKIEPOWDERPICKAXE)); + stacks.add(new ItemStack(QuickieTools.QUICKIEPOWDERSHOVEL)); stacks.add(new ItemStack(QuickieBlocks.DIRT_SALPETER)); stacks.add(new ItemStack(QuickieBlocks.ORE_NETHER_SULPHOR)); stacks.add(new ItemStack(QuickieBlocks.ORE_SALPETER)); @@ -122,6 +125,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.BLOCKSULPHOR)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSALPETER)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSPEEDPOWDER)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKQUICKIEPOWDER)); stacks.add(new ItemStack(QuickieBlocks.DRILL_DOWN)); stacks.add(new ItemStack(QuickieBlocks.DRILL_EAST)); stacks.add(new ItemStack(QuickieBlocks.DRILL_SOUTH)); @@ -202,6 +206,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); registerBlock(QuickieBlocks.BLOCKSALPETER, "blocksalpeter"); registerBlock(QuickieBlocks.BLOCKSPEEDPOWDER, "blockspeedpowder"); + registerBlock(QuickieBlocks.BLOCKQUICKIEPOWDER, "blockquickiepowder"); registerBlock(QuickieBlocks.DRILL_DOWN, "drill"); registerBlock(QuickieBlocks.DRILL_EAST, "drilleast"); registerBlock(QuickieBlocks.DRILL_SOUTH, "drillsouth"); @@ -263,6 +268,9 @@ public class RegistryManager { registerItem(QuickieTools.SPEEDPOWDERSHOVEL, "speedpowdershovel"); registerItem(QuickieTools.SPEEDPOWDERHOE, "speedpowderhoe"); registerItem(QuickieTools.SPEEDPOWDERWATERHOE, "speedpowderwaterhoe"); + registerItem(QuickieTools.QUICKIEPOWDERAXE, "quickiepowderaxe"); + registerItem(QuickieTools.QUICKIEPOWDERPICKAXE, "quickiepowderpickaxe"); + registerItem(QuickieTools.QUICKIEPOWDERSHOVEL, "quickiepowdershovel"); } 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 50fb70d..be940a5 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/QuickieTools.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/QuickieTools.java @@ -11,4 +11,7 @@ public class QuickieTools { public static final ToolSpeedpowderShovel SPEEDPOWDERSHOVEL = new ToolSpeedpowderShovel(); public static final ToolSpeedpowderHoe SPEEDPOWDERHOE = new ToolSpeedpowderHoe(); public static final ToolSpeedpowderWaterHoe SPEEDPOWDERWATERHOE = new ToolSpeedpowderWaterHoe(); + public static final ToolQuickiepowderAxe QUICKIEPOWDERAXE = new ToolQuickiepowderAxe(); + public static final ToolQuickiepowderPickaxe QUICKIEPOWDERPICKAXE = new ToolQuickiepowderPickaxe(); + public static final ToolQuickiepowderShovel QUICKIEPOWDERSHOVEL = new ToolQuickiepowderShovel(); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderAxe.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderAxe.java new file mode 100644 index 0000000..4a1d487 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderAxe.java @@ -0,0 +1,23 @@ +package de.jottyfan.minecraft.quickiefabric.tools; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolMaterials; + +/** + * + * @author jotty + * + */ +public class ToolQuickiepowderAxe extends ToolRangeableAxe { + + public ToolQuickiepowderAxe() { + super(ToolMaterials.DIAMOND, 5, 2.0f, new FabricItemSettings()); + } + + @Override + public HarvestRange getRange(ItemStack stack) { + // TODO: get the range from the stack + return new HarvestRange(64, 128, 64); // trees bigger than that are too heavy for one small axe... + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderPickaxe.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderPickaxe.java new file mode 100644 index 0000000..277b690 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderPickaxe.java @@ -0,0 +1,71 @@ +package de.jottyfan.minecraft.quickiefabric.tools; + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.item.PickaxeItem; +import net.minecraft.item.ToolMaterials; +import net.minecraft.nbt.NbtCompound; + +/** + * + * @author jotty + * + */ +public class ToolQuickiepowderPickaxe extends PickaxeItem implements ToolRangeable { + + public static final int[] DEFAULT_HARVEST_RANGE = new int[] { 6, 6, 6 }; + + public ToolQuickiepowderPickaxe() { + super(ToolMaterials.DIAMOND, 5, 2.0f, new FabricItemSettings()); + } + + @Override + public HarvestRange getRange(ItemStack stack) { + NbtCompound tag = stack.getNbt(); + int[] range = tag.getIntArray("range"); + if (range.length < 3) { + range = DEFAULT_HARVEST_RANGE; + tag.putIntArray("range", range); + } + return new HarvestRange(range); + } + + @Override + public boolean canBreakNeighbors(BlockState blockIn) { + return super.isSuitableFor(blockIn); + } + + @Override + public List getBlockList(Block block) { + return Lists.newArrayList(block); + } + + public void setPlusRange(ItemStack stack, Integer plusRange) { + NbtCompound tag = stack.getNbt(); + int[] range = tag.getIntArray("range"); + if (range.length < 3) { + range = DEFAULT_HARVEST_RANGE; + } + HarvestRange harvestRange = new HarvestRange(range); + harvestRange.addXYZ(plusRange); + tag.putIntArray("range", harvestRange.getRangeAsArray()); + } + +// @Override +// public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand handIn) { +// CommonToolCode.onItemRightClick(worldIn, playerIn, handIn); +// return super.onItemRightClick(worldIn, playerIn, handIn); +// } +// +// @Override +// public void addInformation(ItemStack stack, World worldIn, List tooltip, ITooltipFlag flagIn) { +// CommonToolCode.addInformation(stack, worldIn, tooltip, flagIn); +// super.addInformation(stack, worldIn, tooltip, flagIn); +// } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderShovel.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderShovel.java new file mode 100644 index 0000000..dd2e889 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolQuickiepowderShovel.java @@ -0,0 +1,96 @@ +package de.jottyfan.minecraft.quickiefabric.tools; + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.item.ShovelItem; +import net.minecraft.item.ToolMaterials; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +/** + * + * @author jotty + * + */ +public class ToolQuickiepowderShovel extends ShovelItem implements ToolRangeable { + public static final Integer DEFAULT_HARVEST_RANGE = 6; + public HarvestRange range; + + public ToolQuickiepowderShovel() { + super(ToolMaterials.DIAMOND, 5, 2.0f, new FabricItemSettings()); + this.range = new HarvestRange(DEFAULT_HARVEST_RANGE); + } + + private void createPathOnGrass(World world, BlockPos pos, Direction side) { + BlockState blockState = world.getBlockState(pos); + if (blockState.isAir()) { + // try to find one underneath + pos = pos.down(); + blockState = world.getBlockState(pos); + } else if (!world.getBlockState(pos.up()).isAir()) { + pos = pos.up(); + blockState = world.getBlockState(pos); + } + if (side != Direction.DOWN) { + BlockState blockState2 = (BlockState) PATH_STATES.get(blockState.getBlock()); + if (blockState2 != null && world.getBlockState(pos.up()).isAir()) { + if (!world.isClient) { + world.setBlockState(pos, blockState2, 11); + } + } + } + } + + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + World world = context.getWorld(); + BlockPos pos = context.getBlockPos(); + BlockPos[] positions = new BlockPos[] { pos.north().north().west().west(), pos.north().north().west(), + pos.north().north(), pos.north().north().east(), pos.north().north().east().east(), pos.north().west().west(), + pos.north().west(), pos.north(), pos.north().east(), pos.north().east().east(), pos.west().west(), pos.west(), + pos, pos.east(), pos.east().east(), pos.south().west().west(), pos.south().west(), pos.south(), + pos.south().east(), pos.south().east().east(), pos.south().south().west().west(), pos.south().south().west(), + pos.south().south(), pos.south().south().east(), pos.south().south().east().east() }; + for (BlockPos p : positions) { + createPathOnGrass(world, p, context.getSide()); + } + return super.useOnBlock(context); + } + + @Override + public HarvestRange getRange(ItemStack stack) { + // TODO: get range from stack + return range; + } + + @Override + public boolean canBreakNeighbors(BlockState blockState) { + return super.isSuitableFor(blockState); + } + + @Override + public List getBlockList(Block block) { + return Lists.newArrayList(block); + } + +// @Override +// public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand handIn) { +// CommonToolCode.onItemRightClick(worldIn, playerIn, handIn); +// return super.onItemRightClick(worldIn, playerIn, handIn); +// } +// +// @Override +// public void addInformation(ItemStack stack, World worldIn, List tooltip, ITooltipFlag flagIn) { +// CommonToolCode.addInformation(stack, worldIn, tooltip, flagIn); +// super.addInformation(stack, worldIn, tooltip, flagIn); +// } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeableAxe.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeableAxe.java index a239f36..02051ca 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeableAxe.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeableAxe.java @@ -27,7 +27,7 @@ public class ToolRangeableAxe extends AxeItem implements ToolRangeable { @Override public HarvestRange getRange(ItemStack stack) { // TODO: get the range from the stack - return new HarvestRange(64, 128, 64); // trees bigger than that are too heavy for one small axe... + return new HarvestRange(16, 32, 16); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderAxe.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderAxe.java index de6e3a8..4c0bd1b 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderAxe.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderAxe.java @@ -1,6 +1,7 @@ package de.jottyfan.minecraft.quickiefabric.tools; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.ItemStack; import net.minecraft.item.ToolMaterials; /** @@ -13,4 +14,10 @@ public class ToolSpeedpowderAxe extends ToolRangeableAxe { public ToolSpeedpowderAxe() { super(ToolMaterials.DIAMOND, 4, 2.0f, new FabricItemSettings()); } + + @Override + public HarvestRange getRange(ItemStack stack) { + // TODO: get the range from the stack + return new HarvestRange(32, 64, 32); + } } diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockquickiepowder.json b/src/main/resources/assets/quickiefabric/blockstates/blockquickiepowder.json new file mode 100644 index 0000000..e158509 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blockquickiepowder.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blockquickiepowder" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index 61c77da..c30696f 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -7,6 +7,9 @@ "item.quickiefabric.speedpowderwaterhoe": "bewässerte Fluchtpulverfeldhacke", "item.quickiefabric.speedpowder": "Fluchtpulver", "item.quickiefabric.quickiepowder": "Eilpulver", + "item.quickiefabric.quickiepowderaxe": "Eilpulveraxt", + "item.quickiefabric.quickiepowderpickaxe": "Eilpulverspitzhacke", + "item.quickiefabric.quickiepowdershovel": "Eilpulverschaufel", "item.quickiefabric.sulphor": "Schwefel", "item.quickiefabric.salpeter": "Salpeter", "item.quickiefabric.construction0": "leerer Bauplan", @@ -60,6 +63,7 @@ "block.quickiefabric.blocksulphor": "Schwefelblock", "block.quickiefabric.blocksalpeter": "Salpeterblock", "block.quickiefabric.blockspeedpowder": "Fluchtpulverblock", + "block.quickiefabric.blockquickiepowder": "Eilpulverblock", "block.quickiefabric.drill": "Bohrer", "block.quickiefabric.drilleast": "Ost-Bohrer", "block.quickiefabric.drillsouth": "Süd-Bohrer", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index c6729ab..68f39f5 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -7,6 +7,9 @@ "item.quickiefabric.speedpowderwaterhoe": "watered speedpowder hoe", "item.quickiefabric.speedpowder": "speedpowder", "item.quickiefabric.quickiepowder": "hurrypowder", + "item.quickiefabric.quickiepowderaxe": "hurrypowder axe", + "item.quickiefabric.quickiepowderpickaxe": "hurrypowder pickaxe", + "item.quickiefabric.quickiepowdershovel": "hurrypowder shovel", "item.quickiefabric.sulphor": "sulfur", "item.quickiefabric.salpeter": "salpeter", "item.quickiefabric.construction0": "empty building plan", @@ -60,6 +63,7 @@ "block.quickiefabric.blocksulphor": "block of sulfur", "block.quickiefabric.blocksalpeter": "block of salpeter", "block.quickiefabric.blockspeedpowder": "block of speedpowder", + "block.quickiefabric.blockquickiepowder": "block of hurrypowder", "block.quickiefabric.drill": "drill", "block.quickiefabric.drilleast": "east drill", "block.quickiefabric.drillsouth": "south drill", diff --git a/src/main/resources/assets/quickiefabric/models/block/blockquickiepowder.json b/src/main/resources/assets/quickiefabric/models/block/blockquickiepowder.json new file mode 100644 index 0000000..8d1d65e --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blockquickiepowder.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickiefabric:block/blockquickiepowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/blockquickiepowder.json b/src/main/resources/assets/quickiefabric/models/item/blockquickiepowder.json new file mode 100644 index 0000000..72f1f19 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blockquickiepowder.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blockquickiepowder", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/quickiepowderaxe.json b/src/main/resources/assets/quickiefabric/models/item/quickiepowderaxe.json new file mode 100644 index 0000000..34b220f --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/quickiepowderaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/wooden_axe", + "textures": { + "layer0": "quickiefabric:item/quickiepowderaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/quickiepowderpickaxe.json b/src/main/resources/assets/quickiefabric/models/item/quickiepowderpickaxe.json new file mode 100644 index 0000000..0163b1b --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/quickiepowderpickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/wooden_pickaxe", + "textures": { + "layer0": "quickiefabric:item/quickiepowderpickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/quickiepowdershovel.json b/src/main/resources/assets/quickiefabric/models/item/quickiepowdershovel.json new file mode 100644 index 0000000..d591328 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/quickiepowdershovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/wooden_shovel", + "textures": { + "layer0": "quickiefabric:item/quickiepowdershovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/block/blockquickiepowder.png b/src/main/resources/assets/quickiefabric/textures/block/blockquickiepowder.png new file mode 100644 index 0000000000000000000000000000000000000000..958902d60843fa9f14ee16bd1dfcc3c10f75171d GIT binary patch literal 5013 zcmeHKdsGu=7LN$1Ac_hqtxAljMVw?ZnF-01$SVjD0^y~AXq`+ZFhU+A69{UxD_CDE zy1r4+E#kVif^yVVtE~70*9R}3Sc>?r+JY!TZH4_35OKHX>~YU_|03rkGxOcw{eAcT z?)~n`tW<;tJ2`yhz+$nSWFgWhaCNqP2ik*Q_ZOW6xSU-O6URgm8Em~lr>0XWHj}BR z*p!)8vsmUjjbiqYGw{G)Dm~L}%kG=&!4=asw5lCOmwbQu5}1~#^z_^h#d{62q@ zyZ0|r`=W&1@rvXECw0xK9aU~qTlIsK6K}4`-F*K|Qa+t_R~>o6ZPOmd+f!mpoh{`3 zprN_B*k$OnfUJ_^0r(M5x zD%RQ7*DrBSp39uVvz-%{jpUCT({``Ew7mY)FH&Z@UVb8DZPRYgjftvwFl$+}*K5Ab zxU_7KbI3y}->KobX)SAZlXB|C&hK`Teo&l)v-64(tBAU@ADoH+Vip3#jri%FI`5K*bcK%U5)g26)F!sDU7SAT3l1^`{Z?y;lll|{l=Hu%&%e} zTYSK`y}l?mZ%4~|j*R{CuE_nKpLtX=Hs;YUH`5X(`!%~At@*SgVZ_!q9;MaQ1;J%^ zg!;7l>id#Ah5@4&BOcL)-E4VrobC6OkGHp!RY6rp9=2ZpzWj&&>vk8{c$b|T4@VX} zGwsZ1OK*GCl$*Z9_i&rxl&$f|dKPQQY#OvzoIDICbs8?A(kUsfS)&Ji$71>Tn)L*k zLNRP5l|*YLoTlR^Ic!=b;mpG1uv{NVCDS1b3{>=j@ECGI3Mp1`e5X11m~lX$p%{W~ z)}(5UxLLxn^5Wp$vdrVKtq>+f!ikeB*nv6&#YVX(7lwk&bUMPB=D_wbsML6rbb2=h zc#?3E8Agxuco`WP+zbI%XGr4l#bPlJMtBGU0R&{s)G~w_(i$gND7rYLl#w*hdWP0% z*%nShsWUMW4hPuTZ{ySG(2|se3XpSYz(Zm}u~O(QguF44 z5<*FD6cULj3L?d7gb=7v5*8u7C?X6r=t?5BcT^TC6`)dy0G@(L2t@!N3Zr~TLsAwv!>#6H8m9`!wHrskAaDwbg!APW2Dr=m8 ztII?t6WSySOpoq%eY;NoMk`=yF&`7bVu&Cx3_?*v4H0Uk7*fJ8D5#o5y}d>6vm144 zCWA0g{z*VbpcQCOt5)n!tcCJ?ADxj*S*id8gZMCnh++@~hXpu_dBNZY=J5UxDUy_0 zjlxPuBo+!FlrO{}5rU~93MDX+vJ1v?USodt`Ab+gTQ^=)hE{n zDeytyzV7;;$>s3wjgiuVKYAJ9eb8GXasuy?_R7#;DeEHZAggmt-sLo~GDsg1Z)C9? zM_9i7SljYOgT(=iOdd4gk)xXnDp>jlel3e-lPHt=$A~WOu8CN&(Qb74^U6yd`Stm? zGLv}oZS~)c($*3Q>@FLpBr7GDel-5=ZXx+S^FCw)iQ00#}A7l=ou{+ zGlwgaj@h(ks^_0}_3{rGKl_MUve)H}-T4mckW{xt|6@XRvwXPRr?_@UVVsiA$qyE{ zUs;-^$|*s1wcV72{5`8JVuiM&6uvpVWcZ_*p*6=ov48z6d%?<0rGLyZ((6)lR+pQb zY(MXpu__IpKy7Yqd8CO9P08}Bs?3>SE8cc{+3GFMFQ3dJ~^Mc4hqF zhQ(ZG^}_b&XztXE)dej}PIL_0Flfre886ZbuPslU=9xI^z*GGh_p4u@4k+`mf1S;1 zH9Yv{Xqt9M>45f!g1UqY5AI2e^HM?@*Lb_RHAb#?>c4T-)FE4Qze-dV%y7uJt9cPK zuB!TUYs1LVsSWN+Zfu@)Z_UCSM}ga<&`Vd=M~tv7*>$|_LVEPm`Cphj$Qn(6Y0~8O zpUi`c4(AT7T=%3fYMAR}<;ZB+x8tz9W}8+QX#3^Yt!eHBp!Ha?pm1q%z`UjZ1a{g> AKmY&$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/quickiefabric/textures/item/quickieaxe.png b/src/main/resources/assets/quickiefabric/textures/item/quickiepowderaxe.png similarity index 100% rename from src/main/resources/assets/quickiefabric/textures/item/quickieaxe.png rename to src/main/resources/assets/quickiefabric/textures/item/quickiepowderaxe.png diff --git a/src/main/resources/assets/quickiefabric/textures/item/quickiehoe.png b/src/main/resources/assets/quickiefabric/textures/item/quickiepowderhoe.png similarity index 100% rename from src/main/resources/assets/quickiefabric/textures/item/quickiehoe.png rename to src/main/resources/assets/quickiefabric/textures/item/quickiepowderhoe.png diff --git a/src/main/resources/assets/quickiefabric/textures/item/quickiepickaxe.png b/src/main/resources/assets/quickiefabric/textures/item/quickiepowderpickaxe.png similarity index 100% rename from src/main/resources/assets/quickiefabric/textures/item/quickiepickaxe.png rename to src/main/resources/assets/quickiefabric/textures/item/quickiepowderpickaxe.png diff --git a/src/main/resources/assets/quickiefabric/textures/item/quickieshovel.png b/src/main/resources/assets/quickiefabric/textures/item/quickiepowdershovel.png similarity index 100% rename from src/main/resources/assets/quickiefabric/textures/item/quickieshovel.png rename to src/main/resources/assets/quickiefabric/textures/item/quickiepowdershovel.png diff --git a/src/main/resources/assets/quickiefabric/textures/item/quickiewaterhoe.png b/src/main/resources/assets/quickiefabric/textures/item/quickiepowderwaterhoe.png similarity index 100% rename from src/main/resources/assets/quickiefabric/textures/item/quickiewaterhoe.png rename to src/main/resources/assets/quickiefabric/textures/item/quickiepowderwaterhoe.png diff --git a/src/main/resources/data/fabric/tags/items/axes.json b/src/main/resources/data/fabric/tags/items/axes.json index cffe513..7271e78 100644 --- a/src/main/resources/data/fabric/tags/items/axes.json +++ b/src/main/resources/data/fabric/tags/items/axes.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "quickiefabric:speedpowderaxe" + "quickiefabric:speedpowderaxe", + "quickiefabric:quickiepowderaxe" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/pickaxes.json b/src/main/resources/data/fabric/tags/items/pickaxes.json index 84cb283..6ebfcbe 100644 --- a/src/main/resources/data/fabric/tags/items/pickaxes.json +++ b/src/main/resources/data/fabric/tags/items/pickaxes.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "quickiefabric:speedpowderpickaxe" + "quickiefabric:speedpowderpickaxe", + "quickiefabric:quickiepowderpickaxe" ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/shovels.json b/src/main/resources/data/fabric/tags/items/shovels.json index 6b0405e..4a44205 100644 --- a/src/main/resources/data/fabric/tags/items/shovels.json +++ b/src/main/resources/data/fabric/tags/items/shovels.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "quickiefabric:speedpowdershovel" + "quickiefabric:speedpowdershovel", + "quickiefabric:quickiepowdershovel" ] } \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockquickiepowder_from_quickiepowder.json b/src/main/resources/data/quickiefabric/recipes/blockquickiepowder_from_quickiepowder.json new file mode 100644 index 0000000..d294062 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockquickiepowder_from_quickiepowder.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "sss", + "sss", + "sss" + ], + "key": { + "s": { + "item": "quickiefabric:quickiepowder" + } + }, + "result": { + "item": "quickiefabric:blockquickiepowder", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockquickiepowder_from_slimeblockandspeedpowderblock.json b/src/main/resources/data/quickiefabric/recipes/blockquickiepowder_from_slimeblockandspeedpowderblock.json new file mode 100644 index 0000000..18e1455 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockquickiepowder_from_slimeblockandspeedpowderblock.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:slime_block" + }, + { + "item": "quickiefabric:blockspeedpowder" + } + ], + "result": { + "item": "quickiefabric:blockquickiepowder", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/quickiepowder_from_block.json b/src/main/resources/data/quickiefabric/recipes/quickiepowder_from_block.json new file mode 100644 index 0000000..16b67ef --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/quickiepowder_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blockquickiepowder" + } + ], + "result": { + "item": "quickiefabric:quickiepowder", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/quickiepowderaxe.json b/src/main/resources/data/quickiefabric/recipes/quickiepowderaxe.json new file mode 100644 index 0000000..d50eb8e --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/quickiepowderaxe.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ss", + "s|", + " |" + ], + "key": { + "s": { + "item": "quickiefabric:quickiepowder" + }, + "|": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "quickiefabric:quickiepowderaxe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/quickiepowderpickaxe.json b/src/main/resources/data/quickiefabric/recipes/quickiepowderpickaxe.json new file mode 100644 index 0000000..6b11968 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/quickiepowderpickaxe.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "sss", + " | ", + " | " + ], + "key": { + "s": { + "item": "quickiefabric:quickiepowder" + }, + "|": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "quickiefabric:quickiepowderpickaxe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/quickiepowdershovel.json b/src/main/resources/data/quickiefabric/recipes/quickiepowdershovel.json new file mode 100644 index 0000000..29a098e --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/quickiepowdershovel.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "s", + "|", + "|" + ], + "key": { + "s": { + "item": "quickiefabric:quickiepowder" + }, + "|": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "quickiefabric:quickiepowdershovel", + "count": 1 + } +} \ No newline at end of file