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

compass direction drills

Browse Source
This commit is contained in:
Jörg Henke 2021-01-30 18:57:29 +01:00
parent 97fbe3d933
commit 82e46f6129
9 changed files with 49 additions and 51 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.1 loader_version=0.11.1
# Mod Properties # Mod Properties
mod_version = 1.16.5.0 mod_version = 1.16.5.1
maven_group = de.jottyfan.minecraft maven_group = de.jottyfan.minecraft
archives_base_name = quickiefabric archives_base_name = quickiefabric

38
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java
View File

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

6
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java
View File

@ -11,5 +11,9 @@ public class QuickieFabricBlockEntity {
public static BlockEntityType<ItemHoarderBlockEntity> ITEMHOARDER; public static BlockEntityType<ItemHoarderBlockEntity> ITEMHOARDER;
public static BlockEntityType<MonsterHoarderBlockEntity> MONSTERHOARDER; public static BlockEntityType<MonsterHoarderBlockEntity> MONSTERHOARDER;
public static BlockEntityType<EmptyLavaHoarderBlockEntity> EMPTYLAVAHOARDER; public static BlockEntityType<EmptyLavaHoarderBlockEntity> EMPTYLAVAHOARDER;
public static BlockEntityType<DrillBlockEntity> DRILL; public static BlockEntityType<DrillBlockDownEntity> DRILL_DOWN;
public static BlockEntityType<DrillBlockEastEntity> DRILL_EAST;
public static BlockEntityType<DrillBlockSouthEntity> DRILL_SOUTH;
public static BlockEntityType<DrillBlockWestEntity> DRILL_WEST;
public static BlockEntityType<DrillBlockNorthEntity> DRILL_NORTH;
} }

10
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrill.java → src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java
View File

@ -3,7 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
@ -19,21 +19,21 @@ import net.minecraft.world.BlockView;
* @author jotty * @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)); super(FabricBlockSettings.of(Material.STONE).hardness(2.5f));
} }
@Override @Override
public BlockEntity createBlockEntity(BlockView world) { public BlockEntity createBlockEntity(BlockView world) {
return new DrillBlockEntity(); return new DrillBlockDownEntity();
} }
@Override @Override
public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) { public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
List<ItemStack> list = new ArrayList<>(); List<ItemStack> list = new ArrayList<>();
list.add(new ItemStack(QuickieBlocks.DRILL)); list.add(new ItemStack(QuickieBlocks.DRILL_DOWN));
return list; return list;
} }
} }

6
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java
View File

@ -19,6 +19,10 @@ public class QuickieBlocks {
public static final BlockKelpstack KELPSTACK = new BlockKelpstack(); public static final BlockKelpstack KELPSTACK = new BlockKelpstack();
public static final BlockCottonplant COTTONPLANT = new BlockCottonplant(); public static final BlockCottonplant COTTONPLANT = new BlockCottonplant();
public static final BlockSulphor BLOCKSULPHOR = new BlockSulphor(); 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(); public static final BlockDrillstop DRILLSTOP = new BlockDrillstop();
} }

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

@ -7,7 +7,11 @@ import java.util.function.Supplier;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; 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.EmptyLavaHoarderBlockEntity;
import de.jottyfan.minecraft.quickiefabric.blockentity.ItemHoarderBlockEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.ItemHoarderBlockEntity;
import de.jottyfan.minecraft.quickiefabric.blockentity.MonsterHoarderBlockEntity; 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.MONSTERHOARDER));
stacks.add(new ItemStack(QuickieBlocks.KELPSTACK)); stacks.add(new ItemStack(QuickieBlocks.KELPSTACK));
stacks.add(new ItemStack(QuickieBlocks.BLOCKSULPHOR)); 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)); stacks.add(new ItemStack(QuickieBlocks.DRILLSTOP));
}).build(); }).build();
@ -172,8 +180,16 @@ public class RegistryManager {
QuickieFabricBlockEntity.EMPTYLAVAHOARDER = (BlockEntityType<EmptyLavaHoarderBlockEntity>) registerBlockEntity( QuickieFabricBlockEntity.EMPTYLAVAHOARDER = (BlockEntityType<EmptyLavaHoarderBlockEntity>) registerBlockEntity(
"emptylavahoarderblockentity", EmptyLavaHoarderBlockEntity::new, QuickieBlocks.EMPTYLAVAHOARDER, "emptylavahoarderblockentity", EmptyLavaHoarderBlockEntity::new, QuickieBlocks.EMPTYLAVAHOARDER,
QuickieBlocks.LAVAHOARDER); QuickieBlocks.LAVAHOARDER);
QuickieFabricBlockEntity.DRILL = (BlockEntityType<DrillBlockEntity>) registerBlockEntity("drillblockentity", QuickieFabricBlockEntity.DRILL_DOWN = (BlockEntityType<DrillBlockDownEntity>) registerBlockEntity("drillblockdownentity",
DrillBlockEntity::new, QuickieBlocks.DRILL); DrillBlockDownEntity::new, QuickieBlocks.DRILL_DOWN);
QuickieFabricBlockEntity.DRILL_EAST = (BlockEntityType<DrillBlockEastEntity>) registerBlockEntity("drillblockeastentity",
DrillBlockEastEntity::new, QuickieBlocks.DRILL_EAST);
QuickieFabricBlockEntity.DRILL_SOUTH = (BlockEntityType<DrillBlockSouthEntity>) registerBlockEntity("drillblocksouthentity",
DrillBlockSouthEntity::new, QuickieBlocks.DRILL_SOUTH);
QuickieFabricBlockEntity.DRILL_WEST = (BlockEntityType<DrillBlockWestEntity>) registerBlockEntity("drillblockwestentity",
DrillBlockWestEntity::new, QuickieBlocks.DRILL_WEST);
QuickieFabricBlockEntity.DRILL_NORTH = (BlockEntityType<DrillBlockNorthEntity>) registerBlockEntity("drillblocknorthentity",
DrillBlockNorthEntity::new, QuickieBlocks.DRILL_NORTH);
} }
public static final void registerBlocks() { public static final void registerBlocks() {
@ -191,7 +207,11 @@ public class RegistryManager {
registerBlock(QuickieBlocks.KELPSTACK, "kelpstack"); registerBlock(QuickieBlocks.KELPSTACK, "kelpstack");
registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant"); registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant");
registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); 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"); registerBlock(QuickieBlocks.DRILLSTOP, "drillstop");
} }

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

@ -53,6 +53,10 @@
"block.quickiefabric.cottonplant": "Baumwollpflanze", "block.quickiefabric.cottonplant": "Baumwollpflanze",
"block.quickiefabric.blocksulphor": "Schwefelblock", "block.quickiefabric.blocksulphor": "Schwefelblock",
"block.quickiefabric.drill": "Bohrer", "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", "block.quickiefabric.drillstop": "Bohrerstopper",
"container.quickiefabric.backpack": "Rucksack", "container.quickiefabric.backpack": "Rucksack",
"msg.buildingplan.start": "beginne Konstruktionsaufnahme bei %s,%s,%s", "msg.buildingplan.start": "beginne Konstruktionsaufnahme bei %s,%s,%s",

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

@ -53,6 +53,10 @@
"block.quickiefabric.cottonplant": "cotton plant", "block.quickiefabric.cottonplant": "cotton plant",
"block.quickiefabric.blocksulphor": "block of sulfur", "block.quickiefabric.blocksulphor": "block of sulfur",
"block.quickiefabric.drill": "drill", "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", "block.quickiefabric.drillstop": "drill stopper",
"container.quickiefabric.backpack": "backpack", "container.quickiefabric.backpack": "backpack",
"msg.buildingplan.start": "started recording of construction at %s,%s,%s", "msg.buildingplan.start": "started recording of construction at %s,%s,%s",

BIN
src/main/resources/assets/quickiefabric/textures/block/drillstop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB