diff --git a/bin/.gitignore b/bin/.gitignore index d73e5d7..cf1db2e 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1 @@ /org/ -/net/ diff --git a/bin/java.policy.applet b/bin/java.policy.applet deleted file mode 100644 index 35527af..0000000 --- a/bin/java.policy.applet +++ /dev/null @@ -1,7 +0,0 @@ -/* AUTOMATICALLY GENERATED ON Tue Apr 16 17:20:59 EDT 2002*/ -/* DO NOT EDIT */ - -grant { - permission java.security.AllPermission; -}; - diff --git a/bin/org/betacraft/launcher/Launcher.class b/bin/org/betacraft/launcher/Launcher.class index 5136db7..60887e9 100644 Binary files a/bin/org/betacraft/launcher/Launcher.class and b/bin/org/betacraft/launcher/Launcher.class differ diff --git a/bin/org/betacraft/launcher/Wersja$1.class b/bin/org/betacraft/launcher/Wersja$1.class index 0e89e93..25283b9 100644 Binary files a/bin/org/betacraft/launcher/Wersja$1.class and b/bin/org/betacraft/launcher/Wersja$1.class differ diff --git a/bin/org/betacraft/launcher/Wersja.class b/bin/org/betacraft/launcher/Wersja.class index df6afd6..7ea65db 100644 Binary files a/bin/org/betacraft/launcher/Wersja.class and b/bin/org/betacraft/launcher/Wersja.class differ diff --git a/src/java.policy.applet b/src/java.policy.applet deleted file mode 100644 index 35527af..0000000 --- a/src/java.policy.applet +++ /dev/null @@ -1,7 +0,0 @@ -/* AUTOMATICALLY GENERATED ON Tue Apr 16 17:20:59 EDT 2002*/ -/* DO NOT EDIT */ - -grant { - permission java.security.AllPermission; -}; - diff --git a/src/org/betacraft/launcher/Lang.java b/src/org/betacraft/launcher/Lang.java index 8e822d4..5db3615 100644 --- a/src/org/betacraft/launcher/Lang.java +++ b/src/org/betacraft/launcher/Lang.java @@ -17,6 +17,8 @@ import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; +import org.betacraft.launcher.VersionSorter.Order; + public class Lang extends JFrame { public static List locales = new ArrayList(); @@ -152,6 +154,7 @@ public static void apply() { Wersja wersja = Window.currentAbout; if (wersja != null) { wersja.setTitle(Launcher.getProperty(file, "version_title")); + Wersja.orderbutton.setText(Wersja.order == Order.FROM_OLDEST ? Launcher.getProperty(file, "sort_oldest") : Launcher.getProperty(file, "sort_newest")); } } } diff --git a/src/org/betacraft/launcher/Launcher.java b/src/org/betacraft/launcher/Launcher.java index 739f483..3566516 100644 --- a/src/org/betacraft/launcher/Launcher.java +++ b/src/org/betacraft/launcher/Launcher.java @@ -33,7 +33,7 @@ public class Launcher { public static File LOGIN = new File(BC.get(), "lastlogin"); public static String chosen_version = "b1.6.6"; - public static String VERSION = "Preview 3 build 2"; + public static String VERSION = "Preview 3 build 3"; private static URLClassLoader classLoader; int sessions = 0; @@ -43,6 +43,27 @@ public static void main(String[] args) { new File(BC.get() + "versions/").mkdirs(); new File(BC.get() + "launcher/lang").mkdirs(); new File(BC.get() + "bin/natives/").mkdirs(); + if (args.length == 2 && args[0].equals("update")) { + try { + final String pathToJar = args[1]; + File version = new File(BC.get(), "betacraft.jar$tmp"); + File dest = new File(pathToJar); + Files.copy(version.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING); + new Runnable() { + public void run() { + try { + Runtime.getRuntime().exec("java -jar " + pathToJar); + } catch (IOException e) { + e.printStackTrace(); + } + } + }.run(); + System.exit(0); + } catch (Exception ex) { + ex.printStackTrace(); + System.exit(0); + } + } new Window(); try { Release.initVersions(); @@ -175,7 +196,9 @@ public void windowClosing(final WindowEvent e) { return; } System.out.println(line); - if (getProperty(SETTINGS, "keepon").equals("false")) Window.window.setVisible(false); + if (!getProperty(SETTINGS, "keepon").equals("true")) { + Window.window.setVisible(false); + } Process process = Runtime.getRuntime().exec(line); InputStream err = process.getErrorStream(); @@ -410,12 +433,11 @@ public static void downloadUpdate() { } if (yes || update.startsWith("!")) { // jezeli jest jakas wazna aktualizacja, to pobierz ja bez zgody :P new Pobieranie(update); - download("https://betacraft.ovh/versions/launcher.jar", new File(BC.get(), "betacraft.jar")); + download("https://betacraft.ovh/versions/launcher.jar", new File(BC.get(), "betacraft.jar$tmp")); final String pathToJar = Window.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath(); - File version = new File(BC.get(), "betacraft.jar"); - File dest = new File(pathToJar); - Files.copy(version.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING); - Runtime.getRuntime().exec("java -jar " + pathToJar); + //File version = new File(BC.get(), "betacraft.jar$tmp"); + //File dest = new File(pathToJar); + Runtime.getRuntime().exec("java -jar " + BC.get() + "betacraft.jar$tmp" + " org.betacraft.launcher.Launcher update " + pathToJar); Window.quit(); } } catch (Exception ex) { diff --git a/src/org/betacraft/launcher/WebsitePanel.java b/src/org/betacraft/launcher/WebsitePanel.java index f460bbe..2f5997c 100644 --- a/src/org/betacraft/launcher/WebsitePanel.java +++ b/src/org/betacraft/launcher/WebsitePanel.java @@ -51,9 +51,9 @@ public JScrollPane getUpdateNews() { final JTextPane textPane = new JTextPane(); textPane.setEditable(false); //textPane.setMargin(null); - textPane.setBackground(Color.DARK_GRAY); + textPane.setBackground(Color.BLACK); textPane.setContentType("text/html"); - textPane.setText("






Loading update news..

"); + textPane.setText("






Loading update news...

"); textPane.addHyperlinkListener(EXTERNAL_HYPERLINK_LISTENER); new Thread() { public void run() { @@ -70,7 +70,7 @@ public void run() { this.scrollPane.setBorder(new MatteBorder(2, 2, 2, 2, Color.BLACK)); this.scrollPane.setWheelScrollingEnabled(true); this.scrollPane.setBounds(30, 20, 750, 250); - this.scrollPane.getViewport().getView().setBackground(Color.LIGHT_GRAY); + this.scrollPane.getViewport().getView().setBackground(Color.BLACK); } catch (Exception ex) { ex.printStackTrace(); diff --git a/src/org/betacraft/launcher/Wersja.java b/src/org/betacraft/launcher/Wersja.java index cc24b50..d660e63 100644 --- a/src/org/betacraft/launcher/Wersja.java +++ b/src/org/betacraft/launcher/Wersja.java @@ -3,7 +3,6 @@ import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import javax.swing.DefaultListModel; import javax.swing.ImageIcon; @@ -21,6 +20,7 @@ public class Wersja extends JFrame { static JList list; static DefaultListModel listModel; static JScrollPane listScroller; + static JButton orderbutton; JButton OK; static Order order = Order.FROM_OLDEST; @@ -33,19 +33,23 @@ public Wersja() { setResizable(false); setVisible(true); - final JButton order = new JButton((Wersja.order == Order.FROM_OLDEST) ? Lang.get("sort_oldest") : Lang.get("sort_newest")); - order.setBounds(10, 0, 262, 30); - order.setBackground(Color.LIGHT_GRAY); - add(order); - order.addActionListener(new ActionListener() { + String name = (Wersja.order == Order.FROM_OLDEST) ? Lang.get("sort_oldest") : Lang.get("sort_newest"); + if (name.equals("")) { + name = Wersja.order == Order.FROM_OLDEST ? "Sort: from oldest" : "Sort: from newest"; + } + orderbutton = new JButton(name); + orderbutton.setBounds(10, 0, 262, 30); + orderbutton.setBackground(Color.LIGHT_GRAY); + add(orderbutton); + orderbutton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { if (Wersja.order == Order.FROM_OLDEST) { Wersja.order = Order.FROM_NEWEST; - order.setText(Lang.get("sort_newest")); + orderbutton.setText(Lang.get("sort_newest")); } else { Wersja.order = Order.FROM_OLDEST; - order.setText(Lang.get("sort_oldest")); + orderbutton.setText(Lang.get("sort_oldest")); } updateList(); }