Switch weapon abilities to the new system

src/main/java/com/hbm/handler/ability/AvailableAbilities.java

@@ -1,14 +1,21 @@
 package com.hbm.handler.ability;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.util.EnumChatFormatting;
 
 // All abilities available on a given tool
 public class AvailableAbilities {
     private HashMap<IBaseAbility, Integer> abilities = new HashMap<IBaseAbility, Integer>();
 
-    AvailableAbilities() {}
+    public AvailableAbilities() {}
 
-    AvailableAbilities addAbility(IBaseAbility ability, int level) {
+    public AvailableAbilities addAbility(IBaseAbility ability, int level) {
         if (level < 0 || level >= ability.levels()) {
             throw new IllegalArgumentException("Illegal level " + level + " for ability " + ability.getName());
         }
@@ -17,16 +24,61 @@ public class AvailableAbilities {
         return this;
     }
 
-    AvailableAbilities removeAbility(IBaseAbility ability) {
+    public AvailableAbilities addToolAbilities() {
+        addAbility(IToolAreaAbility.NONE, 0);
+        addAbility(IToolHarvestAbility.NONE, 0);
+        return this;
+    }
+
+    public AvailableAbilities removeAbility(IBaseAbility ability) {
         abilities.remove(ability);
         return this;
     }
 
-    boolean supportsAbility(IBaseAbility ability) {
+    public boolean supportsAbility(IBaseAbility ability) {
         return abilities.containsKey(ability);
     }
 
-    int maxLevel(IBaseAbility ability) {
+    public int maxLevel(IBaseAbility ability) {
         return abilities.getOrDefault(ability, -1);
     }
+
+    public Map<IBaseAbility, Integer> get() {
+        return Collections.unmodifiableMap(abilities);
+    }
+
+    public int size() {
+        return abilities.size();
+    }
+
+    public boolean isEmpty() {
+        return abilities.isEmpty();
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void addInformation(List list) {
+        boolean hasToolAbilities = abilities.keySet().stream().anyMatch(a -> a instanceof IToolAreaAbility || a instanceof IToolHarvestAbility);
+        
+        if (hasToolAbilities) {
+            list.add("Abilities: ");
+
+            abilities.forEach((ability, level) -> {
+                list.add("  " + EnumChatFormatting.GOLD + ability.getFullName(level));
+            });
+
+			list.add("Right click to cycle through abilities!");
+			list.add("Sneak-click to turn ability off!");
+			list.add("Alt-click to open ability selection GUI!");
+        }
+        
+        boolean hasWeaponModifiers = abilities.keySet().stream().anyMatch(a -> a instanceof IWeaponAbility);
+        
+        if (hasWeaponModifiers) {
+            list.add("Weapon modifiers: ");
+            
+            abilities.forEach((ability, level) -> {
+                list.add("  " + EnumChatFormatting.RED + ability.getFullName(level));
+            });
+        }
+    }
 }

src/main/java/com/hbm/handler/ability/IWeaponAbility.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.generic.BlockBobble.BobbleType;
 import com.hbm.handler.threading.PacketThreading;
 import com.hbm.items.ModItems;
-import com.hbm.items.tool.IItemWithAbility;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.potion.HbmPotion;
@@ -26,6 +25,7 @@ import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -35,7 +35,8 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
 public interface IWeaponAbility extends IBaseAbility {
-    public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool);
+    // Note: tool is currently unused in weapon abilities
+    public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool);
     
     // region handlers
     public static final IWeaponAbility NONE = new IWeaponAbility() {
@@ -46,7 +47,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {}
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {}
     };
 
     public static final IWeaponAbility RADIATION = new IWeaponAbility() {
@@ -68,7 +69,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             if(victim instanceof EntityLivingBase)
                 ContaminationUtil.contaminate((EntityLivingBase)victim, HazardType.RADIATION, ContaminationType.CREATIVE, radAtLevel[level]);
         }
@@ -93,7 +94,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             float amount = amountAtLevel[level];
             
             if(victim instanceof EntityLivingBase) {
@@ -125,7 +126,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             int duration = durationAtLevel[level];
             
             if(victim instanceof EntityLivingBase) {
@@ -156,7 +157,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             int divider = dividerAtLevel[level];
             
             if(victim instanceof EntityLivingBase) {
@@ -198,7 +199,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             int duration = durationAtLevel[level];
             
             if(victim instanceof EntityLivingBase) {
@@ -228,7 +229,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             if(victim instanceof EntityLivingBase) {
                 victim.setFire(durationAtLevel[level]);
             }
@@ -241,7 +242,7 @@ public interface IWeaponAbility extends IBaseAbility {
             return "weapon.ability.chainsaw";
         }
 
-        public final int[] dividerAtLevel = {10, 15};
+        public final int[] dividerAtLevel = {15, 10};
 
         @Override
         public int levels() {
@@ -254,7 +255,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             int divider = dividerAtLevel[level];
 
             if(victim instanceof EntityLivingBase) {
@@ -291,7 +292,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             if(victim instanceof EntityLivingBase && ((EntityLivingBase) victim).getHealth() <= 0.0F) {
                 EntityLivingBase living = (EntityLivingBase) victim;
 
@@ -332,7 +333,7 @@ public interface IWeaponAbility extends IBaseAbility {
         }
 
         @Override
-        public void onHit(int level, World world, EntityPlayer player, Entity victim, IItemWithAbility tool) {
+        public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
             if(victim instanceof EntityMob && ((EntityMob) victim).getHealth() <= 0.0F) {
                 EntityMob mob = (EntityMob) victim;
 

src/main/java/com/hbm/inventory/gui/GUIScreenToolAbility.java

@@ -6,6 +6,10 @@ import java.util.List;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
+import com.hbm.handler.ability.IBaseAbility;
+import com.hbm.handler.ability.IToolAreaAbility;
+import com.hbm.handler.ability.IToolHarvestAbility;
+import com.hbm.handler.ability.ToolPreset;
 import com.hbm.items.tool.ItemToolAbility;
 import com.hbm.lib.RefStrings;
 import com.hbm.util.EnumUtil;
@@ -31,17 +35,14 @@ public class GUIScreenToolAbility extends GuiScreen {
     protected ItemToolAbility toolDef;
     protected ItemStack toolStack;
 
-	// TODO: Move elsewhere?
     public static class AbilityInfo {
-		String name;
+        public IBaseAbility ability;
-		int textureU, textureV;
+        public int textureU, textureV;
-		boolean hasLevels;
 
-		public AbilityInfo(String name, int textureU, int textureV, boolean hasLevels) {
+        public AbilityInfo(IBaseAbility ability, int textureU, int textureV) {
-			this.name = name;
+            this.ability = ability;
             this.textureU = textureU;
             this.textureV = textureV;
-			this.hasLevels = hasLevels;
         }
     }
 
@@ -49,19 +50,19 @@ public class GUIScreenToolAbility extends GuiScreen {
     public static final List<AbilityInfo> abilitiesHarvest = new ArrayList<>();
 
     static {
-		abilitiesArea.add(new AbilityInfo(null, 0, 91, false));
+        abilitiesArea.add(new AbilityInfo(IToolAreaAbility.NONE, 0, 91));
-		abilitiesArea.add(new AbilityInfo("tool.ability.recursion", 32, 91, true));
+        abilitiesArea.add(new AbilityInfo(IToolAreaAbility.RECURSION, 32, 91));
-		abilitiesArea.add(new AbilityInfo("tool.ability.hammer", 64, 91, true));
+        abilitiesArea.add(new AbilityInfo(IToolAreaAbility.HAMMER, 64, 91));
-		abilitiesArea.add(new AbilityInfo("tool.ability.explosion", 96, 91, true));
+        abilitiesArea.add(new AbilityInfo(IToolAreaAbility.EXPLOSION, 96, 91));
     
-		abilitiesHarvest.add(new AbilityInfo(null, 0, 107, false));
+        abilitiesHarvest.add(new AbilityInfo(IToolHarvestAbility.NONE, 0, 107));
-		abilitiesHarvest.add(new AbilityInfo("tool.ability.silktouch", 32, 107, false));
+        abilitiesHarvest.add(new AbilityInfo(IToolHarvestAbility.SILK, 32, 107));
-		abilitiesHarvest.add(new AbilityInfo("tool.ability.luck", 64, 107, true));
+        abilitiesHarvest.add(new AbilityInfo(IToolHarvestAbility.LUCK, 64, 107));
-		abilitiesHarvest.add(new AbilityInfo("tool.ability.smelter", 96, 107, false));
+        abilitiesHarvest.add(new AbilityInfo(IToolHarvestAbility.SMELTER, 96, 107));
-		abilitiesHarvest.add(new AbilityInfo("tool.ability.shredder", 128, 107, false));
+        abilitiesHarvest.add(new AbilityInfo(IToolHarvestAbility.SHREDDER, 128, 107));
-		abilitiesHarvest.add(new AbilityInfo("tool.ability.centrifuge", 160, 107, false));
+        abilitiesHarvest.add(new AbilityInfo(IToolHarvestAbility.CENTRIFUGE, 160, 107));
-		abilitiesHarvest.add(new AbilityInfo("tool.ability.crystallizer", 192, 107, false));
+        abilitiesHarvest.add(new AbilityInfo(IToolHarvestAbility.CRYSTALLIZER, 192, 107));
-		abilitiesHarvest.add(new AbilityInfo("tool.ability.mercury", 224, 107, false));
+        abilitiesHarvest.add(new AbilityInfo(IToolHarvestAbility.MERCURY, 224, 107));
     }
 
     // TODO: availability status for abilities; list of presets; selected preset index;
@@ -72,7 +73,10 @@ public class GUIScreenToolAbility extends GuiScreen {
     int selectedLevelHarvest = 0;
     int selectedPreset = 0;
     int totalPresets = 1;
-	String selectedPresetName = "lorem ipsum";
+    
+    int hoverIdxArea = -1;
+    int hoverIdxHarvest = -1;
+    int hoverIdxExtraBtn = -1;
     
     public GUIScreenToolAbility(ItemToolAbility toolDef) {
         super();
@@ -101,10 +105,6 @@ public class GUIScreenToolAbility extends GuiScreen {
     public void drawScreen(int mouseX, int mouseY, float f) {
         this.drawDefaultBackground();
 
-		drawGuiContainerBackgroundLayer(mouseX, mouseY);
-	}
-
-	protected void drawGuiContainerBackgroundLayer(int mouseX, int mouseY) {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
         Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
 
@@ -112,29 +112,57 @@ public class GUIScreenToolAbility extends GuiScreen {
         drawStretchedRect(guiLeft, guiTop, 0, 0, xSize, xSize - insetWidth, ySize, 74, 76);
         
         // Draw the switches
-		drawSwitches(abilitiesArea, selectionIdxArea, selectedLevelArea, guiLeft + 15, guiTop + 25, mouseX, mouseY);
+        hoverIdxArea = drawSwitches(abilitiesArea, selectionIdxArea, selectedLevelArea, guiLeft + 15, guiTop + 25, mouseX, mouseY);
-		drawSwitches(abilitiesHarvest, selectionIdxHarvest, selectedLevelHarvest, guiLeft + 15, guiTop + 45, mouseX, mouseY);
+        hoverIdxHarvest = drawSwitches(abilitiesHarvest, selectionIdxHarvest, selectedLevelHarvest, guiLeft + 15, guiTop + 45, mouseX, mouseY);
 
         // Draw preset indicator
         drawNumber(selectedPreset + 1, guiLeft + insetWidth + 115, guiTop + 25);
         drawNumber(totalPresets, guiLeft + insetWidth + 149, guiTop + 25);
 
         // Draw extra buttons hover highlights
-		int extraBtnsX = guiLeft + xSize - 75;
+        int extraBtnsX = guiLeft + xSize - 86;
         
-		for (int i = 0; i < 6; ++i) {
+        hoverIdxExtraBtn = -1;
+        for (int i = 0; i < 7; ++i) {
             if (isInAABB(mouseX, mouseY, extraBtnsX + i * 11, guiTop + 11, 9, 9)) {
-				drawTexturedModalRect(extraBtnsX + i * 11, guiTop + 11, 186 + i * 9, 18, 9, 9);
+                hoverIdxExtraBtn = i;
+                drawTexturedModalRect(extraBtnsX + i * 11, guiTop + 11, 193 + i * 9, 0, 9, 9);
             }
         }
 
         // Draw tooltip
-		if (!"".equals(selectedPresetName)) {
+        String tooltipValue = "";
-			int tooltipWidth = Math.max(6, fontRendererObj.getStringWidth(selectedPresetName));
+
+        if (hoverIdxArea != -1) {
+            int level = 0;
+            if (hoverIdxArea == selectionIdxArea) {
+                level = selectedLevelArea;
+            }
+            tooltipValue = abilitiesArea.get(hoverIdxArea).ability.getFullName(level);
+        } else if (hoverIdxHarvest != -1) {
+            int level = 0;
+            if (hoverIdxHarvest == selectionIdxHarvest) {
+                level = selectedLevelHarvest;
+            }
+            tooltipValue = abilitiesHarvest.get(hoverIdxHarvest).ability.getFullName(level);
+        } else if (hoverIdxExtraBtn != -1) {
+            switch (hoverIdxExtraBtn) {
+            case 0: tooltipValue = "Reset all presets"; break;
+            case 1: tooltipValue = "Delete current preset"; break;
+            case 2: tooltipValue = "Add new preset"; break;
+            case 3: tooltipValue = "Select first preset"; break;
+            case 4: tooltipValue = "Next preset"; break;
+            case 5: tooltipValue = "Previous preset"; break;
+            case 6: tooltipValue = "Close window"; break;
+            }
+        }
+
+        if (!tooltipValue.isEmpty()) {
+            int tooltipWidth = Math.max(6, fontRendererObj.getStringWidth(tooltipValue));
             int tooltipX = guiLeft + xSize / 2 - tooltipWidth / 2;
             int tooltipY = guiTop + ySize + 1 + 4;
             drawStretchedRect(tooltipX - 5, tooltipY - 4, 0, 76, tooltipWidth + 10, 186, 15, 3, 3);
-			fontRendererObj.drawString(selectedPresetName, tooltipX, tooltipY, 0xffffffff);
+            fontRendererObj.drawString(tooltipValue, tooltipX, tooltipY, 0xffffffff);
         }
     }
 
@@ -148,8 +176,8 @@ public class GUIScreenToolAbility extends GuiScreen {
         drawTexturedModalRect(x + keepLeft + realMidWidth, y, u + keepLeft + midWidth, v, keepRight, height);
     }
 
-	protected void drawSwitches(List<AbilityInfo> abilities, int selectionIdx, int selectedLevel, int x, int y, int mouseX, int mouseY) {
+    protected int drawSwitches(List<AbilityInfo> abilities, int selectionIdx, int selectedLevel, int x, int y, int mouseX, int mouseY) {
-		// TODO: Store hovered ability, use it in click handling and the dynamic tooltip
+        int hoverIdx = -1;
 
         for (int i = 0; i < abilities.size(); ++i) {
             AbilityInfo abilityInfo = abilities.get(i);
@@ -159,24 +187,41 @@ public class GUIScreenToolAbility extends GuiScreen {
             drawTexturedModalRect(x + 20 * i, y, abilityInfo.textureU + (available ? 16 : 0), abilityInfo.textureV, 16, 16);
         
             // Draw level LEDs
-			if (abilityInfo.hasLevels) {
+            if (abilityInfo.ability.levels() > 1) {
-				int level = 0;  // TODO
+                int level = 0;
 
                 if (i == selectionIdx) {
                     level = selectedLevel + 1;
                 }
 
-				drawTexturedModalRect(x + 20 * i + 17, y + 1, 222 + level * 2, 0, 2, 14);
+                // TODO: Max allowed level instead?
+                // int maxLevel = Math.min(abilityInfo.ability.levels(), 5);
+                int maxLevel = 5;
+                
+                if (level > 10 || level < 0) {
+                    // All-red LEDs for invalid levels
+                    level = -1;
+                }
+
+                drawTexturedModalRect(x + 20 * i + 17, y + 1, 188 + level * 2, maxLevel * 14, 2, 14);
+            }
+
+            boolean isHovered = isInAABB(mouseX, mouseY, x + 20 * i, y, 16, 16);
+
+            if (isHovered) {
+                hoverIdx = i;
             }
 
             if (i == selectionIdx) {
                 // Draw selection highlight
-				drawTexturedModalRect(x + 20 * i - 1, y - 1, 186, 0, 18, 18);
+                drawTexturedModalRect(x + 20 * i - 1, y - 1, 220, 9, 18, 18);
-			} else if (available && isInAABB(mouseX, mouseY, x + 20 * i, y, 16, 16)) {
+            } else if (available && isHovered) {
                 // Draw hover highlight
-				drawTexturedModalRect(x + 20 * i - 1, y - 1, 204, 0, 18, 18);
+                drawTexturedModalRect(x + 20 * i - 1, y - 1, 238, 9, 18, 18);
             }
         }
+
+        return hoverIdx;
     }
 
     protected void drawNumber(int number, int x, int y) {
@@ -208,101 +253,86 @@ public class GUIScreenToolAbility extends GuiScreen {
         if(Mouse.getEventButton() == -1) {
             int scroll = Mouse.getEventDWheel();
 
-			if(scroll > 0 && selectedPreset > 0) selectedPreset -= 1;
+            if(scroll < 0 && selectedPreset > 0) selectedPreset -= 1;
-			if(scroll < 0 && selectedPreset < totalPresets) selectedPreset += 1;
+            if(scroll > 0 && selectedPreset < totalPresets - 1) selectedPreset += 1;
         }
     }
 
     @Override
     protected void mouseClicked(int mouseX, int mouseY, int button) {
-		// TODO
+        // Process switches
-		boolean clicked = false;
+        // TODO: Encapsulate in a method
-		
+        if (hoverIdxArea != -1) {
-		// TODO: Encapsulate?
-		for (int i = 0; i < abilitiesArea.size(); ++i) {
-			AbilityInfo abilityInfo = abilitiesArea.get(i);
             boolean available = true;  // TODO
 
-			if (available && isInAABB(mouseX, mouseY, guiLeft + 15 + 20 * i, guiTop + 25, 16, 16)) {
+            if (available) {
-				if (abilityInfo.hasLevels) {
+                int availableLevels = abilitiesArea.get(hoverIdxArea).ability.levels();
-					int availableLevels = 10;
 
-					if (i == selectionIdxArea) {
+                if (hoverIdxArea != selectionIdxArea || availableLevels > 1) {
+                    mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:item.techBoop"), 2F));
+                }
+
+                if (hoverIdxArea == selectionIdxArea) {
                     selectedLevelArea = (selectedLevelArea + 1) % availableLevels;
                 } else {
                     selectedLevelArea = 0;
                 }
-				}
 
-				selectionIdxArea = i;
+                selectionIdxArea = hoverIdxArea;
-				clicked = true;
-				break;
             }
         }
 
-		for (int i = 0; i < abilitiesHarvest.size(); ++i) {
+        if (hoverIdxHarvest != -1) {
-			AbilityInfo abilityInfo = abilitiesHarvest.get(i);
             boolean available = true;  // TODO
 
-			if (available && isInAABB(mouseX, mouseY, guiLeft + 15 + 20 * i, guiTop + 45, 16, 16)) {
+            if (available) {
-				if (abilityInfo.hasLevels) {
+                int availableLevels = abilitiesHarvest.get(hoverIdxHarvest).ability.levels();
-					int availableLevels = 11;
 
-					if (i == selectionIdxHarvest) {
+                if (hoverIdxHarvest == selectionIdxHarvest) {
                     selectedLevelHarvest = (selectedLevelHarvest + 1) % availableLevels;
                 } else {
                     selectedLevelHarvest = 0;
                 }
-				}
 
-				selectionIdxHarvest = i;
+                selectionIdxHarvest = hoverIdxHarvest;
-				clicked = true;
-				break;
-			}
-		}
 
-		if (clicked) {
                 mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:item.techBoop"), 2F));
             }
+        }
         
-		// TODO
+        // Process extra buttons
-		int extraBtnsX = guiLeft + xSize - 75;
+        if (hoverIdxExtraBtn != -1) {
-
+            switch (hoverIdxExtraBtn) {
-		clicked = false;
+            case 0:
-
+                doResetPresets();
-		if (isInAABB(mouseX, mouseY, extraBtnsX + 0 * 11, guiTop + 11, 9, 9)) {
+                break;
+            case 1:
                 doDelPreset();
-			clicked = true;
+                break;
-		}
+            case 2:
-
-		if (isInAABB(mouseX, mouseY, extraBtnsX + 1 * 11, guiTop + 11, 9, 9)) {
                 doAddPreset();
-			clicked = true;
+                break;
-		}
+            case 3:
-
-		if (isInAABB(mouseX, mouseY, extraBtnsX + 2 * 11, guiTop + 11, 9, 9)) {
                 doZeroPreset();
-			clicked = true;
+                break;
-		}
+            case 4:
-
-		if (isInAABB(mouseX, mouseY, extraBtnsX + 3 * 11, guiTop + 11, 9, 9)) {
                 doNextPreset();
-			clicked = true;
+                break;
-		}
+            case 5:
-
-		if (isInAABB(mouseX, mouseY, extraBtnsX + 4 * 11, guiTop + 11, 9, 9)) {
                 doPrevPreset();
-			clicked = true;
+                break;
-		}
+            case 6:
-
-		if (isInAABB(mouseX, mouseY, extraBtnsX + 5 * 11, guiTop + 11, 9, 9)) {
                 doClose();
-			clicked = true;
+                break;
             }
 
-		if (clicked) {
             mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 0.5F));
         }
+
+        // Allow quick-closing
+        if (!isInAABB(mouseX, mouseY, guiLeft, guiTop, xSize, ySize)) {
+            doClose();
+        }
     }
 
     @Override
@@ -320,6 +350,16 @@ public class GUIScreenToolAbility extends GuiScreen {
         return false;
     }
 
+    protected void doResetPresets() {
+        // TODO
+        totalPresets = 1;
+        selectedPreset = 0;
+        selectionIdxArea = 0;
+        selectedLevelArea = 0;
+        selectionIdxHarvest = 0;
+        selectedLevelHarvest = 0;
+    }
+
     protected void doDelPreset() {
         // TODO
         if (totalPresets <= 1) {

src/main/java/com/hbm/items/ModItems.java

@@ -5,6 +5,7 @@ import com.hbm.config.VersatileConfig;
 import com.hbm.handler.BucketHandler;
 import com.hbm.handler.ToolAbility;
 import com.hbm.handler.ToolAbility.LuckAbility;
+import com.hbm.handler.ability.IWeaponAbility;
 import com.hbm.handler.WeaponAbility;
 import com.hbm.handler.guncfg.*;
 import com.hbm.interfaces.ICustomWarhead.SaltedFuel.HalfLifeType;
@@ -4480,8 +4481,8 @@ public class ModItems {
 				.addHitAbility(new WeaponAbility.BeheaderAbility()).setShears().setUnlocalizedName("chainsaw").setTextureName(RefStrings.MODID + ":chainsaw");
 
 		schrabidium_sword = new ItemSwordAbility(75, 0, MainRegistry.tMatSchrab)
-				.addHitAbility(new WeaponAbility.RadiationAbility(50F))
+				.addHitAbility(IWeaponAbility.RADIATION, 1)
-				.addHitAbility(new WeaponAbility.VampireAbility(2F))
+				.addHitAbility(IWeaponAbility.VAMPIRE, 0)
 				.setRarity(EnumRarity.rare).setUnlocalizedName("schrabidium_sword").setTextureName(RefStrings.MODID + ":schrabidium_sword");
 
 		schrabidium_pickaxe = new ItemToolAbility(20, 0, MainRegistry.tMatSchrab, EnumToolType.PICKAXE)
@@ -4531,7 +4532,7 @@ public class ModItems {
 		steel_hoe = new ModHoe(MainRegistry.tMatSteel).setUnlocalizedName("steel_hoe").setTextureName(RefStrings.MODID + ":steel_hoe");
 
 		alloy_sword = new ItemSwordAbility(8F, 0, MainRegistry.tMatAlloy)
-				.addHitAbility(new WeaponAbility.StunAbility(2)).setUnlocalizedName("alloy_sword").setTextureName(RefStrings.MODID + ":alloy_sword");
+				.addHitAbility(IWeaponAbility.STUN, 0).setUnlocalizedName("alloy_sword").setTextureName(RefStrings.MODID + ":alloy_sword");
 
 		alloy_pickaxe = new ItemToolAbility(5F, 0, MainRegistry.tMatAlloy, EnumToolType.PICKAXE)
 				.addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("alloy_pickaxe").setTextureName(RefStrings.MODID + ":alloy_pickaxe");
@@ -4546,8 +4547,8 @@ public class ModItems {
 		alloy_hoe = new ModHoe(MainRegistry.tMatAlloy).setUnlocalizedName("alloy_hoe").setTextureName(RefStrings.MODID + ":alloy_hoe");
 
 		cmb_sword = new ItemSwordAbility(35F, 0, MainRegistry.tMatCMB)
-				.addHitAbility(new WeaponAbility.StunAbility(2))
+				.addHitAbility(IWeaponAbility.STUN, 0)
-				.addHitAbility(new WeaponAbility.VampireAbility(2F)).setUnlocalizedName("cmb_sword").setTextureName(RefStrings.MODID + ":cmb_sword");
+				.addHitAbility(IWeaponAbility.VAMPIRE, 0).setUnlocalizedName("cmb_sword").setTextureName(RefStrings.MODID + ":cmb_sword");
 
 		cmb_pickaxe = new ItemToolAbility(10F, 0, MainRegistry.tMatCMB, EnumToolType.PICKAXE)
 				.addBreakAbility(new ToolAbility.RecursionAbility(5))
@@ -4571,7 +4572,7 @@ public class ModItems {
 		cmb_hoe = new ModHoe(MainRegistry.tMatCMB).setUnlocalizedName("cmb_hoe").setTextureName(RefStrings.MODID + ":cmb_hoe");
 
 		elec_sword = new ItemSwordAbilityPower(12.5F, 0, MainRegistry.tMatElec, 500000, 1000, 100)
-				.addHitAbility(new WeaponAbility.StunAbility(5)).setUnlocalizedName("elec_sword").setTextureName(RefStrings.MODID + ":elec_sword_anim");
+				.addHitAbility(IWeaponAbility.STUN, 2).setUnlocalizedName("elec_sword").setTextureName(RefStrings.MODID + ":elec_sword_anim");
 
 		elec_pickaxe = new ItemToolAbilityPower(6F, 0, MainRegistry.tMatElec, EnumToolType.PICKAXE, 500000, 1000, 100)
 				.addBreakAbility(new ToolAbility.HammerAbility(2))
@@ -4594,7 +4595,7 @@ public class ModItems {
 				.addBreakAbility(new LuckAbility(2)).setUnlocalizedName("elec_shovel").setTextureName(RefStrings.MODID + ":elec_shovel_anim");
 
 		desh_sword = new ItemSwordAbility(12.5F, 0, MainRegistry.tMatDesh)
-				.addHitAbility(new WeaponAbility.StunAbility(2)).setUnlocalizedName("desh_sword").setTextureName(RefStrings.MODID + ":desh_sword");
+				.addHitAbility(IWeaponAbility.STUN, 0).setUnlocalizedName("desh_sword").setTextureName(RefStrings.MODID + ":desh_sword");
 
 		desh_pickaxe = new ItemToolAbility(5F, -0.05, MainRegistry.tMatDesh, EnumToolType.PICKAXE)
 				.addBreakAbility(new ToolAbility.HammerAbility(1))
@@ -4635,7 +4636,7 @@ public class ModItems {
 
 		ToolMaterial matDecCobalt = EnumHelper.addToolMaterial("HBM_COBALT2", 3, 2500, 15.0F, 2.5F, 75).setRepairItem(new ItemStack(ModItems.ingot_cobalt));
 		cobalt_decorated_sword = new ItemSwordAbility(15F, 0, matDecCobalt)
-				.addHitAbility(new WeaponAbility.BobbleAbility()).setUnlocalizedName("cobalt_decorated_sword").setTextureName(RefStrings.MODID + ":cobalt_decorated_sword");
+				.addHitAbility(IWeaponAbility.BOBBLE, 0).setUnlocalizedName("cobalt_decorated_sword").setTextureName(RefStrings.MODID + ":cobalt_decorated_sword");
 		cobalt_decorated_pickaxe = new ItemToolAbility(6F, 0, matDecCobalt, EnumToolType.PICKAXE)
 				.addBreakAbility(new ToolAbility.RecursionAbility(4))
 				.addBreakAbility(new ToolAbility.HammerAbility(1))
@@ -4656,9 +4657,9 @@ public class ModItems {
 
 		ToolMaterial matStarmetal = EnumHelper.addToolMaterial("HBM_STARMETAL", 3, 3000, 20.0F, 2.5F, 100).setRepairItem(new ItemStack(ModItems.ingot_starmetal));
 		starmetal_sword = new ItemSwordAbility(25F, 0, matStarmetal)
-				.addHitAbility(new WeaponAbility.BeheaderAbility())
+				.addHitAbility(IWeaponAbility.BEHEADER, 0)
-				.addHitAbility(new WeaponAbility.StunAbility(3))
+				.addHitAbility(IWeaponAbility.STUN, 1)
-				.addHitAbility(new WeaponAbility.BobbleAbility()).setUnlocalizedName("starmetal_sword").setTextureName(RefStrings.MODID + ":starmetal_sword");
+				.addHitAbility(IWeaponAbility.BOBBLE, 0).setUnlocalizedName("starmetal_sword").setTextureName(RefStrings.MODID + ":starmetal_sword");
 		starmetal_pickaxe = new ItemToolAbility(8F, 0, matStarmetal, EnumToolType.PICKAXE)
 				.addBreakAbility(new ToolAbility.RecursionAbility(6))
 				.addBreakAbility(new ToolAbility.HammerAbility(2))
@@ -4882,11 +4883,11 @@ public class ModItems {
 		diamond_gavel = new WeaponSpecial(ToolMaterial.EMERALD).setUnlocalizedName("diamond_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":diamond_gavel");
 		ToolMaterial matMeseGavel = EnumHelper.addToolMaterial("HBM_MESEGAVEL", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.plate_paa));
 		mese_gavel = new ItemSwordAbility(250, 1.5, matMeseGavel)
-				.addHitAbility(new WeaponAbility.PhosphorusAbility(60))
+				.addHitAbility(IWeaponAbility.PHOSPHORUS, 0)
-				.addHitAbility(new WeaponAbility.RadiationAbility(500))
+				.addHitAbility(IWeaponAbility.RADIATION, 2)
-				.addHitAbility(new WeaponAbility.StunAbility(10))
+				.addHitAbility(IWeaponAbility.STUN, 3)
-				.addHitAbility(new WeaponAbility.VampireAbility(50))
+				.addHitAbility(IWeaponAbility.VAMPIRE, 4)
-				.addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("mese_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mese_gavel");
+				.addHitAbility(IWeaponAbility.BEHEADER, 0).setUnlocalizedName("mese_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mese_gavel");
 
 		multitool_hit = new ItemMultitoolPassive().setUnlocalizedName("multitool_hit").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist");
 		multitool_dig = new ItemMultitoolTool(4.0F, MainRegistry.enumToolMaterialMultitool, ItemMultitoolTool.getAllBlocks()).setFull3D().setUnlocalizedName("multitool_dig").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":multitool_claw");

src/main/java/com/hbm/items/tool/ItemSwordAbility.java

@@ -1,11 +1,11 @@
 package com.hbm.items.tool;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.hbm.handler.WeaponAbility;
+import com.hbm.handler.ability.AvailableAbilities;
+import com.hbm.handler.ability.IWeaponAbility;
 import com.hbm.items.ModItems;
 
 import cpw.mods.fml.relauncher.Side;
@@ -19,13 +19,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemSword;
 import net.minecraft.util.EnumChatFormatting;
 
-public class ItemSwordAbility extends ItemSword implements IItemWithAbility {
+public class ItemSwordAbility extends ItemSword {
 
 	private EnumRarity rarity = EnumRarity.common;
 	// was there a reason for this to be private?
 	protected float damage;
 	protected double movement;
-	private List<WeaponAbility> hitAbility = new ArrayList();
+	private AvailableAbilities hitAbilities = new AvailableAbilities();
 
 	public ItemSwordAbility(float damage, double movement, ToolMaterial material) {
 		super(material);
@@ -33,8 +33,8 @@ public class ItemSwordAbility extends ItemSword implements IItemWithAbility {
 		this.movement = movement;
 	}
 
-	public ItemSwordAbility addHitAbility(WeaponAbility weaponAbility) {
+	public ItemSwordAbility addHitAbility(IWeaponAbility weaponAbility, int level) {
-		this.hitAbility.add(weaponAbility);
+		this.hitAbilities.addAbility(weaponAbility, level);
 		return this;
 	}
 
@@ -50,15 +50,15 @@ public class ItemSwordAbility extends ItemSword implements IItemWithAbility {
 
 	public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) {
 
-		if(!attacker.worldObj.isRemote && !this.hitAbility.isEmpty() && attacker instanceof EntityPlayer && canOperate(stack)) {
+		if(!attacker.worldObj.isRemote && attacker instanceof EntityPlayer && canOperate(stack)) {
 
 			// hacky hacky hack
 			if(this == ModItems.mese_gavel)
 				attacker.worldObj.playSoundAtEntity(victim, "hbm:weapon.whack", 3.0F, 1.F);
 
-			for(WeaponAbility ability : this.hitAbility) {
+			this.hitAbilities.get().forEach((ability, level) -> {
-				ability.onHit(attacker.worldObj, (EntityPlayer) attacker, victim, this);
+				((IWeaponAbility)ability).onHit(level, attacker.worldObj, (EntityPlayer) attacker, victim, this);
-			}
+			});
 		}
 
 		stack.damageItem(1, attacker);
@@ -77,23 +77,10 @@ public class ItemSwordAbility extends ItemSword implements IItemWithAbility {
 
 	@SideOnly(Side.CLIENT)
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
-
+		hitAbilities.addInformation(list);
-		if(!this.hitAbility.isEmpty()) {
-
-			list.add("Weapon modifiers: ");
-
-			for(WeaponAbility ability : this.hitAbility) {
-				list.add("  " + EnumChatFormatting.RED + ability.getFullName());
-			}
-		}
 	}
 
 	protected boolean canOperate(ItemStack stack) {
 		return true;
 	}
-
-	@Override
-	public boolean isShears(ItemStack stack) {
-		return false;
-	}
 }