From cbe587cb39850a74ba4fc946a2b96b63394bd16e Mon Sep 17 00:00:00 2001 From: NeumimTo Date: Sat, 27 Nov 2021 11:10:39 +0100 Subject: [PATCH] =?UTF-8?q?=C3=ADmports=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .run/RunServer.run.xml | 16 +-- Bootstrap/Common/build.gradle | 3 +- .../java/cz/neumimto/rpg/NtRpgBootstrap.java | 7 +- Bootstrap/Spigot/build.gradle | 12 +- .../cz/neumimto/rpg/SpigotRpgBootstrap.java | 1 - .../src/test/java/cz/neumimto/rpg/Tests.java | 8 +- CODE_OF_CONDUCT.md | 49 +++----- Common/build.gradle | 2 +- .../rpg/common/AbstractRpgGuiceModule.java | 6 +- .../rpg/common/ResourceManagerImpl.java | 6 +- .../rpg/common/classes/ClassService.java | 3 +- .../rpg/common/commands/ACFBootstrap.java | 2 +- .../rpg/common/commands/AdminCommands.java | 7 +- .../commands/CharacterCommandFacade.java | 4 +- .../common/commands/SkillsCommandFacade.java | 2 +- .../common/commands/SkilltreeCommands.java | 2 +- .../configuration/SkillTreeLoaderImpl.java | 5 +- .../adapters/ClassDependencyGraphAdapter.java | 6 +- .../adapters/DimExperiencesAdapter.java | 2 +- .../rpg/common/effects/AllSkillsBonus.java | 3 +- .../rpg/common/effects/EffectBase.java | 2 - .../rpg/common/effects/EffectService.java | 74 +----------- .../rpg/common/effects/EffectStatusType.java | 2 - .../neumimto/rpg/common/effects/IEffect.java | 2 - .../rpg/common/effects/IGlobalEffect.java | 4 - .../effects/InternalEffectSourceProvider.java | 2 - .../rpg/common/effects/core/CombatEffect.java | 2 +- .../effects/core/DefaultManaRegeneration.java | 6 +- .../common/entity/AbstractEntityService.java | 4 +- .../rpg/common/entity/CommonProperties.java | 2 +- .../rpg/common/entity/IEffectConsumer.java | 2 - .../rpg/common/entity/IReservable.java | 2 - .../rpg/common/entity/PropertyService.java | 2 +- .../rpg/common/entity/UserActionType.java | 2 - .../entity/players/ActiveCharacter.java | 2 +- .../entity/players/CharacterService.java | 17 +-- .../entity/players/IActiveCharacter.java | 2 - .../entity/players/PreloadCharacter.java | 2 +- .../players/classes/PlayerClassData.java | 2 - .../common/events/EventFactoryService.java | 1 - .../character/CharacterManaRegainEvent.java | 2 - .../CharacterSkillLearnAttemptEvent.java | 2 - .../CharacterSkillRefundAttemptEvent.java | 2 - .../character/CharacterSkillUpgradeEvent.java | 2 - .../EventCharacterArmorPostUpdate.java | 2 - .../common/events/skill/SkillHealEvent.java | 2 - .../events/skill/SkillPostUsageEvent.java | 2 - .../events/skill/SkillPreUsageEvent.java | 2 - .../java/cz/neumimto/rpg/common/gui/Gui.java | 4 - .../rpg/common/gui/IPlayerMessage.java | 2 - .../inventory/AbstractInventoryService.java | 2 +- .../common/inventory/InventoryHandler.java | 5 +- .../rpg/common/items/AbstractItemService.java | 4 +- .../cz/neumimto/rpg/common/logging/Log.java | 1 + .../persistance/model/CharacterBaseImpl.java | 2 - .../model/TimestampEntityImpl.java | 2 - .../rpg/common/properties/Property.java | 2 - .../common/properties/PropertyContainer.java | 2 - .../rpg/common/scripting/NTScriptEngine.java | 19 ++- .../common/scripting/SkillScriptHandlers.java | 13 +- .../common/scripting/mechanics/EffectsM.java | 7 +- .../common/scripting/mechanics/EntitiesM.java | 8 +- .../scripting/mechanics/SkillCommons.java | 8 +- .../cz/neumimto/rpg/common/skills/ISkill.java | 2 - .../rpg/common/skills/ISkillNode.java | 2 - .../rpg/common/skills/PlayerSkillContext.java | 2 - .../rpg/common/skills/RepeatingSkill.java | 5 +- .../neumimto/rpg/common/skills/SkillData.java | 2 - .../rpg/common/skills/SkillNodes.java | 2 - .../rpg/common/skills/SkillResult.java | 4 - .../rpg/common/skills/SkillService.java | 16 +-- .../rpg/common/skills/SkillSettings.java | 16 +-- .../rpg/common/skills/reagents/HPCast.java | 1 - .../scripting/EffectScriptGenerator.java | 114 +++++++++--------- .../common/skills/scripting/JsBinding.java | 19 --- .../ScriptedSkillNodeDescription.java | 12 +- .../rpg/common/skills/tree/SkillTree.java | 2 - .../rpg/common/skills/tree/SkillType.java | 4 +- .../common/skills/types/AbstractSkill.java | 4 - .../rpg/common/skills/types/ActiveSkill.java | 4 - .../rpg/common/skills/types/ITargeted.java | 2 - .../rpg/common/skills/types/PassiveSkill.java | 2 - .../rpg/common/skills/types/ScriptSkill.java | 3 + .../neumimto/rpg/common/utils/FileUtils.java | 4 +- .../cz/neumimto/rpg/common/utils/Pair.java | 2 - .../neumimto/rpg/common/utils/TrigMath.java | 7 +- .../utils/rng/PseudoRandomDistribution.java | 2 - .../core_localization_en.properties | 2 - .../assets/nt-rpg/templates/Effect.md | 7 -- .../resources/assets/nt-rpg/templates/SE.md | 10 -- .../assets/nt-rpg/templates/Skill.md | 13 -- .../assets/nt-rpg/templates/function.md | 13 -- .../cz/neumimto/rpg/AdminCommandTests.java | 10 +- .../neumimto/rpg/CharacterCommandTests.java | 12 +- .../neumimto/rpg/ClassDefinitionDaoTest.java | 8 +- .../cz/neumimto/rpg/DamageServiceTest.java | 2 +- .../cz/neumimto/rpg/EffectServiceTest.java | 2 +- .../java/cz/neumimto/rpg/EffectTests.java | 7 +- .../java/cz/neumimto/rpg/ItemStringTest.java | 12 +- .../cz/neumimto/rpg/ManaRegenerationTest.java | 6 +- .../cz/neumimto/rpg/SkillExecutionTests.java | 3 +- .../neumimto/rpg/SkillManipulationTests.java | 4 +- .../neumimto/rpg/SkillTreeLoadingTests.java | 4 +- .../src/test/java/cz/neumimto/rpg/Test.java | 2 +- .../java/cz/neumimto/rpg/TestApiImpl.java | 5 +- .../cz/neumimto/rpg/TestDamageService.java | 2 +- .../cz/neumimto/rpg/TestListenerScripts.java | 8 +- .../rpg/TestPropertyValueResolving.java | 2 +- .../rpg/TestScriptingComplexUsecase.java | 11 +- .../neumimto/rpg/TestSkillExecutorChain.java | 4 +- .../cz/neumimto/rpg/TestSkillService.java | 7 +- .../src/test/java/cz/neumimto/rpg/Tests.java | 4 +- .../neumimto/rpg/assets/TestAssetService.java | 2 +- .../neumimto/rpg/common/TestPartyService.java | 2 +- .../rpg/common/entity/TestCharacter.java | 2 +- .../rpg/common/impl/TestCharacterService.java | 6 +- .../rpg/common/impl/TestItemService.java | 7 +- .../inventory/InventoryHandlerTest.java | 4 +- .../inventory/TestInventoryService.java | 2 +- .../rpg/common/items/TestItemType.java | 2 +- .../rpg/common/skills/scripting/Sample.java | 4 +- .../scripting/Scr\303\255ptParserTests.java" | 6 +- .../rpg/effects/TestEffectService.java | 2 +- .../rpg/junit/CharactersExtension.java | 8 +- .../cz/neumimto/rpg/junit/TestDictionary.java | 2 +- .../neumimto/rpg/junit/TestGuiceModule.java | 49 ++++---- .../rpg/model/TimestampEntityTest.java | 2 - .../rpg/GlobalEffectAnnotationProcessor.java | 6 +- .../neumimto/rpg/nms117/CustomFirework.java | 3 +- .../cz/neumimto/rpg/nms117/NMSHandler.java | 2 +- Implementations/Spigot/build.gradle | 28 ++--- .../cz/neumimto/rpg/spigot/SpigotRpg.java | 2 +- .../neumimto/rpg/spigot/SpigotRpgPlugin.java | 4 +- .../rpg/spigot/assets/SpigotAssetService.java | 2 +- .../bridges/HolographicDisplaysExpansion.java | 2 +- .../mmoitems/MMOItemWrapperFactory.java | 2 +- .../mythicalmobs/MythicalMobsExpansion.java | 2 +- .../MythicalMobsWrapperFactory.java | 2 +- .../spigot/commands/SpigotAdminCommands.java | 4 +- .../commands/SpigotCharacterCommands.java | 2 +- .../spigot/damage/SpigotDamageService.java | 2 +- .../spigot/effects/SpigotEffectService.java | 2 +- .../effects/common/FireResistanceEffect.java | 1 - .../spigot/effects/common/FlickerEffect.java | 2 +- .../effects/common/InvisibilityEffect.java | 6 +- .../rpg/spigot/effects/common/Maim.java | 2 +- .../effects/common/ManaShieldEffect.java | 1 - .../rpg/spigot/effects/common/SlowEffect.java | 6 +- .../rpg/spigot/effects/common/StunEffect.java | 6 +- .../spigot/effects/common/UnhealEffect.java | 1 - .../common/def/BossBarExpNotifier.java | 6 +- .../effects/common/def/ManaBarBossBar.java | 6 +- .../effects/common/def/ManaBarText.java | 6 +- .../spigot/entities/SpigotEntityService.java | 2 +- .../rpg/spigot/entities/SpigotMob.java | 2 +- .../configuration/SpigotMobSettingsDao.java | 2 +- .../entities/players/SpigotCharacter.java | 2 +- .../players/SpigotCharacterService.java | 6 +- .../players/SpigotPreloadCharacter.java | 4 +- .../players/party/SpigotPartyService.java | 2 +- .../rpg/spigot/events/SpigotEventFactory.java | 2 +- .../skill/SpigotSkillTargetAttemptEvent.java | 1 - .../rpg/spigot/gui/SpellbookListener.java | 1 - .../rpg/spigot/gui/SpigotGuiHelper.java | 2 +- .../rpg/spigot/gui/SpigotUIReader.java | 4 +- .../inventory/SpigotInventoryService.java | 10 +- .../spigot/inventory/SpigotItemService.java | 6 +- .../listeners/SpigotDamageListener.java | 4 +- .../listeners/SpigotInventoryListener.java | 6 +- .../listeners/skillbinds/OnKeyPress.java | 2 +- .../resources/SpigotResourceManager.java | 2 +- .../spigot/scripting/mechanics/Particles.java | 10 +- .../mechanics/SpigotEntityUtils.java | 6 +- .../neumimto/rpg/spigot/skills/Battery.java | 2 +- .../rpg/spigot/skills/FireBreath.java | 4 +- .../rpg/spigot/skills/FireRemnant.java | 8 +- .../rpg/spigot/skills/GlacialCascade.java | 2 +- .../cz/neumimto/rpg/spigot/skills/Slash.java | 1 - .../cz/neumimto/rpg/spigot/skills/Soar.java | 5 +- .../rpg/spigot/skills/SpigotSkillService.java | 11 +- .../rpg/spigot/skills/TargetedBlockSkill.java | 1 - .../spigot/skills/TargetedEntitySkill.java | 1 - .../rpg/spigot/skills/utils/Beam.java | 72 +++++------ .../skills/utils/MutableBoundingBox.java | 30 ++--- .../cz/neumimto/rpg/spigot/SpigotTests.java | 2 +- .../cz/neumimto/persistence/TestHelper.java | 4 +- .../java/cz/neumimto/rpg/common/RpgTests.java | 7 +- .../jdbc/JDBCersistenceHandler.java | 4 +- .../persistence/jdbc/dao/JdbcPlayerDao.java | 4 +- .../jdbc/migrations/DbMigrationsService.java | 2 +- .../flatfiles/converters/ConfigConverter.java | 2 +- .../converters/ConfigConverterTest.java | 5 +- README.md | 5 +- build.gradle | 2 +- gradle.properties | 6 +- 195 files changed, 477 insertions(+), 757 deletions(-) delete mode 100644 Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/JsBinding.java delete mode 100644 Common/src/main/resources/assets/nt-rpg/templates/Effect.md delete mode 100644 Common/src/main/resources/assets/nt-rpg/templates/SE.md delete mode 100644 Common/src/main/resources/assets/nt-rpg/templates/Skill.md delete mode 100644 Common/src/main/resources/assets/nt-rpg/templates/function.md diff --git a/.run/RunServer.run.xml b/.run/RunServer.run.xml index 39a7d483b..bc371705a 100644 --- a/.run/RunServer.run.xml +++ b/.run/RunServer.run.xml @@ -1,10 +1,10 @@ - - + + \ No newline at end of file diff --git a/Bootstrap/Common/build.gradle b/Bootstrap/Common/build.gradle index 420a771c3..487288650 100644 --- a/Bootstrap/Common/build.gradle +++ b/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 } \ No newline at end of file diff --git a/Bootstrap/Common/src/main/java/cz/neumimto/rpg/NtRpgBootstrap.java b/Bootstrap/Common/src/main/java/cz/neumimto/rpg/NtRpgBootstrap.java index 97cd7114f..5da75764c 100644 --- a/Bootstrap/Common/src/main/java/cz/neumimto/rpg/NtRpgBootstrap.java +++ b/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(); } diff --git a/Bootstrap/Spigot/build.gradle b/Bootstrap/Spigot/build.gradle index f8f02a0f3..b0f157b1e 100644 --- a/Bootstrap/Spigot/build.gradle +++ b/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" + } } } \ No newline at end of file diff --git a/Bootstrap/Spigot/src/main/java/cz/neumimto/rpg/SpigotRpgBootstrap.java b/Bootstrap/Spigot/src/main/java/cz/neumimto/rpg/SpigotRpgBootstrap.java index b033a63b0..bf89886c3 100644 --- a/Bootstrap/Spigot/src/main/java/cz/neumimto/rpg/SpigotRpgBootstrap.java +++ b/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") diff --git a/Bootstrap/Spigot/src/test/java/cz/neumimto/rpg/Tests.java b/Bootstrap/Spigot/src/test/java/cz/neumimto/rpg/Tests.java index 8030db3c2..76336834e 100644 --- a/Bootstrap/Spigot/src/test/java/cz/neumimto/rpg/Tests.java +++ b/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(); } } diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 24bafa1ee..89609b243 100644 --- a/CODE_OF_CONDUCT.md +++ b/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. \ No newline at end of file +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. \ No newline at end of file diff --git a/Common/build.gradle b/Common/build.gradle index cdaf56f62..9377238bb 100644 --- a/Common/build.gradle +++ b/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 \ No newline at end of file diff --git a/Common/src/main/java/cz/neumimto/rpg/common/AbstractRpgGuiceModule.java b/Common/src/main/java/cz/neumimto/rpg/common/AbstractRpgGuiceModule.java index 11bf2d29c..1be17109f 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/AbstractRpgGuiceModule.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/ResourceManagerImpl.java b/Common/src/main/java/cz/neumimto/rpg/common/ResourceManagerImpl.java index f9d026699..d76985aa4 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/ResourceManagerImpl.java +++ b/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.*; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/classes/ClassService.java b/Common/src/main/java/cz/neumimto/rpg/common/classes/ClassService.java index 38e25a92a..fb0c0a918 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/classes/ClassService.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/commands/ACFBootstrap.java b/Common/src/main/java/cz/neumimto/rpg/common/commands/ACFBootstrap.java index d6549bafe..8c75e2406 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/commands/ACFBootstrap.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/commands/AdminCommands.java b/Common/src/main/java/cz/neumimto/rpg/common/commands/AdminCommands.java index 4ed654a5a..48e138cf3 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/commands/AdminCommands.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/commands/CharacterCommandFacade.java b/Common/src/main/java/cz/neumimto/rpg/common/commands/CharacterCommandFacade.java index 859aae5f9..dde1b6da9 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/commands/CharacterCommandFacade.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/commands/SkillsCommandFacade.java b/Common/src/main/java/cz/neumimto/rpg/common/commands/SkillsCommandFacade.java index 6c4796146..7ee0514a1 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/commands/SkillsCommandFacade.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/commands/SkilltreeCommands.java b/Common/src/main/java/cz/neumimto/rpg/common/commands/SkilltreeCommands.java index ad08fb322..81ae38a65 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/commands/SkilltreeCommands.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/configuration/SkillTreeLoaderImpl.java b/Common/src/main/java/cz/neumimto/rpg/common/configuration/SkillTreeLoaderImpl.java index b1d6940b6..1c39a81ed 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/configuration/SkillTreeLoaderImpl.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/ClassDependencyGraphAdapter.java b/Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/ClassDependencyGraphAdapter.java index 3aa57f6eb..5bdf7656b 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/ClassDependencyGraphAdapter.java +++ b/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 set) { - List soft = readOrEmpty(value,"Soft"); - List hard = readOrEmpty(value,"Hard"); - List conflicts = readOrEmpty(value,"Conflicts"); + List soft = readOrEmpty(value, "Soft"); + List hard = readOrEmpty(value, "Hard"); + List conflicts = readOrEmpty(value, "Conflicts"); DependencyGraph graph = classDef.getClassDependencyGraph(); diff --git a/Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/DimExperiencesAdapter.java b/Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/DimExperiencesAdapter.java index de2231213..3d17e87b2 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/DimExperiencesAdapter.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/configuration/adapters/DimExperiencesAdapter.java @@ -19,7 +19,7 @@ public Map> convertToField(Config value) { Map 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); } diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/AllSkillsBonus.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/AllSkillsBonus.java index 07127ecbc..95c4e8b4a 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/AllSkillsBonus.java +++ b/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 { diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectBase.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectBase.java index 795c4f6b6..a982b43ac 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectBase.java +++ b/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; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectService.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectService.java index 2279ad2c7..a17088df7 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectService.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectService.java @@ -1,21 +1,14 @@ package cz.neumimto.rpg.common.effects; import cz.neumimto.rpg.common.Rpg; -import cz.neumimto.rpg.common.effects.model.EffectModelFactory; +import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.entity.IEffectConsumer; import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.skills.SkillService; -import cz.neumimto.rpg.common.skills.ISkill; -import cz.neumimto.rpg.common.skills.SkillSettings; -import cz.neumimto.rpg.common.assets.AssetService; import javax.inject.Inject; import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.nio.file.Files; -import java.nio.file.StandardOpenOption; import java.util.*; import java.util.function.Consumer; @@ -394,71 +387,6 @@ public void load() { file.delete(); } - try { - StringBuilder finalString = new StringBuilder(); - file.createNewFile(); - String template = assetService.getAssetAsString("templates/Effect.md"); - for (Map.Entry effect : globalEffects.entrySet()) { - Class aClass = effect.getValue().asEffectClass(); - if (aClass != null && aClass.isAnnotationPresent(Generate.class)) { - Generate meta = (Generate) aClass.getAnnotation(Generate.class); - String description = meta.description(); - String name = effect.getKey(); - - Class modelType = EffectModelFactory.getModelType(aClass); - - String s = new String(template); - s = s.replaceAll("\\{\\{effect\\.name}}", name); - s = s.replaceAll("\\{\\{effect\\.description}}", description); - - if (EffectModelFactory.getTypeMappers().containsKey(modelType)) { - s = s.replaceAll("\\{\\{effect\\.parameter}}", modelType.getSimpleName()); - s = s.replaceAll("\\{\\{effect\\.parameters}}", ""); - } else if (modelType == null) { - s = s.replaceAll("\\{\\{effect\\.parameter}}", ""); - s = s.replaceAll("\\{\\{effect\\.parameters}}", ""); - } else { - Field[] fields = modelType.getFields(); - s = s.replaceAll("\\{\\{effect\\.parameter}}", ""); - StringBuilder buffer = new StringBuilder(); - for (Field field : fields) { - String fname = field.getName(); - String type = field.getType().getSimpleName(); - buffer.append(" * ").append(fname).append(" - ").append(type).append("\n\n"); - } - s = s.replaceAll("\\{\\{effect\\.parameters}}", buffer.toString()); - } - finalString.append(s); - } - } - - template = assetService.getAssetAsString("templates/Skill.md"); - StringBuilder skills = new StringBuilder(); - for (ISkill iSkill : skillService.getAll()) { - - String damageType = iSkill.getDamageType(); - String s = new String(template); - s = s.replaceAll("\\{\\{skill\\.damageType}}", damageType == null ? "Deals no damage" : damageType); - - String id = iSkill.getId(); - s = s.replaceAll("\\{\\{skill\\.id}}", id); - - SkillSettings defaultSkillSettings = iSkill.getDefaultSkillSettings(); - - StringBuilder buffer = new StringBuilder(); - for (Map.Entry stringFloatEntry : defaultSkillSettings.getNodes().entrySet()) { - buffer.append(" * ").append(stringFloatEntry.getKey()).append("\n\n"); - } - s = s.replaceAll("\\{\\{skill\\.parameters}}", buffer.toString()); - skills.append(s); - } - template = assetService.getAssetAsString("templates/SE.md"); - - Files.write(file.toPath(), template.replaceAll("\\{\\{effects}}", finalString.toString()) - .replaceAll("\\{\\{skills}}", skills.toString()).getBytes(), StandardOpenOption.APPEND); - } catch (IOException e) { - e.printStackTrace(); - } } public abstract void startEffectScheduler(); diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectStatusType.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectStatusType.java index a3b591f75..6f4a93363 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectStatusType.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/effects/EffectStatusType.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.effects; /** diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/IEffect.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/IEffect.java index 1381ac01c..91a21cb0d 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/IEffect.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/effects/IEffect.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.effects; import cz.neumimto.rpg.common.IRpgElement; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/IGlobalEffect.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/IGlobalEffect.java index b3892f592..955bade75 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/IGlobalEffect.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/effects/IGlobalEffect.java @@ -1,16 +1,12 @@ - - package cz.neumimto.rpg.common.effects; import cz.neumimto.rpg.common.entity.IEffectConsumer; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; import java.util.Map; /** * Created by NeumimTo. */ -@JsBinding(JsBinding.Type.CLASS) public interface IGlobalEffect { T construct(IEffectConsumer consumer, long duration, Map data); diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/InternalEffectSourceProvider.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/InternalEffectSourceProvider.java index 9f273a333..2211a8697 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/InternalEffectSourceProvider.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/effects/InternalEffectSourceProvider.java @@ -1,11 +1,9 @@ package cz.neumimto.rpg.common.effects; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; /** * Created by ja on 1.4.2017. */ -@JsBinding(JsBinding.Type.CLASS) public enum InternalEffectSourceProvider implements IEffectSourceProvider { INSTANCE { @Override diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/core/CombatEffect.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/core/CombatEffect.java index a401efca0..82d1fb457 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/core/CombatEffect.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/effects/core/CombatEffect.java @@ -1,8 +1,8 @@ package cz.neumimto.rpg.common.effects.core; +import cz.neumimto.rpg.common.effects.CoreEffectTypes; import cz.neumimto.rpg.common.effects.EffectBase; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; -import cz.neumimto.rpg.common.effects.CoreEffectTypes; import java.lang.ref.WeakReference; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/effects/core/DefaultManaRegeneration.java b/Common/src/main/java/cz/neumimto/rpg/common/effects/core/DefaultManaRegeneration.java index aa9e6ced3..dee3bec05 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/effects/core/DefaultManaRegeneration.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/effects/core/DefaultManaRegeneration.java @@ -1,16 +1,12 @@ package cz.neumimto.rpg.common.effects.core; import cz.neumimto.rpg.common.Rpg; -import cz.neumimto.rpg.common.effects.EffectBase; -import cz.neumimto.rpg.common.effects.EffectStatusType; -import cz.neumimto.rpg.common.effects.Generate; -import cz.neumimto.rpg.common.effects.IEffect; +import cz.neumimto.rpg.common.effects.*; import cz.neumimto.rpg.common.entity.CommonProperties; import cz.neumimto.rpg.common.entity.IEffectConsumer; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.events.character.CharacterManaRegainEvent; import cz.neumimto.rpg.common.gui.Gui; -import cz.neumimto.rpg.common.effects.CoreEffectTypes; /** * Created by NeumimTo on 9.8.2015. diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/AbstractEntityService.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/AbstractEntityService.java index 9f3867666..07247a40d 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/AbstractEntityService.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/AbstractEntityService.java @@ -3,10 +3,10 @@ import cz.neumimto.rpg.common.IRpgElement; import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.effects.EffectService; -import cz.neumimto.rpg.common.entity.players.CharacterService; -import cz.neumimto.rpg.common.events.skill.SkillHealEvent; import cz.neumimto.rpg.common.entity.configuration.MobSettingsDao; import cz.neumimto.rpg.common.entity.configuration.MobsConfig; +import cz.neumimto.rpg.common.entity.players.CharacterService; +import cz.neumimto.rpg.common.events.skill.SkillHealEvent; import javax.inject.Inject; import java.util.HashMap; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/CommonProperties.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/CommonProperties.java index cb81194e4..f99504477 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/CommonProperties.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/CommonProperties.java @@ -1,9 +1,9 @@ package cz.neumimto.rpg.common.entity; import com.google.auto.service.AutoService; -import cz.neumimto.rpg.common.services.IPropertyContainer; import cz.neumimto.rpg.common.properties.Property; import cz.neumimto.rpg.common.properties.PropertyContainer; +import cz.neumimto.rpg.common.services.IPropertyContainer; @PropertyContainer @AutoService(IPropertyContainer.class) diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/IEffectConsumer.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/IEffectConsumer.java index cbf9e2bdc..05be3109f 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/IEffectConsumer.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/IEffectConsumer.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.entity; import cz.neumimto.rpg.common.effects.EffectContainer; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/IReservable.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/IReservable.java index 4add51cb7..58d597191 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/IReservable.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/IReservable.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.entity; /** diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/PropertyService.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/PropertyService.java index 76f938226..038d886b9 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/PropertyService.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/PropertyService.java @@ -3,13 +3,13 @@ import com.electronwill.nightconfig.core.conversion.ObjectConverter; import com.electronwill.nightconfig.core.file.FileConfig; import cz.neumimto.rpg.common.Rpg; +import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.configuration.AttributeConfig; import cz.neumimto.rpg.common.configuration.Attributes; import cz.neumimto.rpg.common.items.ItemService; import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.common.properties.Property; import cz.neumimto.rpg.common.utils.Console; -import cz.neumimto.rpg.common.assets.AssetService; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/UserActionType.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/UserActionType.java index 6ed820dd0..1d8589675 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/UserActionType.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/UserActionType.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.entity; /** diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/ActiveCharacter.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/ActiveCharacter.java index 5108e5db5..826fb0338 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/ActiveCharacter.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/ActiveCharacter.java @@ -18,9 +18,9 @@ import cz.neumimto.rpg.common.skills.IPlayerSkillHandler; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; +import cz.neumimto.rpg.common.skills.PlayerSkillHandlers; import cz.neumimto.rpg.common.skills.preprocessors.InterruptableSkillPreprocessor; import cz.neumimto.rpg.common.skills.tree.SkillTreeSpecialization; -import cz.neumimto.rpg.common.skills.PlayerSkillHandlers; import cz.neumimto.rpg.common.skills.types.ItemAccessSkill; import it.unimi.dsi.fastutil.objects.Object2DoubleOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/CharacterService.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/CharacterService.java index f646089fc..b8cdcd1e8 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/CharacterService.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/CharacterService.java @@ -9,7 +9,12 @@ import cz.neumimto.rpg.common.damage.DamageService; import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.IEffectContainer; -import cz.neumimto.rpg.common.entity.*; +import cz.neumimto.rpg.common.effects.core.ClickComboActionComponent; +import cz.neumimto.rpg.common.effects.core.CombatEffect; +import cz.neumimto.rpg.common.entity.CommonProperties; +import cz.neumimto.rpg.common.entity.EntityService; +import cz.neumimto.rpg.common.entity.PropertyService; +import cz.neumimto.rpg.common.entity.UserActionType; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; import cz.neumimto.rpg.common.entity.players.classes.DependencyGraph; import cz.neumimto.rpg.common.entity.players.classes.PlayerClassData; @@ -22,19 +27,17 @@ 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.*; +import cz.neumimto.rpg.common.permissions.PermissionService; +import cz.neumimto.rpg.common.persistance.dao.ICharacterClassDao; +import cz.neumimto.rpg.common.persistance.dao.IPersistenceHandler; +import cz.neumimto.rpg.common.persistance.dao.IPlayerDao; import cz.neumimto.rpg.common.skills.*; import cz.neumimto.rpg.common.skills.tree.SkillTree; import cz.neumimto.rpg.common.skills.tree.SkillTreeSpecialization; import cz.neumimto.rpg.common.utils.ActionResult; import cz.neumimto.rpg.common.utils.DebugLevel; import cz.neumimto.rpg.common.utils.MathUtils; -import cz.neumimto.rpg.common.effects.core.ClickComboActionComponent; -import cz.neumimto.rpg.common.effects.core.CombatEffect; -import cz.neumimto.rpg.common.persistance.dao.ICharacterClassDao; -import cz.neumimto.rpg.common.persistance.dao.IPersistenceHandler; -import cz.neumimto.rpg.common.persistance.dao.IPlayerDao; import cz.neumimto.rpg.common.utils.exceptions.MissingConfigurationException; import javax.inject.Inject; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/IActiveCharacter.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/IActiveCharacter.java index e66c9cd41..ebeb385a5 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/IActiveCharacter.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/IActiveCharacter.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.entity.players; import cz.neumimto.rpg.common.configuration.AttributeConfig; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/PreloadCharacter.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/PreloadCharacter.java index 2c684e2d1..50e28ef0d 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/PreloadCharacter.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/PreloadCharacter.java @@ -5,6 +5,7 @@ import cz.neumimto.rpg.common.effects.IEffectContainer; import cz.neumimto.rpg.common.entity.EntityHand; import cz.neumimto.rpg.common.entity.IReservable; +import cz.neumimto.rpg.common.entity.PropertyService; 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.party.IParty; @@ -17,7 +18,6 @@ import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.preprocessors.InterruptableSkillPreprocessor; import cz.neumimto.rpg.common.skills.tree.SkillTreeSpecialization; -import cz.neumimto.rpg.common.entity.PropertyService; import java.util.*; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/classes/PlayerClassData.java b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/classes/PlayerClassData.java index 43add55c7..8c837cd2e 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/entity/players/classes/PlayerClassData.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/entity/players/classes/PlayerClassData.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.entity.players.classes; import cz.neumimto.rpg.common.entity.players.leveling.ILevelProgression; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/EventFactoryService.java b/Common/src/main/java/cz/neumimto/rpg/common/events/EventFactoryService.java index 1603cd500..88e3f1c72 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/EventFactoryService.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/EventFactoryService.java @@ -2,7 +2,6 @@ import cz.neumimto.nts.annotations.ScriptMeta; -import java.beans.EventHandler; import java.util.function.Supplier; public interface EventFactoryService { diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterManaRegainEvent.java b/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterManaRegainEvent.java index 14f8530d5..d28436fc4 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterManaRegainEvent.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterManaRegainEvent.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.events.character; import cz.neumimto.rpg.common.IRpgElement; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillLearnAttemptEvent.java b/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillLearnAttemptEvent.java index c7c69acbc..49ae87a03 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillLearnAttemptEvent.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillLearnAttemptEvent.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.events.character; import cz.neumimto.rpg.common.events.skill.SkillEvent; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillRefundAttemptEvent.java b/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillRefundAttemptEvent.java index eaff960b5..7d38b68d7 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillRefundAttemptEvent.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillRefundAttemptEvent.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.events.character; import cz.neumimto.rpg.common.events.skill.SkillEvent; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillUpgradeEvent.java b/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillUpgradeEvent.java index 305e5f370..64f24d0db 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillUpgradeEvent.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/character/CharacterSkillUpgradeEvent.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.events.character; import cz.neumimto.rpg.common.events.skill.SkillEvent; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/character/EventCharacterArmorPostUpdate.java b/Common/src/main/java/cz/neumimto/rpg/common/events/character/EventCharacterArmorPostUpdate.java index 715f345e7..48f69adcc 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/character/EventCharacterArmorPostUpdate.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/character/EventCharacterArmorPostUpdate.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.events.character; import cz.neumimto.rpg.common.items.RpgItemType; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillHealEvent.java b/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillHealEvent.java index 7290e818a..ed6ef4578 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillHealEvent.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillHealEvent.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.events.skill; import cz.neumimto.rpg.common.IRpgElement; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillPostUsageEvent.java b/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillPostUsageEvent.java index 0e3f67522..cea82fc0d 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillPostUsageEvent.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillPostUsageEvent.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.events.skill; import cz.neumimto.rpg.common.entity.IEntity; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillPreUsageEvent.java b/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillPreUsageEvent.java index 2a5d736e5..0c6d25d00 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillPreUsageEvent.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/events/skill/SkillPreUsageEvent.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.events.skill; import cz.neumimto.rpg.common.entity.IEntity; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/gui/Gui.java b/Common/src/main/java/cz/neumimto/rpg/common/gui/Gui.java index 0333fd3b6..3a8f76cea 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/gui/Gui.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/gui/Gui.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.gui; import com.google.inject.Singleton; @@ -10,13 +8,11 @@ import cz.neumimto.rpg.common.entity.players.classes.PlayerClassData; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.skills.PlayerSkillContext; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; import cz.neumimto.rpg.common.skills.tree.SkillTree; /** * Created by NeumimTo on 12.2.2015. */ -@JsBinding(JsBinding.Type.CLASS) @Singleton public class Gui { diff --git a/Common/src/main/java/cz/neumimto/rpg/common/gui/IPlayerMessage.java b/Common/src/main/java/cz/neumimto/rpg/common/gui/IPlayerMessage.java index 04da86a42..09ab0f549 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/gui/IPlayerMessage.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/gui/IPlayerMessage.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.gui; import cz.neumimto.rpg.common.Rpg; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/inventory/AbstractInventoryService.java b/Common/src/main/java/cz/neumimto/rpg/common/inventory/AbstractInventoryService.java index 51f13ce96..6fc831efc 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/inventory/AbstractInventoryService.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/inventory/AbstractInventoryService.java @@ -3,6 +3,7 @@ import com.electronwill.nightconfig.core.Config; import com.electronwill.nightconfig.core.file.FileConfig; import cz.neumimto.rpg.common.Rpg; +import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.entity.EntityHand; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.items.ItemService; @@ -10,7 +11,6 @@ import cz.neumimto.rpg.common.items.subtypes.ItemSubtypes; import cz.neumimto.rpg.common.permissions.PermissionService; import cz.neumimto.rpg.common.utils.Console; -import cz.neumimto.rpg.common.assets.AssetService; import javax.inject.Inject; import java.io.File; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/inventory/InventoryHandler.java b/Common/src/main/java/cz/neumimto/rpg/common/inventory/InventoryHandler.java index aa843acb9..2febfa0c2 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/inventory/InventoryHandler.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/inventory/InventoryHandler.java @@ -1,7 +1,10 @@ package cz.neumimto.rpg.common.inventory; import cz.neumimto.rpg.common.configuration.AttributeConfig; -import cz.neumimto.rpg.common.effects.*; +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.entity.players.CharacterService; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.items.ItemService; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/items/AbstractItemService.java b/Common/src/main/java/cz/neumimto/rpg/common/items/AbstractItemService.java index 926f2489e..bb757c1ac 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/items/AbstractItemService.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/items/AbstractItemService.java @@ -4,8 +4,10 @@ import com.typesafe.config.ConfigException; import com.typesafe.config.ConfigFactory; import cz.neumimto.rpg.common.Rpg; +import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.configuration.AttributeConfig; import cz.neumimto.rpg.common.configuration.ItemString; +import cz.neumimto.rpg.common.entity.PropertyService; 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; @@ -13,8 +15,6 @@ import cz.neumimto.rpg.common.items.subtypes.ItemSubtype; 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.entity.PropertyService; import cz.neumimto.rpg.common.utils.Wildcards; import javax.inject.Inject; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/logging/Log.java b/Common/src/main/java/cz/neumimto/rpg/common/logging/Log.java index 4c79143b6..97645ce1a 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/logging/Log.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/logging/Log.java @@ -3,6 +3,7 @@ import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.utils.DebugLevel; + import java.util.logging.Level; import java.util.logging.Logger; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/persistance/model/CharacterBaseImpl.java b/Common/src/main/java/cz/neumimto/rpg/common/persistance/model/CharacterBaseImpl.java index 82d34a7dc..301d34290 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/persistance/model/CharacterBaseImpl.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/persistance/model/CharacterBaseImpl.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.persistance.model; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/persistance/model/TimestampEntityImpl.java b/Common/src/main/java/cz/neumimto/rpg/common/persistance/model/TimestampEntityImpl.java index 665653f5b..c70b82f36 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/persistance/model/TimestampEntityImpl.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/persistance/model/TimestampEntityImpl.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.persistance.model; import cz.neumimto.rpg.common.model.TimestampEntity; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/properties/Property.java b/Common/src/main/java/cz/neumimto/rpg/common/properties/Property.java index 3a61ac8fe..c451eec44 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/properties/Property.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/properties/Property.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.properties; import java.lang.annotation.ElementType; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/properties/PropertyContainer.java b/Common/src/main/java/cz/neumimto/rpg/common/properties/PropertyContainer.java index c9e61d9d6..39f77f5e2 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/properties/PropertyContainer.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/properties/PropertyContainer.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.properties; import java.lang.annotation.Retention; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/scripting/NTScriptEngine.java b/Common/src/main/java/cz/neumimto/rpg/common/scripting/NTScriptEngine.java index 233c7864b..878938fb3 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/scripting/NTScriptEngine.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/scripting/NTScriptEngine.java @@ -1,16 +1,13 @@ package cz.neumimto.rpg.common.scripting; import com.google.inject.Injector; -import com.google.inject.Key; import cz.neumimto.nts.NTScript; -import cz.neumimto.nts.annotations.ScriptMeta; import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.effects.IEffect; import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.common.scripting.mechanics.NTScriptProxy; import cz.neumimto.rpg.common.skills.SkillResult; -import cz.neumimto.rpg.common.skills.types.ScriptSkill; import javax.inject.Inject; import javax.inject.Singleton; @@ -36,10 +33,10 @@ public class NTScriptEngine { public List STL = new ArrayList<>(); public NTScript prepareCompiler(Consumer builder, Class type) { - if (!compilers.containsKey(type)) { - compilers.put(type, scriptContextForSkills(builder, type)); - } - return compilers.get(type); + if (!compilers.containsKey(type)) { + compilers.put(type, scriptContextForSkills(builder, type)); + } + return compilers.get(type); } public NTScript scriptContextForSkills(Consumer builder, Class type) { @@ -47,10 +44,10 @@ public NTScript scriptContextForSkills(Consumer builder, Class Map macrosMap = new HashMap<>(); try (BufferedReader bufReader = new BufferedReader(new StringReader(macros))) { - String line=null; - while((line=bufReader.readLine()) != null) { + String line = null; + while ((line = bufReader.readLine()) != null) { String[] split = line.split(";;"); - macrosMap.put(Pattern.compile(split[0]),split[1]); + macrosMap.put(Pattern.compile(split[0]), split[1]); } } catch (IOException e) { e.printStackTrace(); @@ -80,7 +77,7 @@ public List getStl() { //instances ServiceLoader.load(NTScriptProxy.class, getClass().getClassLoader()).stream() .map(ServiceLoader.Provider::get) - .forEach(a-> list.add(injector.getInstance(a.getClass()))); + .forEach(a -> list.add(injector.getInstance(a.getClass()))); //types try { diff --git a/Common/src/main/java/cz/neumimto/rpg/common/scripting/SkillScriptHandlers.java b/Common/src/main/java/cz/neumimto/rpg/common/scripting/SkillScriptHandlers.java index 6c5cb09ab..86feaae12 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/scripting/SkillScriptHandlers.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/scripting/SkillScriptHandlers.java @@ -6,7 +6,8 @@ import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillResult; -import static cz.neumimto.nts.annotations.ScriptMeta.*; +import static cz.neumimto.nts.annotations.ScriptMeta.NamedParam; +import static cz.neumimto.nts.annotations.ScriptMeta.ScriptTarget; public interface SkillScriptHandlers { @@ -14,22 +15,22 @@ interface Active extends SkillScriptHandlers { @ScriptTarget SkillResult onCast(@NamedParam("caster") IActiveCharacter caster, @NamedParam("context") PlayerSkillContext context, - @NamedParam("this_skill")ISkill iSkill); + @NamedParam("this_skill") ISkill iSkill); } - interface Targetted extends SkillScriptHandlers { + interface Targetted extends SkillScriptHandlers { @ScriptTarget SkillResult castOnTarget(@NamedParam("caster") IActiveCharacter caster, @NamedParam("context") PlayerSkillContext context, @NamedParam("target") IEntity target, - @NamedParam("this_skill")ISkill iSkill); + @NamedParam("this_skill") ISkill iSkill); } interface Passive extends SkillScriptHandlers { @ScriptTarget void init(@NamedParam("caster") IActiveCharacter caster, - @NamedParam("context") PlayerSkillContext context, - @NamedParam("this_skill")ISkill iSkill); + @NamedParam("context") PlayerSkillContext context, + @NamedParam("this_skill") ISkill iSkill); } } diff --git a/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/EffectsM.java b/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/EffectsM.java index b33fd160e..fb41cadf3 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/EffectsM.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/EffectsM.java @@ -1,7 +1,6 @@ package cz.neumimto.rpg.common.scripting.mechanics; import com.google.auto.service.AutoService; -import cz.neumimto.nts.annotations.ScriptMeta; import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.IEffect; import cz.neumimto.rpg.common.effects.IEffectContainer; @@ -25,9 +24,9 @@ public class EffectsM implements NTScriptProxy { public void applyEffect( @NamedParam("e|effect") IEffect effect, @NamedParam("s|source") IEffectSourceProvider provider, - @NamedParam("es|entity_source")IEntity entity - ) { - effectService.addEffect(effect,provider, entity); + @NamedParam("es|entity_source") IEntity entity + ) { + effectService.addEffect(effect, provider, entity); } @Function("remove_effect") diff --git a/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/EntitiesM.java b/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/EntitiesM.java index c3aeaba2c..64c2d0016 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/EntitiesM.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/EntitiesM.java @@ -30,16 +30,16 @@ public class EntitiesM implements NTScriptProxy { @Handler @Function("heal") public double heal(@NamedParam("e|entity") IEntity target, - @NamedParam("a|amount") float amount, - @NamedParam("s|source") IRpgElement skill) { + @NamedParam("a|amount") float amount, + @NamedParam("s|source") IRpgElement skill) { return entityService.healEntity(target, amount, skill); } @Handler @Function("regain_mana") public void regain_mana(@NamedParam("e|entity") IActiveCharacter target, - @NamedParam("a|amount") float amount, - @NamedParam("s|source") IRpgElement skill) { + @NamedParam("a|amount") float amount, + @NamedParam("s|source") IRpgElement skill) { characterService.gainMana(target, amount, skill); } diff --git a/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/SkillCommons.java b/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/SkillCommons.java index 2b44dd153..3b05a3b38 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/SkillCommons.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/scripting/mechanics/SkillCommons.java @@ -4,11 +4,7 @@ import cz.neumimto.nts.annotations.ScriptMeta.Function; import cz.neumimto.nts.annotations.ScriptMeta.Handler; import cz.neumimto.nts.annotations.ScriptMeta.NamedParam; -import cz.neumimto.rpg.common.entity.IEntity; -import cz.neumimto.rpg.common.entity.IEntityType; -import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.common.skills.PlayerSkillContext; -import jdk.jfr.Name; import java.util.concurrent.ThreadLocalRandom; import java.util.logging.Logger; @@ -47,7 +43,7 @@ public void print(@NamedParam("o|obj|var") Object o) { @Handler @Function("printd") - public void printd(@NamedParam("d|n")double d) { - logger.info(""+d); + public void printd(@NamedParam("d|n") double d) { + logger.info("" + d); } } diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/ISkill.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/ISkill.java index 4442c780f..f34442d35 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/ISkill.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/ISkill.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills; import com.typesafe.config.Config; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/ISkillNode.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/ISkillNode.java index aaf7c15e2..e0239561e 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/ISkillNode.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/ISkillNode.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/PlayerSkillContext.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/PlayerSkillContext.java index 81c01bea5..7bc95fb5d 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/PlayerSkillContext.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/PlayerSkillContext.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills; import cz.neumimto.rpg.common.Rpg; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/RepeatingSkill.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/RepeatingSkill.java index 5227d763e..6035ad46c 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/RepeatingSkill.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/RepeatingSkill.java @@ -3,7 +3,10 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigException; import cz.neumimto.rpg.common.Rpg; -import cz.neumimto.rpg.common.effects.*; +import cz.neumimto.rpg.common.effects.EffectBase; +import cz.neumimto.rpg.common.effects.EffectService; +import cz.neumimto.rpg.common.effects.IEffect; +import cz.neumimto.rpg.common.effects.IEffectContainer; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.skills.tree.SkillTree; import cz.neumimto.rpg.common.skills.types.ActiveSkill; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillData.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillData.java index 4c537f330..dfe0e8455 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillData.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillData.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillNodes.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillNodes.java index cbfd2d616..5b132e24e 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillNodes.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillNodes.java @@ -1,11 +1,9 @@ package cz.neumimto.rpg.common.skills; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; /** * Created by ja on 22.10.2016. */ -@JsBinding(JsBinding.Type.CLASS) public enum SkillNodes implements ISkillNode { DAMAGE("damage"), diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillResult.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillResult.java index 3b60d71eb..402e88fcb 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillResult.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillResult.java @@ -1,13 +1,9 @@ - - package cz.neumimto.rpg.common.skills; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; /** * Created by NeumimTo on 26.7.2015. */ -@JsBinding(JsBinding.Type.CLASS) public enum SkillResult { OK, FAIL, diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillService.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillService.java index 9954a2369..a9e6323f3 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillService.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillService.java @@ -190,7 +190,7 @@ public ISkill skillDefinitionToSkill(ScriptSkillModel scriptSkillModel, ClassLoa Log.info("Compiling nts script " + scriptSkillModel.id + " as " + c.getSimpleName()); - Class generate = ntScriptEngine.prepareCompiler(getNTSBuilderContext(),c) + Class generate = ntScriptEngine.prepareCompiler(getNTSBuilderContext(), c) .compile(scriptSkillModel.script); if (generate == null) { Log.error("Unable to generate script " + scriptSkillModel.id); @@ -300,25 +300,25 @@ private void loadSkillDefinitionFile(Config config, ClassLoader urlClassLoader) public void loadSkillDefinitions(ClassLoader urlClassLoader, SkillsDefinition definition) { if (definition.effects != null) { definition.effects.stream() - .peek(a-> Log.info("Compiling Effect " +a.id)) + .peek(a -> Log.info("Compiling Effect " + a.id)) .map(a -> EffectScriptGenerator.from(a, urlClassLoader)) .filter(Objects::nonNull) - .forEach(a->Rpg.get().getScriptEngine().STL.add(a)); + .forEach(a -> Rpg.get().getScriptEngine().STL.add(a)); } if (definition.skills != null) { definition.skills.stream() - .peek(a-> Log.info("Compiling Skill " +a.id)) + .peek(a -> Log.info("Compiling Skill " + a.id)) .map(a -> skillDefinitionToSkill(a, urlClassLoader)) .filter(Objects::nonNull) .forEach(this::registerAdditionalCatalog); } if (definition.listeners != null) { definition.listeners.stream() - .peek(a-> Log.info("Compiling Listener " +a.id)) - .map(a-> ListenerScriptGenerator.from(a, urlClassLoader)) + .peek(a -> Log.info("Compiling Listener " + a.id)) + .map(a -> ListenerScriptGenerator.from(a, urlClassLoader)) .filter(Objects::nonNull) - .map(a->injector.getInstance(a)) - .forEach(a->Rpg.get().registerListeners(a)); + .map(a -> injector.getInstance(a)) + .forEach(a -> Rpg.get().registerListeners(a)); } } diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillSettings.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillSettings.java index 29a99617f..df69452cd 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillSettings.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/SkillSettings.java @@ -1,9 +1,6 @@ - - package cz.neumimto.rpg.common.skills; import cz.neumimto.rpg.common.configuration.AttributeConfig; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; import java.util.Collections; import java.util.HashMap; @@ -12,7 +9,6 @@ /** * Created by NeumimTo on 14.2.2015. */ -@JsBinding(JsBinding.Type.CLASS) public class SkillSettings { private Map skillSettings = new HashMap<>(); @@ -21,19 +17,25 @@ public class SkillSettings { private Map attributeSettingsMap = new HashMap<>(); - /** use addExpression **/ + /** + * use addExpression + **/ @Deprecated public void addNode(ISkillNode n, float val) { addExpression(n.toString(), val); } - /** use addExpression **/ + /** + * use addExpression + **/ @Deprecated public void addNode(String n, float val) { addExpression(n, val); } - /** use addExpression **/ + /** + * use addExpression + **/ @Deprecated public void addNode(String n, String val) { addExpression(n, val); diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/reagents/HPCast.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/reagents/HPCast.java index 719f6537b..c219e460c 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/reagents/HPCast.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/reagents/HPCast.java @@ -3,7 +3,6 @@ import cz.neumimto.rpg.common.damage.DamageService; import cz.neumimto.rpg.common.entity.CommonProperties; import cz.neumimto.rpg.common.entity.EntityService; -import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillData; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/EffectScriptGenerator.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/EffectScriptGenerator.java index ceaef8b07..670ebb6b3 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/EffectScriptGenerator.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/EffectScriptGenerator.java @@ -2,7 +2,10 @@ import cz.neumimto.nts.annotations.ScriptMeta; import cz.neumimto.rpg.common.Rpg; -import cz.neumimto.rpg.common.effects.*; +import cz.neumimto.rpg.common.effects.EffectBase; +import cz.neumimto.rpg.common.effects.IEffect; +import cz.neumimto.rpg.common.effects.ScriptEffectBase; +import cz.neumimto.rpg.common.effects.UnstackableEffectBase; import net.bytebuddy.ByteBuddy; import net.bytebuddy.asm.AsmVisitorWrapper; import net.bytebuddy.description.annotation.AnnotationDescription; @@ -27,7 +30,6 @@ import net.bytebuddy.matcher.ElementMatchers; import net.bytebuddy.pool.TypePool; -import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -39,62 +41,54 @@ /** * Multiple classes are generated - * + *

* Assume input - * { - * Id: Test - * Fields: [ - * Num: numeric - * ] - * OnApply: """ - * @effect.Num=50 - * RETURN - * """ - * } - * Generates + * { + * Id: Test + * Fields: [ + * Num: numeric + * ] + * OnApply: """ * + * @effect.Num=50 RETURN + * """ + * } + * Generates + *

* 1) Effect base class - * - * @SimpleName("Test") - * public class Test{timestamp} extends UnstackableEffect { - * public double Num; - * public static Handler onApply; - * - * public void onApply(IEffect var1) { - * if (onApply != null) { - * onApply.run(this); - * } - * - * } - * - * @ScriptTarget - * public Test1637495972021() { - * super.effectName = "Test"; - * } + * @SimpleName("Test") public class Test{timestamp} extends UnstackableEffect { + * public double Num; + * public static Handler onApply; + *

+ * public void onApply(IEffect var1) { + * if (onApply != null) { + * onApply.run(this); * } - * + *

+ * } + * @ScriptTarget public Test1637495972021() { + * super.effectName = "Test"; + * } + * } + *

* 2) Handler proxy but with concrete generic type - * + *

* public interface Handler{timestamp} extends Handler { - * @ScriptTarget - * void run(@NamedParam("effect") Test{timestamp} var1); + * @ScriptTarget void run(@NamedParam("effect") Test{timestamp} var1); * } - * + *

* 3) OnApply method as implementation of proxy interface from step 2 - * - * @Singleton - * public class HandlerTest{timestamp} implements HandlerTest{timestamp} { - * public void run(Test{timestamp} var1) { - * var1.Num = 50.0D; - * } + * @Singleton public class HandlerTest{timestamp} implements HandlerTest{timestamp} { + * public void run(Test{timestamp} var1) { + * var1.Num = 50.0D; * } - * + * } + *

* This proxy implementation is also automatically initialized with guice injector and its reference is injected into the static field - * + *

* Test{timestamp}.OnApply = injector.newInstance(HandlerTest{timestamp}.class) - * + *

* The timestamps are part of all classnames to ensure easy reloading at runtime, im not reimplementing osgi, just throw away old refs - * */ public class EffectScriptGenerator { @@ -142,18 +136,18 @@ public ClassVisitor wrap(TypeDescription instrumentedType, ClassVisitor classVis Constructor c = null; bb = bb.constructor(ElementMatchers.isDefaultConstructor()) - .intercept(MethodCall.invoke(UnstackableEffectBase.class.getConstructor()) - .andThen(new Implementation.Simple(new ByteCodeAppender.Simple(Arrays.asList( - MethodVariableAccess.loadThis(), - new TextConstant(model.id), - FieldAccess.forField(new FieldDescription.ForLoadedField(effectName)).write(), - new StackManipulation.Simple((m, i) -> { - m.visitInsn(Opcodes.RETURN); - return new StackManipulation.Size(1,1); - })) - ))) - ) - .annotateMethod(AnnotationDescription.Builder.ofType(ScriptMeta.Handler.class).build()); + .intercept(MethodCall.invoke(UnstackableEffectBase.class.getConstructor()) + .andThen(new Implementation.Simple(new ByteCodeAppender.Simple(Arrays.asList( + MethodVariableAccess.loadThis(), + new TextConstant(model.id), + FieldAccess.forField(new FieldDescription.ForLoadedField(effectName)).write(), + new StackManipulation.Simple((m, i) -> { + m.visitInsn(Opcodes.RETURN); + return new StackManipulation.Size(1, 1); + })) + ))) + ) + .annotateMethod(AnnotationDescription.Builder.ofType(ScriptMeta.Handler.class).build()); if (model.onApply != null && !model.onApply.isBlank()) { bb = generateMethodBody("onApply", bb); @@ -242,7 +236,7 @@ private static DynamicType.Builder generateMethodBody(String new StackManipulation.Simple((m, i) -> { m.visitJumpInsn(Opcodes.IFNULL, label1); m.visitLabel(label2); - return new StackManipulation.Size(1,1); + return new StackManipulation.Size(1, 1); }), FieldAccess.forField(field).read(), MethodVariableAccess.loadThis(), @@ -250,7 +244,7 @@ private static DynamicType.Builder generateMethodBody(String new StackManipulation.Simple((m, i) -> { m.visitLabel(label1); m.visitInsn(Opcodes.RETURN); - return new StackManipulation.Size(1,1); + return new StackManipulation.Size(1, 1); }) )))); return bb; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/JsBinding.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/JsBinding.java deleted file mode 100644 index 1f6929516..000000000 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/JsBinding.java +++ /dev/null @@ -1,19 +0,0 @@ -package cz.neumimto.rpg.common.skills.scripting; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface JsBinding { - - Type value(); - - enum Type { - CLASS, - OBJECT, - CONTAINER - } -} diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/ScriptedSkillNodeDescription.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/ScriptedSkillNodeDescription.java index 9f543dfe3..40ca905fb 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/ScriptedSkillNodeDescription.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/scripting/ScriptedSkillNodeDescription.java @@ -25,12 +25,12 @@ public List getDescription(IActiveCharacter character) { simpleBindings.put("character", character); Arg arg = new Arg(); simpleBindings.put("arg", arg); - // try { - // Object o = Rpg.get().getScriptEngine().fn(function, simpleBindings); - //;.eval(function, simpleBindings); - // } catch (ScriptException e) { - // Log.error("Could not build skill node description", e); - // } + // try { + // Object o = Rpg.get().getScriptEngine().fn(function, simpleBindings); + //;.eval(function, simpleBindings); + // } catch (ScriptException e) { + // Log.error("Could not build skill node description", e); + // } return Rpg.get().getLocalizationService().translateRaw(template, arg); } diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/tree/SkillTree.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/tree/SkillTree.java index ba3368b2b..abc1f591e 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/tree/SkillTree.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/tree/SkillTree.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills.tree; import cz.neumimto.rpg.common.skills.SkillData; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/tree/SkillType.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/tree/SkillType.java index e3ccde1b0..03b13bad4 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/tree/SkillType.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/tree/SkillType.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills.tree; @@ -37,7 +35,7 @@ public enum SkillType implements ISkillType { CANNOT_BE_SELF_CASTED(UNDEFINED, "ntrpg:cannot_be_self_casted", "Cannot be self casted"), PROTECTION(TRUE, "ntrpg:protection", "Protection"), ILLUSION(FALSE, "ntrpg:illusion", "Illusion"), - BUFF(FALSE,"ntrpg:buff", "Buff"), + BUFF(FALSE, "ntrpg:buff", "Buff"), DAMAGE_CHECK_TARGET(TRUE, "ntrpg:damage_check_target", "Negative"), /** * Do not use this one in custom skills diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/AbstractSkill.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/AbstractSkill.java index 3cddec75a..2eff1048a 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/AbstractSkill.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/AbstractSkill.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills.types; import cz.neumimto.rpg.common.ResourceLoader; @@ -13,7 +11,6 @@ import cz.neumimto.rpg.common.skills.ISkillType; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillSettings; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; import cz.neumimto.rpg.common.utils.Console; import cz.neumimto.rpg.common.utils.DebugLevel; import cz.neumimto.rpg.common.utils.annotations.CatalogId; @@ -26,7 +23,6 @@ /** * Created by NeumimTo on 12.3.2015. */ -@JsBinding(JsBinding.Type.CLASS) public abstract class AbstractSkill implements ISkill { private static final String SKILL = "skill"; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ActiveSkill.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ActiveSkill.java index 64f72cc71..324f5df6d 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ActiveSkill.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ActiveSkill.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills.types; import com.google.inject.Inject; @@ -10,13 +8,11 @@ import cz.neumimto.rpg.common.skills.SkillExecutionType; import cz.neumimto.rpg.common.skills.SkillNodes; import cz.neumimto.rpg.common.skills.SkillResult; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; import cz.neumimto.rpg.common.skills.tree.SkillType; /** * Created by NeumimTo on 26.7.2015. */ -@JsBinding(JsBinding.Type.CLASS) public abstract class ActiveSkill extends AbstractSkill implements IActiveSkill { @Inject diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ITargeted.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ITargeted.java index 763a92bb4..a70ddc2ab 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ITargeted.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ITargeted.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills.types; import cz.neumimto.rpg.common.entity.IEntity; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/PassiveSkill.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/PassiveSkill.java index d62a8ceb0..ba3bd05dd 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/PassiveSkill.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/PassiveSkill.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.skills.types; import cz.neumimto.nts.annotations.ScriptMeta.NamedParam; diff --git a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ScriptSkill.java b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ScriptSkill.java index ffa3ee10d..1246391d7 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ScriptSkill.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/skills/types/ScriptSkill.java @@ -16,6 +16,7 @@ public interface ScriptSkill { ScriptSkillModel getModel(); void setModel(ScriptSkillModel model); + default void initFromModel() { setDamageType(getModel().damageType); setCatalogId(getModel().id); @@ -34,7 +35,9 @@ default void initFromModel() { void setCatalogId(String id); + void setDamageType(String type); + void addSkillType(ISkillType type); } diff --git a/Common/src/main/java/cz/neumimto/rpg/common/utils/FileUtils.java b/Common/src/main/java/cz/neumimto/rpg/common/utils/FileUtils.java index d35dac714..07804777e 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/utils/FileUtils.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/utils/FileUtils.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.utils; import com.electronwill.nightconfig.core.CommentedConfig; @@ -84,7 +82,7 @@ public static void deleteDirectory(File dir) { } public static void copyDirectory(File from, File to, Function copyFn) { - Path source = from.toPath(); + Path source = from.toPath(); Path target = to.toPath(); try { Files.walkFileTree(source, new SimpleFileVisitor<>() { diff --git a/Common/src/main/java/cz/neumimto/rpg/common/utils/Pair.java b/Common/src/main/java/cz/neumimto/rpg/common/utils/Pair.java index 38b477556..04c023011 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/utils/Pair.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/utils/Pair.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.common.utils; /** diff --git a/Common/src/main/java/cz/neumimto/rpg/common/utils/TrigMath.java b/Common/src/main/java/cz/neumimto/rpg/common/utils/TrigMath.java index 06705bdc0..c95ac2e7d 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/utils/TrigMath.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/utils/TrigMath.java @@ -1,12 +1,13 @@ package cz.neumimto.rpg.common.utils; public class TrigMath { - + private static final int SIN_BITS, SIN_MASK, SIN_COUNT; private static final double radFull, radToIndex; private static final double degFull, degToIndex; private static final double[] sin, cos; public static double PI = Math.PI; + static { SIN_BITS = 12; SIN_MASK = ~(-1 << SIN_BITS); @@ -26,8 +27,8 @@ public class TrigMath { } for (int i = 0; i < 360; i += 90) { - sin[(int) (i * degToIndex) & SIN_MASK] = Math.sin(i * Math.PI / 180.0); - cos[(int) (i * degToIndex) & SIN_MASK] = Math.cos(i * Math.PI / 180.0); + sin[(int) (i * degToIndex) & SIN_MASK] = Math.sin(i * Math.PI / 180.0); + cos[(int) (i * degToIndex) & SIN_MASK] = Math.cos(i * Math.PI / 180.0); } } diff --git a/Common/src/main/java/cz/neumimto/rpg/common/utils/rng/PseudoRandomDistribution.java b/Common/src/main/java/cz/neumimto/rpg/common/utils/rng/PseudoRandomDistribution.java index 841963cd9..e97f7430b 100644 --- a/Common/src/main/java/cz/neumimto/rpg/common/utils/rng/PseudoRandomDistribution.java +++ b/Common/src/main/java/cz/neumimto/rpg/common/utils/rng/PseudoRandomDistribution.java @@ -1,13 +1,11 @@ package cz.neumimto.rpg.common.utils.rng; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; import static java.lang.Math.*; /** * Created by NeumimTo on 14.03.2016. */ -@JsBinding(JsBinding.Type.CLASS) public class PseudoRandomDistribution { public static double[] C = null; diff --git a/Common/src/main/resources/assets/nt-rpg/localizations/core_localization_en.properties b/Common/src/main/resources/assets/nt-rpg/localizations/core_localization_en.properties index ed46ec4c0..95147fccc 100644 --- a/Common/src/main/resources/assets/nt-rpg/localizations/core_localization_en.properties +++ b/Common/src/main/resources/assets/nt-rpg/localizations/core_localization_en.properties @@ -72,12 +72,10 @@ player.message.class-type.immutable=You already are class type {{type}} gui.button.back=Back gui.label.level=Level gui.attributes.commit=Commit Changes - gui.class-dependencies.label=Class dependencies gui.class-dependencies.harddep.label=Must have all gui.class-dependencies.softdep.label=Must have at least one gui.class-dependencies.conflictingdep.label=Most have none - player.party-created.message=You've created a new party player.skill-cast.precondition.no-mana.message=Not enough Mana player.skill-cast.precondition.no-hp.message=Not enough Hp diff --git a/Common/src/main/resources/assets/nt-rpg/templates/Effect.md b/Common/src/main/resources/assets/nt-rpg/templates/Effect.md deleted file mode 100644 index c0c8428c3..000000000 --- a/Common/src/main/resources/assets/nt-rpg/templates/Effect.md +++ /dev/null @@ -1,7 +0,0 @@ -###### {{effect.name}} - -*Description:* {{effect.description}} - -*Parameters:* {{effect.parameter}} - -{{effect.parameters}} \ No newline at end of file diff --git a/Common/src/main/resources/assets/nt-rpg/templates/SE.md b/Common/src/main/resources/assets/nt-rpg/templates/SE.md deleted file mode 100644 index 7b3508de2..000000000 --- a/Common/src/main/resources/assets/nt-rpg/templates/SE.md +++ /dev/null @@ -1,10 +0,0 @@ -## Skills ----- - -{{skills}} - - -## Effects ----- - -{{effects}} diff --git a/Common/src/main/resources/assets/nt-rpg/templates/Skill.md b/Common/src/main/resources/assets/nt-rpg/templates/Skill.md deleted file mode 100644 index 626c8dfae..000000000 --- a/Common/src/main/resources/assets/nt-rpg/templates/Skill.md +++ /dev/null @@ -1,13 +0,0 @@ -###### {{skill.name}} - -*ID:* {{skill.id}} - -*Description:* {{skill.description}} - -*DamageType:* {{skill.damageType}} - -*Parameters:* - -{{skill.parameters}} - ---- \ No newline at end of file diff --git a/Common/src/main/resources/assets/nt-rpg/templates/function.md b/Common/src/main/resources/assets/nt-rpg/templates/function.md deleted file mode 100644 index cad489ff8..000000000 --- a/Common/src/main/resources/assets/nt-rpg/templates/function.md +++ /dev/null @@ -1,13 +0,0 @@ -###### {{function.name}} - - -```javascript -{{function.usage}} -``` - - -- Parameters: - -{{function.params}} - - diff --git a/Common/src/test/java/cz/neumimto/rpg/AdminCommandTests.java b/Common/src/test/java/cz/neumimto/rpg/AdminCommandTests.java index a0ac1016f..1e26f6e23 100644 --- a/Common/src/test/java/cz/neumimto/rpg/AdminCommandTests.java +++ b/Common/src/test/java/cz/neumimto/rpg/AdminCommandTests.java @@ -1,6 +1,8 @@ package cz.neumimto.rpg; import cz.neumimto.rpg.common.RpgApi; +import cz.neumimto.rpg.common.commands.AdminCommands; +import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.IGlobalEffect; import cz.neumimto.rpg.common.entity.CommonProperties; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; @@ -11,8 +13,6 @@ import cz.neumimto.rpg.common.gui.IPlayerMessage; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.model.CharacterClass; -import cz.neumimto.rpg.common.commands.AdminCommands; -import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.effects.TestEffectFloat; import cz.neumimto.rpg.effects.TestEffectFloatGlobal; import cz.neumimto.rpg.junit.CharactersExtension; @@ -99,14 +99,14 @@ public boolean takesExp() { classDefinition.addExperienceSource("expSourceTest".toUpperCase()); iActiveCharacter.setProperty(CommonProperties.experiences_mult, 1); - // abstractAdminCommand.commandAddExperiences(iActiveCharacter, 10D, "expSourceTest"); + // abstractAdminCommand.commandAddExperiences(iActiveCharacter, 10D, "expSourceTest"); Assertions.assertEquals(jpaCharacterClass.getExperiences(), 10D); } @Test public void testAddUniqueSkillPointsWrongArgs3(@Stage(READY) IActiveCharacter iActiveCharacter) { Assertions.assertThrows(IllegalStateException.class, () -> { - // abstractAdminCommand.commandAddUniqueSkillpoint(iActiveCharacter, "Primary", null); + // abstractAdminCommand.commandAddUniqueSkillpoint(iActiveCharacter, "Primary", null); }); } @@ -118,7 +118,7 @@ public void testAddUniqueSkillPoints(@Stage(READY) IActiveCharacter iActiveChara CharacterClass characterClass = characterBase.getCharacterClass(primary.getClassDefinition()); int i = characterClass.getSkillPoints(); - // abstractAdminCommand.commandAddUniqueSkillpoint(iActiveCharacter, "Primary", "testing"); + // abstractAdminCommand.commandAddUniqueSkillpoint(iActiveCharacter, "Primary", "testing"); Assertions.assertEquals(characterClass.getSkillPoints(), i + 1); Assertions.assertEquals(characterBase.getUniqueSkillpoints().size(), 1); diff --git a/Common/src/test/java/cz/neumimto/rpg/CharacterCommandTests.java b/Common/src/test/java/cz/neumimto/rpg/CharacterCommandTests.java index edffa50a5..0cb757419 100644 --- a/Common/src/test/java/cz/neumimto/rpg/CharacterCommandTests.java +++ b/Common/src/test/java/cz/neumimto/rpg/CharacterCommandTests.java @@ -2,16 +2,16 @@ import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.RpgApi; +import cz.neumimto.rpg.common.commands.CharacterCommandFacade; +import cz.neumimto.rpg.common.commands.CharacterCommands; import cz.neumimto.rpg.common.configuration.AttributeConfig; +import cz.neumimto.rpg.common.effects.EffectService; +import cz.neumimto.rpg.common.entity.PropertyService; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; import cz.neumimto.rpg.common.gui.Gui; import cz.neumimto.rpg.common.gui.IPlayerMessage; import cz.neumimto.rpg.common.logging.Log; -import cz.neumimto.rpg.common.commands.CharacterCommandFacade; -import cz.neumimto.rpg.common.commands.CharacterCommands; -import cz.neumimto.rpg.common.effects.EffectService; -import cz.neumimto.rpg.common.entity.PropertyService; import cz.neumimto.rpg.junit.CharactersExtension; import cz.neumimto.rpg.junit.CharactersExtension.Stage; import cz.neumimto.rpg.junit.NtRpgExtension; @@ -83,7 +83,7 @@ public void testCommandAddAttribute(@Stage(READY) IActiveCharacter iActiveCharac @Test public void testAddExpCommand(@Stage(READY) IActiveCharacter iActiveCharacter) { ClassDefinition classDefinition = new ClassDefinition("test", Rpg.get().getPluginConfig().CLASS_TYPES.keySet().iterator().next()); - // characterCommands.chooseCharacterClass(iActiveCharacter, classDefinition); + // characterCommands.chooseCharacterClass(iActiveCharacter, classDefinition); Assertions.assertTrue(iActiveCharacter.getClasses().containsKey("test")); } @@ -94,7 +94,7 @@ public void testAddExpCommand_Wrong_Order(@Stage(READY) IActiveCharacter iActive String i = iterator.next(); ClassDefinition classDefinition = new ClassDefinition("test", i); Rpg.get().getPluginConfig().RESPECT_CLASS_SELECTION_ORDER = true; - // characterCommands.chooseCharacterClass(iActiveCharacter, classDefinition); + // characterCommands.chooseCharacterClass(iActiveCharacter, classDefinition); Assertions.assertFalse(iActiveCharacter.getClasses().containsKey("test")); } diff --git a/Common/src/test/java/cz/neumimto/rpg/ClassDefinitionDaoTest.java b/Common/src/test/java/cz/neumimto/rpg/ClassDefinitionDaoTest.java index 62430bce8..721917868 100644 --- a/Common/src/test/java/cz/neumimto/rpg/ClassDefinitionDaoTest.java +++ b/Common/src/test/java/cz/neumimto/rpg/ClassDefinitionDaoTest.java @@ -1,10 +1,10 @@ package cz.neumimto.rpg; 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.configuration.ClassTypeDefinition; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; -import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.persistance.dao.ClassDefinitionDao; import cz.neumimto.rpg.junit.CharactersExtension; import cz.neumimto.rpg.junit.NtRpgExtension; @@ -39,8 +39,8 @@ public void before() { Path classDirectory = classDefinitionDao.getClassDirectory(); classDirectory.resolve("class1.conf").toFile().delete(); classDirectory.resolve("class2.conf").toFile().delete(); - assetService.copyToFile("classDependencyGraphTest/class1.conf",classDirectory.resolve("class1.conf")); - assetService.copyToFile("classDependencyGraphTest/class2.conf",classDirectory.resolve("class2.conf")); + assetService.copyToFile("classDependencyGraphTest/class1.conf", classDirectory.resolve("class1.conf")); + assetService.copyToFile("classDependencyGraphTest/class2.conf", classDirectory.resolve("class2.conf")); } @@ -57,7 +57,7 @@ public void test_class_def_ependencies_loading() { Assertions.assertEquals(1, softDepends.size()); Assertions.assertNotNull(softDepends.iterator().next()); Assertions.assertTrue(softDepends.iterator().next().getName().equalsIgnoreCase("class1")); - run =true; + run = true; } } Assertions.assertTrue(run); diff --git a/Common/src/test/java/cz/neumimto/rpg/DamageServiceTest.java b/Common/src/test/java/cz/neumimto/rpg/DamageServiceTest.java index fd9a1ad8f..7ac7b4841 100644 --- a/Common/src/test/java/cz/neumimto/rpg/DamageServiceTest.java +++ b/Common/src/test/java/cz/neumimto/rpg/DamageServiceTest.java @@ -3,9 +3,9 @@ import cz.neumimto.rpg.common.damage.DamageService; import cz.neumimto.rpg.common.entity.PropertyService; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; +import cz.neumimto.rpg.common.impl.TestItemService; import cz.neumimto.rpg.common.items.RpgItemStack; import cz.neumimto.rpg.common.items.RpgItemType; -import cz.neumimto.rpg.common.impl.TestItemService; import cz.neumimto.rpg.junit.CharactersExtension; import cz.neumimto.rpg.junit.CharactersExtension.Stage; import cz.neumimto.rpg.junit.NtRpgExtension; diff --git a/Common/src/test/java/cz/neumimto/rpg/EffectServiceTest.java b/Common/src/test/java/cz/neumimto/rpg/EffectServiceTest.java index 0ef187772..a64d9f6eb 100644 --- a/Common/src/test/java/cz/neumimto/rpg/EffectServiceTest.java +++ b/Common/src/test/java/cz/neumimto/rpg/EffectServiceTest.java @@ -1,7 +1,7 @@ package cz.neumimto.rpg; -import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.CommonEffectTypes; +import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.EffectType; import cz.neumimto.rpg.effects.TestEffectService; import cz.neumimto.rpg.junit.NtRpgExtension; diff --git a/Common/src/test/java/cz/neumimto/rpg/EffectTests.java b/Common/src/test/java/cz/neumimto/rpg/EffectTests.java index 6094f02c3..84e3a8e0d 100644 --- a/Common/src/test/java/cz/neumimto/rpg/EffectTests.java +++ b/Common/src/test/java/cz/neumimto/rpg/EffectTests.java @@ -1,11 +1,11 @@ package cz.neumimto.rpg; import cz.neumimto.rpg.common.effects.IEffect; -import cz.neumimto.rpg.common.effects.stacking.DoubleEffectStackingStrategy; -import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.effects.InternalEffectSourceProvider; +import cz.neumimto.rpg.common.effects.stacking.DoubleEffectStackingStrategy; import cz.neumimto.rpg.common.entity.TestCharacter; import cz.neumimto.rpg.common.entity.players.ActiveCharacter; +import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.effects.TestEffectService; import cz.neumimto.rpg.junit.NtRpgExtension; import cz.neumimto.rpg.junit.TestGuiceModule; @@ -18,8 +18,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; -import java.io.File; -import java.nio.file.Files; import java.util.Set; import java.util.UUID; @@ -146,7 +144,6 @@ public void test_Effect_Expirable_stackable() { } - private void processEffectStacking(IEffect first, IEffect test) { first = makeEffectStackable(first); diff --git a/Common/src/test/java/cz/neumimto/rpg/ItemStringTest.java b/Common/src/test/java/cz/neumimto/rpg/ItemStringTest.java index 90b46dada..73eec3e7a 100644 --- a/Common/src/test/java/cz/neumimto/rpg/ItemStringTest.java +++ b/Common/src/test/java/cz/neumimto/rpg/ItemStringTest.java @@ -24,12 +24,12 @@ void parse(String input, ItemString expected) { private static Stream provideItemStrings() { return Stream.of( - Arguments.of("item:id", new ItemString("item:id", 0, 0, null,"")), - Arguments.of("item:id;damage=10", new ItemString("item:id", 10, 0, null,"")), - Arguments.of("item:id;damage=10.8", new ItemString("item:id", 10.8D, 0, null,"")), - Arguments.of("item:id;model=variant;damage=10", new ItemString("item:id", 10, 0, "variant","")), - Arguments.of("item:id;damage=10;model=variant", new ItemString("item:id", 10, 0, "variant","")), - Arguments.of("item:id;model=variant", new ItemString("item:id", 0, 0, "variant","")) + Arguments.of("item:id", new ItemString("item:id", 0, 0, null, "")), + Arguments.of("item:id;damage=10", new ItemString("item:id", 10, 0, null, "")), + Arguments.of("item:id;damage=10.8", new ItemString("item:id", 10.8D, 0, null, "")), + Arguments.of("item:id;model=variant;damage=10", new ItemString("item:id", 10, 0, "variant", "")), + Arguments.of("item:id;damage=10;model=variant", new ItemString("item:id", 10, 0, "variant", "")), + Arguments.of("item:id;model=variant", new ItemString("item:id", 0, 0, "variant", "")) ); } } \ No newline at end of file diff --git a/Common/src/test/java/cz/neumimto/rpg/ManaRegenerationTest.java b/Common/src/test/java/cz/neumimto/rpg/ManaRegenerationTest.java index 1df9350f2..e12e75c88 100644 --- a/Common/src/test/java/cz/neumimto/rpg/ManaRegenerationTest.java +++ b/Common/src/test/java/cz/neumimto/rpg/ManaRegenerationTest.java @@ -3,15 +3,15 @@ import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.RpgApi; import cz.neumimto.rpg.common.configuration.PluginConfig; +import cz.neumimto.rpg.common.effects.EffectService; +import cz.neumimto.rpg.common.effects.core.DefaultManaRegeneration; import cz.neumimto.rpg.common.entity.CommonProperties; import cz.neumimto.rpg.common.entity.EntityService; +import cz.neumimto.rpg.common.entity.PropertyService; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.events.EventFactoryService; import cz.neumimto.rpg.common.gui.Gui; import cz.neumimto.rpg.common.gui.IPlayerMessage; -import cz.neumimto.rpg.common.effects.EffectService; -import cz.neumimto.rpg.common.effects.core.DefaultManaRegeneration; -import cz.neumimto.rpg.common.entity.PropertyService; import cz.neumimto.rpg.junit.CharactersExtension; import cz.neumimto.rpg.junit.CharactersExtension.Stage; import cz.neumimto.rpg.junit.NtRpgExtension; diff --git a/Common/src/test/java/cz/neumimto/rpg/SkillExecutionTests.java b/Common/src/test/java/cz/neumimto/rpg/SkillExecutionTests.java index c2d6d7cd7..2f622645c 100644 --- a/Common/src/test/java/cz/neumimto/rpg/SkillExecutionTests.java +++ b/Common/src/test/java/cz/neumimto/rpg/SkillExecutionTests.java @@ -11,7 +11,6 @@ import cz.neumimto.rpg.common.localization.LocalizationService; import cz.neumimto.rpg.common.skills.*; import cz.neumimto.rpg.common.skills.types.ActiveSkill; -import cz.neumimto.rpg.common.skills.SkillExecutor; import cz.neumimto.rpg.junit.CharactersExtension; import cz.neumimto.rpg.junit.CharactersExtension.Stage; import cz.neumimto.rpg.junit.NtRpgExtension; @@ -78,7 +77,7 @@ public void testBasicSkillExecution(@Stage(READY) IActiveCharacter character) { skillData.setSkillExecutor(injector.getInstance(SkillExecutor.class)); skillData.getSkillExecutor().init(skillData); skillData.setSkill(testSkill); - + playerSkillContext.setSkillData(skillData); character.addSkill("test", playerSkillContext); diff --git a/Common/src/test/java/cz/neumimto/rpg/SkillManipulationTests.java b/Common/src/test/java/cz/neumimto/rpg/SkillManipulationTests.java index a649fe120..2ac19f276 100644 --- a/Common/src/test/java/cz/neumimto/rpg/SkillManipulationTests.java +++ b/Common/src/test/java/cz/neumimto/rpg/SkillManipulationTests.java @@ -1,6 +1,8 @@ package cz.neumimto.rpg; import cz.neumimto.rpg.common.configuration.PluginConfig; +import cz.neumimto.rpg.common.entity.TestCharacter; +import cz.neumimto.rpg.common.entity.players.ActiveCharacter; 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,8 +16,6 @@ import cz.neumimto.rpg.common.skills.SkillDependency; import cz.neumimto.rpg.common.skills.tree.SkillTree; import cz.neumimto.rpg.common.utils.ActionResult; -import cz.neumimto.rpg.common.entity.TestCharacter; -import cz.neumimto.rpg.common.entity.players.ActiveCharacter; import cz.neumimto.rpg.junit.CharactersExtension; import cz.neumimto.rpg.junit.CharactersExtension.Stage; import cz.neumimto.rpg.junit.NtRpgExtension; diff --git a/Common/src/test/java/cz/neumimto/rpg/SkillTreeLoadingTests.java b/Common/src/test/java/cz/neumimto/rpg/SkillTreeLoadingTests.java index 5a41c280a..8a978df48 100644 --- a/Common/src/test/java/cz/neumimto/rpg/SkillTreeLoadingTests.java +++ b/Common/src/test/java/cz/neumimto/rpg/SkillTreeLoadingTests.java @@ -1,14 +1,14 @@ package cz.neumimto.rpg; import cz.neumimto.rpg.common.Rpg; +import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.configuration.SkillTreeDao; +import cz.neumimto.rpg.common.entity.TestCharacter; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.localization.LocalizationService; import cz.neumimto.rpg.common.skills.*; import cz.neumimto.rpg.common.skills.tree.SkillTree; import cz.neumimto.rpg.common.skills.types.ActiveSkill; -import cz.neumimto.rpg.common.assets.AssetService; -import cz.neumimto.rpg.common.entity.TestCharacter; import cz.neumimto.rpg.junit.NtRpgExtension; import cz.neumimto.rpg.junit.TestGuiceModule; import name.falgout.jeffrey.testing.junit.guice.GuiceExtension; diff --git a/Common/src/test/java/cz/neumimto/rpg/Test.java b/Common/src/test/java/cz/neumimto/rpg/Test.java index 45d5be6db..b2636967e 100644 --- a/Common/src/test/java/cz/neumimto/rpg/Test.java +++ b/Common/src/test/java/cz/neumimto/rpg/Test.java @@ -4,9 +4,9 @@ import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillResult; -import cz.neumimto.rpg.common.skills.types.ActiveSkill; import cz.neumimto.rpg.common.skills.mech.DamageMechanic; import cz.neumimto.rpg.common.skills.mech.TargetSelectorSelf; +import cz.neumimto.rpg.common.skills.types.ActiveSkill; import it.unimi.dsi.fastutil.objects.Object2DoubleOpenHashMap; import javax.inject.Inject; diff --git a/Common/src/test/java/cz/neumimto/rpg/TestApiImpl.java b/Common/src/test/java/cz/neumimto/rpg/TestApiImpl.java index 60d7c5122..f37a6e477 100644 --- a/Common/src/test/java/cz/neumimto/rpg/TestApiImpl.java +++ b/Common/src/test/java/cz/neumimto/rpg/TestApiImpl.java @@ -10,19 +10,18 @@ import cz.neumimto.rpg.common.damage.DamageService; import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.entity.PropertyService; -import cz.neumimto.rpg.common.entity.TestCharacter; import cz.neumimto.rpg.common.entity.players.CharacterService; import cz.neumimto.rpg.common.entity.players.parties.PartyService; import cz.neumimto.rpg.common.events.EventFactoryService; import cz.neumimto.rpg.common.exp.ExperienceService; +import cz.neumimto.rpg.common.impl.TestCharacterService; +import cz.neumimto.rpg.common.inventory.TestInventoryService; import cz.neumimto.rpg.common.items.ItemService; import cz.neumimto.rpg.common.localization.Arg; import cz.neumimto.rpg.common.localization.LocalizationService; import cz.neumimto.rpg.common.permissions.PermissionService; import cz.neumimto.rpg.common.scripting.NTScriptEngine; import cz.neumimto.rpg.common.skills.SkillService; -import cz.neumimto.rpg.common.impl.TestCharacterService; -import cz.neumimto.rpg.common.inventory.TestInventoryService; import cz.neumimto.rpg.entity.TestEntityService; import javax.inject.Inject; diff --git a/Common/src/test/java/cz/neumimto/rpg/TestDamageService.java b/Common/src/test/java/cz/neumimto/rpg/TestDamageService.java index 7083639b7..4aa4569bf 100644 --- a/Common/src/test/java/cz/neumimto/rpg/TestDamageService.java +++ b/Common/src/test/java/cz/neumimto/rpg/TestDamageService.java @@ -1,7 +1,7 @@ package cz.neumimto.rpg; -import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.damage.DamageService; +import cz.neumimto.rpg.common.entity.IEntity; import javax.inject.Singleton; diff --git a/Common/src/test/java/cz/neumimto/rpg/TestListenerScripts.java b/Common/src/test/java/cz/neumimto/rpg/TestListenerScripts.java index 90590364f..995ed3d64 100644 --- a/Common/src/test/java/cz/neumimto/rpg/TestListenerScripts.java +++ b/Common/src/test/java/cz/neumimto/rpg/TestListenerScripts.java @@ -2,8 +2,6 @@ import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.RpgApi; -import cz.neumimto.rpg.common.entity.players.IActiveCharacter; -import cz.neumimto.rpg.common.skills.scripting.EffectScriptGenerator; import cz.neumimto.rpg.common.skills.scripting.ListenerScriptGenerator; import cz.neumimto.rpg.common.skills.scripting.ScriptListenerModel; import cz.neumimto.rpg.junit.TestGuiceModule; @@ -48,9 +46,9 @@ public void generate_listener() throws Exception { model.id = "TestListener"; model.event = "CancellableEvent"; model.script = """ - @event.cancelled = T - RETURN - """; + @event.cancelled = T + RETURN + """; Class from = ListenerScriptGenerator.from(model, this.getClass().getClassLoader()); CancellableEvent cancellableEvent = new CancellableEvent(); Arrays.stream(from.getDeclaredMethods()).findFirst().get().invoke(from.newInstance(), cancellableEvent); diff --git a/Common/src/test/java/cz/neumimto/rpg/TestPropertyValueResolving.java b/Common/src/test/java/cz/neumimto/rpg/TestPropertyValueResolving.java index edca09686..7e04ad8aa 100644 --- a/Common/src/test/java/cz/neumimto/rpg/TestPropertyValueResolving.java +++ b/Common/src/test/java/cz/neumimto/rpg/TestPropertyValueResolving.java @@ -1,7 +1,7 @@ package cz.neumimto.rpg; -import cz.neumimto.rpg.common.items.ItemClass; import cz.neumimto.rpg.common.entity.PropertyService; +import cz.neumimto.rpg.common.items.ItemClass; import javax.inject.Inject; diff --git a/Common/src/test/java/cz/neumimto/rpg/TestScriptingComplexUsecase.java b/Common/src/test/java/cz/neumimto/rpg/TestScriptingComplexUsecase.java index 063780fb9..51a56da0c 100644 --- a/Common/src/test/java/cz/neumimto/rpg/TestScriptingComplexUsecase.java +++ b/Common/src/test/java/cz/neumimto/rpg/TestScriptingComplexUsecase.java @@ -4,7 +4,6 @@ import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.RpgApi; import cz.neumimto.rpg.common.effects.IEffectContainer; -import cz.neumimto.rpg.common.effects.UnstackableEffectBase; import cz.neumimto.rpg.common.entity.TestCharacter; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; @@ -12,12 +11,14 @@ import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillsDefinition; -import cz.neumimto.rpg.common.skills.scripting.*; +import cz.neumimto.rpg.common.skills.scripting.ActiveScriptSkill; +import cz.neumimto.rpg.common.skills.scripting.ScriptEffectModel; +import cz.neumimto.rpg.common.skills.scripting.ScriptListenerModel; +import cz.neumimto.rpg.common.skills.scripting.ScriptSkillModel; import cz.neumimto.rpg.junit.TestGuiceModule; import cz.neumimto.rpg.model.CharacterBaseTest; import name.falgout.jeffrey.testing.junit.guice.GuiceExtension; import name.falgout.jeffrey.testing.junit.guice.IncludeModule; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -79,7 +80,7 @@ public void testScriptFlow() throws Exception { @effect.consumer = @caster @effect.Num = @num add_effect{effect=@effect, es=@caster, source=@this_skill} - + RETURN SkillResult.OK """; skillsDefinition.skills.add(smodel); @@ -118,7 +119,7 @@ public void testScriptFlow() throws Exception { ActiveScriptSkill iSkill = (ActiveScriptSkill) byId.get(); TestCharacter testCharacter = new TestCharacter(UUID.randomUUID(), new CharacterBaseTest(), 0); - PlayerSkillContext playerSkillContext = new PlayerSkillContext(new ClassDefinition("",""), iSkill, testCharacter); + PlayerSkillContext playerSkillContext = new PlayerSkillContext(new ClassDefinition("", ""), iSkill, testCharacter); iSkill.cast(testCharacter, playerSkillContext); Assertions.assertTrue(testCharacter.getEffects().stream().anyMatch(a -> a.getName().equals(emodel.id))); diff --git a/Common/src/test/java/cz/neumimto/rpg/TestSkillExecutorChain.java b/Common/src/test/java/cz/neumimto/rpg/TestSkillExecutorChain.java index c6bb27878..75563b70c 100644 --- a/Common/src/test/java/cz/neumimto/rpg/TestSkillExecutorChain.java +++ b/Common/src/test/java/cz/neumimto/rpg/TestSkillExecutorChain.java @@ -2,12 +2,12 @@ import cz.neumimto.rpg.common.configuration.AttributeConfig; import cz.neumimto.rpg.common.entity.PropertyService; +import cz.neumimto.rpg.common.entity.TestCharacter; +import cz.neumimto.rpg.common.entity.players.ActiveCharacter; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillData; import cz.neumimto.rpg.common.skills.SkillSettings; -import cz.neumimto.rpg.common.entity.TestCharacter; -import cz.neumimto.rpg.common.entity.players.ActiveCharacter; import cz.neumimto.rpg.junit.NtRpgExtension; import cz.neumimto.rpg.junit.TestDictionary; import cz.neumimto.rpg.junit.TestGuiceModule; diff --git a/Common/src/test/java/cz/neumimto/rpg/TestSkillService.java b/Common/src/test/java/cz/neumimto/rpg/TestSkillService.java index 7eb70d176..1ddc23a4e 100644 --- a/Common/src/test/java/cz/neumimto/rpg/TestSkillService.java +++ b/Common/src/test/java/cz/neumimto/rpg/TestSkillService.java @@ -3,7 +3,6 @@ import cz.neumimto.nts.NTScript; import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.gui.ISkillTreeInterfaceModel; -import cz.neumimto.rpg.common.scripting.SkillScriptHandlers; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.SkillService; import cz.neumimto.rpg.junit.TestDictionary; @@ -20,9 +19,9 @@ public NTScript getNtScriptCompilerFor(Class c) { return ntScriptEngine.prepareCompiler(builder -> { try { builder - .add(Math.class.getDeclaredMethod("max", double.class, double.class), List.of("a","b")) - .add(Math.class.getDeclaredMethod("min", double.class, double.class), List.of("a","b")) - .add(Math.class.getDeclaredMethod("pow", double.class, double.class), List.of("a","b")) + .add(Math.class.getDeclaredMethod("max", double.class, double.class), List.of("a", "b")) + .add(Math.class.getDeclaredMethod("min", double.class, double.class), List.of("a", "b")) + .add(Math.class.getDeclaredMethod("pow", double.class, double.class), List.of("a", "b")) .add(Math.class.getDeclaredMethod("abs", double.class), List.of("a")) .add(Math.class.getDeclaredMethod("sqrt", double.class), List.of("a")) .add(Math.class.getDeclaredMethod("ceil", double.class), List.of("a")) diff --git a/Common/src/test/java/cz/neumimto/rpg/Tests.java b/Common/src/test/java/cz/neumimto/rpg/Tests.java index f3b7f2e51..74e67c5a2 100644 --- a/Common/src/test/java/cz/neumimto/rpg/Tests.java +++ b/Common/src/test/java/cz/neumimto/rpg/Tests.java @@ -1,12 +1,12 @@ package cz.neumimto.rpg; +import cz.neumimto.rpg.common.classes.ClassService; +import cz.neumimto.rpg.common.entity.players.ActiveCharacter; 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.model.CharacterClass; -import cz.neumimto.rpg.common.classes.ClassService; -import cz.neumimto.rpg.common.entity.players.ActiveCharacter; import cz.neumimto.rpg.model.CharacterClassTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/Common/src/test/java/cz/neumimto/rpg/assets/TestAssetService.java b/Common/src/test/java/cz/neumimto/rpg/assets/TestAssetService.java index f984af471..d4fff7cee 100644 --- a/Common/src/test/java/cz/neumimto/rpg/assets/TestAssetService.java +++ b/Common/src/test/java/cz/neumimto/rpg/assets/TestAssetService.java @@ -2,8 +2,8 @@ import com.google.common.base.Charsets; import com.google.common.io.CharStreams; -import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.common.assets.AssetService; +import cz.neumimto.rpg.common.logging.Log; import javax.inject.Singleton; import java.io.IOException; diff --git a/Common/src/test/java/cz/neumimto/rpg/common/TestPartyService.java b/Common/src/test/java/cz/neumimto/rpg/common/TestPartyService.java index e57c5a21e..ce4e52adc 100644 --- a/Common/src/test/java/cz/neumimto/rpg/common/TestPartyService.java +++ b/Common/src/test/java/cz/neumimto/rpg/common/TestPartyService.java @@ -1,9 +1,9 @@ package cz.neumimto.rpg.common; -import cz.neumimto.rpg.common.entity.players.party.IParty; import cz.neumimto.rpg.common.entity.TestCharacter; import cz.neumimto.rpg.common.entity.TestParty; import cz.neumimto.rpg.common.entity.parties.PartyServiceImpl; +import cz.neumimto.rpg.common.entity.players.party.IParty; public class TestPartyService extends PartyServiceImpl { diff --git a/Common/src/test/java/cz/neumimto/rpg/common/entity/TestCharacter.java b/Common/src/test/java/cz/neumimto/rpg/common/entity/TestCharacter.java index 45bdb56ed..53bcebe6c 100644 --- a/Common/src/test/java/cz/neumimto/rpg/common/entity/TestCharacter.java +++ b/Common/src/test/java/cz/neumimto/rpg/common/entity/TestCharacter.java @@ -1,10 +1,10 @@ package cz.neumimto.rpg.common.entity; +import cz.neumimto.rpg.common.entity.players.ActiveCharacter; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.gui.SkillTreeViewModel; import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.common.model.CharacterBase; -import cz.neumimto.rpg.common.entity.players.ActiveCharacter; import java.util.Collections; import java.util.Map; diff --git a/Common/src/test/java/cz/neumimto/rpg/common/impl/TestCharacterService.java b/Common/src/test/java/cz/neumimto/rpg/common/impl/TestCharacterService.java index d37094c1a..24e3d7c0b 100644 --- a/Common/src/test/java/cz/neumimto/rpg/common/impl/TestCharacterService.java +++ b/Common/src/test/java/cz/neumimto/rpg/common/impl/TestCharacterService.java @@ -1,12 +1,12 @@ package cz.neumimto.rpg.common.impl; +import cz.neumimto.rpg.common.entity.PropertyService; +import cz.neumimto.rpg.common.entity.TestCharacter; +import cz.neumimto.rpg.common.entity.players.CharacterService; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.model.CharacterSkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; -import cz.neumimto.rpg.common.entity.PropertyService; -import cz.neumimto.rpg.common.entity.TestCharacter; -import cz.neumimto.rpg.common.entity.players.CharacterService; import javax.inject.Singleton; import java.util.Collection; diff --git a/Common/src/test/java/cz/neumimto/rpg/common/impl/TestItemService.java b/Common/src/test/java/cz/neumimto/rpg/common/impl/TestItemService.java index 129abb8c0..9aecc5cdb 100644 --- a/Common/src/test/java/cz/neumimto/rpg/common/impl/TestItemService.java +++ b/Common/src/test/java/cz/neumimto/rpg/common/impl/TestItemService.java @@ -1,12 +1,7 @@ package cz.neumimto.rpg.common.impl; import cz.neumimto.rpg.common.configuration.ItemString; -import cz.neumimto.rpg.common.items.ItemClass; -import cz.neumimto.rpg.common.items.RpgItemStack; -import cz.neumimto.rpg.common.items.RpgItemType; -import cz.neumimto.rpg.common.items.AbstractItemService; -import cz.neumimto.rpg.common.items.RpgItemStackImpl; -import cz.neumimto.rpg.common.items.TestItemType; +import cz.neumimto.rpg.common.items.*; import javax.inject.Singleton; import java.util.Collections; diff --git a/Common/src/test/java/cz/neumimto/rpg/common/inventory/InventoryHandlerTest.java b/Common/src/test/java/cz/neumimto/rpg/common/inventory/InventoryHandlerTest.java index ab3d924db..ce70506f7 100644 --- a/Common/src/test/java/cz/neumimto/rpg/common/inventory/InventoryHandlerTest.java +++ b/Common/src/test/java/cz/neumimto/rpg/common/inventory/InventoryHandlerTest.java @@ -4,13 +4,13 @@ import cz.neumimto.rpg.common.RpgApi; import cz.neumimto.rpg.common.configuration.AttributeConfig; import cz.neumimto.rpg.common.entity.PropertyService; +import cz.neumimto.rpg.common.entity.TestCharacter; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; import cz.neumimto.rpg.common.items.ItemService; import cz.neumimto.rpg.common.items.RpgItemStack; -import cz.neumimto.rpg.common.logging.Log; -import cz.neumimto.rpg.common.entity.TestCharacter; import cz.neumimto.rpg.common.items.RpgItemStackImpl; +import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.junit.CharactersExtension; import cz.neumimto.rpg.junit.NtRpgExtension; import cz.neumimto.rpg.junit.TestDictionary; diff --git a/Common/src/test/java/cz/neumimto/rpg/common/inventory/TestInventoryService.java b/Common/src/test/java/cz/neumimto/rpg/common/inventory/TestInventoryService.java index ed99cbc34..d1c427773 100644 --- a/Common/src/test/java/cz/neumimto/rpg/common/inventory/TestInventoryService.java +++ b/Common/src/test/java/cz/neumimto/rpg/common/inventory/TestInventoryService.java @@ -1,7 +1,7 @@ package cz.neumimto.rpg.common.inventory; -import cz.neumimto.rpg.common.model.EquipedSlot; import cz.neumimto.rpg.common.entity.TestCharacter; +import cz.neumimto.rpg.common.model.EquipedSlot; import javax.inject.Singleton; diff --git a/Common/src/test/java/cz/neumimto/rpg/common/items/TestItemType.java b/Common/src/test/java/cz/neumimto/rpg/common/items/TestItemType.java index 9e2bb0f6c..3cfd49834 100644 --- a/Common/src/test/java/cz/neumimto/rpg/common/items/TestItemType.java +++ b/Common/src/test/java/cz/neumimto/rpg/common/items/TestItemType.java @@ -2,6 +2,6 @@ public class TestItemType extends RpgItemTypeImpl { public TestItemType(String id, String modelName, ItemClass itemClass, double damage, double armor) { - super(id, modelName, itemClass, damage, armor,null); + super(id, modelName, itemClass, damage, armor, null); } } diff --git a/Common/src/test/java/cz/neumimto/rpg/common/skills/scripting/Sample.java b/Common/src/test/java/cz/neumimto/rpg/common/skills/scripting/Sample.java index f7e63d2ef..ac091d064 100644 --- a/Common/src/test/java/cz/neumimto/rpg/common/skills/scripting/Sample.java +++ b/Common/src/test/java/cz/neumimto/rpg/common/skills/scripting/Sample.java @@ -7,6 +7,7 @@ import cz.neumimto.rpg.common.skills.types.ActiveSkill; import javax.inject.Inject; + /* @target = targetted_entity{range=$settings.range, entityFrom=@caster} IF exists{test=@target} @@ -32,7 +33,8 @@ public class Sample extends ActiveSkill { @Override public SkillResult cast(IActiveCharacter character, PlayerSkillContext info) { final int range = info.getIntNodeValue("range"); - final IEntity iEntity = TargettedEntity.get(range, character);; + final IEntity iEntity = TargettedEntity.get(range, character); + ; //iEntity = TargettedEntity.get(range, character); if (Exists.test(iEntity)) { if (DamageEntity.damage(20, iEntity, character)) { diff --git "a/Common/src/test/java/cz/neumimto/rpg/common/skills/scripting/Scr\303\255ptParserTests.java" "b/Common/src/test/java/cz/neumimto/rpg/common/skills/scripting/Scr\303\255ptParserTests.java" index 540a4ef83..4d69e12de 100644 --- "a/Common/src/test/java/cz/neumimto/rpg/common/skills/scripting/Scr\303\255ptParserTests.java" +++ "b/Common/src/test/java/cz/neumimto/rpg/common/skills/scripting/Scr\303\255ptParserTests.java" @@ -42,7 +42,7 @@ public void test_01() throws Exception { RETURN CANCELLED """; - skillService.skillDefinitionToSkill(model,this.getClass().getClassLoader()); + skillService.skillDefinitionToSkill(model, this.getClass().getClassLoader()); } @@ -66,7 +66,7 @@ public void test_02() throws Exception { END RETURN CANCELLED """; - skillService.skillDefinitionToSkill(model,this.getClass().getClassLoader()); + skillService.skillDefinitionToSkill(model, this.getClass().getClassLoader()); } @Test @@ -89,7 +89,7 @@ public void test_03() throws Exception { END RETURN CANCELLED """; - skillService.skillDefinitionToSkill(model,this.getClass().getClassLoader()); + skillService.skillDefinitionToSkill(model, this.getClass().getClassLoader()); } @Singleton diff --git a/Common/src/test/java/cz/neumimto/rpg/effects/TestEffectService.java b/Common/src/test/java/cz/neumimto/rpg/effects/TestEffectService.java index 847260091..04dcfad73 100644 --- a/Common/src/test/java/cz/neumimto/rpg/effects/TestEffectService.java +++ b/Common/src/test/java/cz/neumimto/rpg/effects/TestEffectService.java @@ -1,7 +1,7 @@ package cz.neumimto.rpg.effects; -import cz.neumimto.rpg.common.effects.IEffect; import cz.neumimto.rpg.common.effects.EffectService; +import cz.neumimto.rpg.common.effects.IEffect; import java.util.Set; diff --git a/Common/src/test/java/cz/neumimto/rpg/junit/CharactersExtension.java b/Common/src/test/java/cz/neumimto/rpg/junit/CharactersExtension.java index a9a552901..e169c91f8 100644 --- a/Common/src/test/java/cz/neumimto/rpg/junit/CharactersExtension.java +++ b/Common/src/test/java/cz/neumimto/rpg/junit/CharactersExtension.java @@ -1,16 +1,16 @@ package cz.neumimto.rpg.junit; import cz.neumimto.rpg.common.entity.IReservable; +import cz.neumimto.rpg.common.entity.TestCharacter; +import cz.neumimto.rpg.common.entity.TestPropertyService; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.entity.players.classes.PlayerClassData; +import cz.neumimto.rpg.common.inventory.FilteredManagedSlotImpl; import cz.neumimto.rpg.common.inventory.ManagedSlot; +import cz.neumimto.rpg.common.inventory.RpgInventoryImpl; import cz.neumimto.rpg.common.items.ItemClass; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.model.CharacterClass; -import cz.neumimto.rpg.common.entity.TestCharacter; -import cz.neumimto.rpg.common.entity.TestPropertyService; -import cz.neumimto.rpg.common.inventory.FilteredManagedSlotImpl; -import cz.neumimto.rpg.common.inventory.RpgInventoryImpl; import cz.neumimto.rpg.model.CharacterBaseTest; import cz.neumimto.rpg.model.CharacterClassTest; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/Common/src/test/java/cz/neumimto/rpg/junit/TestDictionary.java b/Common/src/test/java/cz/neumimto/rpg/junit/TestDictionary.java index 4a64c4313..43c67cb7a 100644 --- a/Common/src/test/java/cz/neumimto/rpg/junit/TestDictionary.java +++ b/Common/src/test/java/cz/neumimto/rpg/junit/TestDictionary.java @@ -5,11 +5,11 @@ import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; import cz.neumimto.rpg.common.items.ItemClass; import cz.neumimto.rpg.common.items.RpgItemType; +import cz.neumimto.rpg.common.items.RpgItemTypeImpl; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillResult; import cz.neumimto.rpg.common.skills.types.ActiveSkill; -import cz.neumimto.rpg.common.items.RpgItemTypeImpl; import java.util.HashMap; diff --git a/Common/src/test/java/cz/neumimto/rpg/junit/TestGuiceModule.java b/Common/src/test/java/cz/neumimto/rpg/junit/TestGuiceModule.java index 737582193..13bab55b9 100644 --- a/Common/src/test/java/cz/neumimto/rpg/junit/TestGuiceModule.java +++ b/Common/src/test/java/cz/neumimto/rpg/junit/TestGuiceModule.java @@ -1,50 +1,55 @@ package cz.neumimto.rpg.junit; -import com.google.inject.*; +import com.google.inject.AbstractModule; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Provider; import cz.neumimto.rpg.TestApiImpl; import cz.neumimto.rpg.TestDamageService; import cz.neumimto.rpg.TestSkillService; -import cz.neumimto.rpg.common.ResourceLoader; -import cz.neumimto.rpg.common.RpgApi; -import cz.neumimto.rpg.common.configuration.SkillTreeDao; -import cz.neumimto.rpg.common.damage.DamageService; -import cz.neumimto.rpg.common.entity.*; -import cz.neumimto.rpg.common.entity.players.CharacterService; -import cz.neumimto.rpg.common.entity.players.IActiveCharacter; -import cz.neumimto.rpg.common.entity.players.parties.PartyService; -import cz.neumimto.rpg.common.events.EventFactoryService; -import cz.neumimto.rpg.common.exp.ExperienceService; -import cz.neumimto.rpg.common.gui.IPlayerMessage; -import cz.neumimto.rpg.common.inventory.CharacterInventoryInteractionHandler; -import cz.neumimto.rpg.common.inventory.InventoryService; -import cz.neumimto.rpg.common.items.ItemService; -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.skills.SkillService; import cz.neumimto.rpg.assets.TestAssetService; +import cz.neumimto.rpg.common.ResourceLoader; import cz.neumimto.rpg.common.ResourceManagerImpl; +import cz.neumimto.rpg.common.RpgApi; import cz.neumimto.rpg.common.TestPartyService; import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.bytecode.ClassGenerator; 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.damage.DamageService; import cz.neumimto.rpg.common.effects.EffectService; +import cz.neumimto.rpg.common.entity.EntityService; +import cz.neumimto.rpg.common.entity.PropertyService; +import cz.neumimto.rpg.common.entity.TestPropertyService; import cz.neumimto.rpg.common.entity.configuration.MobSettingsDao; import cz.neumimto.rpg.common.entity.configuration.TestMobSettingsDao; +import cz.neumimto.rpg.common.entity.players.CharacterService; +import cz.neumimto.rpg.common.entity.players.IActiveCharacter; +import cz.neumimto.rpg.common.entity.players.parties.PartyService; +import cz.neumimto.rpg.common.events.EventFactoryService; import cz.neumimto.rpg.common.events.TestEventFactory; import cz.neumimto.rpg.common.exp.ExperienceDAO; +import cz.neumimto.rpg.common.exp.ExperienceService; import cz.neumimto.rpg.common.experience.TestExperienceService; +import cz.neumimto.rpg.common.gui.IPlayerMessage; import cz.neumimto.rpg.common.impl.TestCharacterService; import cz.neumimto.rpg.common.impl.TestItemService; +import cz.neumimto.rpg.common.inventory.CharacterInventoryInteractionHandler; import cz.neumimto.rpg.common.inventory.InventoryHandler; +import cz.neumimto.rpg.common.inventory.InventoryService; import cz.neumimto.rpg.common.inventory.TestInventoryService; import cz.neumimto.rpg.common.inventory.crafting.runewords.RWDao; +import cz.neumimto.rpg.common.items.ItemService; +import cz.neumimto.rpg.common.localization.LocalizationService; import cz.neumimto.rpg.common.localization.LocalizationServiceImpl; +import cz.neumimto.rpg.common.logging.Log; +import cz.neumimto.rpg.common.permissions.PermissionService; import cz.neumimto.rpg.common.persistance.dao.ClassDefinitionDao; import cz.neumimto.rpg.common.persistance.dao.ICharacterClassDao; import cz.neumimto.rpg.common.persistance.dao.IPersistenceHandler; import cz.neumimto.rpg.common.persistance.dao.IPlayerDao; +import cz.neumimto.rpg.common.skills.SkillService; import cz.neumimto.rpg.common.skills.reagents.Cooldown; import cz.neumimto.rpg.common.skills.reagents.HPCast; import cz.neumimto.rpg.common.skills.reagents.ManaCast; @@ -54,14 +59,8 @@ import cz.neumimto.rpg.persistence.InMemoryPlayerStorage; import cz.neumimto.rpg.skills.reagents.CooldownTest; import cz.neumimto.rpg.sponge.permission.TestPermissionService; -import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.DynamicType; -import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; -import net.bytebuddy.implementation.InvocationHandlerAdapter; -import net.bytebuddy.matcher.ElementMatchers; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.lang.reflect.Type; diff --git a/Common/src/test/java/cz/neumimto/rpg/model/TimestampEntityTest.java b/Common/src/test/java/cz/neumimto/rpg/model/TimestampEntityTest.java index 65639b7bd..53a034c09 100644 --- a/Common/src/test/java/cz/neumimto/rpg/model/TimestampEntityTest.java +++ b/Common/src/test/java/cz/neumimto/rpg/model/TimestampEntityTest.java @@ -1,5 +1,3 @@ - - package cz.neumimto.rpg.model; import cz.neumimto.rpg.common.model.TimestampEntity; diff --git a/Generator/src/main/java/cz/neumimto/rpg/GlobalEffectAnnotationProcessor.java b/Generator/src/main/java/cz/neumimto/rpg/GlobalEffectAnnotationProcessor.java index 7e8bc832e..dd16640cc 100644 --- a/Generator/src/main/java/cz/neumimto/rpg/GlobalEffectAnnotationProcessor.java +++ b/Generator/src/main/java/cz/neumimto/rpg/GlobalEffectAnnotationProcessor.java @@ -63,11 +63,9 @@ public class GlobalEffectAnnotationProcessor extends AbstractProcessor { + "\n" + "import java.util.Map;\n" + "import cz.neumimto.rpg.common.effects.model.EffectModelMapper;\n" - + "import cz.neumimto.rpg.common.skills.scripting.JsBinding;\n" + "import com.google.auto.service.AutoService;\n" + "\n" - + "@AutoService(EffectModelMapper.class)" - + "@JsBinding(JsBinding.Type.CLASS)\n" + + "@AutoService(EffectModelMapper.class)\n" + "@cz.neumimto.rpg.common.ResourceLoader.ModelMapper\n" + "public class %stype%Mapper extends EffectModelMapper {\n" + "\n" @@ -255,7 +253,7 @@ private void generateModelMapper(String modelSimpleName, String mapperFor, Map players = null; boolean flag = false; + public CustomFirework(Location location, FireworkEffect effect, List p) { super(EntityType.FIREWORK_ROCKET, ((CraftWorld) location.getWorld()).getHandle()); players = p; @@ -32,6 +32,7 @@ public CustomFirework(Location location, FireworkEffect effect, List p) setInvisible(true); } } + @Override public void tick() { if (flag) { diff --git a/Implementations/Spigot-Lib/1.17/src/main/java/cz/neumimto/rpg/nms117/NMSHandler.java b/Implementations/Spigot-Lib/1.17/src/main/java/cz/neumimto/rpg/nms117/NMSHandler.java index 575fb91a7..ecf7754c2 100644 --- a/Implementations/Spigot-Lib/1.17/src/main/java/cz/neumimto/rpg/nms117/NMSHandler.java +++ b/Implementations/Spigot-Lib/1.17/src/main/java/cz/neumimto/rpg/nms117/NMSHandler.java @@ -37,7 +37,7 @@ public String getVersion() { @Override public void spawnFireworkExplosion(Location location, FireworkEffect effect, List observers) { - new CustomFirework(location,effect, observers); + new CustomFirework(location, effect, observers); } @Override diff --git a/Implementations/Spigot/build.gradle b/Implementations/Spigot/build.gradle index a7afd0240..114b5dcb4 100644 --- a/Implementations/Spigot/build.gradle +++ b/Implementations/Spigot/build.gradle @@ -8,7 +8,7 @@ repositories { mavenCentral() maven { url "https://papermc.io/repo/repository/maven-public/" - content{ + content { includeGroupByRegex "(net\\.Indyuce|io\\.lumine)" } } @@ -29,7 +29,7 @@ repositories { } maven { url "https://mvn.lumine.io/repository/maven-releases/" - content{ + content { includeGroupByRegex "(net\\.Indyuce|io\\.lumine)" } } @@ -55,7 +55,7 @@ dependencies { // api 'com.github.stefvanschie.inventoryframework:IF:' + project.if - // compileOnly "org.spigotmc:spigot-api:" + project.spigotapi + // compileOnly "org.spigotmc:spigot-api:" + project.spigotapi compileOnly 'io.papermc.paper:paper-api:1.17-R0.1-SNAPSHOT' compileOnly("org.spigotmc:plugin-annotations:" + project.pluginannotations) { @@ -72,14 +72,14 @@ dependencies { compileOnly "co.aikar:acf-paper:" + project.acf compileOnly "io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT" - // compileOnly('net.Indyuce:MMOItems:' + project.mmoitems) { - // exclude group: 'com.mojang', module: 'authlib' - // exclude group: 'org.jetbrains', module: 'annotations' - // } + // compileOnly('net.Indyuce:MMOItems:' + project.mmoitems) { + // exclude group: 'com.mojang', module: 'authlib' + // exclude group: 'org.jetbrains', module: 'annotations' + // } - // compileOnly('io.lumine:MythicLib:' + project.mythiclib) + // compileOnly('io.lumine:MythicLib:' + project.mythiclib) - // compileOnly 'io.lumine.xikage:MythicMobs:' + project.mythicmobs + // compileOnly 'io.lumine.xikage:MythicMobs:' + project.mythicmobs compileOnly 'com.gitlab.SamB440:RPGRegions-2:' + project.rpgregions @@ -94,7 +94,7 @@ shadowJar { relocate 'com.squareup.javapoet', 'rpgshaded.com.squareup.javapoet' relocate 'com.typesafe.config', 'rpgshaded.com.typesafe.config' relocate 'javax.inject', 'rpgshaded.javax.inject' - // relocate 'net.bytebuddy', 'rpgshaded.net.bytebuddy' + // relocate 'net.bytebuddy', 'rpgshaded.net.bytebuddy' relocate 'org.aopalliance', 'rpgshaded.org.aopalliance' relocate 'org.codehaus', 'rpgshaded.org.codehaus' relocate 'de.slikey.effectlib', 'rpgshaded.de.slikey.effectlib' @@ -103,16 +103,16 @@ shadowJar { mergeServiceFiles() } + import org.gradle.api.internal.tasks.DefaultTaskOutputs import java.nio.file.Files -import java.nio.file.Paths -import java.nio.file.StandardCopyOption; +import java.nio.file.StandardCopyOption task copyNMSImpl { Project spigot = project(":Spigot") if (spigot.file("lib-cp/Spigot-117-1.0.0-SNAPSHOT.jar").exists()) { - return ; + return; } DefaultTaskOutputs output = project(':Spigot-117').jar.outputs boolean found = false; @@ -123,7 +123,7 @@ task copyNMSImpl { if (name.endsWith("dev.jar") || name.endsWith("sources.jar")) { return false } - return true; + return true; } })) { var p = spigot.file("lib-cp/").toPath().resolve(f.getName()) diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/SpigotRpg.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/SpigotRpg.java index faa7a8a42..8ad95f8e0 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/SpigotRpg.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/SpigotRpg.java @@ -1,9 +1,9 @@ package cz.neumimto.rpg.spigot; import com.google.inject.Injector; -import cz.neumimto.rpg.common.utils.Console; import cz.neumimto.rpg.common.AbstractRpg; import cz.neumimto.rpg.common.assets.AssetService; +import cz.neumimto.rpg.common.utils.Console; import cz.neumimto.rpg.spigot.gui.SpigotGuiHelper; import cz.neumimto.rpg.spigot.gui.inventoryviews.ConfigurableInventoryGui; import org.bukkit.Bukkit; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/SpigotRpgPlugin.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/SpigotRpgPlugin.java index 3354d7c99..aa721c0a6 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/SpigotRpgPlugin.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/SpigotRpgPlugin.java @@ -8,12 +8,12 @@ import com.google.inject.Injector; import cz.neumimto.rpg.NtRpgBootstrap; import cz.neumimto.rpg.common.Rpg; +import cz.neumimto.rpg.common.commands.*; import cz.neumimto.rpg.common.entity.players.CharacterService; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; +import cz.neumimto.rpg.common.entity.players.PreloadCharacter; import cz.neumimto.rpg.common.gui.Gui; import cz.neumimto.rpg.common.logging.Log; -import cz.neumimto.rpg.common.commands.*; -import cz.neumimto.rpg.common.entity.players.PreloadCharacter; import cz.neumimto.rpg.persistence.flatfiles.FlatFilesModule; import cz.neumimto.rpg.spigot.bridges.HolographicDisplaysExpansion; import cz.neumimto.rpg.spigot.bridges.NtRpgPlaceholderExpansion; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/assets/SpigotAssetService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/assets/SpigotAssetService.java index 1cb1afdc7..754e96096 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/assets/SpigotAssetService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/assets/SpigotAssetService.java @@ -1,7 +1,7 @@ package cz.neumimto.rpg.spigot.assets; -import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.common.assets.AssetService; +import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.spigot.gui.inventoryviews.ConfigurableInventoryGui; import javax.inject.Singleton; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/HolographicDisplaysExpansion.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/HolographicDisplaysExpansion.java index 81e0f5fc1..c2c5da2b1 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/HolographicDisplaysExpansion.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/HolographicDisplaysExpansion.java @@ -6,9 +6,9 @@ import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; 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.utils.rng.XORShiftRnd; import cz.neumimto.rpg.spigot.SpigotRpgPlugin; import cz.neumimto.rpg.spigot.damage.SpigotDamageService; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mmoitems/MMOItemWrapperFactory.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mmoitems/MMOItemWrapperFactory.java index d46e861dd..844aa4073 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mmoitems/MMOItemWrapperFactory.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mmoitems/MMOItemWrapperFactory.java @@ -2,8 +2,8 @@ import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.common.skills.ISkill; -import cz.neumimto.rpg.common.utils.DebugLevel; import cz.neumimto.rpg.common.skills.SkillConfigLoader; +import cz.neumimto.rpg.common.utils.DebugLevel; import net.Indyuce.mmoitems.ability.Ability; import java.util.ArrayList; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mythicalmobs/MythicalMobsExpansion.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mythicalmobs/MythicalMobsExpansion.java index 0c12099d5..59776f743 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mythicalmobs/MythicalMobsExpansion.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mythicalmobs/MythicalMobsExpansion.java @@ -1,9 +1,9 @@ package cz.neumimto.rpg.spigot.bridges.mythicalmobs; import com.google.inject.Injector; -import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.entity.AbstractEntityService; import cz.neumimto.rpg.common.entity.configuration.MobSettingsDao; +import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.spigot.entities.SpigotEntityService; import cz.neumimto.rpg.spigot.entities.SpigotMob; import cz.neumimto.rpg.spigot.skills.SpigotSkillService; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mythicalmobs/MythicalMobsWrapperFactory.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mythicalmobs/MythicalMobsWrapperFactory.java index 88820d165..dac9a4ce1 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mythicalmobs/MythicalMobsWrapperFactory.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/bridges/mythicalmobs/MythicalMobsWrapperFactory.java @@ -2,8 +2,8 @@ import cz.neumimto.rpg.common.logging.Log; import cz.neumimto.rpg.common.skills.ISkill; -import cz.neumimto.rpg.common.utils.DebugLevel; import cz.neumimto.rpg.common.skills.SkillConfigLoader; +import cz.neumimto.rpg.common.utils.DebugLevel; import io.lumine.xikage.mythicmobs.MythicMobs; import io.lumine.xikage.mythicmobs.skills.Skill; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/commands/SpigotAdminCommands.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/commands/SpigotAdminCommands.java index 1f0fb2852..78b8b87a4 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/commands/SpigotAdminCommands.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/commands/SpigotAdminCommands.java @@ -8,6 +8,8 @@ import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.bukkit.contexts.OnlinePlayer; +import cz.neumimto.rpg.common.commands.CharacterCommands; +import cz.neumimto.rpg.common.commands.OnlineOtherPlayer; import cz.neumimto.rpg.common.damage.DamageService; import cz.neumimto.rpg.common.entity.EntityService; import cz.neumimto.rpg.common.entity.PropertyService; @@ -17,8 +19,6 @@ import cz.neumimto.rpg.common.items.ClassItem; import cz.neumimto.rpg.common.items.ItemClass; import cz.neumimto.rpg.common.items.RpgItemType; -import cz.neumimto.rpg.common.commands.CharacterCommands; -import cz.neumimto.rpg.common.commands.OnlineOtherPlayer; import cz.neumimto.rpg.spigot.inventory.SpigotItemService; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/commands/SpigotCharacterCommands.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/commands/SpigotCharacterCommands.java index bc0b77377..34e5865c9 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/commands/SpigotCharacterCommands.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/commands/SpigotCharacterCommands.java @@ -6,9 +6,9 @@ import co.aikar.commands.annotation.Private; import co.aikar.commands.annotation.Subcommand; import cz.neumimto.rpg.common.Rpg; +import cz.neumimto.rpg.common.commands.CharacterCommandFacade; import cz.neumimto.rpg.common.configuration.AttributeConfig; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; -import cz.neumimto.rpg.common.commands.CharacterCommandFacade; import cz.neumimto.rpg.spigot.SpigotRpgPlugin; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import cz.neumimto.rpg.spigot.entities.players.SpigotCharacterService; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/damage/SpigotDamageService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/damage/SpigotDamageService.java index b3e9ad225..c8cb6c733 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/damage/SpigotDamageService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/damage/SpigotDamageService.java @@ -2,13 +2,13 @@ import com.google.common.collect.Lists; import cz.neumimto.rpg.common.Rpg; +import cz.neumimto.rpg.common.damage.DamageService; import cz.neumimto.rpg.common.entity.CommonProperties; import cz.neumimto.rpg.common.entity.EntityService; 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.items.ClassItem; -import cz.neumimto.rpg.common.damage.DamageService; import cz.neumimto.rpg.spigot.entities.ISpigotEntity; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import org.bukkit.entity.EntityType; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/SpigotEffectService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/SpigotEffectService.java index 6d79d0434..b2d9db786 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/SpigotEffectService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/SpigotEffectService.java @@ -1,11 +1,11 @@ package cz.neumimto.rpg.spigot.effects; +import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.IEffect; import cz.neumimto.rpg.common.effects.IEffectContainer; import cz.neumimto.rpg.common.effects.IEffectSourceProvider; import cz.neumimto.rpg.common.entity.IEffectConsumer; import cz.neumimto.rpg.common.entity.IEntity; -import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.spigot.SpigotRpgPlugin; import cz.neumimto.rpg.spigot.events.character.SpigotEffectApplyEvent; import cz.neumimto.rpg.spigot.events.character.SpigotEffectRemoveEvent; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/FireResistanceEffect.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/FireResistanceEffect.java index 7650be994..d4bc80d11 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/FireResistanceEffect.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/FireResistanceEffect.java @@ -1,6 +1,5 @@ package cz.neumimto.rpg.spigot.effects.common; -import com.google.auto.service.AutoService; import cz.neumimto.rpg.common.effects.EffectBase; import cz.neumimto.rpg.common.effects.IEffect; import cz.neumimto.rpg.common.entity.IEffectConsumer; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/FlickerEffect.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/FlickerEffect.java index 324622b71..2077b3da3 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/FlickerEffect.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/FlickerEffect.java @@ -34,7 +34,7 @@ public void onTick(IEffect self) { InvisibilityEffect invisibilityEffect = new InvisibilityEffect(getConsumer(), invisDuration); Rpg.get().getEffectService().addEffect(invisibilityEffect, getEffectSourceProvider(), (IEntity) getConsumer()); LivingEntity entity = (LivingEntity) getConsumer().getEntity(); - entity.getWorld().spawnParticle(Particle.SMOKE_NORMAL, entity.getLocation(), 5); + entity.getWorld().spawnParticle(Particle.SMOKE_NORMAL, entity.getLocation(), 5); } } diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/InvisibilityEffect.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/InvisibilityEffect.java index bcfd97c07..409ab5331 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/InvisibilityEffect.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/InvisibilityEffect.java @@ -2,13 +2,11 @@ import com.google.auto.service.AutoService; import cz.neumimto.nts.annotations.ScriptMeta; -import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.effects.EffectBase; import cz.neumimto.rpg.common.effects.Generate; import cz.neumimto.rpg.common.effects.IEffect; import cz.neumimto.rpg.common.entity.IEffectConsumer; import cz.neumimto.rpg.spigot.SpigotRpgPlugin; -import cz.neumimto.rpg.spigot.entities.ISpigotEntity; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.Mob; @@ -30,8 +28,8 @@ public class InvisibilityEffect extends EffectBase { @ScriptMeta.Handler public InvisibilityEffect( - @ScriptMeta.NamedParam("e|entity") IEffectConsumer consumer, - @ScriptMeta.NamedParam("d|duration") long duration) { + @ScriptMeta.NamedParam("e|entity") IEffectConsumer consumer, + @ScriptMeta.NamedParam("d|duration") long duration) { super(name, consumer); setDuration(duration); } diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/Maim.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/Maim.java index b024bb4af..6551d5e27 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/Maim.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/Maim.java @@ -21,7 +21,7 @@ public class Maim extends SlowEffect { CircleEffect circleEffect; @Generate.Constructor - public Maim(IEffectConsumer consumer, long duration,@Generate.Model SlowModel slowModel) { + public Maim(IEffectConsumer consumer, long duration, @Generate.Model SlowModel slowModel) { super(consumer, duration, slowModel); name = "maim"; } diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/ManaShieldEffect.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/ManaShieldEffect.java index fd3811064..c9dcf0779 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/ManaShieldEffect.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/ManaShieldEffect.java @@ -4,7 +4,6 @@ import cz.neumimto.nts.annotations.ScriptMeta; import cz.neumimto.rpg.common.effects.*; import cz.neumimto.rpg.common.entity.IEffectConsumer; -import cz.neumimto.rpg.common.skills.scripting.JsBinding; import cz.neumimto.rpg.spigot.utils.VectorUtils; import de.slikey.effectlib.Effect; import org.bukkit.Color; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/SlowEffect.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/SlowEffect.java index 1d8b703c0..144a128a0 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/SlowEffect.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/SlowEffect.java @@ -22,9 +22,9 @@ public class SlowEffect extends EffectBase { @ScriptMeta.Handler public SlowEffect(@ScriptMeta.NamedParam("e|entity") IEffectConsumer consumer, - @ScriptMeta.NamedParam("d|duration") long duration, - @ScriptMeta.NamedParam("sL|slowLevel") int slowLevel, - @ScriptMeta.NamedParam("jh|jumpHeight") boolean jh) { + @ScriptMeta.NamedParam("d|duration") long duration, + @ScriptMeta.NamedParam("sL|slowLevel") int slowLevel, + @ScriptMeta.NamedParam("jh|jumpHeight") boolean jh) { this(consumer, duration, new SlowModel(slowLevel, jh)); } diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/StunEffect.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/StunEffect.java index 51e169451..6fb8a60af 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/StunEffect.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/StunEffect.java @@ -1,7 +1,6 @@ package cz.neumimto.rpg.spigot.effects.common; import com.google.auto.service.AutoService; -import cz.neumimto.nts.annotations.ScriptMeta; import cz.neumimto.nts.annotations.ScriptMeta.Function; import cz.neumimto.rpg.common.effects.Generate; import cz.neumimto.rpg.common.effects.IEffect; @@ -12,12 +11,13 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.event.player.PlayerTeleportEvent; -import static cz.neumimto.nts.annotations.ScriptMeta.*; +import static cz.neumimto.nts.annotations.ScriptMeta.Handler; +import static cz.neumimto.nts.annotations.ScriptMeta.NamedParam; @Generate(id = "name", description = "Stuns entity for a duration") @AutoService(IEffect.class) @Function("StunEffect") -public class StunEffect extends UnstackableEffectBase { +public class StunEffect extends UnstackableEffectBase { public static String name = "Stun"; private LivingEntity livingEntity; private Location appliedLoc; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/UnhealEffect.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/UnhealEffect.java index 51780a17b..a9c611d9f 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/UnhealEffect.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/UnhealEffect.java @@ -1,7 +1,6 @@ package cz.neumimto.rpg.spigot.effects.common; import com.google.auto.service.AutoService; -import cz.neumimto.nts.annotations.ScriptMeta; import cz.neumimto.nts.annotations.ScriptMeta.Function; import cz.neumimto.nts.annotations.ScriptMeta.Handler; import cz.neumimto.nts.annotations.ScriptMeta.NamedParam; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/BossBarExpNotifier.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/BossBarExpNotifier.java index a52bdb6ce..bb6251fe8 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/BossBarExpNotifier.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/BossBarExpNotifier.java @@ -1,15 +1,11 @@ package cz.neumimto.rpg.spigot.effects.common.def; import cz.neumimto.rpg.common.Rpg; -import cz.neumimto.rpg.common.effects.EffectBase; -import cz.neumimto.rpg.common.effects.IEffect; -import cz.neumimto.rpg.common.effects.IEffectContainer; -import cz.neumimto.rpg.common.effects.IEffectSourceProvider; +import cz.neumimto.rpg.common.effects.*; import cz.neumimto.rpg.common.entity.players.classes.PlayerClassData; import cz.neumimto.rpg.common.localization.LocalizationKeys; import cz.neumimto.rpg.common.localization.LocalizationService; import cz.neumimto.rpg.common.utils.MathUtils; -import cz.neumimto.rpg.common.effects.CoreEffectTypes; import cz.neumimto.rpg.common.utils.StringUtils; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import org.bukkit.Bukkit; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/ManaBarBossBar.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/ManaBarBossBar.java index d5791129b..dfdef1391 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/ManaBarBossBar.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/ManaBarBossBar.java @@ -1,12 +1,8 @@ package cz.neumimto.rpg.spigot.effects.common.def; -import cz.neumimto.rpg.common.effects.EffectBase; -import cz.neumimto.rpg.common.effects.IEffect; -import cz.neumimto.rpg.common.effects.IEffectContainer; -import cz.neumimto.rpg.common.effects.IEffectSourceProvider; +import cz.neumimto.rpg.common.effects.*; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.utils.MathUtils; -import cz.neumimto.rpg.common.effects.CoreEffectTypes; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/ManaBarText.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/ManaBarText.java index e3e7bf9f4..65d8563e9 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/ManaBarText.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/effects/common/def/ManaBarText.java @@ -1,12 +1,8 @@ package cz.neumimto.rpg.spigot.effects.common.def; -import cz.neumimto.rpg.common.effects.EffectBase; -import cz.neumimto.rpg.common.effects.IEffect; -import cz.neumimto.rpg.common.effects.IEffectContainer; -import cz.neumimto.rpg.common.effects.IEffectSourceProvider; +import cz.neumimto.rpg.common.effects.*; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.utils.MathUtils; -import cz.neumimto.rpg.common.effects.CoreEffectTypes; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/SpigotEntityService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/SpigotEntityService.java index 769dbaf71..ac3f82003 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/SpigotEntityService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/SpigotEntityService.java @@ -1,10 +1,10 @@ package cz.neumimto.rpg.spigot.entities; import cz.neumimto.rpg.common.Rpg; +import cz.neumimto.rpg.common.entity.AbstractEntityService; import cz.neumimto.rpg.common.entity.CommonProperties; import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.entity.IMob; -import cz.neumimto.rpg.common.entity.AbstractEntityService; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.EntityType; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/SpigotMob.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/SpigotMob.java index 4a79dd911..2f75e0a9a 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/SpigotMob.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/SpigotMob.java @@ -1,9 +1,9 @@ package cz.neumimto.rpg.spigot.entities; +import cz.neumimto.rpg.common.entity.AbstractMob; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.entity.players.party.IParty; import cz.neumimto.rpg.common.skills.ISkill; -import cz.neumimto.rpg.common.entity.AbstractMob; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.LivingEntity; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/configuration/SpigotMobSettingsDao.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/configuration/SpigotMobSettingsDao.java index e0d23a13e..ed45675f7 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/configuration/SpigotMobSettingsDao.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/configuration/SpigotMobSettingsDao.java @@ -1,10 +1,10 @@ package cz.neumimto.rpg.spigot.entities.configuration; import cz.neumimto.rpg.common.Rpg; -import cz.neumimto.rpg.common.utils.FileUtils; import cz.neumimto.rpg.common.entity.configuration.MobSettingsDao; import cz.neumimto.rpg.common.entity.configuration.MobsConfig; import cz.neumimto.rpg.common.entity.configuration.RootMobConfig; +import cz.neumimto.rpg.common.utils.FileUtils; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.EntityType; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotCharacter.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotCharacter.java index 2b43e5737..c0dfe32c8 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotCharacter.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotCharacter.java @@ -1,8 +1,8 @@ package cz.neumimto.rpg.spigot.entities.players; +import cz.neumimto.rpg.common.entity.players.ActiveCharacter; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.skills.ISkill; -import cz.neumimto.rpg.common.entity.players.ActiveCharacter; import cz.neumimto.rpg.spigot.entities.ISpigotEntity; import cz.neumimto.rpg.spigot.entities.players.party.SpigotParty; import cz.neumimto.rpg.spigot.gui.SpigotSkillTreeViewModel; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotCharacterService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotCharacterService.java index 6eb8986ed..b4ecf1733 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotCharacterService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotCharacterService.java @@ -1,13 +1,13 @@ package cz.neumimto.rpg.spigot.entities.players; +import cz.neumimto.rpg.common.entity.PropertyService; +import cz.neumimto.rpg.common.entity.players.CharacterMana; +import cz.neumimto.rpg.common.entity.players.CharacterService; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.gui.Gui; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; -import cz.neumimto.rpg.common.entity.PropertyService; -import cz.neumimto.rpg.common.entity.players.CharacterService; -import cz.neumimto.rpg.common.entity.players.CharacterMana; import cz.neumimto.rpg.spigot.SpigotRpgPlugin; import cz.neumimto.rpg.spigot.gui.SpellbookListener; import cz.neumimto.rpg.spigot.gui.SpigotGuiHelper; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotPreloadCharacter.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotPreloadCharacter.java index 0378d0a9a..d999c3589 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotPreloadCharacter.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/SpigotPreloadCharacter.java @@ -1,9 +1,9 @@ package cz.neumimto.rpg.spigot.entities.players; -import cz.neumimto.rpg.common.skills.ISkill; -import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.entity.players.PlayerNotInGameException; import cz.neumimto.rpg.common.entity.players.PreloadCharacter; +import cz.neumimto.rpg.common.skills.ISkill; +import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.spigot.entities.ISpigotEntity; import cz.neumimto.rpg.spigot.entities.players.party.SpigotParty; import cz.neumimto.rpg.spigot.gui.SpigotSkillTreeViewModel; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/party/SpigotPartyService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/party/SpigotPartyService.java index 1da46e570..b914b04f7 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/party/SpigotPartyService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/entities/players/party/SpigotPartyService.java @@ -1,8 +1,8 @@ package cz.neumimto.rpg.spigot.entities.players.party; -import cz.neumimto.rpg.common.entity.players.party.IParty; import cz.neumimto.rpg.common.entity.parties.PartyServiceImpl; +import cz.neumimto.rpg.common.entity.players.party.IParty; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import javax.inject.Singleton; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/events/SpigotEventFactory.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/events/SpigotEventFactory.java index f235d9c9f..033c81e76 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/events/SpigotEventFactory.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/events/SpigotEventFactory.java @@ -1,5 +1,6 @@ package cz.neumimto.rpg.spigot.events; +import cz.neumimto.rpg.common.events.EventFactoryImpl; import cz.neumimto.rpg.common.events.character.*; import cz.neumimto.rpg.common.events.damage.*; import cz.neumimto.rpg.common.events.effect.EffectApplyEvent; @@ -9,7 +10,6 @@ import cz.neumimto.rpg.common.events.party.PartyJoinEvent; import cz.neumimto.rpg.common.events.party.PartyLeaveEvent; import cz.neumimto.rpg.common.events.skill.*; -import cz.neumimto.rpg.common.events.EventFactoryImpl; import cz.neumimto.rpg.spigot.events.character.*; import cz.neumimto.rpg.spigot.events.damage.*; import cz.neumimto.rpg.spigot.events.effects.SpigotEffectApplyEvent; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/events/skill/SpigotSkillTargetAttemptEvent.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/events/skill/SpigotSkillTargetAttemptEvent.java index b31fcd854..f344d67a0 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/events/skill/SpigotSkillTargetAttemptEvent.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/events/skill/SpigotSkillTargetAttemptEvent.java @@ -17,7 +17,6 @@ import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.events.skill.SkillTargetAttemptEvent; -import cz.neumimto.rpg.spigot.entities.ISpigotEntity; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpellbookListener.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpellbookListener.java index 0be04d497..6060d0a6c 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpellbookListener.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpellbookListener.java @@ -4,7 +4,6 @@ import cz.neumimto.rpg.common.ResourceLoader; import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.entity.players.CharacterService; -import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.localization.LocalizationKeys; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpigotGuiHelper.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpigotGuiHelper.java index 90b77ea9c..6e712ef8f 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpigotGuiHelper.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpigotGuiHelper.java @@ -7,6 +7,7 @@ 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.gui.ConfigInventory; import cz.neumimto.rpg.common.gui.SkillTreeViewModel; import cz.neumimto.rpg.common.localization.LocalizationKeys; import cz.neumimto.rpg.common.localization.LocalizationService; @@ -15,7 +16,6 @@ import cz.neumimto.rpg.common.model.CharacterClass; import cz.neumimto.rpg.common.skills.*; import cz.neumimto.rpg.common.skills.tree.SkillTree; -import cz.neumimto.rpg.common.gui.ConfigInventory; import cz.neumimto.rpg.spigot.Resourcepack; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import cz.neumimto.rpg.spigot.gui.elements.GuiCommand; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpigotUIReader.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpigotUIReader.java index d1f0eecbe..03f982ed7 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpigotUIReader.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/gui/SpigotUIReader.java @@ -4,11 +4,11 @@ import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.configuration.ClassTypeDefinition; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; +import cz.neumimto.rpg.common.gui.GuiParser; +import cz.neumimto.rpg.common.gui.InventorySlotProcessor; import cz.neumimto.rpg.common.items.ClassItem; import cz.neumimto.rpg.common.localization.LocalizationKeys; import cz.neumimto.rpg.common.localization.LocalizationService; -import cz.neumimto.rpg.common.gui.GuiParser; -import cz.neumimto.rpg.common.gui.InventorySlotProcessor; import cz.neumimto.rpg.spigot.gui.inventoryviews.CharacterGuiView; import cz.neumimto.rpg.spigot.items.SpigotRpgItemType; import de.tr7zw.nbtapi.NBTItem; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/inventory/SpigotInventoryService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/inventory/SpigotInventoryService.java index 8d8f95612..722ae1b81 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/inventory/SpigotInventoryService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/inventory/SpigotInventoryService.java @@ -1,13 +1,13 @@ package cz.neumimto.rpg.spigot.inventory; import com.google.inject.Injector; +import cz.neumimto.rpg.common.inventory.AbstractInventoryService; +import cz.neumimto.rpg.common.inventory.InventoryHandler; import cz.neumimto.rpg.common.inventory.ManagedSlot; import cz.neumimto.rpg.common.inventory.RpgInventory; import cz.neumimto.rpg.common.items.RpgItemStack; import cz.neumimto.rpg.common.model.EquipedSlot; import cz.neumimto.rpg.common.skills.SkillData; -import cz.neumimto.rpg.common.inventory.AbstractInventoryService; -import cz.neumimto.rpg.common.inventory.InventoryHandler; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import cz.neumimto.rpg.spigot.gui.inventoryviews.ConfigurableInventoryGui; import cz.neumimto.rpg.spigot.persistance.SpigotEquipedSlot; @@ -158,8 +158,8 @@ public void invalidateGUICaches(ISpigotCharacter cc) { ServiceLoader.load(ConfigurableInventoryGui.class, getClass().getClassLoader()).stream() .map(ServiceLoader.Provider::get).forEach(a -> { - injector.injectMembers(a); - a.clearCache(uniqueId); - }); + injector.injectMembers(a); + a.clearCache(uniqueId); + }); } } diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/inventory/SpigotItemService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/inventory/SpigotItemService.java index 76f1b19c0..75b234dca 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/inventory/SpigotItemService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/inventory/SpigotItemService.java @@ -7,12 +7,8 @@ import cz.neumimto.rpg.common.effects.IGlobalEffect; import cz.neumimto.rpg.common.entity.PropertyService; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; -import cz.neumimto.rpg.common.items.ItemClass; -import cz.neumimto.rpg.common.items.RpgItemStack; -import cz.neumimto.rpg.common.items.RpgItemType; +import cz.neumimto.rpg.common.items.*; import cz.neumimto.rpg.common.logging.Log; -import cz.neumimto.rpg.common.items.AbstractItemService; -import cz.neumimto.rpg.common.items.RpgItemStackImpl; import cz.neumimto.rpg.spigot.items.SpigotRpgItemType; import de.tr7zw.nbtapi.NBTCompoundList; import de.tr7zw.nbtapi.NBTItem; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/SpigotDamageListener.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/SpigotDamageListener.java index 80a66f04c..b64eb5cef 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/SpigotDamageListener.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/SpigotDamageListener.java @@ -5,14 +5,14 @@ import cz.neumimto.rpg.common.ResourceLoader; import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.configuration.PluginConfig; +import cz.neumimto.rpg.common.damage.AbstractDamageListener; import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.entity.IEntityType; import cz.neumimto.rpg.common.events.damage.IEntityWeaponDamageEarlyEvent; +import cz.neumimto.rpg.common.inventory.InventoryHandler; import cz.neumimto.rpg.common.items.RpgItemStack; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; -import cz.neumimto.rpg.common.damage.AbstractDamageListener; -import cz.neumimto.rpg.common.inventory.InventoryHandler; import cz.neumimto.rpg.spigot.SpigotRpg; import cz.neumimto.rpg.spigot.damage.SpigotDamageService; import cz.neumimto.rpg.spigot.entities.ISpigotEntity; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/SpigotInventoryListener.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/SpigotInventoryListener.java index a78bf2c18..acddbc627 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/SpigotInventoryListener.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/SpigotInventoryListener.java @@ -5,6 +5,7 @@ import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.gui.Gui; +import cz.neumimto.rpg.common.inventory.InventoryHandler; import cz.neumimto.rpg.common.inventory.ManagedSlot; import cz.neumimto.rpg.common.inventory.RpgInventory; import cz.neumimto.rpg.common.items.ItemClass; @@ -12,9 +13,8 @@ import cz.neumimto.rpg.common.items.RpgItemType; 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.PlayerSkillContext; -import cz.neumimto.rpg.common.inventory.InventoryHandler; +import cz.neumimto.rpg.common.skills.SkillService; import cz.neumimto.rpg.spigot.SpigotRpg; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import cz.neumimto.rpg.spigot.entities.players.SpigotCharacterService; @@ -50,7 +50,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import javax.swing.event.ChangeEvent; import java.util.Map; import java.util.Optional; @@ -415,7 +414,6 @@ public void onInteract(InventoryClickEvent event) { ManagedSlot managedSlot = rpgInventory.getManagedSlots().get(slotId); - Optional future = itemService.getRpgItemStack(cursor); Optional original = itemService.getRpgItemStack(currentItem); diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/skillbinds/OnKeyPress.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/skillbinds/OnKeyPress.java index 09b1020cf..9d7fb8c7b 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/skillbinds/OnKeyPress.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/listeners/skillbinds/OnKeyPress.java @@ -1,8 +1,8 @@ package cz.neumimto.rpg.spigot.listeners.skillbinds; +import cz.neumimto.rpg.common.commands.SkillsCommandFacade; import cz.neumimto.rpg.common.localization.LocalizationService; import cz.neumimto.rpg.common.skills.SkillService; -import cz.neumimto.rpg.common.commands.SkillsCommandFacade; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import cz.neumimto.rpg.spigot.entities.players.SpigotCharacterService; import cz.neumimto.rpg.spigot.inventory.SpigotInventoryService; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/resources/SpigotResourceManager.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/resources/SpigotResourceManager.java index b86578cc7..3140f8831 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/resources/SpigotResourceManager.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/resources/SpigotResourceManager.java @@ -1,8 +1,8 @@ package cz.neumimto.rpg.spigot.resources; import com.google.inject.Injector; -import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.ResourceManagerImpl; +import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.spigot.services.IRpgListener; import javax.inject.Inject; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/scripting/mechanics/Particles.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/scripting/mechanics/Particles.java index 732ce7b04..dfeb171dc 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/scripting/mechanics/Particles.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/scripting/mechanics/Particles.java @@ -31,9 +31,9 @@ public void spawnLigting(@NamedParam("e|at_entity") ISpigotEntity entity) { @Handler @Function("sound") public void sound(@NamedParam("s|sound") Sound sound, - @NamedParam("l|location") Location l, - @NamedParam("v|volume") float volume, - @NamedParam("p|pitch") float pitch) { + @NamedParam("l|location") Location l, + @NamedParam("v|volume") float volume, + @NamedParam("p|pitch") float pitch) { l.getWorld().playSound(l, sound, volume, pitch); } @@ -49,14 +49,14 @@ public void spawnParticle(@NamedParam("e|at_entity") ISpigotEntity entity, @NamedParam("oz|offset_z") double offsetZ, @NamedParam("e|extra") double extra, @NamedParam("m|m_data") Material material - ) { + ) { Location pLoc = location; if (pLoc == null) { pLoc = entity.getEntity().getLocation(); } BlockData data = null; if (material != null) { - data = material.createBlockData(); + data = material.createBlockData(); } pLoc.getWorld().spawnParticle(particle, location, amount, offsetX, offsetY, offsetZ, extra, data); } diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/scripting/mechanics/SpigotEntityUtils.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/scripting/mechanics/SpigotEntityUtils.java index c83ee4808..183bdb547 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/scripting/mechanics/SpigotEntityUtils.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/scripting/mechanics/SpigotEntityUtils.java @@ -8,10 +8,8 @@ import cz.neumimto.rpg.nms.NMSHandler; import cz.neumimto.rpg.spigot.entities.ISpigotEntity; import org.bukkit.Location; -import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.util.Vector; @@ -19,8 +17,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import java.util.List; - import static cz.neumimto.nts.annotations.ScriptMeta.Handler; import static cz.neumimto.nts.annotations.ScriptMeta.NamedParam; @@ -36,7 +32,7 @@ public class SpigotEntityUtils implements NTScriptProxy { public Location getLocation( @NamedParam("e|entity") IEntity e ) { - return ((LivingEntity)e.getEntity()).getLocation(); + return ((LivingEntity) e.getEntity()).getLocation(); } @Handler diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Battery.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Battery.java index 032df3719..b3eeb05c1 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Battery.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Battery.java @@ -5,12 +5,12 @@ import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.entity.IEntityType; import cz.neumimto.rpg.common.entity.IReservable; +import cz.neumimto.rpg.common.entity.players.CharacterMana; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillNodes; import cz.neumimto.rpg.common.skills.SkillResult; import cz.neumimto.rpg.common.skills.tree.SkillType; -import cz.neumimto.rpg.common.entity.players.CharacterMana; import cz.neumimto.rpg.spigot.SpigotRpgPlugin; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import cz.neumimto.rpg.spigot.entities.players.SpigotCharacterService; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/FireBreath.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/FireBreath.java index 0bd589d8a..c16e4ed73 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/FireBreath.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/FireBreath.java @@ -37,9 +37,9 @@ public void init() { return Beam.BeamActionResult.CONTINUE; }; onTick = (tick, caster, distance, context, location, box, dir) -> { - box.radius = box.radius + tick*0.5; + box.radius = box.radius + tick * 0.5; LivingEntity entity = caster.getEntity(); - entity.getWorld().spawnParticle(Particle.FLAME, location, 5+tick*2, 0.175D, 0.275D, 0, 0.2D); + entity.getWorld().spawnParticle(Particle.FLAME, location, 5 + tick * 2, 0.175D, 0.275D, 0, 0.2D); }; } } diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/FireRemnant.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/FireRemnant.java index a4c2a5931..4020bbc55 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/FireRemnant.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/FireRemnant.java @@ -2,16 +2,16 @@ import com.google.auto.service.AutoService; import cz.neumimto.rpg.common.ResourceLoader; -import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.EffectBase; +import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.IEffect; import cz.neumimto.rpg.common.entity.IEffectConsumer; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillNodes; import cz.neumimto.rpg.common.skills.SkillResult; -import cz.neumimto.rpg.common.skills.types.ActiveSkill; import cz.neumimto.rpg.common.skills.mech.DamageMechanic; +import cz.neumimto.rpg.common.skills.types.ActiveSkill; import cz.neumimto.rpg.nms.NMSHandler; import cz.neumimto.rpg.spigot.Resourcepack; import cz.neumimto.rpg.spigot.SpigotRpgPlugin; @@ -131,8 +131,8 @@ public void process() { if (damage > 0) { nmsHandler.spawnFireworkExplosion(remnant.getLocation(), FireworkEffect.builder().withColor(Color.RED, - Color.YELLOW, - Color.fromRGB(214, 76, 45)) + Color.YELLOW, + Color.fromRGB(214, 76, 45)) .with(FireworkEffect.Type.BURST) .build(), remnant.getLocation().getWorld().getPlayers()); diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/GlacialCascade.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/GlacialCascade.java index 9fb2929a2..a722a74be 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/GlacialCascade.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/GlacialCascade.java @@ -2,8 +2,8 @@ import com.google.auto.service.AutoService; import cz.neumimto.rpg.common.ResourceLoader; -import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.EffectBase; +import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.effects.IEffect; import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.skills.ISkill; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Slash.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Slash.java index ca539c4ae..40c5c4a62 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Slash.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Slash.java @@ -6,7 +6,6 @@ import cz.neumimto.rpg.common.damage.DamageService; import cz.neumimto.rpg.common.effects.EffectService; import cz.neumimto.rpg.common.entity.IEntity; -import cz.neumimto.rpg.common.entity.players.IActiveCharacter; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillNodes; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Soar.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Soar.java index 6190ff4c0..e8206b6b9 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Soar.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/Soar.java @@ -2,7 +2,10 @@ import com.google.auto.service.AutoService; import cz.neumimto.rpg.common.ResourceLoader; -import cz.neumimto.rpg.common.effects.*; +import cz.neumimto.rpg.common.effects.CommonEffectTypes; +import cz.neumimto.rpg.common.effects.EffectService; +import cz.neumimto.rpg.common.effects.IEffect; +import cz.neumimto.rpg.common.effects.UnstackableEffectBase; import cz.neumimto.rpg.common.entity.IEntity; import cz.neumimto.rpg.common.skills.ISkill; import cz.neumimto.rpg.common.skills.PlayerSkillContext; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/SpigotSkillService.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/SpigotSkillService.java index 514993b8d..709684473 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/SpigotSkillService.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/SpigotSkillService.java @@ -3,11 +3,10 @@ import cz.neumimto.nts.NTScript; import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.gui.ISkillTreeInterfaceModel; -import cz.neumimto.rpg.common.scripting.NTScriptEngine; import cz.neumimto.rpg.common.scripting.SkillScriptHandlers; import cz.neumimto.rpg.common.skills.SkillResult; -import cz.neumimto.rpg.common.skills.types.ScriptSkill; import cz.neumimto.rpg.common.skills.SkillService; +import cz.neumimto.rpg.common.skills.types.ScriptSkill; import cz.neumimto.rpg.spigot.SpigotRpgPlugin; import cz.neumimto.rpg.spigot.effects.common.*; import org.bukkit.Material; @@ -41,11 +40,11 @@ public class SpigotSkillService extends SkillService { .withEnum(Sound.class) .withEnum(BlockFace.class) .withEnum(SkillResult.class) - .add(Vector.class.getConstructor(double.class, double.class, double.class), "vector", List.of("x","y","z")) + .add(Vector.class.getConstructor(double.class, double.class, double.class), "vector", List.of("x", "y", "z")) - .add(Math.class.getDeclaredMethod("max", double.class, double.class), List.of("a","b")) - .add(Math.class.getDeclaredMethod("min", double.class, double.class), List.of("a","b")) - .add(Math.class.getDeclaredMethod("pow", double.class, double.class), List.of("a","b")) + .add(Math.class.getDeclaredMethod("max", double.class, double.class), List.of("a", "b")) + .add(Math.class.getDeclaredMethod("min", double.class, double.class), List.of("a", "b")) + .add(Math.class.getDeclaredMethod("pow", double.class, double.class), List.of("a", "b")) .add(Math.class.getDeclaredMethod("abs", double.class), List.of("a")) .add(Math.class.getDeclaredMethod("sqrt", double.class), List.of("a")) .add(Math.class.getDeclaredMethod("ceil", double.class), List.of("a")) diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/TargetedBlockSkill.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/TargetedBlockSkill.java index a59da85f4..0738e3ef2 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/TargetedBlockSkill.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/TargetedBlockSkill.java @@ -12,7 +12,6 @@ import org.bukkit.entity.Player; import org.bukkit.util.RayTraceResult; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/TargetedEntitySkill.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/TargetedEntitySkill.java index 8dee0fa45..a5e9de481 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/TargetedEntitySkill.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/TargetedEntitySkill.java @@ -5,7 +5,6 @@ import cz.neumimto.rpg.common.Rpg; 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.events.skill.SkillTargetAttemptEvent; import cz.neumimto.rpg.common.skills.PlayerSkillContext; import cz.neumimto.rpg.common.skills.SkillNodes; diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/utils/Beam.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/utils/Beam.java index b3cb2122a..43fdb7c80 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/utils/Beam.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/utils/Beam.java @@ -6,7 +6,7 @@ import cz.neumimto.rpg.spigot.SpigotRpgPlugin; import cz.neumimto.rpg.spigot.entities.ISpigotEntity; import cz.neumimto.rpg.spigot.events.skill.SpigotSkillTargetAttemptEvent; -import org.bukkit.*; +import org.bukkit.Location; import org.bukkit.entity.LivingEntity; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.Vector; @@ -38,9 +38,9 @@ public class Beam extends BukkitRunnable { double beamDistance = 0; public Beam(ISpigotEntity caster, - double step, double gravityForce, double maxDistance, - PlayerSkillContext playerSkillContext, - OnTick onTick, OnEntityHit onTarget, OnHitGround onHitGround) { + double step, double gravityForce, double maxDistance, + PlayerSkillContext playerSkillContext, + OnTick onTick, OnEntityHit onTarget, OnHitGround onHitGround) { this.caster = caster.getEntity(); this.nCaster = caster; this.onTick = onTick; @@ -53,37 +53,37 @@ public Beam(ISpigotEntity caster, this.playerSkillContext = playerSkillContext; this.loc = this.caster.getEyeLocation(); this.dir = loc.getDirection().normalize().multiply(step); - this.box = new MutableBoundingBox(loc, step /2); + this.box = new MutableBoundingBox(loc, step / 2); } public void start(long period) { runTaskTimer(SpigotRpgPlugin.getInstance(), 0, period); - // new BukkitRunnable() { - // double t = 0; - // @Override - // public void run() { - // double radius = Math.sin(t); - // for (double angle = 0; angle < Math.PI * 2; angle += Math.PI / 8) { - // double x = Math.sin(angle) * radius; - // double z = Math.cos(angle) * radius; - // Vector v = new Vector(x, 0, z); - // v.rotateAroundX(caster.getLocation().getPitch() + 90F); - // v.rotateAroundY(-caster.getLocation().getYaw()); - // ParticleEffect.VILLAGER_HAPPY.display(0F, 0F, 0F, 0.004F, 1, loc.clone().add(v), 257D); - // } - // t += Math.PI / 8; - // if (t > Math.PI * 2) - // t = 0; - // loc.add(dir); - // } - // }.runTaskTimer(SpigotRpgPlugin.getInstance(), 0,1); + // new BukkitRunnable() { + // double t = 0; + // @Override + // public void run() { + // double radius = Math.sin(t); + // for (double angle = 0; angle < Math.PI * 2; angle += Math.PI / 8) { + // double x = Math.sin(angle) * radius; + // double z = Math.cos(angle) * radius; + // Vector v = new Vector(x, 0, z); + // v.rotateAroundX(caster.getLocation().getPitch() + 90F); + // v.rotateAroundY(-caster.getLocation().getYaw()); + // ParticleEffect.VILLAGER_HAPPY.display(0F, 0F, 0F, 0.004F, 1, loc.clone().add(v), 257D); + // } + // t += Math.PI / 8; + // if (t > Math.PI * 2) + // t = 0; + // loc.add(dir); + // } + // }.runTaskTimer(SpigotRpgPlugin.getInstance(), 0,1); } @Override public void run() { - MutableBoundingBox box = new MutableBoundingBox(loc, step /2); + MutableBoundingBox box = new MutableBoundingBox(loc, step / 2); if (beamDistance < maxDistance) { @@ -91,13 +91,13 @@ public void run() { loc.add(dir); if (gravityForce != 0) { - dir.add(new Vector(0, -gravityForce,0)); + dir.add(new Vector(0, -gravityForce, 0)); loc.setDirection(dir); } if (!loc.getBlock().isPassable()) { if (onHitGround != null) { - onHitGround.process(tick, beamDistance,nCaster, playerSkillContext, loc); + onHitGround.process(tick, beamDistance, nCaster, playerSkillContext, loc); } super.cancel(); return; @@ -148,11 +148,11 @@ public interface OnEntityHit { @ScriptMeta.ScriptTarget BeamActionResult process(@ScriptMeta.NamedParam("target") ISpigotEntity target, - @ScriptMeta.NamedParam("tick") int tick, - @ScriptMeta.NamedParam("distance") double distance, - @ScriptMeta.NamedParam("caster") ISpigotEntity caster, - @ScriptMeta.NamedParam("context") PlayerSkillContext context, - @ScriptMeta.NamedParam("location") Location location); + @ScriptMeta.NamedParam("tick") int tick, + @ScriptMeta.NamedParam("distance") double distance, + @ScriptMeta.NamedParam("caster") ISpigotEntity caster, + @ScriptMeta.NamedParam("context") PlayerSkillContext context, + @ScriptMeta.NamedParam("location") Location location); } public interface OnTick { @@ -169,10 +169,10 @@ public interface OnHitGround { @ScriptMeta.ScriptTarget void process(@ScriptMeta.NamedParam("tick") int tick, - @ScriptMeta.NamedParam("distance") double distance, - @ScriptMeta.NamedParam("caster") ISpigotEntity caster, - @ScriptMeta.NamedParam("context") PlayerSkillContext context, - @ScriptMeta.NamedParam("location") Location location); + @ScriptMeta.NamedParam("distance") double distance, + @ScriptMeta.NamedParam("caster") ISpigotEntity caster, + @ScriptMeta.NamedParam("context") PlayerSkillContext context, + @ScriptMeta.NamedParam("location") Location location); } } \ No newline at end of file diff --git a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/utils/MutableBoundingBox.java b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/utils/MutableBoundingBox.java index f34699abf..af9c92ecd 100644 --- a/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/utils/MutableBoundingBox.java +++ b/Implementations/Spigot/src/main/java/cz/neumimto/rpg/spigot/skills/utils/MutableBoundingBox.java @@ -34,25 +34,25 @@ public void moveAt(Location currentLoc) { public void draw() { int particleDistance = 1; - int _minX = (int) (minX*100); - int _minY = (int) (minY*100); - int _minZ = (int) (minZ*100); - int _maxX = (int) (maxX*100); - int _maxY = (int) (maxY*100); - int _maxZ = (int) (maxZ*100); - - for (double x = _minX; x <= _maxX; x+=particleDistance) { - for (double y = _minY; y <= _maxY; y+=particleDistance) { - for (double z = _minZ; z <= _maxZ; z+=particleDistance) { + int _minX = (int) (minX * 100); + int _minY = (int) (minY * 100); + int _minZ = (int) (minZ * 100); + int _maxX = (int) (maxX * 100); + int _maxY = (int) (maxY * 100); + int _maxZ = (int) (maxZ * 100); + + for (double x = _minX; x <= _maxX; x += particleDistance) { + for (double y = _minY; y <= _maxY; y += particleDistance) { + for (double z = _minZ; z <= _maxZ; z += particleDistance) { boolean edge = false; - if ((x == _minX || x == _maxX) && (y == _minY || y == _maxY)) edge = true; - if ((z == _minZ || z == _maxZ) && ( y == _minY || y == _maxY)) edge = true; - if ((x == _minX || x == _maxX) && ( z == _minZ || z == _maxZ)) edge = true; + if ((x == _minX || x == _maxX) && (y == _minY || y == _maxY)) edge = true; + if ((z == _minZ || z == _maxZ) && (y == _minY || y == _maxY)) edge = true; + if ((x == _minX || x == _maxX) && (z == _minZ || z == _maxZ)) edge = true; if (edge) { world.spawnParticle(Particle.VILLAGER_HAPPY, - new Location(world, x/100, y/100, z/100), - 1,0,0,0, + new Location(world, x / 100, y / 100, z / 100), + 1, 0, 0, 0, 0); } } diff --git a/Implementations/Spigot/src/test/java/cz/neumimto/rpg/spigot/SpigotTests.java b/Implementations/Spigot/src/test/java/cz/neumimto/rpg/spigot/SpigotTests.java index 249acd585..4a5d70d5c 100644 --- a/Implementations/Spigot/src/test/java/cz/neumimto/rpg/spigot/SpigotTests.java +++ b/Implementations/Spigot/src/test/java/cz/neumimto/rpg/spigot/SpigotTests.java @@ -8,13 +8,13 @@ import cz.neumimto.rpg.common.classes.ClassService; import cz.neumimto.rpg.common.configuration.PluginConfig; import cz.neumimto.rpg.common.entity.players.CharacterService; +import cz.neumimto.rpg.common.entity.players.PreloadCharacter; import cz.neumimto.rpg.common.entity.players.classes.ClassDefinition; import cz.neumimto.rpg.common.entity.players.classes.PlayerClassData; import cz.neumimto.rpg.common.model.CharacterClass; 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.entity.players.PreloadCharacter; import cz.neumimto.rpg.spigot.entities.players.ISpigotCharacter; import org.bukkit.Bukkit; import org.junit.jupiter.api.AfterAll; diff --git a/Peristence/Common-Tests/src/main/java/cz/neumimto/persistence/TestHelper.java b/Peristence/Common-Tests/src/main/java/cz/neumimto/persistence/TestHelper.java index c7e40f638..16475f1e0 100644 --- a/Peristence/Common-Tests/src/main/java/cz/neumimto/persistence/TestHelper.java +++ b/Peristence/Common-Tests/src/main/java/cz/neumimto/persistence/TestHelper.java @@ -31,8 +31,8 @@ public static CharacterBaseImpl createCharacterBase() { new HashSet<>(Arrays.asList(new DateKeyPair("uq1"), new DateKeyPair("uq2")))); characterBase.setSpellbookPages(new String[][]{ - {"test", "test2",null,"123"}, - {null, null,null,null} + {"test", "test2", null, "123"}, + {null, null, null, null} }); return characterBase; diff --git a/Peristence/Common-Tests/src/main/java/cz/neumimto/rpg/common/RpgTests.java b/Peristence/Common-Tests/src/main/java/cz/neumimto/rpg/common/RpgTests.java index dd587cb8c..afd684e0f 100644 --- a/Peristence/Common-Tests/src/main/java/cz/neumimto/rpg/common/RpgTests.java +++ b/Peristence/Common-Tests/src/main/java/cz/neumimto/rpg/common/RpgTests.java @@ -18,13 +18,16 @@ import cz.neumimto.rpg.common.items.ItemService; import cz.neumimto.rpg.common.localization.Arg; import cz.neumimto.rpg.common.localization.LocalizationService; -import cz.neumimto.rpg.common.permissions.PermissionService; import cz.neumimto.rpg.common.model.EquipedSlot; +import cz.neumimto.rpg.common.permissions.PermissionService; import cz.neumimto.rpg.common.scripting.NTScriptEngine; import cz.neumimto.rpg.common.skills.SkillService; import java.nio.file.Path; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.concurrent.Executor; import java.util.function.BiFunction; import java.util.function.Consumer; diff --git a/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/JDBCersistenceHandler.java b/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/JDBCersistenceHandler.java index 85edd2b4b..57e587550 100644 --- a/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/JDBCersistenceHandler.java +++ b/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/JDBCersistenceHandler.java @@ -3,17 +3,17 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; +import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.model.BaseCharacterAttribute; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.model.CharacterClass; import cz.neumimto.rpg.common.model.CharacterSkill; -import cz.neumimto.rpg.common.assets.AssetService; import cz.neumimto.rpg.common.persistance.dao.IPersistenceHandler; -import cz.neumimto.rpg.persistence.jdbc.migrations.DbMigrationsService; import cz.neumimto.rpg.common.persistance.model.BaseCharacterAttributeImpl; import cz.neumimto.rpg.common.persistance.model.CharacterBaseImpl; import cz.neumimto.rpg.common.persistance.model.CharacterClassImpl; import cz.neumimto.rpg.common.persistance.model.CharacterSkillImpl; +import cz.neumimto.rpg.persistence.jdbc.migrations.DbMigrationsService; import java.io.IOException; import java.util.Arrays; diff --git a/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/dao/JdbcPlayerDao.java b/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/dao/JdbcPlayerDao.java index 60795f8bf..2462bf4c0 100644 --- a/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/dao/JdbcPlayerDao.java +++ b/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/dao/JdbcPlayerDao.java @@ -6,11 +6,11 @@ import cz.neumimto.rpg.common.model.CharacterSkill; import cz.neumimto.rpg.common.model.TimestampEntity; import cz.neumimto.rpg.common.persistance.dao.IPlayerDao; -import cz.neumimto.rpg.persistence.jdbc.NamedPreparedStatement; -import cz.neumimto.rpg.persistence.jdbc.converters.EquipedSlot2Json; import cz.neumimto.rpg.common.persistance.model.CharacterBaseImpl; import cz.neumimto.rpg.common.persistance.model.CharacterClassImpl; import cz.neumimto.rpg.common.persistance.model.CharacterSkillImpl; +import cz.neumimto.rpg.persistence.jdbc.NamedPreparedStatement; +import cz.neumimto.rpg.persistence.jdbc.converters.EquipedSlot2Json; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/migrations/DbMigrationsService.java b/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/migrations/DbMigrationsService.java index 7ea70af8c..3bf5854b2 100644 --- a/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/migrations/DbMigrationsService.java +++ b/Peristence/Database/src/main/java/cz/neumimto/rpg/persistence/jdbc/migrations/DbMigrationsService.java @@ -135,7 +135,7 @@ private String toString(InputStreamReader inputStreamReader) { StringBuffer sb = new StringBuffer(); String str; try { - while((str = reader.readLine())!= null){ + while ((str = reader.readLine()) != null) { sb.append(str); } } catch (IOException e) { diff --git a/Peristence/FlatFiles/src/main/java/cz/neumimto/rpg/persistence/flatfiles/converters/ConfigConverter.java b/Peristence/FlatFiles/src/main/java/cz/neumimto/rpg/persistence/flatfiles/converters/ConfigConverter.java index fca1872dc..d93075bf6 100644 --- a/Peristence/FlatFiles/src/main/java/cz/neumimto/rpg/persistence/flatfiles/converters/ConfigConverter.java +++ b/Peristence/FlatFiles/src/main/java/cz/neumimto/rpg/persistence/flatfiles/converters/ConfigConverter.java @@ -266,7 +266,7 @@ public static CharacterBase fromConfig(FileConfig config) { characterBase.getUniqueSkillpoints().putAll(stringSetMap); - List> spellbookPages = config.getOrElse(SPELLBOOK, new ArrayList<>()); + List> spellbookPages = config.getOrElse(SPELLBOOK, new ArrayList<>()); String[][] pages = spellbookPages .stream() .map((l) -> l.toArray(new String[l.size()])) diff --git a/Peristence/FlatFiles/src/test/java/cz/neumimto/rpg/persistence/flatfiles/converters/ConfigConverterTest.java b/Peristence/FlatFiles/src/test/java/cz/neumimto/rpg/persistence/flatfiles/converters/ConfigConverterTest.java index 1c4c12455..21a27d9bb 100644 --- a/Peristence/FlatFiles/src/test/java/cz/neumimto/rpg/persistence/flatfiles/converters/ConfigConverterTest.java +++ b/Peristence/FlatFiles/src/test/java/cz/neumimto/rpg/persistence/flatfiles/converters/ConfigConverterTest.java @@ -4,14 +4,14 @@ import cz.neumimto.rpg.common.Rpg; import cz.neumimto.rpg.common.RpgTests; import cz.neumimto.rpg.common.entity.players.IActiveCharacter; +import cz.neumimto.rpg.common.inventory.AbstractInventoryService; import cz.neumimto.rpg.common.inventory.InventoryService; import cz.neumimto.rpg.common.model.CharacterBase; import cz.neumimto.rpg.common.model.CharacterClass; import cz.neumimto.rpg.common.model.DateKeyPair; import cz.neumimto.rpg.common.model.EquipedSlot; -import cz.neumimto.rpg.common.inventory.AbstractInventoryService; -import cz.neumimto.rpg.persistence.flatfiles.dao.FlatFilePlayerDao; import cz.neumimto.rpg.common.persistance.model.CharacterBaseImpl; +import cz.neumimto.rpg.persistence.flatfiles.dao.FlatFilePlayerDao; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -123,7 +123,6 @@ public void testCharacterLoadAndSave() { } - } } \ No newline at end of file diff --git a/README.md b/README.md index 74cbed9e5..816af4827 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,14 @@ # NT-RPG + A new rpg plugin for Sponge Discord server - There are two discords you can contact me for support - https://discord.gg/EVATNNn (much larger community, for various types of plugins) -- https://discord.gg/YerUbgd - +- https://discord.gg/YerUbgd Check [wiki](https://github.com/NeumimTo/NT-RPG/wiki) for more informations ### Building from source + gradle jar -x test - the jar is then located within the server directory in project root \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8ec5e99d7..5a5fc78f1 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ subprojects { from { configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } } - exclude("**/*.DSA", "**/*.SF", "**/*pom.xml", "**/*pom.properties",'**/module-info.class', "**/*.php",) + exclude("**/*.DSA", "**/*.SF", "**/*pom.xml", "**/*pom.properties", '**/module-info.class', "**/*.php",) } dependencies { diff --git a/gradle.properties b/gradle.properties index 0c3603a45..d320a3c84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,13 @@ subp_version=2.2.0-SNAPSHOT -p_spigot_version = 2.1.0-SNAPSHOT-13 +p_spigot_version=2.1.0-SNAPSHOT-13 # API nightconfig=3.6.3 parsii=4.0 guice=5.0.1 - # Common bytebuddy=1.12.1 acf=0.5.0-SNAPSHOT graal=21.1.0 - # Spigot autoservice=1.0 pluginannotations=1.2.3-SNAPSHOT @@ -24,10 +22,8 @@ mmoitems=6.5.5 mythiclib=1.0.17 mythicmobs=4.12.0 rpgregions=9e46ca8d - # Test gson=2.8.5 fastutil=8.2.1 junit5=5.7.2 - org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m \ No newline at end of file