Fix up some more models, register StateMappers using the right function at the right time.

This commit is contained in:
Ben Spiers committed 2016-04-27 23:40:23 +01:00
1 parent 7efa4bcdbb
commit 79d7d8b024
101 files changed
+6636 -4264

No files matched your search

@@ -23,6 +23,8 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import static mekanism.common.block.states.BlockStatePlastic.colorProperty;
public class BlockPlastic extends Block
{
public PlasticBlockType type;
@@ -38,8 +40,6 @@ public class BlockPlastic extends Block
{
slipperiness = 0.98F;
}
setDefaultState(blockState.getBaseState().withProperty(BlockStatePlastic.typeProperty, type));
}
@Override
@@ -51,13 +51,13 @@ public class BlockPlastic extends Block
@Override
public IBlockState getStateFromMeta(int meta)
{
return this.getDefaultState().withProperty(BlockStatePlastic.colorProperty, EnumDyeColor.byMetadata(meta));
return this.getDefaultState().withProperty(colorProperty, EnumDyeColor.byMetadata(meta));
}
@Override
public int getMetaFromState(IBlockState state)
{
return state.getValue(BlockStatePlastic.colorProperty).getMetadata();
return state.getValue(colorProperty).getMetadata();
}
@@ -127,8 +127,9 @@ public class BlockPlastic extends Block
@Override
public int getRenderColor(IBlockState state)
{
EnumColor colour = EnumColor.DYES[getMetaFromState(state)];
return (int)(colour.getColor(0)*255) << 16 | (int)(colour.getColor(1)*255) << 8 | (int)(colour.getColor(2)*255);
EnumDyeColor color = state.getValue(colorProperty);
EnumColor dye = EnumColor.DYES[color.getDyeDamage()];
return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255);
}
@Override