Cleanup

src/main/java/WayofTime/bloodmagic/api/NBTHolder.java

@@ -19,6 +19,10 @@ public class NBTHolder {
     public static final String NBT_RUNNING = "isRunning";
     public static final String NBT_RUNTIME = "runtime";
     public static final String NBT_REAGENTTANK = "reagentTanks";
+    public static final String NBT_ALTAR_TIER = "upgradeLevel";
+    public static final String NBT_ALTAR_ACTIVE = "isActive";
+    public static final String NBT_ALTAR_LIQUID_REQ = "liquidRequired";
+    public static final String NBT_ALTAR_FILLABLE = "canBeFilled";
 
     public static ItemStack checkNBT(ItemStack stack) {
         if (stack.getTagCompound() == null)

src/main/java/WayofTime/bloodmagic/api/altar/AltarRecipe.java

@@ -8,9 +8,10 @@ import javax.annotation.Nullable;
 @Getter
 public class AltarRecipe {
 
-    public final int minTier, syphon, consumeRate, drainRate;
+    public final int syphon, consumeRate, drainRate;
     public final boolean useTag;
     public final ItemStack input, output;
+    public final EnumAltarTier minTier;
 
     /**
      * Allows creation of a recipe for the {@link WayofTime.bloodmagic.block.BlockAltar} / {@link WayofTime.bloodmagic.tile.TileAltar}.
@@ -24,7 +25,7 @@ public class AltarRecipe {
      * @param drainRate   - The rate at which LP is drained during crafting
      * @param useTag      -
      */
-    public AltarRecipe(ItemStack input, @Nullable ItemStack output, int minTier, int syphon, int consumeRate, int drainRate, boolean useTag) {
+    public AltarRecipe(ItemStack input, @Nullable ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate, boolean useTag) {
         this.input = input;
         this.output = output;
         this.minTier = minTier;
@@ -34,11 +35,11 @@ public class AltarRecipe {
         this.useTag = useTag;
     }
 
-    public AltarRecipe(ItemStack input, ItemStack output, int minTier, int syphon, int consumeRate, int drainRate) {
+    public AltarRecipe(ItemStack input, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate) {
         this(input, output, minTier, syphon, consumeRate, drainRate, false);
     }
 
-    public AltarRecipe (ItemStack input, int minTier, int consumeRate, int drainRate) {
+    public AltarRecipe (ItemStack input, EnumAltarTier minTier, int consumeRate, int drainRate) {
         this(input, null, minTier, 0, consumeRate, drainRate);
     }
 }

src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java

@@ -1,9 +1,14 @@
 package WayofTime.bloodmagic.api.altar;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class AltarUpgrade {
+
     private int speedCount;
     private int efficiencyCount;
     private int sacrificeCount;
@@ -14,23 +19,6 @@ public class AltarUpgrade {
     private int betterCapacityCount;
     private int accelerationCount;
 
-    public AltarUpgrade() {
-
-    }
-
-    public AltarUpgrade(int speedCount, int efficiencyCount, int sacrificeCount, int selfSacrificeCount, int displacementCount, int capacityCount, int orbCapacityCount, int betterCapacityCount, int accelerationCount)
-    {
-        this.speedCount = speedCount;
-        this.efficiencyCount = efficiencyCount;
-        this.sacrificeCount = sacrificeCount;
-        this.selfSacrificeCount = selfSacrificeCount;
-        this.displacementCount = displacementCount;
-        this.capacityCount = capacityCount;
-        this.orbCapacityCount = orbCapacityCount;
-        this.betterCapacityCount = betterCapacityCount;
-        this.accelerationCount = accelerationCount;
-    }
-
     // Adders
 
     public AltarUpgrade addSpeed() {
@@ -77,5 +65,4 @@ public class AltarUpgrade {
         accelerationCount++;
         return this;
     }
-
 }

src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java

@@ -6,7 +6,7 @@ public interface IBloodAltar {
 
     int getCurrentBlood();
 
-    int getTier();
+    EnumAltarTier getTier();
 
     int getProgress();
 

src/main/java/WayofTime/bloodmagic/api/iface/IAltarReader.java

@@ -1,5 +1,5 @@
 package WayofTime.bloodmagic.api.iface;
 
-public interface IAltarReader
-{
+public interface IAltarReader {
+
 }