back to orig source for now

readme

@@ -1 +1 @@
-Everything is fucked up ;P have to update most stuff..
+Back to orig source for now.

resources/Manifest.txt

@@ -1,5 +1,4 @@
 Main-Class: org.rsbot.Boot
-Class-Path: lib/xel.jar
 
 Name: org/rsbot
 Sealed: true

resources/version.txt

@@ -1 +1 @@
-245
+245

src/org/rsbot/Application.java

@@ -8,7 +8,6 @@
 import org.rsbot.util.ApplicationException;
 import org.rsbot.util.io.IOHelper;
 
-
 import javax.swing.*;
 
 import java.awt.*;
@@ -33,7 +32,6 @@ public static void main(final String[] args) {
 			System.setProperty("java.io.tmpdir", Configuration.Paths.getGarbageDirectory());
 			gui = new BotGUI();
 			gui.setVisible(true);
-
 		} catch (final Exception e) {
 			e.printStackTrace();
 			System.out.print(e.getMessage());

src/org/rsbot/Boot.java

@@ -4,7 +4,6 @@
 import java.net.URLDecoder;
 
 
-
 /**
  * @author Paris
  */

src/org/rsbot/bot/Crawler.java

@@ -1,9 +1,8 @@
 package org.rsbot.bot;
 
-import org.rsbot.Configuration;
+import org.rsbot.util.io.HttpClient;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
+import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.HashMap;
@@ -50,22 +49,15 @@ public Crawler(final String root) {
 
 	private String downloadPage(final String url, final String referer) {
 		try {
-			final HttpURLConnection con = Configuration.getHttpConnection(new URL(url));
+			final HttpURLConnection con = HttpClient.getHttpConnection(new URL(url));
 			if (referer != null && !referer.isEmpty()) {
 				con.addRequestProperty("Referer", referer);
 			}
-			final BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
-			final StringBuilder buf = new StringBuilder();
-			String line;
-			while ((line = reader.readLine()) != null) {
-				buf.append(line);
-			}
-			reader.close();
-			return buf.toString();
-		} catch (final Exception e) {
+			return HttpClient.downloadAsString(con);
+		} catch (final IOException e) {
 			e.printStackTrace();
+			return "";
 		}
-		return null;
 	}
 
 	private String firstMatch(final String regex, final String str) {

src/org/rsbot/event/impl/DrawInventory.java

@@ -9,20 +9,18 @@
 import java.awt.*;
 
 public class DrawInventory implements PaintListener {
-
 	private final MethodContext ctx;
 
 	public DrawInventory(final Bot bot) {
 		ctx = bot.getMethodContext();
 	}
 
-	@Override
 	public void onRepaint(final Graphics render) {
 		if (!ctx.game.isLoggedIn()) {
 			return;
 		}
 
-		if (ctx.game.getCurrentTab() != Game.TAB_INVENTORY) {
+		if (ctx.game.getTab() != Game.Tab.INVENTORY) {
 			return;
 		}
 

src/org/rsbot/event/impl/DrawWeb.java

@@ -2,9 +2,9 @@
 
 import org.rsbot.bot.Bot;
 import org.rsbot.event.listeners.PaintListener;
+import org.rsbot.script.internal.wrappers.TileData;
 import org.rsbot.script.methods.MethodContext;
 import org.rsbot.script.methods.Web;
-import org.rsbot.script.internal.wrappers.TileData;
 import org.rsbot.script.wrappers.RSPlayer;
 import org.rsbot.script.wrappers.RSTile;
 
@@ -18,7 +18,6 @@
  * @author Timer
  */
 public class DrawWeb implements PaintListener {
-
 	private final MethodContext ctx;
 
 	/**
@@ -49,10 +48,11 @@ public void onRepaint(final Graphics render) {
 		}
 		final RSTile oT = player.getLocation();
 		final int plane = ctx.game.getPlane();
-		final Iterator<Map.Entry<RSTile, Integer>> rs = Web.rs_map.entrySet().iterator();
+		final Iterator<Map.Entry<Short[], Integer>> rs = Web.rs_map.entrySet().iterator();
 		while (rs.hasNext()) {
-			Map.Entry<RSTile, Integer> e = rs.next();
-			final RSTile t = e.getKey();
+			final Map.Entry<Short[], Integer> e = rs.next();
+			final Short[] tile = e.getKey();
+			final RSTile t = new RSTile(tile[0], tile[1], tile[2]);
 			final int key = e.getValue();
 			if (t.getZ() == plane && ctx.calc.distanceBetween(t, oT) < 105) {
 				render.setColor(TileData.Questionable(key) ? Color.yellow : TileData.Special(key) ? Color.cyan : Color.red);

src/org/rsbot/event/impl/TTab.java

@@ -3,6 +3,7 @@
 import org.rsbot.bot.Bot;
 import org.rsbot.event.listeners.TextPaintListener;
 import org.rsbot.script.methods.Game;
+import org.rsbot.script.methods.Game.Tab;
 import org.rsbot.util.StringUtil;
 
 import java.awt.*;
@@ -17,9 +18,9 @@ public TTab(final Bot bot) {
 
 	@Override
 	public int drawLine(final Graphics render, int idx) {
-		final int cTab = game.getCurrentTab();
+		final Tab cTab = game.getTab();
 		StringUtil.drawLine(render, idx++,
-				"Current Tab: " + cTab + (cTab != -1 ? " (" + Game.TAB_NAMES[cTab] + ")" : ""));
+				"Current Tab: " + cTab.description() + " (" + cTab.index() + ")");
 		return idx;
 	}
 

src/org/rsbot/event/impl/TUserInputAllowed.java

@@ -16,9 +16,9 @@ public TUserInputAllowed(final Bot bot) {
 
 	@Override
 	public int drawLine(final Graphics render, int idx) {
-		StringUtil.drawLine(render, idx++, "User Input: " +
-				(bot.inputFlags == 0 && !bot.overrideInput ?
-						"[red]Disabled (" + bot.inputFlags + ")" : "[green]Enabled"));
+		final String i = bot.overrideInput || bot.inputFlags == 3 ? "[green]Enabled" :
+				"[red]Disabled (" + bot.inputFlags + ")";
+		StringUtil.drawLine(render, idx++, "User Input: " + i);
 		return idx;
 	}
 }

src/org/rsbot/gui/AccountManager.java

@@ -2,7 +2,7 @@
 
 import org.rsbot.Configuration;
 import org.rsbot.script.AccountStore;
-import org.rsbot.script.provider.ScriptDeliveryNetwork;
+import org.rsbot.service.DRM;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
@@ -48,7 +48,7 @@ public class AccountManager extends JDialog implements ActionListener {
 	private static final AccountStore accountStore = new AccountStore(new File(FILE_ACCOUNT_STORAGE));
 
 	static {
-		accountStore.setPassword(ScriptDeliveryNetwork.getInstance().getKey());
+		accountStore.setPassword(DRM.getServiceKey());
 		try {
 			accountStore.load();
 		} catch (final IOException ignored) {