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

get rid of all java errors

Browse Source
This commit is contained in:
Jörg Henke 2021-07-17 17:19:23 +02:00
parent 72aa96f874
commit 227071e3dc
17 changed files with 131 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEastEntity.java
View File

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

22
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockNorthEntity.java
View File

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

22
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockSouthEntity.java
View File

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

21
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockWestEntity.java
View File

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

25
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java
View File

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

51
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java
View File

@ -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<ItemStack> 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<ItemStack> 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<Entity> entities = world.getOtherEntities(null, box);
for (Entity entity : entities) {
if (entity instanceof ItemEntity) {
@ -71,8 +68,8 @@ 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
}
}
@ -81,20 +78,20 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity impleme
}
@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);
}
}
@ -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;
}
}

25
src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/MonsterHoarderBlockEntity.java
View File

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

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

@ -43,7 +43,8 @@ public class BlockDrillDown extends FallingBlock implements BlockEntityProvider
@Override
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state,
BlockEntityType<T> type) {
return DrillBlockDownEntity::tick;
return null;
// return DrillBlockDownEntity::tick;
// see https://fabricmc.net/wiki/tutorial:blockentity for tutorial, but seems not to work
}
}

2
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java
View File

@ -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

2
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java
View File

@ -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

2
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java
View File

@ -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

2
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java
View File

@ -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

2
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockEmptyLavahoarder.java
View File

@ -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

2
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java
View File

@ -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

2
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java
View File

@ -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

2
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java
View File

@ -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

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

@ -162,34 +162,34 @@ public class RegistryManager {
Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, name), item);
}
public static final <T extends BlockEntity> BlockEntityType<? extends T> registerBlockEntity(String name,
BlockEntityType<? extends T> supplier, Block... blocks) {
String fullname = new StringBuilder().append(QUICKIEFABRIC).append(":").append(name).toString();
Builder<? extends T> builder = BlockEntityType.Builder.create(supplier, blocks);
BlockEntityType<? extends T> blockEntityType = builder.build(null);
return Registry.register(Registry.BLOCK_ENTITY_TYPE, fullname, blockEntityType);
}
// public static final <T extends BlockEntity> BlockEntityType<? extends T> registerBlockEntity(String name,
// BlockEntityType<? extends T> supplier, Block... blocks) {
// String fullname = new StringBuilder().append(QUICKIEFABRIC).append(":").append(name).toString();
// Builder<? extends T> builder = BlockEntityType.Builder.create(supplier, blocks);
// BlockEntityType<? extends T> 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<ItemHoarderBlockEntity>) registerBlockEntity(
"itemhoarderblockentity", ItemHoarderBlockEntity::new, QuickieBlocks.ITEMHOARDER);
QuickieFabricBlockEntity.MONSTERHOARDER = (BlockEntityType<MonsterHoarderBlockEntity>) registerBlockEntity(
"monsterhoarderblockentity", MonsterHoarderBlockEntity::new, QuickieBlocks.MONSTERHOARDER);
QuickieFabricBlockEntity.EMPTYLAVAHOARDER = (BlockEntityType<EmptyLavaHoarderBlockEntity>) registerBlockEntity(
"emptylavahoarderblockentity", EmptyLavaHoarderBlockEntity::new, QuickieBlocks.EMPTYLAVAHOARDER,
QuickieBlocks.LAVAHOARDER);
QuickieFabricBlockEntity.DRILL_DOWN = (BlockEntityType<DrillBlockDownEntity>) registerBlockEntity("drillblockdownentity",
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);
// LOGGER.debug("registering quickiefabric block entities");
// QuickieFabricBlockEntity.ITEMHOARDER = (BlockEntityType<ItemHoarderBlockEntity>) registerBlockEntity(
// "itemhoarderblockentity", ItemHoarderBlockEntity::new, QuickieBlocks.ITEMHOARDER);
// QuickieFabricBlockEntity.MONSTERHOARDER = (BlockEntityType<MonsterHoarderBlockEntity>) registerBlockEntity(
// "monsterhoarderblockentity", MonsterHoarderBlockEntity::new, QuickieBlocks.MONSTERHOARDER);
// QuickieFabricBlockEntity.EMPTYLAVAHOARDER = (BlockEntityType<EmptyLavaHoarderBlockEntity>) registerBlockEntity(
// "emptylavahoarderblockentity", EmptyLavaHoarderBlockEntity::new, QuickieBlocks.EMPTYLAVAHOARDER,
// QuickieBlocks.LAVAHOARDER);
// QuickieFabricBlockEntity.DRILL_DOWN = (BlockEntityType<DrillBlockDownEntity>) registerBlockEntity("drillblockdownentity",
// 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() {