Merge pull request #584 from Shynixn/development

Merge changes to master --release
Shynixn · Dec 9, 2024 · 0245a5e · 0245a5e
2 parents c7adc5b + 30e6e68
commit 0245a5e
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 143 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "com.github.shynixn"
-version = "7.7.0"
+version = "7.8.0"
 
 repositories {
     mavenLocal()
@@ -41,8 +41,8 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
 
     // Custom dependencies
-    implementation("com.github.shynixn.mcutils:common:2024.38")
-    implementation("com.github.shynixn.mcutils:packet:2024.49")
+    implementation("com.github.shynixn.mcutils:common:2024.39")
+    implementation("com.github.shynixn.mcutils:packet:2024.51")
     implementation("com.github.shynixn.mcutils:database:2024.8")
     implementation("com.github.shynixn.mcutils:sign:2024.3")
     implementation("com.github.shynixn.mcutils:guice:2024.2")
@@ -72,6 +72,11 @@ tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = "1.8"
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 /**
  * Include all but exclude debugging classes.
  */
@@ -124,6 +129,8 @@ tasks.register("pluginJarLatest", ShadowJar::class.java) {
     exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_20_R2/**")
     exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_20_R3/**")
     exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_20_R4/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_21_R1/**")
+    exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_21_R2/**")
     exclude("com/github/shynixn/mcutils/**")
     exclude("com/github/shynixn/mccoroutine/**")
     exclude("org/**")

diff --git a/docs/resources/arena-files/arena/arena_1.yml b/docs/resources/arena-files/arena/arena_1.yml
@@ -439,7 +439,6 @@ meta:
         yaw: 0.0
         pitch: 0.0
         world: "world"
-    walkingSpeed: 0.2
     joinMessage: "%blockball_lang_joinSuccessMessage%"
     leaveMessage: "%blockball_lang_leaveMessage%"
     signLines:
@@ -530,7 +529,6 @@ meta:
         yaw: 0.0
         pitch: 0.0
         world: "world"
-    walkingSpeed: 0.2
     joinMessage: "%blockball_lang_joinSuccessMessage%"
     leaveMessage: "%blockball_lang_leaveMessage%"
     signLines:

diff --git a/docs/resources/arena-files/arena/arena_2.yml b/docs/resources/arena-files/arena/arena_2.yml
@@ -516,7 +516,6 @@ meta:
         yaw: 0.0
         pitch: 0.0
         world: "world"
-    walkingSpeed: 0.2
     joinMessage: "%blockball_lang_joinSuccessMessage%"
     leaveMessage: "%blockball_lang_leaveMessage%"
     signLines:
@@ -613,7 +612,6 @@ meta:
         yaw: 0.0
         pitch: 0.0
         world: "world"
-    walkingSpeed: 0.2
     joinMessage: "%blockball_lang_joinSuccessMessage%"
     leaveMessage: "%blockball_lang_leaveMessage%"
     signLines:

diff --git a/src/main/java/com/github/shynixn/blockball/BlockBallDependencyInjectionModule.kt b/src/main/java/com/github/shynixn/blockball/BlockBallDependencyInjectionModule.kt
@@ -33,7 +33,7 @@ import com.github.shynixn.mcutils.packet.impl.service.ChatMessageServiceImpl
 import com.github.shynixn.mcutils.packet.impl.service.ItemServiceImpl
 import com.github.shynixn.mcutils.packet.impl.service.PacketServiceImpl
 import com.github.shynixn.mcutils.packet.impl.service.RayTracingServiceImpl
-import com.github.shynixn.mcutils.packet.nms.v1_21_R2.AreaSelectionServiceImpl
+import com.github.shynixn.mcutils.packet.nms.v1_21_R3.AreaSelectionServiceImpl
 import com.github.shynixn.mcutils.sign.SignService
 import com.github.shynixn.mcutils.sign.SignServiceImpl
 import kotlinx.coroutines.CoroutineDispatcher

diff --git a/src/main/java/com/github/shynixn/blockball/BlockBallLanguageImpl.kt b/src/main/java/com/github/shynixn/blockball/BlockBallLanguageImpl.kt
diff --git a/src/main/java/com/github/shynixn/blockball/BlockBallPlugin.kt b/src/main/java/com/github/shynixn/blockball/BlockBallPlugin.kt
@@ -71,10 +71,11 @@ class BlockBallPlugin : JavaPlugin() {
                 Version.VERSION_1_20_R4,
                 Version.VERSION_1_21_R1,
                 Version.VERSION_1_21_R2,
+                Version.VERSION_1_21_R3,
             )
         } else {
             arrayOf(
-                Version.VERSION_1_21_R2,
+                Version.VERSION_1_21_R3,
             )
         }
 

diff --git a/src/main/java/com/github/shynixn/blockball/entity/GameStorage.kt b/src/main/java/com/github/shynixn/blockball/entity/GameStorage.kt
@@ -43,11 +43,6 @@ class GameStorage {
      */
     var gameMode: GameMode = GameMode.SURVIVAL
 
-    /**
-     * Walking Speed of the player.
-     */
-    var walkingSpeed: Double = 1.0
-
     /**
      * Counter of enemy goals.
      */

diff --git a/src/main/java/com/github/shynixn/blockball/entity/TeamMeta.kt b/src/main/java/com/github/shynixn/blockball/entity/TeamMeta.kt
@@ -26,9 +26,6 @@ class TeamMeta {
     /** Goal properties of the team. */
     val goal: Selection = Selection()
 
-    /** WalkingSpeed of the players in this team. */
-    var walkingSpeed: Double = 0.2
-
     var armor: Array<String?> = arrayOfNulls(4)
 
     var inventory: Array<String?> = arrayOfNulls(36)

diff --git a/src/main/java/com/github/shynixn/blockball/impl/SoccerGameImpl.kt b/src/main/java/com/github/shynixn/blockball/impl/SoccerGameImpl.kt
@@ -849,7 +849,6 @@ abstract class SoccerGameImpl(
         stats.gameMode = player.gameMode
         stats.armorContents = player.inventory.armorContents.clone()
         stats.inventoryContents = player.inventory.contents.clone()
-        stats.walkingSpeed = player.walkSpeed.toDouble()
         stats.level = player.level
         stats.exp = player.exp.toDouble()
         stats.maxHealth = player.maxHealth
@@ -861,7 +860,6 @@ abstract class SoccerGameImpl(
         player.allowFlight = false
         player.isFlying = false
         player.gameMode = arena.meta.lobbyMeta.gamemode
-        player.walkSpeed = teamMeta.walkingSpeed.toFloat()
         player.foodLevel = 20
         player.level = 0
         player.exp = 0.0F
@@ -912,7 +910,6 @@ abstract class SoccerGameImpl(
         player.gameMode = stats.gameMode
         player.allowFlight = stats.gameMode == GameMode.CREATIVE
         player.isFlying = false
-        player.walkSpeed = stats.walkingSpeed.toFloat()
         player.level = stats.level
         player.scoreboard = Bukkit.getScoreboardManager()!!.newScoreboard
         player.exp = stats.exp.toFloat()

diff --git a/src/main/resources/arena_sample.yml b/src/main/resources/arena_sample.yml
@@ -320,8 +320,6 @@ meta:
         yaw: 0.0
         pitch: 0.0
         world: "world"
-    # Player walking speed.
-    walkingSpeed: 0.2
     # The armor a player receives when joining a game. Should only be set inGame.
     armor:
       - null
@@ -389,7 +387,6 @@ meta:
         yaw: 0.0
         pitch: 0.0
         world: "world"
-    walkingSpeed: 0.2
     armor:
       - null
       - null

diff --git a/src/main/resources/plugin-legacy.yml b/src/main/resources/plugin-legacy.yml
@@ -1,5 +1,5 @@
 name: BlockBall
-version: 7.7.0
+version: 7.8.0
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.BlockBallPlugin

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: BlockBall
-version: 7.7.0
+version: 7.8.0
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.BlockBallPlugin