From 24453d0e1ab3ca5b5cc3097fcc90bde68793d340 Mon Sep 17 00:00:00 2001 From: William278 Date: Wed, 24 Jan 2024 23:06:25 +0000 Subject: [PATCH] build: Require Java 17, Minecraft 1.17.1 --- .scripts/ensure-java-16 | 19 ------------------- README.md | 2 +- bukkit/build.gradle | 2 +- bukkit/src/main/resources/plugin.yml | 2 +- docs/Setup.md | 2 +- docs/Unsupported-Versions.md | 3 ++- gradle.properties | 4 ++-- jitpack.yml | 12 ------------ 8 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 .scripts/ensure-java-16 delete mode 100644 jitpack.yml diff --git a/.scripts/ensure-java-16 b/.scripts/ensure-java-16 deleted file mode 100644 index 9bb37ccc..00000000 --- a/.scripts/ensure-java-16 +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -JV=$(java -version 2>&1 >/dev/null | head -1) -echo "$JV" | sed -E 's/^.*version "([^".]*)\.[^"]*".*$/\1/' - -if [ "$JV" != 16 ]; then - case "$1" in - install) - echo "installing sdkman..." - curl -s "https://get.sdkman.io" | bash - source ~/.sdkman/bin/sdkman-init.sh - sdk install java 16.0.1-open - ;; - use) - echo "must source ~/.sdkman/bin/sdkman-init.sh" - exit 1 - ;; - esac -fi \ No newline at end of file diff --git a/README.md b/README.md index 669fc7c3..7d62445b 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ **Ready?** [It's syncing time!](https://william278.net/docs/husksync/setup) ## Setup -Requires a MySQL (v8.0+) database, a Redis (v5.0+) server and any number of Spigot-based 1.16.5+ Minecraft servers, running Java 16+. +Requires a MySQL (v8.0+) database, a Redis (v5.0+) server and any number of Spigot-based 1.17.1+ Minecraft servers, running Java 17+. 1. Place the plugin jar file in the /plugins/ directory of each Spigot server. You do not need to install HuskSync as a proxy plugin. 2. Start, then stop every server to let HuskSync generate the config file. diff --git a/bukkit/build.gradle b/bukkit/build.gradle index d8ed7409..e6241d59 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation 'space.arim.morepaperlib:morepaperlib:0.4.3' implementation 'de.tr7zw:item-nbt-api:2.12.2' - compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT' compileOnly 'commons-io:commons-io:2.15.1' compileOnly 'org.json:json:20231013' compileOnly 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT' diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index 07051d89..15a88708 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: 'HuskSync' version: '${version}' main: 'net.william278.husksync.BukkitHuskSync' -api-version: 1.16 +api-version: 1.17 author: 'William278' description: '${description}' website: 'https://william278.net' diff --git a/docs/Setup.md b/docs/Setup.md index 3763996a..a33ef866 100644 --- a/docs/Setup.md +++ b/docs/Setup.md @@ -5,7 +5,7 @@ This will walk you through installing HuskSync on your network of Spigot servers * A MySQL Database (v8.0+) * A Redis Database (v5.0+) — see [[FAQs]] for more details. -* Any number of Spigot servers, connected by a BungeeCord or Velocity-based proxy (Minecraft v1.16.5+, running Java 16+) +* Any number of Spigot servers, connected by a BungeeCord or Velocity-based proxy (Minecraft v1.17.1+, running Java 17+) ## Setup Instructions ### 1. Install the jar diff --git a/docs/Unsupported-Versions.md b/docs/Unsupported-Versions.md index 7dad2dc0..db4c3ecc 100644 --- a/docs/Unsupported-Versions.md +++ b/docs/Unsupported-Versions.md @@ -5,6 +5,7 @@ This plugin does not support the following software-Minecraft version combinatio |--------------------|-------------------------------------------|----------------------------------------| | 1.19.4 | Only: `Purpur, Pufferfish`† | Older Paper builds also not supported. | | 1.19.3 | Only: `Paper, Purpur, Pufferfish`† | Upgrade to 1.19.4 or use Spigot | -| below 1.16.5 | _All_ | Upgrade to 1.16.5 | +| 1.16.5 | _All_ | Please use v3.3.1 or lower | +| below 1.16.5 | _All_ | Upgrade Minecraft 1.16.5 | †Further downstream forks of this server software are also affected. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 5db38796..2e829de1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.daemon=true -javaVersion=16 +javaVersion=17 plugin_version=3.2.2 plugin_archive=husksync plugin_description=A modern, cross-server player data synchronization system jedis_version=5.1.0 -mysql_driver_version=8.2.0 +mysql_driver_version=8.3.0 mariadb_driver_version=3.3.2 snappy_version=1.1.10.5 diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index 3cabe06f..00000000 --- a/jitpack.yml +++ /dev/null @@ -1,12 +0,0 @@ -# This file ensures jitpack builds HuskSync correctly by setting the JDK to 16 -jdk: - - 'openjdk16' -before_install: - - 'git clone https://github.com/WiIIiam278/HuskSync.git --recurse-submodules' - - 'chmod +x gradlew' - - 'chmod +x ./.scripts/ensure-java-16' - - 'bash ./.scripts/ensure-java-16 install' -install: - - 'if ! ./.scripts/ensure-java-16 use; then source ~/.sdkman/bin/sdkman-init.sh; fi' - - 'java -version' - - './gradlew publishToMavenLocal' \ No newline at end of file