diff --git a/codechicken/lib/render/CCRenderState.java b/codechicken/lib/render/CCRenderState.java index 85d99ad..d8a92b0 100644 --- a/codechicken/lib/render/CCRenderState.java +++ b/codechicken/lib/render/CCRenderState.java @@ -1,5 +1,6 @@ package codechicken.lib.render; +import codechicken.lib.colour.ColourRGBA; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; @@ -137,4 +138,9 @@ public class CCRenderState { OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, brightness&0xFFFF, brightness>>>16); } + + public static void glColour() + { + new ColourRGBA(colour).glColour(); + } } diff --git a/codechicken/lib/render/RenderUtils.java b/codechicken/lib/render/RenderUtils.java index da37e99..0ccc668 100644 --- a/codechicken/lib/render/RenderUtils.java +++ b/codechicken/lib/render/RenderUtils.java @@ -296,7 +296,7 @@ public class RenderUtils if(larger) GL11.glScaled(d, d, d); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glColor4f(1, 1, 1, 1); entityItem.setEntityItemStack(item); uniformRenderItem.doRenderItem(entityItem, 0, larger ? 0.09 : 0.06, 0, 0, 0); diff --git a/codechicken/lib/world/WorldExtensionManager.java b/codechicken/lib/world/WorldExtensionManager.java index 4f41627..95d5651 100644 --- a/codechicken/lib/world/WorldExtensionManager.java +++ b/codechicken/lib/world/WorldExtensionManager.java @@ -90,7 +90,9 @@ public class WorldExtensionManager @ForgeSubscribe public void onWorldUnLoad(WorldEvent.Unload event) { - WorldExtensionManager.onWorldUnload(event.world); + if(worldMap.containsKey(event.world))//because force closing unloads a world twice + for(WorldExtension extension : worldMap.remove(event.world)) + extension.unload(); } @ForgeSubscribe @@ -217,12 +219,6 @@ public class WorldExtensionManager extension.load(); } - public static void onWorldUnload(World world) - { - for(WorldExtension extension : worldMap.remove(world)) - extension.unload(); - } - private static void createChunkExtension(World world, Chunk chunk) { WorldExtension[] extensions = worldMap.get(world);