tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix recolour. It uses wool colours, not dye colours.

Browse source
This commit is contained in:
Ben Spiers 2014-04-16 00:06:25 +01:00
parent 24d620facc
commit 1fec6464e1
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/mekanism/common/block/BlockPlastic.java
View file

@ -10,6 +10,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon; import net.minecraft.util.Icon;
@ -55,6 +56,23 @@ public class BlockPlastic extends Block
{ {
blockIcon = register.registerIcon("mekanism:ReinforcedPlasticBlock"); blockIcon = register.registerIcon("mekanism:ReinforcedPlasticBlock");
} }
else if(blockID == Mekanism.roadPlasticID)
{
blockIcon = register.registerIcon("mekanism:RoadPlasticBlock");
}
}
@Override
public void onEntityWalking(World world, int x, int y, int z, Entity e)
{
if(blockID == Mekanism.roadPlasticID)
{
double boost = 1.6;
double a = Math.atan2(e.motionX, e.motionZ);
e.motionX += Math.sin(a) * boost * slipperiness;
e.motionZ += Math.cos(a) * boost * slipperiness;
}
} }
@Override @Override
@ -101,9 +119,9 @@ public class BlockPlastic extends Block
public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour)
{ {
int meta = world.getBlockMetadata(x, y, z); int meta = world.getBlockMetadata(x, y, z);
if (meta != colour) if (meta != (15 - colour))
{ {
world.setBlockMetadataWithNotify(x, y, z, colour, 3); world.setBlockMetadataWithNotify(x, y, z, 15-colour, 3);
return true; return true;
} }
return false; return false;