Merge remote-tracking branch 'origin/magicbox-1.5.2' into feature-workorder

# Conflicts:
#	src/engine/mobileAI/Threads/MobRespawnThread.java

src/engine/gameManager/ForgeManager.java

@@ -0,0 +1,67 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+package engine.gameManager;
+
+import engine.loot.WorkOrder;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.DelayQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public enum ForgeManager implements Runnable {
+
+    FORGE_MANAGER;
+
+    private final BlockingQueue<WorkOrder> workQueue = new DelayQueue();
+    public static final AtomicInteger workOrder = new AtomicInteger(0);
+
+    @Override
+    public void run() {
+
+        while (true) {
+
+            try {
+
+                WorkOrder workOrder = workQueue.take();
+
+                // Fulfill workOrder
+
+                for (int i = 0; i < workOrder.slotCount; ++i) {
+
+                    // Create workOrder items; one for each slot
+                    // assigned to this workOrder.
+
+                    // if Prefix and suffix are null random roll item
+                    // otherwise roll what was asked for
+
+                    workOrder.itemCount = workOrder.itemCount - 1;
+
+                }
+
+                if (workOrder.itemCount == 0) {
+
+                    workOrder.runCompleted = true;
+
+                    //  Remove this workOrder from any slots on vendor
+
+                    continue;
+                }
+
+                // Resubmit workOrder
+
+                workOrder.completionTime = System.currentTimeMillis() + 10000;
+
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+        }
+
+    }
+}

src/engine/loot/WorkOrder.java

@@ -0,0 +1,48 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+package engine.loot;
+
+import engine.gameManager.ForgeManager;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.Delayed;
+import java.util.concurrent.TimeUnit;
+
+import static java.lang.Math.toIntExact;
+
+public class WorkOrder implements Delayed {
+
+    public int workOrder;
+    public int npcUUID;
+    public int slotCount;
+    public int itemCount;
+    public String prefix;
+    public String suffix;
+    public long completionTime;
+    public boolean runCompleted;
+
+    public WorkOrder() {
+
+        this.workOrder = ForgeManager.workOrder.incrementAndGet();
+        this.completionTime = System.currentTimeMillis() + 10000;
+    }
+
+    @Override
+    public long getDelay(TimeUnit unit) {
+
+        long timeRemaining = completionTime - System.currentTimeMillis();
+        return unit.convert(timeRemaining, TimeUnit.MILLISECONDS);
+
+    }
+
+    @Override
+    public int compareTo(@NotNull Delayed o) {
+        return toIntExact(this.completionTime - ((WorkOrder) o).completionTime);
+    }
+}

src/engine/mobileAI/Threads/MobAIThread.java

@@ -1,11 +1,18 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
 package engine.mobileAI.Threads;
 
 import engine.gameManager.ConfigManager;
-import engine.mobileAI.MobAI;
 import engine.gameManager.ZoneManager;
+import engine.mobileAI.MobAI;
 import engine.objects.Mob;
 import engine.objects.Zone;
-import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 public class MobAIThread implements Runnable{
@@ -14,23 +21,27 @@ public class MobAIThread implements Runnable{
     public static int AI_PULSE_MOB_THRESHOLD = 200;
     public static int AI_PATROL_DIVISOR = 15;
     public static float AI_CAST_FREQUENCY;
+
     // Thread constructor
 
     public MobAIThread() {
-        Logger.info(" MobAIThread thread has started!");
+
+        //cache config value for mobile casting delay
+
+        AI_CAST_FREQUENCY = Float.parseFloat(ConfigManager.MB_AI_CAST_FREQUENCY.getValue());
+        AI_BASE_AGGRO_RANGE = (int) (60 * Float.parseFloat(ConfigManager.MB_AI_AGGRO_RANGE.getValue()));
 
     }
 
     @Override
     public void run() {
-        //cache config value for mobile casting delay
-        AI_CAST_FREQUENCY = Float.parseFloat(ConfigManager.MB_AI_CAST_FREQUENCY.getValue());
-        AI_BASE_AGGRO_RANGE = (int)(60 * Float.parseFloat(ConfigManager.MB_AI_AGGRO_RANGE.getValue()));
+
+        Logger.info(" MobAIThread thread has started!");
+
         while (true) {
-            for (Zone zone : ZoneManager.getAllZones()) {
-
-                for (Mob mob : zone.zoneMobSet) {
 
+            for (Zone zone : ZoneManager.getAllZones())
+                for (Mob mob : zone.zoneMobSet)
                     try {
                         if (mob != null)
                             MobAI.DetermineAction(mob);
@@ -38,10 +49,10 @@ public class MobAIThread implements Runnable{
                         Logger.error("Mob: " + mob.getName() + " UUID: " + mob.getObjectUUID() + " ERROR: " + e);
                         e.printStackTrace();
                     }
-                }
-            }
         }
+
     }
+
     public static void startAIThread() {
         Thread aiThread;
         aiThread = new Thread(new MobAIThread());

src/engine/objects/NPC.java

@@ -17,6 +17,7 @@ import engine.gameManager.*;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
 import engine.jobs.UpgradeNPCJob;
+import engine.loot.WorkOrder;
 import engine.math.Bounds;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
@@ -37,6 +38,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import static engine.net.client.msg.ErrorPopupMsg.sendErrorPopup;
@@ -52,6 +54,8 @@ public class NPC extends AbstractCharacter {
     private final ArrayList<MobLoot> rolling = new ArrayList<>();
     public ReentrantReadWriteLock minionLock = new ReentrantReadWriteLock();
     public ArrayList<ProducedItem> forgedItems = new ArrayList<>();
+
+    public CopyOnWriteArrayList<WorkOrder> workOrders = new CopyOnWriteArrayList();
     public HashMap<Integer, MobEquipment> equip = null;
     public int runeSetID = 0;
     public int extraRune2 = 0;