Merge pull request #4 from OlympicCode/dev

14 werewolves ftw

src/main/java/net/olympiccode/vhackos/api/entities/impl/LeaderboardsImpl.java

@@ -0,0 +1,127 @@
+package net.olympiccode.vhackos.api.entities.impl;
+
+import net.olympiccode.vhackos.api.misc.Leaderboards;
+import net.olympiccode.vhackos.api.requests.Route;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LeaderboardsImpl implements Leaderboards {
+
+ private final vHackOSAPIImpl api;
+ private long tournamentEndTimestamp;
+ private int tournamentRank;
+ private int rank;
+ private List<LeaderboardEntry> data;
+ private List<TournamentEntry> tournamentData;
+ private long lastReload = 0;
+ public LeaderboardsImpl(vHackOSAPIImpl api) {
+ this.api = api;
+ }
+
+ public long getTournamentEndTimestamp() {
+ reload();
+ return tournamentEndTimestamp;
+ }
+
+ public int getTournamentRank() {
+ reload();
+ return tournamentRank;
+ }
+
+ public int getRank() {
+ reload();
+ return rank;
+ }
+
+ public List<LeaderboardEntry> getData() {
+ reload();
+ return data;
+ }
+
+ public List<TournamentEntry> getTournamentData() {
+ reload();
+ return tournamentData;
+ }
+
+ public void reload() {
+ if (lastReload <= System.currentTimeMillis() - 10000) {
+ lastReload = System.currentTimeMillis();
+ JSONObject object = Route.Misc.LEADERBOARDS.compile(api).getResponse().getJSON();
+ tournamentRank = object.optInt("tournamentrank", 0);
+ rank = object.optInt("myrank", 0);
+ JSONArray dataa = object.optJSONArray("data");
+ List<LeaderboardEntry> datal = new ArrayList<>();
+ for (int i = 0; i < dataa.length(); i++) {
+ JSONObject entry = dataa.optJSONObject(i);
+ String user = entry.optString("user");
+ int level = entry.optInt("level");
+ double expPorcentage = Double.parseDouble(entry.optString("exp").replace("%", ""));
+ datal.add(new LeaderboardEntryImpl(user, level, expPorcentage));
+ }
+ data = datal;
+ List<TournamentEntry> datal2 = new ArrayList<>();
+ for (int i = 0; i < dataa.length(); i++) {
+ JSONObject entry = dataa.optJSONObject(i);
+ String user = entry.optString("user");
+ int level = entry.optInt("level");
+ long expGain = entry.optLong("expgain");
+ datal2.add(new TournamentEntryImpl(user, level, expGain));
+ }
+ tournamentData = datal2;
+ tournamentEndTimestamp = System.currentTimeMillis() + (object.optInt("tournamentleft", 0) * 1000);
+ }
+ }
+
+ class LeaderboardEntryImpl implements Leaderboards.LeaderboardEntry {
+
+ private String username;
+ private int level;
+ private double expPorcentage;
+
+ public LeaderboardEntryImpl(String username, int level, double expPorcentage) {
+ this.username = username;
+ this.level = level;
+ this.expPorcentage = expPorcentage;
+ }
+ public String getUsername() {
+ return username;
+ }
+
+ public int getLevel() {
+ return level;
+ }
+
+
+ public double getExpPorcentage() {
+ return expPorcentage;
+ }
+ }
+
+ class TournamentEntryImpl implements Leaderboards.TournamentEntry {
+
+ private String username;
+ private int level;
+ private long expGain;
+
+ public TournamentEntryImpl(String username, int level, long expGain) {
+ this.username = username;
+ this.level = level;
+ this.expGain = expGain;
+ }
+ public String getUsername() {
+ return username;
+ }
+
+ public int getLevel() {
+ return level;
+ }
+
+
+ public long getExpGain() {
+ return expGain;
+ }
+ }
+}

src/main/java/net/olympiccode/vhackos/api/entities/impl/vHackOSAPIImpl.java

@@ -5,6 +5,7 @@
 import net.olympiccode.vhackos.api.events.Event;
 import net.olympiccode.vhackos.api.events.EventListener;
 import net.olympiccode.vhackos.api.events.StatsUpdateEvent;
+import net.olympiccode.vhackos.api.misc.Leaderboards;
 import net.olympiccode.vhackos.api.requests.Requester;
 import net.olympiccode.vhackos.api.requests.Response;
 import net.olympiccode.vhackos.api.requests.Route;
@@ -44,6 +45,7 @@ public class vHackOSAPIImpl implements vHackOSAPI {
  private TaskManagerImpl taskManager = new TaskManagerImpl(this);
  private NetworkManagerImpl networkManager = new NetworkManagerImpl(this);
  private MinerImpl miner = new MinerImpl(this);
+ private Leaderboards leaderboards = new LeaderboardsImpl(this);
  private ScheduledExecutorService executorService = Executors.newScheduledThreadPool(corePoolSize, new APIThreadFactory());
 
  public vHackOSAPIImpl(OkHttpClient.Builder httpClientBuilder, boolean autoReconnect, int maxReconnectDelay, int corePoolSize) {
@@ -132,9 +134,7 @@ public void setStatus(Status status) {
  this.status = status;
  }
 
- public void addEventListener(Object... listener) {
- for (Object o : listener) if (o instanceof EventListener) listeners.add((EventListener) o);
- }
+ public void addEventListener(Object... listener) { for (Object o : listener) if (o instanceof EventListener) listeners.add((EventListener) o); }
 
  public Status getStatus() {
  return status;
@@ -160,9 +160,7 @@ private void setPassword(String password) {
  this.password = password;
  }
 
- public void removeEventListener(Object... listener) {
- for (Object o : listener) if (o instanceof EventListener) listeners.remove(o);
- }
+ public void removeEventListener(Object... listener) { for (Object o : listener) if (o instanceof EventListener) listeners.remove(o); }
 
  public void setDebugResponses(boolean debugResponses) {
  this.debugResponses = debugResponses;
@@ -201,6 +199,9 @@ public NetworkManagerImpl getNetworkManager() {
  }
 
  public MinerImpl getMiner() { return miner; }
+
+ public Leaderboards getLeaderboards() { return leaderboards; }
+
  class APIThreadFactory implements ThreadFactory {
  private int counter = 0;
  private String prefix = "vHackOSAPI";

src/main/java/net/olympiccode/vhackos/api/misc/Leaderboards.java

@@ -0,0 +1,23 @@
+package net.olympiccode.vhackos.api.misc;
+
+import java.util.List;
+
+public interface Leaderboards {
+ long getTournamentEndTimestamp();
+ int getTournamentRank();
+ int getRank();
+ List<LeaderboardEntry> getData();
+ List<TournamentEntry> getTournamentData();
+
+ interface LeaderboardEntry {
+ String getUsername();
+ int getLevel();
+ double getExpPorcentage();
+ }
+
+ interface TournamentEntry {
+ String getUsername();
+ int getLevel();
+ long getExpGain();
+ }
+}

src/main/java/net/olympiccode/vhackos/api/requests/Requester.java

@@ -49,7 +49,7 @@ public OkHttpClient getHttpClient() {
  public Response getResponse(Route.CompiledRoute route) {
  if (lastRequest >= System.currentTimeMillis() - 1000) {
  try {
- Thread.sleep(200);
+ Thread.sleep(1000);
  } catch (InterruptedException e) {
  e.printStackTrace();
  }
@@ -101,6 +101,7 @@ public Response getResponse(Route.CompiledRoute route) {
  }
  } catch (RuntimeException | LoginException e) {
  e.printStackTrace();
+ System.exit(0);
  } catch (final Exception e) {
  throw new IllegalStateException("An error occurred while processing rest request", e);
  } finally {

src/main/java/net/olympiccode/vhackos/api/requests/Route.java

@@ -50,6 +50,7 @@ public CompiledRoute compile(vHackOSAPI apir, String... params) {
  try {
  arguments.put("uid", api.getUid());
  arguments.put("accesstoken", api.getAccessToken());
+ arguments.put("lang", "en");
  } catch (JSONException e) {
  e.printStackTrace();
  }
@@ -102,6 +103,7 @@ public static class Misc {
  public static final Route UPDATE = new Route("update");
  public static final Route MINER = new Route("mining");
  public static final Route MINER_ACT = new Route("mining", "action");
+ public static final Route LEADERBOARDS = new Route("ranking");
  }
 
  public static class AppStore {

src/main/java/net/olympiccode/vhackos/api/vHackOSAPI.java

@@ -4,6 +4,7 @@
 import net.olympiccode.vhackos.api.appstore.TaskManager;
 import net.olympiccode.vhackos.api.entities.Stats;
 import net.olympiccode.vhackos.api.events.EventListener;
+import net.olympiccode.vhackos.api.misc.Leaderboards;
 import net.olympiccode.vhackos.api.misc.Miner;
 import net.olympiccode.vhackos.api.network.NetworkManager;
 
@@ -59,5 +60,7 @@ public boolean isInit()
 
  Miner getMiner();
 
+ Leaderboards getLeaderboards();
+
 }
 

src/main/java/net/olympiccode/vhackos/api/vHackOSInfo.java

@@ -1,6 +1,6 @@
 package net.olympiccode.vhackos.api;
 
 public class vHackOSInfo {
- private static final int REST_VERSION = 10;
+ private static final int REST_VERSION = 11;
  public static final String API_PREFIX = String.format("https://api.vhack.cc/mobile/%d/", REST_VERSION);
 }