From 20664cd5c1aeccac1ea6d6d363e3e821549bad80 Mon Sep 17 00:00:00 2001 From: Syrent Date: Wed, 10 Apr 2024 09:35:29 +0330 Subject: [PATCH] chore: update dependencies --- build.gradle.kts | 28 +++++++++++++------ .../spigot/VelocityVanishSpigot.kt | 2 +- .../spigot/core/VanishManager.kt | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4b511912..910c0ee2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ plugins { id("com.github.johnrengelman.shadow") version "8.1.1" id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7" id("org.screamingsandals.nms-mapper") version "1.4.9" - id("xyz.jpenilla.run-paper") version "2.2.2" + id("xyz.jpenilla.run-paper") version "2.2.3" id("io.papermc.hangar-publish-plugin") version "0.1.0" id("com.modrinth.minotaur") version "2.8.6" } @@ -90,12 +90,15 @@ repositories { // Velocitab maven("https://repo.william278.net/releases") + + // ForestRedisAPI + maven("https://jitpack.io/") } dependencies { compileOnly("com.velocitypowered:velocity-api:3.1.1") - compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") - compileOnly("dev.folia:folia-api:1.20.1-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") + compileOnly("dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT") compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0") compileOnly("me.clip:placeholderapi:2.11.5") compileOnly("xyz.jpenilla:squaremap-api:1.2.1") @@ -106,6 +109,9 @@ dependencies { compileOnly("io.netty:netty-all:4.1.101.Final") compileOnly("net.william278:velocitab:1.5.1") + implementation("commons-io:commons-io:2.15.1") + + // SayanChat 2.8.1 // ProCosmetics // ServerListPlus Velocity (From extradeps) @@ -117,14 +123,20 @@ dependencies { implementation("io.papermc:paperlib:1.0.8") implementation("org.bstats:bstats-bukkit:3.0.2") + // Redis +// implementation("it.ozimov:embedded-redis:0.7.3") +// implementation("redis.clients:jedis:4.3.1") +// implementation("commons-logging:commons-logging:1.2") + implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") + // gson does not exist in legacy minecraft version implementation("com.google.code.gson:gson:2.10.1") implementation("com.github.cryptomorin:XSeries:9.7.0") { isTransitive = false } - implementation("net.kyori:adventure-api:4.15.0") + implementation("net.kyori:adventure-api:4.16.0") implementation("net.kyori:adventure-platform-bukkit:4.3.2") - implementation("net.kyori:adventure-text-minimessage:4.15.0") + implementation("net.kyori:adventure-text-minimessage:4.16.0") implementation("cloud.commandframework:cloud-paper:tooltips-SNAPSHOT") implementation("cloud.commandframework:cloud-minecraft-extras:tooltips-SNAPSHOT") @@ -172,11 +184,11 @@ val extraDependencies = mapOf( tasks { runServer { - minecraftVersion("1.20.2") + minecraftVersion("1.20.4") } runPaper { - folia.registerTask() +// folia.registerTask() } compileJava { @@ -218,7 +230,7 @@ tasks { archiveFileName.set("${rootProject.name}_${project.version}.jar") exclude("META-INF/**") from("LICENSE") - minimize() +// minimize() relocate("io.papermc.lib", "ir.syrent.velocityvanish.dependencies.io.papermc.lib") relocate("io.leangen", "ir.syrent.velocityvanish.dependencies.io.leangen") diff --git a/src/main/java/ir/syrent/velocityvanish/spigot/VelocityVanishSpigot.kt b/src/main/java/ir/syrent/velocityvanish/spigot/VelocityVanishSpigot.kt index beeef0f4..7923e3df 100644 --- a/src/main/java/ir/syrent/velocityvanish/spigot/VelocityVanishSpigot.kt +++ b/src/main/java/ir/syrent/velocityvanish/spigot/VelocityVanishSpigot.kt @@ -10,9 +10,9 @@ import com.google.gson.JsonObject import com.jeff_media.updatechecker.UpdateCheckSource import com.jeff_media.updatechecker.UpdateChecker import io.papermc.lib.PaperLib -import ir.syrent.velocityvanish.spigot.command.VanishCommand import ir.syrent.velocityvanish.spigot.bridge.BukkitBridge import ir.syrent.velocityvanish.spigot.bridge.BukkitBridgeManager +import ir.syrent.velocityvanish.spigot.command.VanishCommand import ir.syrent.velocityvanish.spigot.core.VanishManager import ir.syrent.velocityvanish.spigot.hook.DependencyManager import ir.syrent.velocityvanish.spigot.listener.* diff --git a/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt b/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt index 3c10f840..6a4bc5bb 100644 --- a/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt +++ b/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt @@ -295,7 +295,7 @@ class VanishManager( updateTabState(player, GameMode.SURVIVAL) - val canFly = player.isOp || player.gameMode == GameMode.CREATIVE || flyingPlayers.contains(player.uniqueId) || player.gameMode == GameMode.SPECTATOR || player.gameMode == GameMode.CREATIVE + val canFly = player.isOp || flyingPlayers.contains(player.uniqueId) || player.gameMode == GameMode.SPECTATOR || player.gameMode == GameMode.CREATIVE player.allowFlight = canFly player.isFlying = canFly flyingPlayers.remove(player.uniqueId)