Automatically grabs port for spawn server now

stanleykerr · Aug 3, 2016 · 647198d · 647198d
1 parent 893eab5
commit 647198d
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 10 deletions.
diff --git a/SaboteurSniper/pom.xml b/SaboteurSniper/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>xyz.saboteur.pokemongo</groupId>
   <artifactId>SaboteurSniper</artifactId>
-  <version>2.16</version>
+  <version>2.17</version>
 
     <repositories>
         <repository>

diff --git a/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/AutoComboBox.java b/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/AutoComboBox.java
@@ -1,5 +1,6 @@
 package xyz.saboteur.pokemongo.beta;
 
+
 import java.awt.event.ItemEvent;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;

diff --git a/...ava/xyz/saboteur/pokemongo/BaseStats.java → ...yz/saboteur/pokemongo/beta/BaseStats.java b/...ava/xyz/saboteur/pokemongo/BaseStats.java → ...yz/saboteur/pokemongo/beta/BaseStats.java
@@ -1,4 +1,4 @@
-package xyz.saboteur.pokemongo;
+package xyz.saboteur.pokemongo.beta;
 
 public class BaseStats {
 	public int baseAttack, baseDefense, baseStamina;

diff --git a/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/CaptureThread.java b/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/CaptureThread.java
@@ -21,7 +21,6 @@
 
 import POGOProtos.Data.PokemonDataOuterClass.PokemonData;
 import POGOProtos.Inventory.Item.ItemIdOuterClass.ItemId;
-import xyz.saboteur.pokemongo.StatsUtil;
 
 public class CaptureThread extends Thread {
 

diff --git a/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/Log.java b/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/Log.java
@@ -15,7 +15,7 @@ public enum Log {
 
 	public void log(String message) {
 		try {
-			MainWindow.kit.insertHTML(MainWindow.doc, MainWindow.doc.getLength(), String.format("<font style='font-size: 11px; color: %s;'>%s</font><br />", color, dateFormat.format(Calendar.getInstance().getTime()) + message), 0, 0, null);
+			MainWindow.kit.insertHTML(MainWindow.doc, MainWindow.doc.getLength(), String.format("<font style='font-family: Comic Sans MS; font-size: 11px; color: %s;'>%s</font><br />", color, dateFormat.format(Calendar.getInstance().getTime()) + message), 0, 0, null);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

diff --git a/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/MainWindow.java b/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/MainWindow.java
@@ -17,6 +17,8 @@
 import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -35,6 +37,7 @@
 import javax.swing.text.html.HTMLEditorKit;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.text.WordUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -335,13 +338,16 @@ public void adjustmentValueChanged(AdjustmentEvent e) {
 
 		log(Log.SUCCESS, "SabSniper v" + version + " | Website: http://saboteur.xyz | Discord: <u>https://discord.gg/KX7EvX2</u>");
 		log(Log.WARNING, "GitHub URL: <u>https://github.com/saboteurxyz/SabSniper</u> | Latest version: " + githubVersion);
+		getPort();
+		log(Log.WARNING, "Grabbed spawn server port: " + port);
 
 		new Thread() {
 
 			public void run() {
 				Socket socket;
 				try {
-					socket = IO.socket("http://spawns.sebastienvercammen.be:49005");
+					getPort();
+					socket = IO.socket("http://spawns.sebastienvercammen.be:" + port);
 				} catch (URISyntaxException e1) {
 					log(Log.ERROR, "Couldn't use socket. Try restarting the program?");
 					return;
@@ -387,6 +393,7 @@ public void run() {
 			}
 
 		}.start();
+		getPort();
 	}
 
 	/*public void tryCapture(String type, String latlong) {
@@ -480,8 +487,16 @@ public void run() {
 		}
 	}*/
 
-	private String githubVersion;
+	private String githubVersion, port;	
 
+	public void getPort() {
+		try {
+			String s = IOUtils.toString(new URL("http://www.pokespawns.be/js/app.min.js"), "UTF-8");
+			Matcher m = Pattern.compile("port=(.*?);").matcher(s);
+			m.find();
+			port = m.group(1);
+	    } catch (Exception ignored) { }
+	}
 	public void getGithubVersion() {
 		try {
 	        Properties p = new Properties();
@@ -491,6 +506,8 @@ public void getGithubVersion() {
 	    } catch (Exception ignored) { }
 	}
 
+
+
 	public void checkForUpdates() {
 		SwingUtilities.invokeLater(() -> {
 			try {

diff --git a/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/PokemonView.java b/SaboteurSniper/src/main/java/xyz/saboteur/pokemongo/beta/PokemonView.java
@@ -24,8 +24,6 @@
 import com.pokegoapi.api.PokemonGo;
 import com.pokegoapi.api.pokemon.Pokemon;
 
-import xyz.saboteur.pokemongo.StatsUtil;
-
 public class PokemonView extends JFrame {
 	private static final long serialVersionUID = 1L;
 	private JPanel contentPane;

diff --git a/...ava/xyz/saboteur/pokemongo/StatsUtil.java → ...yz/saboteur/pokemongo/beta/StatsUtil.java b/...ava/xyz/saboteur/pokemongo/StatsUtil.java → ...yz/saboteur/pokemongo/beta/StatsUtil.java
@@ -1,4 +1,4 @@
-package xyz.saboteur.pokemongo;
+package xyz.saboteur.pokemongo.beta;
 
 import POGOProtos.Data.PokemonDataOuterClass.PokemonData;
 import POGOProtos.Enums.PokemonIdOuterClass.PokemonId;

diff --git a/SaboteurSniper/src/main/resources/version b/SaboteurSniper/src/main/resources/version
@@ -1 +1 @@
-version=2.16
+version=2.17