2 files changed, 48 insertions, 2 deletions
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;
+    }
+}