From 400bf95a44e82b7c93bdfd2733a4a2e9ca7d426b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 16:56:30 -0600 Subject: [PATCH] Fix some lingering GoG worldgen and rendering issues. Closes #8. --- .../client/render/world/SkyblockSkyRenderer.java | 10 +++++----- .../vazkii/botania/common/world/WorldTypeSkyblock.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 3b8d2e949..8b0c2f039 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -80,7 +80,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.disableFog(); GlStateManager.disableAlpha(); GlStateManager.enableBlend(); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); RenderHelper.disableStandardItemLighting(); float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(partialTicks), partialTicks); float f7; @@ -137,7 +137,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { float lowA = Math.max(0F, effCelAng - 0.3F) * f6; float a = Math.max(0.1F, lowA); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, (a * 4) * (1F - insideVoid)); GlStateManager.rotate(90F, 0.5F, 0.5F, 0.0F); @@ -176,7 +176,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { f10 = 20F; a = lowA; GlStateManager.pushMatrix(); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0); GlStateManager.translate(0F, -1F, 0F); GlStateManager.rotate(220F, 1F, 0F, 0F); GlStateManager.color(1F, 1F, 1F, a); @@ -237,7 +237,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { // === Rainbow GlStateManager.pushMatrix(); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); mc.renderEngine.bindTexture(textureRainbow); f10 = 10F; float effCelAng1 = celAng; @@ -280,7 +280,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.color(1F, 1F, 1F, 1F - insideVoid); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0); // === Sun GlStateManager.rotate(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index d3025a41c..34e7049bf 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -47,7 +47,7 @@ public class WorldTypeSkyblock extends WorldType { @Override public IChunkProvider getChunkGenerator(World world, String generatorOptions) { - return new ChunkProviderFlat(world, world.getSeed(), false, "2;1x0;"); + return new ChunkProviderFlat(world, world.getSeed(), false, "3;minecraft:air;"); } }