diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 9f0d692fe8..3a6481dfca 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -107,7 +107,6 @@ net/runelite/api/ObjectID.class net/runelite/api/Opcodes.class net/runelite/api/ParamID.class - net/runelite/api/ProjectileID.class net/runelite/api/ScriptID.class net/runelite/api/SettingID.class net/runelite/api/SoundEffectID.class diff --git a/runelite-api/src/main/java/net/runelite/api/GraphicID.java b/runelite-api/src/main/java/net/runelite/api/GraphicID.java index f6c6138da6..d172a7af77 100644 --- a/runelite-api/src/main/java/net/runelite/api/GraphicID.java +++ b/runelite-api/src/main/java/net/runelite/api/GraphicID.java @@ -27,9 +27,11 @@ package net.runelite.api; public final class GraphicID { public static final int WINE_MAKE = 47; + public static final int CANNONBALL = 53; public static final int SPLASH = 85; - public static final int TELEPORT = 111; public static final int GREY_BUBBLE_TELEPORT = 86; + public static final int TELEPORT = 111; + public static final int TELEKINETIC_SPELL = 143; public static final int ENTANGLE = 179; public static final int SNARE = 180; public static final int BIND = 181; @@ -39,14 +41,16 @@ public final class GraphicID public static final int ICE_BARRAGE = 369; public static final int VENGEANCE_OTHER = 725; public static final int VENGEANCE = 726; + public static final int NPC_CONTACT = 728; + public static final int POT_SHARE = 733; + public static final int BAKE_PIE = 746; public static final int BOOK_HOME_TELEPORT_1 = 800; public static final int BOOK_HOME_TELEPORT_2 = 802; public static final int BOOK_HOME_TELEPORT_3 = 803; public static final int BOOK_HOME_TELEPORT_4 = 804; public static final int STAFF_OF_THE_DEAD = 1228; public static final int FLYING_FISH = 1387; - public static final int NPC_CONTACT = 728; - public static final int POT_SHARE = 733; - public static final int BAKE_PIE = 746; + public static final int GRANITE_CANNONBALL = 1443; public static final int GRAPHICS_OBJECT_ROCKFALL = 1727; + public static final int ZALCANO_PROJECTILE_FIREBALL = 1728; } diff --git a/runelite-api/src/main/java/net/runelite/api/Projectile.java b/runelite-api/src/main/java/net/runelite/api/Projectile.java index 2f371611d3..a4b98cecfd 100644 --- a/runelite-api/src/main/java/net/runelite/api/Projectile.java +++ b/runelite-api/src/main/java/net/runelite/api/Projectile.java @@ -33,7 +33,7 @@ public interface Projectile extends Renderable * Gets the ID of the projectile. * * @return the projectile ID - * @see ProjectileID + * @see GraphicID */ int getId(); diff --git a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java b/runelite-api/src/main/java/net/runelite/api/ProjectileID.java deleted file mode 100644 index 4030f92e56..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/ProjectileID.java +++ /dev/null @@ -1,38 +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.api; - -/** - * Utility class used for mapping projectile IDs. - *

- * Note: This class is not complete and may be missing mapped IDs. - */ -public final class ProjectileID -{ - public static final int CANNONBALL = 53; - public static final int GRANITE_CANNONBALL = 1443; - public static final int TELEKINETIC_SPELL = 143; - public static final int ZALCANO_PROJECTILE_FIREBALL = 1728; -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index bb825bb037..cc5d47324d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -37,6 +37,8 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.GameState; +import static net.runelite.api.GraphicID.CANNONBALL; +import static net.runelite.api.GraphicID.GRANITE_CANNONBALL; import net.runelite.api.InventoryID; import net.runelite.api.Item; import net.runelite.api.ItemContainer; @@ -46,8 +48,6 @@ import net.runelite.api.ObjectID; import static net.runelite.api.ObjectID.CANNON_BASE; import net.runelite.api.Player; import net.runelite.api.Projectile; -import static net.runelite.api.ProjectileID.CANNONBALL; -import static net.runelite.api.ProjectileID.GRANITE_CANNONBALL; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java index b529c54aef..7ce702347b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java @@ -33,6 +33,7 @@ import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.GameState; import static net.runelite.api.GraphicID.GRAPHICS_OBJECT_ROCKFALL; +import static net.runelite.api.GraphicID.ZALCANO_PROJECTILE_FIREBALL; import net.runelite.api.GraphicsObject; import net.runelite.api.Hitsplat; import net.runelite.api.NPC; @@ -40,7 +41,6 @@ import net.runelite.api.NpcID; import static net.runelite.api.NpcID.ZALCANO; import net.runelite.api.ObjectID; import net.runelite.api.Projectile; -import static net.runelite.api.ProjectileID.ZALCANO_PROJECTILE_FIREBALL; import net.runelite.api.VarPlayer; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint;