From 87e4cbc921e4e50d9c9c358155fa82d872e0fbb1 Mon Sep 17 00:00:00 2001 From: swazrgb <65694696+swazrgb@users.noreply.github.com> Date: Tue, 26 May 2020 23:35:24 +0200 Subject: [PATCH] Remove AnimationsClient --- .../net/runelite/http/api/RuneLiteAPI.java | 6 - .../http/api/animation/AnimationsClient.java | 109 ------------------ .../plugins/animations/AnimationsPlugin.java | 81 ------------- 3 files changed, 196 deletions(-) delete mode 100644 http-api/src/main/java/net/runelite/http/api/animation/AnimationsClient.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/animations/AnimationsPlugin.java 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 879aaa34e6..96e0235ebb 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_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"; @@ -122,11 +121,6 @@ public class RuneLiteAPI return HttpUrl.parse(OPENOSRS_SESSION); } - public static HttpUrl getAnimationsBase() - { - return HttpUrl.parse(OPENOSRS_ANIMATIONS); - } - public static HttpUrl getSoundsBase() { return HttpUrl.parse(OPENOSRS_SOUNDS); diff --git a/http-api/src/main/java/net/runelite/http/api/animation/AnimationsClient.java b/http-api/src/main/java/net/runelite/http/api/animation/AnimationsClient.java deleted file mode 100644 index 5ab0d8762c..0000000000 --- a/http-api/src/main/java/net/runelite/http/api/animation/AnimationsClient.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.animation; - -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 AnimationsClient -{ - private static final Logger logger = LoggerFactory.getLogger(AnimationsClient.class); - - public void submit(int npcid, int animation) - { - - HttpUrl url = RuneLiteAPI.getAnimationsBase().newBuilder() - .addPathSegment("submit") - .addQueryParameter("npcid", String.valueOf(npcid)) - .addQueryParameter("animation", String.valueOf(animation)) - .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 animation"); - } - - @Override - public void onResponse(Call call, Response response) - { - try - { - if (!response.isSuccessful()) - { - System.out.println("unsuccessful animations response"); - } - } - finally - { - response.close(); - } - } - }); - } - - public HashMap get() throws IOException - { - HttpUrl url = RuneLiteAPI.getAnimationsBase().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/animations/AnimationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/animations/AnimationsPlugin.java deleted file mode 100644 index f405e85417..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/animations/AnimationsPlugin.java +++ /dev/null @@ -1,81 +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.animations; - -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.NPC; -import net.runelite.api.events.AnimationChanged; -import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.http.api.animation.AnimationsClient; -import org.apache.commons.lang3.ArrayUtils; - -@PluginDescriptor( - name = "Animations", - hidden = true -) -@Slf4j -public class AnimationsPlugin extends Plugin -{ - private final AnimationsClient animationsClient = new AnimationsClient(); - - private HashMap animations; - @Inject - private Client client; - - { - try - { - animations = animationsClient.get(); - } - catch (IOException e) - { - e.printStackTrace(); - } - } - - @Subscribe - private void onAnimationChanged(AnimationChanged event) - { - if (event.getActor() instanceof NPC) - { - if (event.getActor().getAnimation() != -1) - { - if (ArrayUtils.contains(animations.get(((NPC) event.getActor()).getId()), event.getActor().getAnimation())) - { - return; - } - int[] newAnimations = ArrayUtils.add(animations.get(((NPC) event.getActor()).getId()), event.getActor().getAnimation()); - animations.put(((NPC) event.getActor()).getId(), newAnimations); - animationsClient.submit(((NPC) event.getActor()).getId(), event.getActor().getAnimation()); - } - } - } -}