diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index 5a425a744..cca094203 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -21,6 +21,8 @@ public interface IGridTransmitter> extends ITr * @param network - network to set to */ public void setTransmitterNetwork(N network); + + public void setRequestsUpdate(); public int getTransmitterNetworkSize(); diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index fcd2e0c59..cbd97f393 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -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()); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 8f49b3c92..bea94cb3a 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -320,10 +320,10 @@ public class MekanismRenderer for(int i = 0; i < 4; i++) { int nextIndex = (i+amount)%4; - int j = quad.getFormat().getIntegerSize() * i; + int quadSize = quad.getFormat().getIntegerSize(); int uvIndex = quad.getFormat().getUvOffsetById(0) / 4; - vertices[j + uvIndex] = quad.getVertexData()[7*nextIndex + uvIndex]; - vertices[j + uvIndex + 1] = quad.getVertexData()[7*nextIndex + uvIndex]; + vertices[quadSize*i + uvIndex] = quad.getVertexData()[quadSize*nextIndex + uvIndex]; + vertices[quadSize*i + uvIndex + 1] = quad.getVertexData()[quadSize*nextIndex + uvIndex + 1]; } return new BakedQuad(vertices, quad.getTintIndex(), quad.getFace(), quad.getSprite(), quad.shouldApplyDiffuseLighting(), quad.getFormat()); diff --git a/src/main/java/mekanism/common/MekanismSounds.java b/src/main/java/mekanism/common/MekanismSounds.java index cea09fb58..af4d477c0 100644 --- a/src/main/java/mekanism/common/MekanismSounds.java +++ b/src/main/java/mekanism/common/MekanismSounds.java @@ -14,5 +14,4 @@ public final class MekanismSounds public static final SoundEvent POP = new SoundEvent(new ResourceLocation("mekanism:etc.Pop")); public static final SoundEvent SUCCESS = new SoundEvent(new ResourceLocation("mekanism:etc.Success")); public static final SoundEvent CJ_EASTER_EGG = new SoundEvent(new ResourceLocation("mekanism:etc.cj")); - } diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 8939812ff..18453d922 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -41,7 +41,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData private static final DataParameter LATCHED_X = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); private static final DataParameter LATCHED_Y = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); private static final DataParameter LATCHED_Z = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); - private static final DataParameter LATCHED_ID = EntityDataManager.createKey(Entity.class, DataSerializers.VARINT); + private static final DataParameter LATCHED_ID = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); public EntityBalloon(World world) { diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index ab1ac42ff..958e91134 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -143,6 +143,12 @@ public class MultipartTransmitter> extends Tran { return getPart().getTransmissionType(); } + + @Override + public void setRequestsUpdate() + { + containingPart.sendDesc = true; + } public PartTransmitter getPart() { diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index f127af4e3..5d5091e00 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -43,6 +43,8 @@ public class PacketDataRequest implements IMessageHandler