Merge branch '1.9.4' into 1.10

* 1.9.4:
  Completed Opaque Transmitter implementation. Yay!
  Fix Reactor Ports, again
  Bump up Electrolytic Separator gas output
  Fixed Reactor Port crash
  compleatly replaced files
  removed the word "opaque" in all image names
  added boolean opaque
  added boolean opaque
  loaded config before Tier.init()
  added new opaque images
This commit is contained in:
aidancbrady committed 2016-07-19 15:19:37 -04:00
commit aa52a53537
86 files changed
+189 -67

No files matched your search

@@ -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
@@ -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())
{
@@ -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());
@@ -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<TransmitterModel> modelInstances = new HashSet<TransmitterModel>();
private Map<Integer, List<BakedQuad>> modelCache = new HashMap<Integer, List<BakedQuad>>();
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<String, TextureAtlasSprite> textures, HashMap<TransformType, Matrix4f> 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;
}
}
}
@@ -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<PartLogis
@Override
public void renderMultipartAt(PartLogisticalTransporter transporter, double x, double y, double z, float partialTick, int destroyStage)
{
if(client.opaqueTransmitters)
{
return;
}
GL11.glPushMatrix();
//possibly TODO
entityItem.setNoDespawn();
entityItem.hoverStart = 0;
@@ -2,6 +2,7 @@ package mekanism.client.render.transmitter;
import java.util.HashMap;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.FluidType;
@@ -34,6 +35,11 @@ public class RenderMechanicalPipe extends RenderTransmitterBase<PartMechanicalPi
@Override
public void renderMultipartAt(PartMechanicalPipe pipe, double x, double y, double z, float partialTick, int destroyStage)
{
if(client.opaqueTransmitters)
{
return;
}
float targetScale;
if(pipe.getTransmitter().hasTransmitterNetwork())
@@ -1,5 +1,6 @@
package mekanism.client.render.transmitter;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.ColourRGBA;
import mekanism.common.multipart.PartPressurizedTube;
@@ -19,7 +20,7 @@ public class RenderPressurizedTube extends RenderTransmitterBase<PartPressurized
@Override
public void renderMultipartAt(PartPressurizedTube tube, double x, double y, double z, float partialTick, int destroyStage)
{
if(!tube.getTransmitter().hasTransmitterNetwork() || tube.getTransmitter().getTransmitterNetwork().refGas == null || tube.getTransmitter().getTransmitterNetwork().gasScale == 0)
if(client.opaqueTransmitters || !tube.getTransmitter().hasTransmitterNetwork() || tube.getTransmitter().getTransmitterNetwork().refGas == null || tube.getTransmitter().getTransmitterNetwork().gasScale == 0)
{
return;
}
@@ -1,5 +1,6 @@
package mekanism.client.render.transmitter;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.ColourTemperature;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.multipart.PartThermodynamicConductor;
@@ -19,6 +20,11 @@ public class RenderThermodynamicConductor extends RenderTransmitterBase<PartTher
@Override
public void renderMultipartAt(PartThermodynamicConductor transmitter, double x, double y, double z, float partialTick, int destroyStage)
{
if(client.opaqueTransmitters)
{
return;
}
push();
Tessellator tessellator = Tessellator.getInstance();
VertexBuffer worldRenderer = tessellator.getBuffer();
@@ -20,7 +20,7 @@ public class RenderUniversalCable extends RenderTransmitterBase<PartUniversalCab
@Override
public void renderMultipartAt(PartUniversalCable cable, double x, double y, double z, float partialTick, int destroyStage)
{
if(!client.fancyUniversalCableRender || cable.currentPower == 0)
if(client.opaqueTransmitters || cable.currentPower == 0)
{
return;
}
+4 -4
View File
@@ -1264,14 +1264,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!");
@@ -6,6 +6,7 @@ import java.util.Collection;
import java.util.HashSet;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.client;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasNetwork;
import mekanism.api.gas.GasRegistry;
@@ -66,7 +67,13 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
network.updateCapacity();
}
}
else if(message.packetType == PacketType.ENERGY)
if(client.opaqueTransmitters || message.coord4D == null || player == null)
{
return;
}
if(message.packetType == PacketType.ENERGY)
{
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
@@ -74,7 +74,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
public GasTank rightTank = new GasTank(MAX_GAS);
/** How fast this block can output gas. */
public int output = 256;
public int output = 512;
/** The type of gas this block is outputting. */
public GasMode dumpLeft = GasMode.IDLE;
@@ -22,7 +22,6 @@ import mekanism.common.base.FluidHandlerWrapper;
import mekanism.common.base.IFluidHandlerWrapper;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityBoilerValve;
import mekanism.common.util.CableUtils;
import mekanism.common.util.HeatUtils;
import mekanism.common.util.InventoryUtils;
@@ -96,15 +95,15 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
{
CableUtils.emit(this);
if(fluidEject && getReactor() != null && getReactor().getSteamTank().getFluidAmount() > 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());