trueog/Distant-Horizons-Server
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build a single jar using Gradle

Browse Source 
Get rid of Maven, and build a single JAR now that we no longer need Manifold.
This commit is contained in:
Jim C K Flaten committed 2025-07-19 01:59:56 +02:00
1 parent a2239bba85
commit 6e54fed39e
28 files changed
+478 -670
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+4
View File
@@ -33,6 +33,10 @@ replay_pid*
/jars
/.m2
# Gradle output
/.gradle
/build
# Env vars
.env
.gitlab-ci.yml
+6 -26
View File
@@ -1,49 +1,29 @@
include:
- template: Security/SAST.gitlab-ci.yml
variables:
MAVEN_OPTS: >-
-Dhttps.protocols=TLSv1.2
-Dmaven.repo.local=.m2/repository
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
-Dorg.slf4j.simpleLogger.showDateTime=true
-Djava.awt.headless=true
MAVEN_CLI_OPTS: >-
--batch-mode
--errors
--fail-at-end
--show-version
-DinstallAtEnd=true
-DdeployAtEnd=true
stages:
- build
- test
default:
image: maven:3.9-eclipse-temurin-21-alpine
image: eclipse-temurin:21
cache:
key: maven-repo-${CI_COMMIT_REF_SLUG}
key: gradle-${CI_COMMIT_REF_SLUG}
unprotect: true
paths:
- .m2/repository
- .gradle
build:
stage: build
parallel:
matrix:
- MC_VER: [ "1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.7", "1.21.8" ]
script:
- mvn package --projects pom-${MC_VER}.xml ${MAVEN_CLI_OPTS}
- mv jars/*.jar ./
- ./gradlew build
- mv build/libs/*/*.jar ./
artifacts:
name: DHS-${MC_VER}-${CI_COMMIT_REF_SLUG}-${CI_JOB_STARTED_AT}
name: DistantHorizonsSupport-${CI_COMMIT_REF_SLUG}-${CI_JOB_STARTED_AT}
paths:
- "./*.jar"
build.gradle
+107
View File
@@ -0,0 +1,107 @@
plugins {
id 'java'
id 'com.gradleup.shadow' version '8.3.8'
}
group = 'no.jckf.dhs'
version = '0.10.0-SNAPSHOT'
description = 'Distant Horizons Support'
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}
def paperVersions = [
'1.16.5',
]
repositories {
mavenCentral()
maven { url = 'https://repo.papermc.io/repository/maven-public/' }
maven { url = 'https://jitpack.io/' }
}
configurations {
shade
implementation {
extendsFrom shade
}
}
dependencies {
compileOnly 'org.jetbrains:annotations:25.0.0'
implementation 'com.google.guava:guava:33.3.1-jre'
shade 'org.bstats:bstats-bukkit:3.1.0'
shade 'org.json:json:20240303'
shade 'org.tukaani:xz:1.10'
shade 'com.github.technicallycoded:FoliaLib:v0.4.3'
testImplementation 'junit:junit:4.11'
}
paperVersions.each { mcVersion ->
def taskSuffix = mcVersion.replace('.', '_')
def taskName = "buildJar_${taskSuffix}"
def outputDir = file("build/libs/$mcVersion")
def apiVersion = mcVersion.tokenize('.')[0..1].join('.')
def sourceSetName = "main"
// Custom processResources task per version
def processTask = tasks.register("processResources_${taskSuffix}", Copy) {
from(sourceSets[sourceSetName].resources.srcDirs)
into("$buildDir/resources-processed/$mcVersion")
include '**/*.yml'
expand(
version: project.version,
'mainClass': 'no.jckf.dhsupport.bukkit.DhSupportBukkitPlugin',
'mcApiVersion': apiVersion,
)
}
configurations {
"compileOnly${mcVersion}" {
canBeResolved = true
}
}
dependencies {
compileOnly "com.destroystokyo.paper:paper-api:${mcVersion}-R0.1-SNAPSHOT"
//compileOnly "io.papermc.paper:paper-api:${mcVersion}-R0.1-SNAPSHOT"
}
task(taskName, type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
group = 'build'
archiveBaseName.set("DistantHorizonsSupport")
archiveVersion.set(version)
destinationDirectory.set(outputDir)
// Use processed resources as input
// Exclude raw YAML to avoid unprocessed plugin.yml in final JAR
from(sourceSets.main.output) {
exclude '**/*.yml'
}
from("$buildDir/resources-processed/$mcVersion")
configurations = [project.configurations.shade]
relocate 'org.bstats', 'no.jckf.dhsupport.bstats'
relocate 'org.json', 'no.jckf.dhsupport.json'
relocate 'org.tukaani.xz', 'no.jckf.dhsupport.xz'
relocate 'com.tcoded.folialib', 'no.jckf.dhsupport.folialib'
exclude 'org/jetbrains/**'
exclude 'org/intellij/**'
dependsOn processTask
}
build.dependsOn(taskName)
}
gradle.properties
+2
View File
@@ -0,0 +1,2 @@
org.gradle.parallel=true
org.gradle.configureondemand=true
gradle/wrapper/gradle-wrapper.jar
Vendored
BIN
View File
Binary file not shown.
gradle/wrapper/gradle-wrapper.properties
Vendored
+7
View File
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
gradlew
Vendored Executable
+251
View File
@@ -0,0 +1,251 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"
gradlew.bat
Vendored
+94
View File
@@ -0,0 +1,94 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:execute
@rem Setup the command line
set CLASSPATH=
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
pom-1.16.5.xml
-27
View File
@@ -1,27 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}${mc.api-version-patch}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.16</mc.api-version>
<mc.api-version-patch>.5</mc.api-version-patch>
</properties>
<dependencies>
<dependency>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}${mc.api-version-patch}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.17.1.xml
-27
View File
@@ -1,27 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}${mc.api-version-patch}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.17</mc.api-version>
<mc.api-version-patch>.1</mc.api-version-patch>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}${mc.api-version-patch}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.18.2.xml
-27
View File
@@ -1,27 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}${mc.api-version-patch}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.18</mc.api-version>
<mc.api-version-patch>.2</mc.api-version-patch>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}${mc.api-version-patch}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.19.2.xml
-27
View File
@@ -1,27 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}${mc.api-version-patch}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.19</mc.api-version>
<mc.api-version-patch>.2</mc.api-version-patch>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}${mc.api-version-patch}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.19.4.xml
-27
View File
@@ -1,27 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}${mc.api-version-patch}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.19</mc.api-version>
<mc.api-version-patch>.4</mc.api-version-patch>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}${mc.api-version-patch}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.20.1.xml
-27
View File
@@ -1,27 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}${mc.api-version-patch}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.20</mc.api-version>
<mc.api-version-patch>.1</mc.api-version-patch>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}${mc.api-version-patch}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.20.2.xml
-27
View File
@@ -1,27 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}${mc.api-version-patch}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.20</mc.api-version>
<mc.api-version-patch>.2</mc.api-version-patch>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}${mc.api-version-patch}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.20.4.xml
-27
View File
@@ -1,27 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}${mc.api-version-patch}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.20</mc.api-version>
<mc.api-version-patch>.4</mc.api-version-patch>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}${mc.api-version-patch}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.20.6.xml
-26
View File
@@ -1,26 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.20.6</mc.api-version>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.21.1.xml
-26
View File
@@ -1,26 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.21.1</mc.api-version>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.21.3.xml
-26
View File
@@ -1,26 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.21.3</mc.api-version>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.21.4.xml
-26
View File
@@ -1,26 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.21.4</mc.api-version>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.21.5.xml
-26
View File
@@ -1,26 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.21.5</mc.api-version>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.21.7.xml
-26
View File
@@ -1,26 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.21.7</mc.api-version>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom-1.21.8.xml
-26
View File
@@ -1,26 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>DHSupport-${mc.api-version}</artifactId>
<parent>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<relativePath>./pom.xml</relativePath>
</parent>
<properties>
<skip-copy>false</skip-copy>
<mc.api-version>1.21.8</mc.api-version>
</properties>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.api-version}-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
pom.xml
-234
View File
@@ -1,234 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>no.jckf</groupId>
<artifactId>DHSupport</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<properties>
<revision>0.11.0-SNAPSHOT</revision>
<jdk>21</jdk>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.class>no.jckf.dhsupport.bukkit.DhSupportBukkitPlugin</main.class>
<mc.api-version></mc.api-version>
<mc.api-version-patch></mc.api-version-patch>
<skip-copy>true</skip-copy>
</properties>
<developers>
<developer>
<id>jckf</id>
<name>Jim C K Flaten</name>
<email>jckf@jckf.no</email>
</developer>
</developers>
<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public</url>
</repository>
<repository>
<id>jitpack</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.1-jre</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20240303</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>25.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
<version>1.10</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.technicallycoded</groupId>
<artifactId>FoliaLib</artifactId>
<version>v0.4.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<defaultGoal>clean test package</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>${jdk}</source>
<target>${jdk}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<shadedArtifactAttached>false</shadedArtifactAttached>
<shadedClassifierName>all</shadedClassifierName>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>no.jckf.dhsupport.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>com.tcoded.folialib</pattern>
<shadedPattern>no.jckf.dhsupport.folialib</shadedPattern>
</relocation>
</relocations>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*</exclude>
</excludes>
</filter>
</filters>
<artifactSet>
<includes>
<include>org.json</include>
<include>org.tukaani</include>
<include>org.bstats</include>
<include>com.github.technicallycoded</include>
</includes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>jars</outputDirectory>
<skip>${skip-copy}</skip>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>${project.packaging}</type>
<destFileName>DistantHorizonsSupport-Bukkit-Paper-${project.version}-${mc.api-version}${mc.api-version-patch}.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
<targetPath>.</targetPath>
<includes>
<include>plugin.yml</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<targetPath>.</targetPath>
<includes>
<include>config.yml</include>
</includes>
</resource>
</resources>
</build>
<modules>
<module>pom-1.16.5.xml</module>
<module>pom-1.17.1.xml</module>
<module>pom-1.18.2.xml</module>
<module>pom-1.19.2.xml</module>
<module>pom-1.19.4.xml</module>
<module>pom-1.20.1.xml</module>
<module>pom-1.20.2.xml</module>
<module>pom-1.20.4.xml</module>
<module>pom-1.20.6.xml</module>
<module>pom-1.21.1.xml</module>
<module>pom-1.21.3.xml</module>
<module>pom-1.21.4.xml</module>
<module>pom-1.21.5.xml</module>
<module>pom-1.21.7.xml</module>
<module>pom-1.21.8.xml</module>
</modules>
</project>
settings.gradle
+1
View File
@@ -0,0 +1 @@
rootProject.name = 'DistantHorizonsSupport'
src/main/java/no/jckf/dhsupport/bukkit/DhSupportBukkitPlugin.java
+2 -4
View File
@@ -50,21 +50,19 @@ public class DhSupportBukkitPlugin extends JavaPlugin
public void onEnable()
{
String pluginVersion = "N/A";
String mcVersion = "N/A";
try {
YamlConfiguration meta = new YamlConfiguration();
meta.load(new InputStreamReader(this.getResource("plugin.yml")));
pluginVersion = meta.getString("version");
mcVersion = meta.getString("mc-version");
} catch (Exception exception) {
}
this.getLogger().info("I am DHS " + pluginVersion + " for MC " + mcVersion + ".");
this.getLogger().info("I am DHS " + pluginVersion + ".");
this.dhSupport = new DhSupport(pluginVersion, mcVersion);
this.dhSupport = new DhSupport(pluginVersion);
this.dhSupport.setLogger(this.getLogger());
this.dhSupport.setDataDirectory(this.getDataFolder().getAbsolutePath());
src/main/java/no/jckf/dhsupport/core/DhSupport.java
+1 -4
View File
@@ -57,8 +57,6 @@ public class DhSupport implements Configurable
{
protected String pluginVersion;
protected String mcVersion;
protected String dataDirectory;
protected Database database;
@@ -92,10 +90,9 @@ public class DhSupport implements Configurable
protected Map<UUID, PreGenerator> preGenerators = new HashMap<>();
public DhSupport(String pluginVersion, String mcVersion)
public DhSupport(String pluginVersion)
{
this.pluginVersion = pluginVersion;
this.mcVersion = mcVersion;
this.configuration = new Configuration();
src/main/resources/plugin.yml
+3 -4
View File
@@ -1,8 +1,7 @@
name: DHSupport
version: ${project.version}
main: ${main.class}
api-version: ${mc.api-version}
mc-version: ${mc.api-version}${mc.api-version-patch}
version: ${version}
main: ${mainClass}
api-version: ${mcApiVersion}
prefix: DHS
folia-supported: true
author: Jckf