Resolve clash master branch. Solving things twice! Oops.

Author: DaanVanYperen

README.md

@@ -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.2.0</version>
+  <version>1.2.1</version>
 </dependency>
 
 <dependency>
   <groupId>net.mostlyoriginal.artemis-odb</groupId>
   <artifactId>contrib-eventbus</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
 </dependency>
 ```
 
 #### Gradle
 
 ```groovy
 dependencies { 
-    compile "net.mostlyoriginal.artemis-odb:contrib-core:1.2.0"
-    compile "net.mostlyoriginal.artemis-odb:contrib-eventbus:1.2.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.2.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.2.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);
@@ -233,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-eventbus/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.2.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.2.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>contrib-jam</artifactId>
     <packaging>jar</packaging>

contrib-network/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.2.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.2.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.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>contrib-plugin-profiler</artifactId>

contrib-test-gwt/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.mostlyoriginal.artemis-odb</groupId>
         <artifactId>contrib-parent</artifactId>
-        <version>1.2.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.2.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!