diff --git a/gradle.properties b/gradle.properties index eb36e07..77ef68b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.14.8 # Mod Properties - mod_version = 1.19.0.2 + mod_version = 1.19.0.3 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/BlockSpreaderEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/BlockSpreaderEntity.java index 5c5b305..36b0bc9 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/BlockSpreaderEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/BlockSpreaderEntity.java @@ -5,9 +5,6 @@ import org.apache.logging.log4j.Logger; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.LootableContainerBlockEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -24,72 +21,6 @@ public class BlockSpreaderEntity extends BlockEntity { } public static void tick(World world, BlockPos pos, BlockState state, BlockSpreaderEntity entity) { - if (!world.isClient) { - // TODO: source is a chest type below - BlockEntity source = world.getBlockEntity(pos.down()); - // dest is the block that fits to the filter of the gui (north, south, west, east only) - BlockEntity dest = world.getBlockEntity(pos.north()); - Boolean sourceIsLootable = source instanceof LootableContainerBlockEntity; - Boolean destIsLootable = dest instanceof LootableContainerBlockEntity; - if (sourceIsLootable && destIsLootable) { - LootableContainerBlockEntity lootableSource = (LootableContainerBlockEntity) source; - LootableContainerBlockEntity lootableDest = (LootableContainerBlockEntity) dest; - transferOneStack(lootableSource, lootableDest); - } - } - } - - private static final void transferOneStack(LootableContainerBlockEntity source, LootableContainerBlockEntity dest) { - Integer sourceSlot = findItemStackPos(source, false); - if (sourceSlot != null && !Items.AIR.equals(source.getStack(sourceSlot).getItem())) { - ItemStack sourceStack = source.getStack(sourceSlot); - Integer destSlot = findItemStackPos(dest, sourceStack); - if (destSlot != null) { - Integer occupied = dest.getStack(destSlot).getCount(); - Integer free = dest.getStack(destSlot).getMaxCount() - occupied; - Integer candidates = source.getStack(sourceSlot).getCount(); - Integer travellers = candidates > free ? free : candidates; - if (travellers > 0) { - LOGGER.debug("transfer {}/{} of {} from slot {} to slot {} on top of {} ones", travellers, candidates, source.getStack(sourceSlot).getItem().toString(), sourceSlot, destSlot, occupied); - source.getStack(sourceSlot).decrement(travellers); - if (source.getStack(sourceSlot).getCount() < 1) { - source.removeStack(sourceSlot); // make empty slots really empty - } - dest.getStack(destSlot).increment(travellers); - } - } else { - Integer destFreeSlot = findItemStackPos(dest, true); - if (destFreeSlot != null) { - LOGGER.debug("transfer all of {} from slot {} to slot {}", source.getStack(sourceSlot).getItem().toString(), sourceSlot, destSlot); - dest.setStack(destFreeSlot, source.removeStack(sourceSlot)); - } - } - } - } - - private static final Integer findItemStackPos(LootableContainerBlockEntity lcbe, ItemStack sourceStack) { - Integer counter = lcbe.size(); - while (counter > 0) { - counter--; - ItemStack stack = lcbe.getStack(counter); - if (stack.getItem().equals(sourceStack.getItem())) { - if (stack.getCount() < stack.getMaxCount()) { - return counter; - } - } - } - return null; - } - - private static final Integer findItemStackPos(LootableContainerBlockEntity lcbe, Boolean empty) { - Integer counter = lcbe.size(); - while (counter > 0) { - counter--; - ItemStack stack = lcbe.getStack(counter); - if (empty.equals(ItemStack.EMPTY.equals(stack))) { - return counter; - } - } - return null; + LOGGER.debug("not yet implemented"); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/BlockStackerEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/BlockStackerEntity.java index bc25477..f341b70 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/BlockStackerEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/BlockStackerEntity.java @@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blockentity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.LootableContainerBlockEntity; @@ -25,8 +26,10 @@ public class BlockStackerEntity extends BlockEntity { public static void tick(World world, BlockPos pos, BlockState state, BlockStackerEntity entity) { if (!world.isClient) { - BlockEntity source = world.getBlockEntity(pos.down()); - BlockEntity dest = world.getBlockEntity(pos.up()); + pos.down(); + BlockStacker block = (BlockStacker) state.getBlock(); + BlockEntity source = world.getBlockEntity(pos.offset(block.getSourceOffset())); + BlockEntity dest = world.getBlockEntity(pos.offset(block.getDestOffset())); Boolean sourceIsLootable = source instanceof LootableContainerBlockEntity; Boolean destIsLootable = dest instanceof LootableContainerBlockEntity; if (sourceIsLootable && destIsLootable) { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java new file mode 100644 index 0000000..9f5c233 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java @@ -0,0 +1,67 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.ArrayList; +import java.util.List; + +import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.Material; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +/** + * + * @author jotty + * + */ +public class BlockStackerDown extends BlockWithEntity implements BlockStacker { + + public BlockStackerDown() { + super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + } + + @Override + public Direction getSourceOffset() { + return Direction.UP; + } + + @Override + public Direction getDestOffset() { + return Direction.DOWN; + } + + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new BlockStackerEntity(pos, state); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + List list = new ArrayList<>(); + list.add(new ItemStack(QuickieBlocks.BLOCKSTACKERDOWN.asItem())); + return list; + } + + @Override + public BlockEntityTicker getTicker(World world, BlockState state, + BlockEntityType type) { + return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java new file mode 100644 index 0000000..6898e24 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java @@ -0,0 +1,67 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.ArrayList; +import java.util.List; + +import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.Material; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +/** + * + * @author jotty + * + */ +public class BlockStackerEast extends BlockWithEntity implements BlockStacker { + + public BlockStackerEast() { + super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + } + + @Override + public Direction getSourceOffset() { + return Direction.WEST; + } + + @Override + public Direction getDestOffset() { + return Direction.EAST; + } + + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new BlockStackerEntity(pos, state); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + List list = new ArrayList<>(); + list.add(new ItemStack(QuickieBlocks.BLOCKSTACKEREAST.asItem())); + return list; + } + + @Override + public BlockEntityTicker getTicker(World world, BlockState state, + BlockEntityType type) { + return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java new file mode 100644 index 0000000..b59fff9 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java @@ -0,0 +1,67 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.ArrayList; +import java.util.List; + +import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.Material; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +/** + * + * @author jotty + * + */ +public class BlockStackerNorth extends BlockWithEntity implements BlockStacker { + + public BlockStackerNorth() { + super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + } + + @Override + public Direction getSourceOffset() { + return Direction.SOUTH; + } + + @Override + public Direction getDestOffset() { + return Direction.NORTH; + } + + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new BlockStackerEntity(pos, state); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + List list = new ArrayList<>(); + list.add(new ItemStack(QuickieBlocks.BLOCKSTACKERNORTH.asItem())); + return list; + } + + @Override + public BlockEntityTicker getTicker(World world, BlockState state, + BlockEntityType type) { + return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java new file mode 100644 index 0000000..8fa8d2e --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java @@ -0,0 +1,67 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.ArrayList; +import java.util.List; + +import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.Material; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +/** + * + * @author jotty + * + */ +public class BlockStackerSouth extends BlockWithEntity implements BlockStacker { + + public BlockStackerSouth() { + super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + } + + @Override + public Direction getSourceOffset() { + return Direction.NORTH; + } + + @Override + public Direction getDestOffset() { + return Direction.SOUTH; + } + + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new BlockStackerEntity(pos, state); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + List list = new ArrayList<>(); + list.add(new ItemStack(QuickieBlocks.BLOCKSTACKERSOUTH.asItem())); + return list; + } + + @Override + public BlockEntityTicker getTicker(World world, BlockState state, + BlockEntityType type) { + return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStacker.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java similarity index 64% rename from src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStacker.java rename to src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java index 348d63a..aef7813 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStacker.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java @@ -1,7 +1,11 @@ package de.jottyfan.minecraft.quickiefabric.blocks; +import java.util.ArrayList; +import java.util.List; + import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; @@ -10,7 +14,10 @@ import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext.Builder; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; /** @@ -18,12 +25,22 @@ import net.minecraft.world.World; * @author jotty * */ -public class BlockStacker extends BlockWithEntity { +public class BlockStackerUp extends BlockWithEntity implements BlockStacker { - public BlockStacker() { + public BlockStackerUp() { super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); } + @Override + public Direction getSourceOffset() { + return Direction.DOWN; + } + + @Override + public Direction getDestOffset() { + return Direction.UP; + } + @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return new BlockStackerEntity(pos, state); @@ -34,6 +51,13 @@ public class BlockStacker extends BlockWithEntity { return BlockRenderType.MODEL; } + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + List list = new ArrayList<>(); + list.add(new ItemStack(QuickieBlocks.BLOCKSTACKERUP.asItem())); + return list; + } + @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java new file mode 100644 index 0000000..6d285de --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java @@ -0,0 +1,67 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.ArrayList; +import java.util.List; + +import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.Material; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +/** + * + * @author jotty + * + */ +public class BlockStackerWest extends BlockWithEntity implements BlockStacker { + + public BlockStackerWest() { + super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); + } + + @Override + public Direction getSourceOffset() { + return Direction.EAST; + } + + @Override + public Direction getDestOffset() { + return Direction.WEST; + } + + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new BlockStackerEntity(pos, state); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + List list = new ArrayList<>(); + list.add(new ItemStack(QuickieBlocks.BLOCKSTACKERWEST.asItem())); + return list; + } + + @Override + public BlockEntityTicker getTicker(World world, BlockState state, + BlockEntityType type) { + return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); + } +} 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 40035bd..d5a5b2b 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -25,6 +25,11 @@ public class QuickieBlocks { public static final BlockDrillWest DRILL_WEST = new BlockDrillWest(); public static final BlockDrillNorth DRILL_NORTH = new BlockDrillNorth(); public static final BlockDrillstop DRILLSTOP = new BlockDrillstop(); - public static final BlockStacker BLOCKSTACKER = new BlockStacker(); + public static final BlockStackerUp BLOCKSTACKERUP = new BlockStackerUp(); + public static final BlockStackerDown BLOCKSTACKERDOWN = new BlockStackerDown(); + public static final BlockStackerEast BLOCKSTACKEREAST = new BlockStackerEast(); + public static final BlockStackerWest BLOCKSTACKERWEST = new BlockStackerWest(); + public static final BlockStackerNorth BLOCKSTACKERNORTH = new BlockStackerNorth(); + public static final BlockStackerSouth BLOCKSTACKERSOUTH = new BlockStackerSouth(); public static final BlockSpreader BLOCKSPREADER = new BlockSpreader(); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/help/BlockStacker.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/help/BlockStacker.java new file mode 100644 index 0000000..5bb3e81 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/help/BlockStacker.java @@ -0,0 +1,24 @@ +package de.jottyfan.minecraft.quickiefabric.blocks.help; + +import net.minecraft.util.math.Direction; + +/** + * + * @author jotty + * + */ +public interface BlockStacker { + /** + * define the source offset + * + * @return the direction of the source offset (1 block beside) + */ + public Direction getSourceOffset(); + + /** + * define the dest offset + * + * @return the direction of the dest offset (1 block beside) + */ + public Direction getDestOffset(); +} 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 39a3591..59bde2a 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -165,7 +165,12 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.DRILL_WEST)); stacks.add(new ItemStack(QuickieBlocks.DRILL_NORTH)); stacks.add(new ItemStack(QuickieBlocks.DRILLSTOP)); - stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKER)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKERUP)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKERDOWN)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKEREAST)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKERWEST)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKERNORTH)); + stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKERSOUTH)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSPREADER)); }).build(); @@ -208,7 +213,9 @@ public class RegistryManager { QuickieFabricBlockEntity.DRILL_NORTH = (BlockEntityType) registerBlockEntity( "drillblocknorthentity", DrillBlockNorthEntity::new, QuickieBlocks.DRILL_NORTH); QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY = (BlockEntityType) registerBlockEntity( - "blockstackerentity", BlockStackerEntity::new, QuickieBlocks.BLOCKSTACKER); + "blockstackerentity", BlockStackerEntity::new, QuickieBlocks.BLOCKSTACKERUP, QuickieBlocks.BLOCKSTACKERDOWN, + QuickieBlocks.BLOCKSTACKEREAST, QuickieBlocks.BLOCKSTACKERWEST, QuickieBlocks.BLOCKSTACKERNORTH, + QuickieBlocks.BLOCKSTACKERSOUTH); QuickieFabricBlockEntity.BLOCKSPREADER_ENTITY = (BlockEntityType) registerBlockEntity( "blockspreaderentity", BlockSpreaderEntity::new, QuickieBlocks.BLOCKSPREADER); } @@ -234,7 +241,12 @@ public class RegistryManager { registerBlock(QuickieBlocks.DRILL_WEST, "drillwest"); registerBlock(QuickieBlocks.DRILL_NORTH, "drillnorth"); registerBlock(QuickieBlocks.DRILLSTOP, "drillstop"); - registerBlock(QuickieBlocks.BLOCKSTACKER, "blockstacker"); + registerBlock(QuickieBlocks.BLOCKSTACKERUP, "blockstackerup"); + registerBlock(QuickieBlocks.BLOCKSTACKERDOWN, "blockstackerdown"); + registerBlock(QuickieBlocks.BLOCKSTACKEREAST, "blockstackereast"); + registerBlock(QuickieBlocks.BLOCKSTACKERWEST, "blockstackerwest"); + registerBlock(QuickieBlocks.BLOCKSTACKERNORTH, "blockstackernorth"); + registerBlock(QuickieBlocks.BLOCKSTACKERSOUTH, "blockstackersouth"); registerBlock(QuickieBlocks.BLOCKSPREADER, "blockspreader"); } diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockstacker.json b/src/main/resources/assets/quickiefabric/blockstates/blockstacker.json deleted file mode 100644 index f28472b..0000000 --- a/src/main/resources/assets/quickiefabric/blockstates/blockstacker.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "quickiefabric:block/blockstacker" - } - } -} diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockstackerdown.json b/src/main/resources/assets/quickiefabric/blockstates/blockstackerdown.json new file mode 100644 index 0000000..b694ab3 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blockstackerdown.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blockstackerdown" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockstackereast.json b/src/main/resources/assets/quickiefabric/blockstates/blockstackereast.json new file mode 100644 index 0000000..304013e --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blockstackereast.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blockstackereast" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockstackernorth.json b/src/main/resources/assets/quickiefabric/blockstates/blockstackernorth.json new file mode 100644 index 0000000..fcc8371 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blockstackernorth.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blockstackernorth" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockstackersouth.json b/src/main/resources/assets/quickiefabric/blockstates/blockstackersouth.json new file mode 100644 index 0000000..2fa9f4a --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blockstackersouth.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blockstackersouth" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockstackerup.json b/src/main/resources/assets/quickiefabric/blockstates/blockstackerup.json new file mode 100644 index 0000000..9e17953 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blockstackerup.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blockstackerup" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/blockstates/blockstackerwest.json b/src/main/resources/assets/quickiefabric/blockstates/blockstackerwest.json new file mode 100644 index 0000000..62f17fd --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/blockstackerwest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/blockstackerwest" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index 4149b67..aaa8df1 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -62,7 +62,12 @@ "block.quickiefabric.drillwest": "West-Bohrer", "block.quickiefabric.drillnorth": "Nord-Bohrer", "block.quickiefabric.drillstop": "Bohrerstopper", - "block.quickiefabric.blockstacker": "Blockstapler", + "block.quickiefabric.blockstackerup": "Blockhochstapler", + "block.quickiefabric.blockstackerdown": "Blocktiefstapler", + "block.quickiefabric.blockstackereast": "Ostblockstapler", + "block.quickiefabric.blockstackerwest": "Westblockstapler", + "block.quickiefabric.blockstackernorth": "Nordblockstapler", + "block.quickiefabric.blockstackersouth": "Südblockstapler", "block.quickiefabric.blockspreader": "Blockverteiler", "container.quickiefabric.backpack": "Rucksack", "container.quickiefabric.blockstacker": "Blockstapler", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index ffff3be..d63fe4c 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -62,7 +62,12 @@ "block.quickiefabric.drillwest": "west drill", "block.quickiefabric.drillnorth": "north drill", "block.quickiefabric.drillstop": "drill stopper", - "block.quickiefabric.blockstacker": "block stacker", + "block.quickiefabric.blockstackerup": "block up stacker", + "block.quickiefabric.blockstackerdown": "block down stacker", + "block.quickiefabric.blockstackereast": "block east stacker", + "block.quickiefabric.blockstackerwest": "block west stacker", + "block.quickiefabric.blockstackernorth": "block north stacker", + "block.quickiefabric.blockstackersouth": "block south stacker", "block.quickiefabric.blockspreader": "block spreader", "container.quickiefabric.backpack": "backpack", "container.quickiefabric.blockstacker": "block stacker", diff --git a/src/main/resources/assets/quickiefabric/models/block/blockstacker.json b/src/main/resources/assets/quickiefabric/models/block/blockstacker.json deleted file mode 100644 index 7e749f0..0000000 --- a/src/main/resources/assets/quickiefabric/models/block/blockstacker.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "quickiefabric:block/blockstackerbottom", - "side": "quickiefabric:block/blockstacker", - "top": "quickiefabric:block/blockstackertop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/blockstackerdown.json b/src/main/resources/assets/quickiefabric/models/block/blockstackerdown.json new file mode 100644 index 0000000..382b617 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blockstackerdown.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "quickiefabric:block/blockstackerout", + "side": "quickiefabric:block/blockstackerdown", + "top": "quickiefabric:block/blockstackerin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/blockstackereast.json b/src/main/resources/assets/quickiefabric/models/block/blockstackereast.json new file mode 100644 index 0000000..c23a7c9 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blockstackereast.json @@ -0,0 +1,11 @@ +{ + "parent": "block/cube_directional", + "textures": { + "up": "quickiefabric:block/blockstackerright", + "down": "quickiefabric:block/blockstackerleft", + "north": "quickiefabric:block/blockstackerleft", + "east": "quickiefabric:block/blockstackerout", + "south": "quickiefabric:block/blockstackerright", + "west": "quickiefabric:block/blockstackerin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/blockstackernorth.json b/src/main/resources/assets/quickiefabric/models/block/blockstackernorth.json new file mode 100644 index 0000000..b650d1d --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blockstackernorth.json @@ -0,0 +1,11 @@ +{ + "parent": "block/cube_directional", + "textures": { + "up": "quickiefabric:block/blockstackerup", + "down": "quickiefabric:block/blockstackerup", + "north": "quickiefabric:block/blockstackerout", + "east": "quickiefabric:block/blockstackerup", + "south": "quickiefabric:block/blockstackerin", + "west": "quickiefabric:block/blockstackerup" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/blockstackersouth.json b/src/main/resources/assets/quickiefabric/models/block/blockstackersouth.json new file mode 100644 index 0000000..7684bc1 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blockstackersouth.json @@ -0,0 +1,11 @@ +{ + "parent": "block/cube_directional", + "textures": { + "up": "quickiefabric:block/blockstackerdown", + "down": "quickiefabric:block/blockstackerdown", + "north": "quickiefabric:block/blockstackerin", + "east": "quickiefabric:block/blockstackerdown", + "south": "quickiefabric:block/blockstackerout", + "west": "quickiefabric:block/blockstackerdown" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/blockstackerup.json b/src/main/resources/assets/quickiefabric/models/block/blockstackerup.json new file mode 100644 index 0000000..fe452ed --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blockstackerup.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "quickiefabric:block/blockstackerin", + "side": "quickiefabric:block/blockstackerup", + "top": "quickiefabric:block/blockstackerout" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/blockstackerwest.json b/src/main/resources/assets/quickiefabric/models/block/blockstackerwest.json new file mode 100644 index 0000000..581f0e4 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/blockstackerwest.json @@ -0,0 +1,11 @@ +{ + "parent": "block/cube_directional", + "textures": { + "up": "quickiefabric:block/blockstackerleft", + "down": "quickiefabric:block/blockstackerright", + "north": "quickiefabric:block/blockstackerright", + "east": "quickiefabric:block/blockstackerin", + "south": "quickiefabric:block/blockstackerleft", + "west": "quickiefabric:block/blockstackerout" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/blockstackerdown.json b/src/main/resources/assets/quickiefabric/models/item/blockstackerdown.json new file mode 100644 index 0000000..0776057 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blockstackerdown.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blockstackerdown", + "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/blockstackereast.json b/src/main/resources/assets/quickiefabric/models/item/blockstackereast.json new file mode 100644 index 0000000..5af8f0f --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blockstackereast.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blockstackerwest", + "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/blockstackernorth.json b/src/main/resources/assets/quickiefabric/models/item/blockstackernorth.json new file mode 100644 index 0000000..3527d59 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blockstackernorth.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blockstackernorth", + "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/blockstackersouth.json b/src/main/resources/assets/quickiefabric/models/item/blockstackersouth.json new file mode 100644 index 0000000..6f9a528 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blockstackersouth.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blockstackersouth", + "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/blockstacker.json b/src/main/resources/assets/quickiefabric/models/item/blockstackerup.json similarity index 76% rename from src/main/resources/assets/quickiefabric/models/item/blockstacker.json rename to src/main/resources/assets/quickiefabric/models/item/blockstackerup.json index d0dbc2f..16bb23d 100644 --- a/src/main/resources/assets/quickiefabric/models/item/blockstacker.json +++ b/src/main/resources/assets/quickiefabric/models/item/blockstackerup.json @@ -1,5 +1,5 @@ { - "parent": "quickiefabric:block/blockstacker", + "parent": "quickiefabric:block/blockstackerup", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/quickiefabric/models/item/blockstackerwest.json b/src/main/resources/assets/quickiefabric/models/item/blockstackerwest.json new file mode 100644 index 0000000..c6ff895 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/blockstackerwest.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/blockstackereast", + "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/textures/block/blockstackerdown.png b/src/main/resources/assets/quickiefabric/textures/block/blockstackerdown.png new file mode 100644 index 0000000..ea0f05c Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/blockstackerdown.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/blockstackerbottom.png b/src/main/resources/assets/quickiefabric/textures/block/blockstackerin.png similarity index 100% rename from src/main/resources/assets/quickiefabric/textures/block/blockstackerbottom.png rename to src/main/resources/assets/quickiefabric/textures/block/blockstackerin.png diff --git a/src/main/resources/assets/quickiefabric/textures/block/blockstackerleft.png b/src/main/resources/assets/quickiefabric/textures/block/blockstackerleft.png new file mode 100644 index 0000000..94cca3c Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/blockstackerleft.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/blockstackertop.png b/src/main/resources/assets/quickiefabric/textures/block/blockstackerout.png similarity index 100% rename from src/main/resources/assets/quickiefabric/textures/block/blockstackertop.png rename to src/main/resources/assets/quickiefabric/textures/block/blockstackerout.png diff --git a/src/main/resources/assets/quickiefabric/textures/block/blockstackerright.png b/src/main/resources/assets/quickiefabric/textures/block/blockstackerright.png new file mode 100644 index 0000000..e0cfbff Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/blockstackerright.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/blockstacker.png b/src/main/resources/assets/quickiefabric/textures/block/blockstackerup.png similarity index 100% rename from src/main/resources/assets/quickiefabric/textures/block/blockstacker.png rename to src/main/resources/assets/quickiefabric/textures/block/blockstackerup.png diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackerdown.json b/src/main/resources/data/quickiefabric/recipes/blockstackerdown.json new file mode 100644 index 0000000..55aa222 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackerdown.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "w w", + "wsw", + " w " + ], + "key": { + "s": { + "item": "quickiefabric:speedpowder" + }, + "w": { + "item": "minecraft:planks" + } + }, + "result": { + "item": "quickiefabric:blockstackerdown", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackerdown_up.json b/src/main/resources/data/quickiefabric/recipes/blockstackerdown_up.json new file mode 100644 index 0000000..e0d060c --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackerdown_up.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blockstackerup" + } + ], + "result": { + "item": "quickiefabric:blockstackerdown", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackereast.json b/src/main/resources/data/quickiefabric/recipes/blockstackereast.json new file mode 100644 index 0000000..0b07027 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackereast.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "www", + " sw", + " w" + ], + "key": { + "s": { + "item": "quickiefabric:speedpowder" + }, + "w": { + "item": "minecraft:planks" + } + }, + "result": { + "item": "quickiefabric:blockstackereast", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackereast_down.json b/src/main/resources/data/quickiefabric/recipes/blockstackereast_down.json new file mode 100644 index 0000000..78a63b1 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackereast_down.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blockstackerdown" + } + ], + "result": { + "item": "quickiefabric:blockstackereast", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackernorth.json b/src/main/resources/data/quickiefabric/recipes/blockstackernorth.json new file mode 100644 index 0000000..c1136c8 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackernorth.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "www", + "ws ", + "w " + ], + "key": { + "s": { + "item": "quickiefabric:speedpowder" + }, + "w": { + "item": "minecraft:planks" + } + }, + "result": { + "item": "quickiefabric:blockstackernorth", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackernorth_west.json b/src/main/resources/data/quickiefabric/recipes/blockstackernorth_west.json new file mode 100644 index 0000000..600ec02 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackernorth_west.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blockstackerwest" + } + ], + "result": { + "item": "quickiefabric:blockstackernorth", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackersouth.json b/src/main/resources/data/quickiefabric/recipes/blockstackersouth.json new file mode 100644 index 0000000..c4767b8 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackersouth.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " w", + " sw", + "www" + ], + "key": { + "s": { + "item": "quickiefabric:speedpowder" + }, + "w": { + "item": "minecraft:planks" + } + }, + "result": { + "item": "quickiefabric:blockstackersouth", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackersouth_east.json b/src/main/resources/data/quickiefabric/recipes/blockstackersouth_east.json new file mode 100644 index 0000000..e7dfd86 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackersouth_east.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blockstackereast" + } + ], + "result": { + "item": "quickiefabric:blockstackersouth", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstacker.json b/src/main/resources/data/quickiefabric/recipes/blockstackerup.json similarity index 83% rename from src/main/resources/data/quickiefabric/recipes/blockstacker.json rename to src/main/resources/data/quickiefabric/recipes/blockstackerup.json index b09aac8..1229800 100644 --- a/src/main/resources/data/quickiefabric/recipes/blockstacker.json +++ b/src/main/resources/data/quickiefabric/recipes/blockstackerup.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "quickiefabric:blockstacker", + "item": "quickiefabric:blockstackerup", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackerup_north.json b/src/main/resources/data/quickiefabric/recipes/blockstackerup_north.json new file mode 100644 index 0000000..e73fd1a --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackerup_north.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blockstackernorth" + } + ], + "result": { + "item": "quickiefabric:blockstackerup", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackerwest.json b/src/main/resources/data/quickiefabric/recipes/blockstackerwest.json new file mode 100644 index 0000000..0ba914f --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackerwest.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "w ", + "ws ", + "www" + ], + "key": { + "s": { + "item": "quickiefabric:speedpowder" + }, + "w": { + "item": "minecraft:planks" + } + }, + "result": { + "item": "quickiefabric:blockstackerwest", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackerwest_south.json b/src/main/resources/data/quickiefabric/recipes/blockstackerwest_south.json new file mode 100644 index 0000000..ae00387 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/blockstackerwest_south.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blockstackersouth" + } + ], + "result": { + "item": "quickiefabric:blockstackerwest", + "count": 1 + } +} \ No newline at end of file