Skip to content

Commit fe990fc

Browse files
PointerRainPointerRain
committed
Translations and settings for whitelist
1 parent 73ed5c1 commit fe990fc

14 files changed

Lines changed: 60 additions & 15 deletions

File tree

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ loader_version=0.17.2
1010
loom_version=1.11-SNAPSHOT
1111

1212
# Mod Properties
13-
mod_version=1.4.0-a29
13+
mod_version=2.0.0
1414
maven_group=golden.scnicknamer
1515
archives_base_name=scnicknamer
1616

‎languages.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
"text.autoconfig.scnicknamer.option.replacechat": "Nicknames in chat",
1010
"text.autoconfig.scnicknamer.option.colourchat": "Colour names in chat",
1111
"text.autoconfig.scnicknamer.option.locatorbar": "Colour icons in the locator bar",
12+
"text.autoconfig.scnicknamer.option.useWhitelist": "Use the recommended server whitelist",
1213

1314
"text.autoconfig.scnicknamer.option.enableMod.@Tooltip": "Game should be restarted after enabling.",
1415
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[0]": "Leave blank for Spooncraft.",
1516
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[1]": "Game should be restarted after changing.",
17+
"text.autoconfig.scnicknamer.option.useWhitelist.@Tooltip": "This is supplied by the data source, and is recommended for most users.",
1618

1719
"text.scnicknamer.status.disabled": "SCNicknamer is disabled.",
1820
"text.scnicknamer.status.working": "SCNicknamer has not finished setting up yet.",
@@ -55,6 +57,7 @@
5557
"text.autoconfig.scnicknamer.option.replacechat": "Nicknames in chat",
5658
"text.autoconfig.scnicknamer.option.colourchat": "Hue names in chat",
5759
"text.autoconfig.scnicknamer.option.locatorbar": "Hue dots in the finder band",
60+
"text.autoconfig.scnicknamer.option.useWhitelist": "Use the outreckoner whitelist",
5861

5962
"text.scnicknamer.status.disabled": "SCNicknamer is off.",
6063
"text.scnicknamer.status.working": "SCNicknamer has not fulcome setting up yet.",
@@ -65,6 +68,7 @@
6568
"text.autoconfig.scnicknamer.option.enableMod.@Tooltip": "Fand edstarting your game after laying on.",
6669
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[0]": "Leave blank if unknowed.",
6770
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[1]": "Fand edstarting your game after wending.",
71+
"text.autoconfig.scnicknamer.option.useWhitelist.@Tooltip": "This is given by the data ordfrom, and is tipped for most users.",
6872

6973
"modmenu.descriptionTranslation.scnicknamer": "Lightweight software-side nickname and hueing mod."
7074
})
@@ -85,6 +89,7 @@
8589
"text.autoconfig.scnicknamer.option.replacechat": "nimi pi toki poka lon toki",
8690
"text.autoconfig.scnicknamer.option.colourchat": "kule e nimi lon toki",
8791
"text.autoconfig.scnicknamer.option.locatorbar": "kule e ijo pi lukin lon",
92+
"text.autoconfig.scnicknamer.option.useWhitelist": "o lipu pi kulupu pona",
8893

8994
"text.scnicknamer.status.disabled": "ilo nimi Supunkala li pini.",
9095
"text.scnicknamer.status.working": "ilo nimi Supunkala li awen pali.",
@@ -95,6 +100,7 @@
95100
"text.autoconfig.scnicknamer.option.enableMod.@Tooltip": "o pini musi o open sin e musi.",
96101
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[0]": "o pana e ijo ala, la sina sona ala.",
97102
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[1]": "o pini musi o open sin e musi.",
103+
"text.autoconfig.scnicknamer.option.useWhitelist.@Tooltip": "kama tan ilo pi lawa tomo. pona tan jan mute.",
98104

99105
"gui.scnicknamer.hover_nickname": "nimi poka: %s",
100106

‎src/client/java/golden/scnicknamer/SCNicknamerClient.java‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,25 @@ public static boolean isEnabled() {
210210
if (!config.enableMod) {
211211
return false;
212212
}
213+
if (!config.useWhitelist) {
214+
return true;
215+
}
216+
if (whitelist.isEmpty()) {
217+
return true;
218+
}
213219
if (server == null || server.isEmpty()) {
214-
return config.enableOnSingleplayer;
220+
return false;
215221
}
216-
return switch (config.whitelistMode) {
217-
case ALL -> true;
218-
case NONE -> false;
219-
case AUTOWHITELIST -> whitelist.contains(server);
220-
case AUTOBLACKLIST -> !blacklist.contains(server);
221-
};
222+
return whitelist.contains(server);
223+
// if (server == null || server.isEmpty()) {
224+
// return config.enableOnSingleplayer;
225+
// }
226+
// return switch (config.whitelistMode) {
227+
// case ALL -> true;
228+
// case NONE -> false;
229+
// case AUTOWHITELIST -> whitelist.contains(server);
230+
// case AUTOBLACKLIST -> !blacklist.contains(server);
231+
// };
222232
}
223233

224234
@Override

‎src/client/java/golden/scnicknamer/client/ClientPlayNetworkHandlerMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public abstract class ClientPlayNetworkHandlerMixin {
3636
public void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci) {
3737
LOGGER.info("Game joined, current NameLinkAPI status: " + NameLinkAPI.getStatus());
3838
SCNicknamerClient.setServer(getServerInfo() == null ? null : getServerInfo().address);
39-
LOGGER.info("Is server " + getServerInfo().address + " whitelisted? " + SCNicknamerClient.isEnabled());
39+
LOGGER.info("Is server whitelisted? " + SCNicknamerClient.isEnabled());
4040
ChatHud chatHud = MinecraftClient.getInstance().inGameHud.getChatHud();
4141
if (chatHud != null && !NameLinkAPI.getStatus().equals("Success") && !NameLinkAPI.getStatus().equals("Disabled")) {
4242
chatHud.addMessage(SCNicknamerClient.getStatusString());

‎src/client/java/golden/scnicknamer/config/SCNicknamerConfig.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public class SCNicknamerConfig implements ConfigData {
3737
public enum WhitelistMode {
3838
ALL, AUTOWHITELIST, AUTOBLACKLIST, NONE
3939
}
40-
public WhitelistMode whitelistMode = WhitelistMode.AUTOWHITELIST;
41-
public boolean enableOnSingleplayer = false;
40+
// public WhitelistMode whitelistMode = WhitelistMode.AUTOWHITELIST;
41+
42+
// Whether to use the recommended whitelist.
43+
@ConfigEntry.Gui.Tooltip
44+
public boolean useWhitelist = true;
4245
}

‎src/main/resources/assets/scnicknamer/lang/en_au.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
"text.autoconfig.scnicknamer.option.replacechat": "Nicknames in chat",
1010
"text.autoconfig.scnicknamer.option.colourchat": "Colour names in chat",
1111
"text.autoconfig.scnicknamer.option.locatorbar": "Colour icons in the locator bar",
12+
"text.autoconfig.scnicknamer.option.useWhitelist": "Use the recommended server whitelist",
1213
"text.autoconfig.scnicknamer.option.enableMod.@Tooltip": "Game should be restarted after enabling.",
1314
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[0]": "Leave blank for Spooncraft.",
1415
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[1]": "Game should be restarted after changing.",
16+
"text.autoconfig.scnicknamer.option.useWhitelist.@Tooltip": "This is supplied by the data source, and is recommended for most users.",
1517
"text.scnicknamer.status.disabled": "SCNicknamer is disabled.",
1618
"text.scnicknamer.status.working": "SCNicknamer has not finished setting up yet.",
1719
"text.scnicknamer.status.fallback": "SCNicknamer could not reach the server. Using cached fallback.",
1820
"text.scnicknamer.status.failure": "SCNicknamer could not reach the server or find a fallback.",
1921
"text.scnicknamer.status.success": "Loaded mappings from the server.",
20-
"gui.scnicknamer.hover_nickname": "Nickname: %s"
22+
"gui.scnicknamer.hover_nickname": "Nickname: %s",
23+
"modmenu.nameTranslation.scnicknamer": "SCNicknamer",
24+
"modmenu.descriptionTranslation.scnicknamer": "Lightweight client-side nickname and colour mod."
2125
}

‎src/main/resources/assets/scnicknamer/lang/en_ca.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
"text.autoconfig.scnicknamer.option.replacechat": "Nicknames in chat",
1010
"text.autoconfig.scnicknamer.option.colourchat": "Colour names in chat",
1111
"text.autoconfig.scnicknamer.option.locatorbar": "Colour icons in the locator bar",
12+
"text.autoconfig.scnicknamer.option.useWhitelist": "Use the recommended server whitelist",
1213
"text.autoconfig.scnicknamer.option.enableMod.@Tooltip": "Game should be restarted after enabling.",
1314
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[0]": "Leave blank for Spooncraft.",
1415
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[1]": "Game should be restarted after changing.",
16+
"text.autoconfig.scnicknamer.option.useWhitelist.@Tooltip": "This is supplied by the data source, and is recommended for most users.",
1517
"text.scnicknamer.status.disabled": "SCNicknamer is disabled.",
1618
"text.scnicknamer.status.working": "SCNicknamer has not finished setting up yet.",
1719
"text.scnicknamer.status.fallback": "SCNicknamer could not reach the server. Using cached fallback.",
1820
"text.scnicknamer.status.failure": "SCNicknamer could not reach the server or find a fallback.",
1921
"text.scnicknamer.status.success": "Loaded mappings from the server.",
20-
"gui.scnicknamer.hover_nickname": "Nickname: %s"
22+
"gui.scnicknamer.hover_nickname": "Nickname: %s",
23+
"modmenu.nameTranslation.scnicknamer": "SCNicknamer",
24+
"modmenu.descriptionTranslation.scnicknamer": "Lightweight client-side nickname and colour mod."
2125
}

‎src/main/resources/assets/scnicknamer/lang/en_gb.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
"text.autoconfig.scnicknamer.option.replacechat": "Nicknames in chat",
1010
"text.autoconfig.scnicknamer.option.colourchat": "Colour names in chat",
1111
"text.autoconfig.scnicknamer.option.locatorbar": "Colour icons in the locator bar",
12+
"text.autoconfig.scnicknamer.option.useWhitelist": "Use the recommended server whitelist",
1213
"text.autoconfig.scnicknamer.option.enableMod.@Tooltip": "Game should be restarted after enabling.",
1314
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[0]": "Leave blank for Spooncraft.",
1415
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[1]": "Game should be restarted after changing.",
16+
"text.autoconfig.scnicknamer.option.useWhitelist.@Tooltip": "This is supplied by the data source, and is recommended for most users.",
1517
"text.scnicknamer.status.disabled": "SCNicknamer is disabled.",
1618
"text.scnicknamer.status.working": "SCNicknamer has not finished setting up yet.",
1719
"text.scnicknamer.status.fallback": "SCNicknamer could not reach the server. Using cached fallback.",
1820
"text.scnicknamer.status.failure": "SCNicknamer could not reach the server or find a fallback.",
1921
"text.scnicknamer.status.success": "Loaded mappings from the server.",
20-
"gui.scnicknamer.hover_nickname": "Nickname: %s"
22+
"gui.scnicknamer.hover_nickname": "Nickname: %s",
23+
"modmenu.nameTranslation.scnicknamer": "SCNicknamer",
24+
"modmenu.descriptionTranslation.scnicknamer": "Lightweight client-side nickname and colour mod."
2125
}

‎src/main/resources/assets/scnicknamer/lang/en_nz.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
"text.autoconfig.scnicknamer.option.replacechat": "Nicknames in chat",
1010
"text.autoconfig.scnicknamer.option.colourchat": "Colour names in chat",
1111
"text.autoconfig.scnicknamer.option.locatorbar": "Colour icons in the locator bar",
12+
"text.autoconfig.scnicknamer.option.useWhitelist": "Use the recommended server whitelist",
1213
"text.autoconfig.scnicknamer.option.enableMod.@Tooltip": "Game should be restarted after enabling.",
1314
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[0]": "Leave blank for Spooncraft.",
1415
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[1]": "Game should be restarted after changing.",
16+
"text.autoconfig.scnicknamer.option.useWhitelist.@Tooltip": "This is supplied by the data source, and is recommended for most users.",
1517
"text.scnicknamer.status.disabled": "SCNicknamer is disabled.",
1618
"text.scnicknamer.status.working": "SCNicknamer has not finished setting up yet.",
1719
"text.scnicknamer.status.fallback": "SCNicknamer could not reach the server. Using cached fallback.",
1820
"text.scnicknamer.status.failure": "SCNicknamer could not reach the server or find a fallback.",
1921
"text.scnicknamer.status.success": "Loaded mappings from the server.",
20-
"gui.scnicknamer.hover_nickname": "Nickname: %s"
22+
"gui.scnicknamer.hover_nickname": "Nickname: %s",
23+
"modmenu.nameTranslation.scnicknamer": "SCNicknamer",
24+
"modmenu.descriptionTranslation.scnicknamer": "Lightweight client-side nickname and colour mod."
2125
}

‎src/main/resources/assets/scnicknamer/lang/en_pt.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
"text.autoconfig.scnicknamer.option.replacechat": "Nicknames in the Pirate Chatter",
1010
"text.autoconfig.scnicknamer.option.colourchat": "Colour Names in the Pirate Chatter",
1111
"text.autoconfig.scnicknamer.option.locatorbar": "Colour Dots in the Locator bar",
12+
"text.autoconfig.scnicknamer.option.useWhitelist": "Use the recommended server whitelist",
1213
"text.autoconfig.scnicknamer.option.enableMod.@Tooltip": "Restart the game after hoistin’ this option.",
1314
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[0]": "Leave this map blank if ye don’t know the way.",
1415
"text.autoconfig.scnicknamer.option.apiLink.@Tooltip[1]": "Restart the game after chartin’ a new map.",
16+
"text.autoconfig.scnicknamer.option.useWhitelist.@Tooltip": "This is supplied by the data source, and is recommended for most users.",
1517
"text.scnicknamer.status.disabled": "SCNicknamer be struck down n’ disabled.",
1618
"text.scnicknamer.status.working": "SCNicknamer be still settin' sail fer setup.",
1719
"text.scnicknamer.status.fallback": "SCNicknamer failed to reach the server. Usin’ cached fallback charts.",

0 commit comments

Comments
 (0)