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

blockentity trials

Browse Source
This commit is contained in:
Jörg Henke 2021-07-17 16:54:43 +02:00
parent 2a2ae5ec56
commit bf0a718d24
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockDownEntity.java
View File

@ -4,7 +4,6 @@ import de.jottyfan.minecraft.quickiefabric.blocks.QuickieBlocks;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.Tickable;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -13,13 +12,13 @@ import net.minecraft.world.World;
* @author jotty * @author jotty
* *
*/ */
public class DrillBlockDownEntity extends BlockEntity implements Tickable { public class DrillBlockDownEntity extends BlockEntity {
private static final Integer MAXDRILLSTEP = 20; private static final Integer MAXDRILLSTEP = 20;
private Integer drillstep; private Integer drillstep;
public DrillBlockDownEntity() { public DrillBlockDownEntity(BlockPos pos, BlockState state) {
super(QuickieFabricBlockEntity.DRILL_DOWN); super(QuickieFabricBlockEntity.DRILL_DOWN, pos, state);
} }
protected static final void moveBlockWithEntity(BlockPos from, BlockPos to, World world) { protected static final void moveBlockWithEntity(BlockPos from, BlockPos to, World world) {
@ -29,7 +28,7 @@ public class DrillBlockDownEntity extends BlockEntity implements Tickable {
world.setBlockState(from, Blocks.AIR.getDefaultState()); world.setBlockState(from, Blocks.AIR.getDefaultState());
world.setBlockState(to, bs); world.setBlockState(to, bs);
world.removeBlockEntity(from); world.removeBlockEntity(from);
world.setBlockEntity(to, be); world.addBlockEntity(be);
} }
} }
@ -42,13 +41,24 @@ public class DrillBlockDownEntity extends BlockEntity implements Tickable {
} }
} }
public static void tick(World world, BlockPos pos, BlockState state, DrillBlockDownEntity be) {
@Override if (be.getDrillstep() < 1) {
public void tick() { be.setDrillstep(MAXDRILLSTEP);
drillstep = drillstep == null ? MAXDRILLSTEP : drillstep - 1; drill(pos, pos.down(), world);
if (drillstep < 1) { } else {
drillstep = MAXDRILLSTEP; be.doDrillstep();
drill(getPos(), getPos().down(), getWorld());
} }
} }
public void doDrillstep() {
setDrillstep(getDrillstep() - 1);
}
public Integer getDrillstep() {
return drillstep == null ? MAXDRILLSTEP : drillstep;
}
public void setDrillstep(Integer drillstep) {
this.drillstep = drillstep;
}
} }

12
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java
View File

@ -5,14 +5,18 @@ import java.util.List;
import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockDownEntity; 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.Block;
import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.FallingBlock; import net.minecraft.block.FallingBlock;
import net.minecraft.block.Material; import net.minecraft.block.Material;
import net.minecraft.block.entity.BlockEntity; 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.item.ItemStack;
import net.minecraft.loot.context.LootContext.Builder; import net.minecraft.loot.context.LootContext.Builder;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/** /**
* *
@ -26,7 +30,7 @@ public class BlockDrillDown extends FallingBlock implements BlockEntityProvider
} }
public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) {
return new DrillBlockDownEntity(); return new DrillBlockDownEntity(pos, blockState);
} }
@Override @Override
@ -35,4 +39,10 @@ public class BlockDrillDown extends FallingBlock implements BlockEntityProvider
list.add(new ItemStack(QuickieBlocks.DRILL_DOWN)); list.add(new ItemStack(QuickieBlocks.DRILL_DOWN));
return list; return list;
} }
@Override
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state,
BlockEntityType<T> type) {
return DrillBlockDownEntity::tick;
}
} }