Refactored TickTimer.

Author: MartinSVK12

energy/src/main/java/sunsetsatellite/catalyst/energy/impl/TileEntityEnergy.java

@@ -18,7 +18,7 @@ public class TileEntityEnergy extends TileEntity implements IEnergy {
     public HashMap<Direction, Connection> connections = new HashMap<>();
 
     public TileEntityEnergy(){
-        this.lastTransferMemory = new TickTimer(this,"clearLastTransfers",10,true);
+        this.lastTransferMemory = new TickTimer(this,this::clearLastTransfers,10,true);
         for (Direction dir : Direction.values()) {
             connections.put(dir, Connection.NONE);
         }

fluids/src/main/java/sunsetsatellite/catalyst/fluids/util/FluidStack.java

@@ -18,7 +18,15 @@ public FluidStack(CompoundTag nbt){
         readFromNBT(nbt);
     }
 
-    public BlockFluid getLiquid(){
+	public FluidStack(BlockFluid block) {
+		this(block, 1000);
+	}
+
+	public int getAmount() {
+		return amount;
+	}
+
+	public BlockFluid getLiquid(){
         return liquid;
     }
 
@@ -74,4 +82,12 @@ public static boolean areFluidStacksEqual(FluidStack fluidStack, FluidStack flui
         }
     }
 
+	public static boolean areFluidsEqual(FluidStack fluidStack, FluidStack fluidStack1) {
+		if (fluidStack == null && fluidStack1 == null) {
+			return true;
+		} else {
+			return fluidStack != null && fluidStack1 != null && fluidStack.isFluidEqual(fluidStack1);
+		}
+	}
+
 }

src/main/java/sunsetsatellite/catalyst/core/util/Procedure.java

@@ -0,0 +1,16 @@
+package sunsetsatellite.catalyst.core.util;
+
+/**
+ * Represents a function that accepts no arguments and produces no result.
+ *
+ * <p>This is a functional interface
+ * whose functional method is {@link #run()}.
+ */
+@FunctionalInterface
+public interface Procedure {
+
+	/**
+	 * Runs the procedure.
+	 */
+	void run();
+}

src/main/java/sunsetsatellite/catalyst/core/util/TickTimer.java

@@ -1,24 +1,15 @@
 package sunsetsatellite.catalyst.core.util;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 public class TickTimer {
     public Object owner;
-    public Method timeout;
+    public Procedure timeoutMethod;
     public int max = 0;
     public int value = 0;
     public boolean loop = true;
 
-    public TickTimer(Object owner, String method, int max, boolean loop){
-        Method timeout;
-        try {
-            timeout = owner.getClass().getMethod(method);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        }
+    public TickTimer(Object owner, Procedure method, int max, boolean loop){
         this.owner = owner;
-        this.timeout = timeout;
+        this.timeoutMethod = method;
         this.max = max;
         this.loop = loop;
     }
@@ -33,14 +24,7 @@ public void tick(){
             } else {
                 value = -1;
             }
-            try {
-                timeout.invoke(owner);
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-                if(e.getCause() instanceof Error){
-                    throw new Error("Fatal error occurred when invoking method.");
-                }
-            }
+			timeoutMethod.run();
         }
     }