From ff9cccc5412c1563ad1e7d933abfe3bc4cb7f273 Mon Sep 17 00:00:00 2001 From: Voomra Date: Sun, 15 Jun 2025 16:10:40 +0300 Subject: [PATCH] =?UTF-8?q?remove:=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20Mojang?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/minecraft/client/Minecraft.java | 44 ++++--------------- .../net/minecraft/src/NetClientHandler.java | 40 +++-------------- .../net/minecraft/src/ThreadCheckHasPaid.java | 35 --------------- .../shared/network/packet/Packet1Login.java | 24 +++++----- 4 files changed, 25 insertions(+), 118 deletions(-) delete mode 100644 client/src/main/java/net/minecraft/src/ThreadCheckHasPaid.java diff --git a/client/src/main/java/net/minecraft/client/Minecraft.java b/client/src/main/java/net/minecraft/client/Minecraft.java index 614daf4..3391e7a 100644 --- a/client/src/main/java/net/minecraft/client/Minecraft.java +++ b/client/src/main/java/net/minecraft/client/Minecraft.java @@ -115,7 +115,6 @@ public class Minecraft implements Runnable private EntityLiving renderViewEntity; private EffectRenderer effectRenderer; private Session session; - private String minecraftUri; private Canvas mcCanvas; /** a boolean to hide a Quit button from the main menu */ @@ -1538,11 +1537,6 @@ public class Minecraft implements Runnable } } - private void startThreadCheckHasPaid() - { - (new ThreadCheckHasPaid(this)).start(); - } - /** * Runs the current tick. */ @@ -1553,11 +1547,6 @@ public class Minecraft implements Runnable rightClickDelayTimer--; } - if (ticksRan == 6000) - { - startThreadCheckHasPaid(); - } - Profiler.startSection("stats"); statFileWriter.func_27178_d(); Profiler.endStartSection("gui"); @@ -2434,10 +2423,9 @@ public class Minecraft implements Runnable } } - public static void startMainThread(String par0Str, String par1Str, String par2Str) + public static void startMainThread(String username, String serverAddr) { boolean flag = false; - String s = par0Str; Frame frame = new Frame("Minecraft"); Canvas canvas = new Canvas(); frame.setLayout(new BorderLayout()); @@ -2448,20 +2436,12 @@ public class Minecraft implements Runnable Minecraft minecraftimpl = new Minecraft(frame, canvas, 854, 480, flag, frame); Thread thread = new Thread(minecraftimpl, "Minecraft main thread"); thread.setPriority(10); - minecraftimpl.minecraftUri = "www.minecraft.net"; - if (s != null && par1Str != null) - { - minecraftimpl.session = new Session(s, par1Str); - } - else - { - minecraftimpl.session = new Session((new StringBuilder()).append("Player").append(System.currentTimeMillis() % 1000L).toString(), ""); - } + minecraftimpl.session = new Session(username, ""); - if (par2Str != null) + if (serverAddr != null) { - String as[] = par2Str.split(":"); + String as[] = serverAddr.split(":"); minecraftimpl.setServer(as[0], Integer.parseInt(as[1])); } @@ -2487,23 +2467,15 @@ public class Minecraft implements Runnable public static void main(String par0ArrayOfStr[]) { - String s = null; - String s1 = null; - s = (new StringBuilder()).append("Player").append(System.currentTimeMillis() % 1000L).toString(); + String username = null; + username = (new StringBuilder()).append("Player").append(System.currentTimeMillis() % 1000L).toString(); if (par0ArrayOfStr.length > 0) { - s = par0ArrayOfStr[0]; + username = par0ArrayOfStr[0]; } - s1 = "-"; - - if (par0ArrayOfStr.length > 1) - { - s1 = par0ArrayOfStr[1]; - } - - startMainThread(s, s1, null); + startMainThread(username, null); } public static boolean isGuiEnabled() diff --git a/client/src/main/java/net/minecraft/src/NetClientHandler.java b/client/src/main/java/net/minecraft/src/NetClientHandler.java index 0343c5f..6c2dd48 100644 --- a/client/src/main/java/net/minecraft/src/NetClientHandler.java +++ b/client/src/main/java/net/minecraft/src/NetClientHandler.java @@ -667,19 +667,19 @@ public class NetClientHandler extends NetHandler public void handleHandshake(Packet2Handshake par1Packet2Handshake) { boolean flag = true; - String s = par1Packet2Handshake.username; + String username = par1Packet2Handshake.username; - if (s == null || s.trim().length() == 0) + if (username == null || username.trim().length() == 0) { flag = false; } - else if (!s.equals("-")) + else if (!username.equals("-")) { try { - Long.parseLong(s, 16); + Long.parseLong(username, 16); } - catch (NumberFormatException numberformatexception) + catch (NumberFormatException e) { flag = false; } @@ -696,36 +696,6 @@ public class NetClientHandler extends NetHandler { addToSendQueue(new Packet1Login(mc.getSession().username, 29)); } - else - { - try - { - URL url = new URL((new StringBuilder()).append("http://session.minecraft.net/game/joinserver.jsp?user=").append(mc.getSession().username).append("&sessionId=").append(mc.getSession().sessionId).append("&serverId=").append(par1Packet2Handshake.username).toString()); - BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(url.openStream())); - String s1 = bufferedreader.readLine(); - bufferedreader.close(); - - if (s1.equalsIgnoreCase("ok")) - { - addToSendQueue(new Packet1Login(mc.getSession().username, 29)); - } - else - { - netManager.networkShutdown("disconnect.loginFailedInfo", new Object[] - { - s1 - }); - } - } - catch (Exception exception) - { - exception.printStackTrace(); - netManager.networkShutdown("disconnect.genericReason", new Object[] - { - (new StringBuilder()).append("Internal client error: ").append(exception.toString()).toString() - }); - } - } } /** diff --git a/client/src/main/java/net/minecraft/src/ThreadCheckHasPaid.java b/client/src/main/java/net/minecraft/src/ThreadCheckHasPaid.java deleted file mode 100644 index bdf7ec7..0000000 --- a/client/src/main/java/net/minecraft/src/ThreadCheckHasPaid.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.minecraft.src; - -import java.net.HttpURLConnection; -import java.net.URL; -import net.minecraft.client.Minecraft; - -public class ThreadCheckHasPaid extends Thread -{ - final Minecraft mc; - - public ThreadCheckHasPaid(Minecraft par1Minecraft) - { - mc = par1Minecraft; - } - - public void run() - { - try - { - HttpURLConnection httpurlconnection = (HttpURLConnection)(new URL((new StringBuilder()).append("https://login.minecraft.net/session?name=").append(mc.getSession().username).append("&session=").append(mc.getSession().sessionId).toString())).openConnection(); - httpurlconnection.connect(); - - if (httpurlconnection.getResponseCode() == 400 && this == null) - { - Minecraft.hasPaidCheckTime = System.currentTimeMillis(); - } - - httpurlconnection.disconnect(); - } - catch (Exception exception) - { - exception.printStackTrace(); - } - } -} diff --git a/shared/src/main/java/ru/di9/minecraft/shared/network/packet/Packet1Login.java b/shared/src/main/java/ru/di9/minecraft/shared/network/packet/Packet1Login.java index fa5b7a1..4f8279e 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/network/packet/Packet1Login.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/network/packet/Packet1Login.java @@ -32,22 +32,22 @@ public class Packet1Login extends Packet { } - public Packet1Login(String par1Str, int par2) + public Packet1Login(String username, int protocolVersion) { - username = par1Str; - protocolVersion = par2; + this.username = username; + this.protocolVersion = protocolVersion; } - public Packet1Login(String par1Str, int par2, WorldType par3WorldType, int par4, int par5, byte par6, byte par7, byte par8) + public Packet1Login(String username, int protocolVersion, WorldType terrainType, int serverMode, int dimension, byte difficultySetting, byte worldHeight, byte maxPlayers) { - username = par1Str; - protocolVersion = par2; - terrainType = par3WorldType; - dimension = par5; - difficultySetting = par6; - serverMode = par4; - worldHeight = par7; - maxPlayers = par8; + this.username = username; + this.protocolVersion = protocolVersion; + this.terrainType = terrainType; + this.dimension = dimension; + this.difficultySetting = difficultySetting; + this.serverMode = serverMode; + this.worldHeight = worldHeight; + this.maxPlayers = maxPlayers; } /**