Skip to content

feat: Refactor localization with new lore array format and placeholders #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IPECTER wants to merge 2 commits into
base: main
Choose a base branch
from
+20,382 −13,972
Open

feat: Refactor localization with new lore array format and placeholders #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd40009
feat: Refactor localization with new lore array format and placeholders
IPECTER Jan 24, 2026
704e696
oops
IPECTER Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 91 additions & 44 deletions src/main/java/com/volmit/adapt/api/adaptation/Adaptation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,31 @@ default int getRefundCostFor(int level, int myLevel) {
return c;
}

default String displayName() {
if (!this.getSkill().isEnabled()) {
this.unregister();
}
return "<color:%s><b>%s</b></color>".formatted(getSkill().getColor().hex(), Form.capitalizeWords(getName().replaceAll("\\Q" + getSkill().getName() + "-\\E", "").replaceAll("\\Q-\\E", " ")));
}

default String getDisplayName() {
if (!this.getSkill().isEnabled()) {
this.unregister();
}
return C.RESET + "" + C.BOLD + getSkill().getColor().toString() + Form.capitalizeWords(getName().replaceAll("\\Q" + getSkill().getName() + "-\\E", "").replaceAll("\\Q-\\E", " "));
}

default String displayName(int level) {
if (!this.getSkill().isEnabled()) {
this.unregister();
}
if (level >= 1) {
return "%s <white><u>%s</u></white>".formatted(displayName(), Form.toRoman(level));
}

return displayName();
}

default String getDisplayName(int level) {
if (!this.getSkill().isEnabled()) {
this.unregister();
Expand Down Expand Up @@ -449,51 +467,80 @@ default void openGui(Player player) {
.setEnchanted(mylevel >= lvl)
.setProgress(1D)
.addLore(Form.wrapWordsPrefixed(getDescription(), "" + C.GRAY, 40))
.addLore(mylevel >= lvl ? ("") : ("" + C.WHITE + c + C.GRAY + " " + Localizer.dLocalize("snippets", "adaptmenu", "knowledgecost") + " " + (AdaptConfig.get().isHardcoreNoRefunds() ? C.DARK_RED + "" + C.BOLD + Localizer.dLocalize("snippets", "adaptmenu", "norefunds") : "")))
.addLore(mylevel >= lvl ? AdaptConfig.get().isHardcoreNoRefunds() ? (C.GREEN + Localizer.dLocalize("snippets", "adaptmenu", "alreadylearned") + " " + C.DARK_RED + "" + C.BOLD + Localizer.dLocalize("snippets", "adaptmenu", "norefunds")) : (isPermanent() ? "" : (C.GREEN + Localizer.dLocalize("snippets", "adaptmenu", "alreadylearned") + " " + C.GRAY + Localizer.dLocalize("snippets", "adaptmenu", "unlearnrefund") + " " + C.GREEN + rc + " " + Localizer.dLocalize("snippets", "adaptmenu", "knowledgecost"))) : (k >= c ? (C.BLUE + Localizer.dLocalize("snippets", "adaptmenu", "clicklearn") + " " + getDisplayName(i)) : (k == 0 ? (C.RED + Localizer.dLocalize("snippets", "adaptmenu", "noknowledge")) : (C.RED + "(" + Localizer.dLocalize("snippets", "adaptmenu", "youonlyhave") + " " + C.WHITE + k + C.RED + " " + Localizer.dLocalize("snippets", "adaptmenu", "knowledgeavailable") + ")"))))
.addLore(mylevel < lvl && getPlayer(player).getData().hasPowerAvailable(pc) ? C.GREEN + "" + lvl + " " + Localizer.dLocalize("snippets", "adaptmenu", "powerdrain") : mylevel >= lvl ? C.GREEN + "" + lvl + " " + Localizer.dLocalize("snippets", "adaptmenu", "powerdrain") : C.RED + Localizer.dLocalize("snippets", "adaptmenu", "notenoughpower") + "\n" + C.RED + Localizer.dLocalize("snippets", "adaptmenu", "howtolevelup"))
.addLore((isPermanent() ? C.RED + "" + C.BOLD + Localizer.dLocalize("snippets", "adaptmenu", "maynotunlearn") : ""))
.onLeftClick((e) -> {
if (mylevel >= lvl) {
unlearn(player, lvl, false);
spw.play(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.7f, 1.355f);
spw.play(player.getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.4f, 0.755f);
w.close();
if (AdaptConfig.get().getLearnUnlearnButtonDelayTicks() != 0) {
if (isPermanent()) {
spw.play(player.getLocation(), Sound.ENTITY_BLAZE_DEATH, 0.5f, 1.355f);
player.sendTitle(" ", C.RED + "" + C.BOLD + Localizer.dLocalize("snippets", "adaptmenu", "maynotunlearn") + " " + getDisplayName(mylevel), 1, 10, 11);
} else {
player.sendTitle(" ", C.GRAY + Localizer.dLocalize("snippets", "adaptmenu", "unlearned") + " " + getDisplayName(mylevel), 1, 10, 11);
}
}
J.s(() -> openGui(player), AdaptConfig.get().getLearnUnlearnButtonDelayTicks());
return;
}
.addLore("");

if (k >= c && getPlayer(player).getData().hasPowerAvailable(pc)) {
if (getPlayer(player).getData().getSkillLine(getSkill().getName()).spendKnowledge(c)) {
getPlayer(player).getData().getSkillLine(getSkill().getName()).setAdaptation(this, lvl);
spw.play(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.9f, 1.355f);
spw.play(player.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1.7f, 0.355f);
spw.play(player.getLocation(), Sound.BLOCK_BEACON_POWER_SELECT, 0.4f, 0.155f);
spw.play(player.getLocation(), Sound.BLOCK_BEACON_ACTIVATE, 0.2f, 1.455f);
if (isPermanent()) {
spw.play(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.7f, 1.355f);
spw.play(player.getLocation(), Sound.ITEM_GOAT_HORN_SOUND_1, 0.7f, 1.355f);
}
w.close();
if (AdaptConfig.get().getLearnUnlearnButtonDelayTicks() != 0) {
player.sendTitle(" ", C.GRAY + Localizer.dLocalize("snippets", "adaptmenu", "learned") + " " + getDisplayName(lvl), 1, 5, 11);
}
J.s(() -> openGui(player), AdaptConfig.get().getLearnUnlearnButtonDelayTicks());
} else {
spw.play(player.getLocation(), Sound.BLOCK_BAMBOO_HIT, 0.7f, 1.855f);
}
if (mylevel < lvl) {
if (isPermanent()) {
de.addLore(Localizer.dLocalize("snippets.adapt_menu.may_not_unlearn"));
de.addLore("");
}
if (AdaptConfig.get().isHardcoreNoRefunds()) {
de.addLore(Localizer.dLocalize("snippets.adapt_menu.no_refunds"));
de.addLore("");
}
de.addLore(Localizer.dLocalize("snippets.adapt_menu.knowledge_cost", c));
if (k == 0) {
de.addLore(Localizer.dLocalize("snippets.adapt_menu.no_knowledge"));
} else if (k < c) {
de.addLore(Localizer.dLocalize("snippets.adapt_menu.you_only_have", k));
}
de.addLore("");
if (getPlayer(player).getData().hasPowerAvailable(pc)) {
de.addLore(Localizer.dLocalize("snippets.adapt_menu.power_drain", lvl));
} else {
de.addLore(Localizer.dLocalize("snippets.adapt_menu.not_enough_power"));
de.addLore(Localizer.dLocalize("snippets.adapt_menu.how_to_level_up"));
}
} else {
if (AdaptConfig.get().isHardcoreNoRefunds()) {
de.addLore(Localizer.dLocalize("snippets.adapt_menu.no_refunds"));
} else if (!isPermanent()) {
de.addLore( Localizer.dLocalize("snippets.adapt_menu.unlearn_refund", rc));
}
de.addLore("");
de.addLore(Localizer.dLocalize("snippets.adapt_menu.power_drain", lvl));
}
de.onLeftClick((e) -> {
if (mylevel >= lvl) {
unlearn(player, lvl, false);
spw.play(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.7f, 1.355f);
spw.play(player.getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.4f, 0.755f);
w.close();
if (AdaptConfig.get().getLearnUnlearnButtonDelayTicks() != 0) {
if (isPermanent()) {
spw.play(player.getLocation(), Sound.ENTITY_BLAZE_DEATH, 0.5f, 1.355f);
player.sendTitle(" ", Localizer.dLocalize("snippets.adapt_menu.may_not_unlearn"), 1, 10, 11);
} else {
spw.play(player.getLocation(), Sound.BLOCK_BAMBOO_HIT, 0.7f, 1.855f);
player.sendTitle(" ", Localizer.dLocalize("snippets.adapt_menu.unlearned", displayName(mylevel)), 1, 10, 11);
}
}
J.s(() -> openGui(player), AdaptConfig.get().getLearnUnlearnButtonDelayTicks());
return;
}

if (k >= c && getPlayer(player).getData().hasPowerAvailable(pc)) {
if (getPlayer(player).getData().getSkillLine(getSkill().getName()).spendKnowledge(c)) {
getPlayer(player).getData().getSkillLine(getSkill().getName()).setAdaptation(this, lvl);
spw.play(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.9f, 1.355f);
spw.play(player.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1.7f, 0.355f);
spw.play(player.getLocation(), Sound.BLOCK_BEACON_POWER_SELECT, 0.4f, 0.155f);
spw.play(player.getLocation(), Sound.BLOCK_BEACON_ACTIVATE, 0.2f, 1.455f);
if (isPermanent()) {
spw.play(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.7f, 1.355f);
spw.play(player.getLocation(), Sound.ITEM_GOAT_HORN_SOUND_1, 0.7f, 1.355f);
}
});
w.close();
if (AdaptConfig.get().getLearnUnlearnButtonDelayTicks() != 0) {
player.sendTitle(" ", Localizer.dLocalize("snippets.adapt_menu.learned", displayName(lvl)), 1, 5, 11);
}
J.s(() -> openGui(player), AdaptConfig.get().getLearnUnlearnButtonDelayTicks());
} else {
spw.play(player.getLocation(), Sound.BLOCK_BAMBOO_HIT, 0.7f, 1.855f);
}
} else {
spw.play(player.getLocation(), Sound.BLOCK_BAMBOO_HIT, 0.7f, 1.855f);
}
});
de.addLore(" ");
addStats(lvl, de);
w.setElement(pos, row, de);
Expand All @@ -505,12 +552,12 @@ default void openGui(Player player) {
w.setElement(backPos, backRow, new UIElement("back")
.setMaterial(new MaterialBlock(Material.RED_BED))
.setModel(CustomModel.get(Material.RED_BED, "snippets", "gui", "back"))
.setName("" + C.RESET + C.GRAY + Localizer.dLocalize("snippets", "gui", "back"))
.setName(Localizer.dLocalize("snippets.gui.back"))
.onLeftClick((e) -> onGuiClose(player, true)));
}

AdaptPlayer a = Adapt.instance.getAdaptServer().getPlayer(player);
w.setTitle(getDisplayName() + " " + C.DARK_GRAY + " " + Form.f(a.getSkillLine(getSkill().getName()).getKnowledge()) + " " + Localizer.dLocalize("snippets", "adaptmenu", "knowledge"));
w.setTitle(getDisplayName() + " " + Localizer.dLocalize("snippets.adapt_menu.knowledge_available_title", Form.f(a.getSkillLine(getSkill().getName()).getKnowledge())));
w.onClosed((vv) -> J.s(() -> onGuiClose(player, !AdaptConfig.get().isEscClosesAllGuis())));
w.open();
Adapt.instance.getGuiLeftovers().put(player.getUniqueId().toString(), w);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/volmit/adapt/api/adaptation/SimpleAdaptation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public AdaptAdvancement buildAdvancements() {
return AdaptAdvancement.builder()
.key("adaptation_" + getName())
.title(C.WHITE + "[ " + getDisplayName() + C.WHITE + " ]")
.description(getDescription() + ". " + Localizer.dLocalize("snippets", "gui", "unlockthisbyclicking") + " " + AdaptConfig.get().adaptActivatorBlockName)
.description(getDescription() + ". " + Localizer.dLocalize("snippets.gui.unlock_this_by_clicking") + " " + AdaptConfig.get().adaptActivatorBlockName)
.icon(getIcon())
.children(a)
.visibility(AdvancementVisibility.PARENT_GRANTED)
Expand Down
22 changes: 19 additions & 3 deletions src/main/java/com/volmit/adapt/api/skill/Skill.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import org.bukkit.Sound;
import org.bukkit.entity.Player;

import java.util.List;

public interface Skill<T> extends Ticked, Component {
AdaptAdvancement buildAdvancements();

Expand Down Expand Up @@ -102,6 +104,13 @@ default boolean hasBlacklistPermission(Player p, Skill<?> s) {
return p.hasPermission(blacklistPermission);
}

default String displayName() {
if (!this.isEnabled()) {
this.unregister();
}
return "<color:%s><b>%s %s</b></color>".formatted(getColor().hex(), getEmojiName(), Form.capitalize(getName()));
}

default String getDisplayName() {
if (!this.isEnabled()) {
this.unregister();
Expand Down Expand Up @@ -233,7 +242,10 @@ default void openGui(Player player) {
.setModel(i.getModel())
.setName(i.getDisplayName(lvl))
.addLore(Form.wrapWordsPrefixed(i.getDescription(), "" + C.GRAY, 45)) // Set to the actual Description
.addLore(lvl == 0 ? (C.DARK_GRAY + Localizer.dLocalize("snippets", "gui", "notlearned")) : (C.GRAY + Localizer.dLocalize("snippets", "gui", "level") + " " + C.WHITE + Form.toRoman(lvl)))
.addLore("")
.addLore(lvl == 0
? Localizer.dLocalize("snippets.gui.not_learned")
: Localizer.dLocalize("snippets.gui.level", Form.toRoman(lvl)))
.setProgress(1D)
.onLeftClick((e) -> i.openGui(player)));
ind++;
Expand All @@ -246,12 +258,16 @@ default void openGui(Player player) {
w.setElement(backPos, backRow, new UIElement("back")
.setMaterial(new MaterialBlock(Material.RED_BED))
.setModel(CustomModel.get(Material.RED_BED, "snippets", "gui", "back"))
.setName("" + C.RESET + C.GRAY + Localizer.dLocalize("snippets", "gui", "back"))
.setName(Localizer.dLocalize("snippets.gui.back"))
.onLeftClick((e) -> onGuiClose(player, true)));
}

AdaptPlayer a = Adapt.instance.getAdaptServer().getPlayer(player);
w.setTitle(getDisplayName(a.getSkillLine(getName()).getLevel()) + " " + Form.pc(XP.getLevelProgress(a.getSkillLine(getName()).getXp())) + " (" + Form.f((int) XP.getXpUntilLevelUp(a.getSkillLine(getName()).getXp())) + Localizer.dLocalize("snippets", "gui", "xp") + " " + (a.getSkillLine(getName()).getLevel() + 1) + ")");
w.setTitle(
getDisplayName(a.getSkillLine(getName()).getLevel()) + " " +
Form.pc(XP.getLevelProgress(a.getSkillLine(getName()).getXp())) + " (" +
Localizer.dLocalize("snippets.gui.xp", Form.f((int) XP.getXpUntilLevelUp(a.getSkillLine(getName()).getXp())),
a.getSkillLine(getName()).getLevel() + 1) + ")");
w.onClosed((vv) -> J.s(() -> onGuiClose(player, !AdaptConfig.get().isEscClosesAllGuis())));
w.open();
Adapt.instance.getGuiLeftovers().put(player.getUniqueId().toString(), w);
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/volmit/adapt/api/world/AdaptPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.bukkit.util.Vector;

import java.io.File;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -309,9 +310,9 @@ public void loggedIn() {
if (!AdaptConfig.get().isWelcomeMessage())
return;
getNot().queue(AdvancementNotification.builder()
.title(first ? Localizer.dLocalize("snippets", "gui", "welcome") : Localizer.dLocalize("snippets", "gui", "welcomeback"))
.description("+" + C.GREEN + Form.pc(boostAmount, 0) + C.GRAY + " " + Localizer.dLocalize("snippets", "gui", "xpbonusfortime") + " " + C.AQUA + Form.duration(boostTime, 0))
.model(CustomModel.get(Material.DIAMOND, "snippets", "gui", first ? "welcome" : "welcomeback"))
.title(first ? Localizer.dLocalize("snippets.gui.welcome") : Localizer.dLocalize("snippets.gui.welcome_back"))
.description(Localizer.dLocalize("snippets.gui.xp_bonus_for_time", Form.pc(boostAmount, 0), Form.duration(boostTime, 0)))
.model(CustomModel.get(Material.DIAMOND, "snippets", "gui", first ? "welcome" : "welcome_back"))
.build());
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/volmit/adapt/api/world/PlayerData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.volmit.adapt.api.notification.TitleNotification;
import com.volmit.adapt.api.xp.XP;
import com.volmit.adapt.api.xp.XPMultiplier;
import com.volmit.adapt.util.C;
import com.volmit.adapt.util.Form;
import com.volmit.adapt.util.Json;
import com.volmit.adapt.util.Localizer;
Expand Down Expand Up @@ -180,13 +179,13 @@ public void update(AdaptPlayer p) {
.out(2250)
.group("lvl")
.title("")
.subtitle(C.GOLD + Localizer.dLocalize("snippets", "gui", "level") +" " + level)// I'm sorry I missed this!
.subtitle(Localizer.dLocalize("snippets.gui.level", level))// I'm sorry I missed this!
.build());
p.getActionBarNotifier().queue(
ActionBarNotification.builder()
.duration(450)
.group("power")
.title(C.GOLD + "" + Form.f(level * AdaptConfig.get().getPowerPerLevel(), 0) + C.GRAY + " " + Localizer.dLocalize("snippets", "gui", "maxabilitypower")) // I'm sorry I missed this!
.title(Localizer.dLocalize("snippets.gui.max_ability_power", Form.f(level * AdaptConfig.get().getPowerPerLevel(), 0))) // I'm sorry I missed this!
.build());

}
Expand Down
Loading