Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SubServers Console v2.12b

This commit is contained in:
ME1312 2017-07-25 01:37:25 -04:00
parent c02db9890c
commit 8b65ec04dd
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Artifacts/SubServers.Console.jar
View File

Binary file not shown.

2
SubServers.Console/src/bungee.yml
View File

@ -1,4 +1,4 @@
name: SubServers-Console name: SubServers-Console
main: net.ME1312.SubServers.Console.ConsolePlugin main: net.ME1312.SubServers.Console.ConsolePlugin
version: 2.12a version: 2.12b
author: ME1312 author: ME1312

56
SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java
View File

@ -3,13 +3,16 @@ package net.ME1312.SubServers.Console;
import net.ME1312.SubServers.Bungee.Host.SubLogFilter; import net.ME1312.SubServers.Bungee.Host.SubLogFilter;
import net.ME1312.SubServers.Bungee.Host.SubLogger; import net.ME1312.SubServers.Bungee.Host.SubLogger;
import net.ME1312.SubServers.Bungee.Host.SubServer; import net.ME1312.SubServers.Bungee.Host.SubServer;
import net.ME1312.SubServers.Bungee.Library.Util;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import javax.imageio.ImageIO;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.Border; import javax.swing.border.Border;
import javax.swing.text.*; import javax.swing.text.*;
import java.awt.*; import java.awt.*;
import java.awt.event.*; import java.awt.event.*;
import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
@ -109,21 +112,21 @@ public final class ConsoleWindow implements SubLogFilter {
item = new JMenuItem("Reset Text Size"); item = new JMenuItem("Reset Text Size");
item.addActionListener(event -> { item.addActionListener(event -> {
log.setFont(log.getFont().deriveFont(12f)); log.setFont(log.getFont().deriveFont(12f));
SwingUtilities.invokeLater(this::hScroll); hScroll();
}); });
menu.add(item); menu.add(item);
item = new JMenuItem("Bigger Text"); item = new JMenuItem("Bigger Text");
item.setAccelerator(KeyStroke.getKeyStroke('=', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), true)); item.setAccelerator(KeyStroke.getKeyStroke('=', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), true));
item.addActionListener(event -> { item.addActionListener(event -> {
log.setFont(log.getFont().deriveFont((float) log.getFont().getSize() + 2)); log.setFont(log.getFont().deriveFont((float) log.getFont().getSize() + 2));
SwingUtilities.invokeLater(this::hScroll); hScroll();
}); });
menu.add(item); menu.add(item);
item = new JMenuItem("Smaller Text"); item = new JMenuItem("Smaller Text");
item.setAccelerator(KeyStroke.getKeyStroke('-', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), true)); item.setAccelerator(KeyStroke.getKeyStroke('-', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), true));
item.addActionListener(event -> { item.addActionListener(event -> {
log.setFont(log.getFont().deriveFont((float) log.getFont().getSize() - 2)); log.setFont(log.getFont().deriveFont((float) log.getFont().getSize() - 2));
SwingUtilities.invokeLater(this::hScroll); hScroll();
}); });
menu.add(item); menu.add(item);
menu.addSeparator(); menu.addSeparator();
@ -142,6 +145,7 @@ public final class ConsoleWindow implements SubLogFilter {
window.setJMenuBar(jMenu); window.setJMenuBar(jMenu);
window.setContentPane(panel); window.setContentPane(panel);
window.pack(); window.pack();
Util.isException(() -> window.setIconImage(ImageIO.read(ConsolePlugin.class.getResourceAsStream("/SubServers.png"))));
window.setTitle(logger.getName() + " \u2014 SubServers 2"); window.setTitle(logger.getName() + " \u2014 SubServers 2");
window.setSize(1024, 576); window.setSize(1024, 576);
Dimension dimension = Toolkit.getDefaultToolkit().getScreenSize(); Dimension dimension = Toolkit.getDefaultToolkit().getScreenSize();
@ -157,7 +161,7 @@ public final class ConsoleWindow implements SubLogFilter {
}); });
window.addComponentListener(new ComponentAdapter() { window.addComponentListener(new ComponentAdapter() {
public void componentResized(ComponentEvent e) { public void componentResized(ComponentEvent e) {
SwingUtilities.invokeLater(ConsoleWindow.this::hScroll); hScroll();
} }
}); });
vScroll.setBorder(BorderFactory.createEmptyBorder()); vScroll.setBorder(BorderFactory.createEmptyBorder());
@ -342,7 +346,7 @@ public final class ConsoleWindow implements SubLogFilter {
if (obj instanceof SubLogger.LogMessage) log(((SubLogger.LogMessage) obj).getDate(), ((SubLogger.LogMessage) obj).getLevel(), ((SubLogger.LogMessage) obj).getMessage()); if (obj instanceof SubLogger.LogMessage) log(((SubLogger.LogMessage) obj).getDate(), ((SubLogger.LogMessage) obj).getLevel(), ((SubLogger.LogMessage) obj).getMessage());
if (obj instanceof SubServer.LoggedCommand) log(((SubServer.LoggedCommand) obj).getDate(), '<' + ((((SubServer.LoggedCommand) obj).getSender() == null)?"CONSOLE":((ProxyServer.getInstance().getPlayer(((SubServer.LoggedCommand) obj).getSender()) == null)?((SubServer.LoggedCommand) obj).getSender().toString():ProxyServer.getInstance().getPlayer(((SubServer.LoggedCommand) obj).getSender()).getName())) + "> /" + ((SubServer.LoggedCommand) obj).getCommand()); if (obj instanceof SubServer.LoggedCommand) log(((SubServer.LoggedCommand) obj).getDate(), '<' + ((((SubServer.LoggedCommand) obj).getSender() == null)?"CONSOLE":((ProxyServer.getInstance().getPlayer(((SubServer.LoggedCommand) obj).getSender()) == null)?((SubServer.LoggedCommand) obj).getSender().toString():ProxyServer.getInstance().getPlayer(((SubServer.LoggedCommand) obj).getSender()).getName())) + "> /" + ((SubServer.LoggedCommand) obj).getCommand());
} }
SwingUtilities.invokeLater(this::hScroll); hScroll();
} }
public SubLogger getLogger() { public SubLogger getLogger() {
@ -366,7 +370,7 @@ public final class ConsoleWindow implements SubLogFilter {
public void clear() { public void clear() {
log.setText("\n"); log.setText("\n");
SwingUtilities.invokeLater(this::hScroll); hScroll();
} }
@Override @Override
@ -374,13 +378,11 @@ public final class ConsoleWindow implements SubLogFilter {
open(); open();
} }
public void open() { public void open() {
SwingUtilities.invokeLater(() -> { if (!open) {
if (!open) { window.setVisible(true);
window.setVisible(true); this.open = true;
this.open = true; }
} window.toFront();
window.toFront();
});
} }
public boolean isOpen() { public boolean isOpen() {
@ -393,18 +395,16 @@ public final class ConsoleWindow implements SubLogFilter {
clear(); clear();
} }
public void close() { public void close() {
SwingUtilities.invokeLater(() -> { if (open) {
if (open) { this.open = false;
this.open = false; if (find.isVisible()) {
if (find.isVisible()) { find.setVisible(false);
find.setVisible(false); findI = 0;
findI = 0; findO = 0;
findO = 0;
}
window.setVisible(false);
plugin.onClose(this);
} }
}); window.setVisible(false);
plugin.onClose(this);
}
} }
public void destroy() { public void destroy() {
@ -614,13 +614,7 @@ public final class ConsoleWindow implements SubLogFilter {
@Override @Override
public void adjustmentValueChanged(final AdjustmentEvent e) public void adjustmentValueChanged(final AdjustmentEvent e)
{ {
SwingUtilities.invokeLater(new Runnable() checkScrollBar(e);
{
public void run()
{
checkScrollBar(e);
}
});
} }
/* /*