Movable Refactoring

jsettlers.logic/src/main/java/jsettlers/ai/highlevel/pioneers/PioneerGroup.java

@@ -27,6 +27,7 @@
 import jsettlers.input.tasks.ConvertGuiTask;
 import jsettlers.logic.map.grid.movable.MovableGrid;
 import jsettlers.logic.movable.Movable;
+import jsettlers.logic.movable.MovableDataManager;
 import jsettlers.logic.movable.interfaces.ILogicMovable;
 import jsettlers.network.client.interfaces.ITaskScheduler;
 
@@ -60,7 +61,7 @@ public void clear() {
 	public void removeDeadPioneers() {
 		Collection<Integer> idsToRemove = new ArrayList<>(pioneerIds.size());
 		for (Integer pioneerId : pioneerIds) {
-			if (Movable.getMovableByID(pioneerId) == null) {
+			if (MovableDataManager.getMovableByID(pioneerId) == null) {
 				idsToRemove.add(pioneerId);
 			}
 		}
@@ -90,10 +91,11 @@ public void fill(ITaskScheduler taskScheduler, AiStatistics aiStatistics, byte p
 	}
 
 	public PioneerGroup getPioneersWithNoAction() {
-		List<Integer> pioneersWithNoAction = stream(pioneerIds).filter(pioneerId -> Movable.getMovableByID(pioneerId).getAction() == EMovableAction.NO_ACTION).collect(Collectors.toList());
+		List<Integer> pioneersWithNoAction = stream(pioneerIds).filter(pioneerId -> MovableDataManager.getMovableByID(pioneerId).getAction() == EMovableAction.NO_ACTION).collect(Collectors.toList());
 		return new PioneerGroup(pioneersWithNoAction);
 	}
 
+
 	public void addAll(List<Integer> pioneerIds) {
 		this.pioneerIds.addAll(pioneerIds);
 	}

jsettlers.logic/src/main/java/jsettlers/input/GuiTaskExecutor.java

@@ -47,6 +47,7 @@
 import jsettlers.logic.buildings.others.StockBuilding;
 import jsettlers.logic.buildings.trading.TradingBuilding;
 import jsettlers.logic.movable.Movable;
+import jsettlers.logic.movable.MovableDataManager;
 import jsettlers.logic.movable.interfaces.ILogicMovable;
 import jsettlers.network.client.task.packets.TaskPacket;
 import jsettlers.network.synchronic.timer.ITaskExecutor;
@@ -260,7 +261,7 @@ private void setBuildingPriority(SetBuildingPriorityGuiTask guiTask) {
 
 	private void convertMovables(ConvertGuiTask guiTask) {
 		for (Integer currID : guiTask.getSelection()) {
-			ILogicMovable movable = Movable.getMovableByID(currID);
+			ILogicMovable movable = MovableDataManager.getMovableByID(currID);
 			if (movable != null) {
 				movable.convertTo(guiTask.getTargetType());
 			}
@@ -270,7 +271,7 @@ private void convertMovables(ConvertGuiTask guiTask) {
 
 	private void stopOrStartWorking(List<Integer> selectedMovables, boolean stop) {
 		for (Integer currID : selectedMovables) {
-			ILogicMovable movable = Movable.getMovableByID(currID);
+			ILogicMovable movable = MovableDataManager.getMovableByID(currID);
 			if (movable != null) {
 				movable.stopOrStartWorking(stop);
 			}
@@ -279,7 +280,7 @@ private void stopOrStartWorking(List<Integer> selectedMovables, boolean stop) {
 
 	private void killSelectedMovables(List<Integer> selectedMovables) {
 		for (Integer currID : selectedMovables) {
-			ILogicMovable curr = Movable.getMovableByID(currID);
+			ILogicMovable curr = MovableDataManager.getMovableByID(currID);
 			if (curr != null) {
 				curr.kill();
 			}
@@ -296,7 +297,7 @@ private void killSelectedMovables(List<Integer> selectedMovables) {
 	 */
 	private void moveSelectedTo(ShortPoint2D targetPosition, List<Integer> movableIds) {
 		if (movableIds.size() == 1) {
-			ILogicMovable currMovable = Movable.getMovableByID(movableIds.get(0));
+			ILogicMovable currMovable = MovableDataManager.getMovableByID(movableIds.get(0));
 			if (currMovable != null) {
 				currMovable.moveTo(targetPosition);
 			}
@@ -306,7 +307,7 @@ private void moveSelectedTo(ShortPoint2D targetPosition, List<Integer> movableId
 	}
 
 	private void sendMovablesNew(ShortPoint2D targetPosition, List<Integer> movableIds) {
-		List<ILogicMovable> movables = stream(movableIds).map(Movable::getMovableByID).filter(Objects::nonNull).collect(Collectors.toList());
+		List<ILogicMovable> movables = stream(movableIds).map(MovableDataManager::getMovableByID).filter(Objects::nonNull).collect(Collectors.toList());
 		if (movables.isEmpty()) {
 			return;
 		}

jsettlers.logic/src/main/java/jsettlers/logic/buildings/spawn/SpawnBuilding.java

@@ -20,6 +20,7 @@
 import jsettlers.common.position.ShortPoint2D;
 import jsettlers.logic.buildings.Building;
 import jsettlers.logic.buildings.IBuildingsGrid;
+import jsettlers.logic.movable.EntityFactory;
 import jsettlers.logic.movable.Movable;
 import jsettlers.logic.movable.interfaces.ILogicMovable;
 import jsettlers.logic.player.Player;
@@ -56,7 +57,7 @@ protected int subTimerEvent() {
 		ILogicMovable movableAtDoor = super.grid.getMovable(super.getDoor());
 
 		if (movableAtDoor == null) {
-			movableAtDoor = new Movable(super.grid.getMovableGrid(), getMovableType(), getDoor(), super.getPlayer());
+			movableAtDoor = EntityFactory.CreateMovable(super.grid.getMovableGrid(), getMovableType(), getDoor(), super.getPlayer());
 			produced++;
 
 			if (produced < getProduceLimit()) {

jsettlers.logic/src/main/java/jsettlers/logic/map/grid/MainGrid.java

@@ -112,7 +112,9 @@
 import jsettlers.logic.map.loading.list.MapList;
 import jsettlers.logic.map.loading.newmap.MapFileHeader;
 import jsettlers.logic.map.loading.newmap.MapFileHeader.MapType;
+import jsettlers.logic.movable.EntityFactory;
 import jsettlers.logic.movable.Movable;
+import jsettlers.logic.movable.MovableDataManager;
 import jsettlers.logic.movable.interfaces.AbstractMovableGrid;
 import jsettlers.logic.movable.interfaces.IAttackable;
 import jsettlers.logic.movable.interfaces.ILogicMovable;
@@ -430,7 +432,7 @@ public final boolean isInBounds(int x, int y) {
 	}
 
 	final ILogicMovable createNewMovableAt(ShortPoint2D pos, EMovableType type, Player player) {
-		return new Movable(movablePathfinderGrid, type, pos, player);
+		return EntityFactory.CreateMovable(movablePathfinderGrid, type, pos, player);
 	}
 
 	/**
@@ -930,7 +932,7 @@ public void hitWithArrowAt(ArrowObject arrow) {
 		@Override
 		public void spawnDonkey(ShortPoint2D position, Player player) {
 			Player realPlayer = partitionsGrid.getPlayer(player.getPlayerId());
-			ILogicMovable donkey = new Movable(movablePathfinderGrid, EMovableType.DONKEY, position, realPlayer);
+			ILogicMovable donkey = EntityFactory.CreateMovable(movablePathfinderGrid, EMovableType.DONKEY, position, realPlayer);
 			donkey.leavePosition();
 		}
 
@@ -1924,7 +1926,7 @@ public final IMapObject getMapObjectsAt(short x, short y) {
 
 		@Override
 		public final ConcurrentLinkedQueue<? extends IViewDistancable> getMovableViewDistancables() {
-			return Movable.getAllMovables();
+			return MovableDataManager.allMovables();
 		}
 
 		@Override

jsettlers.logic/src/main/java/jsettlers/logic/movable/BehaviorTreeFactory.java

@@ -0,0 +1,116 @@
+package jsettlers.logic.movable;
+
+import java.io.Serializable;
+
+import jsettlers.common.movable.EMovableAction;
+import jsettlers.common.movable.EMovableType;
+import jsettlers.logic.movable.components.SteeringComponent;
+import jsettlers.logic.movable.simplebehaviortree.Decorator;
+import jsettlers.logic.movable.simplebehaviortree.Node;
+import jsettlers.logic.movable.simplebehaviortree.NodeStatus;
+import jsettlers.logic.movable.simplebehaviortree.Tick;
+import jsettlers.logic.movable.simplebehaviortree.nodes.Action;
+import jsettlers.logic.movable.simplebehaviortree.nodes.Condition;
+import jsettlers.logic.movable.simplebehaviortree.nodes.Guard;
+import jsettlers.logic.movable.simplebehaviortree.nodes.Inverter;
+import jsettlers.logic.movable.simplebehaviortree.nodes.Selector;
+import jsettlers.logic.movable.simplebehaviortree.nodes.Sequence;
+import jsettlers.logic.movable.simplebehaviortree.nodes.Succeeder;
+import jsettlers.logic.movable.simplebehaviortree.nodes.WaitFor;
+
+/**
+ * @author homoroselaps
+ */
+
+public abstract class BehaviorTreeFactory implements Serializable {
+    private static final long serialVersionUID = 8396039806339873520L;
+
+    protected static Node<Entity> WaitForTargetReached_FailIfNot() {
+        // wait for targetReached, but abort if target not reachable
+        return new Sequence<>(
+            new Inverter<>(TriggerCondition(SteeringComponent.TargetNotReachedTrigger.class)),
+            new WaitFor(SteeringComponent.TargetReachedTrigger.class, true)
+        );
+    }
+
+    protected static Guard<Entity> TriggerGuard(Class<? extends Notification> type, Node<Entity> child) {
+        return new Guard<>(entity -> entity.getNotificationsIt(type).hasNext(), true, child);
+    }
+
+    protected static Action<Entity> StartAnimation(EMovableAction animation, short duration) {
+        return new Action<>(e -> {
+            e.aniC().startAnimation(animation, duration);
+        });
+    }
+
+    protected static void convertTo(Entity entity, EMovableType type) {
+        Entity blueprint = EntityFactory.CreateEntity(entity.gameC().getMovableGrid(), type, entity.movC().getPos(), entity.movC().getPlayer());
+        entity.convertTo(blueprint);
+    }
+
+    protected static <T> Node<T> Optional(Node<T> child) {
+        return new Selector<T>(child, new Succeeder<T>());
+    }
+
+    protected static class Wait extends Node<Entity> {
+        private static final long serialVersionUID = 8774557186392581042L;
+        boolean done = false;
+        int delay = -1;
+        public Wait(int milliseconds) {
+            super();
+            delay = milliseconds;
+        }
+
+        @Override
+        protected NodeStatus onTick(Tick<Entity> tick) {
+            if (done) return NodeStatus.Success;
+            tick.Target.setInvocationDelay(delay);
+            done = true;
+            return NodeStatus.Running();
+        }
+
+        @Override
+        protected void onOpen(Tick<Entity> tick) {
+            done = false;
+        }
+    }
+
+    protected static Condition<Entity> TriggerCondition(Class<? extends Notification> type) {
+        return new Condition<>(entity -> entity.getNotificationsIt(type).hasNext());
+    }
+
+    protected static Debug $(String message, Node<Entity> child) {
+        return new Debug(message, child);
+    }
+
+    protected static Debug $(String message) {
+        return new Debug(message);
+    }
+
+    protected static class Debug extends Decorator<Entity> {
+        private static final boolean DEBUG = false;
+        private static final long serialVersionUID = 9019598003328102086L;
+        private final String message;
+        public Debug(String message) {
+            super(null);
+            this.message = message;
+        }
+
+        public Debug(String message, Node<Entity> child) {
+            super(child);
+            this.message = message;
+        }
+
+        @Override
+        protected NodeStatus onTick(Tick<Entity> tick) {
+            if (DEBUG) System.out.println(message);
+            if (child != null) {
+                NodeStatus result = child.execute(tick);
+                String res = result == NodeStatus.Success ? "Success" : result == NodeStatus.Failure ? "Failure" : "Running";
+                if (DEBUG) System.out.println(message + ": " + res);
+                return result;
+            }
+            return NodeStatus.Success;
+        }
+    }
+}