mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Temporarily disable multipart functionality, got transmitters to work, reorganize multipart code
This commit is contained in:
1 parent
89905c836b
commit
2aad738c3d
43 files changed
+283
-208
No files matched your search
@@ -8,8 +8,8 @@ import javax.vecmath.Matrix4f;
|
||||
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.client.render.ctm.CTMModelFactory;
|
||||
import mekanism.common.multipart.ColorProperty;
|
||||
import mekanism.common.multipart.TileEntityGlowPanel;
|
||||
import mekanism.common.block.property.PropertyColor;
|
||||
import mekanism.common.tile.TileEntityGlowPanel;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
@@ -70,7 +70,7 @@ public class GlowPanelModel extends OBJBakedModelBase
|
||||
|
||||
if(tempState != null)
|
||||
{
|
||||
return ((IExtendedBlockState)tempState).getValue(ColorProperty.INSTANCE).color;
|
||||
return ((IExtendedBlockState)tempState).getValue(PropertyColor.INSTANCE).color;
|
||||
}
|
||||
|
||||
return EnumColor.WHITE;
|
||||
@@ -138,7 +138,7 @@ public class GlowPanelModel extends OBJBakedModelBase
|
||||
if(state != null && tempState == null)
|
||||
{
|
||||
int hash = TileEntityGlowPanel.hash((IExtendedBlockState)state);
|
||||
EnumColor color = ((IExtendedBlockState)state).getValue(ColorProperty.INSTANCE).color;
|
||||
EnumColor color = ((IExtendedBlockState)state).getValue(PropertyColor.INSTANCE).color;
|
||||
|
||||
if(!glowPanelCache.containsKey(hash))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user