From 8cd5e6e0cdcf627fc15038329df785d71ee0fa6d Mon Sep 17 00:00:00 2001 From: Voomra Date: Wed, 11 Jun 2025 22:49:53 +0300 Subject: [PATCH] remove: server gui --- server/build.gradle | 3 +- .../net/minecraft/server/MinecraftServer.java | 7 +- .../minecraft/server/gui/GuiLogFormatter.java | 64 --------- .../server/gui/GuiLogOutputHandler.java | 45 ------- .../server/gui/GuiStatsComponent.java | 111 ---------------- .../server/gui/GuiStatsListener.java | 19 --- .../net/minecraft/server/gui/ServerGUI.java | 122 ------------------ .../server/gui/ServerGuiCommandListener.java | 32 ----- .../server/gui/ServerGuiFocusAdapter.java | 19 --- .../server/gui/ServerWindowAdapter.java | 35 ----- 10 files changed, 2 insertions(+), 455 deletions(-) delete mode 100644 server/src/main/java/net/minecraft/server/gui/GuiLogFormatter.java delete mode 100644 server/src/main/java/net/minecraft/server/gui/GuiLogOutputHandler.java delete mode 100644 server/src/main/java/net/minecraft/server/gui/GuiStatsComponent.java delete mode 100644 server/src/main/java/net/minecraft/server/gui/GuiStatsListener.java delete mode 100644 server/src/main/java/net/minecraft/server/gui/ServerGUI.java delete mode 100644 server/src/main/java/net/minecraft/server/gui/ServerGuiCommandListener.java delete mode 100644 server/src/main/java/net/minecraft/server/gui/ServerGuiFocusAdapter.java delete mode 100644 server/src/main/java/net/minecraft/server/gui/ServerWindowAdapter.java diff --git a/server/build.gradle b/server/build.gradle index c8f58ea..c02eea5 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,4 +1,4 @@ -//file:noinspection GrDeprecatedAPIUsage +//file:noinspection all plugins { id "application" } @@ -16,5 +16,4 @@ run { if (!workingDir.exists()) { workingDir.mkdir() } - args "nogui" } diff --git a/server/src/main/java/net/minecraft/server/MinecraftServer.java b/server/src/main/java/net/minecraft/server/MinecraftServer.java index 0ed1096..1fda8fa 100644 --- a/server/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/server/src/main/java/net/minecraft/server/MinecraftServer.java @@ -34,7 +34,6 @@ import net.minecraft.server.rcon.RConThreadMain; import net.minecraft.server.rcon.RConThreadQuery; import net.minecraft.src.ServerCommand; import net.minecraft.src.ServerConfigurationManager; -import net.minecraft.server.gui.ServerGUI; import ru.di9.minecraft.shared.stat.StatList; import net.minecraft.src.ThreadCommandReader; import net.minecraft.src.ThreadServerApplication; @@ -46,6 +45,7 @@ import net.minecraft.src.WorldServerMulti; import ru.di9.minecraft.shared.world.WorldSettings; import ru.di9.minecraft.shared.world.WorldType; +@SuppressWarnings("all") public class MinecraftServer implements Runnable, ICommandListener, IServer { /** The logging system. */ @@ -633,11 +633,6 @@ public class MinecraftServer implements Runnable, ICommandListener, IServer { MinecraftServer minecraftserver = new MinecraftServer(); - if (!java.awt.GraphicsEnvironment.isHeadless() && (par0ArrayOfStr.length <= 0 || !par0ArrayOfStr[0].equals("nogui"))) - { - ServerGUI.initGui(minecraftserver); - } - (new ThreadServerApplication("Server thread", minecraftserver)).start(); } catch (Exception exception) diff --git a/server/src/main/java/net/minecraft/server/gui/GuiLogFormatter.java b/server/src/main/java/net/minecraft/server/gui/GuiLogFormatter.java deleted file mode 100644 index d9546b7..0000000 --- a/server/src/main/java/net/minecraft/server/gui/GuiLogFormatter.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.minecraft.server.gui; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.logging.*; - -class GuiLogFormatter extends Formatter -{ - /** Reference to the GuiLogOutputHandler. */ - final GuiLogOutputHandler outputHandler; - - GuiLogFormatter(GuiLogOutputHandler par1GuiLogOutputHandler) - { - outputHandler = par1GuiLogOutputHandler; - } - - public String format(LogRecord par1LogRecord) - { - StringBuilder stringbuilder = new StringBuilder(); - Level level = par1LogRecord.getLevel(); - - if (level == Level.FINEST) - { - stringbuilder.append("[FINEST] "); - } - else if (level == Level.FINER) - { - stringbuilder.append("[FINER] "); - } - else if (level == Level.FINE) - { - stringbuilder.append("[FINE] "); - } - else if (level == Level.INFO) - { - stringbuilder.append("[INFO] "); - } - else if (level == Level.WARNING) - { - stringbuilder.append("[WARNING] "); - } - else if (level == Level.SEVERE) - { - stringbuilder.append("[SEVERE] "); - } - else if (level == Level.SEVERE) - { - stringbuilder.append((new StringBuilder()).append("[").append(level.getLocalizedName()).append("] ").toString()); - } - - stringbuilder.append(par1LogRecord.getMessage()); - stringbuilder.append('\n'); - Throwable throwable = par1LogRecord.getThrown(); - - if (throwable != null) - { - StringWriter stringwriter = new StringWriter(); - throwable.printStackTrace(new PrintWriter(stringwriter)); - stringbuilder.append(stringwriter.toString()); - } - - return stringbuilder.toString(); - } -} diff --git a/server/src/main/java/net/minecraft/server/gui/GuiLogOutputHandler.java b/server/src/main/java/net/minecraft/server/gui/GuiLogOutputHandler.java deleted file mode 100644 index f6c974f..0000000 --- a/server/src/main/java/net/minecraft/server/gui/GuiLogOutputHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.minecraft.server.gui; - -import java.util.logging.*; -import javax.swing.JTextArea; - -public class GuiLogOutputHandler extends Handler -{ - private int field_998_b[]; - private int field_1001_c; - Formatter field_999_a; - private JTextArea field_1000_d; - - public GuiLogOutputHandler(JTextArea par1JTextArea) - { - field_998_b = new int[1024]; - field_1001_c = 0; - field_999_a = new GuiLogFormatter(this); - setFormatter(field_999_a); - field_1000_d = par1JTextArea; - } - - public void close() - { - } - - public void flush() - { - } - - public void publish(LogRecord par1LogRecord) - { - int i = field_1000_d.getDocument().getLength(); - field_1000_d.append(field_999_a.format(par1LogRecord)); - field_1000_d.setCaretPosition(field_1000_d.getDocument().getLength()); - int j = field_1000_d.getDocument().getLength() - i; - - if (field_998_b[field_1001_c] != 0) - { - field_1000_d.replaceRange("", 0, field_998_b[field_1001_c]); - } - - field_998_b[field_1001_c] = j; - field_1001_c = (field_1001_c + 1) % 1024; - } -} diff --git a/server/src/main/java/net/minecraft/server/gui/GuiStatsComponent.java b/server/src/main/java/net/minecraft/server/gui/GuiStatsComponent.java deleted file mode 100644 index e84af82..0000000 --- a/server/src/main/java/net/minecraft/server/gui/GuiStatsComponent.java +++ /dev/null @@ -1,111 +0,0 @@ -package net.minecraft.server.gui; - -import java.awt.*; -import java.text.DecimalFormat; -import javax.swing.JComponent; -import javax.swing.Timer; -import net.minecraft.server.MinecraftServer; -import ru.di9.minecraft.shared.network.NetworkManager; - -public class GuiStatsComponent extends JComponent -{ - private static final DecimalFormat field_40573_a = new DecimalFormat("########0.000"); - private int memoryUse[]; - - /** - * Counts the number of updates. Used as the index into the memoryUse array to display the latest value. - */ - private int updateCounter; - private String displayStrings[]; - private final MinecraftServer field_40572_e; - - public GuiStatsComponent(MinecraftServer par1MinecraftServer) - { - memoryUse = new int[256]; - updateCounter = 0; - displayStrings = new String[10]; - field_40572_e = par1MinecraftServer; - setPreferredSize(new Dimension(356, 246)); - setMinimumSize(new Dimension(356, 246)); - setMaximumSize(new Dimension(356, 246)); - (new Timer(500, new GuiStatsListener(this))).start(); - setBackground(Color.BLACK); - } - - /** - * Updates the stat values and calls paint to redraw the component. - */ - private void updateStats() - { - int i; - long l = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); - System.gc(); - displayStrings[0] = (new StringBuilder()).append("Memory use: ").append(l / 1024L / 1024L).append(" mb (").append((Runtime.getRuntime().freeMemory() * 100L) / Runtime.getRuntime().maxMemory()).append("% free)").toString(); - displayStrings[1] = (new StringBuilder()).append("Threads: ").append(NetworkManager.numReadThreads).append(" + ").append(NetworkManager.numWriteThreads).toString(); - displayStrings[2] = (new StringBuilder()).append("Avg tick: ").append(field_40573_a.format(func_48551_a(field_40572_e.field_40027_f) * 9.9999999999999995E-007D)).append(" ms").toString(); - displayStrings[3] = (new StringBuilder()).append("Avg sent: ").append((int)func_48551_a(field_40572_e.field_48080_u)).append(", Avg size: ").append((int)func_48551_a(field_40572_e.field_48079_v)).toString(); - displayStrings[4] = (new StringBuilder()).append("Avg rec: ").append((int)func_48551_a(field_40572_e.field_48078_w)).append(", Avg size: ").append((int)func_48551_a(field_40572_e.field_48082_x)).toString(); - - if (this.field_40572_e.worldMngr != null) - { - for (int var3 = 0; var3 < this.field_40572_e.worldMngr.length; ++var3) - { - this.displayStrings[5 + var3] = "Lvl " + var3 + " tick: " + field_40573_a.format(this.func_48551_a(this.field_40572_e.field_40028_g[var3]) * 1.0E-6D) + " ms"; - - if (this.field_40572_e.worldMngr[var3] != null && this.field_40572_e.worldMngr[var3].chunkProviderServer != null) - { - this.displayStrings[5 + var3] = this.displayStrings[5 + var3] + ", " + this.field_40572_e.worldMngr[var3].chunkProviderServer.func_46040_d(); - } - } - } - - memoryUse[updateCounter++ & 0xff] = (int)((func_48551_a(field_40572_e.field_48079_v) * 100D) / 12500D); - repaint(); - return; - } - - private double func_48551_a(long par1ArrayOfLong[]) - { - long l = 0L; - - for (int i = 0; i < par1ArrayOfLong.length; i++) - { - l += par1ArrayOfLong[i]; - } - - return (double)l / (double)par1ArrayOfLong.length; - } - - public void paint(Graphics par1Graphics) - { - par1Graphics.setColor(new Color(0xffffff)); - par1Graphics.fillRect(0, 0, 356, 246); - - for (int i = 0; i < 256; i++) - { - int k = memoryUse[i + updateCounter & 0xff]; - par1Graphics.setColor(new Color(k + 28 << 16)); - par1Graphics.fillRect(i, 100 - k, 1, k); - } - - par1Graphics.setColor(Color.BLACK); - - for (int j = 0; j < displayStrings.length; j++) - { - String s = displayStrings[j]; - - if (s != null) - { - par1Graphics.drawString(s, 32, 116 + j * 16); - } - } - } - - /** - * Public static accessor to call updateStats. - */ - static void update(GuiStatsComponent par0GuiStatsComponent) - { - par0GuiStatsComponent.updateStats(); - } -} diff --git a/server/src/main/java/net/minecraft/server/gui/GuiStatsListener.java b/server/src/main/java/net/minecraft/server/gui/GuiStatsListener.java deleted file mode 100644 index 869d4d9..0000000 --- a/server/src/main/java/net/minecraft/server/gui/GuiStatsListener.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.minecraft.server.gui; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -class GuiStatsListener implements ActionListener -{ - final GuiStatsComponent statsComponent; - - GuiStatsListener(GuiStatsComponent par1GuiStatsComponent) - { - statsComponent = par1GuiStatsComponent; - } - - public void actionPerformed(ActionEvent par1ActionEvent) - { - GuiStatsComponent.update(statsComponent); - } -} diff --git a/server/src/main/java/net/minecraft/server/gui/ServerGUI.java b/server/src/main/java/net/minecraft/server/gui/ServerGUI.java deleted file mode 100644 index 0ed5a62..0000000 --- a/server/src/main/java/net/minecraft/server/gui/ServerGUI.java +++ /dev/null @@ -1,122 +0,0 @@ -package net.minecraft.server.gui; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.util.logging.Logger; -import javax.swing.*; -import javax.swing.border.EtchedBorder; -import javax.swing.border.TitledBorder; -import net.minecraft.server.MinecraftServer; -import net.minecraft.src.*; - -public class ServerGUI extends JComponent implements ICommandListener -{ - /** Reference to the logger. */ - public static Logger logger = Logger.getLogger("Minecraft"); - - /** Reference to the MinecraftServer object. */ - private MinecraftServer mcServer; - - /** - * Initialises the GUI components. - */ - public static void initGui(MinecraftServer par0MinecraftServer) - { - try - { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } - catch (Exception exception) { } - - ServerGUI servergui = new ServerGUI(par0MinecraftServer); - JFrame jframe = new JFrame("Minecraft server"); - jframe.add(servergui); - jframe.pack(); - jframe.setLocationRelativeTo(null); - jframe.setVisible(true); - jframe.addWindowListener(new ServerWindowAdapter(par0MinecraftServer)); - } - - public ServerGUI(MinecraftServer par1MinecraftServer) - { - mcServer = par1MinecraftServer; - setPreferredSize(new Dimension(854, 480)); - setLayout(new BorderLayout()); - - try - { - add(getLogComponent(), "Center"); - add(getStatsComponent(), "West"); - } - catch (Exception exception) - { - exception.printStackTrace(); - } - } - - /** - * Returns a new JPanel with a new GuiStatsComponent inside. - */ - private JComponent getStatsComponent() - { - JPanel jpanel = new JPanel(new BorderLayout()); - jpanel.add(new GuiStatsComponent(mcServer), "North"); - jpanel.add(getPlayerListComponent(), "Center"); - jpanel.setBorder(new TitledBorder(new EtchedBorder(), "Stats")); - return jpanel; - } - - /** - * Returns a new JScrollPane with a new PlayerListBox inside. - */ - private JComponent getPlayerListComponent() - { - PlayerListBox playerlistbox = new PlayerListBox(mcServer); - JScrollPane jscrollpane = new JScrollPane(playerlistbox, 22, 30); - jscrollpane.setBorder(new TitledBorder(new EtchedBorder(), "Players")); - return jscrollpane; - } - - /** - * Returns a new JPanel with a new GuiStatsComponent inside. - */ - private JComponent getLogComponent() - { - JPanel jpanel = new JPanel(new BorderLayout()); - JTextArea jtextarea = new JTextArea(); - logger.addHandler(new GuiLogOutputHandler(jtextarea)); - JScrollPane jscrollpane = new JScrollPane(jtextarea, 22, 30); - jtextarea.setEditable(false); - JTextField jtextfield = new JTextField(); - jtextfield.addActionListener(new ServerGuiCommandListener(this, jtextfield)); - jtextarea.addFocusListener(new ServerGuiFocusAdapter(this)); - jpanel.add(jscrollpane, "Center"); - jpanel.add(jtextfield, "South"); - jpanel.setBorder(new TitledBorder(new EtchedBorder(), "Log and chat")); - return jpanel; - } - - /** - * Logs the message with a level of INFO. - */ - public void log(String par1Str) - { - logger.info(par1Str); - } - - /** - * Gets the players username. - */ - public String getUsername() - { - return "CONSOLE"; - } - - /** - * Returns the MinecraftServer associated with the ServerGui. - */ - static MinecraftServer getMinecraftServer(ServerGUI par0ServerGUI) - { - return par0ServerGUI.mcServer; - } -} diff --git a/server/src/main/java/net/minecraft/server/gui/ServerGuiCommandListener.java b/server/src/main/java/net/minecraft/server/gui/ServerGuiCommandListener.java deleted file mode 100644 index 8540747..0000000 --- a/server/src/main/java/net/minecraft/server/gui/ServerGuiCommandListener.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.minecraft.server.gui; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import javax.swing.JTextField; - -class ServerGuiCommandListener implements ActionListener -{ - /** Text field. */ - final JTextField textField; - - /** Reference to the ServerGui object. */ - final ServerGUI mcServerGui; - - ServerGuiCommandListener(ServerGUI par1ServerGUI, JTextField par2JTextField) - { - mcServerGui = par1ServerGUI; - textField = par2JTextField; - } - - public void actionPerformed(ActionEvent par1ActionEvent) - { - String s = textField.getText().trim(); - - if (s.length() > 0) - { - ServerGUI.getMinecraftServer(mcServerGui).addCommand(s, mcServerGui); - } - - textField.setText(""); - } -} diff --git a/server/src/main/java/net/minecraft/server/gui/ServerGuiFocusAdapter.java b/server/src/main/java/net/minecraft/server/gui/ServerGuiFocusAdapter.java deleted file mode 100644 index 58a9b55..0000000 --- a/server/src/main/java/net/minecraft/server/gui/ServerGuiFocusAdapter.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.minecraft.server.gui; - -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; - -class ServerGuiFocusAdapter extends FocusAdapter -{ - /** Reference to the ServerGui object. */ - final ServerGUI mcServerGui; - - ServerGuiFocusAdapter(ServerGUI par1ServerGUI) - { - mcServerGui = par1ServerGUI; - } - - public void focusGained(FocusEvent focusevent) - { - } -} diff --git a/server/src/main/java/net/minecraft/server/gui/ServerWindowAdapter.java b/server/src/main/java/net/minecraft/server/gui/ServerWindowAdapter.java deleted file mode 100644 index 8a754d4..0000000 --- a/server/src/main/java/net/minecraft/server/gui/ServerWindowAdapter.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.minecraft.server.gui; - -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import net.minecraft.server.MinecraftServer; - -final class ServerWindowAdapter extends WindowAdapter -{ - /** Reference to the MinecraftServer object. */ - final MinecraftServer mcServer; - - ServerWindowAdapter(MinecraftServer par1MinecraftServer) - { - mcServer = par1MinecraftServer; - } - - public void windowClosing(WindowEvent par1WindowEvent) - { - mcServer.initiateShutdown(); - - while (!mcServer.serverStopped) - { - try - { - Thread.sleep(100L); - } - catch (InterruptedException interruptedexception) - { - interruptedexception.printStackTrace(); - } - } - - System.exit(0); - } -}