Skip to content

Commit 6c43dfe

Browse files
feat(i18n): convert tablist module strings to translation system
Replace hardcoded strings in 20 tablist module files with I18n.string() calls using tablist.properties keys for all areas and module headers.
1 parent abc7184 commit 6c43dfe

20 files changed

Lines changed: 130 additions & 78 deletions

File tree

type.backwaterbayou/src/main/java/net/swofty/type/backwaterbayou/tab/BackwaterBayouServerModule.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package net.swofty.type.backwaterbayou.tab;
22

33
import net.swofty.type.generic.HypixelConst;
4+
import net.swofty.type.generic.i18n.I18n;
45
import net.swofty.type.generic.tab.TablistModule;
56
import net.swofty.type.generic.tab.TablistSkinRegistry;
67
import net.swofty.type.generic.user.HypixelPlayer;
78

89
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Map;
1012

1113
public class BackwaterBayouServerModule extends TablistModule {
1214
@Override
1315
public List<TablistEntry> getEntries(HypixelPlayer player) {
1416
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
15-
new TablistEntry(getCentered("§3§lServer Info"), TablistSkinRegistry.CYAN)
17+
new TablistEntry(getCentered(I18n.string("tablist.module.server_info")), TablistSkinRegistry.CYAN)
1618
));
1719

18-
entries.add(new TablistEntry("§b§lArea: §7Backwater Bayou", TablistSkinRegistry.GRAY));
19-
entries.add(new TablistEntry(" Server: §8" + HypixelConst.getServerName(), TablistSkinRegistry.GRAY));
20+
entries.add(new TablistEntry(I18n.string("tablist.server_info.area.backwater_bayou"), TablistSkinRegistry.GRAY));
21+
entries.add(new TablistEntry(I18n.string("tablist.server_info.server_label", Map.of("server_name", HypixelConst.getServerName())), TablistSkinRegistry.GRAY));
2022

2123
fillRestWithGray(entries);
2224

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/tab/BedWarsPlayersOnlineModule.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
import net.swofty.type.generic.data.datapoints.DatapointLeaderboardLong;
99
import net.swofty.type.generic.data.datapoints.DatapointRank;
1010
import net.swofty.type.generic.data.handlers.BedWarsDataHandler;
11+
import net.swofty.type.generic.i18n.I18n;
1112
import net.swofty.type.generic.tab.TablistModule;
1213
import net.swofty.type.generic.tab.TablistSkinRegistry;
1314
import net.swofty.type.generic.user.HypixelPlayer;
1415

1516
import java.util.ArrayList;
1617
import java.util.Collections;
1718
import java.util.List;
19+
import java.util.Map;
1820

1921
public class BedWarsPlayersOnlineModule extends TablistModule {
2022
public int page;
@@ -28,7 +30,7 @@ public List<TablistEntry> getEntries(HypixelPlayer player) {
2830
List<HypixelPlayer> players = HypixelGenericLoader.getLoadedPlayers();
2931

3032
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
31-
new TablistEntry(getCentered("§a§lPlayers §f(" + players.size() + ")"), TablistSkinRegistry.GREEN)
33+
new TablistEntry(getCentered(I18n.string("tablist.module.players", Map.of("count", String.valueOf(players.size())))), TablistSkinRegistry.GREEN)
3234
));
3335

3436
List<HypixelPlayer> toShow = new ArrayList<>();

type.crimsonisle/src/main/java/net/swofty/type/crimsonisle/tab/CrimsonIsleServerModule.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package net.swofty.type.crimsonisle.tab;
22

33
import net.swofty.type.generic.HypixelConst;
4+
import net.swofty.type.generic.i18n.I18n;
45
import net.swofty.type.generic.tab.TablistModule;
56
import net.swofty.type.generic.tab.TablistSkinRegistry;
67
import net.swofty.type.generic.user.HypixelPlayer;
78

89
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Map;
1012

1113
public class CrimsonIsleServerModule extends TablistModule {
1214
@Override
1315
public List<TablistEntry> getEntries(HypixelPlayer player) {
1416
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
15-
new TablistEntry(getCentered("§3§lServer Info"), TablistSkinRegistry.CYAN)
17+
new TablistEntry(getCentered(I18n.string("tablist.module.server_info")), TablistSkinRegistry.CYAN)
1618
));
1719

18-
entries.add(new TablistEntry("§b§lArea: §7Crimson Isle", TablistSkinRegistry.GRAY));
19-
entries.add(new TablistEntry(" Server: §8" + HypixelConst.getServerName(), TablistSkinRegistry.GRAY));
20+
entries.add(new TablistEntry(I18n.string("tablist.server_info.area.crimson_isle"), TablistSkinRegistry.GRAY));
21+
entries.add(new TablistEntry(I18n.string("tablist.server_info.server_label", Map.of("server_name", HypixelConst.getServerName())), TablistSkinRegistry.GRAY));
2022

2123
fillRestWithGray(entries);
2224

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/tab/DeepCavernsServerModule.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package net.swofty.type.deepcaverns.tab;
22

33
import net.swofty.type.generic.HypixelConst;
4+
import net.swofty.type.generic.i18n.I18n;
45
import net.swofty.type.generic.tab.TablistModule;
56
import net.swofty.type.generic.tab.TablistSkinRegistry;
67
import net.swofty.type.generic.user.HypixelPlayer;
78

89
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Map;
1012

1113
public class DeepCavernsServerModule extends TablistModule {
1214
@Override
1315
public List<TablistEntry> getEntries(HypixelPlayer player) {
1416
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
15-
new TablistEntry(getCentered("§3§lServer Info"), TablistSkinRegistry.CYAN)
17+
new TablistEntry(getCentered(I18n.string("tablist.module.server_info")), TablistSkinRegistry.CYAN)
1618
));
1719

18-
entries.add(new TablistEntry("§b§lArea: §7Deep Caverns", TablistSkinRegistry.GRAY));
19-
entries.add(new TablistEntry(" Server: §8" + HypixelConst.getServerName(), TablistSkinRegistry.GRAY));
20+
entries.add(new TablistEntry(I18n.string("tablist.server_info.area.deep_caverns"), TablistSkinRegistry.GRAY));
21+
entries.add(new TablistEntry(I18n.string("tablist.server_info.server_label", Map.of("server_name", HypixelConst.getServerName())), TablistSkinRegistry.GRAY));
2022

2123
fillRestWithGray(entries);
2224

type.dungeonhub/src/main/java/net/swofty/type/dungeonhub/tab/DungeonServerModule.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package net.swofty.type.dungeonhub.tab;
22

33
import net.swofty.type.generic.HypixelConst;
4+
import net.swofty.type.generic.i18n.I18n;
45
import net.swofty.type.generic.tab.TablistModule;
56
import net.swofty.type.generic.tab.TablistSkinRegistry;
67
import net.swofty.type.generic.user.HypixelPlayer;
78

89
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Map;
1012

1113
public class DungeonServerModule extends TablistModule {
1214
@Override
1315
public List<TablistEntry> getEntries(HypixelPlayer player) {
1416
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
15-
new TablistEntry(getCentered("§3§lServer Info"), TablistSkinRegistry.CYAN)
17+
new TablistEntry(getCentered(I18n.string("tablist.module.server_info")), TablistSkinRegistry.CYAN)
1618
));
1719

18-
entries.add(new TablistEntry("§b§lArea: §7Dungeon Hub", TablistSkinRegistry.GRAY));
19-
entries.add(new TablistEntry(" Server: §8" + HypixelConst.getServerName(), TablistSkinRegistry.GRAY));
20+
entries.add(new TablistEntry(I18n.string("tablist.server_info.area.dungeon_hub"), TablistSkinRegistry.GRAY));
21+
entries.add(new TablistEntry(I18n.string("tablist.server_info.server_label", Map.of("server_name", HypixelConst.getServerName())), TablistSkinRegistry.GRAY));
2022

2123
fillRestWithGray(entries);
2224

type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/tab/DwarvenMinesServerModule.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package net.swofty.type.dwarvenmines.tab;
22

33
import net.swofty.type.generic.HypixelConst;
4+
import net.swofty.type.generic.i18n.I18n;
45
import net.swofty.type.generic.tab.TablistModule;
56
import net.swofty.type.generic.tab.TablistSkinRegistry;
67
import net.swofty.type.generic.user.HypixelPlayer;
78

89
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Map;
1012

1113
public class DwarvenMinesServerModule extends TablistModule {
1214
@Override
1315
public List<TablistEntry> getEntries(HypixelPlayer player) {
1416
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
15-
new TablistEntry(getCentered("§3§lServer Info"), TablistSkinRegistry.CYAN)
17+
new TablistEntry(getCentered(I18n.string("tablist.module.server_info")), TablistSkinRegistry.CYAN)
1618
));
1719

18-
entries.add(new TablistEntry("§b§lArea: §7Dwarven Mines", TablistSkinRegistry.GRAY));
19-
entries.add(new TablistEntry(" Server: §8" + HypixelConst.getServerName(), TablistSkinRegistry.GRAY));
20+
entries.add(new TablistEntry(I18n.string("tablist.server_info.area.dwarven_mines"), TablistSkinRegistry.GRAY));
21+
entries.add(new TablistEntry(I18n.string("tablist.server_info.server_label", Map.of("server_name", HypixelConst.getServerName())), TablistSkinRegistry.GRAY));
2022

2123
fillRestWithGray(entries);
2224

type.galatea/src/main/java/net/swofty/type/galatea/tab/GalateaServerModule.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package net.swofty.type.galatea.tab;
22

33
import net.swofty.type.generic.HypixelConst;
4+
import net.swofty.type.generic.i18n.I18n;
45
import net.swofty.type.generic.tab.TablistModule;
56
import net.swofty.type.generic.tab.TablistSkinRegistry;
67
import net.swofty.type.generic.user.HypixelPlayer;
78

89
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Map;
1012

1113
public class GalateaServerModule extends TablistModule {
1214
@Override
1315
public List<TablistEntry> getEntries(HypixelPlayer player) {
1416
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
15-
new TablistEntry(getCentered("§3§lServer Info"), TablistSkinRegistry.CYAN)
17+
new TablistEntry(getCentered(I18n.string("tablist.module.server_info")), TablistSkinRegistry.CYAN)
1618
));
1719

18-
entries.add(new TablistEntry("§b§lArea: §7Galatea", TablistSkinRegistry.GRAY));
19-
entries.add(new TablistEntry(" Server: §8" + HypixelConst.getServerName(), TablistSkinRegistry.GRAY));
20+
entries.add(new TablistEntry(I18n.string("tablist.server_info.area.galatea"), TablistSkinRegistry.GRAY));
21+
entries.add(new TablistEntry(I18n.string("tablist.server_info.server_label", Map.of("server_name", HypixelConst.getServerName())), TablistSkinRegistry.GRAY));
2022

2123
fillRestWithGray(entries);
2224

type.goldmine/src/main/java/net/swofty/type/goldmine/tab/GoldMineServerModule.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package net.swofty.type.goldmine.tab;
22

33
import net.swofty.type.generic.HypixelConst;
4+
import net.swofty.type.generic.i18n.I18n;
45
import net.swofty.type.generic.tab.TablistModule;
56
import net.swofty.type.generic.tab.TablistSkinRegistry;
67
import net.swofty.type.generic.user.HypixelPlayer;
78

89
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Map;
1012

1113
public class GoldMineServerModule extends TablistModule {
1214
@Override
1315
public List<TablistEntry> getEntries(HypixelPlayer player) {
1416
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
15-
new TablistEntry(getCentered("§3§lServer Info"), TablistSkinRegistry.CYAN)
17+
new TablistEntry(getCentered(I18n.string("tablist.module.server_info")), TablistSkinRegistry.CYAN)
1618
));
1719

18-
entries.add(new TablistEntry("§b§lArea: §7Gold Mine", TablistSkinRegistry.GRAY));
19-
entries.add(new TablistEntry(" Server: §8" + HypixelConst.getServerName(), TablistSkinRegistry.GRAY));
20+
entries.add(new TablistEntry(I18n.string("tablist.server_info.area.gold_mine"), TablistSkinRegistry.GRAY));
21+
entries.add(new TablistEntry(I18n.string("tablist.server_info.server_label", Map.of("server_name", HypixelConst.getServerName())), TablistSkinRegistry.GRAY));
2022

2123
fillRestWithGray(entries);
2224

type.hub/src/main/java/net/swofty/type/hub/tab/HubServerModule.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package net.swofty.type.hub.tab;
22

33
import net.swofty.type.generic.HypixelConst;
4+
import net.swofty.type.generic.i18n.I18n;
45
import net.swofty.type.generic.tab.TablistModule;
56
import net.swofty.type.generic.tab.TablistSkinRegistry;
67
import net.swofty.type.generic.user.HypixelPlayer;
78

89
import java.util.ArrayList;
910
import java.util.List;
11+
import java.util.Map;
1012

1113
public class HubServerModule extends TablistModule {
1214
@Override
1315
public List<TablistEntry> getEntries(HypixelPlayer player) {
1416
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
15-
new TablistEntry(getCentered("§3§lServer Info"), TablistSkinRegistry.CYAN)
17+
new TablistEntry(getCentered(I18n.string("tablist.module.server_info")), TablistSkinRegistry.CYAN)
1618
));
1719

18-
entries.add(new TablistEntry("§b§lArea: §7Hub", TablistSkinRegistry.GRAY));
19-
entries.add(new TablistEntry(" Server: §8" + HypixelConst.getServerName(), TablistSkinRegistry.GRAY));
20+
entries.add(new TablistEntry(I18n.string("tablist.server_info.area.hub"), TablistSkinRegistry.GRAY));
21+
entries.add(new TablistEntry(I18n.string("tablist.server_info.server_label", Map.of("server_name", HypixelConst.getServerName())), TablistSkinRegistry.GRAY));
2022

2123
fillRestWithGray(entries);
2224

type.island/src/main/java/net/swofty/type/island/tab/IslandGuestsModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.swofty.type.island.tab;
22

3+
import net.swofty.type.generic.i18n.I18n;
34
import net.swofty.type.generic.tab.TablistModule;
45
import net.swofty.type.generic.tab.TablistSkinRegistry;
56
import net.swofty.type.generic.user.HypixelPlayer;
@@ -11,7 +12,7 @@ public class IslandGuestsModule extends TablistModule {
1112
@Override
1213
public List<TablistEntry> getEntries(HypixelPlayer player) {
1314
ArrayList<TablistEntry> entries = new ArrayList<>(List.of(
14-
new TablistEntry(getCentered("§d§lGuests"), TablistSkinRegistry.PURPLE)
15+
new TablistEntry(getCentered(I18n.string("tablist.module.guests")), TablistSkinRegistry.PURPLE)
1516
));
1617

1718
fillRestWithGray(entries);

0 commit comments

Comments
 (0)