diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAbilities.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAbilities.java index b1e58d94a..295716a92 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAbilities.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAbilities.java @@ -649,9 +649,11 @@ public class GuiNPCAbilities extends GuiNPCInterface2 implements IScrollData, IC // Search matches either the display name or the typeId (strip color codes for matching) String stripped = displayName.replaceAll("\u00A7.", ""); if (search.isEmpty() || stripped.toLowerCase().contains(search) || typeId.toLowerCase().contains(search)) { - // Lime green for concurrent-capable types, gray for other built-in types - if (AbilityController.Instance.isConcurrentCapableType(typeId)) { - displayName = "\u00A7a" + displayName; + // Pink for custom ability, light blue for concurrent-capable types, gray for other built-in types + if (typeId.equals("ability.cnpc.custom")) { + displayName = "\u00A7d" + displayName; + } else if (AbilityController.Instance.isConcurrentCapableType(typeId)) { + displayName = "\u00A7b" + displayName; } else if (AbilityController.Instance.isBuiltInType(typeId)) { displayName = "\u00A77" + displayName; } @@ -661,6 +663,21 @@ public class GuiNPCAbilities extends GuiNPCInterface2 implements IScrollData, IC } Collections.sort(list, (a, b) -> String.CASE_INSENSITIVE_ORDER.compare( a.replaceAll("\u00A7.", ""), b.replaceAll("\u00A7.", ""))); + + // Pin Custom Ability to top of list + String customEntry = null; + for (String name : list) { + String tid = displayNameToTypeId.get(name); + if (tid != null && tid.equals("ability.cnpc.custom")) { + customEntry = name; + break; + } + } + if (customEntry != null) { + list.remove(customEntry); + list.add(0, customEntry); + } + return list; } diff --git a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java index 46447712b..5b56d0f14 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java @@ -189,7 +189,7 @@ public class SubGuiAbilityConfig extends SubGuiInterface implements ITextfieldLi } if (ability.isConcurrentCapable()) { sw.addLabel(new GuiNpcLabel(baseId + 3, - StatCollector.translateToLocal("ability.concurrentInfo"), 5, infoY, 0x55FF55)); + StatCollector.translateToLocal("ability.concurrentInfo"), 5, infoY, 0x55FFFF)); } } diff --git a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityTypeSelect.java b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityTypeSelect.java index 7d9c6cc32..46975f289 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityTypeSelect.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityTypeSelect.java @@ -86,7 +86,7 @@ public class SubGuiAbilityTypeSelect extends SubGuiInterface implements ICustomS if (typeId.equals("ability.cnpc.custom")) { displayName = "\u00A7d" + displayName; } else if (AbilityController.Instance.isConcurrentCapableType(typeId)) { - displayName = "\u00A7a" + displayName; + displayName = "\u00A7b" + displayName; } allDisplayNameToTypeId.put(displayName, typeId); } diff --git a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiChainedAbilityConfig.java b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiChainedAbilityConfig.java index 99af06e1c..1fc123d37 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiChainedAbilityConfig.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiChainedAbilityConfig.java @@ -402,7 +402,7 @@ public class SubGuiChainedAbilityConfig extends SubGuiInterface implements IText // Concurrent toggle (only shown if resolved ability is concurrent-capable, never for first entry) if (i > 0 && resolvedAbility != null && resolvedAbility.isConcurrentCapable()) { - String cLabel = entry.isConcurrentEnabled() ? "\u00A7aC" : "\u00A77C"; + String cLabel = entry.isConcurrentEnabled() ? "\u00A7bC" : "\u00A77C"; GuiNpcButton cBtn = new GuiNpcButton(ENTRY_BASE + i * ENTRY_STRIDE + 5, L_LABEL_X + 288, y, 20, 20, cLabel); cBtn.setHoverText("ability.hover.concurrent"); sw.addButton(cBtn);