dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of ITileEntityProvider

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-27 22:00:48 +01:00
parent 0d6087ca67
commit 62d3f0436c
13 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/storagecraft/block/BlockCable.java Normal file → Executable file
View File

@@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.tile.TileCable; import storagecraft.tile.TileCable;
public class BlockCable extends BlockBase implements ITileEntityProvider public class BlockCable extends BlockBase
{ {
public static final PropertyBool SENSITIVE = PropertyBool.create("sensitive"); public static final PropertyBool SENSITIVE = PropertyBool.create("sensitive");
@@ -45,8 +45,13 @@ public class BlockCable extends BlockBase implements ITileEntityProvider
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public boolean hasTileEntity(IBlockState state)
{ {
return true;
}
@Override
public TileEntity createTileEntity(World world, IBlockState state) {
return new TileCable(); return new TileCable();
} }

3
src/main/java/storagecraft/block/BlockConstructor.java
View File

@@ -18,8 +18,7 @@ public class BlockConstructor extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileConstructor(); return new TileConstructor();
} }

10
src/main/java/storagecraft/block/BlockController.java
View File

@@ -1,6 +1,5 @@
package storagecraft.block; package storagecraft.block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockState;
@@ -15,7 +14,7 @@ import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileController; import storagecraft.tile.TileController;
public class BlockController extends BlockBase implements ITileEntityProvider public class BlockController extends BlockBase
{ {
public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 15); public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 15);
@@ -42,8 +41,13 @@ public class BlockController extends BlockBase implements ITileEntityProvider
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public boolean hasTileEntity(IBlockState state)
{ {
return true;
}
@Override
public TileEntity createTileEntity(World world, IBlockState state) {
return new TileController(); return new TileController();
} }

3
src/main/java/storagecraft/block/BlockDestructor.java
View File

@@ -18,8 +18,7 @@ public class BlockDestructor extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileDestructor(); return new TileDestructor();
} }

3
src/main/java/storagecraft/block/BlockDetector.java Normal file → Executable file
View File

@@ -19,8 +19,7 @@ public class BlockDetector extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileDetector(); return new TileDetector();
} }

4
src/main/java/storagecraft/block/BlockDrive.java Normal file → Executable file
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileCable;
import storagecraft.tile.TileDrive; import storagecraft.tile.TileDrive;
public class BlockDrive extends BlockMachine public class BlockDrive extends BlockMachine
@@ -18,8 +19,7 @@ public class BlockDrive extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileDrive(); return new TileDrive();
} }

5
src/main/java/storagecraft/block/BlockExporter.java Normal file → Executable file
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileCable;
import storagecraft.tile.TileExporter; import storagecraft.tile.TileExporter;
public class BlockExporter extends BlockMachine public class BlockExporter extends BlockMachine
@@ -18,11 +19,11 @@ public class BlockExporter extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileExporter(); return new TileExporter();
} }
@Override @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
{ {

4
src/main/java/storagecraft/block/BlockExternalStorage.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileCable;
import storagecraft.tile.TileExternalStorage; import storagecraft.tile.TileExternalStorage;
public class BlockExternalStorage extends BlockMachine public class BlockExternalStorage extends BlockMachine
@@ -18,8 +19,7 @@ public class BlockExternalStorage extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileExternalStorage(); return new TileExternalStorage();
} }

5
src/main/java/storagecraft/block/BlockGrid.java
View File

@@ -16,6 +16,8 @@ import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import static storagecraft.block.BlockMachine.CONNECTED; import static storagecraft.block.BlockMachine.CONNECTED;
import storagecraft.tile.TileCable;
import storagecraft.tile.TileGrid; import storagecraft.tile.TileGrid;
public class BlockGrid extends BlockMachine public class BlockGrid extends BlockMachine
@@ -28,8 +30,7 @@ public class BlockGrid extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileGrid(); return new TileGrid();
} }

5
src/main/java/storagecraft/block/BlockImporter.java Normal file → Executable file
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileCable;
import storagecraft.tile.TileImporter; import storagecraft.tile.TileImporter;
public class BlockImporter extends BlockMachine public class BlockImporter extends BlockMachine
@@ -18,11 +19,11 @@ public class BlockImporter extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileImporter(); return new TileImporter();
} }
@Override @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
{ {

9
src/main/java/storagecraft/block/BlockMachine.java
View File

@@ -1,6 +1,5 @@
package storagecraft.block; package storagecraft.block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockState;
@@ -9,7 +8,7 @@ import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import storagecraft.tile.TileMachine; import storagecraft.tile.TileMachine;
public abstract class BlockMachine extends BlockBase implements ITileEntityProvider public abstract class BlockMachine extends BlockBase
{ {
public static final PropertyBool CONNECTED = PropertyBool.create("connected"); public static final PropertyBool CONNECTED = PropertyBool.create("connected");
@@ -18,6 +17,12 @@ public abstract class BlockMachine extends BlockBase implements ITileEntityProvi
super(name); super(name);
} }
@Override
public boolean hasTileEntity(IBlockState state)
{
return true;
}
@Override @Override
protected BlockState createBlockState() protected BlockState createBlockState()
{ {

4
src/main/java/storagecraft/block/BlockSolderer.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileCable;
import storagecraft.tile.TileSolderer; import storagecraft.tile.TileSolderer;
public class BlockSolderer extends BlockMachine public class BlockSolderer extends BlockMachine
@@ -18,8 +19,7 @@ public class BlockSolderer extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileSolderer(); return new TileSolderer();
} }

4
src/main/java/storagecraft/block/BlockWirelessTransmitter.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileCable;
import storagecraft.tile.TileWirelessTransmitter; import storagecraft.tile.TileWirelessTransmitter;
// @TODO: This texture behaves differently // @TODO: This texture behaves differently
@@ -19,8 +20,7 @@ public class BlockWirelessTransmitter extends BlockMachine
} }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createTileEntity(World world, IBlockState state) {
{
return new TileWirelessTransmitter(); return new TileWirelessTransmitter();
} }