Tea Network update: still alpha (#69)

* Move to UUID checking and BigInteger tea count

* Research category

* Start working on tea limit

* Maybe

* Update en_US.lang

* Fix

* Save UUID mapping

* Mark dirty

* Fixes

22 files changed, 447 insertions, 106 deletions

diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java
index a93d5991c1..37bd924579 100644
--- a/src/main/java/kubatech/CommonProxy.java
+++ b/src/main/java/kubatech/CommonProxy.java
@@ -37,11 +37,11 @@ public class CommonProxy {
         MinecraftForge.EVENT_BUS.register(new PlayerDataManager());
         registerItems();
         registerBlocks();
-        if (LoaderReference.Thaumcraft) TCLoader.load();
     }
 
     public void init(FMLInitializationEvent event) {
         if (LoaderReference.MineTweaker) MTLoader.init();
+        if (LoaderReference.Thaumcraft) TCLoader.init();
     }
 
     public void postInit(FMLPostInitializationEvent event) {
diff --git a/src/main/java/kubatech/FMLEventHandler.java b/src/main/java/kubatech/FMLEventHandler.java
index b096c7bb11..f1aa845ebd 100644
--- a/src/main/java/kubatech/FMLEventHandler.java
+++ b/src/main/java/kubatech/FMLEventHandler.java
@@ -10,7 +10,9 @@
 
 package kubatech;
 
+import kubatech.api.helpers.UUIDFinder;
 import kubatech.api.network.LoadConfigPacket;
+import kubatech.savedata.PlayerDataManager;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 
@@ -23,6 +25,8 @@ public class FMLEventHandler {
     @SubscribeEvent
     public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
         if (!(event.player instanceof EntityPlayerMP)) return;
+        UUIDFinder.updateMapping(event.player.getCommandSenderName(), event.player.getPersistentID());
+        PlayerDataManager.initializePlayer((EntityPlayerMP) event.player);
         kubatech.info("Sending config to " + event.player.getDisplayName());
         kubatech.NETWORK.sendTo(LoadConfigPacket.instance, (EntityPlayerMP) event.player);
     }
diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java
index fd1c8564d5..74312d6fb7 100644
--- a/src/main/java/kubatech/api/Variables.java
+++ b/src/main/java/kubatech/api/Variables.java
@@ -10,6 +10,9 @@
 
 package kubatech.api;
 
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+
 import kubatech.api.utils.StringUtils;
 
 import net.minecraft.util.EnumChatFormatting;
@@ -41,4 +44,7 @@ public class Variables {
 
     public static final double ln4 = Math.log(4d);
     public static final double ln2 = Math.log(2d);
+
+    public static final NumberFormat numberFormatScientific = new DecimalFormat("0.00E0");
+    public static final NumberFormat numberFormat = NumberFormat.getInstance();
 }
diff --git a/src/main/java/kubatech/api/enums/ItemList.java b/src/main/java/kubatech/api/enums/ItemList.java
index 55621888ee..9176c6b207 100644
--- a/src/main/java/kubatech/api/enums/ItemList.java
+++ b/src/main/java/kubatech/api/enums/ItemList.java
@@ -58,6 +58,7 @@ public enum ItemList implements IItemContainer {
     PartiallyOxidizedTeaLeaf,
     TeaAcceptorResearchNote,
     TeaAcceptor,
+    TeaStorage,
     Beeeeee;
 
     private ItemStack mStack;
diff --git a/src/main/java/kubatech/api/helpers/UUIDFinder.java b/src/main/java/kubatech/api/helpers/UUIDFinder.java
new file mode 100644
index 0000000000..737080ef80
--- /dev/null
+++ b/src/main/java/kubatech/api/helpers/UUIDFinder.java
@@ -0,0 +1,23 @@
+package kubatech.api.helpers;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+public class UUIDFinder {
+
+    private static final HashMap<UUID, String> UUIDToUsernameMap = new HashMap<>();
+    private static final HashMap<String, UUID> UsernameToUUIDMap = new HashMap<>();
+
+    public static UUID getUUID(String username) {
+        return UsernameToUUIDMap.get(username);
+    }
+
+    public static String getUsername(UUID player) {
+        return UUIDToUsernameMap.get(player);
+    }
+
+    public static void updateMapping(String username, UUID player) {
+        UUIDToUsernameMap.put(player, username);
+        UsernameToUUIDMap.put(username, player);
+    }
+}
diff --git a/src/main/java/kubatech/api/tea/TeaNetwork.java b/src/main/java/kubatech/api/tea/TeaNetwork.java
new file mode 100644
index 0000000000..298982ce9d
--- /dev/null
+++ b/src/main/java/kubatech/api/tea/TeaNetwork.java
@@ -0,0 +1,92 @@
+package kubatech.api.tea;
+
+import java.math.BigInteger;
+import java.util.HashSet;
+import java.util.UUID;
+
+import kubatech.savedata.PlayerData;
+import kubatech.savedata.PlayerDataManager;
+import kubatech.tileentity.TeaStorageTile;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+public class TeaNetwork {
+
+    // TODO: Optimize later :P
+    public BigInteger teaAmount = BigInteger.ZERO;
+    public BigInteger teaLimit = BigInteger.valueOf(Long.MAX_VALUE);
+    PlayerData owner;
+    private HashSet<TeaStorageTile> teaStorageExtenders = new HashSet<>();
+
+    public static TeaNetwork getNetwork(UUID player) {
+        PlayerData p = PlayerDataManager.getPlayer(player);
+        if (p == null) return null;
+        TeaNetwork n = p.teaNetwork;
+        if (n == null) {
+            p.teaNetwork = new TeaNetwork();
+            p.teaNetwork.owner = p;
+            return p.teaNetwork;
+        }
+        n.owner = p;
+        return n;
+    }
+
+    public boolean canAfford(long price, boolean take) {
+        return canAfford(BigInteger.valueOf(price), take);
+    }
+
+    public boolean canAfford(BigInteger price, boolean take) {
+        if (teaAmount.compareTo(price) >= 0) {
+            if (take) {
+                teaAmount = teaAmount.subtract(price);
+                markDirty();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public boolean addTea(long toAdd) {
+        return addTea(BigInteger.valueOf(toAdd));
+    }
+
+    public boolean addTea(BigInteger toAdd) {
+        BigInteger newValue = teaAmount.add(toAdd);
+        if (newValue.compareTo(teaLimit) > 0) return false;
+        teaAmount = teaAmount.add(toAdd);
+        markDirty();
+        return true;
+    }
+
+    public boolean canAdd(long toAdd) {
+        return canAdd(BigInteger.valueOf(toAdd));
+    }
+
+    public boolean canAdd(BigInteger toAdd) {
+        return teaAmount.add(toAdd).compareTo(teaLimit) <= 0;
+    }
+
+    public void registerTeaStorageExtender(TeaStorageTile storageTile) {
+        if (teaStorageExtenders.add(storageTile)) teaLimit = teaLimit.add(storageTile.teaExtendAmount());
+    }
+
+    public void unregisterTeaStorageExtender(TeaStorageTile storageTile) {
+        if (teaStorageExtenders.remove(storageTile)) teaLimit = teaLimit.subtract(storageTile.teaExtendAmount());
+    }
+
+    public void markDirty() {
+        owner.markDirty();
+    }
+
+    public NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setByteArray("teaAmount", teaAmount.toByteArray());
+        return nbt;
+    }
+
+    public static TeaNetwork fromNBT(NBTTagCompound nbt) {
+        TeaNetwork teaNetwork = new TeaNetwork();
+        teaNetwork.teaAmount = new BigInteger(nbt.getByteArray("teaAmount"));
+        return teaNetwork;
+    }
+}
diff --git a/src/main/java/kubatech/commands/CommandTea.java b/src/main/java/kubatech/commands/CommandTea.java
index 726b8ce799..4fff7f0a40 100644
--- a/src/main/java/kubatech/commands/CommandTea.java
+++ b/src/main/java/kubatech/commands/CommandTea.java
@@ -12,8 +12,11 @@ package kubatech.commands;
 
 import static kubatech.commands.CommandTea.Translations.*;
 
-import kubatech.savedata.PlayerData;
-import kubatech.savedata.PlayerDataManager;
+import java.math.BigInteger;
+import java.util.UUID;
+
+import kubatech.api.helpers.UUIDFinder;
+import kubatech.api.tea.TeaNetwork;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
@@ -76,43 +79,43 @@ public class CommandTea extends CommandBase {
             p_71515_1_.addChatMessage(new ChatComponentText(INVALID_OPTION.get()));
             return;
         }
-        PlayerData playerData = PlayerDataManager.getPlayer(p_71515_2_[0]);
-        if (playerData == null) {
+        UUID player = UUIDFinder.getUUID(p_71515_2_[0]);
+        if (player == null) {
             p_71515_1_.addChatMessage(new ChatComponentText(PLAYER_NOT_FOUND.get()));
             return;
         }
+        TeaNetwork teaNetwork = TeaNetwork.getNetwork(player);
         if (!p_71515_2_[1].equalsIgnoreCase("get") && p_71515_2_.length < 3) {
             p_71515_1_.addChatMessage(new ChatComponentText(INVALID_OPTION.get()));
             return;
         }
         switch (p_71515_2_[1].toLowerCase()) {
             case "get":
-                p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_GET.get(p_71515_2_[0], playerData.teaAmount)));
+                p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_GET.get(p_71515_2_[0], teaNetwork.teaAmount)));
                 break;
             case "set": {
-                long tea;
+                BigInteger tea;
                 try {
-                    tea = Long.parseLong(p_71515_2_[2]);
+                    tea = new BigInteger(p_71515_2_[2]);
                 } catch (NumberFormatException ex) {
                     p_71515_1_.addChatMessage(new ChatComponentText(INVALID_OPTION.get()));
                     return;
                 }
-                playerData.teaAmount = tea;
-                playerData.markDirty();
-                p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_SET.get(p_71515_2_[0], playerData.teaAmount)));
+                teaNetwork.teaAmount = tea;
+                teaNetwork.markDirty();
+                p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_SET.get(p_71515_2_[0], teaNetwork.teaAmount)));
                 break;
             }
             case "add": {
-                long tea;
+                BigInteger tea;
                 try {
-                    tea = Long.parseLong(p_71515_2_[2]);
+                    tea = new BigInteger(p_71515_2_[2]);
                 } catch (NumberFormatException ex) {
                     p_71515_1_.addChatMessage(new ChatComponentText(INVALID_OPTION.get()));
                     return;
                 }
-                playerData.teaAmount += tea;
-                playerData.markDirty();
-                p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_ADD.get(p_71515_2_[0], playerData.teaAmount)));
+                teaNetwork.addTea(tea);
+                p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS_ADD.get(p_71515_2_[0], teaNetwork.teaAmount)));
                 break;
             }
             default:
diff --git a/src/main/java/kubatech/kubatech.java b/src/main/java/kubatech/kubatech.java
index b0868a3f30..2ec2da2e7b 100644
--- a/src/main/java/kubatech/kubatech.java
+++ b/src/main/java/kubatech/kubatech.java
@@ -81,6 +81,7 @@ public class kubatech {
             super.displayAllReleventItems(p_78018_1_);
             p_78018_1_.add(ItemList.ExtremeExterminationChamber.get(1));
             p_78018_1_.add(ItemList.ExtremeIndustrialApiary.get(1));
+            p_78018_1_.add(ItemList.ExtremeIndustrialGreenhouse.get(1));
         }
     };
 
diff --git a/src/main/java/kubatech/loaders/BlockLoader.java b/src/main/java/kubatech/loaders/BlockLoader.java
index feed715fa7..b16fd55b4e 100644
--- a/src/main/java/kubatech/loaders/BlockLoader.java
+++ b/src/main/java/kubatech/loaders/BlockLoader.java
@@ -14,7 +14,9 @@ import kubatech.api.enums.ItemList;
 import kubatech.loaders.block.KubaBlock;
 import kubatech.loaders.block.KubaItemBlock;
 import kubatech.loaders.block.blocks.TeaAcceptor;
+import kubatech.loaders.block.blocks.TeaStorage;
 import kubatech.tileentity.TeaAcceptorTile;
+import kubatech.tileentity.TeaStorageTile;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemBlock;
@@ -28,9 +30,11 @@ public class BlockLoader {
 
     public static void registerBlocks() {
         GameRegistry.registerTileEntity(TeaAcceptorTile.class, "KT_TeaAcceptor");
+        GameRegistry.registerTileEntity(TeaStorageTile.class, "KT_TeaStorage");
         GameRegistry.registerBlock(kubaBlock, null, "kubablocks");
         GameRegistry.registerItem(kubaItemBlock, "kubablocks");
 
         ItemList.TeaAcceptor.set(kubaBlock.registerProxyBlock(new TeaAcceptor()));
+        ItemList.TeaStorage.set(kubaBlock.registerProxyBlock(new TeaStorage()));
     }
 }
diff --git a/src/main/java/kubatech/loaders/MTLoader.java b/src/main/java/kubatech/loaders/MTLoader.java
index d223e83951..b39c99e795 100644
--- a/src/main/java/kubatech/loaders/MTLoader.java
+++ b/src/main/java/kubatech/loaders/MTLoader.java
@@ -11,7 +11,6 @@
 package kubatech.loaders;
 
 import kubatech.Tags;
-import kubatech.api.LoaderReference;
 import minetweaker.MineTweakerImplementationAPI;
 
 import org.apache.logging.log4j.LogManager;
@@ -31,6 +30,5 @@ public class MTLoader {
 
     public void MTOnPostReload(MineTweakerImplementationAPI.ReloadEvent reloadEvent) {
         LOG.info("MT Recipes Loaded!");
-        if (LoaderReference.Thaumcraft) TCLoader.register();
     }
 }
diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java
index a4141d4ba5..37aed521cc 100644
--- a/src/main/java/kubatech/loaders/TCLoader.java
+++ b/src/main/java/kubatech/loaders/TCLoader.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.stream.Collectors;
 
+import kubatech.Tags;
 import kubatech.api.LoaderReference;
 import kubatech.api.enums.ItemList;
 import kubatech.api.utils.ItemID;
@@ -22,6 +23,7 @@ import kubatech.loaders.item.items.TeaUltimate;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import thaumcraft.api.ThaumcraftApi;
@@ -36,9 +38,13 @@ import cpw.mods.fml.common.registry.GameRegistry;
 
 public class TCLoader {
 
-    public static void load() {}
+    public static final String TCCategoryKey = "KUBATECH";
 
-    public static void register() {
+    public static void init() {
+        ResearchCategories.registerCategory(
+                TCCategoryKey,
+                new ResourceLocation(Tags.MODID, "textures/gui/green_tea.png"),
+                new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"));
         if (!LoaderReference.GTNHCoreMod || !LoaderReference.DraconicEvolution) return;
         registerRecipe();
         registerResearch();
@@ -102,7 +108,7 @@ public class TCLoader {
         if (ultimateTeaResearch == null) {
             ultimateTeaResearch = new ResearchItem(
                     "KT_UltimateTea",
-                    "NEWHORIZONS",
+                    TCCategoryKey,
                     new AspectList().add(Aspect.MAGIC, 1).add(Aspect.HEAL, 1).add(Aspect.PLANT, 1)
                             .add(Aspect.EXCHANGE, 1),
                     -2,
diff --git a/src/main/java/kubatech/loaders/block/BlockProxy.java b/src/main/java/kubatech/loaders/block/BlockProxy.java
index 4ce6aa820d..a546aa80d8 100644
--- a/src/main/java/kubatech/loaders/block/BlockProxy.java
+++ b/src/main/java/kubatech/loaders/block/BlockProxy.java
@@ -31,12 +31,20 @@ import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI;
 public class BlockProxy {
 
     private final String unlocalizedName;
-    private final String texturepath;
-    private IIcon icon;
+    private final String sideTexturePath;
+    private final String topBottomTexturePath;
+    private IIcon sideIcon;
+    private IIcon topBottomIcon;
 
     public BlockProxy(String unlocalizedName, String texture) {
         this.unlocalizedName = "kubablock." + unlocalizedName;
-        texturepath = Tags.MODID + ":" + texture;
+        sideTexturePath = topBottomTexturePath = Tags.MODID + ":" + texture;
+    }
+
+    public BlockProxy(String unlocalizedName, String sideTexture, String topBottomTexture) {
+        this.unlocalizedName = "kubablock." + unlocalizedName;
+        sideTexturePath = Tags.MODID + ":" + sideTexture;
+        topBottomTexturePath = Tags.MODID + ":" + topBottomTexture;
     }
 
     public void itemInit(int ID) {}
@@ -58,11 +66,14 @@ public class BlockProxy {
     public void onBlockPlaced(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {}
 
     public void registerIcon(IIconRegister iconRegister) {
-        icon = iconRegister.registerIcon(texturepath);
+        sideIcon = iconRegister.registerIcon(sideTexturePath);
+        if (sideTexturePath.equals(topBottomTexturePath)) topBottomIcon = sideIcon;
+        else topBottomIcon = iconRegister.registerIcon(topBottomTexturePath);
     }
 
     public IIcon getIcon(int side) {
-        return icon;
+        if (side <= 1) return topBottomIcon;
+        else return sideIcon;
     }
 
     public String getUnlocalizedName() {
diff --git a/src/main/java/kubatech/loaders/block/KubaBlock.java b/src/main/java/kubatech/loaders/block/KubaBlock.java
index 92481c3f8a..52b378dbf5 100644
--- a/src/main/java/kubatech/loaders/block/KubaBlock.java
+++ b/src/main/java/kubatech/loaders/block/KubaBlock.java
@@ -107,6 +107,11 @@ public class KubaBlock extends Block {
     }
 
     @Override
+    public int damageDropped(int meta) {
+        return meta;
+    }
+
+    @Override
     public void registerBlockIcons(IIconRegister p_149651_1_) {
         blocks.values().forEach(b -> b.registerIcon(p_149651_1_));
     }
diff --git a/src/main/java/kubatech/loaders/block/KubaItemBlock.java b/src/main/java/kubatech/loaders/block/KubaItemBlock.java
index 8d497a6a0f..bdd0c6eecd 100644
--- a/src/main/java/kubatech/loaders/block/KubaItemBlock.java
+++ b/src/main/java/kubatech/loaders/block/KubaItemBlock.java
@@ -17,6 +17,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 
 public class KubaItemBlock extends ItemBlock {
 
@@ -26,6 +27,12 @@ public class KubaItemBlock extends ItemBlock {
     }
 
     @Override
+    public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
+            float hitX, float hitY, float hitZ, int metadata) {
+        return super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata);
+    }
+
+    @Override
     public void registerIcons(IIconRegister p_94581_1_) {
         super.registerIcons(p_94581_1_);
     }
@@ -45,4 +52,9 @@ public class KubaItemBlock extends ItemBlock {
     public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) {
         KubaBlock.blocks.get(p_77624_1_.getItemDamage()).addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_);
     }
+
+    @Override
+    public int getMetadata(int p_77647_1_) {
+        return p_77647_1_;
+    }
 }
diff --git a/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java b/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java
index 2f4f36db53..9eba767376 100644
--- a/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java
+++ b/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java
@@ -26,7 +26,7 @@ import net.minecraft.world.World;
 public class TeaAcceptor extends BlockProxy implements IProxyTileEntityProvider {
 
     public TeaAcceptor() {
-        super("tea_acceptor", "tea_acceptor");
+        super("tea_acceptor", "tea_acceptor", "blank");
     }
 
     @Override
@@ -38,7 +38,7 @@ public class TeaAcceptor extends BlockProxy implements IProxyTileEntityProvider
     public void onBlockPlaced(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {
         if (world.isRemote) return;
         if (!(player instanceof EntityPlayerMP)) return;
-        ((TeaAcceptorTile) world.getTileEntity(x, y, z)).setTeaOwner(player.getCommandSenderName());
+        ((TeaAcceptorTile) world.getTileEntity(x, y, z)).setTeaOwner(player.getPersistentID());
     }
 
     @Override
diff --git a/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java b/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java
new file mode 100644
index 0000000000..a80b73fce0
--- /dev/null
+++ b/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java
@@ -0,0 +1,46 @@
+package kubatech.loaders.block.blocks;
+
+import static kubatech.api.Variables.numberFormat;
+
+import java.util.List;
+
+import kubatech.loaders.block.BlockProxy;
+import kubatech.loaders.block.IProxyTileEntityProvider;
+import kubatech.tileentity.TeaStorageTile;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
+public class TeaStorage extends BlockProxy implements IProxyTileEntityProvider {
+
+    public TeaStorage() {
+        super("tea_storage", "tea_storage");
+    }
+
+    @Override
+    public TileEntity createTileEntity(World world) {
+        return new TeaStorageTile();
+    }
+
+    @Override
+    public void onBlockPlaced(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {
+        if (world.isRemote) return;
+        if (!(player instanceof EntityPlayerMP)) return;
+        ((TeaStorageTile) world.getTileEntity(x, y, z)).setTeaOwner(player.getPersistentID());
+    }
+
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer entity, List<String> tooltipList, boolean showDebugInfo) {
+        tooltipList.add("Extends Tea Storage by " + EnumChatFormatting.RED + numberFormat.format(Long.MAX_VALUE));
+    }
+
+    @Override
+    public float getResistance() {
+        return 999999999999.f;
+    }
+}
diff --git a/src/main/java/kubatech/loaders/item/items/TeaCollection.java b/src/main/java/kubatech/loaders/item/items/TeaCollection.java
index 5ef3995301..46c13a0032 100644
--- a/src/main/java/kubatech/loaders/item/items/TeaCollection.java
+++ b/src/main/java/kubatech/loaders/item/items/TeaCollection.java
@@ -12,13 +12,13 @@ package kubatech.loaders.item.items;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.UUID;
 
 import kubatech.api.utils.ModUtils;
 import kubatech.loaders.ItemLoader;
 import kubatech.loaders.item.ItemProxy;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -48,19 +48,29 @@ public class TeaCollection extends ItemProxy {
     private static final int[][] achievement_poses = new int[][] { { 0, 0 }, { 2, 0 }, { 3, 1 }, { 4, 2 }, { 4, 4 },
             { 3, 5 }, { 2, 6 }, { 0, 6 }, { -1, 5 }, { -2, 4 }, { -2, 2 }, { -1, 1 }, { 1, 3 } };
 
-    boolean checkTeaOwner(ItemStack stack, String username) {
+    boolean checkTeaOwner(ItemStack stack, UUID player) {
+        NBTTagCompound tag = stack.stackTagCompound;
+        if (tag == null || !stack.stackTagCompound.hasKey("TeaOwnerUUID")) return true;
+        return stack.stackTagCompound.getString("TeaOwnerUUID").equals(player.toString());
+    }
+
+    boolean checkTeaOwner(ItemStack stack, String player) {
         NBTTagCompound tag = stack.stackTagCompound;
         if (tag == null || !stack.stackTagCompound.hasKey("TeaOwner")) return true;
-        return stack.stackTagCompound.getString("TeaOwner").equals(username);
+        return stack.stackTagCompound.getString("TeaOwner").equals(player);
     }
 
-    private boolean checkOrSetTeaOwner(ItemStack stack, String username) {
+    private boolean checkOrSetTeaOwner(ItemStack stack, EntityPlayer player) {
         NBTTagCompound tag = stack.stackTagCompound;
-        if (tag == null || !stack.stackTagCompound.hasKey("TeaOwner")) {
-            stack.setTagInfo("TeaOwner", new NBTTagString(username));
+        if (tag == null || !stack.stackTagCompound.hasKey("TeaOwnerUUID")) {
+            stack.setTagInfo("TeaOwnerUUID", new NBTTagString(player.getPersistentID().toString()));
+            stack.setTagInfo("TeaOwner", new NBTTagString(player.getCommandSenderName()));
             return true;
         }
-        return stack.stackTagCompound.getString("TeaOwner").equals(username);
+        if (stack.stackTagCompound.getString("TeaOwnerUUID").equals(player.getPersistentID().toString())) {
+            stack.setTagInfo("TeaOwner", new NBTTagString(player.getCommandSenderName()));
+            return true;
+        } else return false;
     }
 
     @Override
@@ -136,6 +146,7 @@ public class TeaCollection extends ItemProxy {
         if (!ModUtils.isClientSided || Minecraft.getMinecraft().thePlayer == null) {
             return super.getDisplayName(stack);
         }
+        // UUID is different on client if in offline mode I think
         if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) {
             return super.getDisplayName(stack);
         }
@@ -146,7 +157,7 @@ public class TeaCollection extends ItemProxy {
     public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean isCurrentItem) {
         if (world.isRemote) return;
         if (!(entity instanceof EntityPlayerMP)) return;
-        checkOrSetTeaOwner(stack, entity.getCommandSenderName());
+        checkOrSetTeaOwner(stack, (EntityPlayer) entity);
         NBTTagCompound tag = stack.stackTagCompound;
         if (tag.hasKey("display")) tag.removeTag("display");
     }
@@ -166,10 +177,9 @@ public class TeaCollection extends ItemProxy {
             if (new Throwable().getStackTrace()[1].getMethodName().equals("isAchievementInPages"))
                 return super.getAchievements(); // 5HEAD FIX
 
-            EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
             unlockedAchievements.clear();
             for (Achievement achievement : achievements)
-                if (player.getStatFileWriter().hasAchievementUnlocked(achievement))
+                if (Minecraft.getMinecraft().thePlayer.getStatFileWriter().hasAchievementUnlocked(achievement))
                     unlockedAchievements.add(achievement);
             return unlockedAchievements;
         }
diff --git a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java b/src/main/java/kubatech/loaders/item/items/TeaUltimate.java
index 35b4ae28f1..ec7da06b2d 100644
--- a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java
+++ b/src/main/java/kubatech/loaders/item/items/TeaUltimate.java
@@ -10,14 +10,18 @@
 
 package kubatech.loaders.item.items;
 
+import static kubatech.api.Variables.numberFormat;
+import static kubatech.api.Variables.numberFormatScientific;
+
+import java.math.BigInteger;
 import java.text.NumberFormat;
+import java.util.concurrent.atomic.AtomicReference;
 
 import kubatech.api.enums.ItemList;
+import kubatech.api.tea.TeaNetwork;
 import kubatech.api.utils.ModUtils;
 import kubatech.api.utils.StringUtils;
 import kubatech.loaders.item.IItemProxyGUI;
-import kubatech.savedata.PlayerData;
-import kubatech.savedata.PlayerDataManager;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
@@ -26,11 +30,11 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
+import codechicken.nei.NEIClientUtils;
+
 import com.gtnewhorizons.modularui.api.ModularUITextures;
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
 import com.gtnewhorizons.modularui.api.drawable.ItemDrawable;
@@ -64,7 +68,7 @@ public class TeaUltimate extends TeaCollection implements IItemProxyGUI {
 
     @Override
     public String getDisplayName(ItemStack stack) {
-        if (!ModUtils.isClientSided) return super.getDisplayName(stack);
+        if (!ModUtils.isClientSided || Minecraft.getMinecraft().thePlayer == null) return super.getDisplayName(stack);
         if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) {
             return getUltimateTeaDisplayName(super.getDisplayName(stack));
         }
@@ -75,10 +79,12 @@ public class TeaUltimate extends TeaCollection implements IItemProxyGUI {
     public ModularWindow createWindow(ItemStack stack, EntityPlayer player) {
         ModularWindow.Builder builder = ModularWindow.builder(200, 150);
         builder.setBackground(ModularUITextures.VANILLA_BACKGROUND);
-        final PlayerData playerData = PlayerDataManager.getPlayer(player.getCommandSenderName());
+        final TeaNetwork teaNetwork = TeaNetwork.getNetwork(player.getPersistentID());
         IDrawable tab1 = new ItemDrawable(ItemList.LegendaryUltimateTea.get(1)).withFixedSize(18, 18, 4, 6);
         IDrawable tab2 = new ItemDrawable(new ItemStack(Blocks.crafting_table)).withFixedSize(18, 18, 4, 6);
         IDrawable tab3 = new ItemDrawable(new ItemStack(Items.golden_apple)).withFixedSize(18, 18, 4, 6);
+        Ato