catfoolyou
/
Project164
mirror of https://github.com/catfoolyou/Project164.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some things (kinda)

This commit is contained in:
catfoolyou 2025-02-27 16:48:35 -05:00
parent 12d79206b0
commit 0fd1510cbf
7 changed files with 91 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -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>

BIN
lwjgl-rundir/_eagstorage.g.dat
View File

Binary file not shown.

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

2
src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java
View File

@ -460,7 +460,7 @@ public class TextureTerrainMap implements IconRegister {
} }
public void refreshTextures() { public void refreshTextures() {
System.out.println("refreshing textures"); System.out.println("Refreshing textures");
for(TerrainIconV2 t : iconList) { for(TerrainIconV2 t : iconList) {
t.free(); t.free();
} }

160
src/main/java/net/minecraft/src/RenderBlocks.java
View File

@ -3776,19 +3776,17 @@ public class RenderBlocks
{ {
Tessellator var5 = Tessellator.instance; Tessellator var5 = Tessellator.instance;
int var6 = par1Block.colorMultiplier(this.blockAccess, par2, par3, par4); int var6 = par1Block.colorMultiplier(this.blockAccess, par2, par3, par4);
float var7 = (float)(var6 >> 16 & 255) / 255.0F; float var7 = (float) (var6 >> 16 & 255) / 255.0F;
float var8 = (float)(var6 >> 8 & 255) / 255.0F; float var8 = (float) (var6 >> 8 & 255) / 255.0F;
float var9 = (float)(var6 & 255) / 255.0F; float var9 = (float) (var6 & 255) / 255.0F;
boolean var10 = par1Block.shouldSideBeRendered(this.blockAccess, par2, par3 + 1, par4, 1); boolean var10 = par1Block.shouldSideBeRendered(this.blockAccess, par2, par3 + 1, par4, 1);
boolean var11 = par1Block.shouldSideBeRendered(this.blockAccess, par2, par3 - 1, par4, 0); boolean var11 = par1Block.shouldSideBeRendered(this.blockAccess, par2, par3 - 1, par4, 0);
boolean[] var12 = new boolean[] {par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4 - 1, 2), par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4 + 1, 3), par1Block.shouldSideBeRendered(this.blockAccess, par2 - 1, par3, par4, 4), par1Block.shouldSideBeRendered(this.blockAccess, par2 + 1, par3, par4, 5)}; boolean[] var12 = new boolean[] { par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4 - 1, 2), par1Block.shouldSideBeRendered(this.blockAccess, par2, par3, par4 + 1, 3),
par1Block.shouldSideBeRendered(this.blockAccess, par2 - 1, par3, par4, 4), par1Block.shouldSideBeRendered(this.blockAccess, par2 + 1, par3, par4, 5) };
if (!var10 && !var11 && !var12[0] && !var12[1] && !var12[2] && !var12[3]) if (!var10 && !var11 && !var12[0] && !var12[1] && !var12[2] && !var12[3]) {
{
return false; return false;
} } else {
else
{
boolean var13 = false; boolean var13 = false;
float var14 = 0.5F; float var14 = 0.5F;
float var15 = 1.0F; float var15 = 1.0F;
@ -3798,23 +3796,20 @@ public class RenderBlocks
double var20 = 1.0D; double var20 = 1.0D;
Material var22 = par1Block.blockMaterial; Material var22 = par1Block.blockMaterial;
int var23 = this.blockAccess.getBlockMetadata(par2, par3, par4); int var23 = this.blockAccess.getBlockMetadata(par2, par3, par4);
double var24 = (double)this.getFluidHeight(par2, par3, par4, var22); double var24 = (double) this.getFluidHeight(par2, par3, par4, var22);
double var26 = (double)this.getFluidHeight(par2, par3, par4 + 1, var22); double var26 = (double) this.getFluidHeight(par2, par3, par4 + 1, var22);
double var28 = (double)this.getFluidHeight(par2 + 1, par3, par4 + 1, var22); double var28 = (double) this.getFluidHeight(par2 + 1, par3, par4 + 1, var22);
double var30 = (double)this.getFluidHeight(par2 + 1, par3, par4, var22); double var30 = (double) this.getFluidHeight(par2 + 1, par3, par4, var22);
double var32 = 0.0010000000474974513D; double var32 = 0.0010000000474974513D;
float var52; float var52;
float var53; float var53;
float var54;
if (this.renderAllFaces || var10) if (this.renderAllFaces || var10) {
{
var13 = true; var13 = true;
Icon var34 = this.getBlockIconFromSideAndMetadata(par1Block, 1, var23); Icon var34 = this.getBlockIconFromSideAndMetadata(par1Block, 1, var23);
float var35 = (float)BlockFluid.getFlowDirection(this.blockAccess, par2, par3, par4, var22); float var35 = (float) BlockFluid.getFlowDirection(this.blockAccess, par2, par3, par4, var22);
if (var35 > -999.0F) if (var35 > -999.0F) {
{
var34 = this.getBlockIconFromSideAndMetadata(par1Block, 2, var23); var34 = this.getBlockIconFromSideAndMetadata(par1Block, 2, var23);
} }
@ -3831,79 +3826,68 @@ public class RenderBlocks
double var48; double var48;
double var50; double var50;
if (var35 < -999.0F) if (var35 < -999.0F) {
{ var36 = (double) var34.getInterpolatedU(0.0D);
var36 = (double)var34.getInterpolatedU(0.0D); var44 = (double) var34.getInterpolatedV(0.0D);
var44 = (double)var34.getInterpolatedV(0.0D);
var38 = var36; var38 = var36;
var46 = (double)var34.getInterpolatedV(16.0D); var46 = (double) var34.getInterpolatedV(16.0D);
var40 = (double)var34.getInterpolatedU(16.0D); var40 = (double) var34.getInterpolatedU(16.0D);
var48 = var46; var48 = var46;
var42 = var40; var42 = var40;
var50 = var44; var50 = var44;
} } else {
else
{
var52 = MathHelper.sin(var35) * 0.25F; var52 = MathHelper.sin(var35) * 0.25F;
var53 = MathHelper.cos(var35) * 0.25F; var53 = MathHelper.cos(var35) * 0.25F;
var54 = 8.0F; var36 = (double) var34.getInterpolatedU((double) (8.0F + (-var53 - var52) * 16.0F));
var36 = (double)var34.getInterpolatedU((double)(8.0F + (-var53 - var52) * 16.0F)); var44 = (double) var34.getInterpolatedV((double) (8.0F + (-var53 + var52) * 16.0F));
var44 = (double)var34.getInterpolatedV((double)(8.0F + (-var53 + var52) * 16.0F)); var38 = (double) var34.getInterpolatedU((double) (8.0F + (-var53 + var52) * 16.0F));
var38 = (double)var34.getInterpolatedU((double)(8.0F + (-var53 + var52) * 16.0F)); var46 = (double) var34.getInterpolatedV((double) (8.0F + (var53 + var52) * 16.0F));
var46 = (double)var34.getInterpolatedV((double)(8.0F + (var53 + var52) * 16.0F)); var40 = (double) var34.getInterpolatedU((double) (8.0F + (var53 + var52) * 16.0F));
var40 = (double)var34.getInterpolatedU((double)(8.0F + (var53 + var52) * 16.0F)); var48 = (double) var34.getInterpolatedV((double) (8.0F + (var53 - var52) * 16.0F));
var48 = (double)var34.getInterpolatedV((double)(8.0F + (var53 - var52) * 16.0F)); var42 = (double) var34.getInterpolatedU((double) (8.0F + (var53 - var52) * 16.0F));
var42 = (double)var34.getInterpolatedU((double)(8.0F + (var53 - var52) * 16.0F)); var50 = (double) var34.getInterpolatedV((double) (8.0F + (-var53 - var52) * 16.0F));
var50 = (double)var34.getInterpolatedV((double)(8.0F + (-var53 - var52) * 16.0F));
} }
var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4)); var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3, par4));
var52 = 1.0F; var52 = 1.0F;
var5.setColorOpaque_F(var15 * var52 * var7, var15 * var52 * var8, var15 * var52 * var9); var5.setColorOpaque_F(var15 * var52 * var7, var15 * var52 * var8, var15 * var52 * var9);
var5.addVertexWithUV((double)(par2 + 0), (double)par3 + var24, (double)(par4 + 0), var36, var44); var5.addVertexWithUV((double) (par2 + 0), (double) par3 + var24, (double) (par4 + 0), var36, var44);
var5.addVertexWithUV((double)(par2 + 0), (double)par3 + var26, (double)(par4 + 1), var38, var46); var5.addVertexWithUV((double) (par2 + 0), (double) par3 + var26, (double) (par4 + 1), var38, var46);
var5.addVertexWithUV((double)(par2 + 1), (double)par3 + var28, (double)(par4 + 1), var40, var48); var5.addVertexWithUV((double) (par2 + 1), (double) par3 + var28, (double) (par4 + 1), var40, var48);
var5.addVertexWithUV((double)(par2 + 1), (double)par3 + var30, (double)(par4 + 0), var42, var50); var5.addVertexWithUV((double) (par2 + 1), (double) par3 + var30, (double) (par4 + 0), var42, var50);
} }
if (this.renderAllFaces || var11) if (this.renderAllFaces || var11) {
{
var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4)); var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, par2, par3 - 1, par4));
float var57 = 1.0F; float var57 = 1.0F;
var5.setColorOpaque_F(var14 * var57, var14 * var57, var14 * var57); var5.setColorOpaque_F(var14 * var57, var14 * var57, var14 * var57);
this.renderFaceYNeg(par1Block, (double)par2, (double)par3 + var32, (double)par4, this.getBlockIconFromSide(par1Block, 0)); this.renderFaceYNeg(par1Block, (double) par2, (double) par3 + var32, (double) par4, this.getBlockIconFromSide(par1Block, 0));
var13 = true; var13 = true;
} }
for (int var59 = 0; var59 < 4; ++var59) for (int var59 = 0; var59 < 4; ++var59) {
{
int var58 = par2; int var58 = par2;
int var37 = par4; int var37 = par4;
if (var59 == 0) if (var59 == 0) {
{
var37 = par4 - 1; var37 = par4 - 1;
} }
if (var59 == 1) if (var59 == 1) {
{
++var37; ++var37;
} }
if (var59 == 2) if (var59 == 2) {
{
var58 = par2 - 1; var58 = par2 - 1;
} }
if (var59 == 3) if (var59 == 3) {
{
++var58; ++var58;
} }
Icon var60 = this.getBlockIconFromSideAndMetadata(par1Block, var59 + 2, var23); Icon var60 = this.getBlockIconFromSideAndMetadata(par1Block, var59 + 2, var23);
if (this.renderAllFaces || var12[var59]) if (this.renderAllFaces || var12[var59]) {
{
double var39; double var39;
double var41; double var41;
double var43; double var43;
@ -3911,66 +3895,56 @@ public class RenderBlocks
double var47; double var47;
double var49; double var49;
if (var59 == 0) if (var59 == 0) {
{
var39 = var24; var39 = var24;
var41 = var30; var41 = var30;
var43 = (double)par2; var43 = (double) par2;
var47 = (double)(par2 + 1); var47 = (double) (par2 + 1);
var45 = (double)par4 + var32; var45 = (double) par4 + var32;
var49 = (double)par4 + var32; var49 = (double) par4 + var32;
} } else if (var59 == 1) {
else if (var59 == 1)
{
var39 = var28; var39 = var28;
var41 = var26; var41 = var26;
var43 = (double)(par2 + 1); var43 = (double) (par2 + 1);
var47 = (double)par2; var47 = (double) par2;
var45 = (double)(par4 + 1) - var32; var45 = (double) (par4 + 1) - var32;
var49 = (double)(par4 + 1) - var32; var49 = (double) (par4 + 1) - var32;
} } else if (var59 == 2) {
else if (var59 == 2)
{
var39 = var26; var39 = var26;
var41 = var24; var41 = var24;
var43 = (double)par2 + var32; var43 = (double) par2 + var32;
var47 = (double)par2 + var32; var47 = (double) par2 + var32;
var45 = (double)(par4 + 1); var45 = (double) (par4 + 1);
var49 = (double)par4; var49 = (double) par4;
} } else {
else
{
var39 = var30; var39 = var30;
var41 = var28; var41 = var28;
var43 = (double)(par2 + 1) - var32; var43 = (double) (par2 + 1) - var32;
var47 = (double)(par2 + 1) - var32; var47 = (double) (par2 + 1) - var32;
var45 = (double)par4; var45 = (double) par4;
var49 = (double)(par4 + 1); var49 = (double) (par4 + 1);
} }
var13 = true; var13 = true;
float var51 = var60.getInterpolatedU(0.0D); float var51 = var60.getInterpolatedU(0.0D);
var52 = var60.getInterpolatedU(8.0D); var52 = var60.getInterpolatedU(8.0D);
var53 = var60.getInterpolatedV((1.0D - var39) * 16.0D * 0.5D); var53 = var60.getInterpolatedV((1.0D - var39) * 16.0D * 0.5D);
var54 = var60.getInterpolatedV((1.0D - var41) * 16.0D * 0.5D); float var54 = var60.getInterpolatedV((1.0D - var41) * 16.0D * 0.5D);
float var55 = var60.getInterpolatedV(8.0D); float var55 = var60.getInterpolatedV(8.0D);
var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, var58, par3, var37)); var5.setBrightness(par1Block.getMixedBrightnessForBlock(this.blockAccess, var58, par3, var37));
float var56 = 1.0F; float var56 = 1.0F;
if (var59 < 2) if (var59 < 2) {
{
var56 *= var16; var56 *= var16;
} } else {
else
{
var56 *= var17; var56 *= var17;
} }
var5.setColorOpaque_F(var15 * var56 * var7, var15 * var56 * var8, var15 * var56 * var9); var5.setColorOpaque_F(var15 * var56 * var7, var15 * var56 * var8, var15 * var56 * var9);
var5.addVertexWithUV(var43, (double)par3 + var39, var45, (double)var51, (double)var53); var5.addVertexWithUV(var43, (double) par3 + var39, var45, (double) var51, (double) var53);
var5.addVertexWithUV(var47, (double)par3 + var41, var49, (double)var52, (double)var54); var5.addVertexWithUV(var47, (double) par3 + var41, var49, (double) var52, (double) var54);
var5.addVertexWithUV(var47, (double)(par3 + 0), var49, (double)var52, (double)var55); var5.addVertexWithUV(var47, (double) (par3 + 0), var49, (double) var52, (double) var55);
var5.addVertexWithUV(var43, (double)(par3 + 0), var45, (double)var51, (double)var55); var5.addVertexWithUV(var43, (double) (par3 + 0), var45, (double) var51, (double) var55);
} }
} }

39
src/main/java/net/minecraft/src/RenderGlobal.java
View File

@ -1459,20 +1459,24 @@ public class RenderGlobal implements IWorldAccess
} }
} }
private static final TextureLocation tex_terrain = new TextureLocation("/terrain.png");
public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityPlayer par2EntityPlayer, float par3) public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityPlayer par2EntityPlayer, float par3)
{ {
double var4 = par2EntityPlayer.lastTickPosX + (par2EntityPlayer.posX - par2EntityPlayer.lastTickPosX) * (double)par3; double var4 = par2EntityPlayer.lastTickPosX + (par2EntityPlayer.posX - par2EntityPlayer.lastTickPosX) * (double) par3;
double var6 = par2EntityPlayer.lastTickPosY + (par2EntityPlayer.posY - par2EntityPlayer.lastTickPosY) * (double)par3; double var6 = par2EntityPlayer.lastTickPosY + (par2EntityPlayer.posY - par2EntityPlayer.lastTickPosY) * (double) par3;
double var8 = par2EntityPlayer.lastTickPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.lastTickPosZ) * (double)par3; double var8 = par2EntityPlayer.lastTickPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.lastTickPosZ) * (double) par3;
if (!this.damagedBlocks.isEmpty()) if (!this.damagedBlocks.isEmpty()) {
{
EaglerAdapter.glBlendFunc(EaglerAdapter.GL_DST_COLOR, EaglerAdapter.GL_SRC_COLOR); EaglerAdapter.glBlendFunc(EaglerAdapter.GL_DST_COLOR, EaglerAdapter.GL_SRC_COLOR);
TextureMap.locationBlocksTexture.bindTexture(); tex_terrain.bindTexture();
EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MIN_FILTER, EaglerAdapter.GL_NEAREST);
EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MAG_FILTER, EaglerAdapter.GL_NEAREST);
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 0.5F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST);
EaglerAdapter.glPolygonOffset(-3.0F, -3.0F); EaglerAdapter.glPolygonOffset(3.0F, 3.0F);
EaglerAdapter.glDepthMask(false);
EaglerAdapter.glEnable(EaglerAdapter.GL_POLYGON_OFFSET_FILL); EaglerAdapter.glEnable(EaglerAdapter.GL_POLYGON_OFFSET_FILL);
EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST);
par1Tessellator.startDrawingQuads(); par1Tessellator.startDrawingQuads();
@ -1480,24 +1484,19 @@ public class RenderGlobal implements IWorldAccess
par1Tessellator.disableColor(); par1Tessellator.disableColor();
Iterator var10 = this.damagedBlocks.values().iterator(); Iterator var10 = this.damagedBlocks.values().iterator();
while (var10.hasNext()) while (var10.hasNext()) {
{ DestroyBlockProgress var11 = (DestroyBlockProgress) var10.next();
DestroyBlockProgress var11 = (DestroyBlockProgress)var10.next(); double var12 = (double) var11.getPartialBlockX() - var4;
double var12 = (double)var11.getPartialBlockX() - var4; double var14 = (double) var11.getPartialBlockY() - var6;
double var14 = (double)var11.getPartialBlockY() - var6; double var16 = (double) var11.getPartialBlockZ() - var8;
double var16 = (double)var11.getPartialBlockZ() - var8;
if (var12 * var12 + var14 * var14 + var16 * var16 > 1024.0D) if (var12 * var12 + var14 * var14 + var16 * var16 > 1024.0D) {
{
var10.remove(); var10.remove();
} } else {
else
{
int var18 = this.theWorld.getBlockId(var11.getPartialBlockX(), var11.getPartialBlockY(), var11.getPartialBlockZ()); int var18 = this.theWorld.getBlockId(var11.getPartialBlockX(), var11.getPartialBlockY(), var11.getPartialBlockZ());
Block var19 = var18 > 0 ? Block.blocksList[var18] : null; Block var19 = var18 > 0 ? Block.blocksList[var18] : null;
if (var19 == null) if (var19 == null) {
{
var19 = Block.stone; var19 = Block.stone;
} }

7
src/main/java/net/minecraft/src/RenderPlayer.java
View File

@ -4,7 +4,6 @@ import net.lax1dude.eaglercraft.DefaultSkinRenderer;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglerProfile; import net.lax1dude.eaglercraft.EaglerProfile;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter;
public class RenderPlayer extends RendererLivingEntity public class RenderPlayer extends RendererLivingEntity
{ {
@ -100,7 +99,7 @@ public class RenderPlayer extends RendererLivingEntity
} }
} }
public void func_130009_a(EntityPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9) public void renderPlayer(EntityPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9)
{ {
float var10 = 1.0F; float var10 = 1.0F;
EaglerAdapter.glColor3f(var10, var10, var10); EaglerAdapter.glColor3f(var10, var10, var10);
@ -480,7 +479,7 @@ public class RenderPlayer extends RendererLivingEntity
public void doRenderLiving(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6, float par8, float par9) public void doRenderLiving(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6, float par8, float par9)
{ {
this.func_130009_a((EntityPlayer)par1EntityLivingBase, par2, par4, par6, par8, par9); this.renderPlayer((EntityPlayer)par1EntityLivingBase, par2, par4, par6, par8, par9);
} }
/** /**
@ -499,7 +498,7 @@ public class RenderPlayer extends RendererLivingEntity
*/ */
public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
{ {
this.func_130009_a((EntityPlayer)par1Entity, par2, par4, par6, par8, par9); this.renderPlayer((EntityPlayer)par1Entity, par2, par4, par6, par8, par9);
} }
private static final TextureLocation entityTexture = new TextureLocation("/mob/char.png"); private static final TextureLocation entityTexture = new TextureLocation("/mob/char.png");