Merge remote-tracking branch 'origin/master'

Ethan-Vann · Mar 20, 2023 · ac24814 · ac24814
2 parents 072dbb2 + 79d07d9
commit ac24814
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/com/example/EthanApiPlugin/ItemQuery.java b/src/main/java/com/example/EthanApiPlugin/ItemQuery.java
@@ -36,13 +36,13 @@ public ItemQuery filter(Predicate<? super Widget> predicate)
 		return this;
 	}
 
-	public ItemQuery hasAction(String action)
+	public ItemQuery withAction(String action)
 	{
 		items = items.stream().filter(item -> Arrays.asList(item.getActions()).contains(action)).collect(Collectors.toList());
 		return this;
 	}
 
-	public ItemQuery hasId(int id)
+	public ItemQuery withId(int id)
 	{
 		items = items.stream().filter(item -> item.getItemId() == id).collect(Collectors.toList());
 		return this;

diff --git a/src/main/java/com/example/EthanApiPlugin/NPCQuery.java b/src/main/java/com/example/EthanApiPlugin/NPCQuery.java
@@ -27,11 +27,11 @@ public NPCQuery filter(Predicate<? super NPC> predicate){
 		return this;
 	}
 
-	public NPCQuery hasAction(String action){
+	public NPCQuery withAction(String action){
 		npcs = npcs.stream().filter(npc -> Arrays.asList(npc.getComposition().getActions()).contains(action)).collect(Collectors.toList());
 		return this;
 	}
-	public NPCQuery hasId(int id){
+	public NPCQuery withId(int id){
 		npcs = npcs.stream().filter(npc -> npc.getId() == id).collect(Collectors.toList());
 		return this;
 	}

diff --git a/src/main/java/com/example/EthanApiPlugin/TileObjectQuery.java b/src/main/java/com/example/EthanApiPlugin/TileObjectQuery.java
@@ -86,12 +86,12 @@ public Optional<TileObject> first()
 		return tileObjects.stream().findFirst();
 	}
 
-	public Optional<TileObject> closestToPlayer()
+	public Optional<TileObject> nearestToPlayer()
 	{
 		return tileObjects.stream().min(Comparator.comparingInt(o -> client.getLocalPlayer().getWorldLocation().distanceTo(o.getWorldLocation())));
 	}
 
-	public Optional<TileObject> closestToPoint(WorldPoint point)
+	public Optional<TileObject> nearestToPoint(WorldPoint point)
 	{
 		return tileObjects.stream().min(Comparator.comparingInt(o -> point.distanceTo(o.getWorldLocation())));
 	}

diff --git a/src/main/java/com/example/InteractionApi/BankInteraction.java b/src/main/java/com/example/InteractionApi/BankInteraction.java
@@ -18,7 +18,7 @@ public static boolean useItem(String name,String... actions){
 		}).orElse(false);
 	}
 	public static boolean useItem(int id,String... actions){
-		return Bank.search().hasId(id).first().flatMap(item -> {
+		return Bank.search().withId(id).first().flatMap(item -> {
 			MousePackets.queueClickPacket();
 			WidgetPackets.queueWidgetAction(item,actions);
 			return Optional.of(true);

diff --git a/src/main/java/com/example/InteractionApi/BankInventoryInteraction.java b/src/main/java/com/example/InteractionApi/BankInventoryInteraction.java
@@ -18,7 +18,7 @@ public static boolean useItem(String name,String... actions){
 		}).orElse(false);
 	}
 	public static boolean useItem(int id,String... actions){
-		return BankInventory.search().hasId(id).first().flatMap(item -> {
+		return BankInventory.search().withId(id).first().flatMap(item -> {
 			MousePackets.queueClickPacket();
 			WidgetPackets.queueWidgetAction(item,actions);
 			return Optional.of(true);

diff --git a/src/main/java/com/example/InteractionApi/InventoryInteraction.java b/src/main/java/com/example/InteractionApi/InventoryInteraction.java
@@ -18,7 +18,7 @@ public static boolean useItem(String name,String... actions){
 		}).orElse(false);
 	}
 	public static boolean useItem(int id,String... actions){
-		return Inventory.search().hasId(id).first().flatMap(item -> {
+		return Inventory.search().withId(id).first().flatMap(item -> {
 			MousePackets.queueClickPacket();
 			WidgetPackets.queueWidgetAction(item,actions);
 			return Optional.of(true);

diff --git a/src/main/java/com/example/InteractionApi/NPCInteraction.java b/src/main/java/com/example/InteractionApi/NPCInteraction.java
@@ -22,7 +22,7 @@ public static boolean interact(String name, String... actions)
 
 	public static boolean interact(int id, String... actions)
 	{
-		return NPCs.search().hasId(id).first().flatMap(npc ->
+		return NPCs.search().withId(id).first().flatMap(npc ->
 		{
 			MousePackets.queueClickPacket();
 			NPCPackets.queueNPCAction(npc, actions);

diff --git a/src/main/java/com/example/UpkeepPlugin/UpkeepPlugin.java b/src/main/java/com/example/UpkeepPlugin/UpkeepPlugin.java
@@ -101,7 +101,7 @@ public void handleAction(String actionParam){
 			for (String item : items)
 			{
 				Optional<Widget> itemBeingUsed = StringUtils.isNumeric(item)?
-						Inventory.search().hasId(Integer.parseInt(item)).first():
+						Inventory.search().withId(Integer.parseInt(item)).first():
 						Inventory.search().matchesWildCardNoCase(item).first();
 				if(itemBeingUsed.isPresent()){
 					InventoryInteraction.useItem(itemBeingUsed.get(),action);