diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index 5e63a9ef0c..879aaa34e6 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -65,7 +65,6 @@ public class RuneLiteAPI private static final String STATICBASE = "https://static.runelite.net"; private static final String OPENOSRS_SESSION = "http://session.openosrs.dev"; - private static final String OPENOSRS_XTEA = "http://xtea.openosrs.dev"; private static final String OPENOSRS_ANIMATIONS = "http://animations.openosrs.dev"; private static final String OPENOSRS_SOUNDS = "http://sounds.openosrs.dev"; private static final String MAVEN_METADATA = "https://repo.runelite.net/net/runelite/runelite-parent/maven-metadata.xml"; @@ -123,11 +122,6 @@ public class RuneLiteAPI return HttpUrl.parse(OPENOSRS_SESSION); } - public static HttpUrl getXteaBase() - { - return HttpUrl.parse(OPENOSRS_XTEA); - } - public static HttpUrl getAnimationsBase() { return HttpUrl.parse(OPENOSRS_ANIMATIONS); diff --git a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java deleted file mode 100644 index 548c209c1d..0000000000 --- a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.http.api.xtea; - -import com.google.gson.JsonParseException; -import com.google.gson.reflect.TypeToken; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.HashMap; -import net.runelite.http.api.RuneLiteAPI; -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.HttpUrl; -import okhttp3.Request; -import okhttp3.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class XteaClient -{ - private static final Logger logger = LoggerFactory.getLogger(XteaClient.class); - - public void submit(int region, int[] keys) - { - - HttpUrl url = RuneLiteAPI.getXteaBase().newBuilder() - .addPathSegment("submit") - .addQueryParameter("region", String.valueOf(region)) - .addQueryParameter("key1", String.valueOf(keys[0])) - .addQueryParameter("key2", String.valueOf(keys[1])) - .addQueryParameter("key3", String.valueOf(keys[2])) - .addQueryParameter("key4", String.valueOf(keys[3])) - .build(); - - Request request = new Request.Builder() - .url(url) - .build(); - - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() - { - @Override - public void onFailure(Call call, IOException e) - { - logger.warn("unable to submit xtea keys", e); - } - - @Override - public void onResponse(Call call, Response response) - { - try - { - if (!response.isSuccessful()) - { - logger.debug("unsuccessful xtea response"); - } - } - finally - { - response.close(); - } - } - }); - } - - public HashMap get() throws IOException - { - HttpUrl url = RuneLiteAPI.getXteaBase().newBuilder() - .addPathSegment("get") - .build(); - - Request request = new Request.Builder() - .url(url) - .build(); - - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) - { - InputStream in = response.body().byteStream(); - // CHECKSTYLE:OFF - return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken>() {}.getType()); - // CHECKSTYLE:ON - } - catch (JsonParseException ex) - { - throw new IOException(ex); - } - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java deleted file mode 100644 index a9e04be440..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.xtea; - -import java.io.IOException; -import java.util.HashMap; -import javax.inject.Inject; -import lombok.extern.slf4j.Slf4j; -import net.runelite.api.Client; -import net.runelite.api.GameState; -import net.runelite.api.events.GameStateChanged; -import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.http.api.xtea.XteaClient; - -@PluginDescriptor( - name = "Xtea", - hidden = true -) -@Slf4j -public class XteaPlugin extends Plugin -{ - private final XteaClient xteaClient = new XteaClient(); - - private HashMap xteas; - { - try - { - xteas = xteaClient.get(); - } - catch (IOException e) - { - e.printStackTrace(); - } - } - - @Inject - private Client client; - - @Subscribe - private void onGameStateChanged(GameStateChanged gameStateChanged) - { - if (gameStateChanged.getGameState() != GameState.LOGGED_IN) - { - return; - } - - int[] regions = client.getMapRegions(); - int[][] xteaKeys = client.getXteaKeys(); - - for (int idx = 0; idx < regions.length; ++idx) - { - int region = regions[idx]; - int[] keys = xteaKeys[idx]; - - if (xteas.get(region) != null) - { - continue; - } - - xteas.put(region, keys); - - log.debug("Region {} keys {}, {}, {}, {}", region, keys[0], keys[1], keys[2], keys[3]); - - //Don't post non encrypted regions - if (keys[0] == 0 && keys[1] == 0 && keys[2] == 0 && keys[3] == 0) - { - continue; - } - - xteaClient.submit(region, keys); - } - } -}