Foci sorting helper

Will now display other variants if you have more than one copy of a foci in your inventory/pouch.

src/main/java/thaumic/tinkerer/common/compat/EnderStorageFunctions.java

@@ -74,7 +74,7 @@ public class EnderStorageFunctions {
     }
 
     public static String getSortingHelper(ItemStack focus) {
-        String base = "ENDERCHEST";
+        String base = "TTEC";
         if (!focus.hasTagCompound())
             return base + "-VANILLA";
         boolean vanilla = !focus.getTagCompound().getBoolean("ender");

src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusDeflect.java

@@ -128,9 +128,9 @@ public class ItemFocusDeflect extends ItemModFocus {
             protectFromProjectiles(p, stack);
     }
 
-    @Override
-    public String getSortingHelper(ItemStack paramItemStack) {
-        return "DEFLECT";
+    public String getSortingHelper(ItemStack itemstack)
+    {
+      return "TTDF" + super.getSortingHelper(itemstack);
     }
 
     @Override

src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusDislocation.java

@@ -160,8 +160,9 @@ public class ItemFocusDislocation extends ItemModFocus {
 
     @Override
     public String getSortingHelper(ItemStack itemstack) {
-        return "DISLOCATION" + getUniqueKey(itemstack);
+    	return "TTDL" + super.getSortingHelper(itemstack) + getUniqueKey(itemstack);
     }
+    
 
     public String getUniqueKey(ItemStack itemstack) {
         ItemStack stack = getPickedBlock(itemstack);

src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusEnderChest.java

@@ -78,12 +78,13 @@ public class ItemFocusEnderChest extends ItemModFocus {
     }
 
     @Override
-    public String getSortingHelper(ItemStack paramItemStack) {
+    public String getSortingHelper(ItemStack itemstack) {
         if (Loader.isModLoaded("EnderStorage")) {
-            return EnderStorageFunctions.getSortingHelper(paramItemStack);
+            return EnderStorageFunctions.getSortingHelper(itemstack);
         }
-        return "ENDERCHEST";
+        return "TTEC" + super.getSortingHelper(itemstack);
     }
+    
 
     @Override
     public AspectList getVisCost(ItemStack stack) {

src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusFlight.java

@@ -68,9 +68,9 @@ public class ItemFocusFlight extends ItemModFocus {
         return itemstack;
     }
 
-    @Override
-    public String getSortingHelper(ItemStack itemstack) {
-        return "FLIGHT";
+    public String getSortingHelper(ItemStack itemstack)
+    {
+      return "TTFL" + super.getSortingHelper(itemstack);
     }
 
     @Override

src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusHeal.java

@@ -96,9 +96,9 @@ public class ItemFocusHeal extends ItemModFocus {
         return true;
     }
 
-    @Override
-    public String getSortingHelper(ItemStack paramItemStack) {
-        return "HEAL";
+    public String getSortingHelper(ItemStack itemstack)
+    {
+      return "TTHE" + super.getSortingHelper(itemstack);
     }
 
     @Override

src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusSmelt.java

@@ -135,9 +135,9 @@ public class ItemFocusSmelt extends ItemModFocus {
         }
     }
 
-    @Override
-    public String getSortingHelper(ItemStack itemstack) {
-        return "SMELT";
+    public String getSortingHelper(ItemStack itemstack)
+    {
+      return "TTEF" + super.getSortingHelper(itemstack);
     }
 
     @Override

src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusTelekinesis.java

@@ -64,10 +64,10 @@ public class ItemFocusTelekinesis extends ItemModFocus {
             }
         }
     }
-
-    @Override
-    public String getSortingHelper(ItemStack itemstack) {
-        return "TELEKINESIS";
+    
+    public String getSortingHelper(ItemStack itemstack)
+    {
+      return "TTTE" + super.getSortingHelper(itemstack);
     }
 
     @Override

src/main/java/thaumic/tinkerer/common/item/foci/ItemModFocus.java

@@ -44,9 +44,6 @@ public abstract class ItemModFocus extends ItemFocusBasic implements ITTinkererI
 
     public ItemModFocus() {
         super();
-        setMaxDamage(1);
-        setNoRepair();
-        setMaxStackSize(1);
     }
 
     protected boolean hasOrnament() {
@@ -164,8 +161,6 @@ public abstract class ItemModFocus extends ItemFocusBasic implements ITTinkererI
         // NO-OP
     }
 
-    @Override
-    public abstract String getSortingHelper(ItemStack paramItemStack);
 
     @Override
     public boolean onFocusBlockStartBreak(ItemStack paramItemStack, int paramInt1, int paramInt2, int paramInt3, EntityPlayer paramEntityPlayer) {
@@ -175,6 +170,8 @@ public abstract class ItemModFocus extends ItemFocusBasic implements ITTinkererI
     public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) {
         return true;
     }
+    
+    
 
 
 }

src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusRecall.java

@@ -46,6 +46,11 @@ public class ItemFocusRecall extends ItemModKamiFocus {
     public ItemFocusRecall() {
         super();
     }
+    
+    public String getSortingHelper(ItemStack itemstack)
+    {
+      return "TTKCR" + super.getSortingHelper(itemstack);
+    }
 
     @Override
     protected boolean hasDepth() {
@@ -116,11 +121,6 @@ public class ItemFocusRecall extends ItemModKamiFocus {
       return null;
     }
 
-    @Override
-    public String getSortingHelper(ItemStack paramItemStack) {
-        return "RECALL";
-    }
-
     @Override
     public String getItemName() {
         return LibItemNames.FOCUS_RECALL;

src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusShadowbeam.java

@@ -43,6 +43,11 @@ public class ItemFocusShadowbeam extends ItemModKamiFocus {
 
         EntityRegistry.registerModEntity(Beam.class, "ShadowbeamStaffBeam", 0, ThaumicTinkerer.instance, 0, 0, false);
     }
+    
+    public String getSortingHelper(ItemStack itemstack)
+    {
+      return "TTKSH" + super.getSortingHelper(itemstack);
+    }
 
     @Override
     public void onUsingFocusTick(ItemStack stack, EntityPlayer player, int count) {
@@ -126,11 +131,6 @@ public class ItemFocusShadowbeam extends ItemModKamiFocus {
 
     }
 
-    @Override
-    public String getSortingHelper(ItemStack paramItemStack) {
-        return "SHADOWBEAM";
-    }
-
     public static class Particle extends FXSparkle {
 
         public Particle(World world, double x, double y, double z, float scale, float red, float green, float blue, int maxAge) {

src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemFocusXPDrain.java

@@ -38,6 +38,11 @@ public class ItemFocusXPDrain extends ItemModKamiFocus {
     public boolean isVisCostPerTick(ItemStack stack) {
         return true;
     }
+    
+    public String getSortingHelper(ItemStack itemstack)
+    {
+      return "TTKXP" + super.getSortingHelper(itemstack);
+    }
 
     @Override
     public void onUsingFocusTick(ItemStack paramItemStack, EntityPlayer paramEntityPlayer, int paramInt) {
@@ -110,11 +115,6 @@ public class ItemFocusXPDrain extends ItemModKamiFocus {
     }
 
 
-    @Override
-    public String getSortingHelper(ItemStack paramItemStack) {
-        return "XPDRAIN";
-    }
-
     @Override
     public String getItemName() {
         return LibItemNames.FOCUS_XP_DRAIN;

src/main/java/thaumic/tinkerer/common/item/kami/foci/ItemModKamiFocus.java

@@ -163,8 +163,6 @@ public abstract class ItemModKamiFocus extends ItemFocusBasic implements ITTinke
         return ConfigHandler.enableKami;
     }
 
-    @Override
-    public abstract String getSortingHelper(ItemStack paramItemStack);
 
     @Override
     public boolean onFocusBlockStartBreak(ItemStack paramItemStack, int paramInt1, int paramInt2, int paramInt3, EntityPlayer paramEntityPlayer) {