build: Require Java 17, Minecraft 1.17.1

feat/data-edit-commands
William278 10 months ago
parent 280e90e297
commit 24453d0e1a

@ -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

@ -44,7 +44,7 @@
**Ready?** [It's syncing time!](https://william278.net/docs/husksync/setup) **Ready?** [It's syncing time!](https://william278.net/docs/husksync/setup)
## 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. 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. 2. Start, then stop every server to let HuskSync generate the config file.

@ -12,7 +12,7 @@ dependencies {
implementation 'space.arim.morepaperlib:morepaperlib:0.4.3' implementation 'space.arim.morepaperlib:morepaperlib:0.4.3'
implementation 'de.tr7zw:item-nbt-api:2.12.2' 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 'commons-io:commons-io:2.15.1'
compileOnly 'org.json:json:20231013' compileOnly 'org.json:json:20231013'
compileOnly 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT' compileOnly 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'

@ -1,7 +1,7 @@
name: 'HuskSync' name: 'HuskSync'
version: '${version}' version: '${version}'
main: 'net.william278.husksync.BukkitHuskSync' main: 'net.william278.husksync.BukkitHuskSync'
api-version: 1.16 api-version: 1.17
author: 'William278' author: 'William278'
description: '${description}' description: '${description}'
website: 'https://william278.net' website: 'https://william278.net'

@ -5,7 +5,7 @@ This will walk you through installing HuskSync on your network of Spigot servers
* A MySQL Database (v8.0+) * A MySQL Database (v8.0+)
* A Redis Database (v5.0+) — see [[FAQs]] for more details. * 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 ## Setup Instructions
### 1. Install the jar ### 1. Install the jar

@ -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.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 | | 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. †Further downstream forks of this server software are also affected.

@ -1,13 +1,13 @@
org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.jvmargs='-Dfile.encoding=UTF-8'
org.gradle.daemon=true org.gradle.daemon=true
javaVersion=16 javaVersion=17
plugin_version=3.2.2 plugin_version=3.2.2
plugin_archive=husksync plugin_archive=husksync
plugin_description=A modern, cross-server player data synchronization system plugin_description=A modern, cross-server player data synchronization system
jedis_version=5.1.0 jedis_version=5.1.0
mysql_driver_version=8.2.0 mysql_driver_version=8.3.0
mariadb_driver_version=3.3.2 mariadb_driver_version=3.3.2
snappy_version=1.1.10.5 snappy_version=1.1.10.5

@ -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'
Loading…
Cancel
Save