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

Fix MP skins and achievements

This commit is contained in:
catfoolyou 2025-03-05 16:27:30 -05:00
parent 12bbc19c3e
commit 12c793fb0d
14 changed files with 68750 additions and 66448 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"?>
<project version="4">
<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>

6
build.gradle
View File

@ -10,7 +10,7 @@ sourceSets {
java {
srcDirs(
"src/main/java",
"src/lwjgl/java",
"src/teavm/java",
"sp-server/src/ipc/java"
)
}
@ -26,10 +26,10 @@ tasks.withType(JavaCompile) {
options.compilerArgs << "-Xmaxerrs" << "1000"
}
sourceSets.main.resources.srcDirs += 'src/lwjgl/java/javazoom/jl/decoder'
//sourceSets.main.resources.srcDirs += 'src/lwjgl/java/javazoom/jl/decoder'
dependencies {
implementation fileTree(dir: './lwjgl-rundir/', include: '*.jar')
//implementation fileTree(dir: './lwjgl-rundir/', include: '*.jar')
teavm(teavm.libs.jso)
teavm(teavm.libs.jsoApis)

134668
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

3
javascript/index.html
View File

@ -49,8 +49,7 @@ relays: [
{ addr: "wss://relay.shhnowisnottheti.me/", name: "ayunami relay #1", primary: relayId == 2 }
],
mainMenu: { splashes: [
"Darviglet!", "eaglerenophile!", "You Eagler!", "Yeeeeeee!", "yeee",
"EEEEEEEEE!", "You Darvig!", "You Vigg!", ":>", "|>", "You Yumpster!"
"Darviglet!", "eaglerenophile!", "You Eagler!", "Yeeeeeee!", "yeee", "EEEEEEEEE!", "You Darvig!", "You Vigg!", ":>", "|>", "You Yumpster!", "No longer on Gitpod", "MiG Mad Marine", "Wild Weasel", "YGBSM", "Union Aerospace Corporation"
], eaglerLogo: false }};
(function(){
var q = window.location.search;

BIN
lwjgl-rundir/_eagstorage.a.dat Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

4
src/main/java/net/lax1dude/eaglercraft/ConfigConstants.java
View File

@ -5,10 +5,10 @@ import java.util.List;
public class ConfigConstants {
public static final String version = "25w10a";
public static final String version = "25w10b";
public static final String mainMenuString = "Eaglercraft " + version;
public static final String forkMe = null;
public static final String forkMe = "https://git.zelz.net/catfoolyou/Project164";
public static String ayonullTitle = null;
public static String ayonullLink = null;

26
src/main/java/net/minecraft/src/EntityPlayerSP.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.LocalStorageManager;
public class EntityPlayerSP extends EntityPlayer
{
public MovementInput movementInput;
@ -490,27 +492,11 @@ public class EntityPlayerSP extends EntityPlayer
*/
public void addStat(StatBase par1StatBase, int par2)
{
/*if (par1StatBase != null)
{
if (par1StatBase.isAchievement())
{
Achievement var3 = (Achievement)par1StatBase;
if (var3.parentAchievement == null || this.mc.statFileWriter.hasAchievementUnlocked(var3.parentAchievement))
{
if (!this.mc.statFileWriter.hasAchievementUnlocked(var3))
{
this.mc.guiAchievement.queueTakenAchievement(var3);
}
this.mc.statFileWriter.readStat(par1StatBase, par2);
}
if (par1StatBase != null) {
if(par1StatBase.isAchievement() && LocalStorageManager.hasMadeAchievement((Achievement)par1StatBase)) {
this.mc.guiAchievement.queueTakenAchievement((Achievement)par1StatBase);
}
else
{
this.mc.statFileWriter.readStat(par1StatBase, par2);
}
}*/
}
}
private boolean isBlockTranslucent(int par1, int par2, int par3)

464
src/main/java/net/minecraft/src/GuiAchievements.java
View File

@ -1,464 +0,0 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.glemu.RealOpenGLEnums;
import net.lax1dude.eaglercraft.EaglerAdapter;
public class GuiAchievements extends GuiScreen
{
/** The top x coordinate of the achievement map */
private static final int guiMapTop = AchievementList.minDisplayColumn * 24 - 112;
/** The left y coordinate of the achievement map */
private static final int guiMapLeft = AchievementList.minDisplayRow * 24 - 112;
/** The bottom x coordinate of the achievement map */
private static final int guiMapBottom = AchievementList.maxDisplayColumn * 24 - 77;
/** The right y coordinate of the achievement map */
private static final int guiMapRight = AchievementList.maxDisplayRow * 24 - 77;
private static final TextureLocation achievementTextures = new TextureLocation("textures/gui/achievement/achievement_background.png");
protected int achievementsPaneWidth = 256;
protected int achievementsPaneHeight = 202;
/** The current mouse x coordinate */
protected int mouseX;
/** The current mouse y coordinate */
protected int mouseY;
protected double field_74117_m;
protected double field_74115_n;
/** The x position of the achievement map */
protected double guiMapX;
/** The y position of the achievement map */
protected double guiMapY;
protected double field_74124_q;
protected double field_74123_r;
/** Whether the Mouse Button is down or not */
private int isMouseButtonDown;
private StatFileWriter statFileWriter;
public GuiAchievements(StatFileWriter par1StatFileWriter)
{
this.statFileWriter = par1StatFileWriter;
short var2 = 141;
short var3 = 141;
this.field_74117_m = this.guiMapX = this.field_74124_q = (double)(AchievementList.openInventory.displayColumn * 24 - var2 / 2 - 12);
this.field_74115_n = this.guiMapY = this.field_74123_r = (double)(AchievementList.openInventory.displayRow * 24 - var3 / 2);
}
/**
* Adds the buttons (and other controls) to the screen in question.
*/
public void initGui()
{
this.buttonList.clear();
this.buttonList.add(new GuiSmallButton(1, this.width / 2 + 24, this.height / 2 + 74, 80, 20, StatCollector.translateToLocal("gui.done")));
}
/**
* Fired when a control is clicked. This is the equivalent of ActionListener.actionPerformed(ActionEvent e).
*/
protected void actionPerformed(GuiButton par1GuiButton)
{
if (par1GuiButton.id == 1)
{
this.mc.displayGuiScreen((GuiScreen)null);
this.mc.setIngameFocus();
}
super.actionPerformed(par1GuiButton);
}
/**
* Fired when a key is typed. This is the equivalent of KeyListener.keyTyped(KeyEvent e).
*/
protected void keyTyped(char par1, int par2)
{
if (par2 == this.mc.gameSettings.keyBindInventory.keyCode)
{
this.mc.displayGuiScreen((GuiScreen)null);
this.mc.setIngameFocus();
}
else
{
super.keyTyped(par1, par2);
}
}
/**
* Draws the screen and all the components in it.
*/
public void drawScreen(int par1, int par2, float par3)
{
if (EaglerAdapter.mouseIsButtonDown(0))
{
int var4 = (this.width - this.achievementsPaneWidth) / 2;
int var5 = (this.height - this.achievementsPaneHeight) / 2;
int var6 = var4 + 8;
int var7 = var5 + 17;
if ((this.isMouseButtonDown == 0 || this.isMouseButtonDown == 1) && par1 >= var6 && par1 < var6 + 224 && par2 >= var7 && par2 < var7 + 155)
{
if (this.isMouseButtonDown == 0)
{
this.isMouseButtonDown = 1;
}
else
{
this.guiMapX -= (double)(par1 - this.mouseX);
this.guiMapY -= (double)(par2 - this.mouseY);
this.field_74124_q = this.field_74117_m = this.guiMapX;
this.field_74123_r = this.field_74115_n = this.guiMapY;
}
this.mouseX = par1;
this.mouseY = par2;
}
if (this.field_74124_q < (double)guiMapTop)
{
this.field_74124_q = (double)guiMapTop;
}
if (this.field_74123_r < (double)guiMapLeft)
{
this.field_74123_r = (double)guiMapLeft;
}
if (this.field_74124_q >= (double)guiMapBottom)
{
this.field_74124_q = (double)(guiMapBottom - 1);
}
if (this.field_74123_r >= (double)guiMapRight)
{
this.field_74123_r = (double)(guiMapRight - 1);
}
}
else
{
this.isMouseButtonDown = 0;
}
this.drawDefaultBackground();
this.genAchievementBackground(par1, par2, par3);
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST);
this.drawTitle();
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST);
}
/**
* Called from the main game loop to update the screen.
*/
public void updateScreen()
{
this.field_74117_m = this.guiMapX;
this.field_74115_n = this.guiMapY;
double var1 = this.field_74124_q - this.guiMapX;
double var3 = this.field_74123_r - this.guiMapY;
if (var1 * var1 + var3 * var3 < 4.0D)
{
this.guiMapX += var1;
this.guiMapY += var3;
}
else
{
this.guiMapX += var1 * 0.85D;
this.guiMapY += var3 * 0.85D;
}
}
/**
* Draws the "Achievements" title at the top of the GUI.
*/
protected void drawTitle()
{
int var1 = (this.width - this.achievementsPaneWidth) / 2;
int var2 = (this.height - this.achievementsPaneHeight) / 2;
this.fontRenderer.drawString("Achievements", var1 + 15, var2 + 5, 4210752);
}
protected void genAchievementBackground(int par1, int par2, float par3)
{
int var4 = MathHelper.floor_double(this.field_74117_m + (this.guiMapX - this.field_74117_m) * (double)par3);
int var5 = MathHelper.floor_double(this.field_74115_n + (this.guiMapY - this.field_74115_n) * (double)par3);
if (var4 < guiMapTop)
{
var4 = guiMapTop;
}
if (var5 < guiMapLeft)
{
var5 = guiMapLeft;
}
if (var4 >= guiMapBottom)
{
var4 = guiMapBottom - 1;
}
if (var5 >= guiMapRight)
{
var5 = guiMapRight - 1;
}
int var6 = (this.width - this.achievementsPaneWidth) / 2;
int var7 = (this.height - this.achievementsPaneHeight) / 2;
int var8 = var6 + 16;
int var9 = var7 + 17;
this.zLevel = 0.0F;
EaglerAdapter.glDepthFunc(RealOpenGLEnums.GL_GEQUAL);
EaglerAdapter.glPushMatrix();
EaglerAdapter.glTranslatef(0.0F, 0.0F, -200.0F);
EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D);
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(RealOpenGLEnums.GL_RESCALE_NORMAL);
EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL);
int var10 = var4 + 288 >> 4;
int var11 = var5 + 288 >> 4;
int var12 = (var4 + 288) % 16;
int var13 = (var5 + 288) % 16;
boolean var14 = true;
boolean var15 = true;
boolean var16 = true;
boolean var17 = true;
boolean var18 = true;
EaglercraftRandom var19 = new EaglercraftRandom();
int var20;
int var22;
int var23;
for (var20 = 0; var20 * 16 - var13 < 155; ++var20)
{
float var21 = 0.6F - (float)(var11 + var20) / 25.0F * 0.3F;
EaglerAdapter.glColor4f(var21, var21, var21, 1.0F);
for (var22 = 0; var22 * 16 - var12 < 224; ++var22)
{
var19.setSeed((long)(1234 + var10 + var22));
var19.nextInt();
var23 = var19.nextInt(1 + var11 + var20) + (var11 + var20) / 2;
Icon var24 = Block.sand.getIcon(0, 0);
if (var23 <= 37 && var11 + var20 != 35)
{
if (var23 == 22)
{
if (var19.nextInt(2) == 0)
{
var24 = Block.oreDiamond.getIcon(0, 0);
}
else
{
var24 = Block.oreRedstone.getIcon(0, 0);
}
}
else if (var23 == 10)
{
var24 = Block.oreIron.getIcon(0, 0);
}
else if (var23 == 8)
{
var24 = Block.oreCoal.getIcon(0, 0);
}
else if (var23 > 4)
{
var24 = Block.stone.getIcon(0, 0);
}
else if (var23 > 0)
{
var24 = Block.dirt.getIcon(0, 0);
}
}
else
{
var24 = Block.bedrock.getIcon(0, 0);
}
TextureMap.locationBlocksTexture.bindTexture();
this.drawTexturedModelRectFromIcon(var8 + var22 * 16 - var12, var9 + var20 * 16 - var13, var24, 16, 16);
}
}
EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST);
EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL);
EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D);
int var25;
int var28;
int var37;
for (var20 = 0; var20 < AchievementList.achievementList.size(); ++var20)
{
Achievement var31 = (Achievement)AchievementList.achievementList.get(var20);
if (var31.parentAchievement != null)
{
var22 = var31.displayColumn * 24 - var4 + 11 + var8;
var23 = var31.displayRow * 24 - var5 + 11 + var9;
var37 = var31.parentAchievement.displayColumn * 24 - var4 + 11 + var8;
var25 = var31.parentAchievement.displayRow * 24 - var5 + 11 + var9;
boolean var26 = this.statFileWriter.hasAchievementUnlocked(var31);
boolean var27 = this.statFileWriter.canUnlockAchievement(var31);
var28 = Math.sin((double)(Minecraft.getSystemTime() % 600L) / 600.0D * Math.PI * 2.0D) > 0.6D ? 255 : 130;
int var29 = -16777216;
if (var26)
{
var29 = -9408400;
}
else if (var27)
{
var29 = 65280 + (var28 << 24);
}
this.drawHorizontalLine(var22, var37, var23, var29);
this.drawVerticalLine(var37, var23, var25, var29);
}
}
Achievement var30 = null;
RenderItem var32 = new RenderItem();
RenderHelper.enableGUIStandardItemLighting();
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(RealOpenGLEnums.GL_RESCALE_NORMAL);
EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL);
int var38;
int var39;
for (var22 = 0; var22 < AchievementList.achievementList.size(); ++var22)
{
Achievement var33 = (Achievement)AchievementList.achievementList.get(var22);
var37 = var33.displayColumn * 24 - var4;
var25 = var33.displayRow * 24 - var5;
if (var37 >= -24 && var25 >= -24 && var37 <= 224 && var25 <= 155)
{
float var36;
if (this.statFileWriter.hasAchievementUnlocked(var33))
{
var36 = 1.0F;
EaglerAdapter.glColor4f(var36, var36, var36, 1.0F);
}
else if (this.statFileWriter.canUnlockAchievement(var33))
{
var36 = Math.sin((double)(Minecraft.getSystemTime() % 600L) / 600.0D * Math.PI * 2.0D) < 0.6D ? 0.6F : 0.8F;
EaglerAdapter.glColor4f(var36, var36, var36, 1.0F);
}
else
{
var36 = 0.3F;
EaglerAdapter.glColor4f(var36, var36, var36, 1.0F);
}
achievementTextures.bindTexture();
var38 = var8 + var37;
var39 = var9 + var25;
if (var33.getSpecial())
{
this.drawTexturedModalRect(var38 - 2, var39 - 2, 26, 202, 26, 26);
}
else
{
this.drawTexturedModalRect(var38 - 2, var39 - 2, 0, 202, 26, 26);
}
if (!this.statFileWriter.canUnlockAchievement(var33))
{
float var40 = 0.1F;
EaglerAdapter.glColor4f(var40, var40, var40, 1.0F);
var32.renderWithColor = false;
}
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE);
var32.renderItemAndEffectIntoGUI(this.mc.fontRenderer, this.mc.getTextureManager(), var33.theItemStack, var38 + 3, var39 + 3);
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
if (!this.statFileWriter.canUnlockAchievement(var33))
{
var32.renderWithColor = true;
}
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
if (par1 >= var8 && par2 >= var9 && par1 < var8 + 224 && par2 < var9 + 155 && par1 >= var38 && par1 <= var38 + 22 && par2 >= var39 && par2 <= var39 + 22)
{
var30 = var33;
}
}
}
EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST);
EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND);
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
achievementTextures.bindTexture();
this.drawTexturedModalRect(var6, var7, 0, 0, this.achievementsPaneWidth, this.achievementsPaneHeight);
EaglerAdapter.glPopMatrix();
this.zLevel = 0.0F;
EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL);
EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST);
EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D);
super.drawScreen(par1, par2, par3);
if (var30 != null)
{
String var34 = StatCollector.translateToLocal(var30.getName());
String var35 = var30.getDescription();
var37 = par1 + 12;
var25 = par2 - 4;
if (this.statFileWriter.canUnlockAchievement(var30))
{
var38 = Math.max(this.fontRenderer.getStringWidth(var34), 120);
var39 = this.fontRenderer.splitStringWidth(var35, var38);
if (this.statFileWriter.hasAchievementUnlocked(var30))
{
var39 += 12;
}
this.drawGradientRect(var37 - 3, var25 - 3, var37 + var38 + 3, var25 + var39 + 3 + 12, -1073741824, -1073741824);
this.fontRenderer.drawSplitString(var35, var37, var25 + 12, var38, -6250336);
if (this.statFileWriter.hasAchievementUnlocked(var30))
{
this.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal("achievement.taken"), var37, var25 + var39 + 4, -7302913);
}
}
else
{
var38 = Math.max(this.fontRenderer.getStringWidth(var34), 120);
String var41 = StatCollector.translateToLocalFormatted("achievement.requires", new Object[] {StatCollector.translateToLocal(var30.parentAchievement.getName())});
var28 = this.fontRenderer.splitStringWidth(var41, var38);
this.drawGradientRect(var37 - 3, var25 - 3, var37 + var38 + 3, var25 + var28 + 12 + 3, -1073741824, -1073741824);
this.fontRenderer.drawSplitString(var41, var37, var25 + 12, var38, -9416624);
}
this.fontRenderer.drawStringWithShadow(var34, var37, var25, this.statFileWriter.canUnlockAchievement(var30) ? (var30.getSpecial() ? -128 : -1) : (var30.getSpecial() ? -8355776 : -8355712));
}
EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST);
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
RenderHelper.disableStandardItemLighting();
}
/**
* Returns true if this GUI should pause the game when it is displayed in single-player
*/
public boolean doesGuiPauseGame()
{
return true;
}
}

4
src/main/java/net/minecraft/src/ItemRenderer.java
View File

@ -45,9 +45,9 @@ public class ItemRenderer
if (par2ItemStack.getItemSpriteNumber() == 0 && Block.blocksList[par2ItemStack.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType())) {
terrain.bindTexture();
EaglerAdapter.flipLightMatrix();
//EaglerAdapter.flipLightMatrix();
this.renderBlocksInstance.renderBlockAsItem(Block.blocksList[par2ItemStack.itemID], par2ItemStack.getItemDamage(), 1.0F);
EaglerAdapter.flipLightMatrix();
//EaglerAdapter.flipLightMatrix();
}
else
{

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

@ -101,7 +101,6 @@ public class RenderPlayer extends RendererLivingEntity
public void renderPlayer(EntityPlayer par1EntityPlayer, double par2, double par4, double par6, float par8, float par9)
{
if(par1EntityPlayer instanceof EntityOtherPlayerMP){
System.out.println("fuck");
this.bindTexture(par1EntityPlayer);
}
if(DefaultSkinRenderer.isPlayerStandard(par1EntityPlayer)) {
@ -229,11 +228,6 @@ public class RenderPlayer extends RendererLivingEntity
}
}
protected TextureLocation func_110817_a(EntityPlayer par1AbstractClientPlayer)
{
return DefaultSkinRenderer.defaultVanillaSkins[EaglerProfile.presetSkinId];
}
/**
* Method for adding special render rules
*/
@ -582,7 +576,16 @@ public class RenderPlayer extends RendererLivingEntity
*/
protected TextureLocation getEntityTexture(Entity par1Entity)
{
return this.func_110817_a((EntityPlayer)par1Entity);
if(par1Entity instanceof EntityOtherPlayerMP){
if(!DefaultSkinRenderer.bindSyncedSkin((EntityOtherPlayerMP)par1Entity)) {
entityTexture.bindTexture();
return this.entityTexture;
}
}else{
return DefaultSkinRenderer.defaultVanillaSkins[EaglerProfile.presetSkinId];
}
//return this.func_110817_a((EntityPlayer)par1Entity);
return null;
}
/**

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

@ -269,7 +269,7 @@ public abstract class RendererLivingEntity extends Render
*/
protected void renderModel(EntityLivingBase par1EntityLivingBase, float par2, float par3, float par4, float par5, float par6, float par7)
{
this.bindEntityTexture(par1EntityLivingBase);
this.bindTexture(par1EntityLivingBase);
if (!par1EntityLivingBase.isInvisible())
{