Update to new RebornCore

This commit is contained in:
Modmuss50 2015-12-11 19:48:16 +00:00
parent 801964a92d
commit 9bb3aad137
7 changed files with 42 additions and 7 deletions

View file

@ -359,7 +359,7 @@ public abstract class BlockMachineBase extends BaseTileBlock implements IBlockTe
} }
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMetaValue(int meta) {
boolean active = false; boolean active = false;
int facingInt = meta; int facingInt = meta;
if(facingInt > 3){ if(facingInt > 3){
@ -377,6 +377,11 @@ public abstract class BlockMachineBase extends BaseTileBlock implements IBlockTe
return facingInt + activeInt; return facingInt + activeInt;
} }
@Override
public IBlockState getStateFromMeta(int meta) {
return getStateFromMetaValue(meta);
}
public boolean isActive(IBlockState state){ public boolean isActive(IBlockState state){
return state.getValue(ACTIVE); return state.getValue(ACTIVE);
} }

View file

@ -39,7 +39,7 @@ public class BlockMachineCasing extends BlockMultiblockBase implements IBlockTex
public PropertyInteger METADATA; public PropertyInteger METADATA;
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMetaValue(int meta) {
return this.getDefaultState().withProperty(METADATA, meta); return this.getDefaultState().withProperty(METADATA, meta);
} }
@ -108,4 +108,9 @@ public class BlockMachineCasing extends BlockMultiblockBase implements IBlockTex
public int amountOfVariants() { public int amountOfVariants() {
return types.length; return types.length;
} }
@Override
public IBlockState getStateFromMeta(int meta) {
return getStateFromMetaValue(meta);
}
} }

View file

@ -68,7 +68,7 @@ public class BlockMachineFrame extends BaseBlock implements IBlockTextureProvide
} }
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMetaValue(int meta) {
return this.getDefaultState().withProperty(METADATA, meta); return this.getDefaultState().withProperty(METADATA, meta);
} }
@ -82,4 +82,9 @@ public class BlockMachineFrame extends BaseBlock implements IBlockTextureProvide
METADATA = PropertyInteger.create("Type", 0, types.length -1); METADATA = PropertyInteger.create("Type", 0, types.length -1);
return new BlockState(this, METADATA); return new BlockState(this, METADATA);
} }
@Override
public IBlockState getStateFromMeta(int meta) {
return getStateFromMetaValue(meta);
}
} }

View file

@ -163,7 +163,7 @@ public class BlockOre extends BaseBlock implements IBlockTextureProvider {
} }
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMetaValue(int meta) {
return this.getDefaultState().withProperty(METADATA, meta); return this.getDefaultState().withProperty(METADATA, meta);
} }
@ -177,4 +177,9 @@ public class BlockOre extends BaseBlock implements IBlockTextureProvider {
METADATA = PropertyInteger.create("Type", 0, types.length); METADATA = PropertyInteger.create("Type", 0, types.length);
return new BlockState(this, METADATA); return new BlockState(this, METADATA);
} }
@Override
public IBlockState getStateFromMeta(int meta) {
return getStateFromMetaValue(meta);
}
} }

View file

@ -133,7 +133,7 @@ public class BlockPlayerDetector extends BaseTileBlock implements IBlockTextureP
} }
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMetaValue(int meta) {
return this.getDefaultState().withProperty(METADATA, meta); return this.getDefaultState().withProperty(METADATA, meta);
} }
@ -147,4 +147,9 @@ public class BlockPlayerDetector extends BaseTileBlock implements IBlockTextureP
METADATA = PropertyInteger.create("Type", 0, types.length -1); METADATA = PropertyInteger.create("Type", 0, types.length -1);
return new BlockState(this, METADATA); return new BlockState(this, METADATA);
} }
@Override
public IBlockState getStateFromMeta(int meta) {
return getStateFromMetaValue(meta);
}
} }

View file

@ -78,7 +78,7 @@ public class BlockStorage extends BaseBlock implements IBlockTextureProvider {
} }
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMetaValue(int meta) {
return this.getDefaultState().withProperty(METADATA, meta); return this.getDefaultState().withProperty(METADATA, meta);
} }
@ -92,4 +92,9 @@ public class BlockStorage extends BaseBlock implements IBlockTextureProvider {
METADATA = PropertyInteger.create("Type", 0, types.length -1); METADATA = PropertyInteger.create("Type", 0, types.length -1);
return new BlockState(this, METADATA); return new BlockState(this, METADATA);
} }
@Override
public IBlockState getStateFromMeta(int meta) {
return getStateFromMetaValue(meta);
}
} }

View file

@ -76,7 +76,7 @@ public class BlockStorage2 extends BaseBlock implements IBlockTextureProvider {
} }
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMetaValue(int meta) {
return this.getDefaultState().withProperty(METADATA, meta); return this.getDefaultState().withProperty(METADATA, meta);
} }
@ -90,4 +90,9 @@ public class BlockStorage2 extends BaseBlock implements IBlockTextureProvider {
METADATA = PropertyInteger.create("Type", 0, types.length -1); METADATA = PropertyInteger.create("Type", 0, types.length -1);
return new BlockState(this, METADATA); return new BlockState(this, METADATA);
} }
@Override
public IBlockState getStateFromMeta(int meta) {
return getStateFromMetaValue(meta);
}
} }