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

Fix some things + compile

This commit is contained in:
catfoolyou 2025-03-01 15:05:43 -05:00
parent 7b7abb0308
commit 6d66cd8357
11 changed files with 14382 additions and 14377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28603
javascript/classes.js
View File

File diff suppressed because it is too large Load Diff

2
javascript/classes.js.map
View File

File diff suppressed because one or more lines are too long

2
javascript/index.html
View File

@ -19,7 +19,7 @@ try {
*/ */
const relayId = Math.floor(Math.random() * 3); const relayId = Math.floor(Math.random() * 3);
window.eaglercraftOpts = { window.eaglercraftOpts = {
container: "game_frame", assetsURI: "assets.epk", serverWorkerURI: "worker_bootstrap.js", worldsFolder: "TEST", container: "game_frame", assetsURI: "assets.epk", serverWorkerURI: null, worldsFolder: "TEST",
assetOverrides: { assetOverrides: {
// "title/no-pano-blur.flag": "", // "title/no-pano-blur.flag": "",
"records/wait.mp3": "wait.mp3", "records/wait.mp3": "wait.mp3",

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

11
src/main/java/net/minecraft/src/GuiIngame.java
View File

@ -336,6 +336,17 @@ public class GuiIngame extends Gui
this.drawString(var8, var45, var6 - var8.getStringWidth(var45) - 2, offset + 120, 14737632); this.drawString(var8, var45, var6 - var8.getStringWidth(var45) - 2, offset + 120, 14737632);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }
else {
EaglerAdapter.glPushMatrix();
EaglerAdapter.glScalef(0.75f, 0.75f, 0.75f);
var8.drawStringWithShadow(this.mc.renderGlobal.getDebugInfoShort(), 2, 2, 16777215);
if (mc.gameSettings.showCoordinates) {
var8.drawStringWithShadow("x: " + MathHelper.floor_double(this.mc.thePlayer.posX) + ", y: " + MathHelper.floor_double(this.mc.thePlayer.posY) + ", z: " + MathHelper.floor_double(this.mc.thePlayer.posZ), 2, 12, 16777215);
}
EaglerAdapter.glPopMatrix();
}
if (this.recordPlayingUpFor > 0) if (this.recordPlayingUpFor > 0)
{ {

2
src/main/java/net/minecraft/src/GuiMainMenu.java
View File

@ -144,7 +144,7 @@ public class GuiMainMenu extends GuiScreen {
StringTranslate var2 = StringTranslate.getInstance(); StringTranslate var2 = StringTranslate.getInstance();
int var4 = this.height / 4 + 48; int var4 = this.height / 4 + 48;
if(EaglerAdapter.isIntegratedServerAvailable()) { if(false) { // EaglerAdapter.isIntegratedServerAvailable()
this.buttonList.add(new GuiButton(1, this.width / 2 - 100, var4, var2.translateKey("menu.singleplayer"))); this.buttonList.add(new GuiButton(1, this.width / 2 - 100, var4, var2.translateKey("menu.singleplayer")));
this.buttonList.add(new GuiButton(2, this.width / 2 - 100, var4 + 24 * 1, var2.translateKey("menu.multiplayer"))); this.buttonList.add(new GuiButton(2, this.width / 2 - 100, var4 + 24 * 1, var2.translateKey("menu.multiplayer")));
this.buttonList.add(new GuiButton(3, this.width / 2 - 100, var4 + 24 * 2, var2.translateKey("menu.forkme"))); this.buttonList.add(new GuiButton(3, this.width / 2 - 100, var4 + 24 * 2, var2.translateKey("menu.forkme")));

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

@ -8017,6 +8017,9 @@ public class RenderBlocks
} }
public Icon getIconSafe(Icon par1Icon) { public Icon getIconSafe(Icon par1Icon) {
if(par1Icon == null){
System.out.println("fuck");
}
return par1Icon == null ? this.minecraftRB.renderEngine.getMissingIcon(0) : par1Icon; return par1Icon == null ? this.minecraftRB.renderEngine.getMissingIcon(0) : par1Icon;
} }
} }

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

@ -452,6 +452,11 @@ public class RenderGlobal implements IWorldAccess
return "C: " + this.renderersBeingRendered + "/" + this.renderersLoaded + ". F: " + this.renderersBeingClipped + ", O: " + this.renderersBeingOccluded + ", E: " + this.renderersSkippingRenderPass; return "C: " + this.renderersBeingRendered + "/" + this.renderersLoaded + ". F: " + this.renderersBeingClipped + ", O: " + this.renderersBeingOccluded + ", E: " + this.renderersSkippingRenderPass;
} }
public String getDebugInfoShort() {
return "" + Minecraft.debugFPS + "fps | C: " + this.renderersBeingRendered + "/" + this.renderersLoaded + ", E: " + this.countEntitiesRendered + "+" + tileEntities.size() +
", U: " + Minecraft.debugChunkGeometryUpdates + "/" + Minecraft.debugChunkUpdates;
}
/** /**
* Gets the entities info for use on the Debug screen * Gets the entities info for use on the Debug screen
*/ */

119
src/main/java/net/minecraft/src/RenderItem.java
View File

@ -35,72 +35,65 @@ public class RenderItem extends Render
*/ */
public void doRenderItem(EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9) public void doRenderItem(EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9)
{ {
this.bindEntityTexture(par1EntityItem); isRenderInProgress = true;
this.random.setSeed(187L); this.random.setSeed(187L);
ItemStack var10 = par1EntityItem.getEntityItem(); ItemStack var10 = par1EntityItem.getEntityItem();
if (var10.getItem() != null) if (var10.getItem() != null) {
{
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
float var11 = MathHelper.sin(((float) par1EntityItem.age + par9) / 10.0F + par1EntityItem.hoverStart) * 0.1F + 0.1F; float var11 = MathHelper.sin(((float) par1EntityItem.age + par9) / 10.0F + par1EntityItem.hoverStart) * 0.1F + 0.1F;
float var12 = (((float) par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI); float var12 = (((float) par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI);
byte var13 = 1; byte var13 = 1;
if (par1EntityItem.getEntityItem().stackSize > 1) if (par1EntityItem.getEntityItem().stackSize > 1) {
{
var13 = 2; var13 = 2;
} }
if (par1EntityItem.getEntityItem().stackSize > 5) if (par1EntityItem.getEntityItem().stackSize > 5) {
{
var13 = 3; var13 = 3;
} }
if (par1EntityItem.getEntityItem().stackSize > 20) if (par1EntityItem.getEntityItem().stackSize > 20) {
{
var13 = 4; var13 = 4;
} }
if (par1EntityItem.getEntityItem().stackSize > 40) if (par1EntityItem.getEntityItem().stackSize > 40) {
{
var13 = 5; var13 = 5;
} }
EaglerAdapter.glTranslatef((float) par2, (float) par4 + var11, (float) par6); EaglerAdapter.glTranslatef((float) par2, (float) par4 + var11, (float) par6);
EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
int var17;
float var18; float var18;
float var19; float var19;
float var20; float var20;
int var26;
if (var10.getItemSpriteNumber() == 0 && var10.itemID < Block.blocksList.length && Block.blocksList[var10.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) if (var10.getItemSpriteNumber() == 0 && Block.blocksList[var10.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) {
{
Block var22 = Block.blocksList[var10.itemID]; Block var22 = Block.blocksList[var10.itemID];
EaglerAdapter.glRotatef(var12, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(var12, 0.0F, 1.0F, 0.0F);
//RenderHelper.enableStandardItemLighting();
if (renderInFrame) if (renderInFrame) {
{
EaglerAdapter.glScalef(1.25F, 1.25F, 1.25F); EaglerAdapter.glScalef(1.25F, 1.25F, 1.25F);
EaglerAdapter.glTranslatef(0.0F, 0.05F, 0.0F); EaglerAdapter.glTranslatef(0.0F, 0.05F, 0.0F);
EaglerAdapter.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
} }
terrain.bindTexture();
float var24 = 0.25F; float var24 = 0.25F;
int var25 = var22.getRenderType(); int var25 = var22.getRenderType();
if (var25 == 1 || var25 == 19 || var25 == 12 || var25 == 2) if (var25 == 1 || var25 == 19 || var25 == 12 || var25 == 2) {
{
var24 = 0.5F; var24 = 0.5F;
} }
EaglerAdapter.glScalef(var24, var24, var24); EaglerAdapter.glScalef(var24, var24, var24);
for (var26 = 0; var26 < var13; ++var26) for (var17 = 0; var17 < var13; ++var17) {
{
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
if (var26 > 0) if (var17 > 0) {
{
var18 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24; var18 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24;
var19 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24; var19 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24;
var20 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24; var20 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24;
@ -108,73 +101,65 @@ public class RenderItem extends Render
} }
var18 = 1.0F; var18 = 1.0F;
if (!renderInFrame) EaglerAdapter.flipLightMatrix();
this.itemRenderBlocks.renderBlockAsItem(var22, var10.getItemDamage(), var18); this.itemRenderBlocks.renderBlockAsItem(var22, var10.getItemDamage(), var18);
if (!renderInFrame) EaglerAdapter.flipLightMatrix();
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }
} } else {
else
{
float var16; float var16;
if (var10.getItemSpriteNumber() == 1 && var10.getItem().requiresMultipleRenderPasses()) if (var10.getItem().requiresMultipleRenderPasses()) {
{ if (renderInFrame) {
if (renderInFrame)
{
EaglerAdapter.glScalef(0.5128205F, 0.5128205F, 0.5128205F); EaglerAdapter.glScalef(0.5128205F, 0.5128205F, 0.5128205F);
EaglerAdapter.glTranslatef(0.0F, -0.05F, 0.0F); EaglerAdapter.glTranslatef(0.0F, -0.05F, 0.0F);
} } else {
else
{
EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F); EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F);
} }
for (int var21 = 0; var21 <= 1; ++var21) items.bindTexture();
{
for (int var14 = 0; var14 <= 1; ++var14) {
this.random.setSeed(187L); this.random.setSeed(187L);
Icon var23 = var10.getItem().getIconFromDamageForRenderPass(var10.getItemDamage(), var21); Icon var15 = var10.getItem().getIconFromDamageForRenderPass(var10.getItemDamage(), var14);
var16 = 1.0F; var16 = 1.0F;
if (this.renderWithColor) if (this.renderWithColor) {
{ var17 = Item.itemsList[var10.itemID].getColorFromItemStack(var10, var14);
var26 = Item.itemsList[var10.itemID].getColorFromItemStack(var10, var21); var18 = (float) (var17 >> 16 & 255) / 255.0F;
var18 = (float)(var26 >> 16 & 255) / 255.0F; var19 = (float) (var17 >> 8 & 255) / 255.0F;
var19 = (float)(var26 >> 8 & 255) / 255.0F; var20 = (float) (var17 & 255) / 255.0F;
var20 = (float)(var26 & 255) / 255.0F;
EaglerAdapter.glColor4f(var18 * var16, var19 * var16, var20 * var16, 1.0F); EaglerAdapter.glColor4f(var18 * var16, var19 * var16, var20 * var16, 1.0F);
this.renderDroppedItem(par1EntityItem, var23, var13, par9, var18 * var16, var19 * var16, var20 * var16); this.renderDroppedItem(par1EntityItem, var15, var13, par9, var18 * var16, var19 * var16, var20 * var16);
} } else {
else this.renderDroppedItem(par1EntityItem, var15, var13, par9, 1.0F, 1.0F, 1.0F);
{
this.renderDroppedItem(par1EntityItem, var23, var13, par9, 1.0F, 1.0F, 1.0F);
} }
} }
} } else {
else if (renderInFrame) {
{
if (renderInFrame)
{
EaglerAdapter.glScalef(0.5128205F, 0.5128205F, 0.5128205F); EaglerAdapter.glScalef(0.5128205F, 0.5128205F, 0.5128205F);
EaglerAdapter.glTranslatef(0.0F, -0.05F, 0.0F); EaglerAdapter.glTranslatef(0.0F, -0.05F, 0.0F);
} } else {
else
{
EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F); EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F);
} }
Icon var14 = var10.getIconIndex(); Icon var21 = var10.getIconIndex();
if (this.renderWithColor) if (var10.getItemSpriteNumber() == 0) {
{ terrain.bindTexture();
int var15 = Item.itemsList[var10.itemID].getColorFromItemStack(var10, 0); } else {
var16 = (float)(var15 >> 16 & 255) / 255.0F; items.bindTexture();
float var17 = (float)(var15 >> 8 & 255) / 255.0F;
var18 = (float)(var15 & 255) / 255.0F;
var19 = 1.0F;
this.renderDroppedItem(par1EntityItem, var14, var13, par9, var16 * var19, var17 * var19, var18 * var19);
} }
else
{ if (this.renderWithColor) {
this.renderDroppedItem(par1EntityItem, var14, var13, par9, 1.0F, 1.0F, 1.0F); int var23 = Item.itemsList[var10.itemID].getColorFromItemStack(var10, 0);
var16 = (float) (var23 >> 16 & 255) / 255.0F;
float var26 = (float) (var23 >> 8 & 255) / 255.0F;
var18 = (float) (var23 & 255) / 255.0F;
var19 = 1.0F;
this.renderDroppedItem(par1EntityItem, var21, var13, par9, var16 * var19, var26 * var19, var18 * var19);
} else {
this.renderDroppedItem(par1EntityItem, var21, var13, par9, 1.0F, 1.0F, 1.0F);
} }
} }
} }
@ -182,6 +167,7 @@ public class RenderItem extends Render
EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }
isRenderInProgress = false;
} }
protected TextureLocation func_110796_a(EntityItem par1EntityItem) // FIX THIS (maybe) protected TextureLocation func_110796_a(EntityItem par1EntityItem) // FIX THIS (maybe)
@ -193,6 +179,7 @@ public class RenderItem extends Render
* Renders a dropped item * Renders a dropped item
*/ */
private void renderDroppedItem(EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) { private void renderDroppedItem(EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) {
System.out.println("test");
Tessellator var8 = Tessellator.instance; Tessellator var8 = Tessellator.instance;
if (par2Icon == null) { if (par2Icon == null) {

4
src/teavm/java/net/lax1dude/eaglercraft/Client.java
View File

@ -75,7 +75,7 @@ public class Client {
try { try {
EaglerAdapterImpl2.initializeContext(rootElement, assetsURI, serverWorkerURI); EaglerAdapterImpl2.initializeContext(rootElement, assetsURI, null);
ServerList.loadDefaultServers(conf); ServerList.loadDefaultServers(conf);
AssetRepository.loadOverrides(conf); AssetRepository.loadOverrides(conf);
@ -105,7 +105,7 @@ public class Client {
try { try {
EaglerAdapterImpl2.initializeContext(rootElement = Window.current().getDocument().getElementById(e[0]), e[1], "worker_bootstrap.js"); EaglerAdapterImpl2.initializeContext(rootElement = Window.current().getDocument().getElementById(e[0]), e[1], null);
LocalStorageManager.loadStorage(); LocalStorageManager.loadStorage();
if(e.length > 2 && e[2].length() > 0) { if(e.length > 2 && e[2].length() > 0) {

2
src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java
View File

@ -419,7 +419,7 @@ public class EaglerAdapterImpl2 {
//todo: safely skip startRTCLANServer() if the integrated server is disabled: //todo: safely skip startRTCLANServer() if the integrated server is disabled:
//if(integratedServerScript != null) { //if(integratedServerScript != null) {
rtcLANServer = startRTCLANServer(); //rtcLANServer = startRTCLANServer();
//} //}
downloadAssetPack(assetPackageURI); downloadAssetPack(assetPackageURI);