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

Hotfixes

This commit is contained in:
catfoolyou 2025-02-26 14:44:01 -05:00
parent 6f88142730
commit a2d44c8db3
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

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

@ -151,7 +151,7 @@ public class GuiNewChat extends Gui
public void printChatMessageWithOptionalDeletion(String par1Str, int par2) public void printChatMessageWithOptionalDeletion(String par1Str, int par2)
{ {
this.func_96129_a(par1Str, par2, this.mc.ingameGUI.getUpdateCounter(), false); this.func_96129_a(par1Str, par2, this.mc.ingameGUI.getUpdateCounter(), false);
System.out.println("[CHAT] " + EnumChatFormatting.func_110646_a(par1Str)); System.out.println("[CHAT] " + par1Str);
} }
private void func_96129_a(String par1Str, int par2, int par3, boolean par4) private void func_96129_a(String par1Str, int par2, int par3, boolean par4)

33
src/main/java/net/minecraft/src/Minecraft.java
View File

@ -532,42 +532,32 @@ public class Minecraft
*/ */
public void displayGuiScreen(GuiScreen par1GuiScreen) public void displayGuiScreen(GuiScreen par1GuiScreen)
{ {
if (this.currentScreen != null) if (this.currentScreen != null) {
{
this.currentScreen.onGuiClosed(); this.currentScreen.onGuiClosed();
} }
//this.statFileWriter.syncStats(); if (par1GuiScreen == null && this.theWorld == null) {
if (par1GuiScreen == null && this.theWorld == null)
{
par1GuiScreen = new GuiMainMenu(); par1GuiScreen = new GuiMainMenu();
} } else if (par1GuiScreen == null && this.thePlayer.getHealth() <= 0) {
else if (par1GuiScreen == null && this.thePlayer.getHealth() <= 0.0F)
{
par1GuiScreen = new GuiGameOver(); par1GuiScreen = new GuiGameOver();
} }
if (par1GuiScreen instanceof GuiMainMenu) if (par1GuiScreen instanceof GuiMainMenu) {
{
this.gameSettings.showDebugInfo = false; this.gameSettings.showDebugInfo = false;
this.ingameGUI.getChatGUI().clearChatMessages(); this.ingameGUI.getChatGUI().clearChatMessages();
} }
this.currentScreen = (GuiScreen)par1GuiScreen; this.currentScreen = (GuiScreen) par1GuiScreen;
if (par1GuiScreen != null) if (par1GuiScreen != null) {
{
this.setIngameNotInFocus(); this.setIngameNotInFocus();
ScaledResolution var2 = new ScaledResolution(this.gameSettings, this.displayWidth, this.displayHeight); ScaledResolution var2 = new ScaledResolution(this.gameSettings, this.displayWidth, this.displayHeight);
int var3 = var2.getScaledWidth(); int var3 = var2.getScaledWidth();
int var4 = var2.getScaledHeight(); int var4 = var2.getScaledHeight();
((GuiScreen)par1GuiScreen).setWorldAndResolution(this, var3, var4); ((GuiScreen) par1GuiScreen).setWorldAndResolution(this, var3, var4);
this.skipRenderWorld = false; this.skipRenderWorld = false;
} } else {
else if(!this.inGameHasFocus) this.setIngameFocus();
{
this.setIngameFocus();
} }
} }
@ -949,7 +939,7 @@ public class Minecraft
{ {
this.inGameHasFocus = true; this.inGameHasFocus = true;
this.mouseHelper.grabMouseCursor(); this.mouseHelper.grabMouseCursor();
this.displayGuiScreen((GuiScreen)null); this.displayGuiScreen((GuiScreen) null);
this.leftClickCounter = 10000; this.leftClickCounter = 10000;
} }
@ -1610,7 +1600,6 @@ public class Minecraft
*/ */
public void loadWorld(WorldClient par1WorldClient, String par2Str) { public void loadWorld(WorldClient par1WorldClient, String par2Str) {
if (par1WorldClient == null) { if (par1WorldClient == null) {
System.out.println("worldClient is null");
NetClientHandler var3 = this.getNetHandler(); NetClientHandler var3 = this.getNetHandler();
if (var3 != null) { if (var3 != null) {
@ -1624,7 +1613,6 @@ public class Minecraft
this.myNetworkManager = null; this.myNetworkManager = null;
} }
System.out.println("worldClient not null");
this.renderViewEntity = null; this.renderViewEntity = null;
if (this.loadingScreen != null) { if (this.loadingScreen != null) {
@ -1650,7 +1638,6 @@ public class Minecraft
this.theWorld = par1WorldClient; this.theWorld = par1WorldClient;
if (par1WorldClient != null) { if (par1WorldClient != null) {
System.out.println("doing rendering shit");
if (this.renderGlobal != null) { if (this.renderGlobal != null) {
this.renderGlobal.setWorldAndLoadRenderers(par1WorldClient); this.renderGlobal.setWorldAndLoadRenderers(par1WorldClient);
} }