bonkmaykr/firestar
bonkmaykr/firestar
2
1
Fork 0
Code Issues 2 Pull Requests Releases 6 Wiki Activity

fixed incorrect operator making notification appear when it wasn't supposed to

Browse Source
This commit is contained in:
Downforce Agent 2024-07-12 13:49:37 -05:00
parent 656dbd0975
commit aa5d4bb97f
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firestar/src/main/java/Ernie.java
View File

@ -19,6 +19,7 @@
import java.awt.Desktop; import java.awt.Desktop;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -30,6 +31,7 @@ import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.imageio.ImageIO;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JEditorPane; import javax.swing.JEditorPane;
import javax.swing.JFrame; import javax.swing.JFrame;
@ -57,15 +59,24 @@ public class Ernie implements ActionListener, Runnable {
private JButton surebtn; private JButton surebtn;
public boolean backgroundDone = false; public boolean backgroundDone = false;
private BufferedImage windowIcon;
public void run() { public void run() {
try {
windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png"));
frame.setIconImage(windowIcon);
} catch (IOException e) {
System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
}
byte[] urlraw = new Ernie().getFile(gitapi+"/releases?draft=false&pre-release=false"); byte[] urlraw = new Ernie().getFile(gitapi+"/releases?draft=false&pre-release=false");
if (urlraw.length <= 0) { if (urlraw.length <= 0) {
JOptionPane.showMessageDialog(frame, "Internal Error: Couldn't check for updates.", "Fatal Error", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(frame, "Internal Error: Couldn't check for updates.", "Fatal Error", JOptionPane.ERROR_MESSAGE);
} else { } else {
try { try {
JSONArray releases = new JSONArray(new String(urlraw, Charset.forName("utf-8"))); JSONArray releases = new JSONArray(new String(urlraw, Charset.forName("utf-8")));
if (releases.length() >= 1 && ((JSONObject)releases.get(0)).get("tag_name") != Main.vtag) { System.out.println("Updater: latest release is " + ((JSONObject)releases.get(0)).get("tag_name"));
if (releases.length() >= 1 && !((JSONObject)releases.get(0)).get("tag_name").equals(Main.vtag)) {
System.out.println("Updater: Your version is out of date.");
frame.add(frameContainer); frame.add(frameContainer);
notnowbtn.addActionListener(this); notnowbtn.addActionListener(this);
surebtn.addActionListener(this); surebtn.addActionListener(this);
@ -79,7 +90,7 @@ public class Ernie implements ActionListener, Runnable {
frame.setLocationRelativeTo(null); frame.setLocationRelativeTo(null);
frame.setAlwaysOnTop(true); frame.setAlwaysOnTop(true);
frame.setVisible(true); frame.setVisible(true);
} else { System.out.println("Problem??"); } } else { System.out.println("Updater: No updates."); }
} catch (IOException ex) { } catch (IOException ex) {
Logger.getLogger(Ernie.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(Ernie.class.getName()).log(Level.SEVERE, null, ex);
} catch (JSONException ex) { } catch (JSONException ex) {

2
firestar/src/main/java/Main.java
View File

@ -31,7 +31,7 @@ public class Main {
// Build Information // Build Information
public static final String vstr = "Release 1.3"; public static final String vstr = "Release 1.3";
public static final String vcode = "Tetsuo"; public static final String vcode = "Tetsuo";
public static final String vtag = "dekka-1.1"; //tetsuo-1.3 public static final String vtag = "tetsuo-1.3"; // set to dekka-1.1 for testing
public static final int vint = 1; public static final int vint = 1;
// User Settings // User Settings