ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove deprecated ActorQuery class

Browse Source
This commit is contained in:
Jordan Atwood
2018-10-12 11:48:28 -07:00
committed by Adam
parent 3d3ec76af8
commit 9e67dcd39e
8 changed files with 100 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
runelite-api/src/main/java/net/runelite/api/queries/ActorQuery.java
View File

@@ -1,121 +0,0 @@
/*
* Copyright (c) 2017, Devin French <https://github.com/devinfrench>
* 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.queries;
import static java.lang.Math.abs;
import net.runelite.api.Actor;
import net.runelite.api.Query;
import net.runelite.api.coords.LocalPoint;
/**
* Used for getting players in view,deprecated as of existence of Actor spawn events
*
*/
@Deprecated
public abstract class ActorQuery<EntityType extends Actor, QueryType> extends Query<EntityType, QueryType>
{
@SuppressWarnings("unchecked")
public QueryType nameEquals(String... names)
{
predicate = and(actor ->
{
for (String name : names)
{
String actorName = actor.getName();
if (actorName != null && actorName.equals(name))
{
return true;
}
}
return false;
});
return (QueryType) this;
}
@SuppressWarnings("unchecked")
public QueryType nameContains(String... names)
{
predicate = and(actor ->
{
for (String name : names)
{
String actorName = actor.getName();
if (actorName != null && actorName.contains(name))
{
return true;
}
}
return false;
});
return (QueryType) this;
}
@SuppressWarnings("unchecked")
public QueryType atLocalLocation(LocalPoint location)
{
predicate = and(actor -> actor.getLocalLocation().equals(location));
return (QueryType) this;
}
@SuppressWarnings("unchecked")
public QueryType isLevel(int level)
{
predicate = and(actor -> actor.getCombatLevel() == level);
return (QueryType) this;
}
@SuppressWarnings("unchecked")
public QueryType animationEquals(int animation)
{
predicate = and(actor -> actor.getAnimation() == animation);
return (QueryType) this;
}
@SuppressWarnings("unchecked")
public QueryType isInteractingWith(Actor actor)
{
predicate = and(a -> a.getInteracting().equals(actor));
return (QueryType) this;
}
@SuppressWarnings("unchecked")
public QueryType isWithinDistance(LocalPoint to, int distance)
{
predicate = and(a -> a.getLocalLocation().distanceTo(to) <= distance);
return (QueryType) this;
}
@SuppressWarnings("unchecked")
public QueryType isWithinArea(LocalPoint from, int area)
{
predicate = and(a ->
{
LocalPoint localLocation = a.getLocalLocation();
return abs(localLocation.getX() - from.getX()) < area
&& abs(localLocation.getY() - from.getY()) < area;
});
return (QueryType) this;
}
}

63
runelite-api/src/main/java/net/runelite/api/queries/NPCQuery.java
View File

@@ -1,63 +0,0 @@
/*
* Copyright (c) 2017, Devin French <https://github.com/devinfrench>
* 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.queries;
import net.runelite.api.Client;
import net.runelite.api.NPC;
/**
* Used for getting NPCs in view,deprecated as of existence of NPC spawn events
*
* @see net.runelite.api.events.NpcSpawned
* @see net.runelite.api.events.NpcDespawned
*/
@Deprecated
public class NPCQuery extends ActorQuery<NPC, NPCQuery>
{
@Override
public NPC[] result(Client client)
{
return client.getNpcs().stream()
.filter(predicate)
.toArray(NPC[]::new);
}
@SuppressWarnings("unchecked")
public NPCQuery idEquals(int... ids)
{
predicate = and(object ->
{
for (int id : ids)
{
if (object.getId() == id)
{
return true;
}
}
return false;
});
return (NPCQuery) this;
}
}