Refactoring

Author: lare96

src/main/java/io/luna/game/model/WorldLocator.java

@@ -570,6 +570,16 @@ public Player findNearestPlayer(Locatable base, String name) {
         return findNearest(EntityType.PLAYER, base, player -> player.getUsername().equalsIgnoreCase(name));
     }
 
+    /**
+     * Finds the nearest player.
+     *
+     * @param base The origin of the search.
+     * @return The nearest player, or {@code null} if no player is online.
+     */
+    public Player findNearestPlayer(Locatable base) {
+        return findNearest(EntityType.PLAYER, base, player -> true);
+    }
+
     /**
      * Computes the list of players visible to {@code player}.
      * <p>

src/main/java/io/luna/game/model/item/Item.java

@@ -339,7 +339,7 @@ public DynamicItem asDynamic() {
      * @return The item definition (as stored in {@link ItemDefinition#ALL}).
      */
     public ItemDefinition getItemDef() {
-        return ItemDefinition.ALL.retrieve(id);
+        return ItemDefinition.ALL.get(id).orElse(null);
     }
 
     /**
@@ -351,6 +351,6 @@ public ItemDefinition getItemDef() {
      * @return The equipment definition for this item.
      */
     public EquipmentDefinition getEquipDef() {
-        return EquipmentDefinition.ALL.retrieve(id);
+        return EquipmentDefinition.ALL.get(id).orElse(null);
     }
 }

src/main/java/io/luna/game/model/item/ItemContainer.java

@@ -1093,7 +1093,7 @@ public final void set(int index, Item item) {
      * @return The item at that slot, or null if empty.
      */
     public final Item get(int index) {
-        checkArgument(index >= 0 && index < capacity, "Index out of bounds!");
+        checkArgument(index >= 0 && index < capacity, "Index " + index + " out of bounds!");
         return items[index];
     }
 

src/main/java/io/luna/game/model/mob/WalkingQueue.java

@@ -82,7 +82,8 @@ public WalkingQueue(Mob mob) {
     public void process() {
         // Ignore processing and clear queue for stationary/immobilized NPCs, and locked mobs.
         boolean isNpc = mob instanceof Npc;
-        if ((isNpc && mob.asNpc().isStationary()) || (isNpc && mob.getCombat().isImmobilized()) || locked) {
+        boolean isNpcOrBot = isNpc || mob.asPlr().isBot();
+        if ((isNpc && mob.asNpc().isStationary()) || (isNpcOrBot && mob.getCombat().isImmobilized()) || locked) {
             clear();
             mob.setWalkingDirection(Direction.NONE);
             mob.setRunningDirection(Direction.NONE);

src/main/java/io/luna/game/model/mob/bot/Bot.java

@@ -30,6 +30,7 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.Predicate;
 
 import static java.util.Objects.requireNonNull;
 
@@ -274,11 +275,11 @@ public CompletableFuture<PlayerData> login() {
                     if (data != null) {
                         temporary = false;
                     }
+                    loadData(data);
+                    if (data == null) {
+                        position = spawnPosition;
+                    }
                     if (world.getPlayers().add(this)) {
-                        loadData(data);
-                        if (data == null) {
-                            setPosition(spawnPosition);
-                        }
                         world.getBots().add(this);
                         setState(EntityState.ACTIVE);
                         log("I'm alive!");
@@ -342,15 +343,25 @@ public void randomizeSkills() {
                     ? ThreadLocalRandom.current().nextInt(1, 100)
                     : ThreadLocalRandom.current().nextInt(50, 100);
             skill.setStaticLevel(level);
+            skill.setLevel(level);
         }
     }
 
     /**
      * Randomizes the bot’s currently equipped items.
      */
     public void randomizeEquipment() {
+        randomizeEquipment(def -> true);
+    }
+
+    /**
+     * Randomizes the bot’s currently equipped items, only factoring in filtered items.
+     *
+     * @param filter The filter to apply.
+     */
+    public void randomizeEquipment(Predicate<EquipmentDefinition> filter) {
         ArrayListMultimap<Integer, EquipmentDefinition> eligible = ArrayListMultimap.create();
-        EquipmentDefinition.ALL.lookupAll(def -> def.meetsAllRequirements(this))
+        EquipmentDefinition.ALL.lookupAll(def -> def.meetsAllRequirements(this) && filter.test(def))
                 .forEach(def -> eligible.put(def.getIndex(), def));
 
         for (int index = 0; index < getEquipment().capacity(); index++) {
@@ -361,6 +372,16 @@ public void randomizeEquipment() {
         }
     }
 
+    /**
+     * Maxes the bot’s skill levels.
+     */
+    public void maxSkills() {
+        for (Skill skill : skills) {
+            skill.setStaticLevel(99);
+            skill.setLevel(99);
+        }
+    }
+
     /**
      * @return {@code true} if this bot is temporary (non-persistent).
      */

src/main/java/io/luna/game/model/mob/bot/BotMovementStack.java

@@ -6,6 +6,8 @@
 import io.luna.game.model.Locatable;
 import io.luna.game.model.mob.WalkingNavigator;
 import io.luna.game.model.mob.WalkingQueue;
+import io.luna.game.model.mob.interact.InteractionPolicy;
+import io.luna.game.model.mob.interact.InteractionType;
 import io.luna.game.task.Task;
 
 import java.util.concurrent.CompletableFuture;
@@ -201,7 +203,10 @@ public void cancel() {
      */
     private BotMovementRequest createRequest(Locatable target) {
         bot.log("Generating new movement path to " + target + ".");
-        return new BotMovementRequest(bot.getNavigator().walk(target, true), target);
+        // TODO Redo nicely?
+        return new BotMovementRequest(target instanceof Entity ?
+                bot.getNavigator().walkUntilReached((Entity) target, new InteractionPolicy(InteractionType.SIZE, ((Entity) target).size()), true) :
+                bot.getNavigator().walk(target, true), target);
     }
 
     /**

src/main/java/io/luna/game/model/mob/bot/io/BotOutputMessageHandler.java

@@ -325,9 +325,9 @@ public boolean sendInventoryItemClick(int option, int index, int itemId) {
                 opcode = 203;
                 break;
             case 2:
+                msg.putShort(3214, ValueType.ADD);
                 msg.putShort(itemId);
                 msg.putShort(index, ValueType.ADD);
-                msg.putShort(3214, ValueType.ADD);
                 opcode = 24;
                 break;
             case 3:

src/main/java/io/luna/game/model/mob/combat/attack/CombatAttack.java

@@ -102,6 +102,7 @@ public CombatAttack(T attacker, Mob victim, InteractionPolicy interactionPolicy,
      */
     public final void apply() {
         // todo onAttack is redundant, do anything within calculate damage?
+        // todo maybe just only pass the builder until attack is ready to run?
         nextDamage = onAttack(calculateDamage(victim));
         if (nextDamage == null) {
             attacker.getCombat().setTarget(null);
@@ -136,7 +137,7 @@ public CombatDamage onAttack(CombatDamage damage) {
      *
      * @param damage The damage that was applied to the victim.
      */
-    public void onAttackArrived(CombatDamage damage) {
+    public void onDamageApplied(CombatDamage damage) {
 
     }
 

src/main/java/io/luna/game/model/mob/combat/attack/MeleeCombatAttack.java

@@ -38,7 +38,7 @@ public class MeleeCombatAttack<T extends Mob> extends CombatAttack<T> {
      */
     public MeleeCombatAttack(T attacker, Mob victim, int animationId, int range, int delay) {
         super(attacker, victim, new InteractionPolicy(InteractionType.SIZE, range), delay);
-        animation = new Animation(animationId, AnimationPriority.HIGH);
+        animation = animationId == -1 ? null : new Animation(animationId, AnimationPriority.HIGH);
     }
 
     @Override

src/main/java/io/luna/game/model/mob/combat/damage/CombatDamageAction.java

@@ -74,7 +74,7 @@ public boolean run() {
             // Apply the hit.
             if (damage != null) {
                 damage.apply();
-                source.onAttackArrived(damage);
+                source.onDamageApplied(damage);
             }
 
             // Determine whether the victim should retaliate.