Skip to content

Commit 7281ab7

Browse files
TUsamaTUsama
authored
Extract Translatable (RobertSkalko#177)
* extract translatable * delete line break
1 parent 7276359 commit 7281ab7

File tree

13 files changed

+59
-33
lines changed

13 files changed

+59
-33
lines changed

‎src/main/java/com/robertx22/mine_and_slash/capability/player/data/DeathFavorData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void onLootChest(Player p) {
5454
float favorGain = ServerContainer.get().FAVOR_CHEST_GAIN.get().floatValue();
5555

5656
set(p, favor + favorGain);
57-
OnScreenMessageUtils.actionBar((ServerPlayer) p, Component.literal("+" + favorGain + " ").append(Component.literal("Favor (" + favor + ")")).withStyle(ChatFormatting.GREEN));
57+
OnScreenMessageUtils.actionBar((ServerPlayer) p, Chats.GAIN_FAVOR_ON_LOOT.locName(favorGain, favor).withStyle(ChatFormatting.GREEN));
5858
// Load.player(p).prophecy.favor += ServerContainer.get().FAVOR_CHEST_GAIN.get();
5959
}
6060

‎src/main/java/com/robertx22/mine_and_slash/database/data/profession/screen/CraftButton.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.robertx22.mine_and_slash.mmorpg.SlashRef;
99
import com.robertx22.mine_and_slash.uncommon.datasaving.Load;
1010
import com.robertx22.mine_and_slash.uncommon.localization.Chats;
11+
import com.robertx22.mine_and_slash.uncommon.localization.Gui;
1112
import com.robertx22.mine_and_slash.vanilla_mc.packets.CraftPacket;
1213
import net.minecraft.ChatFormatting;
1314
import net.minecraft.client.Minecraft;
@@ -68,9 +69,9 @@ public void setModTooltip() {
6869
list.add(Chats.PROF_RECIPE_LEVEL_NOT_ENOUGH.locName(prof.locName(), lvl, owner).withStyle(ChatFormatting.RED, ChatFormatting.BOLD));
6970
} else {
7071
if (pbe.getSyncedData().craftingState == Crafting_State.ACTIVE || pbe.getSyncedData().craftingState == Crafting_State.IDLE)
71-
list.add(Component.literal("Stop Crafting").withStyle(ChatFormatting.DARK_AQUA));
72+
list.add(Gui.STATION_STOP_CRAFTING.locName().withStyle(ChatFormatting.DARK_AQUA));
7273
else
73-
list.add(Component.literal("Start Crafting").withStyle(ChatFormatting.DARK_AQUA));
74+
list.add(Gui.STATION_START_CRAFTING.locName().withStyle(ChatFormatting.DARK_AQUA));
7475
}
7576

7677

‎src/main/java/com/robertx22/mine_and_slash/database/data/profession/screen/LockButton.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.robertx22.mine_and_slash.database.data.profession.screen;
22

33
import com.robertx22.mine_and_slash.mmorpg.SlashRef;
4+
import com.robertx22.mine_and_slash.uncommon.localization.Gui;
45
import com.robertx22.mine_and_slash.vanilla_mc.packets.LockTogglePacket;
56
import com.robertx22.library_of_exile.main.Packets;
67
import net.minecraft.ChatFormatting;
@@ -44,9 +45,9 @@ public void renderWidget(GuiGraphics gui, int mouseX, int mouseY, float delta) {
4445

4546
public void setModTooltip() {
4647
if (s.getSyncedData().recipe_locked)
47-
this.setTooltip(Tooltip.create(Component.literal("Unlock Recipe").withStyle(ChatFormatting.DARK_AQUA)));
48+
this.setTooltip(Tooltip.create(Gui.STATION_UNLOCK_RECIPE.locName().withStyle(ChatFormatting.DARK_AQUA)));
4849
else
49-
this.setTooltip(Tooltip.create(Component.literal("Lock Recipe").withStyle(ChatFormatting.DARK_AQUA)));
50+
this.setTooltip(Tooltip.create(Gui.STATION_LOCK_RECIPE.locName().withStyle(ChatFormatting.DARK_AQUA)));
5051
}
5152

5253
}

‎src/main/java/com/robertx22/mine_and_slash/gui/card_picker/ProphecyCurseCard.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.robertx22.mine_and_slash.prophecy.AcceptProphecyAffixPacket;
77
import com.robertx22.mine_and_slash.saveclasses.ExactStatData;
88
import com.robertx22.mine_and_slash.uncommon.datasaving.Load;
9+
import com.robertx22.mine_and_slash.uncommon.localization.Words;
910
import net.minecraft.network.chat.Component;
1011
import net.minecraft.network.chat.MutableComponent;
1112
import net.minecraft.resources.ResourceLocation;
@@ -51,6 +52,6 @@ public List<MutableComponent> getScreenText(Player p) {
5152

5253
@Override
5354
public MutableComponent getName() {
54-
return Component.literal("Pick Curse");
55+
return Words.PICK_CURSE.locName();
5556
}
5657
}

‎src/main/java/com/robertx22/mine_and_slash/gui/wiki/reworked/filters/FilterGroupButton.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.robertx22.mine_and_slash.gui.wiki.reworked.filters;
22

33
import com.robertx22.mine_and_slash.gui.wiki.reworked.NewWikiScreen;
4+
import com.robertx22.mine_and_slash.uncommon.localization.Words;
45
import net.minecraft.client.Minecraft;
56
import net.minecraft.client.gui.components.AbstractButton;
67
import net.minecraft.client.gui.narration.NarrationElementOutput;
@@ -31,7 +32,7 @@ public Component getMessage() {
3132
var cur = screen.getFilter(filter);
3233

3334
if (cur == GroupFilterEntry.NONE) {
34-
return Component.literal("Pick ").append(filter.word.locName());
35+
return Words.PICK_CURSE.locName(filter.word.locName());
3536
} else {
3637
return screen.getFilter(filter).getName();
3738
}

‎src/main/java/com/robertx22/mine_and_slash/gui/wiki/reworked/filters/FilterSelectScreen.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.robertx22.mine_and_slash.gui.wiki.reworked.filters;
22

33
import com.robertx22.mine_and_slash.gui.wiki.reworked.NewWikiScreen;
4+
import com.robertx22.mine_and_slash.uncommon.localization.Gui;
45
import net.minecraft.client.gui.GuiGraphics;
56
import net.minecraft.client.gui.screens.Screen;
67
import net.minecraft.network.chat.Component;
@@ -14,7 +15,7 @@ public class FilterSelectScreen extends Screen {
1415
public FilterGroupButton button;
1516

1617
public FilterSelectScreen(FilterGroupButton filterGroupButton, NewWikiScreen screen, GroupFilterType type) {
17-
super(Component.literal("Choose A Filter"));
18+
super(Gui.CHOOSE_FILTER.locName());
1819
this.type = type;
1920
this.last = screen;
2021
this.button = filterGroupButton;

‎src/main/java/com/robertx22/mine_and_slash/gui/wiki/reworked/filters/GroupFilterEntry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.robertx22.mine_and_slash.gui.wiki.reworked.filters;
22

33
import com.robertx22.mine_and_slash.gui.wiki.BestiaryEntry;
4+
import com.robertx22.mine_and_slash.uncommon.localization.Gui;
45
import net.minecraft.network.chat.Component;
56
import net.minecraft.network.chat.MutableComponent;
67

@@ -15,7 +16,7 @@ public boolean isValid(BestiaryEntry e) {
1516

1617
@Override
1718
public MutableComponent getName() {
18-
return Component.literal("none");
19+
return Gui.NONE_FILTER.locName();
1920
}
2021
};
2122

‎src/main/java/com/robertx22/mine_and_slash/maps/MapEvents.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.robertx22.mine_and_slash.config.forge.ServerContainer;
44
import com.robertx22.mine_and_slash.mmorpg.ForgeEvents;
5+
import com.robertx22.mine_and_slash.uncommon.localization.Chats;
56
import com.robertx22.mine_and_slash.uncommon.utilityclasses.WorldUtils;
67
import net.minecraft.ChatFormatting;
78
import net.minecraft.network.chat.Component;
@@ -34,8 +35,7 @@ public static void init() {
3435
ForgeEvents.registerForgeEvent(PlayerInteractEvent.RightClickItem.class, x -> {
3536
if (WorldUtils.isMapWorldClass(x.getEntity().level())) {
3637
if (ServerContainer.get().isItemBanned(x.getItemStack().getItem())) {
37-
x.getEntity().sendSystemMessage(Component.literal("This item is banned in Adventure Maps: ")
38-
.append(x.getItemStack().getDisplayName()).withStyle(ChatFormatting.BOLD));
38+
x.getEntity().sendSystemMessage(Chats.BANNED_IN_MAP.locName(x.getItemStack().getDisplayName()).withStyle(ChatFormatting.BOLD));
3939
x.setCanceled(true);
4040
}
4141
}

‎src/main/java/com/robertx22/mine_and_slash/uncommon/effectdatas/DamageEvent.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public Component getDamageName() {
171171

172172
try {
173173
if (this.data.isBasicAttack()) {
174-
return Component.literal("Attack");
174+
return Words.BASIC_ATTACK.locName();
175175
}
176176
if (this.data.isSpellEffect()) {
177177
return getSpell().locName();
@@ -187,7 +187,7 @@ public Component getDamageName() {
187187
e.printStackTrace();
188188
}
189189

190-
return Component.literal("[Error, dmg isn't a basic attack, spell or ailment]");
190+
return Words.UNKNOWN_DAMAGE.locName();
191191
}
192192

193193
public AttackType getAttackType() {
@@ -468,26 +468,26 @@ public MutableComponent getInfoHoverMessage(DmgByElement info, boolean doBonusDm
468468
MutableComponent msg = Component.empty();
469469

470470
if (this.isSpell()) {
471-
msg.append(Component.literal("Spell: ").append(getSpell().locName()).append("\n").withStyle(ChatFormatting.AQUA));
471+
msg.append(Words.DAMAGE_TYPE_SPELL.locName(getSpell().locName().plainCopy()).withStyle(ChatFormatting.AQUA));
472472
}
473473
if (this.data.isBasicAttack()) {
474-
msg.append(Component.literal("Basic Attack\n").withStyle(ChatFormatting.RED));
474+
msg.append(Words.DAMAGE_TYPE_BASIC_ATTACK.locName().withStyle(ChatFormatting.RED));
475475
}
476476
if (this.data.getAttackType() == AttackType.dot) {
477-
msg.append(Component.literal("Damage Over Time\n").withStyle(ChatFormatting.RED));
477+
msg.append(Words.DAMAGE_TYPE_AILMENT.locName().withStyle(ChatFormatting.RED));
478478
}
479479

480480
if (!this.data.getString(EventData.AILMENT).isEmpty()) {
481481
String ailment = this.data.getString(EventData.AILMENT);
482482
var ai = ExileDB.Ailments().get(ailment);
483-
msg.append(Component.literal("Ailment: ").append(ai.locName()).append("\n").withStyle(ai.element.format));
483+
msg.append(Words.AILMENT_DAMAGE.locName().append(ai.locName()).append("\n").withStyle(ai.element.format));
484484
}
485485

486-
msg.append(Component.literal("\n" + getElement().getIconNameDmg() + ":\n").withStyle(getElement().format));
486+
msg.append(Words.ELEMENTAL_DAMAGE.locName(getElement().getIconNameDmg()).withStyle(getElement().format));
487487

488-
msg.append(Component.literal("Base Damage: " + (int) this.data.getOriginalNumber(EventData.NUMBER).number + "\n").withStyle(ChatFormatting.BLUE));
488+
msg.append(Words.BASE_DAMAGE.locName((int) this.data.getOriginalNumber(EventData.NUMBER).number).withStyle(ChatFormatting.BLUE));
489489

490-
msg.append(Component.literal("Damage Info: \n").withStyle(ChatFormatting.RED));
490+
msg.append(Words.DAMAGE_INFO.locName().withStyle(ChatFormatting.RED));
491491

492492
for (StatLayerData layerData : this.getSortedLayers()) {
493493
if (layerData.numberID.equals(EventData.NUMBER)) {
@@ -496,7 +496,7 @@ public MutableComponent getInfoHoverMessage(DmgByElement info, boolean doBonusDm
496496
}
497497

498498
if (!getMoreMultis().isEmpty()) {
499-
msg.append(Component.literal("Multipliers: \n").withStyle(ChatFormatting.LIGHT_PURPLE));
499+
msg.append(Words.MULTIPLIERS.locName().withStyle(ChatFormatting.LIGHT_PURPLE));
500500

501501
for (MoreMultiData multi : this.getMoreMultis()) {
502502
if (multi.numberid.equals(EventData.NUMBER)) {
@@ -505,7 +505,7 @@ public MutableComponent getInfoHoverMessage(DmgByElement info, boolean doBonusDm
505505
}
506506
}
507507

508-
msg.append(Component.literal("Final Damage: " + (int) info.dmgmap.getOrDefault(getElement(), 0F).intValue() + "\n").withStyle(ChatFormatting.GOLD));
508+
msg.append(Words.FINAL_DAMAGE.locName(info.dmgmap.getOrDefault(getElement(), 0F).intValue()).withStyle(ChatFormatting.GOLD));
509509

510510

511511
if (doBonusDmg) {
@@ -514,7 +514,7 @@ public MutableComponent getInfoHoverMessage(DmgByElement info, boolean doBonusDm
514514
for (Entry<Elements, Float> en : info.dmgmap.entrySet()) {
515515
if (en.getKey() != getElement()) {
516516

517-
msg.append(Component.literal("\n- Bonus Damage Types:\n").withStyle(ChatFormatting.YELLOW));
517+
msg.append(Words.BONUS_DAMAGE_TYPE.locName().withStyle(ChatFormatting.YELLOW));
518518

519519
var dmg = info.eventMap.get(en.getKey());
520520
msg.append(dmg.getInfoHoverMessage(info, false));
@@ -526,7 +526,7 @@ public MutableComponent getInfoHoverMessage(DmgByElement info, boolean doBonusDm
526526

527527
if (doBonusDmg) {
528528
msg.append(Component.literal("\n"));
529-
msg.append(Component.literal("Total Combined Damage: " + (int) info.totalDmg + "\n").withStyle(ChatFormatting.GOLD));
529+
msg.append(Words.TOTAL_COMBINE_DAMAGE.locName((int) info.totalDmg).withStyle(ChatFormatting.GOLD));
530530
}
531531

532532
return msg;

‎src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Chats.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import java.util.Locale;
77

88
public enum Chats implements IAutoLocName {
9+
BANNED_IN_MAP("This item is banned in Adventure Maps: %1$s"),
10+
GAIN_FAVOR_ON_LOOT("+ %1$s Favor (%2$s)"),
11+
FOUND_ITEM("%1$s found a %2$s item!"),
912
BOSS_ARENA_UNLOCKED("Boss Arena: Open"),
1013
ALREADY_IN_ARENA("You are already inside the Boss Arena"),
1114
BOSS_KILLED("Boss already Killed"),

0 commit comments

Comments
 (0)