diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b589d56..fcb19bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 18ad7e3..8bddb52 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index 6dc8500..de95340 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/lwjgl-rundir/resources/misc/beacon.png b/lwjgl-rundir/resources/misc/beacon.png new file mode 100644 index 0000000..4b298c5 Binary files /dev/null and b/lwjgl-rundir/resources/misc/beacon.png differ diff --git a/lwjgl-rundir/resources/misc/beam.png b/lwjgl-rundir/resources/misc/beam.png new file mode 100644 index 0000000..2074211 Binary files /dev/null and b/lwjgl-rundir/resources/misc/beam.png differ diff --git a/lwjgl-rundir/resources/misc/dial.png b/lwjgl-rundir/resources/misc/dial.png new file mode 100644 index 0000000..56a4c01 Binary files /dev/null and b/lwjgl-rundir/resources/misc/dial.png differ diff --git a/lwjgl-rundir/resources/misc/explosion.png b/lwjgl-rundir/resources/misc/explosion.png new file mode 100644 index 0000000..3a368d6 Binary files /dev/null and b/lwjgl-rundir/resources/misc/explosion.png differ diff --git a/lwjgl-rundir/resources/misc/foliagecolor.png b/lwjgl-rundir/resources/misc/foliagecolor.png new file mode 100644 index 0000000..732f607 Binary files /dev/null and b/lwjgl-rundir/resources/misc/foliagecolor.png differ diff --git a/lwjgl-rundir/resources/misc/footprint.png b/lwjgl-rundir/resources/misc/footprint.png new file mode 100644 index 0000000..ebc17f6 Binary files /dev/null and b/lwjgl-rundir/resources/misc/footprint.png differ diff --git a/lwjgl-rundir/resources/misc/glint.png b/lwjgl-rundir/resources/misc/glint.png new file mode 100644 index 0000000..9e3782a Binary files /dev/null and b/lwjgl-rundir/resources/misc/glint.png differ diff --git a/lwjgl-rundir/resources/misc/grasscolor.png b/lwjgl-rundir/resources/misc/grasscolor.png new file mode 100644 index 0000000..6da0768 Binary files /dev/null and b/lwjgl-rundir/resources/misc/grasscolor.png differ diff --git a/lwjgl-rundir/resources/misc/laxcape.png b/lwjgl-rundir/resources/misc/laxcape.png new file mode 100644 index 0000000..78ff899 Binary files /dev/null and b/lwjgl-rundir/resources/misc/laxcape.png differ diff --git a/lwjgl-rundir/resources/misc/mapbg.png b/lwjgl-rundir/resources/misc/mapbg.png new file mode 100644 index 0000000..38dbccc Binary files /dev/null and b/lwjgl-rundir/resources/misc/mapbg.png differ diff --git a/lwjgl-rundir/resources/misc/mapicons.png b/lwjgl-rundir/resources/misc/mapicons.png new file mode 100644 index 0000000..8039e2e Binary files /dev/null and b/lwjgl-rundir/resources/misc/mapicons.png differ diff --git a/lwjgl-rundir/resources/misc/particlefield.png b/lwjgl-rundir/resources/misc/particlefield.png new file mode 100644 index 0000000..cee51eb Binary files /dev/null and b/lwjgl-rundir/resources/misc/particlefield.png differ diff --git a/lwjgl-rundir/resources/misc/pumpkinblur.png b/lwjgl-rundir/resources/misc/pumpkinblur.png new file mode 100644 index 0000000..63a8184 Binary files /dev/null and b/lwjgl-rundir/resources/misc/pumpkinblur.png differ diff --git a/lwjgl-rundir/resources/misc/shadow.png b/lwjgl-rundir/resources/misc/shadow.png new file mode 100644 index 0000000..d0c39e0 Binary files /dev/null and b/lwjgl-rundir/resources/misc/shadow.png differ diff --git a/lwjgl-rundir/resources/misc/tunnel.png b/lwjgl-rundir/resources/misc/tunnel.png new file mode 100644 index 0000000..53833da Binary files /dev/null and b/lwjgl-rundir/resources/misc/tunnel.png differ diff --git a/lwjgl-rundir/resources/misc/vignette.png b/lwjgl-rundir/resources/misc/vignette.png new file mode 100644 index 0000000..5371fda Binary files /dev/null and b/lwjgl-rundir/resources/misc/vignette.png differ diff --git a/lwjgl-rundir/resources/misc/water.png b/lwjgl-rundir/resources/misc/water.png new file mode 100644 index 0000000..0671a75 Binary files /dev/null and b/lwjgl-rundir/resources/misc/water.png differ diff --git a/lwjgl-rundir/resources/misc/watercolor.png b/lwjgl-rundir/resources/misc/watercolor.png new file mode 100644 index 0000000..3c83008 Binary files /dev/null and b/lwjgl-rundir/resources/misc/watercolor.png differ diff --git a/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java b/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java index 91ff668..e1ddcd5 100644 --- a/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java +++ b/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java @@ -665,6 +665,7 @@ public class EaglerAdapterGL30 extends EaglerAdapterImpl2 { if (matModelPointer > 0) { --matModelPointer; } else { + System.out.println(new Exception().getStackTrace()[1].getClassName()); System.err.println("modelview matrix stack underflow"); } break; diff --git a/src/main/java/net/minecraft/src/BiomeGenBase.java b/src/main/java/net/minecraft/src/BiomeGenBase.java index 6948963..6569a12 100644 --- a/src/main/java/net/minecraft/src/BiomeGenBase.java +++ b/src/main/java/net/minecraft/src/BiomeGenBase.java @@ -1,6 +1,5 @@ package net.minecraft.src; -import java.awt.Color; import java.util.ArrayList; import java.util.List; import net.lax1dude.eaglercraft.EaglercraftRandom; @@ -253,7 +252,53 @@ public abstract class BiomeGenBase par1 = 1.0F; } - return Color.getHSBColor(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F).getRGB(); + return HSBtoRGB(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F); + } + + public static int HSBtoRGB(float hue, float saturation, float brightness) { + int r = 0, g = 0, b = 0; + if (saturation == 0) { + r = g = b = (int) (brightness * 255.0f + 0.5f); + } else { + float h = (hue - (float) Math.floor(hue)) * 6.0f; + float f = h - (float) Math.floor(h); + float p = brightness * (1.0f - saturation); + float q = brightness * (1.0f - saturation * f); + float t = brightness * (1.0f - (saturation * (1.0f - f))); + switch ((int) h) { + case 0: + r = (int) (brightness * 255.0f + 0.5f); + g = (int) (t * 255.0f + 0.5f); + b = (int) (p * 255.0f + 0.5f); + break; + case 1: + r = (int) (q * 255.0f + 0.5f); + g = (int) (brightness * 255.0f + 0.5f); + b = (int) (p * 255.0f + 0.5f); + break; + case 2: + r = (int) (p * 255.0f + 0.5f); + g = (int) (brightness * 255.0f + 0.5f); + b = (int) (t * 255.0f + 0.5f); + break; + case 3: + r = (int) (p * 255.0f + 0.5f); + g = (int) (q * 255.0f + 0.5f); + b = (int) (brightness * 255.0f + 0.5f); + break; + case 4: + r = (int) (t * 255.0f + 0.5f); + g = (int) (p * 255.0f + 0.5f); + b = (int) (brightness * 255.0f + 0.5f); + break; + case 5: + r = (int) (brightness * 255.0f + 0.5f); + g = (int) (p * 255.0f + 0.5f); + b = (int) (q * 255.0f + 0.5f); + break; + } + } + return 0xff000000 | (r << 16) | (g << 8) | (b << 0); } /** @@ -336,20 +381,20 @@ public abstract class BiomeGenBase /** * Provides the basic grass color based on the biome temperature and rainfall */ - public int getBiomeGrassColor() - { - double var1 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); - double var3 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); + public int getBiomeGrassColor() { + if(biomeID == 6) return 6975545; + double var1 = (double) MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); + double var3 = (double) MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); return ColorizerGrass.getGrassColor(var1, var3); } /** * Provides the basic foliage color based on the biome temperature and rainfall */ - public int getBiomeFoliageColor() - { - double var1 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); - double var3 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); + public int getBiomeFoliageColor() { + if(biomeID == 6) return 6975545; + double var1 = (double) MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F); + double var3 = (double) MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F); return ColorizerFoliage.getFoliageColor(var1, var3); } } diff --git a/src/main/java/net/minecraft/src/WorldRenderer.java b/src/main/java/net/minecraft/src/WorldRenderer.java index e1b2e0b..bd26545 100644 --- a/src/main/java/net/minecraft/src/WorldRenderer.java +++ b/src/main/java/net/minecraft/src/WorldRenderer.java @@ -110,9 +110,9 @@ public class WorldRenderer this.posZMinus = par3 - this.posZClip; float var4 = 6.0F; this.rendererBoundingBox = AxisAlignedBB.getBoundingBox((double)((float)par1 - var4), (double)((float)par2 - var4), (double)((float)par3 - var4), (double)((float)(par1 + 16) + var4), (double)((float)(par2 + 16) + var4), (double)((float)(par3 + 16) + var4)); - EaglerAdapter.glNewList(this.glRenderList + 2, EaglerAdapter.GL_COMPILE); - RenderItem.renderAABB(AxisAlignedBB.getAABBPool().getAABB((double)((float)this.posXClip - var4), (double)((float)this.posYClip - var4), (double)((float)this.posZClip - var4), (double)((float)(this.posXClip + 16) + var4), (double)((float)(this.posYClip + 16) + var4), (double)((float)(this.posZClip + 16) + var4))); - EaglerAdapter.glEndList(); + //EaglerAdapter.glNewList(this.glRenderList + 2, EaglerAdapter.GL_COMPILE); + //RenderItem.renderAABB(AxisAlignedBB.getAABBPool().getAABB((double)((float)this.posXClip - var4), (double)((float)this.posYClip - var4), (double)((float)this.posZClip - var4), (double)((float)(this.posXClip + 16) + var4), (double)((float)(this.posYClip + 16) + var4), (double)((float)(this.posZClip + 16) + var4))); + //EaglerAdapter.glEndList(); this.markDirty(); } } @@ -175,12 +175,12 @@ public class WorldRenderer { var14 = true; EaglerAdapter.glNewList(this.glRenderList + var11, EaglerAdapter.GL_COMPILE); - EaglerAdapter.glPushMatrix(); + /*EaglerAdapter.glPushMatrix(); this.setupGLTranslation(); float var19 = 1.000001F; EaglerAdapter.glTranslatef(-8.0F, -8.0F, -8.0F); EaglerAdapter.glScalef(var19, var19, var19); - EaglerAdapter.glTranslatef(8.0F, 8.0F, 8.0F); + EaglerAdapter.glTranslatef(8.0F, 8.0F, 8.0F);*/ tessellator.startDrawingQuads(); tessellator.setTranslation((double)(-this.posX), (double)(-this.posY), (double)(-this.posZ)); } @@ -218,7 +218,7 @@ public class WorldRenderer if (var14) { this.bytesDrawn += tessellator.draw(); - EaglerAdapter.glPopMatrix(); + //EaglerAdapter.glPopMatrix(); EaglerAdapter.glEndList(); tessellator.setTranslation(0.0D, 0.0D, 0.0D); }