diff --git a/gradle.properties b/gradle.properties index 3db4470..c3b6b0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.1 # Mod Properties - mod_version = 1.16.5.0 + mod_version = 1.16.5.1 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java deleted file mode 100644 index a53d535..0000000 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java +++ /dev/null @@ -1,38 +0,0 @@ -package de.jottyfan.minecraft.quickiefabric.blockentity; - -import de.jottyfan.minecraft.quickiefabric.blocks.QuickieBlocks; -import net.minecraft.block.Blocks; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.Tickable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * - * @author jotty - * - */ -public class DrillBlockEntity extends BlockEntity implements Tickable { - - private static final Integer MAXDRILLSTEP = 16; - private Integer drillstep; - - public DrillBlockEntity() { - super(QuickieFabricBlockEntity.DRILL); - drillstep = MAXDRILLSTEP; - } - - @Override - public void tick() { - BlockPos pos = getPos(); - World world = getWorld(); - drillstep--; - if (drillstep < 1) { - drillstep = MAXDRILLSTEP; - BlockPos down = pos.down(); - if (!world.getBlockState(down).isOf(Blocks.BEDROCK) && !world.getBlockState(down).isOf(QuickieBlocks.DRILLSTOP)) { - world.breakBlock(down, true); - } - } - } -} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java index deb55f5..17476ca 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java @@ -11,5 +11,9 @@ public class QuickieFabricBlockEntity { public static BlockEntityType ITEMHOARDER; public static BlockEntityType MONSTERHOARDER; public static BlockEntityType EMPTYLAVAHOARDER; - public static BlockEntityType DRILL; + public static BlockEntityType DRILL_DOWN; + public static BlockEntityType DRILL_EAST; + public static BlockEntityType DRILL_SOUTH; + public static BlockEntityType DRILL_WEST; + public static BlockEntityType DRILL_NORTH; } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrill.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java similarity index 81% rename from src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrill.java rename to src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java index 7d13626..e948f25 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrill.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java @@ -3,7 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks; import java.util.ArrayList; import java.util.List; -import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockDownEntity; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; @@ -19,21 +19,21 @@ import net.minecraft.world.BlockView; * @author jotty * */ -public class BlockDrill extends FallingBlock implements BlockEntityProvider { +public class BlockDrillDown extends FallingBlock implements BlockEntityProvider { - public BlockDrill() { + public BlockDrillDown() { super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); } @Override public BlockEntity createBlockEntity(BlockView world) { - return new DrillBlockEntity(); + return new DrillBlockDownEntity(); } @Override public List getDroppedStacks(BlockState state, Builder builder) { List list = new ArrayList<>(); - list.add(new ItemStack(QuickieBlocks.DRILL)); + list.add(new ItemStack(QuickieBlocks.DRILL_DOWN)); return list; } } 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 c856216..d6bd224 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -19,6 +19,10 @@ public class QuickieBlocks { public static final BlockKelpstack KELPSTACK = new BlockKelpstack(); public static final BlockCottonplant COTTONPLANT = new BlockCottonplant(); public static final BlockSulphor BLOCKSULPHOR = new BlockSulphor(); - public static final BlockDrill DRILL = new BlockDrill(); + public static final BlockDrillDown DRILL_DOWN = new BlockDrillDown(); + public static final BlockDrillEast DRILL_EAST = new BlockDrillEast(); + public static final BlockDrillSouth DRILL_SOUTH = new BlockDrillSouth(); + public static final BlockDrillWest DRILL_WEST = new BlockDrillWest(); + public static final BlockDrillNorth DRILL_NORTH = new BlockDrillNorth(); public static final BlockDrillstop DRILLSTOP = new BlockDrillstop(); } 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 2651d35..6e4bff0 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -7,7 +7,11 @@ import java.util.function.Supplier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockDownEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockEastEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockNorthEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockSouthEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockWestEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.EmptyLavaHoarderBlockEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.ItemHoarderBlockEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.MonsterHoarderBlockEntity; @@ -140,7 +144,11 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.MONSTERHOARDER)); stacks.add(new ItemStack(QuickieBlocks.KELPSTACK)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSULPHOR)); - stacks.add(new ItemStack(QuickieBlocks.DRILL)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_DOWN)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_EAST)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_SOUTH)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_WEST)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_NORTH)); stacks.add(new ItemStack(QuickieBlocks.DRILLSTOP)); }).build(); @@ -172,8 +180,16 @@ public class RegistryManager { QuickieFabricBlockEntity.EMPTYLAVAHOARDER = (BlockEntityType) registerBlockEntity( "emptylavahoarderblockentity", EmptyLavaHoarderBlockEntity::new, QuickieBlocks.EMPTYLAVAHOARDER, QuickieBlocks.LAVAHOARDER); - QuickieFabricBlockEntity.DRILL = (BlockEntityType) registerBlockEntity("drillblockentity", - DrillBlockEntity::new, QuickieBlocks.DRILL); + QuickieFabricBlockEntity.DRILL_DOWN = (BlockEntityType) registerBlockEntity("drillblockdownentity", + DrillBlockDownEntity::new, QuickieBlocks.DRILL_DOWN); + QuickieFabricBlockEntity.DRILL_EAST = (BlockEntityType) registerBlockEntity("drillblockeastentity", + DrillBlockEastEntity::new, QuickieBlocks.DRILL_EAST); + QuickieFabricBlockEntity.DRILL_SOUTH = (BlockEntityType) registerBlockEntity("drillblocksouthentity", + DrillBlockSouthEntity::new, QuickieBlocks.DRILL_SOUTH); + QuickieFabricBlockEntity.DRILL_WEST = (BlockEntityType) registerBlockEntity("drillblockwestentity", + DrillBlockWestEntity::new, QuickieBlocks.DRILL_WEST); + QuickieFabricBlockEntity.DRILL_NORTH = (BlockEntityType) registerBlockEntity("drillblocknorthentity", + DrillBlockNorthEntity::new, QuickieBlocks.DRILL_NORTH); } public static final void registerBlocks() { @@ -191,7 +207,11 @@ public class RegistryManager { registerBlock(QuickieBlocks.KELPSTACK, "kelpstack"); registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant"); registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); - registerBlock(QuickieBlocks.DRILL, "drill"); + registerBlock(QuickieBlocks.DRILL_DOWN, "drill"); + registerBlock(QuickieBlocks.DRILL_EAST, "drilleast"); + registerBlock(QuickieBlocks.DRILL_SOUTH, "drillsouth"); + registerBlock(QuickieBlocks.DRILL_WEST, "drillwest"); + registerBlock(QuickieBlocks.DRILL_NORTH, "drillnorth"); registerBlock(QuickieBlocks.DRILLSTOP, "drillstop"); } diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index c1d5512..811283d 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -53,6 +53,10 @@ "block.quickiefabric.cottonplant": "Baumwollpflanze", "block.quickiefabric.blocksulphor": "Schwefelblock", "block.quickiefabric.drill": "Bohrer", + "block.quickiefabric.drilleast": "Ost-Bohrer", + "block.quickiefabric.drillsouth": "Süd-Bohrer", + "block.quickiefabric.drillwest": "West-Bohrer", + "block.quickiefabric.drillnorth": "Nord-Bohrer", "block.quickiefabric.drillstop": "Bohrerstopper", "container.quickiefabric.backpack": "Rucksack", "msg.buildingplan.start": "beginne Konstruktionsaufnahme bei %s,%s,%s", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index bd77dcc..7956c0d 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -53,6 +53,10 @@ "block.quickiefabric.cottonplant": "cotton plant", "block.quickiefabric.blocksulphor": "block of sulfur", "block.quickiefabric.drill": "drill", + "block.quickiefabric.drilleast": "east drill", + "block.quickiefabric.drillsouth": "south drill", + "block.quickiefabric.drillwest": "west drill", + "block.quickiefabric.drillnorth": "north drill", "block.quickiefabric.drillstop": "drill stopper", "container.quickiefabric.backpack": "backpack", "msg.buildingplan.start": "started recording of construction at %s,%s,%s", diff --git a/src/main/resources/assets/quickiefabric/textures/block/drillstop.png b/src/main/resources/assets/quickiefabric/textures/block/drillstop.png index 04779cd..c223200 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/block/drillstop.png and b/src/main/resources/assets/quickiefabric/textures/block/drillstop.png differ