mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fixed balloon colors, fixed transmitter block render, fixed visual disconnect of transmitters on world load
This commit is contained in:
1 parent
2c39f6a689
commit
30447e40e2
8 files changed
+28
-16
No files matched your search
@@ -128,7 +128,6 @@ import mekanism.common.inventory.InventoryPersonalChest;
|
||||
import mekanism.common.item.ItemBlockBasic;
|
||||
import mekanism.common.item.ItemBlockGasTank;
|
||||
import mekanism.common.item.ItemBlockMachine;
|
||||
import mekanism.common.item.ItemBlockPlastic;
|
||||
import mekanism.common.item.ItemCraftingFormula;
|
||||
import mekanism.common.item.ItemPortableTeleporter;
|
||||
import mekanism.common.item.ItemSeismicReader;
|
||||
@@ -898,18 +897,22 @@ public class ClientProxy extends CommonProxy
|
||||
@Override
|
||||
public int getColorFromItemstack(ItemStack stack, int tintIndex)
|
||||
{
|
||||
if(stack.getItem() instanceof ItemBlockPlastic)
|
||||
{
|
||||
EnumDyeColor dyeColor = EnumDyeColor.byMetadata(stack.getItemDamage()&15);
|
||||
EnumColor dye = EnumColor.DYES[dyeColor.getDyeDamage()];
|
||||
|
||||
return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255);
|
||||
}
|
||||
EnumDyeColor dyeColor = EnumDyeColor.byMetadata(stack.getItemDamage()&15);
|
||||
EnumColor dye = EnumColor.DYES[dyeColor.getDyeDamage()];
|
||||
|
||||
return -1;
|
||||
return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255);
|
||||
}
|
||||
}, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock,
|
||||
MekanismBlocks.SlickPlasticBlock, MekanismBlocks.PlasticFence);
|
||||
Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() {
|
||||
@Override
|
||||
public int getColorFromItemstack(ItemStack stack, int tintIndex)
|
||||
{
|
||||
EnumColor dye = EnumColor.DYES[stack.getItemDamage()];
|
||||
|
||||
return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255);
|
||||
}
|
||||
}, MekanismItems.Balloon);
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(new ClientConnectionHandler());
|
||||
MinecraftForge.EVENT_BUS.register(new ClientPlayerTracker());
|
||||
|
||||
Reference in new issue
Block a user