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 6d12693bb..c88c18095 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java @@ -144,20 +144,20 @@ public class SubGuiAbilityConfig extends SubGuiInterface implements ITextfieldLi // ═══════════════════════════════════════════════════════════════════════ // TOP TABS using GuiMenuTopButton // ═══════════════════════════════════════════════════════════════════════ - GuiMenuTopButton generalTab = new GuiMenuTopButton(90, guiLeft + 4, guiTop - 17, "ability.tab.general"); + GuiMenuTopButton generalTab = new GuiMenuTopButton(90, guiLeft + 4, guiTop - 17, "menu.general"); generalTab.active = (activeTab == TAB_GENERAL); addTopButton(generalTab); GuiMenuTopButton lastTab = generalTab; if (hasTypeSettings) { - GuiMenuTopButton typeTab = new GuiMenuTopButton(91, lastTab, "ability.tab.type"); + GuiMenuTopButton typeTab = new GuiMenuTopButton(91, lastTab, "gui.type"); typeTab.active = (activeTab == TAB_TYPE); addTopButton(typeTab); lastTab = typeTab; } - GuiMenuTopButton targetTab = new GuiMenuTopButton(92, lastTab, "ability.tab.target"); + GuiMenuTopButton targetTab = new GuiMenuTopButton(92, lastTab, "script.target"); targetTab.active = (activeTab == TAB_TARGET); addTopButton(targetTab); lastTab = targetTab; @@ -435,7 +435,7 @@ public class SubGuiAbilityConfig extends SubGuiInterface implements ITextfieldLi // ───────────────────────────────────────────────────────────────────── // SOUNDS SECTION // ───────────────────────────────────────────────────────────────────── - addLabel(new GuiNpcLabel(30, "ability.sounds", col1LabelX, y)); + addLabel(new GuiNpcLabel(30, "advanced.sounds", col1LabelX, y)); y += 14; // Wind Up Sound @@ -455,7 +455,7 @@ public class SubGuiAbilityConfig extends SubGuiInterface implements ITextfieldLi // ───────────────────────────────────────────────────────────────────── // ANIMATIONS SECTION // ───────────────────────────────────────────────────────────────────── - addLabel(new GuiNpcLabel(33, "ability.animations", col1LabelX, y)); + addLabel(new GuiNpcLabel(33, "menu.animations", col1LabelX, y)); y += 14; // Wind Up Animation @@ -486,7 +486,8 @@ public class SubGuiAbilityConfig extends SubGuiInterface implements ITextfieldLi // Telegraph Type (separate column) String typeKey = ability.getTelegraphType().name().toLowerCase(); addLabel(new GuiNpcLabel(42, "ability.telegraphType", guiLeft + 200, y + 5)); - addLabel(new GuiNpcLabel(43, "ability.telegraph." + typeKey, guiLeft + 280, y + 5)); + String telegraphLangKey = typeKey.equals("none") ? "gui.none" : "telegraph." + typeKey; + addLabel(new GuiNpcLabel(43, telegraphLangKey, guiLeft + 280, y + 5)); y += 24; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityBeam.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityBeam.java index e951e5fbd..fb3e6b074 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityBeam.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityBeam.java @@ -28,7 +28,7 @@ public class SubGuiAbilityBeam extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Damage + Damage Interval - addLabel(new GuiNpcLabel(100, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(100, fieldX, y, 50, beam.getDamage())); addLabel(new GuiNpcLabel(101, "ability.dmgInterval", col2LabelX, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityCharge.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityCharge.java index a7b19b05c..d3ff5fd81 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityCharge.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityCharge.java @@ -27,10 +27,10 @@ public class SubGuiAbilityCharge extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Damage + Speed - addLabel(new GuiNpcLabel(100, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(100, fieldX, y, 50, charge.getDamage())); - addLabel(new GuiNpcLabel(101, "ability.speed", col2LabelX, y + 5)); + addLabel(new GuiNpcLabel(101, "stats.speed", col2LabelX, y + 5)); addTextField(createFloatField(101, col2FieldX, y, 50, charge.getChargeSpeed())); y += 24; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityCutter.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityCutter.java index b825789a8..d917282f2 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityCutter.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityCutter.java @@ -28,10 +28,10 @@ public class SubGuiAbilityCutter extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Damage + Range - addLabel(new GuiNpcLabel(100, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(100, fieldX, y, 50, cutter.getDamage())); - addLabel(new GuiNpcLabel(101, "ability.range", col2LabelX, y + 5)); + addLabel(new GuiNpcLabel(101, "gui.range", col2LabelX, y + 5)); addTextField(createFloatField(101, col2FieldX, y, 50, cutter.getRange())); y += 24; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDash.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDash.java index 2d0d5c33a..7ae0ea1f5 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDash.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDash.java @@ -28,7 +28,7 @@ public class SubGuiAbilityDash extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Dash Mode - addLabel(new GuiNpcLabel(100, "ability.dashMode", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "ability.mode", labelX, y + 5)); String[] dashModes = {"Aggressive", "Defensive"}; addButton(new GuiNpcButton(100, fieldX, y, 80, 20, dashModes, dash.getDashMode().ordinal())); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityHeal.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityHeal.java index 365460672..30ccb739e 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityHeal.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityHeal.java @@ -40,7 +40,7 @@ public class SubGuiAbilityHeal extends SubGuiAbilityConfig { addLabel(new GuiNpcLabel(102, "ability.healRadius", labelX, y + 5)); addTextField(createFloatField(102, fieldX, y, 50, heal.getHealRadius())); - addLabel(new GuiNpcLabel(103, "ability.instant", col2LabelX, y + 5)); + addLabel(new GuiNpcLabel(103, "dialog.instant", col2LabelX, y + 5)); addButton(new GuiNpcButton(103, col2FieldX, y, 50, 20, new String[]{"gui.no", "gui.yes"}, heal.isInstantHeal() ? 1 : 0)); y += 24; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityHeavyHit.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityHeavyHit.java index c045833b9..5c0d99c48 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityHeavyHit.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityHeavyHit.java @@ -27,7 +27,7 @@ public class SubGuiAbilityHeavyHit extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Damage + Potion Time - addLabel(new GuiNpcLabel(100, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(100, fieldX, y, 50, heavyHit.getDamage())); addLabel(new GuiNpcLabel(101, "ability.potionTime", col2LabelX, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityOrb.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityOrb.java index 5c82c42f8..fd75700c0 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityOrb.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityOrb.java @@ -28,16 +28,16 @@ public class SubGuiAbilityOrb extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Damage + Speed - addLabel(new GuiNpcLabel(100, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(100, fieldX, y, 50, orb.getDamage())); - addLabel(new GuiNpcLabel(101, "ability.speed", col2LabelX, y + 5)); + addLabel(new GuiNpcLabel(101, "stats.speed", col2LabelX, y + 5)); addTextField(createFloatField(101, col2FieldX, y, 50, orb.getOrbSpeed())); y += 24; // Row 2: Orb Size + Max Distance - addLabel(new GuiNpcLabel(102, "ability.orbSize", labelX, y + 5)); + addLabel(new GuiNpcLabel(102, "stats.size", labelX, y + 5)); addTextField(createFloatField(102, fieldX, y, 50, orb.getOrbSize())); addLabel(new GuiNpcLabel(103, "ability.maxDist", col2LabelX, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityProjectile.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityProjectile.java index cbde41b7f..88d7bbf00 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityProjectile.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityProjectile.java @@ -28,10 +28,10 @@ public class SubGuiAbilityProjectile extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Damage + Speed - addLabel(new GuiNpcLabel(100, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(100, fieldX, y, 50, projectile.getDamage())); - addLabel(new GuiNpcLabel(101, "ability.speed", col2LabelX, y + 5)); + addLabel(new GuiNpcLabel(101, "stats.speed", col2LabelX, y + 5)); addTextField(createFloatField(101, col2FieldX, y, 50, projectile.getSpeed())); y += 24; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityShockwave.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityShockwave.java index 9230e242c..38ab22158 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityShockwave.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityShockwave.java @@ -27,7 +27,7 @@ public class SubGuiAbilityShockwave extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Damage + Push Radius - addLabel(new GuiNpcLabel(100, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(100, fieldX, y, 50, shockwave.getDamage())); addLabel(new GuiNpcLabel(101, "ability.pushRadius", col2LabelX, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilitySlam.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilitySlam.java index 2fdb0d7fb..7f8c7194e 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilitySlam.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilitySlam.java @@ -27,7 +27,7 @@ public class SubGuiAbilitySlam extends SubGuiAbilityConfig { int col2FieldX = guiLeft + 205; // Row 1: Damage + Radius - addLabel(new GuiNpcLabel(100, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(100, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(100, fieldX, y, 50, slam.getDamage())); addLabel(new GuiNpcLabel(101, "ability.radius", col2LabelX, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityTeleport.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityTeleport.java index c4e9154e5..5570d944f 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityTeleport.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityTeleport.java @@ -71,7 +71,7 @@ public class SubGuiAbilityTeleport extends SubGuiAbilityConfig { } // Damage + Damage Radius - addLabel(new GuiNpcLabel(106, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(106, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(106, fieldX, y, 50, teleport.getDamage())); addLabel(new GuiNpcLabel(107, "ability.dmgRadius", col2LabelX, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityTrap.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityTrap.java index 8c8d92bb4..88529fe68 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityTrap.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityTrap.java @@ -38,7 +38,7 @@ public class SubGuiAbilityTrap extends SubGuiAbilityConfig { y += 24; // Row 2: Damage + Damage Radius - addLabel(new GuiNpcLabel(102, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(102, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(102, fieldX, y, 50, trap.getDamage())); addLabel(new GuiNpcLabel(103, "ability.dmgRadius", col2LabelX, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityVortex.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityVortex.java index 6978abce7..a1abbd661 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityVortex.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityVortex.java @@ -37,7 +37,7 @@ public class SubGuiAbilityVortex extends SubGuiAbilityConfig { y += 24; // Row 2: Damage + Knockback - addLabel(new GuiNpcLabel(102, "ability.damage", labelX, y + 5)); + addLabel(new GuiNpcLabel(102, "enchantment.damage", labelX, y + 5)); addTextField(createFloatField(102, fieldX, y, 50, vortex.getDamage())); addLabel(new GuiNpcLabel(103, "ability.knockback", col2LabelX, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiAuction.java b/src/main/java/noppes/npcs/client/gui/player/GuiAuction.java index 8dcbcfcbe..30e857e7a 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiAuction.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiAuction.java @@ -527,7 +527,7 @@ public class GuiAuction extends GuiContainerNPCInterface implements IGuiData, addLabel(new GuiNpcLabel(140, StatCollector.translateToLocal("auction.listingFee") + " " + fee + " " + ConfigMarket.CurrencyName, leftX, guiTop + 104, fee > 0 ? 0xAA0000 : 0x008800)); - addButton(new GuiNpcButton(71, leftX, guiTop + 126, 90, 20, StatCollector.translateToLocal("auction.create"))); + addButton(new GuiNpcButton(71, leftX, guiTop + 126, 90, 20, StatCollector.translateToLocal("gui.create"))); addButton(new GuiNpcButton(72, leftX + 100, guiTop + 126, 90, 20, StatCollector.translateToLocal("gui.cancel"))); if (getButton(71) != null) { diff --git a/src/main/java/noppes/npcs/client/gui/player/SubGuiAuctionCreate.java b/src/main/java/noppes/npcs/client/gui/player/SubGuiAuctionCreate.java index 6d7f0a756..01c650bbd 100644 --- a/src/main/java/noppes/npcs/client/gui/player/SubGuiAuctionCreate.java +++ b/src/main/java/noppes/npcs/client/gui/player/SubGuiAuctionCreate.java @@ -73,7 +73,7 @@ public class SubGuiAuctionCreate extends SubGuiInterface { guiLeft + 20, guiTop + 142, fee > 0 ? 0xAA0000 : 0x008800)); // Create button - addButton(new GuiNpcButton(50, guiLeft + 30, guiTop + 162, 90, 20, StatCollector.translateToLocal("auction.create"))); + addButton(new GuiNpcButton(50, guiLeft + 30, guiTop + 162, 90, 20, StatCollector.translateToLocal("gui.create"))); getButton(50).setEnabled(item != null); // Cancel button diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiAnimationSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiAnimationSelection.java index c0fbb0295..882f5817b 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiAnimationSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiAnimationSelection.java @@ -50,7 +50,7 @@ public class GuiAnimationSelection extends SubGuiInterface implements ICustomScr public void initGui() { super.initGui(); - this.addLabel(new GuiNpcLabel(0, "gui.animations", guiLeft + 8, guiTop + 4)); + this.addLabel(new GuiNpcLabel(0, "menu.animations", guiLeft + 8, guiTop + 4)); this.addButton(new GuiNpcButton(1, guiLeft + 4, guiTop + ySize - 35, 50, 20, "gui.clear")); this.addButton(new GuiNpcButton(2, guiLeft + xSize - 56, guiTop + ySize - 35, 50, 20, "gui.done")); diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 66837c543..7f7314d1c 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -1477,14 +1477,12 @@ ability.target.self=Self ability.target.aoe_self=AOE Self ability.target.aoe_target=AOE Target -ability.telegraph.none=None -ability.telegraph.circle=Circle -ability.telegraph.ring=Ring -ability.telegraph.line=Line -ability.telegraph.cone=Cone -ability.telegraph.point=Point +telegraph.circle=Circle +telegraph.ring=Ring +telegraph.line=Line +telegraph.cone=Cone +telegraph.point=Point -ability.tab.general=General ability.tab.timing=Timing ability.tab.effects=Effects ability.tab.telegraph=Telegraph @@ -1497,7 +1495,6 @@ ability.windUpSound=Wind Up Sound ability.activeSound=Active Sound ability.windUpAnim=Wind Up Anim ability.activeAnim=Active Anim -gui.animations=Animations ability.cnpc.slam=Slam ability.cnpc.heavy_hit=Heavy Hit @@ -1516,15 +1513,11 @@ ability.cnpc.hazard=Hazard ability.cnpc.trap=Trap # Ability GUI - Type Tab -ability.tab.type=Type # Common Type Settings -ability.damage=Damage ability.radius=Radius ability.knockback=Knockback ability.knockbackUp=KB Up -ability.speed=Speed -ability.range=Range ability.maxDist=Max Dist ability.minDist=Min Dist ability.distance=Distance @@ -1551,13 +1544,10 @@ ability.hitRadius=Hit Radius # Cutter Settings ability.arcAngle=Arc Angle ability.sweepWaves=Waves -ability.waveInterval=Interval ability.rotSpeed=Rot Speed ability.piercing=Piercing # Orb Settings -ability.orbSpeed=Speed -ability.orbSize=Size ability.homing=Homing ability.explosive=Explosive @@ -1569,7 +1559,6 @@ ability.aoe=AOE ability.maxTargets=Max Targets # Dash Settings -ability.dashMode=Mode ability.dash.aggressive=Aggressive ability.dash.defensive=Defensive ability.mode=Mode @@ -1609,7 +1598,6 @@ ability.counterAnim=Counter Anim ability.healAmount=Amount ability.healPercent=Percent ability.healRadius=Radius -ability.instant=Instant ability.healSelf=Heal Self ability.healAllies=Heal Allies @@ -1620,9 +1608,6 @@ ability.shape=Shape ability.placement=Placement ability.affectsCaster=Hit Caster ability.ignoreInvuln=Ign Invuln -ability.shape.circle=Circle -ability.shape.ring=Ring -ability.shape.cone=Cone ability.place.caster=At Caster ability.place.target=At Target ability.place.followCaster=Follow Caster @@ -1633,7 +1618,6 @@ ability.place.ahead=Ahead ability.triggerRadius=Trig Rad ability.armTime=Arm Time ability.maxTriggers=Max Trig -ability.visible=Visible # Ability Save/Load ability.save.confirm=Save ability preset @@ -1663,11 +1647,8 @@ ability.shockwaveFalloff=Damage/knockback drop off with distance # Ability Config GUI ability.typeId=Type ID -ability.tab.target=Target ability.conditions=Conditions ability.noTypeSettings=No type-specific settings -ability.sounds=Sounds -ability.animations=Animations # Conditions condition.edit=Edit Condition @@ -1726,7 +1707,6 @@ auction.claim=Claim auction.createListing=Create Listing auction.duration=Duration: auction.listingFee=Listing Fee: -auction.create=Create auction.sort.newest=Newest First auction.sort.oldest=Oldest First auction.sort.priceHigh=Most Expensive