Skip to content

Commit cbe587c

Browse files
NeumimToNeumimTo
committed
ímports cleanup
1 parent e5ecd36 commit cbe587c

195 files changed

Lines changed: 477 additions & 757 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.run/RunServer.run.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="RunServer" type="JarApplication">
3-
<option name="JAR_PATH" value="$PROJECT_DIR$/server-spigot/server.jar" />
4-
<option name="PROGRAM_PARAMETERS" value="nogui" />
5-
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/server-spigot" />
6-
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
7-
<option name="ALTERNATIVE_JRE_PATH" value="16" />
8-
<method v="2" />
9-
</configuration>
2+
<configuration default="false" name="RunServer" type="JarApplication">
3+
<option name="JAR_PATH" value="$PROJECT_DIR$/server-spigot/server.jar"/>
4+
<option name="PROGRAM_PARAMETERS" value="nogui"/>
5+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/server-spigot"/>
6+
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
7+
<option name="ALTERNATIVE_JRE_PATH" value="16"/>
8+
<method v="2"/>
9+
</configuration>
1010
</component>

‎Bootstrap/Common/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
compileOnly "co.aikar:acf-core:" + project.acf
1010
testCompileClasspath "co.aikar:acf-core:" + project.acf
1111

12-
api 'com.github.stefvanschie.inventoryframework:IF:' + project.if // todo make a pr to if, this shit must be loaded by a javapluginclassloader
12+
api 'com.github.stefvanschie.inventoryframework:IF:' + project.if
13+
// todo make a pr to if, this shit must be loaded by a javapluginclassloader
1314

1415
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
import java.util.logging.Logger;
77

88
public interface NtRpgBootstrap {
9-
record Data(Object plugin, File workingDir, CommandManager commandManager, Logger logger){};
9+
record Data(Object plugin, File workingDir, CommandManager commandManager, Logger logger) {
10+
}
11+
12+
;
13+
1014
void enable(Data data);
15+
1116
void disable();
1217
}

‎Bootstrap/Spigot/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ version = project.subp_version
1111
dependencies {
1212
api project(':Bootstrap-Common')
1313

14-
compileOnly ("org.spigotmc:plugin-annotations:" + project.pluginannotations){
14+
compileOnly("org.spigotmc:plugin-annotations:" + project.pluginannotations) {
1515
exclude group: "org.bukkit", module: "bukkit"
1616
}
1717
annotationProcessor("org.spigotmc:plugin-annotations:" + project.pluginannotations)
@@ -35,10 +35,10 @@ build.dependsOn processResources
3535
build.mustRunAfter tasks.getByPath(':Spigot:build')
3636

3737
processResources {
38-
from (path) {
39-
into ''
40-
rename {
41-
"ntrpg-embed.jar"
42-
}
38+
from(path) {
39+
into ''
40+
rename {
41+
"ntrpg-embed.jar"
42+
}
4343
}
4444
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.bukkit.plugin.java.annotation.plugin.author.Author;
1313

1414
import java.io.File;
15-
import java.util.logging.Logger;
1615

1716
@Plugin(name = "NT-RPG", version = "2.1.0-SNAPSHOT-13")
1817
@Description("Complete combat overhaul with classes and skills")

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,18 @@ public class Tests {
1111
private SpigotRpgBootstrap plugin;
1212

1313
@BeforeEach
14-
public void setUp()
15-
{
14+
public void setUp() {
1615
server = MockBukkit.mock();
1716
plugin = MockBukkit.load(SpigotRpgBootstrap.class);
1817
}
1918

20-
// @Test
19+
// @Test
2120
public void load() {
2221

2322
}
2423

2524
@AfterEach
26-
public void tearDown()
27-
{
25+
public void tearDown() {
2826
MockBukkit.unmock();
2927
}
3028
}

‎CODE_OF_CONDUCT.md‎

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22

33
## Our Pledge
44

5-
In the interest of fostering unwelcoming environment, we as
6-
contributors and maintainers pledge to making participation in our project and
7-
our community a harassment-full experience for everyone, regardless of age, body
8-
size, disability, ethnicity, gender identity and expression, level of experience,
9-
education, socio-economic status, nationality, personal appearance, race,
10-
religion, or sexual identity and orientation.
5+
In the interest of fostering unwelcoming environment, we as contributors and maintainers pledge to making participation
6+
in our project and our community a harassment-full experience for everyone, regardless of age, body size, disability,
7+
ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal
8+
appearance, race, religion, or sexual identity and orientation.
119

1210
## Our Standards
1311

14-
Examples of behavior that contributes to creating a negative environment
15-
include:
12+
Examples of behavior that contributes to creating a negative environment include:
1613

1714
* Using unwelcoming and non-inclusive language
1815
* Being unrespectful of differing viewpoints and experiences
@@ -22,40 +19,34 @@ include:
2219

2320
Examples of acceptable behavior by participants include:
2421

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
22+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
2723
* Trolling, insulting/derogatory comments, and personal or political attacks
2824
* Public or private harassment
29-
* Other conduct which could reasonably be considered inappropriate in a
30-
professional setting
25+
* Other conduct which could reasonably be considered inappropriate in a professional setting
3126

3227
## Our Responsibilities
3328

34-
Project maintainers are responsible for clarifying the standards of acceptable
35-
behavior and are expected to take appropriate and fair corrective action in
36-
response to any instances of unacceptable behavior.
29+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take
30+
appropriate and fair corrective action in response to any instances of unacceptable behavior.
3731

38-
Project maintainers have the right and responsibility to remove, edit, or
39-
reject comments, commits, code, wiki edits, issues, and other contributions
40-
that are not aligned to this Code of Conduct, or to ban temporarily or
41-
permanently any contributor for other behaviors that they deem inappropriate,
42-
threatening, offensive, or harmful.
32+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits,
33+
issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any
34+
contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
4335

4436
## Scope
4537

46-
This Code of Conduct applies to the entire milky way. Ayy lmao
38+
This Code of Conduct applies to the entire milky way. Ayy lmao
4739

4840
## Enforcement
4941

50-
No complaints will be reviewed and investigated and wont result in any response that
51-
is deemed necessary and appropriate to the circumstances. The project team has no
52-
obligation to maintain confidentiality with regard to the reporter of an incident.
53-
Further details of specific enforcement policies may be posted separately.
54-
55-
Project maintainers who do not follow or enforce the Code of Conduct may not face temporary
56-
nor permanent repercussions as determined by other members of the project's leadership.
42+
No complaints will be reviewed and investigated and wont result in any response that is deemed necessary and appropriate
43+
to the circumstances. The project team has no obligation to maintain confidentiality with regard to the reporter of an
44+
incident. Further details of specific enforcement policies may be posted separately.
5745

46+
Project maintainers who do not follow or enforce the Code of Conduct may not face temporary nor permanent repercussions
47+
as determined by other members of the project's leadership.
5848

5949
## TL;DR
6050

61-
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.
51+
I dont fucking care, just commit shit that wont break other shit. If you commit shit that will break other shit i'll
52+
call you retard.

‎Common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
}
3333

3434
shadowJar {
35-
// relocate 'co.aikar.commands', 'cz.neumimto.acf'
35+
// relocate 'co.aikar.commands', 'cz.neumimto.acf'
3636
}
3737

3838
build.dependsOn shadowJar

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package cz.neumimto.rpg.common;
22

33
import com.google.inject.AbstractModule;
4-
import cz.neumimto.rpg.common.configuration.SkillTreeDao;
5-
import cz.neumimto.rpg.common.gui.Gui;
6-
import cz.neumimto.rpg.common.localization.LocalizationService;
74
import cz.neumimto.rpg.common.classes.ClassService;
5+
import cz.neumimto.rpg.common.configuration.SkillTreeDao;
86
import cz.neumimto.rpg.common.configuration.SkillTreeLoaderImpl;
97
import cz.neumimto.rpg.common.entity.PropertyService;
108
import cz.neumimto.rpg.common.exp.ExperienceDAO;
9+
import cz.neumimto.rpg.common.gui.Gui;
10+
import cz.neumimto.rpg.common.localization.LocalizationService;
1111
import cz.neumimto.rpg.common.localization.LocalizationServiceImpl;
1212
import cz.neumimto.rpg.common.persistance.dao.ClassDefinitionDao;
1313

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package cz.neumimto.rpg.common;
22

33
import com.google.inject.Injector;
4+
import cz.neumimto.rpg.common.bytecode.ClassGenerator;
45
import cz.neumimto.rpg.common.classes.ClassService;
56
import cz.neumimto.rpg.common.effects.EffectService;
67
import cz.neumimto.rpg.common.effects.IGlobalEffect;
78
import cz.neumimto.rpg.common.effects.model.EffectModelFactory;
89
import cz.neumimto.rpg.common.effects.model.EffectModelMapper;
10+
import cz.neumimto.rpg.common.entity.PropertyService;
911
import cz.neumimto.rpg.common.localization.LocalizationService;
1012
import cz.neumimto.rpg.common.logging.Log;
1113
import cz.neumimto.rpg.common.services.IPropertyContainer;
12-
import cz.neumimto.rpg.common.skills.SkillService;
1314
import cz.neumimto.rpg.common.skills.ISkill;
15+
import cz.neumimto.rpg.common.skills.SkillService;
1416
import cz.neumimto.rpg.common.utils.DebugLevel;
1517
import cz.neumimto.rpg.common.utils.FileUtils;
16-
import cz.neumimto.rpg.common.bytecode.ClassGenerator;
17-
import cz.neumimto.rpg.common.entity.PropertyService;
1818

1919
import javax.inject.Inject;
2020
import java.io.*;

0 commit comments

Comments
 (0)