Upstream/ChestSort
1
0
Fork 0
mirror of https://github.com/JEFF-Media-GbR/ChestSort.git synced 2025-04-12 15:05:44 +02:00
Code Issues Projects Releases Wiki Activity

4.1 update

Browse Source
This commit is contained in:
mfnalex 2019-05-01 12:52:42 +02:00
parent 753f22fde4
commit 10e5078d66
8 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>de.jeffclan</groupId>
<artifactId>JeffChestSort</artifactId>
<version>4.1-beta2</version>
<version>4.1</version>
<packaging>jar</packaging>
<name>JeffChestSort</name>
@ -53,8 +53,14 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version>
<version>1.14-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
</project>

2
src/main/java/de/jeffclan/JeffChestSort/JeffChestSortCommandExecutor.java
View File

@ -66,7 +66,7 @@ public class JeffChestSortCommandExecutor implements CommandExecutor {
start=9;
end=35;
} else {
p.sendMessage(ChatColor.RED+"Error: unknown option \""+args[0]+"\". Valid values are \"inv\", \"hotbar\" and \"all\".");
p.sendMessage(String.format(plugin.messages.MSG_INVALIDOPTIONS,"\""+args[0]+"\"","\"inv\", \"hotbar\", \"all\""));
return true;
}
}

21
src/main/java/de/jeffclan/JeffChestSort/JeffChestSortMessages.java
View File

@ -3,16 +3,18 @@ package de.jeffclan.JeffChestSort;
import org.bukkit.ChatColor;
public class JeffChestSortMessages {
// Messages can be customized in the config.yml
// To avoid problems with missing messages in the config, the default messages are
// To avoid problems with missing messages in the config, the default messages
// are
// hardcoded.
// When creating pull requests that feature a message to the player, please stick to this scheme
// When creating pull requests that feature a message to the player, please
// stick to this scheme
JeffChestSortPlugin plugin;
final String MSG_ACTIVATED, MSG_DEACTIVATED, MSG_COMMANDMESSAGE, MSG_COMMANDMESSAGE2, MSG_PLAYERSONLY, MSG_PLAYERINVSORTED;
final String MSG_ACTIVATED, MSG_DEACTIVATED, MSG_COMMANDMESSAGE, MSG_COMMANDMESSAGE2, MSG_PLAYERSONLY,
MSG_PLAYERINVSORTED, MSG_INVALIDOPTIONS;
JeffChestSortMessages(JeffChestSortPlugin plugin) {
this.plugin = plugin;
@ -31,9 +33,12 @@ public class JeffChestSortMessages {
MSG_PLAYERSONLY = ChatColor.translateAlternateColorCodes('&', plugin.getConfig()
.getString("message-error-players-only", "&cError: This command can only be run by players.&r"));
MSG_PLAYERINVSORTED = ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString(
"message-player-inventory-sorted", "&7Your inventory has been sorted."));
MSG_PLAYERINVSORTED = ChatColor.translateAlternateColorCodes('&',
plugin.getConfig().getString("message-player-inventory-sorted", "&7Your inventory has been sorted."));
MSG_INVALIDOPTIONS = ChatColor.translateAlternateColorCodes('&', plugin.getConfig()
.getString("message-error-invalid-options", "&cError: Unknown option %s. Valid options are %s."));
}
}

2
src/main/java/de/jeffclan/JeffChestSort/JeffChestSortPlugin.java
View File

@ -58,7 +58,7 @@ public class JeffChestSortPlugin extends JavaPlugin {
JeffChestSortListener listener;
String sortingMethod;
ArrayList<String> disabledWorlds;
int currentConfigVersion = 7;
int currentConfigVersion = 8;
boolean usingMatchingConfig = true;
boolean debug = false;
boolean verbose = true;

0
src/main/resources/categories/910-tools.default.txt → src/main/resources/categories/900-tools.default.txt
View File

0
src/main/resources/categories/900-valuables.default.txt → src/main/resources/categories/910-valuables.default.txt
View File

17
src/main/resources/config.yml
View File

@ -116,6 +116,9 @@ sorting-method: '{category},{itemsFirst},{name},{color}'
# &l Bold &o Italic
# &n Underline &r Reset
# IMPORTANT NOTE:
# Some messages contain placeholders (%s). You must not remove those, or you will get exceptions in the console
##### English
message-when-using-chest: "&7Hint: Type &6/chestsort&7 to enable automatic chest sorting."
message-when-using-chest2: "&7Hint: Type &6/chestsort&7 to disable automatic chest sorting."
@ -123,6 +126,7 @@ message-sorting-disabled: "&7Automatic chest sorting has been &cdisabled&7."
message-sorting-enabled: "&7Automatic chest sorting has been &aenabled&7."
message-error-players-only: "&cError: This command can only be run by players."
message-player-inventory-sorted: "&7Your inventory has been sorted."
message-error-invalid-options: "&cError: Unknown option %s. Valid options are %s."
##### Chinese - Thanks to qsefthuopq for translating! -> https://www.spigotmc.org/members/qsefthuopq.339953/
#message-when-using-chest: "&7提示: 输入 &6/chestsort&7 来启用自动整理箱子."
@ -131,6 +135,7 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-enabled: "&7自动整理箱子已 &a启用&7."
#message-error-players-only: "&c错误: 指令只能由玩家运行."
#message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-error-invalid-options: "&cError: Unknown option %s. Valid options are %s."
##### Chinese (Traditional) 繁體中文
#message-when-using-chest: "&7小提醒: 輸入 &6/chestsort&7 來開啟自動整理箱子"
@ -139,6 +144,7 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-enabled: "&7自動整理箱子已 &a開啟&7"
#message-error-players-only: "&c錯誤: 這個指令只能由玩家使用"
#message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-error-invalid-options: "&cError: Unknown option %s. Valid options are %s."
##### French - Thanks to automatizer for translating! -> https://www.spigotmc.org/members/automatizer.26188/
#message-when-using-chest: "&7Astuce: Écris &6/chestsort&7 pour activer le classement automatique."
@ -147,6 +153,7 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-enabled: "&7Le classement automatique a été &aactivé&7."
#message-error-players-only: "&cErreur: Cette commande ne peut être utilisée que par des joueurs."
#message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-error-invalid-options: "&cError: Unknown option %s. Valid options are %s."
##### German
#message-when-using-chest: "&7Hinweis: Benutze &6/chestsort&7 um die automatische Kistensortierung zu aktivieren."
@ -155,6 +162,7 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-enabled: "&7Automatische Kistensortierung &aaktiviert&7."
#message-error-players-only: "&cFehler: Dieser Befehl ist nur für Spieler verfügbar."
#message-player-inventory-sorted: "&7Dein Inventar wurde sortiert."
#message-error-invalid-options: "&cFehler: Unbekannte Option %s. Gültige Optionen sind %s."
##### Italian - Translated with Google. Please tell me if something is wrong :)
#message-when-using-chest: "&7Nota: inserire &6/chestsort&7 per abilitare l'ordinamento automatico dei bauli."
@ -162,7 +170,8 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-disabled: "&7L'ordinamento automatico dei bauli è stato &cdisattivato&7."
#message-sorting-enabled: "&7L'ordinamento automatico dei bauli è stato &aattivato&7."
#message-error-players-only: "&cErrore: questo comando è disponibile solo per i giocatori."
#message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-player-inventory-sorted: "&7Il tuo inventario è stato ordinato."
#message-error-invalid-options: "&cErrore: Parametro sconosciuto %s. I parametri validi sono %s."
##### Japanese
#message-when-using-chest: "&7ヒント: &6/chestsort&7 と入力して自動チェスト整理を有効にできます。"
@ -171,6 +180,7 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-enabled: "&7自動チェスト整理は現在 &aON&7です。"
#message-error-players-only: "&cエラー: このコマンドはプレイヤーのみ実行できます。"
#message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-error-invalid-options: "&cError: Unknown option %s. Valid options are %s."
##### Portuguese - Thanks to wildastral for translating! -> https://www.spigotmc.org/members/wildastral.673147/
#message-when-using-chest: "&7Dica: Digite &6/chestsort&7 para habilitar a organização automática."
@ -179,6 +189,7 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-enabled: "&7A Organização automática de baús foi &ahabilitada&7."
#message-error-players-only: "&cErro: Esse comando não pode ser executado por jogadores."
#message-player-inventory-sorted: "&7Seu inventário foi organizado."
#message-error-invalid-options: "&cError: Unknown option %s. Valid options are %s."
##### Russian - Thanks to Gandon for translating! -> https://www.spigotmc.org/members/gandon.443887/
#message-when-using-chest: "&7Подсказка: введите &6"/chestsort&7, чтобы включить автоматическую сортировку вещей в сундуках."
@ -187,6 +198,7 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-enabled: "&7Автоматическая сортировка вещей в сундуках была &aвключена&7."
#message-error-players-only: "&cОшибка: эта команда может быть использована только игроками."
#message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-error-invalid-options: "&cError: Unknown option %s. Valid options are %s."
##### Spanish - Thanks to Bers_ for translating! -> https://www.spigotmc.org/members/bers_.146126/
#message-when-using-chest: "&7Pista: Usa &6/chestsort&7 para activar el orden automático de los cofres."
@ -195,10 +207,11 @@ message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-sorting-enabled: "&7Orden automático de los cofres &aactivado&7."
#message-error-players-only: "&cError: Este comando solo puede ser ejecutado por jugadores."
#message-player-inventory-sorted: "&7Your inventory has been sorted."
#message-error-invalid-options: "&cError: Unknown option %s. Valid options are %s."
#########################
##### Done! #####
#########################
# please do not change the following line manually!
config-version: 7
config-version: 8

4
src/main/resources/plugin.yml
View File

@ -1,7 +1,7 @@
main: de.jeffclan.JeffChestSort.JeffChestSortPlugin
name: ChestSort
version: 4.1-beta2
api-version: 1.13
version: 4.1
api-version: 1.14
description: Allows automatic chest sorting
author: mfnalex
website: https://www.chestsort.de