Reorganize namespaces

- Rename de.litiengine.entities.ai de.litiengine.entities.behavior - Move de.litiengine.states to de.litiengine.entities.behavior - Move de.litiengine.pathfinding to de.litiengine.entities.behavior - Move de.gurkenlabs.litiengine.pathfinding.astar to de.litiengine.entities.behavior
gurkenlabs · Mar 14, 2020 · eef04d2 · eef04d2
1 parent ddfa946
commit eef04d2
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 43 deletions.
diff --git a/src/de/gurkenlabs/litiengine/entities/Entity.java b/src/de/gurkenlabs/litiengine/entities/Entity.java
@@ -14,7 +14,7 @@
 import java.util.logging.Logger;
 
 import de.gurkenlabs.litiengine.Game;
-import de.gurkenlabs.litiengine.entities.ai.IBehaviorController;
+import de.gurkenlabs.litiengine.entities.behavior.IBehaviorController;
 import de.gurkenlabs.litiengine.environment.Environment;
 import de.gurkenlabs.litiengine.environment.tilemap.ICustomPropertyProvider;
 import de.gurkenlabs.litiengine.environment.tilemap.MapObjectProperty;

diff --git a/src/de/gurkenlabs/litiengine/entities/IEntity.java b/src/de/gurkenlabs/litiengine/entities/IEntity.java
@@ -4,7 +4,7 @@
 import java.awt.geom.Rectangle2D;
 import java.util.List;
 
-import de.gurkenlabs.litiengine.entities.ai.IBehaviorController;
+import de.gurkenlabs.litiengine.entities.behavior.IBehaviorController;
 import de.gurkenlabs.litiengine.environment.Environment;
 import de.gurkenlabs.litiengine.environment.GameWorld;
 import de.gurkenlabs.litiengine.environment.tilemap.ICustomPropertyProvider;

diff --git a/...tiengine/pathfinding/astar/AStarGrid.java → ...tiengine/entities/behavior/AStarGrid.java b/...tiengine/pathfinding/astar/AStarGrid.java → ...tiengine/entities/behavior/AStarGrid.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.pathfinding.astar;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.awt.Color;
 import java.awt.Dimension;

diff --git a/...tiengine/pathfinding/astar/AStarNode.java → ...tiengine/entities/behavior/AStarNode.java b/...tiengine/pathfinding/astar/AStarNode.java → ...tiengine/entities/behavior/AStarNode.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.pathfinding.astar;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.awt.Point;
 import java.awt.Rectangle;

diff --git a/...ne/pathfinding/astar/AStarPathFinder.java → ...ne/entities/behavior/AStarPathFinder.java b/...ne/pathfinding/astar/AStarPathFinder.java → ...ne/entities/behavior/AStarPathFinder.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.pathfinding.astar;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.awt.Dimension;
 import java.awt.Point;
@@ -11,8 +11,6 @@
 
 import de.gurkenlabs.litiengine.entities.IMobileEntity;
 import de.gurkenlabs.litiengine.environment.tilemap.IMap;
-import de.gurkenlabs.litiengine.pathfinding.Path;
-import de.gurkenlabs.litiengine.pathfinding.PathFinder;
 
 public class AStarPathFinder extends PathFinder {
 

diff --git a/...tiengine/pathfinding/EntityNavigator.java → ...ne/entities/behavior/EntityNavigator.java b/...tiengine/pathfinding/EntityNavigator.java → ...ne/entities/behavior/EntityNavigator.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.pathfinding;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.awt.Color;
 import java.awt.Graphics2D;

diff --git a/...s/litiengine/entities/ai/EntityState.java → ...engine/entities/behavior/EntityState.java b/...s/litiengine/entities/ai/EntityState.java → ...engine/entities/behavior/EntityState.java
@@ -1,8 +1,7 @@
-package de.gurkenlabs.litiengine.entities.ai;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import de.gurkenlabs.litiengine.entities.Entity;
 import de.gurkenlabs.litiengine.environment.Environment;
-import de.gurkenlabs.litiengine.states.State;
 
 public abstract class EntityState<T extends Entity> extends State {
   private final T entity;

diff --git a/...iengine/entities/ai/EntityTransition.java → ...e/entities/behavior/EntityTransition.java b/...iengine/entities/ai/EntityTransition.java → ...e/entities/behavior/EntityTransition.java
@@ -1,7 +1,6 @@
-package de.gurkenlabs.litiengine.entities.ai;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import de.gurkenlabs.litiengine.entities.Entity;
-import de.gurkenlabs.litiengine.states.Transition;
 
 public abstract class EntityTransition<T extends Entity> extends Transition {
   private final T entity;

diff --git a/...gine/entities/ai/IBehaviorController.java → ...ntities/behavior/IBehaviorController.java b/...gine/entities/ai/IBehaviorController.java → ...ntities/behavior/IBehaviorController.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.entities.ai;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import de.gurkenlabs.litiengine.Game;
 import de.gurkenlabs.litiengine.entities.IEntityController;

diff --git a/...ngine/pathfinding/NavigationListener.java → ...entities/behavior/NavigationListener.java b/...ngine/pathfinding/NavigationListener.java → ...entities/behavior/NavigationListener.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.pathfinding;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.util.EventListener;
 

diff --git a/...rkenlabs/litiengine/pathfinding/Path.java → ...bs/litiengine/entities/behavior/Path.java b/...rkenlabs/litiengine/pathfinding/Path.java → ...bs/litiengine/entities/behavior/Path.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.pathfinding;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.awt.geom.Path2D;
 import java.awt.geom.Point2D;

diff --git a/...bs/litiengine/pathfinding/PathFinder.java → ...iengine/entities/behavior/PathFinder.java b/...bs/litiengine/pathfinding/PathFinder.java → ...iengine/entities/behavior/PathFinder.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.pathfinding;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;

diff --git a/...e/gurkenlabs/litiengine/states/State.java → ...s/litiengine/entities/behavior/State.java b/...e/gurkenlabs/litiengine/states/State.java → ...s/litiengine/entities/behavior/State.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.states;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;

diff --git a/...tiengine/entities/ai/StateController.java → ...ne/entities/behavior/StateController.java b/...tiengine/entities/ai/StateController.java → ...ne/entities/behavior/StateController.java
@@ -1,7 +1,6 @@
-package de.gurkenlabs.litiengine.entities.ai;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import de.gurkenlabs.litiengine.entities.IEntity;
-import de.gurkenlabs.litiengine.states.StateMachine;
 
 public class StateController<T extends IEntity> extends StateMachine implements IBehaviorController {
   private final T entity;

diff --git a/...nlabs/litiengine/states/StateMachine.java → ...ngine/entities/behavior/StateMachine.java b/...nlabs/litiengine/states/StateMachine.java → ...ngine/entities/behavior/StateMachine.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.states;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/...kenlabs/litiengine/states/Transition.java → ...iengine/entities/behavior/Transition.java b/...kenlabs/litiengine/states/Transition.java → ...iengine/entities/behavior/Transition.java
@@ -1,4 +1,4 @@
-package de.gurkenlabs.litiengine.states;
+package de.gurkenlabs.litiengine.entities.behavior;
 
 public abstract class Transition implements Comparable<Transition> {
   private final int priority;

diff --git a/src/de/gurkenlabs/litiengine/input/MousePathController.java b/src/de/gurkenlabs/litiengine/input/MousePathController.java
@@ -1,11 +1,7 @@
 package de.gurkenlabs.litiengine.input;
 
-import java.awt.event.MouseEvent;
-
-import javax.swing.SwingUtilities;
-
 import de.gurkenlabs.litiengine.entities.IMobileEntity;
-import de.gurkenlabs.litiengine.pathfinding.EntityNavigator;
+import de.gurkenlabs.litiengine.entities.behavior.EntityNavigator;
 import de.gurkenlabs.litiengine.physics.MovementController;
 
 public class MousePathController extends MovementController<IMobileEntity> {
@@ -17,26 +13,11 @@ public class MousePathController extends MovementController<IMobileEntity> {
   public MousePathController(final EntityNavigator navigator, final IMobileEntity entity) {
     super(entity);
     this.navigator = navigator;
-    Input.mouse().onPressed(this::mousePressed);
-    Input.mouse().onReleased(this::mouseReleased);
   }
 
   public EntityNavigator getNavigator() {
     return this.navigator;
   }
-
-  public void mousePressed(final MouseEvent e) {
-    if (SwingUtilities.isRightMouseButton(e)) {
-      this.navigating = true;
-    }
-  }
-
-  public void mouseReleased(final MouseEvent e) {
-    if (SwingUtilities.isRightMouseButton(e)) {
-      this.navigating = false;
-    }
-  }
-
   @Override
   public void update() {
     super.update();
@@ -46,6 +27,7 @@ public void update() {
       return;
     }
 
+    this.navigating = Input.mouse().isRightButtonPressed();
     if (this.navigating) {
       this.navigator.navigate(Input.mouse().getMapLocation());
     }

diff --git a/tests/de/gurkenlabs/litiengine/pathfinding/AStarTests.java b/tests/de/gurkenlabs/litiengine/pathfinding/AStarTests.java
@@ -20,11 +20,11 @@
 
 import de.gurkenlabs.litiengine.Game;
 import de.gurkenlabs.litiengine.GameTest;
+import de.gurkenlabs.litiengine.entities.behavior.AStarGrid;
+import de.gurkenlabs.litiengine.entities.behavior.AStarNode;
 import de.gurkenlabs.litiengine.environment.Environment;
 import de.gurkenlabs.litiengine.environment.tilemap.IMap;
 import de.gurkenlabs.litiengine.environment.tilemap.MapOrientations;
-import de.gurkenlabs.litiengine.pathfinding.astar.AStarGrid;
-import de.gurkenlabs.litiengine.pathfinding.astar.AStarNode;
 
 public class AStarTests {
   @BeforeAll