Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Replaced some Method calls

Browse source
This commit is contained in:
canitzp 2016-02-19 19:58:26 +01:00
parent 51de083209
commit 967d180cca
7 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java
View file

@ -54,7 +54,7 @@ public class BlockCoalGenerator extends BlockContainerBase{
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){ public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){
int meta = PosUtil.getMetadata(pos, world); int meta = state.getBlock().getMetaFromState(state);
if(meta == 1){ if(meta == 1){
for(int i = 0; i < 5; i++){ for(int i = 0; i < 5; i++){

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
View file

@ -68,7 +68,7 @@ public class BlockColoredLamp extends BlockBase{
//Turning On //Turning On
if(player.isSneaking()){ if(player.isSneaking()){
if(!world.isRemote){ if(!world.isRemote){
PosUtil.setBlock(pos, world, this.isOn ? InitBlocks.blockColoredLamp : InitBlocks.blockColoredLampOn, PosUtil.getMetadata(pos, world), 2); PosUtil.setBlock(pos, world, this.isOn ? InitBlocks.blockColoredLamp : InitBlocks.blockColoredLampOn, state.getBlock().getMetaFromState(state), 2);
} }
return true; return true;
} }
@ -82,7 +82,7 @@ public class BlockColoredLamp extends BlockBase{
String name = OreDictionary.getOreName(oreID); String name = OreDictionary.getOreName(oreID);
TheColoredLampColors color = TheColoredLampColors.getColorFromDyeName(name); TheColoredLampColors color = TheColoredLampColors.getColorFromDyeName(name);
if(color != null){ if(color != null){
if(PosUtil.getMetadata(pos, world) != color.ordinal()){ if(state.getBlock().getMetaFromState(state) != color.ordinal()){
if(!world.isRemote){ if(!world.isRemote){
PosUtil.setMetadata(pos, world, color.ordinal(), 2); PosUtil.setMetadata(pos, world, color.ordinal(), 2);
if(!player.capabilities.isCreativeMode){ if(!player.capabilities.isCreativeMode){

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java
View file

@ -56,7 +56,7 @@ public class BlockFurnaceDouble extends BlockContainerBase{
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){ public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){
int meta = PosUtil.getMetadata(pos, world); int meta = state.getBlock().getMetaFromState(state);
if(meta > 3){ if(meta > 3){
float f = (float)pos.getX()+0.5F; float f = (float)pos.getX()+0.5F;

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java
View file

@ -56,7 +56,7 @@ public class BlockGrinder extends BlockContainerBase{
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){ public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){
int meta = PosUtil.getMetadata(pos, world); int meta = state.getBlock().getMetaFromState(state);
if(meta == 1){ if(meta == 1){
for(int i = 0; i < 5; i++){ for(int i = 0; i < 5; i++){

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java
View file

@ -54,7 +54,7 @@ public class BlockOilGenerator extends BlockContainerBase{
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){ public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){
if(PosUtil.getMetadata(pos, world) == 1){ if(state.getBlock().getMetaFromState(state) == 1){
for(int i = 0; i < 5; i++){ for(int i = 0; i < 5; i++){
world.spawnParticle(ClientProxy.bulletForMyValentine ? EnumParticleTypes.HEART : EnumParticleTypes.SMOKE_NORMAL, (double)pos.getX()+0.5F, (double)pos.getY()+1.0F, (double)pos.getZ()+0.5F, 0.0D, 0.0D, 0.0D); world.spawnParticle(ClientProxy.bulletForMyValentine ? EnumParticleTypes.HEART : EnumParticleTypes.SMOKE_NORMAL, (double)pos.getX()+0.5F, (double)pos.getY()+1.0F, (double)pos.getZ()+0.5F, 0.0D, 0.0D, 0.0D);
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java
View file

@ -51,7 +51,7 @@ public class BlockWildPlant extends BlockBushBase{
@Override @Override
public boolean canBlockStay(World world, BlockPos pos, IBlockState state){ public boolean canBlockStay(World world, BlockPos pos, IBlockState state){
BlockPos offset = PosUtil.offset(pos, 0, -1, 0); BlockPos offset = PosUtil.offset(pos, 0, -1, 0);
return PosUtil.getMetadata(pos, world) == TheWildPlants.RICE.ordinal() ? PosUtil.getMaterial(offset, world) == Material.water : PosUtil.getBlock(offset, world).canSustainPlant(world, offset, EnumFacing.UP, this); return state.getBlock().getMetaFromState(state) == TheWildPlants.RICE.ordinal() ? PosUtil.getMaterial(offset, world) == Material.water : PosUtil.getBlock(offset, world).canSustainPlant(world, offset, EnumFacing.UP, this);
} }
@Override @Override

1
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java
View file

@ -20,7 +20,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
//TODO Fix Reconstructor Lens rendering
public class RenderReconstructorLens extends TileEntitySpecialRenderer{ public class RenderReconstructorLens extends TileEntitySpecialRenderer{
@Override @Override