Merge pull request #107 from DaanVanYperen/develop

Develop

Author: DaanVanYperen

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version: 1.2.0-SNAPSHOT
+
+- Upgraded for Artemis-odb 2.0.0, LibGDX 1.9.4
+
 ## Version: 1.1.0
 
 - Upgraded for Artemis-odb 1.0.0, LibGDX 1.7.0.

README.md

@@ -18,7 +18,7 @@ with all fancy features, check out these instead:
 - [playn-artemis-quickstart](https://github.com/DaanVanYperen/playn-artemis-quickstart)
 
 ### Library Versions
-Artemis-odb 1.0.x, (Optional) LibGDX 1.6+, tested with 1.7.
+Artemis-odb 2.0.x, (Optional) LibGDX 1.9+, tested with 1.9.4.
 
 ### License
 The primary license for this code is MIT. 
@@ -32,21 +32,21 @@ Some stubs from LibGDX are licensed under Apache 2.0.
 <dependency>
   <groupId>net.mostlyoriginal.artemis-odb</groupId>
   <artifactId>contrib-core</artifactId>
-  <version>1.1.0</version>
+  <version>1.2.1</version>
 </dependency>
 
 <dependency>
   <groupId>net.mostlyoriginal.artemis-odb</groupId>
   <artifactId>contrib-eventbus</artifactId>
-  <version>1.1.0</version>
+  <version>1.2.1</version>
 </dependency>
 ```
 
 #### Gradle
 
 ```groovy
 dependencies { 
-    compile "net.mostlyoriginal.artemis-odb:contrib-core:1.1.0"
-    compile "net.mostlyoriginal.artemis-odb:contrib-eventbus:1.1.0"
+    compile "net.mostlyoriginal.artemis-odb:contrib-core:1.2.1"
+    compile "net.mostlyoriginal.artemis-odb:contrib-eventbus:1.2.1"
 }
 ```

contrib-benchmark/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>contrib-benchmark</artifactId>
     <packaging>jar</packaging>

contrib-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>contrib-core</artifactId>
     <packaging>jar</packaging>

contrib-core/src/main/java/net/mostlyoriginal/api/plugin/extendedcomponentmapper/M.java

@@ -171,7 +171,7 @@ public A get(Entity e) throws ArrayIndexOutOfBoundsException {
 
 	@Deprecated
 	public A getSafe(Entity e, boolean forceNewInstance) {
-		A component = mapper.getSafe(e);
+		A component = mapper.get(e);
 
 		if(component == null && forceNewInstance) {
 			component = mapper.create(e);
@@ -184,18 +184,23 @@ public A get(int entityId) throws ArrayIndexOutOfBoundsException {
 		return mapper.get(entityId);
 	}
 
+	/**
+	 * @deprecated as of odb version 2.0.0 {@see #get} is as safe as getSafe.
+	 */
 	@Deprecated
 	public A getSafe(int entityId) {
-		return mapper.getSafe(entityId);
+		return mapper.get(entityId);
 	}
 
 	public boolean has(Entity e) throws ArrayIndexOutOfBoundsException {
 		return mapper.has(e);
 	}
 
-	@Deprecated
+	/**
+	 * @deprecated as of odb version 2.0.0 {@see #get} is as safe as getSafe.
+	 */
 	public A getSafe(Entity e) {
-		return mapper.getSafe(e);
+		return mapper.get(e);
 	}
 
 	public boolean has(int entityId) {
@@ -228,7 +233,7 @@ public A get(int entityId, boolean forceNewInstance) throws ArrayIndexOutOfBound
 
 	@Deprecated
 	public A getSafe(int entityId, boolean forceNewInstance) {
-		A component = mapper.getSafe(entityId);
+		A component = mapper.get(entityId);
 
 		if(component == null && forceNewInstance) {
 			component = mapper.create(entityId);

contrib-core/src/test/java/net/mostlyoriginal/api/system/delegate/DeferredEntityProcessingSystemTest.java

@@ -55,7 +55,7 @@ public void DeferredSystem_EntityRemoved_UnregisteredFromPrincipal() {
 		World w = new World(config);
 		Entity myEntity = new EntityBuilder(w).with(EmptyComponent.class).build();
 		w.process();
-		myEntity.edit().deleteEntity();
+		w.deleteEntity(myEntity);
 		w.process();
 
 		// ensure it gets registered with the principal

contrib-eventbus/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>contrib-eventbus</artifactId>
     <packaging>jar</packaging>

contrib-jam/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>contrib-jam</artifactId>
     <packaging>jar</packaging>

contrib-jam/src/main/java/net/mostlyoriginal/api/system/physics/CollisionSystem.java

@@ -25,10 +25,10 @@ public class CollisionSystem extends BaseSystem {
 
     public final boolean overlaps( final Entity a, final Entity b)
     {
-        final Bounds b1 = bm.getSafe(a);
-        final Pos p1 =  pm.getSafe(a);
-        final Bounds b2 = bm.getSafe(b);
-        final Pos p2 =  pm.getSafe(b);
+        final Bounds b1 = bm.get(a);
+        final Pos p1 =  pm.get(a);
+        final Bounds b2 = bm.get(b);
+        final Pos p2 =  pm.get(b);
 
         if ( b1==null || p1 ==null || b2==null || p2==null)
             return false;

contrib-network/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>contrib-network</artifactId>
     <packaging>jar</packaging>

contrib-plugin-operations/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>contrib-plugin-operations</artifactId>

contrib-plugin-profiler/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>contrib-plugin-profiler</artifactId>

contrib-plugin-profiler/src/main/java/net/mostlyoriginal/plugin/profiler/ProfilerInvocationStrategy.java

@@ -22,7 +22,7 @@ public class ProfilerInvocationStrategy extends SystemInvocationStrategy {
 	protected SystemProfiler[] profilers;
 
 	@Override
-	protected void process (Bag<BaseSystem> systems) {
+	protected void process () {
 
 		if ( !initialized )
 		{

contrib-test-gwt/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>contrib-test-gwt</artifactId>
     <packaging>war</packaging>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>net.mostlyoriginal.artemis-odb</groupId>
     <artifactId>contrib-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.1</version>
     <packaging>pom</packaging>
     <name>contrib-parent</name>
     <description>Drop-in extensions for artemis-odb. Prefab systems, components, networking, events!
@@ -15,8 +15,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asm.version>4.1</asm.version> 
-        <artemis-odb.version>[1.0.0,2.0.0)</artemis-odb.version>
-        <libgdx.version>[1.6.0,2.0.0)</libgdx.version>
+        <artemis-odb.version>[2.0.0,3.0.0)</artemis-odb.version>
+        <libgdx.version>[1.9.0,2.0.0)</libgdx.version>
     </properties>
 
     <scm>