Fixed random client crashes
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<bytecodeTargetLevel target="17" />
|
<bytecodeTargetLevel target="18" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
|
||||||
</project>
|
</project>
|
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 242 B |
After Width: | Height: | Size: 163 B |
After Width: | Height: | Size: 1017 B |
After Width: | Height: | Size: 17 KiB |
After Width: | Height: | Size: 119 B |
After Width: | Height: | Size: 386 B |
After Width: | Height: | Size: 7.1 KiB |
After Width: | Height: | Size: 511 B |
After Width: | Height: | Size: 562 B |
After Width: | Height: | Size: 391 B |
After Width: | Height: | Size: 17 KiB |
After Width: | Height: | Size: 15 KiB |
After Width: | Height: | Size: 669 B |
After Width: | Height: | Size: 47 KiB |
After Width: | Height: | Size: 12 KiB |
After Width: | Height: | Size: 287 B |
After Width: | Height: | Size: 3.4 KiB |
|
@ -665,6 +665,7 @@ public class EaglerAdapterGL30 extends EaglerAdapterImpl2 {
|
||||||
if (matModelPointer > 0) {
|
if (matModelPointer > 0) {
|
||||||
--matModelPointer;
|
--matModelPointer;
|
||||||
} else {
|
} else {
|
||||||
|
System.out.println(new Exception().getStackTrace()[1].getClassName());
|
||||||
System.err.println("modelview matrix stack underflow");
|
System.err.println("modelview matrix stack underflow");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package net.minecraft.src;
|
package net.minecraft.src;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import net.lax1dude.eaglercraft.EaglercraftRandom;
|
import net.lax1dude.eaglercraft.EaglercraftRandom;
|
||||||
|
@ -253,7 +252,53 @@ public abstract class BiomeGenBase
|
||||||
par1 = 1.0F;
|
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
|
* Provides the basic grass color based on the biome temperature and rainfall
|
||||||
*/
|
*/
|
||||||
public int getBiomeGrassColor()
|
public int getBiomeGrassColor() {
|
||||||
{
|
if(biomeID == 6) return 6975545;
|
||||||
double var1 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F);
|
double var1 = (double) MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F);
|
||||||
double var3 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F);
|
double var3 = (double) MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F);
|
||||||
return ColorizerGrass.getGrassColor(var1, var3);
|
return ColorizerGrass.getGrassColor(var1, var3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides the basic foliage color based on the biome temperature and rainfall
|
* Provides the basic foliage color based on the biome temperature and rainfall
|
||||||
*/
|
*/
|
||||||
public int getBiomeFoliageColor()
|
public int getBiomeFoliageColor() {
|
||||||
{
|
if(biomeID == 6) return 6975545;
|
||||||
double var1 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F);
|
double var1 = (double) MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F);
|
||||||
double var3 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F);
|
double var3 = (double) MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F);
|
||||||
return ColorizerFoliage.getFoliageColor(var1, var3);
|
return ColorizerFoliage.getFoliageColor(var1, var3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,9 +110,9 @@ public class WorldRenderer
|
||||||
this.posZMinus = par3 - this.posZClip;
|
this.posZMinus = par3 - this.posZClip;
|
||||||
float var4 = 6.0F;
|
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));
|
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);
|
//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)));
|
//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.glEndList();
|
||||||
this.markDirty();
|
this.markDirty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -175,12 +175,12 @@ public class WorldRenderer
|
||||||
{
|
{
|
||||||
var14 = true;
|
var14 = true;
|
||||||
EaglerAdapter.glNewList(this.glRenderList + var11, EaglerAdapter.GL_COMPILE);
|
EaglerAdapter.glNewList(this.glRenderList + var11, EaglerAdapter.GL_COMPILE);
|
||||||
EaglerAdapter.glPushMatrix();
|
/*EaglerAdapter.glPushMatrix();
|
||||||
this.setupGLTranslation();
|
this.setupGLTranslation();
|
||||||
float var19 = 1.000001F;
|
float var19 = 1.000001F;
|
||||||
EaglerAdapter.glTranslatef(-8.0F, -8.0F, -8.0F);
|
EaglerAdapter.glTranslatef(-8.0F, -8.0F, -8.0F);
|
||||||
EaglerAdapter.glScalef(var19, var19, var19);
|
EaglerAdapter.glScalef(var19, var19, var19);
|
||||||
EaglerAdapter.glTranslatef(8.0F, 8.0F, 8.0F);
|
EaglerAdapter.glTranslatef(8.0F, 8.0F, 8.0F);*/
|
||||||
tessellator.startDrawingQuads();
|
tessellator.startDrawingQuads();
|
||||||
tessellator.setTranslation((double)(-this.posX), (double)(-this.posY), (double)(-this.posZ));
|
tessellator.setTranslation((double)(-this.posX), (double)(-this.posY), (double)(-this.posZ));
|
||||||
}
|
}
|
||||||
|
@ -218,7 +218,7 @@ public class WorldRenderer
|
||||||
if (var14)
|
if (var14)
|
||||||
{
|
{
|
||||||
this.bytesDrawn += tessellator.draw();
|
this.bytesDrawn += tessellator.draw();
|
||||||
EaglerAdapter.glPopMatrix();
|
//EaglerAdapter.glPopMatrix();
|
||||||
EaglerAdapter.glEndList();
|
EaglerAdapter.glEndList();
|
||||||
tessellator.setTranslation(0.0D, 0.0D, 0.0D);
|
tessellator.setTranslation(0.0D, 0.0D, 0.0D);
|
||||||
}
|
}
|
||||||
|
|