From e406a4fa6f805b7037f1c026c7b9332c1ed736cb Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Thu, 2 Jun 2016 19:13:50 -0400
Subject: [PATCH] Grew a Pair

---
 .../bloodmagic/altar/BloodAltar.java          | 24 +++++++------------
 .../item/sigil/ItemSigilDivination.java       |  9 ++++---
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
index 6a25885a..c46f4795 100644
--- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
+++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
@@ -2,9 +2,6 @@ package WayofTime.bloodmagic.altar;
 
 import java.util.List;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -19,6 +16,10 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
 import WayofTime.bloodmagic.api.BlockStack;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
 import WayofTime.bloodmagic.api.Constants;
@@ -137,7 +138,7 @@ public class BloodAltar implements IFluidHandler
         return true;
     }
 
-    public static PosAndComponent getAltarMissingBlock(World world, BlockPos worldPos, int altarTier)
+    public static Pair<BlockPos, EnumAltarComponent> getAltarMissingBlock(World world, BlockPos worldPos, int altarTier)
     {
         if (altarTier >= EnumAltarTier.MAXTIERS)
         {
@@ -156,17 +157,17 @@ public class BloodAltar implements IFluidHandler
                     EnumAltarComponent component = ((IAltarComponent) worldBlock.getBlock()).getType(worldBlock.getMeta());
                     if (component != altarComponent.getComponent())
                     {
-                        return new PosAndComponent(componentPos, altarComponent.getComponent());
+                        return new ImmutablePair<BlockPos, EnumAltarComponent>(componentPos, altarComponent.getComponent());
                     }
                 } else if (worldBlock.getBlock() != Utils.getBlockForComponent(altarComponent.getComponent()))
                 {
-                    return new PosAndComponent(componentPos, altarComponent.getComponent());
+                    return new ImmutablePair<BlockPos, EnumAltarComponent>(componentPos, altarComponent.getComponent());
                 }
             } else
             {
                 if (world.isAirBlock(componentPos))
                 {
-                    return new PosAndComponent(componentPos, altarComponent.getComponent());
+                    return new ImmutablePair<BlockPos, EnumAltarComponent>(componentPos, altarComponent.getComponent());
                 }
             }
         }
@@ -174,15 +175,6 @@ public class BloodAltar implements IFluidHandler
         return null;
     }
 
-    @AllArgsConstructor
-    @Getter
-    @Setter
-    public static class PosAndComponent
-    {
-        public final BlockPos pos;
-        public final EnumAltarComponent component;
-    }
-
     public static AltarUpgrade getUpgrades(World world, BlockPos pos, EnumAltarTier altarTier)
     {
         if (world.isRemote)
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
index 14cbca2d..f5ae89f6 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
@@ -11,10 +11,13 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
+
+import org.apache.commons.lang3.tuple.Pair;
+
 import WayofTime.bloodmagic.altar.BloodAltar;
+import WayofTime.bloodmagic.api.altar.EnumAltarComponent;
 import WayofTime.bloodmagic.api.altar.IBloodAltar;
 import WayofTime.bloodmagic.api.iface.IAltarReader;
 import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
@@ -60,10 +63,10 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader
 
                         if (player.isSneaking())
                         {
-                            BloodAltar.PosAndComponent missingBlock = BloodAltar.getAltarMissingBlock(world, position.getBlockPos(), tier);
+                            Pair<BlockPos, EnumAltarComponent> missingBlock = BloodAltar.getAltarMissingBlock(world, position.getBlockPos(), tier);
                             if (missingBlock != null)
                             {
-                                ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.BloodMagic.altar.nextTier", new TextComponentTranslation(missingBlock.getComponent().getKey()), prettifyBlockPosString(missingBlock.getPos())));
+                                ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.BloodMagic.altar.nextTier", new TextComponentTranslation(missingBlock.getRight().getKey()), prettifyBlockPosString(missingBlock.getLeft())));
                             }
 
                         } else