Merge pull request #105 from ThaBalla1148/master

Artemis-ODB 2.0.0-RC1 support

Author: DaanVanYperen

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

@@ -169,14 +169,22 @@ public A get(Entity e) throws ArrayIndexOutOfBoundsException {
 		return mapper.get(e);
 	}
 
+	@Deprecated
 	public A getSafe(Entity e, boolean forceNewInstance) {
-		return mapper.getSafe(e, forceNewInstance);
+		A component = mapper.getSafe(e);
+		
+		if(component == null && forceNewInstance) {
+			component = mapper.create(e);
+		}
+		
+		return component;
 	}
 
 	public A get(int entityId) throws ArrayIndexOutOfBoundsException {
 		return mapper.get(entityId);
 	}
 
+	@Deprecated
 	public A getSafe(int entityId) {
 		return mapper.getSafe(entityId);
 	}
@@ -185,6 +193,7 @@ public boolean has(Entity e) throws ArrayIndexOutOfBoundsException {
 		return mapper.has(e);
 	}
 
+	@Deprecated
 	public A getSafe(Entity e) {
 		return mapper.getSafe(e);
 	}
@@ -198,14 +207,33 @@ public static <T extends Component> M<T> getFor(Class<T> type, World world) {
 	}
 
 	public A get(Entity e, boolean forceNewInstance) throws ArrayIndexOutOfBoundsException {
-		return mapper.get(e, forceNewInstance);
+		A component = mapper.get(e);
+		
+		if(component == null && forceNewInstance) {
+			component = mapper.create(e);
+		}
+		
+		return component;
 	}
 
 	public A get(int entityId, boolean forceNewInstance) throws ArrayIndexOutOfBoundsException {
-		return mapper.get(entityId, forceNewInstance);
+		A component = mapper.get(entityId);
+		
+		if(component == null && forceNewInstance) {
+			component = mapper.create(entityId);
+		}
+		
+		return component;
 	}
 
+	@Deprecated
 	public A getSafe(int entityId, boolean forceNewInstance) {
-		return mapper.getSafe(entityId, forceNewInstance);
+		A component = mapper.getSafe(entityId);
+		
+		if(component == null && forceNewInstance) {
+			component = mapper.create(entityId);
+		}
+		
+		return component;
 	}
 }

contrib-core/src/main/java/net/mostlyoriginal/api/system/core/PassiveSystem.java

@@ -12,11 +12,17 @@
 public class PassiveSystem extends BaseSystem {
 
     public PassiveSystem() {
-        setEnabled(false);
+        
     }
 
     @Override
     protected void processSystem() {
 	    // do nothing!
     }
+    
+    @Override
+    protected boolean checkProcessing() {
+    	setEnabled(false);
+    	return false;
+    }
 }

contrib-core/src/main/java/net/mostlyoriginal/api/system/delegate/DeferredEntityProcessingSystem.java

@@ -39,7 +39,13 @@ public DeferredEntityProcessingSystem(Aspect.Builder aspect, EntityProcessPrinci
         super(aspect);
         this.aspect = aspect;
         this.principal = principal;
-        setEnabled(false);
+    }
+    
+    @Override
+    protected void initialize() {
+    	super.initialize();
+    	
+    	setEnabled(false);
     }
 
     /**

contrib-plugin-operations/src/main/java/net/mostlyoriginal/api/operation/OperationFactory.java

@@ -1,7 +1,6 @@
 package net.mostlyoriginal.api.operation;
 
 import com.artemis.Component;
-import com.artemis.PackedComponent;
 import com.artemis.PooledComponent;
 import com.badlogic.gdx.math.Interpolation;
 import com.badlogic.gdx.utils.reflect.ClassReflection;
@@ -218,7 +217,6 @@ public static LegacyAddOperation add(Component component)
 	{
 		Preconditions.checkNotNull(component);
 		Preconditions.checkArgument(!ClassReflection.isAssignableFrom(PooledComponent.class, component.getClass()), "Does not support Pooled components.");
-		Preconditions.checkArgument(!ClassReflection.isAssignableFrom(PackedComponent.class, component.getClass()), "Does not support Packed components.");
 		final LegacyAddOperation operation = Operation.prepare(LegacyAddOperation.class);
 		operation.component = component;
 		return operation;