From 0c6916f8c9a59ec84f5100ceb60c210e06f97577 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Wed, 28 Jun 2023 21:46:42 +0600 Subject: [PATCH] Fixes --- .../client/gui/minecraft/GuiConnecting.java | 8 ++++---- .../client/gui/minecraft/GuiIngameMenu.java | 2 +- .../silentclient/client/gui/minecraft/GuiMainMenu.java | 10 +++++----- .../net/silentclient/client/mods/hud/MiniMapMod.java | 2 +- .../java/net/silentclient/client/mods/util/Utils.java | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/silentclient/client/gui/minecraft/GuiConnecting.java b/src/main/java/net/silentclient/client/gui/minecraft/GuiConnecting.java index bacef4f..fa6348b 100644 --- a/src/main/java/net/silentclient/client/gui/minecraft/GuiConnecting.java +++ b/src/main/java/net/silentclient/client/gui/minecraft/GuiConnecting.java @@ -77,7 +77,7 @@ public class GuiConnecting extends GuiScreen try { Minecraft.getMinecraft().isIntegratedServerRunning(); - Minecraft.getMinecraft().func_181540_al(); + Minecraft.getMinecraft().getIntegratedServer(); Minecraft.getMinecraft().theWorld.sendQuittingDisconnectingPacket(); Minecraft.getMinecraft().loadWorld((WorldClient)null); } catch(Exception err) { @@ -85,7 +85,7 @@ public class GuiConnecting extends GuiScreen } inetaddress = InetAddress.getByName(ip); - GuiConnecting.this.networkManager = NetworkManager.func_181124_a(inetaddress, port, GuiConnecting.this.mc.gameSettings.func_181148_f()); + GuiConnecting.this.networkManager = NetworkManager.createNetworkManagerAndConnect(inetaddress, port, GuiConnecting.this.mc.gameSettings.useNativeTransport); GuiConnecting.this.networkManager.setNetHandler(new NetHandlerLoginClient(GuiConnecting.this.networkManager, GuiConnecting.this.mc, GuiConnecting.this.previousGuiScreen)); GuiConnecting.this.networkManager.sendPacket(new C00Handshake(47, ip, port, EnumConnectionState.LOGIN)); GuiConnecting.this.networkManager.sendPacket(new C00PacketLoginStart(GuiConnecting.this.mc.getSession().getProfile())); @@ -141,7 +141,7 @@ public class GuiConnecting extends GuiScreen try { Minecraft.getMinecraft().isIntegratedServerRunning(); - Minecraft.getMinecraft().func_181540_al(); + Minecraft.getMinecraft().getIntegratedServer(); Minecraft.getMinecraft().theWorld.sendQuittingDisconnectingPacket(); Minecraft.getMinecraft().loadWorld((WorldClient)null); } catch(Exception err) { @@ -149,7 +149,7 @@ public class GuiConnecting extends GuiScreen } inetaddress = InetAddress.getByName(ip); - GuiConnecting.this.networkManager = NetworkManager.func_181124_a(inetaddress, port, GuiConnecting.this.mc.gameSettings.func_181148_f()); + GuiConnecting.this.networkManager = NetworkManager.createNetworkManagerAndConnect(inetaddress, port, GuiConnecting.this.mc.gameSettings.useNativeTransport); GuiConnecting.this.networkManager.setNetHandler(new NetHandlerLoginClient(GuiConnecting.this.networkManager, GuiConnecting.this.mc, GuiConnecting.this.previousGuiScreen)); GuiConnecting.this.networkManager.sendPacket(new C00Handshake(47, ip, port, EnumConnectionState.LOGIN)); GuiConnecting.this.networkManager.sendPacket(new C00PacketLoginStart(GuiConnecting.this.mc.getSession().getProfile())); diff --git a/src/main/java/net/silentclient/client/gui/minecraft/GuiIngameMenu.java b/src/main/java/net/silentclient/client/gui/minecraft/GuiIngameMenu.java index c18e579..fe801e8 100644 --- a/src/main/java/net/silentclient/client/gui/minecraft/GuiIngameMenu.java +++ b/src/main/java/net/silentclient/client/gui/minecraft/GuiIngameMenu.java @@ -79,7 +79,7 @@ public class GuiIngameMenu extends GuiScreen case 1: boolean flag = this.mc.isIntegratedServerRunning(); - boolean flag1 = this.mc.func_181540_al(); + boolean flag1 = this.mc.isSingleplayer(); button.enabled = false; this.mc.theWorld.sendQuittingDisconnectingPacket(); this.mc.loadWorld((WorldClient)null); diff --git a/src/main/java/net/silentclient/client/gui/minecraft/GuiMainMenu.java b/src/main/java/net/silentclient/client/gui/minecraft/GuiMainMenu.java index 5dbdd7c..1822603 100644 --- a/src/main/java/net/silentclient/client/gui/minecraft/GuiMainMenu.java +++ b/src/main/java/net/silentclient/client/gui/minecraft/GuiMainMenu.java @@ -87,8 +87,8 @@ public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback if (!GLContext.getCapabilities().OpenGL20 && !OpenGlHelper.areShadersSupported()) { - this.openGLWarning1 = I18n.format("title.oldgl1", new Object[0]); - this.openGLWarning2 = I18n.format("title.oldgl2", new Object[0]); + this.openGLWarning1 = I18n.format("title.oldgl1"); + this.openGLWarning2 = I18n.format("title.oldgl2"); this.openGLWarningLink = "https://help.mojang.com/customer/portal/articles/325948?ref=game"; } } @@ -102,8 +102,8 @@ public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback if (!GLContext.getCapabilities().OpenGL20 && !OpenGlHelper.areShadersSupported()) { - this.openGLWarning1 = I18n.format("title.oldgl1", new Object[0]); - this.openGLWarning2 = I18n.format("title.oldgl2", new Object[0]); + this.openGLWarning1 = I18n.format("title.oldgl1"); + this.openGLWarning2 = I18n.format("title.oldgl2"); this.openGLWarningLink = "https://help.mojang.com/customer/portal/articles/325948?ref=game"; } } @@ -241,7 +241,7 @@ public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback if (worldinfo != null) { - GuiYesNo guiyesno = GuiSelectWorld.func_152129_a(this, worldinfo.getWorldName(), 12); + GuiYesNo guiyesno = GuiSelectWorld.makeDeleteWorldYesNo(this, worldinfo.getWorldName(), 12); this.mc.displayGuiScreen(guiyesno); } } diff --git a/src/main/java/net/silentclient/client/mods/hud/MiniMapMod.java b/src/main/java/net/silentclient/client/mods/hud/MiniMapMod.java index 4ca6a79..f7582c2 100644 --- a/src/main/java/net/silentclient/client/mods/hud/MiniMapMod.java +++ b/src/main/java/net/silentclient/client/mods/hud/MiniMapMod.java @@ -249,7 +249,7 @@ public class MiniMapMod extends ModDraggable { if (j / 4 == 0) { miniMapTexture.getTextureData()[i] = (i + i / 128 & 1) * 8 + 16 << 24; } else { - miniMapTexture.getTextureData()[i] = MapColor.mapColorArray[j / 4].func_151643_b(j & 3); + miniMapTexture.getTextureData()[i] = MapColor.mapColorArray[j / 4].getMapColor(j & 3); } } diff --git a/src/main/java/net/silentclient/client/mods/util/Utils.java b/src/main/java/net/silentclient/client/mods/util/Utils.java index 5472f8e..8e994a6 100644 --- a/src/main/java/net/silentclient/client/mods/util/Utils.java +++ b/src/main/java/net/silentclient/client/mods/util/Utils.java @@ -25,7 +25,7 @@ public class Utils { public static void pingServer(String address, IntConsumer callback) throws UnknownHostException { ServerAddress serverAddress = ServerAddress.fromString(address); - NetworkManager networkManager = NetworkManager.func_181124_a( + NetworkManager networkManager = NetworkManager.createNetworkManagerAndConnect( InetAddress.getByName(serverAddress.getIP()), serverAddress.getPort(), false); networkManager.setNetHandler(new INetHandlerStatusClient() {