@@ -50,15 +50,15 @@ private void loadArmorStandsConf() {
5050 private void loadTranslations () {
5151 getLogger ().log (Level .INFO , "Parsing translations..." );
5252 lTrans = new Translations ();
53- lTrans .prefix = config . getString ("prefix" ). replace ( '&' , '§' );
54- lTrans .noPermissions = lTrans . prefix + config . getString ("no-permission" );
55- lTrans .consoleSummoning = config . getString ("console-summoning" );
56- lTrans .punchMe = config . getString ("punch-me" );
57- lTrans .helperAdded = lTrans . prefix + config . getString ("helper-added" );
58- lTrans .helperRemoved = lTrans . prefix + config . getString ("helper-removed" );
59- lTrans .nonActiveWorld = lTrans . prefix + config . getString ("non-active-world" );
60- lTrans .nearSpawnPlacing = lTrans . prefix + config . getString ("near-spawn-placing" );
61- lTrans .tryAgain = lTrans . prefix + config . getString ("try-again" );
53+ lTrans .prefix = loadTranslation ("prefix" , false );
54+ lTrans .noPermissions = loadTranslation ("no-permission" , true );
55+ lTrans .consoleSummoning = loadTranslation ("console-summoning" , false );
56+ lTrans .punchMe = loadTranslation ("punch-me" , false );
57+ lTrans .helperAdded = loadTranslation ("helper-added" , true );
58+ lTrans .helperRemoved = loadTranslation ("helper-removed" , true );
59+ lTrans .nonActiveWorld = loadTranslation ("non-active-world" , true );
60+ lTrans .nearSpawnPlacing = loadTranslation ("near-spawn-placing" , true );
61+ lTrans .tryAgain = loadTranslation ("try-again" , true );
6262 getLogger ().log (Level .INFO , "Translations parsed." );
6363 }
6464
@@ -82,6 +82,16 @@ private void parseConfiguration() {
8282
8383 }
8484
85+ private String loadTranslation (String messageKey , boolean appendPrefix ) {
86+ String toRet = config .getString (messageKey );
87+ if (toRet == null )
88+ toRet = messageKey ;
89+ toRet = toRet .replace ('&' , '§' );
90+ if (appendPrefix )
91+ toRet = lTrans .prefix + toRet ;
92+ return toRet ;
93+ }
94+
8595 private void saveArmorStandsConf () {
8696 getLogger ().log (Level .INFO , "Saving armor stands..." );
8797 File armorStandsFile = new File (getDataFolder (), "armorstands.yml" );
@@ -108,6 +118,18 @@ public void onEnable() {
108118 getCommand ("summonhelper" ).setExecutor (new CommandsHandler (this , lConfig , lTrans ));
109119 }
110120
121+ @ Override
122+ public void onDisable () {
123+ getLogger ().log (Level .INFO , "Executing delayed tasks..." );
124+ delayedTasks .forEach (task -> {
125+ task .cancel ();
126+ task .run ();
127+ });
128+ getLogger ().log (Level .INFO , "Delayed tasks executed." );
129+ HandlerList .unregisterAll (this );
130+ saveArmorStandsConf ();
131+ }
132+
111133 public void registerNewArmorStandIfNotExisting (UUID uuid ) {
112134 List <String > armorStands = armorStandsConf .getStringList ("armorStands" );
113135 if (!isArmorStandExisting (uuid )) {
@@ -156,16 +178,4 @@ public void removeArmorStandIfExisting(UUID uuid) {
156178 armorStandsConf .set ("armorStands" , armorStands );
157179 }
158180
159- @ Override
160- public void onDisable () {
161- getLogger ().log (Level .INFO , "Executing delayed tasks..." );
162- delayedTasks .forEach (task -> {
163- task .cancel ();
164- task .run ();
165- });
166- getLogger ().log (Level .INFO , "Delayed tasks executed." );
167- HandlerList .unregisterAll (this );
168- saveArmorStandsConf ();
169- }
170-
171181}
0 commit comments