Tile -> BlockEntity + some more refactors

This commit is contained in:
modmuss50 2019-07-22 12:45:13 +01:00
parent 7f8674f1ca
commit dbc89adaf7
193 changed files with 3194 additions and 3214 deletions

View file

@ -48,15 +48,15 @@ import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.api.ToolManager;
import reborncore.common.BaseTileBlock;
import reborncore.common.BaseBlockEntityProvider;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils;
import techreborn.tiles.TileAlarm;
import techreborn.blockentity.AlarmBlockEntity;
import javax.annotation.Nullable;
import java.util.List;
public class BlockAlarm extends BaseTileBlock {
public class BlockAlarm extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.FACING;
public static BooleanProperty ACTIVE;
protected final VoxelShape[] shape;
@ -103,7 +103,7 @@ public class BlockAlarm extends BaseTileBlock {
@Nullable
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileAlarm();
return new AlarmBlockEntity();
}
// Block
@ -128,10 +128,10 @@ public class BlockAlarm extends BaseTileBlock {
@Override
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) {
ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND);
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
// We extended BaseTileBlock. Thus we should always have tile entity. I hope.
if (tileEntity == null) {
// We extended BaseTileBlock. Thus we should always have blockEntity entity. I hope.
if (blockEntity == null) {
return false;
}
@ -142,7 +142,7 @@ public class BlockAlarm extends BaseTileBlock {
}
if (!worldIn.isClient && playerIn.isSneaking()) {
((TileAlarm) tileEntity).rightClick();
((AlarmBlockEntity) blockEntity).rightClick();
return true;
}

View file

@ -32,7 +32,7 @@ import net.minecraft.block.entity.BlockEntity;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.world.BlockView;
import reborncore.common.multiblock.BlockMultiblockBase;
import techreborn.tiles.TileMachineCasing;
import techreborn.blockentity.MachineCasingBlockEntity;
public class BlockMachineCasing extends BlockMultiblockBase {
@ -54,7 +54,7 @@ public class BlockMachineCasing extends BlockMultiblockBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileMachineCasing();
return new MachineCasingBlockEntity();
}
}

View file

@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.text.LiteralText;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import javax.annotation.Nullable;

View file

@ -46,7 +46,7 @@ import net.minecraft.world.BlockView;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import reborncore.api.ToolManager;
import reborncore.api.power.IEnergyInterfaceTile;
import reborncore.api.power.EnergyBlockEntity;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.registration.RebornRegister;
import reborncore.common.registration.config.ConfigRegistry;
@ -54,7 +54,7 @@ import reborncore.common.util.WrenchUtils;
import techreborn.TechReborn;
import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.tiles.cable.TileCable;
import techreborn.blockentity.cable.CableBlockEntity;
import techreborn.utils.damageSources.ElectrialShockSource;
import javax.annotation.Nullable;
@ -123,8 +123,8 @@ public class BlockCable extends BlockWithEntity {
}
private Boolean canConnectTo(IWorld world, BlockPos pos, Direction facing) {
BlockEntity tileEntity = world.getBlockEntity(pos);
if (tileEntity != null && (tileEntity instanceof IEnergyInterfaceTile)) {
BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity != null && (blockEntity instanceof EnergyBlockEntity)) {
return Boolean.TRUE;
}
return Boolean.FALSE;
@ -139,17 +139,17 @@ public class BlockCable extends BlockWithEntity {
@Nullable
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileCable();
return new CableBlockEntity();
}
// Block
@Override
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) {
ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND);
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
// We should always have tile entity. I hope.
if (tileEntity == null) {
// We should always have blockEntity entity. I hope.
if (blockEntity == null) {
return false;
}
@ -203,16 +203,16 @@ public class BlockCable extends BlockWithEntity {
return;
}
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
if (tileEntity == null) {
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
if (blockEntity == null) {
return;
}
if (!(tileEntity instanceof TileCable)) {
if (!(blockEntity instanceof CableBlockEntity)) {
return;
}
TileCable tileCable = (TileCable) tileEntity;
if (tileCable.power <= 0) {
CableBlockEntity blockEntityCable = (CableBlockEntity) blockEntity;
if (blockEntityCable.power <= 0) {
return;
}

View file

@ -26,10 +26,10 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.generator.advanced.TileDieselGenerator;
import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity;
/**
* Block for Diesel Generator
@ -38,7 +38,7 @@ public class BlockDieselGenerator extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileDieselGenerator();
return new DieselGeneratorBlockEntity();
}
@Override

View file

@ -26,15 +26,15 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.tiles.generator.advanced.TileDragonEggSyphon;
import techreborn.blockentity.generator.advanced.DragonEggSyphonBlockEntity;
public class BlockDragonEggSyphon extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileDragonEggSyphon();
return new DragonEggSyphonBlockEntity();
}
@Override

View file

@ -33,12 +33,12 @@ import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.Torus;
import techreborn.client.EGui;
import techreborn.init.TRContent;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.blockentity.fusionReactor.FusionControlComputerBlockEntity;
import techreborn.utils.damageSources.FusionDamageSource;
import java.util.List;
@ -48,15 +48,15 @@ public class BlockFusionControlComputer extends BlockMachineBase {
@Override
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn,
Hand hand, BlockHitResult hitResult) {
final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) worldIn.getBlockEntity(pos);
final FusionControlComputerBlockEntity blockEntityFusionControlComputer = (FusionControlComputerBlockEntity) worldIn.getBlockEntity(pos);
if(!playerIn.getStackInHand(hand).isEmpty() && (playerIn.getStackInHand(hand).getItem() == TRContent.Machine.FUSION_COIL.asItem())){
List<BlockPos> coils = Torus.generate(tileFusionControlComputer.getPos(), tileFusionControlComputer.size);
List<BlockPos> coils = Torus.generate(blockEntityFusionControlComputer.getPos(), blockEntityFusionControlComputer.size);
boolean placed = false;
for(BlockPos coil : coils){
if(playerIn.getStackInHand(hand).isEmpty()){
return true;
}
if(worldIn.isAir(coil) && !tileFusionControlComputer.isCoil(coil)){
if(worldIn.isAir(coil) && !blockEntityFusionControlComputer.isCoil(coil)){
worldIn.setBlockState(coil, TRContent.Machine.FUSION_COIL.block.getDefaultState());
if(!playerIn.isCreative()){
playerIn.getStackInHand(hand).decrement(1);
@ -69,7 +69,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
}
}
tileFusionControlComputer.checkCoils();
blockEntityFusionControlComputer.checkCoils();
return super.activate(state, worldIn, pos, playerIn, hand, hitResult);
}
@ -81,9 +81,9 @@ public class BlockFusionControlComputer extends BlockMachineBase {
@Override
public void onSteppedOn(final World worldIn, final BlockPos pos, final Entity entityIn) {
super.onSteppedOn(worldIn, pos, entityIn);
if (worldIn.getBlockEntity(pos) instanceof TileFusionControlComputer) {
if (((TileFusionControlComputer) worldIn.getBlockEntity(pos)).crafingTickTime != 0
&& ((TileFusionControlComputer) worldIn.getBlockEntity(pos)).checkCoils()) {
if (worldIn.getBlockEntity(pos) instanceof FusionControlComputerBlockEntity) {
if (((FusionControlComputerBlockEntity) worldIn.getBlockEntity(pos)).crafingTickTime != 0
&& ((FusionControlComputerBlockEntity) worldIn.getBlockEntity(pos)).checkCoils()) {
entityIn.damage(new FusionDamageSource(), 200F);
}
}
@ -91,7 +91,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileFusionControlComputer();
return new FusionControlComputerBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.generator.advanced.TileGasTurbine;
import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity;
public class BlockGasTurbine extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileGasTurbine();
return new GasTurbineBlockEntity();
}
@Override

View file

@ -26,15 +26,15 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.tiles.generator.TileLightningRod;
import techreborn.blockentity.generator.LightningRodBlockEntity;
public class BlockLightningRod extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileLightningRod();
return new LightningRodBlockEntity();
}
@Override

View file

@ -30,7 +30,7 @@ import net.minecraft.util.Formatting;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.item.ItemStack;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import javax.annotation.Nullable;
import java.util.List;

View file

@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.text.LiteralText;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import javax.annotation.Nullable;
import java.util.List;

View file

@ -26,10 +26,10 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.generator.TilePlasmaGenerator;
import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity;
/**
* Block for Plasma Generator
@ -38,7 +38,7 @@ public class BlockPlasmaGenerator extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TilePlasmaGenerator();
return new PlasmaGeneratorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity;
public class BlockSemiFluidGenerator extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileSemiFluidGenerator();
return new SemiFluidGeneratorBlockEntity();
}
@Override

View file

@ -26,10 +26,10 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.init.TRContent.SolarPanels;
import techreborn.tiles.generator.TileSolarPanel;
import techreborn.blockentity.generator.SolarPanelBlockEntity;
/**
* Created by modmuss50 on 25/02/2016.
@ -45,7 +45,7 @@ public class BlockSolarPanel extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileSolarPanel();
return new SolarPanelBlockEntity();
}
@Override

View file

@ -26,10 +26,10 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity;
public class BlockSolidFuelGenerator extends BlockMachineBase {
@ -39,7 +39,7 @@ public class BlockSolidFuelGenerator extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileSolidFuelGenerator();
return new SolidFuelGeneratorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.generator.advanced.TileThermalGenerator;
import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity;
public class BlockThermalGenerator extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileThermalGenerator();
return new ThermalGeneratorBlockEntity();
}
@Override

View file

@ -26,9 +26,9 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.tiles.generator.basic.TileWaterMill;
import techreborn.blockentity.generator.basic.WaterMillBlockEntity;
/**
* Created by modmuss50 on 25/02/2016.
@ -37,7 +37,7 @@ public class BlockWaterMill extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileWaterMill();
return new WaterMillBlockEntity();
}
@Override

View file

@ -26,9 +26,9 @@ package techreborn.blocks.generator;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.tiles.generator.basic.TileWindMill;
import techreborn.blockentity.generator.basic.WindMillBlockEntity;
/**
* Created by modmuss50 on 25/02/2016.
@ -37,7 +37,7 @@ public class BlockWindMill extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileWindMill();
return new WindMillBlockEntity();
}
@Override

View file

@ -44,14 +44,14 @@ import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.api.ToolManager;
import reborncore.common.BaseTileBlock;
import reborncore.common.BaseBlockEntityProvider;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils;
import techreborn.tiles.lighting.TileLamp;
import techreborn.blockentity.lighting.LampBlockEntity;
import javax.annotation.Nullable;
public class BlockLamp extends BaseTileBlock {
public class BlockLamp extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.FACING;
public static BooleanProperty ACTIVE;
@ -107,7 +107,7 @@ public class BlockLamp extends BaseTileBlock {
// BaseTileBlock
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileLamp();
return new LampBlockEntity();
}
// Block
@ -142,10 +142,10 @@ public class BlockLamp extends BaseTileBlock {
@Override
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) {
ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND);
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
// We extended BaseTileBlock. Thus we should always have tile entity. I hope.
if (tileEntity == null) {
// We extended BaseTileBlock. Thus we should always have blockEntity entity. I hope.
if (blockEntity == null) {
return false;
}

View file

@ -35,7 +35,7 @@ import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import reborncore.api.ToolManager;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.init.ModSounds;
import techreborn.init.TRContent;

View file

@ -34,7 +34,7 @@ import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.TRContent;
import techreborn.tiles.storage.TileAdjustableSU;
import techreborn.blockentity.storage.AdjustableSUBlockEntity;
public class BlockAdjustableSU extends BlockEnergyStorage {
@ -44,7 +44,7 @@ public class BlockAdjustableSU extends BlockEnergyStorage {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileAdjustableSU();
return new AdjustableSUBlockEntity();
}
@Override

View file

@ -41,15 +41,15 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import reborncore.api.ToolManager;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.BaseTileBlock;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.BaseBlockEntityProvider;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils;
/**
* Created by Rushmead
*/
public abstract class BlockEnergyStorage extends BaseTileBlock {
public abstract class BlockEnergyStorage extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.FACING;
public String name;
public IMachineGuiHandler gui;
@ -101,10 +101,10 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
@Override
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) {
ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND);
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
// We extended BlockTileBase. Thus we should always have tile entity. I hope.
if (tileEntity == null) {
// We extended BlockTileBase. Thus we should always have blockEntity entity. I hope.
if (blockEntity == null) {
return false;
}

View file

@ -34,7 +34,7 @@ import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.TRContent;
import techreborn.tiles.storage.TileHighVoltageSU;
import techreborn.blockentity.storage.HighVoltageSUBlockEntity;
/**
* Created by modmuss50 on 14/03/2016.
@ -47,7 +47,7 @@ public class BlockHighVoltageSU extends BlockEnergyStorage {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileHighVoltageSU();
return new HighVoltageSUBlockEntity();
}
@Override

View file

@ -36,7 +36,7 @@ import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.TRContent;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
import techreborn.blockentity.storage.idsu.InterdimensionalSUBlockEntity;
public class BlockInterdimensionalSU extends BlockEnergyStorage {
@ -46,14 +46,14 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileInterdimensionalSU();
return new InterdimensionalSUBlockEntity();
}
@Override
public BlockState getPlacementState(ItemPlacementContext context) {
final BlockEntity tile = context.getWorld().getBlockEntity(context.getBlockPos());
if (tile instanceof TileInterdimensionalSU) {
((TileInterdimensionalSU) tile).ownerUdid = context.getPlayer().getUuid().toString();
final BlockEntity blockEntity = context.getWorld().getBlockEntity(context.getBlockPos());
if (blockEntity instanceof InterdimensionalSUBlockEntity) {
((InterdimensionalSUBlockEntity) blockEntity).ownerUdid = context.getPlayer().getUuid().toString();
}
return this.getDefaultState();
}
@ -61,9 +61,9 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage {
@Override
public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
super.onPlaced(world, pos, state, placer, stack);
BlockEntity tile = world.getBlockEntity(pos);
if (tile instanceof TileInterdimensionalSU) {
((TileInterdimensionalSU) tile).ownerUdid = placer.getUuid().toString();
BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof InterdimensionalSUBlockEntity) {
((InterdimensionalSUBlockEntity) blockEntity).ownerUdid = placer.getUuid().toString();
}
}

View file

@ -38,17 +38,17 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.api.ToolManager;
import reborncore.common.BaseTileBlock;
import reborncore.common.BaseBlockEntityProvider;
import reborncore.common.RebornCoreConfig;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils;
import techreborn.init.TRContent;
import techreborn.tiles.storage.lesu.TileLSUStorage;
import techreborn.blockentity.storage.lesu.LSUStorageBlockEntity;
/**
* Energy storage block for LESU
*/
public class BlockLSUStorage extends BaseTileBlock {
public class BlockLSUStorage extends BaseBlockEntityProvider {
public BlockLSUStorage() {
super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).build());
@ -61,10 +61,10 @@ public class BlockLSUStorage extends BaseTileBlock {
if (state.getBlock() == newState.getBlock()) {
return;
}
if (worldIn.getBlockEntity(pos) instanceof TileLSUStorage) {
TileLSUStorage tile = (TileLSUStorage) worldIn.getBlockEntity(pos);
if (tile != null) {
tile.removeFromNetwork();
if (worldIn.getBlockEntity(pos) instanceof LSUStorageBlockEntity) {
LSUStorageBlockEntity blockEntity = (LSUStorageBlockEntity) worldIn.getBlockEntity(pos);
if (blockEntity != null) {
blockEntity.removeFromNetwork();
}
}
super.onBlockRemoved(state, worldIn, pos, newState, isMoving);
@ -72,16 +72,16 @@ public class BlockLSUStorage extends BaseTileBlock {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileLSUStorage();
return new LSUStorageBlockEntity();
}
@Override
public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity player, ItemStack itemstack) {
super.onPlaced(world, pos, state, player, itemstack);
if (world.getBlockEntity(pos) instanceof TileLSUStorage) {
TileLSUStorage tile = (TileLSUStorage) world.getBlockEntity(pos);
if (tile != null) {
tile.rebuildNetwork();
if (world.getBlockEntity(pos) instanceof LSUStorageBlockEntity) {
LSUStorageBlockEntity blockEntity = (LSUStorageBlockEntity) world.getBlockEntity(pos);
if (blockEntity != null) {
blockEntity.rebuildNetwork();
}
}
}
@ -90,10 +90,10 @@ public class BlockLSUStorage extends BaseTileBlock {
@Override
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) {
ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND);
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
// We extended BaseTileBlock. Thus we should always have tile entity. I hope.
if (tileEntity == null) {
// We extended BaseTileBlock. Thus we should always have blockEntity entity. I hope.
if (blockEntity == null) {
return false;
}

View file

@ -34,7 +34,7 @@ import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.TRContent;
import techreborn.tiles.storage.lesu.TileLapotronicSU;
import techreborn.blockentity.storage.lesu.LapotronicSUBlockEntity;
public class BlockLapotronicSU extends BlockEnergyStorage {
@ -44,7 +44,7 @@ public class BlockLapotronicSU extends BlockEnergyStorage {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileLapotronicSU();
return new LapotronicSUBlockEntity();
}
@Override

View file

@ -27,7 +27,7 @@ package techreborn.blocks.storage;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import techreborn.client.EGui;
import techreborn.tiles.storage.TileLowVoltageSU;
import techreborn.blockentity.storage.LowVoltageSUBlockEntity;
/**
* Created by modmuss50 on 14/03/2016.
@ -40,6 +40,6 @@ public class BlockLowVoltageSU extends BlockEnergyStorage {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileLowVoltageSU();
return new LowVoltageSUBlockEntity();
}
}

View file

@ -34,7 +34,7 @@ import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.TRContent;
import techreborn.tiles.storage.TileMediumVoltageSU;
import techreborn.blockentity.storage.MediumVoltageSUBlockEntity;
/**
* Created by modmuss50 on 14/03/2016.
@ -47,7 +47,7 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileMediumVoltageSU();
return new MediumVoltageSUBlockEntity();
}
@Override

View file

@ -31,16 +31,16 @@ import net.minecraft.util.DefaultedList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
import techreborn.blockentity.machine.iron.IronAlloyFurnaceBlockEntity;
public class BlockIronAlloyFurnace extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileIronAlloyFurnace();
return new IronAlloyFurnaceBlockEntity();
}
@Override

View file

@ -37,10 +37,10 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.iron.TileIronFurnace;
import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity;
import java.util.Random;
@ -86,7 +86,7 @@ public class BlockIronFurnace extends BlockMachineBase {
// BlockMachineBase
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileIronFurnace();
return new IronFurnaceBlockEntity();
}
@Override

View file

@ -26,10 +26,10 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileAlloySmelter;
import techreborn.blockentity.machine.tier1.AlloySmelterBlockEntity;
public class BlockAlloySmelter extends BlockMachineBase {
@ -39,7 +39,7 @@ public class BlockAlloySmelter extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileAlloySmelter();
return new AlloySmelterBlockEntity();
}
@Override

View file

@ -26,10 +26,10 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileAssemblingMachine;
import techreborn.blockentity.machine.tier1.AssemblingMachineBlockEntity;
public class BlockAssemblingMachine extends BlockMachineBase {
@ -39,7 +39,7 @@ public class BlockAssemblingMachine extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileAssemblingMachine();
return new AssemblingMachineBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
import techreborn.blockentity.machine.tier1.AutoCraftingTableBlockEntity;
public class BlockAutoCraftingTable extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileAutoCraftingTable();
return new AutoCraftingTableBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileCompressor;
import techreborn.blockentity.machine.tier1.CompressorBlockEntity;
public class BlockCompressor extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileCompressor();
return new CompressorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileElectricFurnace;
import techreborn.blockentity.machine.tier1.ElectricFurnaceBlockEntity;
public class BlockElectricFurnace extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileElectricFurnace();
return new ElectricFurnaceBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileExtractor;
import techreborn.blockentity.machine.tier1.ExtractorBlockEntity;
public class BlockExtractor extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileExtractor();
return new ExtractorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileGrinder;
import techreborn.blockentity.machine.tier1.GrinderBlockEntity;
public class BlockGrinder extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileGrinder();
return new GrinderBlockEntity();
}
@Override

View file

@ -46,11 +46,11 @@ import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.api.IToolDrop;
import reborncore.api.ToolManager;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.StringUtils;
import techreborn.tiles.machine.tier1.TilePlayerDectector;
import techreborn.blockentity.machine.tier1.PlayerDectectorBlockEntity;
import techreborn.utils.MessageIDs;
public class BlockPlayerDetector extends BlockMachineBase {
@ -65,25 +65,25 @@ public class BlockPlayerDetector extends BlockMachineBase {
// BlockMachineBase
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TilePlayerDectector();
return new PlayerDectectorBlockEntity();
}
@Override
public void onPlaced(World worldIn, BlockPos pos, BlockState state, LivingEntity placer,
ItemStack stack) {
super.onPlaced(worldIn, pos, state, placer, stack);
BlockEntity tile = worldIn.getBlockEntity(pos);
if (tile instanceof TilePlayerDectector) {
((TilePlayerDectector) tile).owenerUdid = placer.getUuid().toString();
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
if (blockEntity instanceof PlayerDectectorBlockEntity) {
((PlayerDectectorBlockEntity) blockEntity).owenerUdid = placer.getUuid().toString();
}
}
@Override
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) {
ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND);
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
if (tileEntity == null) {
if (blockEntity == null) {
return super.activate(state, worldIn, pos, playerIn, hand, hitResult);
}
@ -94,8 +94,8 @@ public class BlockPlayerDetector extends BlockMachineBase {
if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) {
if (ToolManager.INSTANCE.handleTool(stack, pos, worldIn, playerIn, hitResult.getSide(), false)) {
if (playerIn.isSneaking()) {
if (tileEntity instanceof IToolDrop) {
ItemStack drop = ((IToolDrop) tileEntity).getToolDrop(playerIn);
if (blockEntity instanceof IToolDrop) {
ItemStack drop = ((IToolDrop) blockEntity).getToolDrop(playerIn);
if (drop == null) {
return false;
}
@ -150,8 +150,8 @@ public class BlockPlayerDetector extends BlockMachineBase {
@Override
public int getWeakRedstonePower(BlockState blockState, BlockView blockAccess, BlockPos pos, Direction side) {
BlockEntity entity = blockAccess.getBlockEntity(pos);
if (entity instanceof TilePlayerDectector) {
return ((TilePlayerDectector) entity).isProvidingPower() ? 15 : 0;
if (entity instanceof PlayerDectectorBlockEntity) {
return ((PlayerDectectorBlockEntity) entity).isProvidingPower() ? 15 : 0;
}
return 0;
}
@ -159,8 +159,8 @@ public class BlockPlayerDetector extends BlockMachineBase {
@Override
public int getStrongRedstonePower(BlockState blockState, BlockView blockAccess, BlockPos pos, Direction side) {
BlockEntity entity = blockAccess.getBlockEntity(pos);
if (entity instanceof TilePlayerDectector) {
return ((TilePlayerDectector) entity).isProvidingPower() ? 15 : 0;
if (entity instanceof PlayerDectectorBlockEntity) {
return ((PlayerDectectorBlockEntity) entity).isProvidingPower() ? 15 : 0;
}
return 0;
}

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileRecycler;
import techreborn.blockentity.machine.tier1.RecyclerBlockEntity;
public class BlockRecycler extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileRecycler();
return new RecyclerBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileRollingMachine;
import techreborn.blockentity.machine.tier1.RollingMachineBlockEntity;
public class BlockRollingMachine extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileRollingMachine();
return new RollingMachineBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier1;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileScrapboxinator;
import techreborn.blockentity.machine.tier1.ScrapboxinatorBlockEntity;
public class BlockScrapboxinator extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileScrapboxinator();
return new ScrapboxinatorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.TileChargeOMat;
import techreborn.blockentity.ChargeOMatBlockEntity;
public class BlockChargeOMat extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileChargeOMat();
return new ChargeOMatBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileChemicalReactor;
import techreborn.blockentity.machine.tier1.ChemicalReactorBlockEntity;
public class BlockChemicalReactor extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileChemicalReactor();
return new ChemicalReactorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.TileDigitalChest;
import techreborn.blockentity.DigitalChestBlockEntity;
public class BlockDigitalChest extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileDigitalChest();
return new DigitalChestBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileDistillationTower;
import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity;
public class BlockDistillationTower extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileDistillationTower();
return new DistillationTowerBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileImplosionCompressor;
import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity;
public class BlockImplosionCompressor extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileImplosionCompressor();
return new ImplosionCompressorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace;
import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity;
public class BlockIndustrialBlastFurnace extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileIndustrialBlastFurnace();
return new IndustrialBlastFurnaceBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.TileIndustrialCentrifuge;
import techreborn.blockentity.IndustrialCentrifugeBlockEntity;
public class BlockIndustrialCentrifuge extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileIndustrialCentrifuge();
return new IndustrialCentrifugeBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer;
import techreborn.blockentity.machine.tier1.IndustrialElectrolyzerBlockEntity;
public class BlockIndustrialElectrolyzer extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileIndustrialElectrolyzer();
return new IndustrialElectrolyzerBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileIndustrialGrinder;
import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity;
public class BlockIndustrialGrinder extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileIndustrialGrinder();
return new IndustrialGrinderBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileIndustrialSawmill;
import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity;
public class BlockIndustrialSawmill extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileIndustrialSawmill();
return new IndustrialSawmillBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier2;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileVacuumFreezer;
import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity;
public class BlockVacuumFreezer extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileVacuumFreezer();
return new VacuumFreezerBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier3;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier3.TileChunkLoader;
import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity;
public class BlockChunkLoader extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileChunkLoader();
return new ChunkLoaderBlockEntity();
}
@Override

View file

@ -29,16 +29,16 @@ import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier3.TileCreativeQuantumChest;
import techreborn.blockentity.machine.tier3.CreativeQuantumChestBlockEntity;
public class BlockCreativeQuantumChest extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileCreativeQuantumChest();
return new CreativeQuantumChestBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier3;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier3.TileCreativeQuantumTank;
import techreborn.blockentity.machine.tier3.CreativeQuantumTankBlockEntity;
public class BlockCreativeQuantumTank extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileCreativeQuantumTank();
return new CreativeQuantumTankBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier3;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity;
public class BlockFluidReplicator extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileFluidReplicator();
return new FluidReplicatorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier3;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier3.TileMatterFabricator;
import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity;
public class BlockMatterFabricator extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileMatterFabricator();
return new MatterFabricatorBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier3;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier3.TileQuantumChest;
import techreborn.blockentity.machine.tier3.QuantumChestBlockEntity;
public class BlockQuantumChest extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileQuantumChest();
return new QuantumChestBlockEntity();
}
@Override

View file

@ -26,16 +26,16 @@ package techreborn.blocks.tier3;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.api.blockentity.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.tiles.machine.tier3.TileQuantumTank;
import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity;
public class BlockQuantumTank extends BlockMachineBase {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileQuantumTank();
return new QuantumTankBlockEntity();
}
@Override

View file

@ -33,7 +33,7 @@ import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.init.TRContent;
import techreborn.tiles.transformers.TileHVTransformer;
import techreborn.blockentity.transformers.HVTransformerBlockEntity;
/**
* Created by modmuss50 on 16/03/2016.
@ -46,7 +46,7 @@ public class BlockHVTransformer extends BlockTransformer {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileHVTransformer();
return new HVTransformerBlockEntity();
}
@Override

View file

@ -26,7 +26,7 @@ package techreborn.blocks.transformers;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import techreborn.tiles.transformers.TileLVTransformer;
import techreborn.blockentity.transformers.LVTransformerBlockEntity;
/**
* Created by modmuss50 on 16/03/2016.
@ -39,6 +39,6 @@ public class BlockLVTransformer extends BlockTransformer {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileLVTransformer();
return new LVTransformerBlockEntity();
}
}

View file

@ -33,7 +33,7 @@ import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.init.TRContent;
import techreborn.tiles.transformers.TileMVTransformer;
import techreborn.blockentity.transformers.MVTransformerBlockEntity;
/**
* Created by modmuss50 on 16/03/2016.
@ -46,7 +46,7 @@ public class BlockMVTransformer extends BlockTransformer {
@Override
public BlockEntity createBlockEntity(BlockView worldIn) {
return new TileMVTransformer();
return new MVTransformerBlockEntity();
}
@Override

View file

@ -41,14 +41,14 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import reborncore.api.ToolManager;
import reborncore.common.BaseTileBlock;
import reborncore.common.BaseBlockEntityProvider;
import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils;
/**
* Created by Rushmead
*/
public abstract class BlockTransformer extends BaseTileBlock {
public abstract class BlockTransformer extends BaseBlockEntityProvider {
public static DirectionProperty FACING = Properties.FACING;
public String name;
@ -91,10 +91,10 @@ public abstract class BlockTransformer extends BaseTileBlock {
@Override
public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) {
ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND);
BlockEntity tileEntity = worldIn.getBlockEntity(pos);
BlockEntity blockEntity = worldIn.getBlockEntity(pos);
// We extended BlockTileBase. Thus we should always have tile entity. I hope.
if (tileEntity == null) {
// We extended BlockTileBase. Thus we should always have blockEntity entity. I hope.
if (blockEntity == null) {
return false;
}