diff --git a/build.gradle.kts b/build.gradle.kts index aa14385..681b97d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { implementation(kotlin("reflect")) implementation("net.dv8tion:JDA:4.1.1_155") implementation("com.google.guava:guava:29.0-jre") + implementation("commons-codec:commons-codec:1.14") compileOnly(files("./libs/CorpseReborn.jar")) compileOnly(files("./libs/ActionBarAPI.jar")) compileOnly(files("./libs/ProtocolLib.jar")) diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/Resourcepack.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/Resourcepack.kt index 5343d44..fdcd79c 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/Resourcepack.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/Resourcepack.kt @@ -1,9 +1,11 @@ package de.moritzruth.spigot_ttt +import org.apache.commons.codec.binary.Hex import org.bukkit.Material object Resourcepack { const val url = "https://github.com/moritzruth/spigot-ttt/raw/master/resourcepack.zip" + val checksum = Hex.decodeHex("9333ca9c1e5f6ade64575b6007ded85a94450753") private const val NAMESPACE = "ttt:" object Items { diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/ResourcepackCommand.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/ResourcepackCommand.kt index 9ef8e9c..007047e 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/ResourcepackCommand.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/ResourcepackCommand.kt @@ -19,7 +19,7 @@ class ResourcepackCommand: CommandExecutor { if (sender !is Player) { sender.sendMessage("$COMMAND_RESPONSE_PREFIX${ChatColor.RED}Dieser Befehl kan nur als Spieler verwendet werden.") } else { - sender.setResourcePack(Resourcepack.url) + sender.setResourcePack(Resourcepack.url, Resourcepack.checksum) } return true diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/TTTListener.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/TTTListener.kt index 20e139d..62dd3b4 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/TTTListener.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/TTTListener.kt @@ -37,8 +37,7 @@ object TTTListener: Listener { ) event.joinMessage = "${TTTPlugin.prefix}${player.displayName} ${ChatColor.GOLD}hat das Spiel betreten." - player.setResourcePack(Resourcepack.url) - player.sendMessage("${TTTPlugin.prefix}${ChatColor.GREEN}Das Resourcepack wird heruntergeladen.") + player.setResourcePack(Resourcepack.url, Resourcepack.checksum) } @EventHandler @@ -46,7 +45,8 @@ object TTTListener: Listener { when (event.status) { PlayerResourcePackStatusEvent.Status.DECLINED -> { event.player.sendMessage("${TTTPlugin.prefix}${ChatColor.RED}Du hast das Resourcepack abgelehnt.") - event.player.sendMessage("${TTTPlugin.prefix}${ChatColor.GREEN}${ChatColor.BOLD}Wenn du es dir anders überlegt hast, tritt dem Server neu bei.") + event.player.sendMessage("${TTTPlugin.prefix}${ChatColor.GREEN}${ChatColor.BOLD}Wenn du es dir anders " + + "überlegst, entferne den Server aus deiner Serverlist und tritt ihm erneut bei.") } PlayerResourcePackStatusEvent.Status.FAILED_DOWNLOAD -> { event.player.sendMessage("${TTTPlugin.prefix}${ChatColor.RED}Das Laden des Resourcepacks " +