diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEastEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEastEntity.java index 3cba65c..b4e16ca 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEastEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEastEntity.java @@ -1,28 +1,26 @@ package de.jottyfan.minecraft.quickiefabric.blockentity; +import net.minecraft.block.BlockState; 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 DrillBlockEastEntity extends BlockEntity implements Tickable { - +public class DrillBlockEastEntity extends BlockEntity { private static final Integer MAXDRILLSTEP = 24; - private Integer drillstep; - public DrillBlockEastEntity() { - super(QuickieFabricBlockEntity.DRILL_EAST); + public DrillBlockEastEntity(BlockPos pos, BlockState state) { + super(QuickieFabricBlockEntity.DRILL_EAST, pos, state); } - @Override - public void tick() { - drillstep = drillstep == null ? MAXDRILLSTEP : drillstep - 1; - if (drillstep < 1) { - drillstep = MAXDRILLSTEP; - DrillBlockDownEntity.drill(getPos(), getPos().east().down(), getWorld()); + public static void tick(World world, BlockPos pos, BlockState state, DrillBlockDownEntity be) { + if (be.getDrillstep() < 1) { + be.setDrillstep(MAXDRILLSTEP); + DrillBlockDownEntity.drill(pos, pos.east().down(), world); } } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockNorthEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockNorthEntity.java index 5380e24..76c7b52 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockNorthEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockNorthEntity.java @@ -1,28 +1,26 @@ package de.jottyfan.minecraft.quickiefabric.blockentity; +import net.minecraft.block.BlockState; 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 DrillBlockNorthEntity extends BlockEntity implements Tickable { - +public class DrillBlockNorthEntity extends BlockEntity { private static final Integer MAXDRILLSTEP = 24; - private Integer drillstep; - public DrillBlockNorthEntity() { - super(QuickieFabricBlockEntity.DRILL_NORTH); + public DrillBlockNorthEntity(BlockPos pos, BlockState state) { + super(QuickieFabricBlockEntity.DRILL_NORTH, pos, state); } - @Override - public void tick() { - drillstep = drillstep == null ? MAXDRILLSTEP : drillstep - 1; - if (drillstep < 1) { - drillstep = MAXDRILLSTEP; - DrillBlockDownEntity.drill(getPos(), getPos().north().down(), getWorld()); + public static void tick(World world, BlockPos pos, BlockState state, DrillBlockDownEntity be) { + if (be.getDrillstep() < 1) { + be.setDrillstep(MAXDRILLSTEP); + DrillBlockDownEntity.drill(pos, pos.north().down(), world); } } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockSouthEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockSouthEntity.java index b512581..e4d66c4 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockSouthEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockSouthEntity.java @@ -1,28 +1,26 @@ package de.jottyfan.minecraft.quickiefabric.blockentity; +import net.minecraft.block.BlockState; 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 DrillBlockSouthEntity extends BlockEntity implements Tickable { - +public class DrillBlockSouthEntity extends BlockEntity { private static final Integer MAXDRILLSTEP = 24; - private Integer drillstep; - public DrillBlockSouthEntity() { - super(QuickieFabricBlockEntity.DRILL_SOUTH); + public DrillBlockSouthEntity(BlockPos pos, BlockState state) { + super(QuickieFabricBlockEntity.DRILL_SOUTH, pos, state); } - @Override - public void tick() { - drillstep = drillstep == null ? MAXDRILLSTEP : drillstep - 1; - if (drillstep < 1) { - drillstep = MAXDRILLSTEP; - DrillBlockDownEntity.drill(getPos(), getPos().south().down(), getWorld()); + public static void tick(World world, BlockPos pos, BlockState state, DrillBlockDownEntity be) { + if (be.getDrillstep() < 1) { + be.setDrillstep(MAXDRILLSTEP); + DrillBlockDownEntity.drill(pos, pos.south().down(), world); } } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockWestEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockWestEntity.java index 1c81c08..85200ae 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockWestEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockWestEntity.java @@ -1,28 +1,27 @@ package de.jottyfan.minecraft.quickiefabric.blockentity; +import net.minecraft.block.BlockState; 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 DrillBlockWestEntity extends BlockEntity implements Tickable { +public class DrillBlockWestEntity extends BlockEntity { private static final Integer MAXDRILLSTEP = 24; - private Integer drillstep; - public DrillBlockWestEntity() { - super(QuickieFabricBlockEntity.DRILL_WEST); + public DrillBlockWestEntity(BlockPos pos, BlockState state) { + super(QuickieFabricBlockEntity.DRILL_WEST, pos, state); } - @Override - public void tick() { - drillstep = drillstep == null ? MAXDRILLSTEP : drillstep - 1; - if (drillstep < 1) { - drillstep = MAXDRILLSTEP; - DrillBlockDownEntity.drill(getPos(), getPos().west().down(), getWorld()); + public static void tick(World world, BlockPos pos, BlockState state, DrillBlockDownEntity be) { + if (be.getDrillstep() < 1) { + be.setDrillstep(MAXDRILLSTEP); + DrillBlockDownEntity.drill(pos, pos.west().down(), world); } } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java index df7c4d0..4bfdc07 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java @@ -4,11 +4,11 @@ import java.util.Random; import de.jottyfan.minecraft.quickiefabric.blocks.QuickieBlocks; import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; +import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.ItemEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -17,10 +17,10 @@ import net.minecraft.world.World; * @author jotty * */ -public class EmptyLavaHoarderBlockEntity extends BlockEntity implements Tickable { +public class EmptyLavaHoarderBlockEntity extends BlockEntity { - public EmptyLavaHoarderBlockEntity() { - super(QuickieFabricBlockEntity.EMPTYLAVAHOARDER); + public EmptyLavaHoarderBlockEntity(BlockPos pos, BlockState state) { + super(QuickieFabricBlockEntity.EMPTYLAVAHOARDER, pos, state); } /** @@ -46,16 +46,13 @@ public class EmptyLavaHoarderBlockEntity extends BlockEntity implements Tickable return false; } - @Override - public void tick() { - BlockPos pos = getPos(); - World world = getWorld(); - boolean found = suckLava(world, pos.north()); - found = found || suckLava(world, pos.south()); - found = found || suckLava(world, pos.east()); - found = found || suckLava(world, pos.west()); - found = found || suckLava(world, pos.up()); - found = found || suckLava(world, pos.down()); + public static void tick(World world, BlockPos pos, BlockState state, EmptyLavaHoarderBlockEntity be) { + boolean found = be.suckLava(world, pos.north()); + found = found || be.suckLava(world, pos.south()); + found = found || be.suckLava(world, pos.east()); + found = found || be.suckLava(world, pos.west()); + found = found || be.suckLava(world, pos.up()); + found = found || be.suckLava(world, pos.down()); if (found) { world.setBlockState(pos, QuickieBlocks.LAVAHOARDER.getDefaultState()); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java index e6dcd5f..727d1c4 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java @@ -6,20 +6,20 @@ import java.util.List; import net.minecraft.block.BlockState; import net.minecraft.block.entity.LootableContainerBlockEntity; import net.minecraft.entity.Entity; +import net.minecraft.entity.Entity.RemovalReason; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.Inventories; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtCompound; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.LiteralText; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; -import net.minecraft.util.Tickable; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; @@ -30,19 +30,19 @@ import net.minecraft.world.World; * @author jotty * */ -public class ItemHoarderBlockEntity extends LootableContainerBlockEntity implements Tickable { +public class ItemHoarderBlockEntity extends LootableContainerBlockEntity { private DefaultedList stacks; private float suckradius; - public ItemHoarderBlockEntity() { - super(QuickieFabricBlockEntity.ITEMHOARDER); + public ItemHoarderBlockEntity(BlockPos pos, BlockState state) { + super(QuickieFabricBlockEntity.ITEMHOARDER, pos, state); stacks = DefaultedList.ofSize(54, ItemStack.EMPTY); - suckradius = 4f; // TODO: make it level up - able and start with 2 + setSuckradius(4f); // TODO: make it level up - able and start with 2 } // TODO: see https://fabricmc.net/wiki/tutorial:containers for a real chest - private final boolean setStackToSlots(ItemStack stack) { + public final static boolean setStackToSlots(ItemStack stack, List stacks) { for (ItemStack slot : stacks) { if (slot.getItem().equals(stack.getItem())) { slot.increment(stack.getCount()); @@ -59,11 +59,8 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity impleme return false; } - @Override - public void tick() { - BlockPos pos = getPos(); - World world = getWorld(); - Box box = new Box(pos).expand(suckradius); + public static void tick(World world, BlockPos pos, BlockState state, ItemHoarderBlockEntity be) { + Box box = new Box(pos).expand(be.getSuckradius()); List entities = world.getOtherEntities(null, box); for (Entity entity : entities) { if (entity instanceof ItemEntity) { @@ -71,33 +68,33 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity impleme if (itemEntity.isAlive()) { ItemStack stack = itemEntity.getStack(); if (stack != null) { - if (setStackToSlots(stack)) { - itemEntity.remove(); + if (ItemHoarderBlockEntity.setStackToSlots(stack, be.getStacks())) { + itemEntity.remove(RemovalReason.DISCARDED); } // else inventory is full } } } } } - + @Override - public CompoundTag toTag(CompoundTag tag) { - super.toTag(tag); - if (!this.serializeLootTable(tag)) { - Inventories.toTag(tag, this.stacks); + public NbtCompound writeNbt(NbtCompound nbt) { + super.writeNbt(nbt); + if (!this.serializeLootTable(nbt)) { + Inventories.writeNbt(nbt, this.stacks); } - return tag; + return nbt; } @Override - public void fromTag(BlockState state, CompoundTag tag) { - super.fromTag(state, tag); + public void readNbt(NbtCompound nbt) { + super.readNbt(nbt); this.stacks = DefaultedList.ofSize(this.size(), ItemStack.EMPTY); - if (!this.deserializeLootTable(tag)) { - Inventories.fromTag(tag, this.stacks); + if (!this.deserializeLootTable(nbt)) { + Inventories.readNbt(nbt, this.stacks); } } - + public List getStacks() { return stacks; } @@ -146,4 +143,12 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity impleme } return list; } + + public float getSuckradius() { + return suckradius; + } + + public void setSuckradius(float suckradius) { + this.suckradius = suckradius; + } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/MonsterHoarderBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/MonsterHoarderBlockEntity.java index 404c2c2..d14def2 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/MonsterHoarderBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/MonsterHoarderBlockEntity.java @@ -2,10 +2,10 @@ package de.jottyfan.minecraft.quickiefabric.blockentity; import java.util.List; +import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.mob.HostileEntity; -import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.world.World; @@ -15,20 +15,17 @@ import net.minecraft.world.World; * @author jotty * */ -public class MonsterHoarderBlockEntity extends BlockEntity implements Tickable { +public class MonsterHoarderBlockEntity extends BlockEntity { private float suckradius; - public MonsterHoarderBlockEntity() { - super(QuickieFabricBlockEntity.MONSTERHOARDER); - suckradius = 8f; // TODO: make it level up - able and start with 2 + public MonsterHoarderBlockEntity(BlockPos pos, BlockState state) { + super(QuickieFabricBlockEntity.MONSTERHOARDER, pos, state); + setSuckradius(8f); // TODO: make it level up - able and start with 2 } - @Override - public void tick() { - BlockPos pos = getPos(); - World world = getWorld(); - Box box = new Box(pos).expand(suckradius); + public static void tick(World world, BlockPos pos, BlockState state, MonsterHoarderBlockEntity be) { + Box box = new Box(pos).expand(be.getSuckradius()); List entities = world.getOtherEntities(null, box); for (Entity entity : entities) { if (entity instanceof HostileEntity) { @@ -37,4 +34,12 @@ public class MonsterHoarderBlockEntity extends BlockEntity implements Tickable { } } } + + public float getSuckradius() { + return suckradius; + } + + public void setSuckradius(float suckradius) { + this.suckradius = suckradius; + } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java index ede0248..aa02acc 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java @@ -43,7 +43,8 @@ public class BlockDrillDown extends FallingBlock implements BlockEntityProvider @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return DrillBlockDownEntity::tick; + return null; + // return DrillBlockDownEntity::tick; // see https://fabricmc.net/wiki/tutorial:blockentity for tutorial, but seems not to work } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java index 5137168..6f9a508 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java @@ -27,7 +27,7 @@ public class BlockDrillEast extends FallingBlock implements BlockEntityProvider @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { - return new DrillBlockEastEntity(); + return new DrillBlockEastEntity(pos, blockState); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java index 1235d4c..be77d57 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java @@ -27,7 +27,7 @@ public class BlockDrillNorth extends FallingBlock implements BlockEntityProvider @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { - return new DrillBlockNorthEntity(); + return new DrillBlockNorthEntity(pos, blockState); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java index 6702b7d..00882f9 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java @@ -27,7 +27,7 @@ public class BlockDrillSouth extends FallingBlock implements BlockEntityProvider @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { - return new DrillBlockSouthEntity(); + return new DrillBlockSouthEntity(pos, blockState); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java index 11d410d..5999da3 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java @@ -27,7 +27,7 @@ public class BlockDrillWest extends FallingBlock implements BlockEntityProvider @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { - return new DrillBlockWestEntity(); + return new DrillBlockWestEntity(pos, blockState); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java index 6164106..ee89894 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java @@ -37,7 +37,7 @@ public class BlockEmptyLavahoarder extends Block implements BlockEntityProvider @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { - return new EmptyLavaHoarderBlockEntity(); + return new EmptyLavaHoarderBlockEntity(pos, blockState); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java index 6dcbb8e..657fc3f 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java @@ -39,7 +39,7 @@ public class BlockItemhoarder extends Block implements BlockEntityProvider { @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { - return new ItemHoarderBlockEntity(); + return new ItemHoarderBlockEntity(pos, blockState); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java index 9d5768f..22a85bd 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java @@ -35,7 +35,7 @@ public class BlockLavahoarder extends Block implements BlockEntityProvider { @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { - return new EmptyLavaHoarderBlockEntity(); + return new EmptyLavaHoarderBlockEntity(pos, blockState); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java index 50b7ccc..5971a2b 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java @@ -31,7 +31,7 @@ public class BlockMonsterhoarder extends Block implements BlockEntityProvider { @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState blockState) { - return new MonsterHoarderBlockEntity(); + return new MonsterHoarderBlockEntity(pos, blockState); } @Override 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 02e34f4..1567e22 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -162,34 +162,34 @@ public class RegistryManager { Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, name), item); } - public static final BlockEntityType registerBlockEntity(String name, - BlockEntityType supplier, Block... blocks) { - String fullname = new StringBuilder().append(QUICKIEFABRIC).append(":").append(name).toString(); - Builder builder = BlockEntityType.Builder.create(supplier, blocks); - BlockEntityType blockEntityType = builder.build(null); - return Registry.register(Registry.BLOCK_ENTITY_TYPE, fullname, blockEntityType); - } +// public static final BlockEntityType registerBlockEntity(String name, +// BlockEntityType supplier, Block... blocks) { +// String fullname = new StringBuilder().append(QUICKIEFABRIC).append(":").append(name).toString(); +// Builder builder = BlockEntityType.Builder.create(supplier, blocks); +// BlockEntityType blockEntityType = builder.build(null); +// return Registry.register(Registry.BLOCK_ENTITY_TYPE, fullname, blockEntityType); +// } @SuppressWarnings("unchecked") public static final void registerBlockEntities() { - LOGGER.debug("registering quickiefabric block entities"); - QuickieFabricBlockEntity.ITEMHOARDER = (BlockEntityType) registerBlockEntity( - "itemhoarderblockentity", ItemHoarderBlockEntity::new, QuickieBlocks.ITEMHOARDER); - QuickieFabricBlockEntity.MONSTERHOARDER = (BlockEntityType) registerBlockEntity( - "monsterhoarderblockentity", MonsterHoarderBlockEntity::new, QuickieBlocks.MONSTERHOARDER); - QuickieFabricBlockEntity.EMPTYLAVAHOARDER = (BlockEntityType) registerBlockEntity( - "emptylavahoarderblockentity", EmptyLavaHoarderBlockEntity::new, QuickieBlocks.EMPTYLAVAHOARDER, - QuickieBlocks.LAVAHOARDER); - 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); +// LOGGER.debug("registering quickiefabric block entities"); +// QuickieFabricBlockEntity.ITEMHOARDER = (BlockEntityType) registerBlockEntity( +// "itemhoarderblockentity", ItemHoarderBlockEntity::new, QuickieBlocks.ITEMHOARDER); +// QuickieFabricBlockEntity.MONSTERHOARDER = (BlockEntityType) registerBlockEntity( +// "monsterhoarderblockentity", MonsterHoarderBlockEntity::new, QuickieBlocks.MONSTERHOARDER); +// QuickieFabricBlockEntity.EMPTYLAVAHOARDER = (BlockEntityType) registerBlockEntity( +// "emptylavahoarderblockentity", EmptyLavaHoarderBlockEntity::new, QuickieBlocks.EMPTYLAVAHOARDER, +// QuickieBlocks.LAVAHOARDER); +// 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() {