Skip to content

Commit 4fa832a

Browse files
committed
Option that allow user change the sign default language
1 parent 4a39b92 commit 4fa832a

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

src/main/java/org/maxgamer/quickshop/QuickShop.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,6 @@ private void updateConfig(int selectedVersion) throws IOException {
19141914
getConfiguration().set("config-version", ++selectedVersion);
19151915
}
19161916
if (selectedVersion == 141) {
1917-
getConfiguration().set("language", null);
19181917
getConfiguration().set("disabled-languages", Collections.singletonList("disable_here"));
19191918
getConfiguration().set("mojangapi-mirror", 0);
19201919
getConfiguration().set("purge.enabled", false);
@@ -1930,6 +1929,13 @@ private void updateConfig(int selectedVersion) throws IOException {
19301929
getConfiguration().set("enabled-languages", Collections.singletonList("*"));
19311930
getConfiguration().set("config-version", ++selectedVersion);
19321931
}
1932+
if (selectedVersion == 143) {
1933+
if (getConfiguration().get("language") == null) {
1934+
getConfiguration().set("language", "en-US");
1935+
}
1936+
getConfiguration().set("config-version", ++selectedVersion);
1937+
}
1938+
19331939

19341940
if (getConfiguration().getInt("matcher.work-type") != 0 && GameVersion.get(ReflectFactory.getServerVersion()).name().contains("1_16")) {
19351941
getLogger().warning("You are not using QS Matcher, it may meeting item comparing issue mentioned there: https://hub.spigotmc.org/jira/browse/SPIGOT-5063");

src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,8 @@ public void setSignText() {
799799
if (!Util.isLoaded(this.location)) {
800800
return;
801801
}
802-
this.setSignText(getSignText("en_us"));
802+
this.setSignText(getSignText(plugin.getConfiguration().getOrDefault("language", "en-US")));
803+
// this.setSignText(getSignText("en_us"));
803804
}
804805

805806
/**

src/main/java/org/maxgamer/quickshop/shop/ShopSignStorage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file is a part of project QuickShop, the name is ShopInfoStorage.java
2+
* This file is a part of project QuickShop, the name is ShopSignStorage.java
33
* Copyright (C) PotatoCraft Studio and contributors
44
*
55
* This program is free software: you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
3030
@Data
3131
@Builder
3232
public class ShopSignStorage {
33+
private final boolean shopSign = true;
3334
private String world;
3435
private int x;
3536
private int y;

src/main/resources/config.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
# QuickShop-Reremake Plugin Configuration
22

33
#Do not touch this if you don't know what you're doing!
4-
config-version: 143
4+
config-version: 144
5+
6+
#This language will used by Shop signs and other texts that direct write on the block/entity.
7+
language: en-US
8+
9+
#This language will used by Item Name, Enchantment Name and Potion Effect Name and other them related position.
10+
#Use default will use your system language.
11+
game-language: default
512

613
#Choose which languages should enabled
714
#Any client connect to server that using disabled language, will fallback to en-US language
@@ -11,14 +18,6 @@ config-version: 143
1118
enabled-languages:
1219
- '*'
1320

14-
#Select the language you want to use, (e.g de-DE), use only supported language codes from the list below.
15-
#If you use a not existant/not supported language, then QuickShop will use en_US.
16-
#After you have selected your language, you need to delete the `messages.yml` file and reload the plugin to apply the new language.
17-
18-
#After you have setup a language, QuickShop will download all the required Game language files from Mojang.
19-
#You can find all supported languages in your Minecraft Client Languages Menu.
20-
#Enter the language Code here (e.g English (en-US) -> Language Code = en-US).
21-
game-language: default
2221

2322
#0=Official
2423
#1=BMCLAPI (Unofficial China Mirror, https://bmclapidoc.bangbang93.com)

0 commit comments

Comments
 (0)