ímports cleanup

.run/RunServer.run.xml

@@ -1,10 +1,10 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="RunServer" type="JarApplication">
-    <option name="JAR_PATH" value="$PROJECT_DIR$/server-spigot/server.jar" />
-    <option name="PROGRAM_PARAMETERS" value="nogui" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/server-spigot" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="16" />
-    <method v="2" />
-  </configuration>
+    <configuration default="false" name="RunServer" type="JarApplication">
+        <option name="JAR_PATH" value="$PROJECT_DIR$/server-spigot/server.jar"/>
+        <option name="PROGRAM_PARAMETERS" value="nogui"/>
+        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/server-spigot"/>
+        <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
+        <option name="ALTERNATIVE_JRE_PATH" value="16"/>
+        <method v="2"/>
+    </configuration>
 </component>

Bootstrap/Common/build.gradle

@@ -9,6 +9,7 @@ dependencies {
     compileOnly "co.aikar:acf-core:" + project.acf
     testCompileClasspath "co.aikar:acf-core:" + project.acf
 
-    api 'com.github.stefvanschie.inventoryframework:IF:' + project.if // todo make a pr to if, this shit must be loaded by a javapluginclassloader
+    api 'com.github.stefvanschie.inventoryframework:IF:' + project.if
+    // todo make a pr to if, this shit must be loaded by a javapluginclassloader
 
 }

Bootstrap/Common/src/main/java/cz/neumimto/rpg/NtRpgBootstrap.java

@@ -6,7 +6,12 @@
 import java.util.logging.Logger;
 
 public interface NtRpgBootstrap {
-    record Data(Object plugin, File workingDir, CommandManager commandManager, Logger logger){};
+    record Data(Object plugin, File workingDir, CommandManager commandManager, Logger logger) {
+    }
+
+    ;
+
     void enable(Data data);
+
     void disable();
 }

Bootstrap/Spigot/build.gradle

@@ -11,7 +11,7 @@ version = project.subp_version
 dependencies {
     api project(':Bootstrap-Common')
 
-    compileOnly ("org.spigotmc:plugin-annotations:" + project.pluginannotations){
+    compileOnly("org.spigotmc:plugin-annotations:" + project.pluginannotations) {
         exclude group: "org.bukkit", module: "bukkit"
     }
     annotationProcessor("org.spigotmc:plugin-annotations:" + project.pluginannotations)
@@ -35,10 +35,10 @@ build.dependsOn processResources
 build.mustRunAfter tasks.getByPath(':Spigot:build')
 
 processResources {
-    from (path) {
-       into ''
-       rename {
-           "ntrpg-embed.jar"
-       }
+    from(path) {
+        into ''
+        rename {
+            "ntrpg-embed.jar"
+        }
     }
 }

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

@@ -12,7 +12,6 @@
 import org.bukkit.plugin.java.annotation.plugin.author.Author;
 
 import java.io.File;
-import java.util.logging.Logger;
 
 @Plugin(name = "NT-RPG", version = "2.1.0-SNAPSHOT-13")
 @Description("Complete combat overhaul with classes and skills")

Bootstrap/Spigot/src/test/java/cz/neumimto/rpg/Tests.java

@@ -11,20 +11,18 @@ public class Tests {
     private SpigotRpgBootstrap plugin;
 
     @BeforeEach
-    public void setUp()
-    {
+    public void setUp() {
         server = MockBukkit.mock();
         plugin = MockBukkit.load(SpigotRpgBootstrap.class);
     }
 
-  //  @Test
+    //  @Test
     public void load() {
 
     }
 
     @AfterEach
-    public void tearDown()
-    {
+    public void tearDown() {
         MockBukkit.unmock();
     }
 }

CODE_OF_CONDUCT.md

@@ -2,17 +2,14 @@
 
 ## Our Pledge
 
-In the interest of fostering unwelcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-full experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-education, socio-economic status, nationality, personal appearance, race,
-religion, or sexual identity and orientation.
+In the interest of fostering unwelcoming environment, we as contributors and maintainers pledge to making participation
+in our project and our community a harassment-full experience for everyone, regardless of age, body size, disability,
+ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a negative environment
-include:
+Examples of behavior that contributes to creating a negative environment include:
 
 * Using unwelcoming and non-inclusive language
 * Being unrespectful of differing viewpoints and experiences
@@ -22,40 +19,34 @@ include:
 
 Examples of acceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+* Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take
+appropriate and fair corrective action in response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits,
+issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies to the entire milky way. Ayy lmao 
+This Code of Conduct applies to the entire milky way. Ayy lmao
 
 ## Enforcement
 
-No complaints will be reviewed and investigated and wont result in any response that
-is deemed necessary and appropriate to the circumstances. The project team has no
-obligation to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct may not face temporary 
-nor permanent repercussions as determined by other members of the project's leadership.
+No complaints will be reviewed and investigated and wont result in any response that is deemed necessary and appropriate
+to the circumstances. The project team has no obligation to maintain confidentiality with regard to the reporter of an
+incident. Further details of specific enforcement policies may be posted separately.
 
+Project maintainers who do not follow or enforce the Code of Conduct may not face temporary nor permanent repercussions
+as determined by other members of the project's leadership.
 
 ## TL;DR
 
-I dont fucking care, just commit shit that wont break other shit. If you commit shit that will break other shit i'll call you retard.
+I dont fucking care, just commit shit that wont break other shit. If you commit shit that will break other shit i'll
+call you retard.

Common/build.gradle

@@ -32,7 +32,7 @@ dependencies {
 }
 
 shadowJar {
-   // relocate 'co.aikar.commands', 'cz.neumimto.acf'
+    // relocate 'co.aikar.commands', 'cz.neumimto.acf'
 }
 
 build.dependsOn shadowJar

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

@@ -1,13 +1,13 @@
 package cz.neumimto.rpg.common;
 
 import com.google.inject.AbstractModule;
-import cz.neumimto.rpg.common.configuration.SkillTreeDao;
-import cz.neumimto.rpg.common.gui.Gui;
-import cz.neumimto.rpg.common.localization.LocalizationService;
 import cz.neumimto.rpg.common.classes.ClassService;
+import cz.neumimto.rpg.common.configuration.SkillTreeDao;
 import cz.neumimto.rpg.common.configuration.SkillTreeLoaderImpl;
 import cz.neumimto.rpg.common.entity.PropertyService;
 import cz.neumimto.rpg.common.exp.ExperienceDAO;
+import cz.neumimto.rpg.common.gui.Gui;
+import cz.neumimto.rpg.common.localization.LocalizationService;
 import cz.neumimto.rpg.common.localization.LocalizationServiceImpl;
 import cz.neumimto.rpg.common.persistance.dao.ClassDefinitionDao;
 

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

@@ -1,20 +1,20 @@
 package cz.neumimto.rpg.common;
 
 import com.google.inject.Injector;
+import cz.neumimto.rpg.common.bytecode.ClassGenerator;
 import cz.neumimto.rpg.common.classes.ClassService;
 import cz.neumimto.rpg.common.effects.EffectService;
 import cz.neumimto.rpg.common.effects.IGlobalEffect;
 import cz.neumimto.rpg.common.effects.model.EffectModelFactory;
 import cz.neumimto.rpg.common.effects.model.EffectModelMapper;
+import cz.neumimto.rpg.common.entity.PropertyService;
 import cz.neumimto.rpg.common.localization.LocalizationService;
 import cz.neumimto.rpg.common.logging.Log;
 import cz.neumimto.rpg.common.services.IPropertyContainer;
-import cz.neumimto.rpg.common.skills.SkillService;
 import cz.neumimto.rpg.common.skills.ISkill;
+import cz.neumimto.rpg.common.skills.SkillService;
 import cz.neumimto.rpg.common.utils.DebugLevel;
 import cz.neumimto.rpg.common.utils.FileUtils;
-import cz.neumimto.rpg.common.bytecode.ClassGenerator;
-import cz.neumimto.rpg.common.entity.PropertyService;
 
 import javax.inject.Inject;
 import java.io.*;

Common/src/main/java/cz/neumimto/rpg/common/classes/ClassService.java

@@ -1,15 +1,14 @@
 package cz.neumimto.rpg.common.classes;
 
 import cz.neumimto.rpg.common.Rpg;
+import cz.neumimto.rpg.common.assets.AssetService;
 import cz.neumimto.rpg.common.damage.DamageService;
-import cz.neumimto.rpg.common.entity.IEntity;
 import cz.neumimto.rpg.common.entity.players.IActiveCharacter;
 import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition;
 import cz.neumimto.rpg.common.entity.players.classes.PlayerClassData;
 import cz.neumimto.rpg.common.entity.players.classes.PlayerClassPermission;
 import cz.neumimto.rpg.common.logging.Log;
 import cz.neumimto.rpg.common.permissions.PermissionService;
-import cz.neumimto.rpg.common.assets.AssetService;
 import cz.neumimto.rpg.common.persistance.dao.ClassDefinitionDao;
 
 import javax.inject.Inject;

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

@@ -11,11 +11,11 @@
 import cz.neumimto.rpg.common.entity.players.IActiveCharacter;
 import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition;
 import cz.neumimto.rpg.common.entity.players.classes.PlayerClassData;
+import cz.neumimto.rpg.common.inventory.runewords.RuneWord;
 import cz.neumimto.rpg.common.skills.ISkill;
 import cz.neumimto.rpg.common.skills.PlayerSkillContext;
 import cz.neumimto.rpg.common.skills.SkillData;
 import cz.neumimto.rpg.common.skills.tree.SkillTree;
-import cz.neumimto.rpg.common.inventory.runewords.RuneWord;
 
 import java.util.*;
 import java.util.stream.Collectors;

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

@@ -7,7 +7,11 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import cz.neumimto.rpg.common.Rpg;
-import cz.neumimto.rpg.common.effects.*;
+import cz.neumimto.rpg.common.assets.AssetService;
+import cz.neumimto.rpg.common.effects.EffectParams;
+import cz.neumimto.rpg.common.effects.EffectService;
+import cz.neumimto.rpg.common.effects.IGlobalEffect;
+import cz.neumimto.rpg.common.effects.InternalEffectSourceProvider;
 import cz.neumimto.rpg.common.effects.model.EffectModelFactory;
 import cz.neumimto.rpg.common.entity.players.CharacterService;
 import cz.neumimto.rpg.common.entity.players.IActiveCharacter;
@@ -19,7 +23,6 @@
 import cz.neumimto.rpg.common.skills.*;
 import cz.neumimto.rpg.common.skills.tree.SkillTree;
 import cz.neumimto.rpg.common.utils.ActionResult;
-import cz.neumimto.rpg.common.assets.AssetService;
 import cz.neumimto.rpg.common.utils.model.InstallOptions;
 
 import javax.inject.Inject;

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

@@ -3,6 +3,7 @@
 import cz.neumimto.rpg.common.Rpg;
 import cz.neumimto.rpg.common.classes.ClassService;
 import cz.neumimto.rpg.common.configuration.AttributeConfig;
+import cz.neumimto.rpg.common.entity.PropertyService;
 import cz.neumimto.rpg.common.entity.players.CharacterService;
 import cz.neumimto.rpg.common.entity.players.IActiveCharacter;
 import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition;
@@ -14,11 +15,10 @@
 import cz.neumimto.rpg.common.localization.LocalizationKeys;
 import cz.neumimto.rpg.common.localization.LocalizationService;
 import cz.neumimto.rpg.common.logging.Log;
-import cz.neumimto.rpg.common.permissions.PermissionService;
 import cz.neumimto.rpg.common.model.CharacterBase;
+import cz.neumimto.rpg.common.permissions.PermissionService;
 import cz.neumimto.rpg.common.skills.tree.SkillTree;
 import cz.neumimto.rpg.common.utils.ActionResult;
-import cz.neumimto.rpg.common.entity.PropertyService;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

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

@@ -8,9 +8,9 @@
 import cz.neumimto.rpg.common.localization.Arg;
 import cz.neumimto.rpg.common.localization.LocalizationKeys;
 import cz.neumimto.rpg.common.localization.LocalizationService;
-import cz.neumimto.rpg.common.skills.SkillService;
 import cz.neumimto.rpg.common.skills.ISkill;
 import cz.neumimto.rpg.common.skills.PlayerSkillContext;
+import cz.neumimto.rpg.common.skills.SkillService;
 import cz.neumimto.rpg.common.skills.tree.SkillTree;
 
 import javax.inject.Inject;

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

@@ -10,8 +10,8 @@
 import cz.neumimto.rpg.common.gui.Gui;
 import cz.neumimto.rpg.common.gui.SkillTreeViewModel;
 import cz.neumimto.rpg.common.localization.LocalizationService;
-import cz.neumimto.rpg.common.skills.SkillService;
 import cz.neumimto.rpg.common.skills.ISkill;
+import cz.neumimto.rpg.common.skills.SkillService;
 import cz.neumimto.rpg.common.skills.tree.SkillTree;
 
 import javax.inject.Inject;

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

@@ -3,6 +3,7 @@
 import com.google.inject.Injector;
 import com.typesafe.config.*;
 import cz.neumimto.rpg.common.Rpg;
+import cz.neumimto.rpg.common.assets.AssetService;
 import cz.neumimto.rpg.common.classes.ClassService;
 import cz.neumimto.rpg.common.gui.ISkillTreeInterfaceModel;
 import cz.neumimto.rpg.common.localization.LocalizationService;
@@ -16,10 +17,6 @@
 import cz.neumimto.rpg.common.utils.FileUtils;
 import cz.neumimto.rpg.common.utils.MathUtils;
 import cz.neumimto.rpg.common.utils.Pair;
-import cz.neumimto.rpg.common.assets.AssetService;
-import cz.neumimto.rpg.common.skills.SkillConfigLoader;
-import cz.neumimto.rpg.common.skills.SkillConfigLoaders;
-import cz.neumimto.rpg.common.skills.SkillExecutor;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/ClassDependencyGraphAdapter.java

@@ -10,9 +10,9 @@
 public class ClassDependencyGraphAdapter {
 
     public static DependencyGraph load(Config value, ClassDefinition classDef, Set<ClassDefinition> set) {
-        List<String> soft = readOrEmpty(value,"Soft");
-        List<String> hard = readOrEmpty(value,"Hard");
-        List<String> conflicts = readOrEmpty(value,"Conflicts");
+        List<String> soft = readOrEmpty(value, "Soft");
+        List<String> hard = readOrEmpty(value, "Hard");
+        List<String> conflicts = readOrEmpty(value, "Conflicts");
 
         DependencyGraph graph = classDef.getClassDependencyGraph();
 

Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/DimExperiencesAdapter.java

@@ -19,7 +19,7 @@ public Map<String, Map<String, Double>> convertToField(Config value) {
             Map<String, Double> expMap = new HashMap<>();
             Config c = (Config) entry.getValue();
             for (Config.Entry e : c.entrySet()) {
-                expMap.put(e.getKey(), ((Number)e.getValue()).doubleValue());
+                expMap.put(e.getKey(), ((Number) e.getValue()).doubleValue());
             }
             map.put(entry.getKey(), expMap);
         }

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

@@ -3,9 +3,8 @@
 import cz.neumimto.rpg.common.effects.stacking.IntegerEffectStackingStrategy;
 import cz.neumimto.rpg.common.entity.CommonProperties;
 import cz.neumimto.rpg.common.entity.IEffectConsumer;
-import cz.neumimto.rpg.common.skills.scripting.JsBinding;
 
-@JsBinding(JsBinding.Type.CLASS)
+
 @Generate(id = "name", description = "An effect which gives +x bonus points to all skill")
 public class AllSkillsBonus extends EffectBase<Integer> {
 

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

@@ -1,5 +1,3 @@
-
-
 package cz.neumimto.rpg.common.effects;
 
 import cz.neumimto.rpg.common.entity.IEffectConsumer;