Merge pull request #3493 from chaos234/opaque

Opaque
This commit is contained in:
Aidan authored and GitHub committed 2016-07-19 13:41:53 -04:00
commit 640de3ef4c
54 files changed
+40 -20

No files matched your search

@@ -81,6 +81,7 @@ public class MekanismConfig
public static boolean renderCTM = true;
public static boolean enableAmbientLighting;
public static int ambientLightingLevel;
public static boolean opaque = false;
}
public static class machines
+4 -4
View File
@@ -1209,14 +1209,14 @@ public class Mekanism
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
//Register tier information
Tier.init();
File config = event.getSuggestedConfigurationFile();
//Set the mod's configuration
configuration = new Configuration(config);
//Register tier information
Tier.init();
if(config.getAbsolutePath().contains("voltz"))
{
logger.info("Detected Voltz in root directory - hello, fellow user!");
@@ -48,6 +48,7 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
public Tier.TransporterTier tier = Tier.TransporterTier.BASIC;
public static TransmitterIcons transporterIcons = new TransmitterIcons(8, 16);
private static boolean opaque = Mekanism.configuration.get("client", "opaque", false).getBoolean();
public int pullDelay = 0;
@@ -94,7 +95,7 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
@SideOnly(Side.CLIENT)
public void renderDynamic(Vector3 pos, float f, int pass)
{
if(pass == 0)
if(pass == 0 && !opaque)
{
RenderPartTransmitter.getInstance().renderContents(this, f, pos);
}
@@ -5,6 +5,7 @@ import java.util.Collection;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.common.FluidNetwork;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.PipeTier;
@@ -30,6 +31,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetwork> implements IFluidHandler
{
public static TransmitterIcons pipeIcons = new TransmitterIcons(4, 8);
private static boolean opaque = Mekanism.configuration.get("client", "opaque", false).getBoolean();
public float currentScale;
@@ -227,7 +229,7 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
@SideOnly(Side.CLIENT)
public void renderDynamic(Vector3 pos, float f, int pass)
{
if(pass == 0)
if(pass == 0 && !opaque)
{
RenderPartTransmitter.getInstance().renderContents(this, pos);
}
@@ -10,6 +10,7 @@ import mekanism.api.gas.GasTransmission;
import mekanism.api.gas.IGasHandler;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.TubeTier;
@@ -30,6 +31,7 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
public Tier.TubeTier tier = Tier.TubeTier.BASIC;
public static TransmitterIcons tubeIcons = new TransmitterIcons(4, 8);
private static boolean opaque = Mekanism.configuration.get("client", "opaque", false).getBoolean();
public float currentScale;
@@ -233,7 +235,7 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
@SideOnly(Side.CLIENT)
public void renderDynamic(Vector3 pos, float f, int pass)
{
if(pass == 0)
if(pass == 0 && !opaque)
{
RenderPartTransmitter.getInstance().renderContents(this, pos);
}
@@ -7,6 +7,7 @@ import mekanism.api.IHeatTransfer;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.common.HeatNetwork;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.ConductorTier;
@@ -28,7 +29,8 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
public Tier.ConductorTier tier;
public static TransmitterIcons conductorIcons = new TransmitterIcons(4, 8);
private static boolean opaque = Mekanism.configuration.get("client", "opaque", false).getBoolean();
public double temperature = 0;
public double clientTemperature = 0;
public double heatToAbsorb = 0;
@@ -71,10 +73,10 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
public static void registerIcons(IIconRegister register)
{
conductorIcons.registerCenterIcons(register, new String[] {"ThermodynamicConductorBasic", "ThermodynamicConductorAdvanced",
"ThermodynamicConductorElite", "ThermodynamicConductorUltimate"});
conductorIcons.registerSideIcons(register, new String[] {"ThermodynamicConductorVerticalBasic", "ThermodynamicConductorVerticalAdvanced", "ThermodynamicConductorVerticalElite", "ThermodynamicConductorVerticalUltimate",
"ThermodynamicConductorHorizontalBasic", "ThermodynamicConductorHorizontalAdvanced", "ThermodynamicConductorHorizontalElite", "ThermodynamicConductorHorizontalUltimate"});
conductorIcons.registerCenterIcons(register, new String[]{"ThermodynamicConductorBasic", "ThermodynamicConductorAdvanced",
"ThermodynamicConductorElite", "ThermodynamicConductorUltimate"});
conductorIcons.registerSideIcons(register, new String[]{"ThermodynamicConductorVerticalBasic", "ThermodynamicConductorVerticalAdvanced", "ThermodynamicConductorVerticalElite", "ThermodynamicConductorVerticalUltimate",
"ThermodynamicConductorHorizontalBasic", "ThermodynamicConductorHorizontalAdvanced", "ThermodynamicConductorHorizontalElite", "ThermodynamicConductorHorizontalUltimate"});
}
@Override
@@ -123,7 +125,7 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
@SideOnly(Side.CLIENT)
public void renderDynamic(Vector3 pos, float f, int pass)
{
if(pass == 0)
if(pass == 0 && !opaque)
{
RenderPartTransmitter.getInstance().renderContents(this, pos);
}
@@ -14,6 +14,7 @@ import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.common.EnergyNetwork;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.CableTier;
@@ -38,6 +39,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
public Tier.CableTier tier;
public static TransmitterIcons cableIcons = new TransmitterIcons(4, 8);
private static boolean opaque = Mekanism.configuration.get("client", "opaque", false).getBoolean();
public double currentPower = 0;
public double lastWrite = 0;
@@ -184,10 +186,10 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
public static void registerIcons(IIconRegister register)
{
cableIcons.registerCenterIcons(register, new String[] {"UniversalCableBasic", "UniversalCableAdvanced",
"UniversalCableElite", "UniversalCableUltimate"});
cableIcons.registerSideIcons(register, new String[] {"UniversalCableVerticalBasic", "UniversalCableVerticalAdvanced", "UniversalCableVerticalElite", "UniversalCableVerticalUltimate",
"UniversalCableHorizontalBasic", "UniversalCableHorizontalAdvanced", "UniversalCableHorizontalElite", "UniversalCableHorizontalUltimate"});
cableIcons.registerCenterIcons(register, new String[]{"UniversalCableBasic", "UniversalCableAdvanced",
"UniversalCableElite", "UniversalCableUltimate"});
cableIcons.registerSideIcons(register, new String[]{"UniversalCableVerticalBasic", "UniversalCableVerticalAdvanced", "UniversalCableVerticalElite", "UniversalCableVerticalUltimate",
"UniversalCableHorizontalBasic", "UniversalCableHorizontalAdvanced", "UniversalCableHorizontalElite", "UniversalCableHorizontalUltimate"});
}
@Override
@@ -230,7 +232,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
@SideOnly(Side.CLIENT)
public void renderDynamic(Vector3 pos, float frame, int pass)
{
if(pass == 0 && client.fancyUniversalCableRender)
if(pass == 0 && client.fancyUniversalCableRender && !opaque)
{
RenderPartTransmitter.getInstance().renderContents(this, pos);
}
@@ -1,5 +1,6 @@
package mekanism.common.multipart;
import mekanism.common.Mekanism;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
@@ -7,6 +8,7 @@ public class TransmitterIcons
{
private IIcon[] sideIcons;
private IIcon[] centerIcons;
private static boolean opaque = Mekanism.configuration.get("client", "opaque", false).getBoolean();
public TransmitterIcons(int numCentres, int numSides)
{
@@ -18,7 +20,11 @@ public class TransmitterIcons
{
for(int i = 0; i < centerIcons.length; i++)
{
centerIcons[i] = register.registerIcon("mekanism:models/" + filenames[i]);
if(!opaque) {
centerIcons[i] = register.registerIcon("mekanism:models/" + filenames[i]);
} else {
centerIcons[i] = register.registerIcon("mekanism:models/opaque/" + filenames[i]);
}
}
}
@@ -26,7 +32,11 @@ public class TransmitterIcons
{
for(int i = 0; i < sideIcons.length; i++)
{
sideIcons[i] = register.registerIcon("mekanism:models/" + filenames[i]);
if(!opaque) {
sideIcons[i] = register.registerIcon("mekanism:models/" + filenames[i]);
} else {
sideIcons[i] = register.registerIcon("mekanism:models/opaque/" + filenames[i]);
}
}
}