Fix some bugs with sky rendering and add a color override boolean

Author: voidsong-dragonfly

src/main/java/zmaster587/advancedRocketry/client/render/planet/RenderSpaceSky.java

@@ -203,15 +203,14 @@ public void renderPlanet2(BufferBuilder buffer, DimensionProperties properties,
 
 				buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
 				mc.renderEngine.bindTexture(DimensionProperties.getAtmosphereLEOResource());
+				GlStateManager.color(atmColor[0], atmColor[1], atmColor[2], 0.5f);
 
 				double dist = -5D - 4*(planetOrbitalDistance)/200D;
 				double scalingMult = 1D - 0.9*(planetOrbitalDistance)/200D;
 
 				int maxAmt = 6;
 				float lng = (float) (Minecraft.getSystemTime()/100000d % 1);
 				for(int i = 0; i < maxAmt; i++) {
-					GlStateManager.color(0.05f*(maxAmt-i/6f), .4f*(i/6f), 1f, 0.4f);
-
 					//IDK it looks pretty
 					Xoffset = lng*(i-(maxAmt/4f));
 					float Yoffset = -lng*i;
@@ -235,7 +234,7 @@ public void renderPlanet2(BufferBuilder buffer, DimensionProperties properties,
 				GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 
 				buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
-				GlStateManager.color(0.5f,0.5f,1, 0.08f);
+				GlStateManager.color(atmColor[0], atmColor[1], atmColor[2], 0.08f);
 
 
 				for(int i = 0; i < 5 ; i++) {

src/main/java/zmaster587/advancedRocketry/dimension/DimensionProperties.java

@@ -222,6 +222,7 @@ public ResourceLocation getResourceLEO() {
 	public float gravitationalMultiplier;
 	public int orbitalDist;
 	public boolean hasOxygen;
+	public boolean colorOverride;
 	private int originalAtmosphereDensity;
 	//Used in solar panels
 	public double peakInsolationMultiplier;
@@ -315,6 +316,7 @@ public DimensionProperties(int id) {
 		isNativeDimension = true;
 		skyRenderOverride = false;
 		hasOxygen = true;
+		colorOverride = false;
 		peakInsolationMultiplier = -1;
 		peakInsolationMultiplierWithoutAtmosphere = -1;
 		isGasGiant = false;
@@ -1517,6 +1519,7 @@ public void readFromNBT(NBTTagCompound nbt) {
 		rotationalPhi = nbt.getDouble("rotationalPhi");
 		isRetrograde = nbt.getBoolean("isRetrograde");
 		hasOxygen = nbt.getBoolean("hasOxygen");
+		colorOverride = nbt.getBoolean("colorOverride");
 		atmosphereDensity = nbt.getInteger("atmosphereDensity");
 
 		if(nbt.hasKey("originalAtmosphereDensity"))
@@ -1742,6 +1745,7 @@ public void writeToNBT(NBTTagCompound nbt) {
 		nbt.setDouble("rotationalPhi", rotationalPhi);
 		nbt.setBoolean("isRetrograde", isRetrograde);
 		nbt.setBoolean("hasOxygen", hasOxygen);
+		nbt.setBoolean("colorOverride", colorOverride);
 		nbt.setInteger("atmosphereDensity", atmosphereDensity);
 		nbt.setInteger("originalAtmosphereDensity", originalAtmosphereDensity);
  		nbt.setDouble("peakInsolationMultiplier", peakInsolationMultiplier);

src/main/java/zmaster587/advancedRocketry/util/XMLPlanetLoader.java

@@ -94,6 +94,7 @@ public class XMLPlanetLoader {
 	private static final String ELEMENT_VOLCANO_MULTIPLIER = "volcanoFrequencyMultiplier";
 	private static final String ELEMENT_GEODE_MULTIPLIER = "geodefrequencyMultiplier";
 	private static final String ELEMENT_CAN_DECORATE = "hasShading";
+	private static final String ELEMENT_COLOR_OVERRIDE = "hasColorOverride";
 	private static final String ELEMENT_SKYOVERRIDE = "skyRenderOverride";
 	private static final String ATTR_WEIGHT = "weight";
 	private static final String ATTR_GROUPMIN = "groupMin";
@@ -296,6 +297,8 @@ else if(colors.length == 1) {
 			}
 			else if(planetPropertyNode.getNodeName().equalsIgnoreCase(ELEMENT_HASOXYGEN))
 				properties.hasOxygen = Boolean.parseBoolean(planetPropertyNode.getTextContent());
+			else if(planetPropertyNode.getNodeName().equalsIgnoreCase(ELEMENT_COLOR_OVERRIDE))
+				properties.hasOxygen = Boolean.parseBoolean(planetPropertyNode.getTextContent());
 			else if(planetPropertyNode.getNodeName().equalsIgnoreCase(ELEMENT_SKYOVERRIDE))
 				properties.skyRenderOverride = Boolean.parseBoolean(planetPropertyNode.getTextContent());
 			else if(planetPropertyNode.getNodeName().equalsIgnoreCase(ELEMENT_ATMDENSITY)) {

src/main/java/zmaster587/advancedRocketry/world/provider/WorldProviderPlanet.java

@@ -301,7 +301,7 @@ public Vec3d getSkyColor(@Nonnull Entity cameraEntity, float partialTicks) {
 		if(vec == null)
 			return super.getSkyColor(cameraEntity, partialTicks);
 		else {
-			Vec3d skyColorVec = super.getSkyColor(cameraEntity, partialTicks);
+			Vec3d skyColorVec = getDimensionProperties(new BlockPos((int)cameraEntity.posX, 0, (int)cameraEntity.posZ)).colorOverride ? new Vec3d(1.0, 1.0, 1.0) : super.getSkyColor(cameraEntity, partialTicks);
 			return new Vec3d(vec[0] * skyColorVec.x, vec[1] * skyColorVec.y, vec[2] * skyColorVec.z) ;
 		}
 	}
@@ -310,11 +310,11 @@ public Vec3d getSkyColor(@Nonnull Entity cameraEntity, float partialTicks) {
 	@SideOnly(Side.CLIENT)
 	@Nonnull
 	public Vec3d getFogColor(float p_76562_1_, float p_76562_2_) {
+        Entity cameraEntity = Minecraft.getMinecraft().player;
 
-		Vec3d superVec = super.getFogColor(p_76562_1_, p_76562_2_);
-		//float multiplier = getAtmosphereDensityFromHeight(Minecraft.getMinecraft().renderViewEntity.posY);
+		Vec3d superVec = getDimensionProperties(new BlockPos((int)cameraEntity.posX, 0, (int)cameraEntity.posZ)).colorOverride ? new Vec3d(1.0, 1.0, 1.0) : super.getFogColor(p_76562_1_, p_76562_2_);
 
-		float[] vec = getDimensionProperties(new BlockPos((int)Minecraft.getMinecraft().player.posX, 0, (int)Minecraft.getMinecraft().player.posZ)).fogColor;
+		float[] vec = getDimensionProperties(new BlockPos((int)cameraEntity.posX, 0, (int)cameraEntity.posZ)).fogColor;
 		return new Vec3d(vec[0] * superVec.x, vec[1] * superVec.y, vec[2] * superVec.z);
 	}