Bugfixes + import cleanup

Author: NeumimTo

Bootstrap/Spigot/src/main/java/cz/neumimto/rpg/SpigotRpgBootstrap.java

@@ -28,7 +28,6 @@
 )
 @DependsOn(
         value = {
-                @Dependency("EffectLib"),
                 @Dependency("ProtocolLib")
         }
 )

Common/src/main/java/cz/neumimto/rpg/common/AbstractRpg.java

@@ -257,10 +257,10 @@ public void init(Path workingDirPath, Object commandManager,
 
         try {
             for (RpgAddon addon : rpgAddons) {
-                 bindings.putAll(addon.getBindings());
-                 Map<String, Object> map = new HashMap<>();
-                 map.put("WORKINGDIR", workingDirPath.toAbsolutePath().toString());
-                 providers = addon.getProviders(map); //TODO something definitely wrong with this
+                bindings.putAll(addon.getBindings());
+                Map<String, Object> map = new HashMap<>();
+                map.put("WORKINGDIR", workingDirPath.toAbsolutePath().toString());
+                providers = addon.getProviders(map); //TODO something definitely wrong with this
             }
             injector = Guice.createInjector(fnInjProv.apply(bindings, providers));
         } catch (Exception e) {

Common/src/main/java/cz/neumimto/rpg/common/ResourceManagerImpl.java

@@ -8,11 +8,9 @@
 import cz.neumimto.rpg.api.effects.IGlobalEffect;
 import cz.neumimto.rpg.api.effects.model.EffectModelFactory;
 import cz.neumimto.rpg.api.effects.model.EffectModelMapper;
-import cz.neumimto.rpg.api.localization.Localization;
 import cz.neumimto.rpg.api.localization.LocalizationService;
 import cz.neumimto.rpg.api.logging.Log;
 import cz.neumimto.rpg.api.scripting.IRpgScriptEngine;
-import cz.neumimto.rpg.api.services.ILocalization;
 import cz.neumimto.rpg.api.services.IPropertyContainer;
 import cz.neumimto.rpg.api.skills.ISkill;
 import cz.neumimto.rpg.api.skills.SkillService;
@@ -24,10 +22,10 @@
 import javax.inject.Inject;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
 import java.util.stream.Stream;
 
 import static cz.neumimto.rpg.api.logging.Log.info;

Common/src/main/java/cz/neumimto/rpg/common/assets/AssetService.java

@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 public abstract class AssetService {
 
@@ -41,6 +40,7 @@ public void copyDefaultClasses(Path path) {
         copyToFileIfMissing("defaults/classes/races/Elf.conf", path.resolve("races/Rogue.conf"));
         copyToFileIfMissing("defaults/classes/races/Human.conf", path.resolve("races/Human.conf"));
     }
+
     private Path tempDirectory;
 
     public Path getTempWorkingDir() {

Common/src/main/java/cz/neumimto/rpg/common/commands/AdminCommands.java

@@ -120,7 +120,7 @@ public void addExperiencesCommand(CommandIssuer executor, OnlineOtherPlayer targ
 
     @Subcommand("skill")
     @CommandCompletion("@skilltree @nothing @skillskctx")
-    public void adminExecuteSkillCommand(IActiveCharacter character, SkillTree tree, int level,  ISkill skill) {
+    public void adminExecuteSkillCommand(IActiveCharacter character, SkillTree tree, int level, ISkill skill) {
         long e = System.nanoTime();
         commandExecuteSkill(character, tree, skill, level);
         if (Rpg.get().getPluginConfig().DEBUG.isBalance()) {
@@ -130,7 +130,7 @@ public void adminExecuteSkillCommand(IActiveCharacter character, SkillTree tree,
 
     @Subcommand("cast-skill-as")
     @CommandCompletion("@skilltree @nothing @skillskctx")
-    public void adminExecuteSkillCommandAs(OnlineOtherPlayer executor, SkillTree tree, int level,  ISkill skill) {
+    public void adminExecuteSkillCommandAs(OnlineOtherPlayer executor, SkillTree tree, int level, ISkill skill) {
         commandExecuteSkill(executor.character, tree, skill, level);
     }
 
@@ -424,7 +424,7 @@ public void commandAddUniqueSkillpoint(IActiveCharacter character, String classT
             if (result.isOk()) {
                 characterService.putInSaveQueue(character.getCharacterBase());
             } else {
-                Log.warn("Character " + character.getUUID() + " could not gain unique sp ClassType: " + classType + " " +result.getMessage());
+                Log.warn("Character " + character.getUUID() + " could not gain unique sp ClassType: " + classType + " " + result.getMessage());
             }
         }
     }

Common/src/main/java/cz/neumimto/rpg/common/commands/CharacterCommandFacade.java

@@ -159,6 +159,7 @@ public void openSKillTreeMenu(IActiveCharacter character, ClassDefinition classD
     private static class CommandSyncCallback implements Runnable {
         private final IActiveCharacter character;
         private CharacterCommandFacade facade;
+
         private CommandSyncCallback(IActiveCharacter character, CharacterCommandFacade facade) {
             this.character = character;
             this.facade = facade;

Common/src/main/java/cz/neumimto/rpg/common/configuration/SkillTreeLoaderImpl.java

@@ -1,5 +1,3 @@
-
-
 package cz.neumimto.rpg.common.configuration;
 
 import com.google.inject.Injector;
@@ -101,7 +99,7 @@ public void loadAsciiMaps(Config config, SkillTree skillTree) {
         try {
             ConfigList asciiMap = config.getList("AsciiMap");
 
-            int length = ((ConfigList)asciiMap.get(0)).size();
+            int length = ((ConfigList) asciiMap.get(0)).size();
             int rows = asciiMap.size();
             short[][] array = new short[rows][length];
             int i = 0;
@@ -119,7 +117,8 @@ public void loadAsciiMaps(Config config, SkillTree skillTree) {
                     ISkillTreeInterfaceModel guiModelByCharacter = skillService.getGuiModelByCharacter(c1.charAt(0));
                     if (guiModelByCharacter != null) {
                         array[i][j] = guiModelByCharacter.getId();
-                    } if (MathUtils.isNumeric(c1)) {
+                    }
+                    if (MathUtils.isNumeric(c1)) {
                         array[i][j] = Short.parseShort(c1);
                     }
                     j++;
@@ -393,7 +392,8 @@ private void loadSkill(SkillTree skillTree, Config c, SkillData info) {
                 }
                 Log.warn("Skill Upgrade for " + info.getSkillName() + " missing SkillId, skipping");
             }
-        } catch (ConfigException missing) {}
+        } catch (ConfigException missing) {
+        }
 
         try {
             List<? extends ConfigObject> preprocessors = c.getObjectList("CastConditions");
@@ -485,7 +485,7 @@ private SkillData getSkillInfo(String id, SkillTree tree) {
 
     private SkillData createSkillInfo(SkillTree tree, String lowercased) {
 
-        ISkill skill = Rpg.get().getSkillService().getSkillById(lowercased.replaceAll("\"",""));
+        ISkill skill = Rpg.get().getSkillService().getSkillById(lowercased.replaceAll("\"", ""));
         if (skill == null) {
             throw new InvalidSkillTreeException("Could not find a skill " + lowercased + " referenced in the skilltree " + tree.getId());
         }

Common/src/main/java/cz/neumimto/rpg/common/effects/AbstractEffectService.java

@@ -1,5 +1,3 @@
-
-
 package cz.neumimto.rpg.common.effects;
 
 import cz.neumimto.rpg.api.Rpg;
@@ -167,7 +165,7 @@ public <T extends IEffect> boolean addEffect(T effect, IEffectSourceProvider eff
     @Override
     public <T extends IEffect> boolean addEffect(T effect, IEffectSourceProvider effectSourceProvider, IEntity entitySource) {
         IEffectContainer eff = effect.getConsumer().getEffect(effect.getName());
-         if (Rpg.get().getPluginConfig().DEBUG.isDevelop()) {
+        if (Rpg.get().getPluginConfig().DEBUG.isDevelop()) {
             IEffectConsumer consumer1 = effect.getConsumer();
             if (consumer1 instanceof IActiveCharacter) {
                 IActiveCharacter chara = (IActiveCharacter) consumer1;
@@ -393,7 +391,8 @@ public void purgeEffectCache() {
         for (IEffect iEffect : effectSet) {
             try {
                 iEffect.onRemove(iEffect);
-            } catch (Throwable t){}
+            } catch (Throwable t) {
+            }
         }
         effectSet.clear();
         pendingAdditions.clear();

Common/src/main/java/cz/neumimto/rpg/common/effects/core/DefaultManaRegeneration.java

@@ -1,5 +1,3 @@
-
-
 package cz.neumimto.rpg.common.effects.core;
 
 import cz.neumimto.rpg.api.Rpg;

Common/src/main/java/cz/neumimto/rpg/common/entity/parties/PartyServiceImpl.java

@@ -1,5 +1,3 @@
-
-
 package cz.neumimto.rpg.common.entity.parties;