diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 9c06c8259..1cd561993 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -75,7 +75,6 @@ public class MekanismConfig { public static boolean enablePlayerSounds = true; public static boolean enableMachineSounds = true; - public static boolean fancyUniversalCableRender = true; public static boolean holidays = true; public static float baseSoundVolume = 1F; public static boolean machineEffects = true; @@ -84,6 +83,7 @@ public class MekanismConfig public static boolean renderCTM = true; public static boolean enableAmbientLighting; public static int ambientLightingLevel; + public static boolean opaqueTransmitters = false; } public static class machines diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index a8cc822bd..217bc02df 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -268,18 +268,17 @@ public class ClientProxy extends CommonProxy { super.loadConfiguration(); - client.enablePlayerSounds = Mekanism.configuration.get("client", "EnablePlayerSounds", true).getBoolean(true); - client.enableMachineSounds = Mekanism.configuration.get("client", "EnableMachineSounds", true).getBoolean(true); - client.fancyUniversalCableRender = Mekanism.configuration.get("client", "FancyUniversalCableRender", true).getBoolean(true); - client.holidays = Mekanism.configuration.get("client", "Holidays", true).getBoolean(true); - client.baseSoundVolume = (float)Mekanism.configuration.get("client", "SoundVolume", 1D).getDouble(1D); - client.machineEffects = Mekanism.configuration.get("client", "MachineEffects", true).getBoolean(true); - client.oldTransmitterRender = Mekanism.configuration.get("client", "OldTransmitterRender", false).getBoolean(); + client.enablePlayerSounds = Mekanism.configuration.get("client", "EnablePlayerSounds", true).getBoolean(); + client.enableMachineSounds = Mekanism.configuration.get("client", "EnableMachineSounds", true).getBoolean(); + client.holidays = Mekanism.configuration.get("client", "Holidays", true).getBoolean(); + client.baseSoundVolume = (float)Mekanism.configuration.get("client", "SoundVolume", 1D).getDouble(); + client.machineEffects = Mekanism.configuration.get("client", "MachineEffects", true).getBoolean(); client.replaceSoundsWhenResuming = Mekanism.configuration.get("client", "ReplaceSoundsWhenResuming", true, "If true, will reduce lagging between player sounds. Setting to false will reduce GC load").getBoolean(); client.renderCTM = Mekanism.configuration.get("client", "CTMRenderer", true).getBoolean(); - client.enableAmbientLighting = Mekanism.configuration.get("general", "EnableAmbientLighting", true).getBoolean(); - client.ambientLightingLevel = Mekanism.configuration.get("general", "AmbientLightingLevel", 15).getInt(); + client.enableAmbientLighting = Mekanism.configuration.get("client", "EnableAmbientLighting", true).getBoolean(); + client.ambientLightingLevel = Mekanism.configuration.get("client", "AmbientLightingLevel", 15).getInt(); + client.opaqueTransmitters = Mekanism.configuration.get("client", "OpaqueTransmitterRender", false).getBoolean(); if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index d42e2a861..2ed8f26db 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -6,6 +6,7 @@ import java.util.Map; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; import mekanism.api.MekanismConfig.general; +import mekanism.client.render.obj.TransmitterModel; import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; @@ -50,6 +51,8 @@ public class MekanismClient extends Mekanism } ClientTickHandler.tickingSet.clear(); + + TransmitterModel.clearCache(); MekanismAPI.getBoxIgnore().clear(); MinecraftForge.EVENT_BUS.post(new BoxBlacklistEvent()); diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index cb084ddb3..41d7d9ee1 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -2,14 +2,14 @@ package mekanism.client.render.obj; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import javax.vecmath.Matrix4f; -import org.apache.commons.lang3.tuple.Pair; - import mekanism.api.MekanismConfig.client; import mekanism.client.render.ctm.CTMModelFactory; import mekanism.common.multipart.ColorProperty; @@ -42,28 +42,34 @@ import net.minecraftforge.client.model.obj.OBJModel.OBJState; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.property.IExtendedBlockState; +import org.apache.commons.lang3.tuple.Pair; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; public class TransmitterModel extends OBJBakedModelBase { + private static Set modelInstances = new HashSet(); + private Map> modelCache = new HashMap>(); private TransmitterModel itemCache; private IBlockState tempState; private ItemStack tempStack; - private static TextureAtlasSprite transporter_center; - private static TextureAtlasSprite transporter_center_color; - private static TextureAtlasSprite transporter_side; - private static TextureAtlasSprite transporter_side_color; + private static TextureAtlasSprite[] transporter_center = new TextureAtlasSprite[2]; + private static TextureAtlasSprite[] transporter_center_color = new TextureAtlasSprite[2]; + private static TextureAtlasSprite[] transporter_side = new TextureAtlasSprite[2]; + private static TextureAtlasSprite[] transporter_side_color = new TextureAtlasSprite[2]; private TransmitterOverride override = new TransmitterOverride(); public TransmitterModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { super(base, model, state, format, textures, transform); + + modelInstances.add(this); } private class TransmitterOverride extends ItemOverrideList @@ -174,28 +180,36 @@ public class TransmitterModel extends OBJBakedModelBase if(MinecraftForgeClient.getRenderLayer() == BlockRenderLayer.TRANSLUCENT) { + int opaqueVal = client.opaqueTransmitters ? 1 : 0; + if(prop != null && prop.color != null) { - return (!sideIconOverride && f.getMaterialName().contains("Center")) ? transporter_center_color : transporter_side_color; + return (!sideIconOverride && f.getMaterialName().contains("Center")) ? transporter_center_color[opaqueVal] : transporter_side_color[opaqueVal]; } else { - return (!sideIconOverride && f.getMaterialName().contains("Center")) ? transporter_center : transporter_side; + return (!sideIconOverride && f.getMaterialName().contains("Center")) ? transporter_center[opaqueVal] : transporter_side[opaqueVal]; } } else { if(groupName.endsWith("NONE") && sideIconOverride) { - for(Group g : getModel().getMatLib().getGroups().values()) + for(String s : getModel().getMatLib().getMaterialNames()) { - for(Face testFace : g.getFaces()) + if(s.contains("Texture.Name")) { - String s = testFace.getMaterialName(); - - if(!s.contains("Center") && !s.contains("Centre")) - { - return textureMap.get(s); - } + continue; } + + if(!s.contains("Center") && !s.contains("Centre") && (client.opaqueTransmitters ? s.contains("Opaque") : !s.contains("Opaque"))) + { + return textureMap.get(s); + } + } + } + else { + if(client.opaqueTransmitters) + { + return textureMap.get(f.getMaterialName() + "_Opaque"); } } } @@ -260,9 +274,23 @@ public class TransmitterModel extends OBJBakedModelBase public static void registerIcons(TextureMap map) { - transporter_center = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterGlass")); - transporter_center_color = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterGlassColored")); - transporter_side = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterVerticalGlass")); - transporter_side_color = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterVerticalGlassColored")); + transporter_center[0] = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterGlass")); + transporter_center_color[0] = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterGlassColored")); + transporter_side[0] = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterVerticalGlass")); + transporter_side_color[0] = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterVerticalGlassColored")); + + transporter_center[1] = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/opaque/LogisticalTransporterGlass")); + transporter_center_color[1] = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/opaque/LogisticalTransporterGlassColored")); + transporter_side[1] = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/opaque/LogisticalTransporterVerticalGlass")); + transporter_side_color[1] = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/opaque/LogisticalTransporterVerticalGlassColored")); + } + + public static void clearCache() + { + for(TransmitterModel model : modelInstances) + { + model.modelCache.clear(); + model.itemCache = null; + } } } diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index d1c27eb34..949cef585 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -3,6 +3,7 @@ package mekanism.client.render.transmitter; import java.util.HashMap; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.client; import mekanism.client.model.ModelTransporterBox; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; @@ -51,9 +52,13 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase 0) + if(fluidEject && getReactor() != null && getReactor().getSteamTank().getFluid() != null) { IFluidTank tank = getReactor().getSteamTank(); for(EnumFacing side : EnumFacing.values()) { TileEntity tile = Coord4D.get(this).offset(side).getTileEntity(worldObj); - - if(tile != null && !(tile instanceof TileEntityBoilerValve) && CapabilityUtils.hasCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite())) + + if(tile != null && !(tile instanceof TileEntityReactorPort) && CapabilityUtils.hasCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite())) { IFluidHandler handler = CapabilityUtils.getCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite()); diff --git a/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json b/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json index 08654e11e..5a9e30341 100644 --- a/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json +++ b/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/DiversionTransporterVertical", - "#center": "mekanism:blocks/models/multipart/DiversionTransporter" + "#center": "mekanism:blocks/models/multipart/DiversionTransporter", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/DiversionTransporterVertical", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/DiversionTransporter" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json index f99e7e694..9107d917d 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalAdvanced", - "#center": "mekanism:blocks/models/multipart/LogisticalTransporterAdvanced" + "#center": "mekanism:blocks/models/multipart/LogisticalTransporterAdvanced", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/LogisticalTransporterVerticalAdvanced", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/LogisticalTransporterAdvanced" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json index e0cd7bd25..b660d1f70 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalBasic", - "#center": "mekanism:blocks/models/multipart/LogisticalTransporterBasic" + "#center": "mekanism:blocks/models/multipart/LogisticalTransporterBasic", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/LogisticalTransporterVerticalBasic", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/LogisticalTransporterBasic" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json index 7893e6b04..31368496b 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalElite", - "#center": "mekanism:blocks/models/multipart/LogisticalTransporterElite" + "#center": "mekanism:blocks/models/multipart/LogisticalTransporterElite", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/LogisticalTransporterVerticalElite", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/LogisticalTransporterElite" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json index 71a77c6ec..e8f4aa1f5 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalUltimate", - "#center": "mekanism:blocks/models/multipart/LogisticalTransporterUltimate" + "#center": "mekanism:blocks/models/multipart/LogisticalTransporterUltimate", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/LogisticalTransporterVerticalUltimate", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/LogisticalTransporterUltimate" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json index 02d021f62..4f194afcf 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalAdvanced", - "#center": "mekanism:blocks/models/multipart/MechanicalPipeAdvanced" + "#center": "mekanism:blocks/models/multipart/MechanicalPipeAdvanced", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/MechanicalPipeVerticalAdvanced", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/MechanicalPipeAdvanced" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json index 07d723e0e..6a3e15183 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalBasic", - "#center": "mekanism:blocks/models/multipart/MechanicalPipeBasic" + "#center": "mekanism:blocks/models/multipart/MechanicalPipeBasic", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/MechanicalPipeVerticalBasic", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/MechanicalPipeBasic" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json index 10c7b5d9a..3a2161152 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalElite", - "#center": "mekanism:blocks/models/multipart/MechanicalPipeElite" + "#center": "mekanism:blocks/models/multipart/MechanicalPipeElite", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/MechanicalPipeVerticalElite", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/MechanicalPipeElite" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json index 18101524f..b0a53eb5d 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalUltimate", - "#center": "mekanism:blocks/models/multipart/MechanicalPipeUltimate" + "#center": "mekanism:blocks/models/multipart/MechanicalPipeUltimate", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/MechanicalPipeVerticalUltimate", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/MechanicalPipeUltimate" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json index 661851c03..2bd6cd96a 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalAdvanced", - "#center": "mekanism:blocks/models/multipart/PressurizedTubeAdvanced" + "#center": "mekanism:blocks/models/multipart/PressurizedTubeAdvanced", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/PressurizedTubeVerticalAdvanced", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/PressurizedTubeAdvanced" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json index 085b9d61f..8e3e7bf44 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalBasic", - "#center": "mekanism:blocks/models/multipart/PressurizedTubeBasic" + "#center": "mekanism:blocks/models/multipart/PressurizedTubeBasic", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/PressurizedTubeVerticalBasic", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/PressurizedTubeBasic" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json index 0ced8a8af..9c0dbc9fc 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalElite", - "#center": "mekanism:blocks/models/multipart/PressurizedTubeElite" + "#center": "mekanism:blocks/models/multipart/PressurizedTubeElite", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/PressurizedTubeVerticalElite", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/PressurizedTubeElite" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json index 37e5a9dc1..ebb7080cc 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalUltimate", - "#center": "mekanism:blocks/models/multipart/PressurizedTubeUltimate" + "#center": "mekanism:blocks/models/multipart/PressurizedTubeUltimate", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/PressurizedTubeVerticalUltimate", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/PressurizedTubeUltimate" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json b/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json index 634a42b06..c6d94cbcf 100644 --- a/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json +++ b/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_large.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/RestrictiveTransporterVertical", - "#center": "mekanism:blocks/models/multipart/RestrictiveTransporter" + "#center": "mekanism:blocks/models/multipart/RestrictiveTransporter", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/RestrictiveTransporterVertical", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/RestrictiveTransporter" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json index 9ad53f079..008b70726 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalAdvanced", - "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorAdvanced" + "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorAdvanced", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/ThermodynamicConductorVerticalAdvanced", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/ThermodynamicConductorAdvanced" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json index 5de7b5510..b7d33f9f7 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalBasic", - "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorBasic" + "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorBasic", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/ThermodynamicConductorVerticalBasic", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/ThermodynamicConductorBasic" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json index c1544f457..737219bd2 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalElite", - "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorElite" + "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorElite", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/ThermodynamicConductorVerticalElite", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/ThermodynamicConductorElite" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json index f9b79a7a9..8aa617d39 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalUltimate", - "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorUltimate" + "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorUltimate", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/ThermodynamicConductorVerticalUltimate", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/ThermodynamicConductorUltimate" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json index 6c563d120..834da1bba 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalAdvanced", - "#center": "mekanism:blocks/models/multipart/UniversalCableAdvanced" + "#center": "mekanism:blocks/models/multipart/UniversalCableAdvanced", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/UniversalCableVerticalAdvanced", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/UniversalCableAdvanced" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json index 677ebd7cf..dc333bd01 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalBasic", - "#center": "mekanism:blocks/models/multipart/UniversalCableBasic" + "#center": "mekanism:blocks/models/multipart/UniversalCableBasic", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/UniversalCableVerticalBasic", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/UniversalCableBasic" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json index f1ea1ccb8..47a0415d2 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalElite", - "#center": "mekanism:blocks/models/multipart/UniversalCableElite" + "#center": "mekanism:blocks/models/multipart/UniversalCableElite", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/UniversalCableVerticalElite", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/UniversalCableElite" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json index 27040acab..0aadfd0bb 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json @@ -4,7 +4,9 @@ "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalUltimate", - "#center": "mekanism:blocks/models/multipart/UniversalCableUltimate" + "#center": "mekanism:blocks/models/multipart/UniversalCableUltimate", + "#side_opaque": "mekanism:blocks/models/multipart/opaque/UniversalCableVerticalUltimate", + "#center_opaque": "mekanism:blocks/models/multipart/opaque/UniversalCableUltimate" }, "custom": { "flip-v": true diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_large.mtl b/src/main/resources/assets/mekanism/models/block/transmitter_large.mtl index cbd6117df..8daaa5fff 100644 --- a/src/main/resources/assets/mekanism/models/block/transmitter_large.mtl +++ b/src/main/resources/assets/mekanism/models/block/transmitter_large.mtl @@ -1,5 +1,5 @@ # Blender MTL File: 'transmitter_large.blend' -# Material Count: 2 +# Material Count: 4 newmtl None Ka 0.000000 0.000000 0.000000 @@ -12,3 +12,15 @@ Ka 0.000000 0.000000 0.000000 Kd 0.8 0.8 0.8 d 1 map_Kd #center + +newmtl None_Opaque +Ka 0.000000 0.000000 0.000000 +Kd 0.8 0.8 0.8 +d 1 +map_Kd #side_opaque + +newmtl None_Center_Opaque +Ka 0.000000 0.000000 0.000000 +Kd 0.8 0.8 0.8 +d 1 +map_Kd #center_opaque diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_small.mtl b/src/main/resources/assets/mekanism/models/block/transmitter_small.mtl index 996535e70..a141d7c33 100644 --- a/src/main/resources/assets/mekanism/models/block/transmitter_small.mtl +++ b/src/main/resources/assets/mekanism/models/block/transmitter_small.mtl @@ -1,5 +1,5 @@ # Blender MTL File: 'transmitter_small.blend' -# Material Count: 2 +# Material Count: 4 newmtl CentreMaterial Ka 1.000000 1.000000 1.000000 @@ -12,3 +12,15 @@ Ka 0.000000 0.000000 0.000000 Kd 0.8 0.8 0.8 d 1 map_Kd #side + +newmtl CentreMaterial_Opaque +Ka 1.000000 1.000000 1.000000 +Kd 0.8 0.8 0.8 +d 1 +map_Kd #center_opaque + +newmtl None_Opaque +Ka 0.000000 0.000000 0.000000 +Kd 0.8 0.8 0.8 +d 1 +map_Kd #side_opaque diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterHorizontal.png deleted file mode 100644 index 89ea9005e..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterHorizontal.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/DiversionTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/DiversionTransporter.png new file mode 100644 index 000000000..f5303866a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/DiversionTransporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/DiversionTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/DiversionTransporterVertical.png new file mode 100644 index 000000000..8e9d68151 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/DiversionTransporterVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterAdvanced.png new file mode 100644 index 000000000..a1b6d79f8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterBasic.png new file mode 100644 index 000000000..525e2baa9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterElite.png new file mode 100644 index 000000000..056e14f9b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterGlass.png new file mode 100644 index 000000000..7d24d36fb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterGlassColored.png new file mode 100644 index 000000000..d9495a01e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterGlassColored.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterUltimate.png new file mode 100644 index 000000000..577806f9d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalAdvanced.png new file mode 100644 index 000000000..158c1e1fe Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalBasic.png new file mode 100644 index 000000000..45bdd474e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalElite.png new file mode 100644 index 000000000..72e69e959 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalGlass.png new file mode 100644 index 000000000..90ea0180b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalGlassColored.png new file mode 100644 index 000000000..0a7d53512 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalGlassColored.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalUltimate.png new file mode 100644 index 000000000..a38ca108f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/LogisticalTransporterVerticalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeAdvanced.png new file mode 100644 index 000000000..c7e110d61 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeBasic.png new file mode 100644 index 000000000..384adb41b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeElite.png new file mode 100644 index 000000000..dc08dc89e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeUltimate.png new file mode 100644 index 000000000..453b778af Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalAdvanced.png new file mode 100644 index 000000000..cf7227df7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalBasic.png new file mode 100644 index 000000000..81b9b7ef6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalElite.png new file mode 100644 index 000000000..1a7c7e2d7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalUltimate.png new file mode 100644 index 000000000..692a5a51e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/MechanicalPipeVerticalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeAdvanced.png new file mode 100644 index 000000000..45e7a8195 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeBasic.png new file mode 100644 index 000000000..2b281deb0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeElite.png new file mode 100644 index 000000000..4ef95050c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeUltimate.png new file mode 100644 index 000000000..7508a7f7a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalAdvanced.png new file mode 100644 index 000000000..44497054a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalBasic.png new file mode 100644 index 000000000..c24f4709b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalElite.png new file mode 100644 index 000000000..ffde48b01 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalUltimate.png new file mode 100644 index 000000000..5cd7e1c8f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/PressurizedTubeVerticalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/RestrictiveTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/RestrictiveTransporter.png new file mode 100644 index 000000000..496338a45 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/RestrictiveTransporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/RestrictiveTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/RestrictiveTransporterVertical.png new file mode 100644 index 000000000..a611001ca Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/RestrictiveTransporterVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorAdvanced.png new file mode 100644 index 000000000..892815da8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorBasic.png new file mode 100644 index 000000000..9d9437527 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorElite.png new file mode 100644 index 000000000..ca3d14994 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorUltimate.png new file mode 100644 index 000000000..6e77a0a11 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalAdvanced.png new file mode 100644 index 000000000..ca42645b9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalBasic.png new file mode 100644 index 000000000..f37c9ed06 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalElite.png new file mode 100644 index 000000000..650d217eb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalUltimate.png new file mode 100644 index 000000000..1a082971f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/ThermodynamicConductorVerticalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableAdvanced.png new file mode 100644 index 000000000..d45989bf9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableBasic.png new file mode 100644 index 000000000..f9b8e06c4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableElite.png new file mode 100644 index 000000000..4470d888d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableUltimate.png new file mode 100644 index 000000000..4c39e9863 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalAdvanced.png new file mode 100644 index 000000000..aee09b335 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalBasic.png new file mode 100644 index 000000000..9a3aba9ab Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalElite.png new file mode 100644 index 000000000..83d7856cd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalUltimate.png new file mode 100644 index 000000000..f91f28830 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/UniversalCableVerticalUltimate.png differ