Fix Travis build

Author: ExE-Boss

src/main/java/nova/core/component/fluid/FluidHandler.java

@@ -22,21 +22,26 @@
 
 import nova.core.component.Component;
 import nova.core.component.SidedComponent;
+import nova.core.retention.Data;
+import nova.core.retention.Storable;
+import nova.core.retention.Store;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * A sided component that provides a fluid container.
  * @author Calclavia
  */
 @SidedComponent
-public class FluidHandler extends Component implements FluidConsumer, FluidProvider {
+public class FluidHandler extends Component implements FluidIO, Storable {
 
 	protected Set<Tank> tanks = new HashSet<>();
+	@Store
 	protected boolean resizable;
 
 	public static FluidHandler singleTank() {
@@ -154,4 +159,49 @@ public Optional<Fluid> removeFluid(int amount, boolean simulate) {
 
 		return Optional.of(f).filter(fl -> fl.amount() > 0);
 	}
+
+	@Override
+	public void save(Data data) {
+		Storable.super.save(data);
+		data.put("tanks", tanks.stream()
+			.filter(t -> t instanceof Storable)
+			.collect(Collectors.toSet()));
+	}
+
+	@Override
+	public void load(Data data) {
+		Storable.super.load(data);
+		tanks.removeIf(t -> t instanceof Storable);
+		tanks.addAll(data.getCollection("tanks"));
+	}
+
+	@Override
+	public int getFluidAmount() {
+		return tanks.stream().mapToInt(FluidIO::getFluidAmount).sum();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return tanks.isEmpty() || tanks.stream().allMatch(FluidIO::isEmpty);
+	}
+
+	@Override
+	public boolean hasFluid() {
+		return !tanks.isEmpty() && tanks.stream().anyMatch(FluidIO::hasFluid);
+	}
+
+	@Override
+	public boolean hasFluidType(String fluidID) {
+		return !tanks.isEmpty() && tanks.stream().anyMatch(t -> t.hasFluidType(fluidID));
+	}
+
+	@Override
+	public boolean hasFluidType(Fluid sample) {
+		return !tanks.isEmpty() && tanks.stream().anyMatch(t -> t.hasFluidType(sample));
+	}
+
+	@Override
+	public boolean hasFluidType(FluidFactory sample) {
+		return !tanks.isEmpty() && tanks.stream().anyMatch(t -> t.hasFluidType(sample));
+	}
 }

src/main/java/nova/core/component/fluid/FluidIO.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017 NOVA, All rights reserved.
+ * This library is free software, licensed under GNU Lesser General Public License version 3
+ *
+ * This file is part of NOVA.
+ *
+ * NOVA is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NOVA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NOVA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package nova.core.component.fluid;
+
+/**
+ * @author ExE Boss
+ */
+public interface FluidIO extends FluidProvider, FluidConsumer {
+
+	int getFluidAmount();
+
+	/**
+	 * @return Whether this container is empty
+	 */
+	boolean isEmpty();
+
+	/**
+	 * @return Whether this container is storing a fluid (is not empty)
+	 */
+	boolean hasFluid();
+
+	boolean hasFluidType(String id);
+
+	boolean hasFluidType(Fluid fluid);
+
+	boolean hasFluidType(FluidFactory fluid);
+}

src/main/java/nova/core/component/fluid/Tank.java

@@ -21,42 +21,41 @@
 package nova.core.component.fluid;
 
 import java.util.Optional;
+import java.util.OptionalInt;
 
 /**
  * Classes with this interface declare ability to store fluids
  * @see FluidConsumer
  * @see Tank
  */
-public interface Tank extends FluidConsumer, FluidProvider {
+public interface Tank extends FluidIO {
 
 	/**
 	 * @return Maximum capacity of this container
 	 */
-	int getFluidCapacity();
+	OptionalInt getFluidCapacity();
 
 	/**
 	 * @return Fluid stored in this container
 	 */
 	Optional<Fluid> getFluid();
 
+	@Override
 	default int getFluidAmount() {
 		return hasFluid() ? getFluid().get().amount() : 0;
 	}
 
-	/**
-	 * @return Whether this container is empty
-	 */
+	@Override
 	default boolean isEmpty() {
 		return !getFluid().isPresent();
 	}
 
-	/**
-	 * @return Whether this container is storing a fluid (is not empty)
-	 */
+	@Override
 	default boolean hasFluid() {
 		return getFluid().isPresent();
 	}
 
+	@Override
 	default boolean hasFluidType(String fluidID) {
 		if (hasFluid()) {
 			return getFluid().get().getID().equals(fluidID);
@@ -65,6 +64,7 @@ default boolean hasFluidType(String fluidID) {
 		return false;
 	}
 
+	@Override
 	default boolean hasFluidType(Fluid sample) {
 		if (hasFluid()) {
 			return getFluid().get().sameType(sample);
@@ -73,6 +73,7 @@ default boolean hasFluidType(Fluid sample) {
 		return false;
 	}
 
+	@Override
 	default boolean hasFluidType(FluidFactory sample) {
 		if (hasFluid()) {
 			return getFluid().get().sameType(sample);

src/main/java/nova/core/component/fluid/TankSimple.java

@@ -117,8 +117,8 @@ public Optional<Fluid> removeFluid(int amount, boolean simulate) {
 	}
 
 	@Override
-	public int getFluidCapacity() {
-		return capacity.orElse(Integer.MAX_VALUE);
+	public OptionalInt getFluidCapacity() {
+		return capacity;
 	}
 
 	@Override
@@ -138,7 +138,9 @@ public TankSimple setFluid(Optional<Fluid> fluid) {
 
 	@Override
 	public void save(Data data) {
-		data.put("capacity", capacity);
+		if (capacity.isPresent()) {
+			data.put("capacity", capacity.getAsInt());
+		}
 
 		if (containedFluid.isPresent()) {
 			data.put("fluid", containedFluid.get());
@@ -147,7 +149,11 @@ public void save(Data data) {
 
 	@Override
 	public void load(Data data) {
-		setCapacity(data.get("capacity"));
+		if (data.containsKey("capactiy")) {
+			setCapacity(data.get("capacity"));
+		} else {
+			removeCapacity();
+		}
 
 		if (data.containsKey("fluid")) {
 			containedFluid = Optional.of(data.getStorable("fluid"));