This commit is contained in:
Raoul Van den Berge
2016-01-31 15:17:36 +01:00
parent 9d2e6ed16f
commit f55e8ac2e5
7 changed files with 23 additions and 26 deletions

View File

@@ -44,9 +44,9 @@ public abstract class BlockBase extends Block
protected BlockState createBlockState() protected BlockState createBlockState()
{ {
return new BlockState(this, new IProperty[] return new BlockState(this, new IProperty[]
{ {
DIRECTION, DIRECTION,
}); });
} }
@Override @Override

View File

@@ -1,5 +1,6 @@
package storagecraft.block; package storagecraft.block;
import java.util.List;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
@@ -18,8 +19,6 @@ import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI; import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileController; import storagecraft.tile.TileController;
import java.util.List;
public class BlockController extends BlockBase public class BlockController extends BlockBase
{ {
public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class); public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class);
@@ -43,11 +42,11 @@ public class BlockController extends BlockBase
protected BlockState createBlockState() protected BlockState createBlockState()
{ {
return new BlockState(this, new IProperty[] return new BlockState(this, new IProperty[]
{ {
DIRECTION, DIRECTION,
TYPE, TYPE,
ENERGY ENERGY
}); });
} }
@Override @Override

View File

@@ -27,11 +27,11 @@ public class BlockDetector extends BlockMachine
protected BlockState createBlockState() protected BlockState createBlockState()
{ {
return new BlockState(this, new IProperty[] return new BlockState(this, new IProperty[]
{ {
DIRECTION, DIRECTION,
CONNECTED, CONNECTED,
POWERED POWERED
}); });
} }
@Override @Override

View File

@@ -23,7 +23,6 @@ public class BlockExporter extends BlockMachine
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)
{ {

View File

@@ -23,7 +23,6 @@ public class BlockImporter extends BlockMachine
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)
{ {

View File

@@ -27,10 +27,10 @@ public abstract class BlockMachine extends BlockBase
protected BlockState createBlockState() protected BlockState createBlockState()
{ {
return new BlockState(this, new IProperty[] return new BlockState(this, new IProperty[]
{ {
DIRECTION, DIRECTION,
CONNECTED CONNECTED
}); });
} }
@Override @Override

View File

@@ -27,11 +27,11 @@ public class BlockWirelessTransmitter extends BlockMachine
protected BlockState createBlockState() protected BlockState createBlockState()
{ {
return new BlockState(this, new IProperty[] return new BlockState(this, new IProperty[]
{ {
DIRECTION, DIRECTION,
CONNECTED, CONNECTED,
WORKING WORKING
}); });
} }
@Override @Override