diff --git a/src/main/java/techreborn/blocks/BlockAlarm.java b/src/main/java/techreborn/blocks/BlockAlarm.java index a308d94bd..7ef1f22e9 100644 --- a/src/main/java/techreborn/blocks/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/BlockAlarm.java @@ -42,6 +42,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.ToolManager; import reborncore.client.models.ModelCompound; @@ -146,7 +147,7 @@ public class BlockAlarm extends BaseTileBlock { @Nullable @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileAlarm(); } diff --git a/src/main/java/techreborn/blocks/BlockFlare.java b/src/main/java/techreborn/blocks/BlockFlare.java index 32dd83c1e..d595293d8 100644 --- a/src/main/java/techreborn/blocks/BlockFlare.java +++ b/src/main/java/techreborn/blocks/BlockFlare.java @@ -38,6 +38,7 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -62,7 +63,7 @@ public class BlockFlare extends BlockContainer { } @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { if (worldIn.isRemote) { //Only needed on the client return new TileEntityFlare(); } diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 1bc6de1db..c56740458 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -28,6 +28,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.multiblock.BlockMultiblockBase; import techreborn.tiles.TileMachineCasing; @@ -52,7 +53,7 @@ public class BlockMachineCasing extends BlockMultiblockBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileMachineCasing(); } diff --git a/src/main/java/techreborn/blocks/cable/BlockCable.java b/src/main/java/techreborn/blocks/cable/BlockCable.java index 10ffd885e..e4f4bf959 100644 --- a/src/main/java/techreborn/blocks/cable/BlockCable.java +++ b/src/main/java/techreborn/blocks/cable/BlockCable.java @@ -41,6 +41,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.energy.CapabilityEnergy; @@ -126,7 +127,7 @@ public class BlockCable extends BlockContainer { @Nullable @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileCable(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 58925577f..5fddbd68a 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -24,7 +24,9 @@ package techreborn.blocks.generator; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -45,7 +47,7 @@ public class BlockDieselGenerator extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileDieselGenerator(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java index b5a341be7..26d507912 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -41,7 +42,7 @@ public class BlockDragonEggSyphon extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileDragonEggSyphon(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java index d71f668ac..d29cc83d6 100644 --- a/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java @@ -32,6 +32,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -99,7 +100,7 @@ public class BlockFusionControlComputer extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileFusionControlComputer(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index cc4dd2543..d9a255c45 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockGasTurbine extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileGasTurbine(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index 4c95739ff..926360e1d 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -41,7 +42,7 @@ public class BlockLightningRod extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileLightningRod(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 0286583da..f4f0390be 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -45,7 +46,7 @@ public class BlockPlasmaGenerator extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TilePlasmaGenerator(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index 406b45c69..7157a1457 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileSemiFluidGenerator(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index da205886c..45716f585 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -48,7 +49,7 @@ public class BlockSolarPanel extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileSolarPanel(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java index af1d8426a..c1c2180bb 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockSolidFuelGenerator extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileSolidFuelGenerator(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index a0f701625..8d1bac045 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockThermalGenerator extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileThermalGenerator(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java index 02795975b..8f1f211cb 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -44,7 +45,7 @@ public class BlockWaterMill extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileWaterMill(); } diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index 836632f33..4838db2a2 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -25,6 +25,7 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -44,7 +45,7 @@ public class BlockWindMill extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileWindMill(); } diff --git a/src/main/java/techreborn/blocks/lighting/BlockLamp.java b/src/main/java/techreborn/blocks/lighting/BlockLamp.java index c907ebf9f..ee397ea7d 100644 --- a/src/main/java/techreborn/blocks/lighting/BlockLamp.java +++ b/src/main/java/techreborn/blocks/lighting/BlockLamp.java @@ -40,6 +40,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.ToolManager; import reborncore.client.models.ModelCompound; @@ -108,7 +109,7 @@ public class BlockLamp extends BaseTileBlock { // BaseTileBlock @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileLamp(); } diff --git a/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java index eb311df80..34d3bd802 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java @@ -30,6 +30,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; @@ -43,7 +44,7 @@ public class BlockAdjustableSU extends BlockEnergyStorage { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileAdjustableSU(); } diff --git a/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java index 7b3b80ca3..4ccc623aa 100644 --- a/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; @@ -46,12 +46,12 @@ public class BlockHighVoltageSU extends BlockEnergyStorage { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileHighVoltageSU(); } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(NonNullList drops, IBlockReader world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } else { diff --git a/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java index ea620aa5e..ec7db132e 100644 --- a/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java @@ -32,6 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; @@ -45,7 +46,7 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileInterdimensionalSU(); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index f4089a0f4..a9ecb4cb7 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -36,6 +36,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.ToolManager; import reborncore.client.models.ModelCompound; @@ -72,7 +73,7 @@ public class BlockLSUStorage extends BaseTileBlock { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileLSUStorage(); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java index b42f3344a..91661e3ed 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java @@ -30,6 +30,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; @@ -43,7 +44,7 @@ public class BlockLapotronicSU extends BlockEnergyStorage { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileLapotronicSU(); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLowVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockLowVoltageSU.java index 953cac26d..e7a2f03f9 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLowVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLowVoltageSU.java @@ -25,7 +25,7 @@ package techreborn.blocks.storage; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; +import net.minecraft.world.IBlockReader; import techreborn.client.EGui; import techreborn.tiles.storage.TileLowVoltageSU; @@ -39,7 +39,7 @@ public class BlockLowVoltageSU extends BlockEnergyStorage { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileLowVoltageSU(); } } diff --git a/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java index f6914e4e1..34131048c 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java @@ -30,6 +30,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; @@ -46,7 +47,7 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileMediumVoltageSU(); } diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java index 98d505718..4b486f739 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java @@ -29,6 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -48,7 +49,7 @@ public class BlockIronAlloyFurnace extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileIronAlloyFurnace(); } diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java index 3a4bd1397..a72d840b3 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java @@ -31,6 +31,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -89,7 +90,7 @@ public class BlockIronFurnace extends BlockMachineBase { // BlockMachineBase @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileIronFurnace(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java index 304e9b7fa..b0bea9722 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockAlloySmelter extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileAlloySmelter(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java index 7004ea418..cc094de3a 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockAssemblingMachine extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileAssemblingMachine(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java index de0ddbe9f..6f1d5bc4b 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java @@ -27,6 +27,7 @@ package techreborn.blocks.tier1; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -59,7 +60,7 @@ public class BlockAutoCraftingTable extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileAutoCraftingTable(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java index 8a077ae51..43c1baeb5 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockCompressor extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileCompressor(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index 7b1c49555..f9bc72c22 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockElectricFurnace extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileElectricFurnace(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java index 088cdbfe8..27262b33c 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockExtractor extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileExtractor(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java index 955fdf78e..8d9cbe301 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockGrinder extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileGrinder(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java index 21539537d..a978792d8 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java @@ -43,6 +43,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -78,7 +79,7 @@ public class BlockPlayerDetector extends BlockMachineBase { // BlockMachineBase @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TilePlayerDectector(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java index b576927db..45f26be38 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockRecycler extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileRecycler(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java index 975f086ae..0398c1631 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockRollingMachine extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileRollingMachine(); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java index 48e705f3f..53aca95d4 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockScrapboxinator extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileScrapboxinator(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java index 6ce8e54a2..0899e684b 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockChargeOMat extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileChargeOMat(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java index e87c6e49a..2bccfef79 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockChemicalReactor extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileChemicalReactor(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java index 213217499..488ed6b9d 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java @@ -28,6 +28,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -48,7 +49,7 @@ public class BlockDigitalChest extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileDigitalChest(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java index 4261b1316..a8da4ddf2 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockDistillationTower extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileDistillationTower(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java index a9271511f..3920a0ed0 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockImplosionCompressor extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileImplosionCompressor(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java index d08420ccc..b6d3c5a65 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockIndustrialBlastFurnace extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileIndustrialBlastFurnace(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java index e427a11c7..2ca1eb8cc 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockIndustrialCentrifuge extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileIndustrialCentrifuge(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java index b8c24dcb7..2c9adbef2 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileIndustrialElectrolyzer(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java index 94d5b8d03..ef96ecbed 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockIndustrialGrinder extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileIndustrialGrinder(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java index 02ac4f7e4..4c2f6f6d9 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockIndustrialSawmill extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileIndustrialSawmill(); } diff --git a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java index ab3ce92fa..22d659d6d 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockVacuumFreezer extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileVacuumFreezer(); } diff --git a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java index e8c94d192..b7f76ec1c 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockChunkLoader extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileChunkLoader(); } diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java index 2c863ab55..7dfe51aca 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java @@ -27,6 +27,7 @@ package techreborn.blocks.tier3; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; @@ -45,7 +46,7 @@ public class BlockCreativeQuantumChest extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileCreativeQuantumChest(); } diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java index 950b52c39..6e3c4d678 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockCreativeQuantumTank extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileCreativeQuantumTank(); } diff --git a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java index 4caf08166..667277810 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockFluidReplicator extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileFluidReplicator(); } diff --git a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java index ed5058f39..8da1f7692 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockMatterFabricator extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileMatterFabricator(); } diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java index 79e17c357..cf50b246a 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java @@ -28,6 +28,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -48,7 +49,7 @@ public class BlockQuantumChest extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileQuantumChest(); } diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java index 54868c4d6..4907d82c2 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java @@ -25,6 +25,7 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; @@ -42,7 +43,7 @@ public class BlockQuantumTank extends BlockMachineBase { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileQuantumTank(); } diff --git a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java index 0a5bed3f6..87869cb30 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java @@ -30,6 +30,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.init.TRContent; @@ -45,7 +46,7 @@ public class BlockHVTransformer extends BlockTransformer { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileHVTransformer(); } diff --git a/src/main/java/techreborn/blocks/transformers/BlockLVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockLVTransformer.java index 53fb6d6c4..8414db65a 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockLVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockLVTransformer.java @@ -25,7 +25,7 @@ package techreborn.blocks.transformers; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; +import net.minecraft.world.IBlockReader; import techreborn.tiles.transformers.TileLVTransformer; /** @@ -38,7 +38,7 @@ public class BlockLVTransformer extends BlockTransformer { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileLVTransformer(); } } diff --git a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java index 48272ac67..1be4a445a 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java @@ -30,6 +30,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.init.TRContent; @@ -45,7 +46,7 @@ public class BlockMVTransformer extends BlockTransformer { } @Override - public TileEntity createNewTileEntity(final World world, final int meta) { + public TileEntity createNewTileEntity(IBlockReader worldIn) { return new TileMVTransformer(); } diff --git a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java index 191a005bf..52a5f21a6 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java @@ -30,6 +30,7 @@ import net.minecraft.item.ItemStack; import reborncore.api.recipe.RecipeHandler; import techreborn.api.Reference; import techreborn.api.recipe.machines.CentrifugeRecipe; +import techreborn.init.TRContent; import techreborn.items.DynamicCell; import java.security.InvalidParameterException; @@ -44,10 +45,9 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { register(getStack(Blocks.GRASS, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2), getStack(Items.WHEAT_SEEDS, 4)); register(getStack(Blocks.MYCELIUM, 8), 1640, getStack(Blocks.SAND, 4), getStack(Items.CLAY_BALL), getStack(Blocks.BROWN_MUSHROOM, 2), getStack(Blocks.RED_MUSHROOM, 2)); register(getStack(Items.GOLDEN_APPLE), 5000, getStack(Items.GOLD_INGOT, 6), getMaterial("methane", Type.CELL)); - register(getStack(Items.GOLDEN_APPLE, 1, 1), 5000, getStack(Items.GOLD_INGOT, 64), getMaterial("methane", Type.CELL)); -// TODO: Fix recipe -// register(getStack(Items.GOLDEN_CARROT), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); -// register(getStack(Items.SPECKLED_MELON, 8), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); + register(getStack(Items.ENCHANTED_GOLDEN_APPLE), 5000, getStack(Items.GOLD_INGOT, 64), getMaterial("methane", Type.CELL)); + register(getStack(Items.GOLDEN_CARROT), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); + register(getStack(Items.GLISTERING_MELON_SLICE, 8), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); register(getStack(Items.APPLE, 32), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.MUSHROOM_STEW, 16), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.BREAD, 64), 5000, getMaterial("methane", Type.CELL)); @@ -61,9 +61,11 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { register(getStack(Items.COOKED_MUTTON, 16), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.RABBIT, 12), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.COOKED_RABBIT, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.FISH, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKED_FISH, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.MELON, 64), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COD, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKED_COD, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.SALMON, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKED_SALMON, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.MELON_SLICE, 64), 5000, getMaterial("methane", Type.CELL)); register(getStack(Blocks.PUMPKIN, 16), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.ROTTEN_FLESH, 16), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.SPIDER_EYE, 32), 5000, getMaterial("methane", Type.CELL)); @@ -78,6 +80,7 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { register(getStack(Blocks.BROWN_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL)); register(getStack(Blocks.RED_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL)); register(getStack(Items.NETHER_WART, 32), 5000, getMaterial("methane", Type.CELL)); +//TODO: Fixme // register(getMaterial("sap", 4, Type.PART), 1300, getMaterial("rubber", 14, Type.PART)); // register(getStack(ModBlocks.RUBBER_LOG, 16), 5000, false, getMaterial("sap", 8, Type.PART), getMaterial("methane", Type.CELL), getMaterial("carbon", 4, Type.CELL)); // register(getStack(Blocks.SOUL_SAND, 16), 2500, getStack(Blocks.SAND, 10), getMaterial("saltpeter", 4, Type.DUST), getMaterial("coal", Type.DUST), getMaterial("oil", Type.CELL)); diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index 3ecb3f8ce..607b6394b 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -132,7 +132,7 @@ public abstract class RecipeMethods { } public static ItemStack getStack(Item item, int count) { - return getStack(item, count, 0); + return new ItemStack(item, count); } public static ItemStack getStack(Item item, boolean wildcard) { @@ -143,10 +143,6 @@ public abstract class RecipeMethods { return getStack(item, count, wildcard ? OreDictionary.WILDCARD_VALUE : 0); } - public static ItemStack getStack(Item item, int count, int metadata) { - return new ItemStack(item, count, metadata); - } - public static ItemStack getStack(Block block) { return getStack(block, 1); }