diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java index c279b9af..e1707e37 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java @@ -20,7 +20,7 @@ public class BlockAnimalContainer extends BlockContainerImpl implements IVisuali private static final VoxelShape SHAPE = box(5, 0, 5, 11, 13, 11); public BlockAnimalContainer() { - super("animal_container", BlockEntityAnimalContainer::new, Properties.copy(Blocks.STONE)); + super("animal_container", BlockEntityAnimalContainer.class, Properties.copy(Blocks.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java index 1c5807bd..186ff08d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java @@ -9,9 +9,7 @@ import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.reg.ICustomBlockState; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.animal.Animal; import net.minecraft.world.entity.npc.Npc; @@ -31,7 +29,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; public class BlockAnimalGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockAnimalGenerator() { - super("animal_generator", BlockEntityAnimalGenerator::new, Properties.of(Material.STONE).strength(3F).sound(SoundType.STONE)); + super("animal_generator", BlockEntityAnimalGenerator.class, Properties.of(Material.STONE).strength(3F).sound(SoundType.STONE)); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalSpawner.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalSpawner.java index 789ad478..976ed717 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalSpawner.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalSpawner.java @@ -7,6 +7,6 @@ import net.minecraft.world.level.material.Material; public class BlockAnimalSpawner extends BlockContainerImpl { public BlockAnimalSpawner() { - super("animal_spawner", BlockEntityAnimalSpawner::new, Properties.of(Material.STONE).strength(2F).sound(SoundType.STONE)); + super("animal_spawner", BlockEntityAnimalSpawner.class, Properties.of(Material.STONE).strength(2F).sound(SoundType.STONE)); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java index 8883e60b..4918392b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java @@ -1,6 +1,8 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityAuraBloom; +import de.ellpeck.naturesaura.blocks.tiles.ITickableBlockEntity; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.ItemModelGenerator; import de.ellpeck.naturesaura.reg.*; @@ -16,11 +18,13 @@ import net.minecraft.world.level.block.BushBlock; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; -import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.Nullable; import java.util.Arrays; import java.util.function.Supplier; @@ -86,4 +90,10 @@ public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockS public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { return new BlockEntityAuraBloom(pos, state); } + + @Nullable + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + return ITickableBlockEntity.createTickerHelper(type, ModBlockEntities.AURA_BLOOM); + } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java index af8a00e0..ef22a8ad 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java @@ -4,14 +4,13 @@ import de.ellpeck.naturesaura.blocks.tiles.BlockEntityAuraDetector; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; public class BlockAuraDetector extends BlockContainerImpl { public BlockAuraDetector() { - super("aura_detector", BlockEntityAuraDetector::new, Properties.of(Material.STONE).strength(2F).sound(SoundType.STONE)); + super("aura_detector", BlockEntityAuraDetector.class, Properties.of(Material.STONE).strength(2F).sound(SoundType.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java index 0823ecf8..433524db 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityAuraTimer; -import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.blocks.tiles.render.RenderAuraTimer; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; @@ -35,7 +35,7 @@ public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockSt private static final VoxelShape SHAPE = box(1, 0, 1, 15, 15, 15); public BlockAuraTimer() { - super("aura_timer", BlockEntityAuraTimer::new, Properties.copy(Blocks.SMOOTH_STONE)); + super("aura_timer", BlockEntityAuraTimer.class, Properties.copy(Blocks.SMOOTH_STONE)); this.registerDefaultState(this.defaultBlockState().setValue(BlockStateProperties.POWERED, false)); } @@ -83,6 +83,6 @@ public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockSt @Override public void registerTESR() { - BlockEntityRenderers.register(ModTileEntities.AURA_TIMER, RenderAuraTimer::new); + BlockEntityRenderers.register(ModBlockEntities.AURA_TIMER, RenderAuraTimer::new); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAutoCrafter.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAutoCrafter.java index 965d8e6c..4c1cc228 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAutoCrafter.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAutoCrafter.java @@ -17,7 +17,7 @@ public class BlockAutoCrafter extends BlockContainerImpl implements ICustomBlock public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; public BlockAutoCrafter() { - super("auto_crafter", BlockEntityAutoCrafter::new, Properties.of(Material.WOOD).strength(1.5F).sound(SoundType.WOOD)); + super("auto_crafter", BlockEntityAutoCrafter.class, Properties.of(Material.WOOD).strength(1.5F).sound(SoundType.WOOD)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java index 874ef3a0..aa21a732 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockBlastFurnaceBooster.java @@ -22,7 +22,7 @@ public class BlockBlastFurnaceBooster extends BlockContainerImpl implements ICus private static final VoxelShape SHAPE = Shapes.create(1 / 16F, 0, 1 / 16F, 15 / 16F, 1, 15 / 16F); public BlockBlastFurnaceBooster() { - super("blast_furnace_booster", BlockEntityBlastFurnaceBooster::new, Block.Properties.copy(Blocks.BLAST_FURNACE).lightLevel(s -> 0)); + super("blast_furnace_booster", BlockEntityBlastFurnaceBooster.class, Block.Properties.copy(Blocks.BLAST_FURNACE).lightLevel(s -> 0)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockChorusGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockChorusGenerator.java index 519f6f0f..8a561029 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockChorusGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockChorusGenerator.java @@ -8,7 +8,7 @@ import net.minecraft.world.level.block.Blocks; public class BlockChorusGenerator extends BlockContainerImpl implements ICustomBlockState { public BlockChorusGenerator() { - super("chorus_generator", BlockEntityChorusGenerator::new, Properties.copy(Blocks.END_STONE)); + super("chorus_generator", BlockEntityChorusGenerator.class, Properties.copy(Blocks.END_STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java index 93ca727c..8cc9314c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java @@ -12,7 +12,6 @@ import net.minecraft.util.Mth; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.AABB; @@ -28,7 +27,7 @@ public class BlockChunkLoader extends BlockContainerImpl implements IVisualizabl private static final VoxelShape SHAPE = box(4, 4, 4, 12, 12, 12); public BlockChunkLoader() { - super("chunk_loader", BlockEntityChunkLoader::new, Properties.of(Material.STONE).strength(3F).sound(SoundType.STONE)); + super("chunk_loader", BlockEntityChunkLoader.class, Properties.of(Material.STONE).strength(3F).sound(SoundType.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java index 5a4abdcc..68c4b786 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java @@ -1,6 +1,7 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityImpl; +import de.ellpeck.naturesaura.blocks.tiles.ITickableBlockEntity; import de.ellpeck.naturesaura.reg.IModItem; import de.ellpeck.naturesaura.reg.ModRegistry; import de.ellpeck.naturesaura.reg.ModTileType; @@ -19,6 +20,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -29,19 +31,22 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import javax.annotation.Nullable; +import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Random; public class BlockContainerImpl extends BaseEntityBlock implements IModItem { private final String baseName; - private final ModTileType tileType; + private final Class tileClass; + private final ModTileType tileType; - public BlockContainerImpl(String baseName, BlockEntityType.BlockEntitySupplier tileSupplier, Block.Properties properties) { + public BlockContainerImpl(String baseName, Class tileClass, Block.Properties properties) { super(properties); this.baseName = baseName; - this.tileType = new ModTileType<>(tileSupplier, this); + this.tileClass = tileClass; + this.tileType = new ModTileType<>(this::createBlockEntity, this); ModRegistry.add(this); ModRegistry.add(this.tileType); @@ -85,7 +90,14 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { @org.jetbrains.annotations.Nullable @Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { - return this.tileType.type.create(pos, state); + return this.createBlockEntity(pos, state); + } + + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if (ITickableBlockEntity.class.isAssignableFrom(this.tileClass)) + return ITickableBlockEntity.createTickerHelper(type, this.tileType.type); + return null; } @Override @@ -164,4 +176,12 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { } } } + + private BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + try { + return this.tileClass.getConstructor(BlockPos.class, BlockState.class).newInstance(pos, state); + } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + throw new IllegalStateException("Cannot construct block entity from class " + this.tileClass, e); + } + } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java index 1d5a682c..d3405701 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java @@ -1,13 +1,14 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityEndFlower; +import de.ellpeck.naturesaura.blocks.tiles.ITickableBlockEntity; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.ItemModelGenerator; import de.ellpeck.naturesaura.reg.*; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.boss.enderdragon.EnderDragon; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -19,13 +20,14 @@ import net.minecraft.world.level.block.BushBlock; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; -import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.common.MinecraftForge; @@ -89,6 +91,12 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS return new BlockEntityEndFlower(pos, state); } + @org.jetbrains.annotations.Nullable + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + return ITickableBlockEntity.createTickerHelper(type, ModBlockEntities.END_FLOWER); + } + @Override public boolean onDestroyedByPlayer(BlockState state, Level level, BlockPos pos, Player player, boolean willHarvest, FluidState fluid) { return willHarvest || super.onDestroyedByPlayer(state, level, pos, player, willHarvest, fluid); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java index 02030485..286b8126 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java @@ -3,7 +3,7 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.api.misc.ILevelData; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityEnderCrate; -import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.blocks.tiles.render.RenderEnderCrate; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.items.ModItems; @@ -43,7 +43,7 @@ import java.util.Random; public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider, ICustomBlockState { public BlockEnderCrate() { - super("ender_crate", BlockEntityEnderCrate::new, Properties.of(Material.STONE).strength(5F).lightLevel(s -> 7).sound(SoundType.STONE)); + super("ender_crate", BlockEntityEnderCrate.class, Properties.of(Material.STONE).strength(5F).lightLevel(s -> 7).sound(SoundType.STONE)); MinecraftForge.EVENT_BUS.register(this); } @@ -131,6 +131,6 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider @Override public void registerTESR() { - BlockEntityRenderers.register(ModTileEntities.ENDER_CRATE, RenderEnderCrate::new); + BlockEntityRenderers.register(ModBlockEntities.ENDER_CRATE, RenderEnderCrate::new); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java index f6a0c2ec..e45e8641 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java @@ -8,14 +8,12 @@ import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomRenderType; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.BlockHitResult; @@ -28,7 +26,7 @@ import java.util.function.Supplier; public class BlockFieldCreator extends BlockContainerImpl implements ICustomBlockState, ICustomRenderType { public BlockFieldCreator() { - super("field_creator", BlockEntityFieldCreator::new, Properties.of(Material.STONE).strength(2F).noCollission().sound(SoundType.STONE)); + super("field_creator", BlockEntityFieldCreator.class, Properties.of(Material.STONE).strength(2F).noCollission().sound(SoundType.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFireworkGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFireworkGenerator.java index b5325eea..8607eba9 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFireworkGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFireworkGenerator.java @@ -15,7 +15,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class BlockFireworkGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockFireworkGenerator() { - super("firework_generator", BlockEntityFireworkGenerator::new, Properties.of(Material.STONE).strength(3F).sound(SoundType.STONE)); + super("firework_generator", BlockEntityFireworkGenerator.class, Properties.of(Material.STONE).strength(3F).sound(SoundType.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerGenerator.java index 7b149e71..b46370ab 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerGenerator.java @@ -15,7 +15,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class BlockFlowerGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockFlowerGenerator() { - super("flower_generator", BlockEntityFlowerGenerator::new, Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2F)); + super("flower_generator", BlockEntityFlowerGenerator.class, Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2F)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java index 4003bc7e..e1092dfb 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java @@ -37,7 +37,7 @@ public class BlockFurnaceHeater extends BlockContainerImpl implements ICustomBlo }; public BlockFurnaceHeater() { - super("furnace_heater", BlockEntityFurnaceHeater::new, Properties.of(Material.STONE).strength(3F)); + super("furnace_heater", BlockEntityFurnaceHeater.class, Properties.of(Material.STONE).strength(3F)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGeneratorLimitRemover.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGeneratorLimitRemover.java index 11a7c4d9..5b589e7a 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGeneratorLimitRemover.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGeneratorLimitRemover.java @@ -1,7 +1,7 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityGeneratorLimitRemover; -import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.blocks.tiles.render.RenderGeneratorLimitRemover; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; @@ -13,7 +13,7 @@ import net.minecraft.world.level.material.Material; public class BlockGeneratorLimitRemover extends BlockContainerImpl implements ITESRProvider, ICustomBlockState { public BlockGeneratorLimitRemover() { - super("generator_limit_remover", BlockEntityGeneratorLimitRemover::new, Properties.of(Material.STONE).strength(2F).sound(SoundType.STONE)); + super("generator_limit_remover", BlockEntityGeneratorLimitRemover.class, Properties.of(Material.STONE).strength(2F).sound(SoundType.STONE)); } @Override @@ -26,6 +26,6 @@ public class BlockGeneratorLimitRemover extends BlockContainerImpl implements IT @Override public void registerTESR() { - BlockEntityRenderers.register(ModTileEntities.GENERATOR_LIMIT_REMOVER, RenderGeneratorLimitRemover::new); + BlockEntityRenderers.register(ModBlockEntities.GENERATOR_LIMIT_REMOVER, RenderGeneratorLimitRemover::new); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java index faaee362..831bccc7 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java @@ -11,7 +11,6 @@ import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; @@ -19,7 +18,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.HopperBlock; import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.Hopper; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -53,7 +51,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock private static final VoxelShape WEST_RAYTRACE_SHAPE = Shapes.or(Hopper.INSIDE, box(0.0D, 8.0D, 6.0D, 4.0D, 10.0D, 10.0D)); public BlockGratedChute() { - super("grated_chute", BlockEntityGratedChute::new, Properties.of(Material.METAL).strength(3.0F, 8.0F).sound(SoundType.METAL)); + super("grated_chute", BlockEntityGratedChute.class, Properties.of(Material.METAL).strength(3.0F, 8.0F).sound(SoundType.METAL)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockHopperUpgrade.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockHopperUpgrade.java index 47605da7..5337209d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockHopperUpgrade.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockHopperUpgrade.java @@ -13,7 +13,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class BlockHopperUpgrade extends BlockContainerImpl implements IVisualizable { public BlockHopperUpgrade() { - super("hopper_upgrade", BlockEntityHopperUpgrade::new, Properties.of(Material.METAL).strength(2.5F).sound(SoundType.METAL)); + super("hopper_upgrade", BlockEntityHopperUpgrade.class, Properties.of(Material.METAL).strength(2.5F).sound(SoundType.METAL)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java index 25a4c70f..49e3e3ff 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java @@ -9,14 +9,13 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; public class BlockItemDistributor extends BlockContainerImpl implements ICustomBlockState { public BlockItemDistributor() { - super("item_distributor", BlockEntityItemDistributor::new, Properties.copy(Blocks.STONE_BRICKS)); + super("item_distributor", BlockEntityItemDistributor.class, Properties.copy(Blocks.STONE_BRICKS)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockMossGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockMossGenerator.java index ace84b9e..77a98075 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockMossGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockMossGenerator.java @@ -13,7 +13,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class BlockMossGenerator extends BlockContainerImpl implements IVisualizable { public BlockMossGenerator() { - super("moss_generator", BlockEntityMossGenerator::new, Properties.of(Material.STONE).strength(2.5F).sound(SoundType.STONE)); + super("moss_generator", BlockEntityMossGenerator.class, Properties.of(Material.STONE).strength(2.5F).sound(SoundType.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java index e98b1f33..c100d820 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java @@ -4,7 +4,7 @@ import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.aura.type.IAuraType; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityNatureAltar; -import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.blocks.tiles.render.RenderNatureAltar; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; @@ -35,7 +35,7 @@ public class BlockNatureAltar extends BlockContainerImpl implements ITESRProvide public static final BooleanProperty NETHER = BooleanProperty.create("nether"); public BlockNatureAltar() { - super("nature_altar", BlockEntityNatureAltar::new, Block.Properties.of(Material.STONE).strength(4F)); + super("nature_altar", BlockEntityNatureAltar.class, Block.Properties.of(Material.STONE).strength(4F)); this.registerDefaultState(this.defaultBlockState().setValue(NETHER, false)); } @@ -75,6 +75,6 @@ public class BlockNatureAltar extends BlockContainerImpl implements ITESRProvide @Override public void registerTESR() { - BlockEntityRenderers.register(ModTileEntities.NATURE_ALTAR, RenderNatureAltar::new); + BlockEntityRenderers.register(ModBlockEntities.NATURE_ALTAR, RenderNatureAltar::new); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java index 9396e380..d8a0d8a4 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java @@ -19,12 +19,10 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.SaplingGrowTreeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import java.util.Random; - public class BlockOakGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockOakGenerator() { - super("oak_generator", BlockEntityOakGenerator::new, Properties.of(Material.WOOD).strength(2F).sound(SoundType.WOOD)); + super("oak_generator", BlockEntityOakGenerator.class, Properties.of(Material.WOOD).strength(2F).sound(SoundType.WOOD)); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java index 0e4110c9..ce50b7ba 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOfferingTable.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityOfferingTable; -import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.blocks.tiles.render.RenderOfferingTable; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; @@ -27,7 +27,7 @@ public class BlockOfferingTable extends BlockContainerImpl implements ITESRProvi private static final VoxelShape SHAPE = Shapes.create(2 / 16F, 0F, 2 / 16F, 14 / 16F, 1F, 14 / 16F); public BlockOfferingTable() { - super("offering_table", BlockEntityOfferingTable::new, Properties.of(Material.WOOD).strength(2F).sound(SoundType.WOOD)); + super("offering_table", BlockEntityOfferingTable.class, Properties.of(Material.WOOD).strength(2F).sound(SoundType.WOOD)); } @Override @@ -52,6 +52,6 @@ public class BlockOfferingTable extends BlockContainerImpl implements ITESRProvi @Override public void registerTESR() { - BlockEntityRenderers.register(ModTileEntities.OFFERING_TABLE, RenderOfferingTable::new); + BlockEntityRenderers.register(ModBlockEntities.OFFERING_TABLE, RenderOfferingTable::new); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java index 9983f52b..0d7ad46c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java @@ -8,11 +8,8 @@ import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.reg.ICustomBlockState; import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.AABB; import net.minecraftforge.api.distmarker.Dist; @@ -24,7 +21,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; public class BlockPickupStopper extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockPickupStopper() { - super("pickup_stopper", BlockEntityPickupStopper::new, Properties.of(Material.STONE).strength(2F).sound(SoundType.STONE)); + super("pickup_stopper", BlockEntityPickupStopper.class, Properties.of(Material.STONE).strength(2F).sound(SoundType.STONE)); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPlacer.java index ba94d077..86c76b95 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPlacer.java @@ -15,7 +15,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class BlockPlacer extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockPlacer() { - super("placer", BlockEntityPlacer::new, Properties.of(Material.STONE).strength(2.5F).sound(SoundType.STONE)); + super("placer", BlockEntityPlacer.class, Properties.of(Material.STONE).strength(2.5F).sound(SoundType.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPotionGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPotionGenerator.java index 379d9c41..5e2a1221 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPotionGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPotionGenerator.java @@ -8,7 +8,7 @@ import net.minecraft.world.level.material.Material; public class BlockPotionGenerator extends BlockContainerImpl implements ICustomBlockState { public BlockPotionGenerator() { - super("potion_generator", BlockEntityPotionGenerator::new, Properties.of(Material.STONE).strength(5F)); + super("potion_generator", BlockEntityPotionGenerator.class, Properties.of(Material.STONE).strength(5F)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPowderPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPowderPlacer.java index f483a9e7..ae5fb3ac 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPowderPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPowderPlacer.java @@ -17,7 +17,7 @@ public class BlockPowderPlacer extends BlockContainerImpl implements ICustomBloc private static final VoxelShape SHAPE = Shapes.create(0F, 0F, 0F, 1F, 4 / 16F, 1F); public BlockPowderPlacer() { - super("powder_placer", BlockEntityPowderPlacer::new, Properties.of(Material.STONE).strength(2, 5F).sound(SoundType.STONE)); + super("powder_placer", BlockEntityPowderPlacer.class, Properties.of(Material.STONE).strength(2, 5F).sound(SoundType.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockProjectileGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockProjectileGenerator.java index 9b1b7ba3..41a8dabc 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockProjectileGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockProjectileGenerator.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityProjectileGenerator; -import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.blocks.tiles.render.RenderProjectileGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.packet.PacketHandler; @@ -10,12 +10,10 @@ import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ITESRProvider; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; -import net.minecraft.core.BlockPos; import net.minecraft.core.Position; import net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.Projectile; @@ -26,10 +24,8 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.DispenserBlock; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.ProjectileImpactEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -38,7 +34,7 @@ import net.minecraftforge.fml.util.ObfuscationReflectionHelper; public class BlockProjectileGenerator extends BlockContainerImpl implements ITESRProvider, ICustomBlockState { public BlockProjectileGenerator() { - super("projectile_generator", BlockEntityProjectileGenerator::new, Properties.of(Material.STONE).strength(2.5F).sound(SoundType.STONE)); + super("projectile_generator", BlockEntityProjectileGenerator.class, Properties.of(Material.STONE).strength(2.5F).sound(SoundType.STONE)); MinecraftForge.EVENT_BUS.register(this); DispenserBlock.registerBehavior(Items.ENDER_PEARL, new AbstractProjectileDispenseBehavior() { @@ -106,6 +102,6 @@ public class BlockProjectileGenerator extends BlockContainerImpl implements ITES @Override public void registerTESR() { - BlockEntityRenderers.register(ModTileEntities.PROJECTILE_GENERATOR, RenderProjectileGenerator::new); + BlockEntityRenderers.register(ModBlockEntities.PROJECTILE_GENERATOR, RenderProjectileGenerator::new); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockRFConverter.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockRFConverter.java index 06c0ed7a..affb0fff 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockRFConverter.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockRFConverter.java @@ -9,7 +9,7 @@ import net.minecraft.world.level.material.Material; public class BlockRFConverter extends BlockContainerImpl { public BlockRFConverter() { - super("rf_converter", BlockEntityRFConverter::new, Properties.of(Material.STONE).sound(SoundType.STONE).strength(3)); + super("rf_converter", BlockEntityRFConverter.class, Properties.of(Material.STONE).sound(SoundType.STONE).strength(3)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java index 06922700..753f00b7 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java @@ -6,7 +6,6 @@ import de.ellpeck.naturesaura.blocks.tiles.BlockEntitySlimeSplitGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.monster.Slime; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; @@ -20,7 +19,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; public class BlockSlimeSplitGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockSlimeSplitGenerator() { - super("slime_split_generator", BlockEntitySlimeSplitGenerator::new, Properties.copy(Blocks.SLIME_BLOCK).strength(2)); + super("slime_split_generator", BlockEntitySlimeSplitGenerator.class, Properties.copy(Blocks.SLIME_BLOCK).strength(2)); MinecraftForge.EVENT_BUS.register(new Events()); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java index 78ac1107..3ebb7a02 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java @@ -7,7 +7,6 @@ import de.ellpeck.naturesaura.reg.ICustomBlockState; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.phys.AABB; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -15,7 +14,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class BlockSnowCreator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public BlockSnowCreator() { - super("snow_creator", BlockEntitySnowCreator::new, Properties.copy(Blocks.STONE_BRICKS)); + super("snow_creator", BlockEntitySnowCreator.class, Properties.copy(Blocks.STONE_BRICKS)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java index a44c1097..eff84936 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java @@ -16,9 +16,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Mob; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.AABB; @@ -40,7 +38,7 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, private static final VoxelShape SHAPE = Shapes.create(4 / 16F, 0F, 4 / 16F, 12 / 16F, 13 / 16F, 12 / 16F); public BlockSpawnLamp() { - super("spawn_lamp", BlockEntitySpawnLamp::new, Properties.of(Material.METAL).strength(3F).lightLevel(s -> 15).sound(SoundType.METAL)); + super("spawn_lamp", BlockEntitySpawnLamp.class, Properties.of(Material.METAL).strength(3F).lightLevel(s -> 15).sound(SoundType.METAL)); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java index e92fc343..6ae1d068 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java @@ -19,7 +19,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.BucketPickup; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluids; import net.minecraftforge.api.distmarker.Dist; @@ -31,7 +30,7 @@ import java.util.function.Supplier; public class BlockSpring extends BlockContainerImpl implements ICustomBlockState, IColorProvidingBlock, IColorProvidingItem, BucketPickup, ICustomRenderType { public BlockSpring() { - super("spring", BlockEntitySpring::new, Properties.copy(Blocks.STONE_BRICKS)); + super("spring", BlockEntitySpring.class, Properties.copy(Blocks.STONE_BRICKS)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockTimeChanger.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockTimeChanger.java index d9bb4b03..194bab00 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockTimeChanger.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockTimeChanger.java @@ -9,7 +9,7 @@ import net.minecraft.world.level.material.Material; public class BlockTimeChanger extends BlockContainerImpl implements ICustomBlockState { public BlockTimeChanger() { - super("time_changer", BlockEntityTimeChanger::new, Properties.of(Material.STONE).strength(2.5F).sound(SoundType.STONE)); + super("time_changer", BlockEntityTimeChanger.class, Properties.of(Material.STONE).strength(2.5F).sound(SoundType.STONE)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWeatherChanger.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWeatherChanger.java index 59e559b9..d1ec78bc 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWeatherChanger.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWeatherChanger.java @@ -8,7 +8,7 @@ import net.minecraft.world.level.block.Blocks; public class BlockWeatherChanger extends BlockContainerImpl implements ICustomBlockState { public BlockWeatherChanger() { - super("weather_changer", BlockEntityWeatherChanger::new, Properties.copy(Blocks.STONE_BRICKS)); + super("weather_changer", BlockEntityWeatherChanger.class, Properties.copy(Blocks.STONE_BRICKS)); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java index f9ac9597..dd50a429 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java @@ -3,11 +3,10 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.blocks.multi.Multiblocks; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityWoodStand; -import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.blocks.tiles.render.RenderWoodStand; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.recipes.ModRecipes; -import de.ellpeck.naturesaura.recipes.TreeRitualRecipe; import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ITESRProvider; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; @@ -15,13 +14,10 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.BlockHitResult; @@ -42,7 +38,7 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider< private static final VoxelShape SHAPE = Shapes.create(3 / 16F, 0F, 3 / 16F, 13 / 16F, 13 / 16F, 13 / 16F); public BlockWoodStand() { - super("wood_stand", BlockEntityWoodStand::new, Properties.of(Material.WOOD).strength(1.5F).sound(SoundType.WOOD)); + super("wood_stand", BlockEntityWoodStand.class, Properties.of(Material.WOOD).strength(1.5F).sound(SoundType.WOOD)); MinecraftForge.EVENT_BUS.register(this); } @@ -115,6 +111,6 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider< @Override public void registerTESR() { - BlockEntityRenderers.register(ModTileEntities.WOOD_STAND, RenderWoodStand::new); + BlockEntityRenderers.register(ModBlockEntities.WOOD_STAND, RenderWoodStand::new); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java index 229b6c99..388f9934 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java @@ -26,7 +26,7 @@ public class BlockEntityAncientLeaves extends BlockEntityImpl { }; public BlockEntityAncientLeaves(BlockPos pos, BlockState state) { - super(ModTileEntities.ANCIENT_LEAVES, pos, state); + super(ModBlockEntities.ANCIENT_LEAVES, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalContainer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalContainer.java index 9b08e1c0..7662d7a4 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalContainer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalContainer.java @@ -13,7 +13,7 @@ import java.util.Set; public class BlockEntityAnimalContainer extends BlockEntityImpl implements ITickableBlockEntity { public BlockEntityAnimalContainer(BlockPos pos, BlockState state) { - super(ModTileEntities.ANIMAL_CONTAINER, pos, state); + super(ModBlockEntities.ANIMAL_CONTAINER, pos, state); } public int getRadius() { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalGenerator.java index 9ba11a4f..c7684404 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalGenerator.java @@ -11,7 +11,7 @@ public class BlockEntityAnimalGenerator extends BlockEntityImpl implements ITick private int amountToRelease; public BlockEntityAnimalGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.ANIMAL_GENERATOR, pos, state); + super(ModBlockEntities.ANIMAL_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java index c3b73522..ed4d5d4a 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java @@ -15,7 +15,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; @@ -33,7 +32,7 @@ public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickab private Entity entityClient; public BlockEntityAnimalSpawner(BlockPos pos, BlockState state) { - super(ModTileEntities.ANIMAL_SPAWNER, pos, state); + super(ModBlockEntities.ANIMAL_SPAWNER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraBloom.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraBloom.java index 23935a9f..6cb67d7d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraBloom.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraBloom.java @@ -10,7 +10,7 @@ public class BlockEntityAuraBloom extends BlockEntityImpl implements ITickableBl public boolean justGenerated; public BlockEntityAuraBloom(BlockPos pos, BlockState state) { - this(ModTileEntities.AURA_BLOOM, pos, state); + this(ModBlockEntities.AURA_BLOOM, pos, state); } protected BlockEntityAuraBloom(BlockEntityType type, BlockPos pos, BlockState state) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraDetector.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraDetector.java index 61250415..72646617 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraDetector.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraDetector.java @@ -10,7 +10,7 @@ public class BlockEntityAuraDetector extends BlockEntityImpl implements ITickabl public int redstonePower; public BlockEntityAuraDetector(BlockPos pos, BlockState state) { - super(ModTileEntities.AURA_DETECTOR, pos, state); + super(ModBlockEntities.AURA_DETECTOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java index 86d6b2c9..73d1d8b6 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java @@ -31,7 +31,7 @@ public class BlockEntityAuraTimer extends BlockEntityImpl implements ITickableBl private int timer; public BlockEntityAuraTimer(BlockPos pos, BlockState state) { - super(ModTileEntities.AURA_TIMER, pos, state); + super(ModBlockEntities.AURA_TIMER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java index e49af731..02e72b50 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java @@ -5,7 +5,6 @@ import de.ellpeck.naturesaura.blocks.multi.Multiblocks; import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.world.entity.EntitySelector; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; @@ -25,7 +24,7 @@ public class BlockEntityAutoCrafter extends BlockEntityImpl implements ITickable }, 3, 3); public BlockEntityAutoCrafter(BlockPos pos, BlockState state) { - super(ModTileEntities.AUTO_CRAFTER, pos, state); + super(ModBlockEntities.AUTO_CRAFTER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java index 068e2dd8..a2972474 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java @@ -5,15 +5,12 @@ import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.inventory.ContainerData; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.level.block.entity.BlastFurnaceBlockEntity; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import javax.annotation.Nonnull; @@ -22,7 +19,7 @@ import java.util.List; public class BlockEntityBlastFurnaceBooster extends BlockEntityImpl implements ITickableBlockEntity { public BlockEntityBlastFurnaceBooster(BlockPos pos, BlockState state) { - super(ModTileEntities.BLAST_FURNACE_BOOSTER, pos, state); + super(ModBlockEntities.BLAST_FURNACE_BOOSTER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java index 60d46a55..13eb8f21 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java @@ -23,7 +23,7 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick private int auraPerBlock; public BlockEntityChorusGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.CHORUS_GENERATOR, pos, state); + super(ModBlockEntities.CHORUS_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java index bf773939..8708c86a 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java @@ -20,7 +20,7 @@ public class BlockEntityChunkLoader extends BlockEntityImpl implements ITickable private boolean firstTick = true; public BlockEntityChunkLoader(BlockPos pos, BlockState state) { - super(ModTileEntities.CHUNK_LOADER, pos, state); + super(ModBlockEntities.CHUNK_LOADER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java index 420f9987..0307b113 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java @@ -9,14 +9,11 @@ import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; -import java.util.List; - public class BlockEntityEndFlower extends BlockEntityImpl implements ITickableBlockEntity { private final BasicAuraContainer container = new BasicAuraContainer(null, 500000) { @@ -46,7 +43,7 @@ public class BlockEntityEndFlower extends BlockEntityImpl implements ITickableBl public boolean isDrainMode; public BlockEntityEndFlower(BlockPos pos, BlockState state) { - super(ModTileEntities.END_FLOWER, pos, state); + super(ModBlockEntities.END_FLOWER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java index 71ae1710..e4a8048f 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java @@ -76,7 +76,7 @@ public class BlockEntityEnderCrate extends BlockEntityImpl implements MenuProvid }; public BlockEntityEnderCrate(BlockPos pos, BlockState state) { - super(ModTileEntities.ENDER_CRATE, pos, state); + super(ModBlockEntities.ENDER_CRATE, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java index a76f8228..0f758eb6 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java @@ -10,22 +10,17 @@ import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.Mth; -import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.event.world.BlockEvent; -import java.util.List; - public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickableBlockEntity { public BlockPos connectionOffset; @@ -34,7 +29,7 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl private int chargeTimer; public BlockEntityFieldCreator(BlockPos pos, BlockState state) { - super(ModTileEntities.FIELD_CREATOR, pos, state); + super(ModBlockEntities.FIELD_CREATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFireworkGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFireworkGenerator.java index 288f1368..05195fd6 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFireworkGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFireworkGenerator.java @@ -5,8 +5,6 @@ import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.Tag; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; @@ -29,7 +27,7 @@ public class BlockEntityFireworkGenerator extends BlockEntityImpl implements ITi private int releaseTimer; public BlockEntityFireworkGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.FIREWORK_GENERATOR, pos, state); + super(ModBlockEntities.FIREWORK_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java index bc1d24f9..3799463c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java @@ -9,10 +9,8 @@ import de.ellpeck.naturesaura.packet.PacketParticles; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.registries.ForgeRegistries; import org.apache.commons.lang3.mutable.MutableInt; @@ -27,7 +25,7 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick private final Map consumedRecently = new HashMap<>(); public BlockEntityFlowerGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.FLOWER_GENERATOR, pos, state); + super(ModBlockEntities.FLOWER_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java index 162a1750..8e4838f8 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java @@ -8,17 +8,14 @@ import de.ellpeck.naturesaura.blocks.BlockFurnaceHeater; import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticleStream; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import net.minecraft.world.inventory.ContainerData; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.block.AbstractFurnaceBlock; import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.world.level.block.entity.BlastFurnaceBlockEntity; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.SmokerBlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.fml.util.ObfuscationReflectionHelper; @@ -31,7 +28,7 @@ public class BlockEntityFurnaceHeater extends BlockEntityImpl implements ITickab public boolean isActive; public BlockEntityFurnaceHeater(BlockPos pos, BlockState state) { - super(ModTileEntities.FURNACE_HEATER, pos, state); + super(ModBlockEntities.FURNACE_HEATER, pos, state); } public static ContainerData getFurnaceData(AbstractFurnaceBlockEntity tile) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGeneratorLimitRemover.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGeneratorLimitRemover.java index b5da146e..9fbec986 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGeneratorLimitRemover.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGeneratorLimitRemover.java @@ -9,7 +9,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class BlockEntityGeneratorLimitRemover extends BlockEntityImpl { public BlockEntityGeneratorLimitRemover(BlockPos pos, BlockState state) { - super(ModTileEntities.GENERATOR_LIMIT_REMOVER, pos, state); + super(ModBlockEntities.GENERATOR_LIMIT_REMOVER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java index fdf94dc0..110f0cad 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java @@ -5,18 +5,13 @@ import de.ellpeck.naturesaura.blocks.BlockGratedChute; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; -import java.util.List; - public class BlockEntityGratedChute extends BlockEntityImpl implements ITickableBlockEntity { public boolean isBlacklist; @@ -34,7 +29,7 @@ public class BlockEntityGratedChute extends BlockEntityImpl implements ITickable private int cooldown; public BlockEntityGratedChute(BlockPos pos, BlockState state) { - super(ModTileEntities.GRATED_CHUTE, pos, state); + super(ModBlockEntities.GRATED_CHUTE, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java index 330665ea..671b4434 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java @@ -13,14 +13,11 @@ import net.minecraft.world.level.block.entity.HopperBlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; - -import java.util.List; public class BlockEntityHopperUpgrade extends BlockEntityImpl implements ITickableBlockEntity { public BlockEntityHopperUpgrade(BlockPos pos, BlockState state) { - super(ModTileEntities.HOPPER_UPGRADE, pos, state); + super(ModBlockEntities.HOPPER_UPGRADE, pos, state); } private static boolean isValidHopper(BlockEntity tile) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java index 3b5e9d2b..af8010f8 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java @@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -19,7 +18,7 @@ public class BlockEntityItemDistributor extends BlockEntityImpl implements ITick public boolean isRandomMode; public BlockEntityItemDistributor(BlockPos pos, BlockState state) { - super(ModTileEntities.ITEM_DISTRIBUTOR, pos, state); + super(ModBlockEntities.ITEM_DISTRIBUTOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityMossGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityMossGenerator.java index dd90d657..b7fe2b58 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityMossGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityMossGenerator.java @@ -15,7 +15,7 @@ import java.util.List; public class BlockEntityMossGenerator extends BlockEntityImpl implements ITickableBlockEntity { public BlockEntityMossGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.MOSS_GENERATOR, pos, state); + super(ModBlockEntities.MOSS_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java index 9eb8fb05..cba1b03d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java @@ -65,7 +65,7 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable private boolean firstTick = true; public BlockEntityNatureAltar(BlockPos pos, BlockState state) { - super(ModTileEntities.NATURE_ALTAR, pos, state); + super(ModBlockEntities.NATURE_ALTAR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOakGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOakGenerator.java index 05f53595..b76f0baf 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOakGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOakGenerator.java @@ -14,7 +14,7 @@ public class BlockEntityOakGenerator extends BlockEntityImpl implements ITickabl public Queue scheduledBigTrees = new ArrayDeque<>(); public BlockEntityOakGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.OAK_GENERATOR, pos, state); + super(ModBlockEntities.OAK_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java index 5102f898..ab7029c9 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java @@ -9,9 +9,7 @@ import de.ellpeck.naturesaura.recipes.OfferingRecipe; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.Tag; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LightningBolt; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -23,7 +21,6 @@ import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; import java.util.ArrayDeque; -import java.util.List; import java.util.Queue; public class BlockEntityOfferingTable extends BlockEntityImpl implements ITickableBlockEntity { @@ -37,7 +34,7 @@ public class BlockEntityOfferingTable extends BlockEntityImpl implements ITickab private final Queue itemsToSpawn = new ArrayDeque<>(); public BlockEntityOfferingTable(BlockPos pos, BlockState state) { - super(ModTileEntities.OFFERING_TABLE, pos, state); + super(ModBlockEntities.OFFERING_TABLE, pos, state); } private OfferingRecipe getRecipe(ItemStack input) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPickupStopper.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPickupStopper.java index 5c4c94dd..9ac9198b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPickupStopper.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPickupStopper.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.block.state.BlockState; public class BlockEntityPickupStopper extends BlockEntityImpl { public BlockEntityPickupStopper(BlockPos pos, BlockState state) { - super(ModTileEntities.PICKUP_STOPPER, pos, state); + super(ModBlockEntities.PICKUP_STOPPER, pos, state); } public float getRadius() { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java index de045718..372270c1 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java @@ -13,15 +13,12 @@ import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import java.util.ArrayList; import java.util.List; @@ -29,7 +26,7 @@ import java.util.List; public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlockEntity { public BlockEntityPlacer(BlockPos pos, BlockState state) { - super(ModTileEntities.PLACER, pos, state); + super(ModBlockEntities.PLACER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPotionGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPotionGenerator.java index 487d4b23..7bb9b82d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPotionGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPotionGenerator.java @@ -4,20 +4,15 @@ import de.ellpeck.naturesaura.blocks.multi.Multiblocks; import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; import net.minecraft.core.BlockPos; -import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.AreaEffectCloud; -import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.PotionUtils; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; -import java.util.List; - public class BlockEntityPotionGenerator extends BlockEntityImpl implements ITickableBlockEntity { public BlockEntityPotionGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.POTION_GENERATOR, pos, state); + super(ModBlockEntities.POTION_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPowderPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPowderPlacer.java index 27584c59..89b9b3ae 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPowderPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPowderPlacer.java @@ -5,19 +5,14 @@ import de.ellpeck.naturesaura.items.ModItems; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; - -import java.util.List; public class BlockEntityPowderPlacer extends BlockEntityImpl { public BlockEntityPowderPlacer(BlockPos pos, BlockState state) { - super(ModTileEntities.POWDER_PLACER, pos, state); + super(ModBlockEntities.POWDER_PLACER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityProjectileGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityProjectileGenerator.java index 2127c430..aae95624 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityProjectileGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityProjectileGenerator.java @@ -10,7 +10,7 @@ public class BlockEntityProjectileGenerator extends BlockEntityImpl { public Direction nextSide = Direction.NORTH; public BlockEntityProjectileGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.PROJECTILE_GENERATOR, pos, state); + super(ModBlockEntities.PROJECTILE_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java index 14e68a0a..1dae07df 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java @@ -9,7 +9,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; @@ -26,7 +25,7 @@ public class BlockEntityRFConverter extends BlockEntityImpl implements ITickable private int lastEnergy; public BlockEntityRFConverter(BlockPos pos, BlockState state) { - super(ModTileEntities.RF_CONVERTER, pos, state); + super(ModBlockEntities.RF_CONVERTER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java index f0a67da8..1b6866da 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java @@ -15,7 +15,7 @@ public class BlockEntitySlimeSplitGenerator extends BlockEntityImpl implements I private int color; public BlockEntitySlimeSplitGenerator(BlockPos pos, BlockState state) { - super(ModTileEntities.SLIME_SPLIT_GENERATOR, pos, state); + super(ModBlockEntities.SLIME_SPLIT_GENERATOR, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java index ee7d4b45..7f8d7257 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java @@ -13,7 +13,6 @@ import net.minecraft.world.entity.animal.SnowGolem; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; public class BlockEntitySnowCreator extends BlockEntityImpl implements ITickableBlockEntity { @@ -21,7 +20,7 @@ public class BlockEntitySnowCreator extends BlockEntityImpl implements ITickable private int snowmanCount; public BlockEntitySnowCreator(BlockPos pos, BlockState state) { - super(ModTileEntities.SNOW_CREATOR, pos, state); + super(ModBlockEntities.SNOW_CREATOR, pos, state); } public int getRange() { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpawnLamp.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpawnLamp.java index 31ef5ada..282dca3c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpawnLamp.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpawnLamp.java @@ -8,7 +8,7 @@ import net.minecraft.world.level.block.state.BlockState; public class BlockEntitySpawnLamp extends BlockEntityImpl { public BlockEntitySpawnLamp(BlockPos pos, BlockState state) { - super(ModTileEntities.SPAWN_LAMP, pos, state); + super(ModBlockEntities.SPAWN_LAMP, pos, state); } public int getRadius() { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java index 7cee7a8b..26321bc6 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java @@ -11,7 +11,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.AABB; import net.minecraftforge.common.FarmlandWaterManager; @@ -30,7 +29,7 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock private AABBTicket waterTicket; public BlockEntitySpring(BlockPos pos, BlockState state) { - super(ModTileEntities.SPRING, pos, state); + super(ModBlockEntities.SPRING, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java index 67afa3d2..4a00ed14 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java @@ -9,26 +9,21 @@ import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.game.ClientboundSetTimePacket; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.players.PlayerList; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.GameRules; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.ServerLevelData; import net.minecraft.world.phys.AABB; -import java.util.List; - public class BlockEntityTimeChanger extends BlockEntityImpl implements ITickableBlockEntity { private long goalTime; public BlockEntityTimeChanger(BlockPos pos, BlockState state) { - super(ModTileEntities.TIME_CHANGER, pos, state); + super(ModBlockEntities.TIME_CHANGER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java index f229da7d..dc3e348c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java @@ -14,9 +14,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import org.apache.commons.lang3.tuple.Pair; -import java.util.List; -import java.util.Map; - public class BlockEntityWeatherChanger extends BlockEntityImpl implements ITickableBlockEntity { private int processTime; @@ -24,7 +21,7 @@ public class BlockEntityWeatherChanger extends BlockEntityImpl implements ITicka private int itemAmount; public BlockEntityWeatherChanger(BlockPos pos, BlockState state) { - super(ModTileEntities.WEATHER_CHANGER, pos, state); + super(ModBlockEntities.WEATHER_CHANGER, pos, state); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java index 4693d683..f6c175fc 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java @@ -17,7 +17,6 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.LeavesBlock; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; @@ -40,7 +39,7 @@ public class BlockEntityWoodStand extends BlockEntityImpl implements ITickableBl private int timer; public BlockEntityWoodStand(BlockPos pos, BlockState state) { - super(ModTileEntities.WOOD_STAND, pos, state); + super(ModBlockEntities.WOOD_STAND, pos, state); } public void setRitual(BlockPos pos, TreeRitualRecipe recipe) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ITickableBlockEntity.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ITickableBlockEntity.java index 6c3d1431..51f1e1c4 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ITickableBlockEntity.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ITickableBlockEntity.java @@ -1,8 +1,14 @@ package de.ellpeck.naturesaura.blocks.tiles; -// TODO actually call this from the base entity block thing, and possibly others if not all use the base one! +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; + public interface ITickableBlockEntity { void tick(); + static BlockEntityTicker createTickerHelper(BlockEntityType actual, BlockEntityType expected) { + return expected == actual ? (l, p, s, e) -> ((ITickableBlockEntity) e).tick() : null; + } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModTileEntities.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModBlockEntities.java similarity index 98% rename from src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModTileEntities.java rename to src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModBlockEntities.java index 13c91c30..ad92e6fb 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModTileEntities.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/ModBlockEntities.java @@ -3,7 +3,7 @@ package de.ellpeck.naturesaura.blocks.tiles; import net.minecraft.world.level.block.entity.BlockEntityType; @SuppressWarnings("FieldNamingConvention") -public final class ModTileEntities { +public final class ModBlockEntities { public static BlockEntityType ANCIENT_LEAVES; public static BlockEntityType ANIMAL_GENERATOR; diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java index 192771b9..9e27e8aa 100644 --- a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java +++ b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java @@ -6,7 +6,7 @@ import de.ellpeck.naturesaura.api.misc.ILevelData; import de.ellpeck.naturesaura.blocks.*; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityAuraBloom; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityEnderCrate; -import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; +import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.enchant.AuraMendingEnchantment; import de.ellpeck.naturesaura.enchant.ModEnchantments; import de.ellpeck.naturesaura.entities.*; @@ -236,7 +236,7 @@ public final class ModRegistry { if (item instanceof ModTileType type) event.getRegistry().register(type.type); } - Helper.populateObjectHolders(ModTileEntities.class, event.getRegistry()); + Helper.populateObjectHolders(ModBlockEntities.class, event.getRegistry()); } @SubscribeEvent