mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
A good bit of work
- Fixed infuse sprites - Fixed liquid sprites - Fixed Plastic Fence block states - got Plastic Fence to render in block form
This commit is contained in:
1 parent
115443f5f9
commit
13893bd705
24 files changed
+474
-88
No files matched your search
@@ -1,5 +1,7 @@
|
||||
package mekanism.common.block;
|
||||
|
||||
import static mekanism.common.block.states.BlockStatePlastic.colorProperty;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.EnumColor;
|
||||
@@ -8,7 +10,6 @@ import mekanism.common.block.states.BlockStatePlastic;
|
||||
import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
import net.minecraft.block.state.BlockState;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -23,8 +24,6 @@ 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;
|
||||
@@ -60,7 +59,6 @@ public class BlockPlastic extends Block
|
||||
return state.getValue(colorProperty).getMetadata();
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -129,6 +127,7 @@ public class BlockPlastic extends Block
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user