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 96e0235ebb..c56a8a2591 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_SOUNDS = "http://sounds.openosrs.dev"; private static final String MAVEN_METADATA = "https://repo.runelite.net/net/runelite/runelite-parent/maven-metadata.xml"; private static final Properties properties = new Properties(); @@ -121,11 +120,6 @@ public class RuneLiteAPI return HttpUrl.parse(OPENOSRS_SESSION); } - public static HttpUrl getSoundsBase() - { - return HttpUrl.parse(OPENOSRS_SOUNDS); - } - public static HttpUrl getApiBase() { final String prop = System.getProperty("runelite.http-service.url"); diff --git a/http-api/src/main/java/net/runelite/http/api/sounds/SoundsClient.java b/http-api/src/main/java/net/runelite/http/api/sounds/SoundsClient.java deleted file mode 100644 index e47d1edc27..0000000000 --- a/http-api/src/main/java/net/runelite/http/api/sounds/SoundsClient.java +++ /dev/null @@ -1,109 +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.sounds; - -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 SoundsClient -{ - private static final Logger logger = LoggerFactory.getLogger(SoundsClient.class); - - public void submit(int npcid, int soundid) - { - - HttpUrl url = RuneLiteAPI.getSoundsBase().newBuilder() - .addPathSegment("submit") - .addQueryParameter("npcid", String.valueOf(npcid)) - .addQueryParameter("soundid", String.valueOf(soundid)) - .build(); - - Request request = new Request.Builder() - .url(url) - .build(); - - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() - { - @Override - public void onFailure(Call call, IOException e) - { - System.out.println("unable to submit sound"); - } - - @Override - public void onResponse(Call call, Response response) - { - try - { - if (!response.isSuccessful()) - { - System.out.println("unsuccessful sound response"); - } - } - finally - { - response.close(); - } - } - }); - } - - public HashMap get() throws IOException - { - HttpUrl url = RuneLiteAPI.getSoundsBase().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); - } - } -}