GH-189 EternalCombat 2.0.

.github/CONTRIBUTING.md

@@ -18,7 +18,7 @@ We expect all contributors to follow our [code of conduct](CODE_OF_CONDUCT.md).
 
 If you find an issue with the plugin, please report it in
 the [Issues tab](https://github.com/EternalCodeTeam/EternalCombat/issues). Please provide as much information as
-possible, including the version of Minecraft and the plugin you are using, as well as any error messages or logs.
+possible, including the version of Minecraft and the plugin you are using, as well as any error messagesSettings or logs.
 
 ### Compatibility
 

.github/workflows/gradle.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ "master" ]
   pull_request:
-    branches: [ "master" ]
 
 permissions:
   contents: read
@@ -23,7 +22,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Cache Gradle
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: >-
@@ -37,7 +36,7 @@ jobs:
         with:
           arguments: shadowJar
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4
         with:
           name: 'Successfully build EternalCombat'
           path: eternalcombat-plugin/build/libs/*.jar

README.md

@@ -72,15 +72,15 @@ with Maven:
 
 with Gradle:
 ```kts
-compileOnly("com.eternalcode:eternalcombat-api:1.3.3")
+compileOnly("com.eternalcode:eternalcombat-api:1.3.2")
 ```
 
 with Maven:
 ```xml
 <dependency>
   <groupId>com.eternalcode</groupId>
   <artifactId>eternalcombat-api</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.2</version>
   <scope>provided</scope>
 </dependency>
 ```
@@ -94,4 +94,4 @@ more information on how to contribute and our [code of conduct](./.github/CODE_O
 
 If you find an issue with the plugin, please report it in
 the [Issues tab](https://github.com/EternalCodeTeam/EternalCombat/issues). Please provide as much information as
-possible, including the version of Minecraft and the plugin you are using, as well as any error messages or logs
+possible, including the version of Minecraft and the plugin you are using, as well as any error messagesSettings or logs

buildSrc/src/main/kotlin/Versions.kt

@@ -6,13 +6,16 @@ object Versions {
     const val JUNIT_JUPITER_PARAMS = "5.10.3"
     const val JUNIT_JUPITER_ENGINE = "5.10.3"
 
+    const val JETBRAINS_ANNOTATIONS = "24.1.0"
+
     const val ETERNALCODE_COMMONS = "1.1.3"
-    // TODO: Multification.
+    const val MULTIFICATION = "1.1.4"
+    const val PACKETS_EVENTS = "2.7.0"
 
     const val ADVENTURE_PLATFORM_BUKKIT = "4.3.4"
-    const val ADVENTURE_TEXT_MINIMESSAGE = "4.17.0"
+    const val ADVENTURE_API = "4.17.0"
 
-    const val LITE_COMMANDS = "2.8.9"
+    const val LITE_COMMANDS = "3.7.0"
     const val OKAERI_CONFIGS_YAML_BUKKIT = "5.0.3"
     const val OKAERI_CONFIGS_SERDES_COMMONS = "5.0.3"
     const val OKAERI_CONFIGS_SERDES_BUKKIT = "5.0.3"
@@ -27,6 +30,7 @@ object Versions {
     const val WORLD_GUARD_BUKKIT = "7.0.9"
 
     const val PLACEHOLDER_API = "2.11.6"
+    const val PAPERLIB = "1.0.8"
 
 }
 

buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts

@@ -1,36 +1,15 @@
 plugins {
     `java-library`
-    checkstyle
 }
 
 group = "com.eternalcode"
-version = "1.3.3"
+version = "2.0.0-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-checkstyle {
-    toolVersion = "10.17.0"
-
-    configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
-
-    maxErrors = 0
-    maxWarnings = 0
-}
-
-// https://github.com/JabRef/jabref/pull/10812/files#diff-49a96e7eea8a94af862798a45174e6ac43eb4f8b4bd40759b5da63ba31ec3ef7R267
-configurations.named("checkstyle") {
-    resolutionStrategy {
-        capabilitiesResolution {
-            withCapability("com.google.collections:google-collections") {
-                select("com.google.guava:guava:33.2.1-jre")
-            }
-        }
-    }
-}
-
 tasks.compileJava {
     options.compilerArgs = listOf("-Xlint:deprecation", "-parameters")
     options.encoding = "UTF-8"

buildSrc/src/main/kotlin/eternalcombat-publish.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "com.eternalcode"
-version = "1.3.3"
+version = "2.0.0-SNAPSHOT"
 
 java {
     withSourcesJar()

buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts

@@ -5,11 +5,12 @@ plugins {
 repositories {
     mavenCentral()
 
-    maven { url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") }
-    maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
-    maven { url = uri("https://repo.eternalcode.pl/releases") }
-    maven { url = uri("https://storehouse.okaeri.eu/repository/maven-public/") }
-    maven { url = uri("https://repo.panda-lang.org/releases") }
-    maven { url = uri("https://maven.enginehub.org/repo/") }
-    maven { url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")}
+    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    maven("https://papermc.io/repo/repository/maven-public/")
+    maven("https://repo.eternalcode.pl/releases")
+    maven("https://storehouse.okaeri.eu/repository/maven-public/")
+    maven("https://repo.panda-lang.org/releases")
+    maven("https://maven.enginehub.org/repo/")
+    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+    maven("https://repo.codemc.io/repository/maven-releases/")
 }

eternalcombat-api/build.gradle.kts

@@ -8,41 +8,5 @@ plugins {
 dependencies {
     // Spigot api
     compileOnlyApi("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
-
-    // kyori
-    api("net.kyori:adventure-platform-bukkit:${Versions.ADVENTURE_PLATFORM_BUKKIT}")
-    api("net.kyori:adventure-text-minimessage:${Versions.ADVENTURE_TEXT_MINIMESSAGE}")
-
-    // litecommands
-    api("dev.rollczi.litecommands:bukkit-adventure:${Versions.LITE_COMMANDS}")
-
-    // Okaeri configs
-    api("eu.okaeri:okaeri-configs-yaml-bukkit:${Versions.OKAERI_CONFIGS_YAML_BUKKIT}")
-    api("eu.okaeri:okaeri-configs-serdes-commons:${Versions.OKAERI_CONFIGS_SERDES_COMMONS}")
-    api("eu.okaeri:okaeri-configs-serdes-bukkit:${Versions.OKAERI_CONFIGS_SERDES_BUKKIT}")
-
-    // Panda utilities
-    api("org.panda-lang:panda-utilities:${Versions.PANDA_UTILITIES}")
-
-    // GitCheck
-    api("com.eternalcode:gitcheck:${Versions.GIT_CHECK}")
-
-    // commons
-    api("commons-io:commons-io:${Versions.APACHE_COMMONS}")
-
-    // bstats
-    api("org.bstats:bstats-bukkit:${Versions.B_STATS_BUKKIT}")
-
-    // caffeine
-    api("com.github.ben-manes.caffeine:caffeine:${Versions.CAFFEINE}")
-
-    api("com.eternalcode:eternalcode-commons-bukkit:${Versions.ETERNALCODE_COMMONS}")
-    api("com.eternalcode:eternalcode-commons-adventure:${Versions.ETERNALCODE_COMMONS}")
-
-    // worldguard
-    compileOnly("com.sk89q.worldguard:worldguard-bukkit:${Versions.WORLD_GUARD_BUKKIT}")
-
-    // PlaceholderAPI
-    compileOnlyApi("me.clip:placeholderapi:${Versions.PLACEHOLDER_API}")
-
+    api("org.jetbrains:annotations:${Versions.JETBRAINS_ANNOTATIONS}")
 }

eternalcombat-api/src/main/java/com/eternalcode/combat/EternalCombatApi.java

@@ -1,30 +1,27 @@
 package com.eternalcode.combat;
 
-import com.eternalcode.combat.config.implementation.PluginConfig;
-import com.eternalcode.combat.drop.DropKeepInventoryManager;
-import com.eternalcode.combat.drop.DropManager;
+import com.eternalcode.combat.fight.drop.DropKeepInventoryService;
 import com.eternalcode.combat.fight.FightManager;
+import com.eternalcode.combat.fight.drop.DropService;
 import com.eternalcode.combat.fight.effect.FightEffectService;
-import com.eternalcode.combat.fight.pearl.FightPearlManager;
-import com.eternalcode.combat.fight.tagout.FightTagOutService;
+import com.eternalcode.combat.fight.pearl.FightPearlService;
 import com.eternalcode.combat.region.RegionProvider;
+import com.eternalcode.combat.fight.tagout.FightTagOutService;
 
 public interface EternalCombatApi {
 
     FightManager getFightManager();
 
     RegionProvider getRegionProvider();
 
-    FightPearlManager getFightPearlManager();
+    FightPearlService getFightPearlService();
 
     FightTagOutService getFightTagOutService();
 
     FightEffectService getFightEffectService();
 
-    DropManager getDropManager();
-
-    DropKeepInventoryManager getDropKeepInventoryManager();
+    DropService getDropService();
 
-    PluginConfig getPluginConfig();
+    DropKeepInventoryService getDropKeepInventoryService();
 
 }