From 0713bca79db5ff87b193f8bf38a48373be8a0dcf Mon Sep 17 00:00:00 2001 From: kruthers Date: Fri, 14 Mar 2025 23:02:20 +0000 Subject: [PATCH 1/3] Move to gradle and paper weight --- .gitattributes | 9 + .gitignore | 9 +- build.gradle.kts | 95 +++++++ core/build.gradle.kts | 41 +++ core/dependency-reduced-pom.xml | 96 ------- core/pom.xml | 130 --------- dependency-reduced-pom.xml | 145 ---------- dist/pom.xml | 136 ---------- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ pom.xml | 90 ------- settings.gradle.kts | 21 ++ v1_19_R1/build.gradle.kts | 14 + v1_19_R1/pom.xml | 82 ------ v1_19_R2/build.gradle.kts | 15 ++ v1_19_R2/pom.xml | 88 ------ v1_19_R3/build.gradle.kts | 15 ++ v1_19_R3/pom.xml | 88 ------ v1_20_R1/build.gradle.kts | 15 ++ v1_20_R1/pom.xml | 88 ------ v1_20_R1/v1_20_R1.iml | 99 ------- v1_20_R1/v1_20_R2.iml | 97 ------- v1_20_R2/build.gradle.kts | 15 ++ v1_20_R2/pom.xml | 88 ------ v1_20_R2/v1_20_R2.iml | 98 ------- v1_20_R3/build.gradle.kts | 15 ++ v1_20_R3/pom.xml | 88 ------ v1_20_R3/v1_20_R3.iml | 99 ------- v1_20_R4/build.gradle.kts | 15 ++ v1_20_R4/pom.xml | 88 ------ .../valhallammo/nms/NMS_v1_20_R4.java | 12 +- v1_20_R4/v1_20_R4.iml | 102 ------- v1_21_R1/build.gradle.kts | 15 ++ v1_21_R1/pom.xml | 88 ------ .../valhallammo/nms/NMS_v1_21_R1.java | 12 +- v1_21_R2/build.gradle.kts | 16 ++ v1_21_R2/pom.xml | 94 ------- .../valhallammo/nms/NMS_v1_21_R2.java | 12 +- v1_21_R3/build.gradle.kts | 17 ++ v1_21_R3/pom.xml | 100 ------- .../valhallammo/nms/NMS_v1_21_R3.java | 12 +- valhallammo-parent.iml | 13 - 44 files changed, 704 insertions(+), 2022 deletions(-) create mode 100644 .gitattributes create mode 100644 build.gradle.kts create mode 100644 core/build.gradle.kts delete mode 100644 core/dependency-reduced-pom.xml delete mode 100644 core/pom.xml delete mode 100644 dependency-reduced-pom.xml delete mode 100644 dist/pom.xml create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle.kts create mode 100644 v1_19_R1/build.gradle.kts delete mode 100644 v1_19_R1/pom.xml create mode 100644 v1_19_R2/build.gradle.kts delete mode 100644 v1_19_R2/pom.xml create mode 100644 v1_19_R3/build.gradle.kts delete mode 100644 v1_19_R3/pom.xml create mode 100644 v1_20_R1/build.gradle.kts delete mode 100644 v1_20_R1/pom.xml delete mode 100644 v1_20_R1/v1_20_R1.iml delete mode 100644 v1_20_R1/v1_20_R2.iml create mode 100644 v1_20_R2/build.gradle.kts delete mode 100644 v1_20_R2/pom.xml delete mode 100644 v1_20_R2/v1_20_R2.iml create mode 100644 v1_20_R3/build.gradle.kts delete mode 100644 v1_20_R3/pom.xml delete mode 100644 v1_20_R3/v1_20_R3.iml create mode 100644 v1_20_R4/build.gradle.kts delete mode 100644 v1_20_R4/pom.xml delete mode 100644 v1_20_R4/v1_20_R4.iml create mode 100644 v1_21_R1/build.gradle.kts delete mode 100644 v1_21_R1/pom.xml create mode 100644 v1_21_R2/build.gradle.kts delete mode 100644 v1_21_R2/pom.xml create mode 100644 v1_21_R3/build.gradle.kts delete mode 100644 v1_21_R3/pom.xml delete mode 100644 valhallammo-parent.iml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..097f9f98 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore index 0d938c46..f6bca0f9 100644 --- a/.gitignore +++ b/.gitignore @@ -105,4 +105,11 @@ $RECYCLE.BIN/ *.msp # Windows shortcuts -*.lnk \ No newline at end of file +*.lnk +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build + +run/ diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..b420952f --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,95 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + java + id("io.papermc.paperweight.userdev") version "2.0.0-beta.14" apply false + id("xyz.jpenilla.run-paper") version "2.3.1" + id("com.gradleup.shadow") version "8.3.5" +} + +group = "me.athlaeos" +description = "A very big skills/leveling plugin with plenty of useful tools to make a unique experience" + +//repos +allprojects { + + repositories { + mavenCentral() + maven { + name = "jitpack.io" + url = uri("https://jitpack.io") + } + maven { + name = "spigot-repo" + url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") + } + maven { + name = "papermc" + url = uri("https://repo.papermc.io/repository/maven-public/") + } + maven { + name = "lauriichan-release" + url = uri("https://maven.lauriichan.me/release") + } + maven { + name = "jeff-media-public" + url = uri("https://hub.jeff-media.com/nexus/repository/jeff-media-public/") + } + maven { + name = "enginehub" + url = uri("https://maven.enginehub.org/repo/") + } + maven { + name = "placeholderapi" + url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/") + } + maven { + name = "codemc-repo" + url = uri("https://repo.codemc.io/repository/maven-public/") + } + } +} + +subprojects { + apply(plugin = "java") + apply(plugin = "com.gradleup.shadow") + + ext { + set("paperCompiler", ReobfArtifactConfiguration.REOBF_PRODUCTION) + } + + dependencies { + compileOnly("io.netty:netty-all:4.1.87.Final") + + //if we are an NMS module + if (this@subprojects.name.startsWith("v1_")) { + compileOnly(project(":core")) + this@subprojects.tasks.assemble { + dependsOn("reobfJar") + } + } + } +} + +//tasks +allprojects { + tasks.build { + dependsOn("shadowJar") + } +} + +tasks { + runServer { + version("1.21.4") + } +} + +dependencies { + subprojects.forEach { + implementation(it) + } +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) +} diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 00000000..2e157e30 --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,41 @@ +plugins { + java + `maven-publish` +} + +dependencies { + compileOnly("org.spigotmc", "spigot-api", "1.20.1-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT") + + implementation("com.jeff-media:MorePersistentDataTypes:2.4.0") + implementation("com.jeff-media:custom-block-data:2.2.2") + + compileOnly("me.lauriichan.spigot.justlootit:justlootit-core:1.7.0") + compileOnly("me.lauriichan.spigot.justlootit:justlootit-nms-api:1.7.0") { + exclude("me.lauriichan.laylib") + } + compileOnly("com.github.MilkBowl:VaultAPI:1.7") + compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.3.0-SNAPSHOT") + compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT") + compileOnly("me.clip:placeholderapi:2.11.6") + compileOnly("net.kyori:adventure-text-minimessage:4.17.0") + compileOnly("commons-io:commons-io:2.17.0") + compileOnly("org.bstats:bstats-bukkit:3.0.3") + compileOnly("com.github.decentsoftware-eu:decentholograms:2.8.5") +} + +publishing { + publications { + create("maven") { + groupId = "${rootProject.group}" + artifactId = "valhallammo-core" + version = "${rootProject.version}" + + pom { + name.set("ValhallaMMO") + description.set(rootProject.description) + } + } + } +} + diff --git a/core/dependency-reduced-pom.xml b/core/dependency-reduced-pom.xml deleted file mode 100644 index f8211c42..00000000 --- a/core/dependency-reduced-pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - valhallammo-parent - me.athlaeos - ${revision} - - 4.0.0 - valhallammo-core - - - - maven-shade-plugin - 3.5.1 - - - package - - shade - - - - - true - - - com.jeff_media.morepersistentdatatypes - ${shadedPackage}.com.jeff_media.morepersistentdatatypes - - - com.jeff_media.customblockdata - ${shadedPackage}.com.jeff_media.customblockdata - - - org.bstats - me.athlaeos.valhallammo.bstats - - - - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - jeff-media-public - https://hub.jeff-media.com/nexus/repository/jeff-media-public/ - - - - - org.projectlombok - lombok - 1.18.24 - provided - - - com.github.MilkBowl - VaultAPI - 1.7 - provided - - - com.sk89q.worldedit - worldedit-bukkit - 7.3.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-bukkit - 7.1.0-SNAPSHOT - provided - - - me.clip - placeholderapi - 2.11.2 - provided - - - commons-io - commons-io - 2.11.0 - provided - - - - 17 - UTF-8 - - diff --git a/core/pom.xml b/core/pom.xml deleted file mode 100644 index 925f24f6..00000000 --- a/core/pom.xml +++ /dev/null @@ -1,130 +0,0 @@ - - 4.0.0 - valhallammo-core - - - 17 - UTF-8 - - - - me.athlaeos - valhallammo-parent - ${revision} - - - - - lauriichan - https://maven.lauriichan.me/release - - - jitpack.io - https://jitpack.io - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - jeff-media-public - https://hub.jeff-media.com/nexus/repository/jeff-media-public/ - - - enginehub - https://maven.enginehub.org/repo/ - - - placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ - - - codemc-repo - https://repo.codemc.io/repository/maven-public/ - default - - - - - - org.spigotmc - spigot-api - 1.20.1-R0.1-SNAPSHOT - provided - - - io.papermc.paper - paper-api - 1.20-R0.1-SNAPSHOT - provided - - - com.jeff-media - MorePersistentDataTypes - 2.4.0 - compile - - - com.jeff-media - custom-block-data - 2.2.2 - compile - - - me.lauriichan.spigot.justlootit - justlootit-core - 1.7.0 - shaded - provided - - - com.github.MilkBowl - VaultAPI - 1.7 - provided - - - com.sk89q.worldedit - worldedit-bukkit - 7.3.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-bukkit - 7.1.0-SNAPSHOT - provided - - - me.clip - placeholderapi - 2.11.6 - provided - - - net.kyori - adventure-text-minimessage - 4.17.0 - provided - - - commons-io - commons-io - 2.17.0 - provided - - - org.bstats - bstats-bukkit - 3.0.3 - provided - - - com.github.decentsoftware-eu - decentholograms - 2.8.5 - provided - - - diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml deleted file mode 100644 index a31facbd..00000000 --- a/dependency-reduced-pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - 4.0.0 - me.athlaeos - valhallammo-parent - pom - ValhallaMMO - ${revision} - A very big skills/leveling plugin with plenty of useful tools to make a unique experience - - clean package - - - . - true - src/main/resources - - - ValhallaMMO_${revision} - - - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - maven-jar-plugin - 3.3.0 - - ${outputDirectory} - - - - maven-shade-plugin - 3.5.1 - - - package - - shade - - - - - true - - - com.jeff_media.morepersistentdatatypes - ${shadedPackage}.com.jeff_media.morepersistentdatatypes - - - com.jeff_media.customblockdata - ${shadedPackage}.com.jeff_media.customblockdata - - - - - - - - - - exportToServer - - ${testServerPath} - - - - - valhallammo - dist - v1_19_R1 - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - jeff-media-public - https://hub.jeff-media.com/nexus/repository/jeff-media-public/ - - - jitpack.io - https://jitpack.io - - - enginehub - https://maven.enginehub.org/repo/ - - - placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ - - - - - org.projectlombok - lombok - 1.18.24 - provided - - - com.github.MilkBowl - VaultAPI - 1.7 - provided - - - com.sk89q.worldedit - worldedit-bukkit - 7.3.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-bukkit - 7.1.0-SNAPSHOT - provided - - - me.clip - placeholderapi - 2.11.2 - provided - - - commons-io - commons-io - 2.11.0 - provided - - - - C:\Users\Job\Desktop\paper 1.19\plugins - 17 - BETA-1.0 - UTF-8 - target - me.athlaeos.valhallammo.shaded - - diff --git a/dist/pom.xml b/dist/pom.xml deleted file mode 100644 index 5dddf2e9..00000000 --- a/dist/pom.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - 4.0.0 - valhallammo-dist - - - me.athlaeos - valhallammo-parent - ${revision} - - - - - me.athlaeos - valhallammo-core - ${project.version} - - - me.athlaeos - valhallammo-v1_21_R4 - ${project.version} - - - me.athlaeos - valhallammo-v1_21_R3 - ${project.version} - - - me.athlaeos - valhallammo-v1_21_R2 - ${project.version} - - - me.athlaeos - valhallammo-v1_21_R1 - ${project.version} - - - me.athlaeos - valhallammo-v1_20_R4 - ${project.version} - - - me.athlaeos - valhallammo-v1_20_R3 - ${project.version} - - - me.athlaeos - valhallammo-v1_20_R2 - ${project.version} - - - me.athlaeos - valhallammo-v1_20_R1 - ${project.version} - - - me.athlaeos - valhallammo-v1_19_R3 - ${project.version} - - - me.athlaeos - valhallammo-v1_19_R2 - ${project.version} - - - me.athlaeos - valhallammo-v1_19_R1 - ${project.version} - - - - - clean package - ../target - ValhallaMMO_${revision} - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - ${outputDirectory} - dummy - - - - org.apache.maven.plugins - maven-shade-plugin - 3.5.1 - - false - - - me.athlaeos:valhallammo-core - ** - - - false - - - - com.jeff_media.morepersistentdatatypes - ${shadedPackage}.com.jeff_media.morepersistentdatatypes - - - - - com.jeff_media.customblockdata - ${shadedPackage}.com.jeff_media.customblockdata - - - - - org.bstats - me.athlaeos.valhallammo.bstats - - - - - - - - shade - - package - - - - - - diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..bd82d7b8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +version=1.4.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..cea7a793 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..f5feea6d --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/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 +' "$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=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# 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, 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" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/gradlew.bat @@ -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=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +: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 diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 02f8c640..00000000 --- a/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - 4.0.0 - - ValhallaMMO - me.athlaeos - valhallammo-parent - A very big skills/leveling plugin with plenty of useful tools to make a unique experience - ${revision} - pom - - - 1.4.4 - 17 - C:\Users\Athlaeos\Desktop\Minecraft Servers\1.21.4\plugins - me.athlaeos.valhallammo.shaded - - - target - UTF-8 - - - - core - dist - v1_20_R3 - v1_20_R2 - v1_20_R1 - v1_19_R3 - v1_19_R2 - v1_19_R1 - v1_20_R4 - v1_21_R1 - v1_21_R2 - v1_21_R3 - v1_21_R4 - - - - - exportToServer - - ${testServerPath} - - - - - - clean package - ValhallaMMO_${revision} - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - jitpack.io - https://jitpack.io - - - - - - io.netty - netty-transport - 4.1.82.Final - provided - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..287d7e46 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,21 @@ +rootProject.name = "ValhallaMMO" + +//Core Project +include("core") + +//NMS +include( + "v1_19_R1", + "v1_19_R2", + "v1_19_R3", + "v1_20_R1", + "v1_20_R2", + "v1_20_R3", + "v1_20_R4", + "v1_21_R1", + "v1_21_R2", + "v1_21_R3", +) + +//Output Projects +//include("dist") diff --git a/v1_19_R1/build.gradle.kts b/v1_19_R1/build.gradle.kts new file mode 100644 index 00000000..8e7bb5b4 --- /dev/null +++ b/v1_19_R1/build.gradle.kts @@ -0,0 +1,14 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.19-R0.1-SNAPSHOT") +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_19_R1/pom.xml b/v1_19_R1/pom.xml deleted file mode 100644 index 416f9dfe..00000000 --- a/v1_19_R1/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - 4.0.0 - valhallammo-v1_19_R1 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.19 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - diff --git a/v1_19_R2/build.gradle.kts b/v1_19_R2/build.gradle.kts new file mode 100644 index 00000000..2c519c7c --- /dev/null +++ b/v1_19_R2/build.gradle.kts @@ -0,0 +1,15 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.19.3-R0.1-SNAPSHOT") + compileOnly(project(":v1_19_R1")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_19_R2/pom.xml b/v1_19_R2/pom.xml deleted file mode 100644 index b2cef41b..00000000 --- a/v1_19_R2/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - valhallammo-v1_19_R2 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.19.3 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_19_R1 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - diff --git a/v1_19_R3/build.gradle.kts b/v1_19_R3/build.gradle.kts new file mode 100644 index 00000000..887cea06 --- /dev/null +++ b/v1_19_R3/build.gradle.kts @@ -0,0 +1,15 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") + compileOnly(project(":v1_19_R1")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_19_R3/pom.xml b/v1_19_R3/pom.xml deleted file mode 100644 index 0c19c175..00000000 --- a/v1_19_R3/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - valhallammo-v1_19_R3 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.19.4 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_19_R1 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - diff --git a/v1_20_R1/build.gradle.kts b/v1_20_R1/build.gradle.kts new file mode 100644 index 00000000..d968892f --- /dev/null +++ b/v1_20_R1/build.gradle.kts @@ -0,0 +1,15 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT") + compileOnly(project(":v1_19_R1")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_20_R1/pom.xml b/v1_20_R1/pom.xml deleted file mode 100644 index bc6b1bd4..00000000 --- a/v1_20_R1/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - valhallammo-v1_20_R1 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.20.1 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_19_R1 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - diff --git a/v1_20_R1/v1_20_R1.iml b/v1_20_R1/v1_20_R1.iml deleted file mode 100644 index ae1e01a3..00000000 --- a/v1_20_R1/v1_20_R1.iml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - MCP - SPIGOT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/v1_20_R1/v1_20_R2.iml b/v1_20_R1/v1_20_R2.iml deleted file mode 100644 index baa883fd..00000000 --- a/v1_20_R1/v1_20_R2.iml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - MCP - SPIGOT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/v1_20_R2/build.gradle.kts b/v1_20_R2/build.gradle.kts new file mode 100644 index 00000000..cf1ebde8 --- /dev/null +++ b/v1_20_R2/build.gradle.kts @@ -0,0 +1,15 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT") + compileOnly(project(":v1_19_R1")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_20_R2/pom.xml b/v1_20_R2/pom.xml deleted file mode 100644 index 94be815b..00000000 --- a/v1_20_R2/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - valhallammo-v1_20_R2 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.20.2 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_19_R1 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - diff --git a/v1_20_R2/v1_20_R2.iml b/v1_20_R2/v1_20_R2.iml deleted file mode 100644 index 1bf597ca..00000000 --- a/v1_20_R2/v1_20_R2.iml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - MCP - SPIGOT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/v1_20_R3/build.gradle.kts b/v1_20_R3/build.gradle.kts new file mode 100644 index 00000000..e93f7768 --- /dev/null +++ b/v1_20_R3/build.gradle.kts @@ -0,0 +1,15 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT") + compileOnly(project(":v1_19_R1")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_20_R3/pom.xml b/v1_20_R3/pom.xml deleted file mode 100644 index 566dc0fd..00000000 --- a/v1_20_R3/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - valhallammo-v1_20_R3 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.20.4 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_19_R1 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - diff --git a/v1_20_R3/v1_20_R3.iml b/v1_20_R3/v1_20_R3.iml deleted file mode 100644 index 8e636e48..00000000 --- a/v1_20_R3/v1_20_R3.iml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - MCP - SPIGOT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/v1_20_R4/build.gradle.kts b/v1_20_R4/build.gradle.kts new file mode 100644 index 00000000..b02f6535 --- /dev/null +++ b/v1_20_R4/build.gradle.kts @@ -0,0 +1,15 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT") + compileOnly(project(":v1_19_R1")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_20_R4/pom.xml b/v1_20_R4/pom.xml deleted file mode 100644 index ca6726a3..00000000 --- a/v1_20_R4/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - valhallammo-v1_20_R4 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.20.6 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_19_R1 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - diff --git a/v1_20_R4/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_20_R4.java b/v1_20_R4/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_20_R4.java index 67b6e139..1614c321 100644 --- a/v1_20_R4/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_20_R4.java +++ b/v1_20_R4/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_20_R4.java @@ -28,12 +28,12 @@ import org.bukkit.*; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; -import org.bukkit.craftbukkit.v1_20_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R4.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_20_R4.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R4.generator.structure.CraftStructureType; -import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemStack; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.generator.structure.CraftStructureType; +import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/v1_20_R4/v1_20_R4.iml b/v1_20_R4/v1_20_R4.iml deleted file mode 100644 index 35b7532a..00000000 --- a/v1_20_R4/v1_20_R4.iml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - MCP - SPIGOT - PAPER - ADVENTURE - BUKKIT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/v1_21_R1/build.gradle.kts b/v1_21_R1/build.gradle.kts new file mode 100644 index 00000000..0b777faa --- /dev/null +++ b/v1_21_R1/build.gradle.kts @@ -0,0 +1,15 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT") + compileOnly(project(":v1_20_R4")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_21_R1/pom.xml b/v1_21_R1/pom.xml deleted file mode 100644 index 28208854..00000000 --- a/v1_21_R1/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - valhallammo-v1_21_R1 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.21.1 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_20_R4 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - \ No newline at end of file diff --git a/v1_21_R1/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R1.java b/v1_21_R1/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R1.java index 49655956..496d4887 100644 --- a/v1_21_R1/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R1.java +++ b/v1_21_R1/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R1.java @@ -30,12 +30,12 @@ import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.attribute.AttributeModifier; -import org.bukkit.craftbukkit.v1_21_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R1.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_21_R1.generator.structure.CraftStructureType; -import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.generator.structure.CraftStructureType; +import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/v1_21_R2/build.gradle.kts b/v1_21_R2/build.gradle.kts new file mode 100644 index 00000000..d043ab9f --- /dev/null +++ b/v1_21_R2/build.gradle.kts @@ -0,0 +1,16 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT") + compileOnly(project(":v1_20_R4")) + compileOnly(project(":v1_21_R1")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_21_R2/pom.xml b/v1_21_R2/pom.xml deleted file mode 100644 index d5907cd6..00000000 --- a/v1_21_R2/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - 4.0.0 - valhallammo-v1_21_R2 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.21.3 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_20_R4 - ${project.parent.version} - compile - - - me.athlaeos - valhallammo-v1_21_R1 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - \ No newline at end of file diff --git a/v1_21_R2/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R2.java b/v1_21_R2/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R2.java index 105d04a0..004abfed 100644 --- a/v1_21_R2/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R2.java +++ b/v1_21_R2/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R2.java @@ -31,12 +31,12 @@ import org.bukkit.*; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_21_R2.generator.structure.CraftStructureType; -import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.generator.structure.CraftStructureType; +import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/v1_21_R3/build.gradle.kts b/v1_21_R3/build.gradle.kts new file mode 100644 index 00000000..b76b4135 --- /dev/null +++ b/v1_21_R3/build.gradle.kts @@ -0,0 +1,17 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +plugins { + id("io.papermc.paperweight.userdev") +} + +dependencies { + paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT") + compileOnly(project(":v1_20_R4")) + compileOnly(project(":v1_21_R1")) + compileOnly(project(":v1_21_R2")) +} + +tasks.reobfJar { + paperweight.reobfArtifactConfiguration = + ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +} diff --git a/v1_21_R3/pom.xml b/v1_21_R3/pom.xml deleted file mode 100644 index 25676a9c..00000000 --- a/v1_21_R3/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - 4.0.0 - valhallammo-v1_21_R3 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.21.4 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_20_R4 - ${project.parent.version} - compile - - - me.athlaeos - valhallammo-v1_21_R1 - ${project.parent.version} - compile - - - me.athlaeos - valhallammo-v1_21_R2 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - \ No newline at end of file diff --git a/v1_21_R3/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R3.java b/v1_21_R3/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R3.java index 30bb76a0..4bdbd0e6 100644 --- a/v1_21_R3/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R3.java +++ b/v1_21_R3/src/main/java/me/athlaeos/valhallammo/nms/NMS_v1_21_R3.java @@ -32,12 +32,12 @@ import org.bukkit.*; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; -import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_21_R3.generator.structure.CraftStructureType; -import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.block.data.CraftBlockData; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.generator.structure.CraftStructureType; +import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/valhallammo-parent.iml b/valhallammo-parent.iml deleted file mode 100644 index be7aa730..00000000 --- a/valhallammo-parent.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - BUKKIT - SPIGOT - - - - - \ No newline at end of file From 2cd9e5036352c725d021afe7923b100aaed209da Mon Sep 17 00:00:00 2001 From: kruthers Date: Sat, 15 Mar 2025 11:52:12 +0000 Subject: [PATCH 2/3] Clean up some build scripts and fix spigot mappings --- build.gradle.kts | 43 ++++++++++++++++++++++++++------------- gradle.properties | 10 ++++++++- settings.gradle.kts | 27 ++++++++++-------------- v1_19_R1/build.gradle.kts | 11 ---------- v1_19_R2/build.gradle.kts | 13 +----------- v1_19_R3/build.gradle.kts | 13 +----------- v1_20_R1/build.gradle.kts | 13 +----------- v1_20_R2/build.gradle.kts | 13 +----------- v1_20_R3/build.gradle.kts | 7 +------ v1_20_R4/build.gradle.kts | 16 +++++++-------- v1_21_R1/build.gradle.kts | 16 +++++++-------- v1_21_R2/build.gradle.kts | 18 ++++++++-------- v1_21_R3/build.gradle.kts | 20 +++++++++--------- 13 files changed, 89 insertions(+), 131 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b420952f..5e5b3bbb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,12 +7,10 @@ plugins { id("com.gradleup.shadow") version "8.3.5" } -group = "me.athlaeos" -description = "A very big skills/leveling plugin with plenty of useful tools to make a unique experience" +java.disableAutoTargetJvm() //repos allprojects { - repositories { mavenCentral() maven { @@ -58,27 +56,39 @@ subprojects { set("paperCompiler", ReobfArtifactConfiguration.REOBF_PRODUCTION) } + //common dependencies dependencies { compileOnly("io.netty:netty-all:4.1.87.Final") + } + + //if we are an NMS module + if (this@subprojects.name.startsWith("v1_")) { + //apply paper weight + apply(plugin = "io.papermc.paperweight.userdev") - //if we are an NMS module - if (this@subprojects.name.startsWith("v1_")) { - compileOnly(project(":core")) - this@subprojects.tasks.assemble { + //make sure it requires core + dependencies.implementation(project(":core")) + + //make assemble require the re-obfuscated jar + this@subprojects.tasks { + assemble { dependsOn("reobfJar") } + withType().configureEach { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + } + withType().configureEach { + // Defaults to java 17, needs to be overridden in newer versions! + options.release = 17 + } } } } -//tasks -allprojects { - tasks.build { +tasks { + assemble { dependsOn("shadowJar") } -} - -tasks { runServer { version("1.21.4") } @@ -86,7 +96,12 @@ tasks { dependencies { subprojects.forEach { - implementation(it) + //if its a version jar we want the reobf variant + if (it.name.startsWith("v1_")) { + runtimeOnly(project(":${it.name}", configuration = "reobf")) + } else { + implementation(it) + } } } diff --git a/gradle.properties b/gradle.properties index bd82d7b8..21a56ed0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,9 @@ -version=1.4.1 \ No newline at end of file +# Project Meta +group=me.athlaeos +version=1.4.1 +description=A very big skills/leveling plugin with plenty of useful tools to make a unique experience + +# Gradle configuration +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true diff --git a/settings.gradle.kts b/settings.gradle.kts index 287d7e46..0e369ca7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,21 +1,16 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + rootProject.name = "ValhallaMMO" //Core Project include("core") -//NMS -include( - "v1_19_R1", - "v1_19_R2", - "v1_19_R3", - "v1_20_R1", - "v1_20_R2", - "v1_20_R3", - "v1_20_R4", - "v1_21_R1", - "v1_21_R2", - "v1_21_R3", -) - -//Output Projects -//include("dist") +//NMS - Auto imports any new versions +File("$rootDir").listFiles()?.filter { + //check the file is a directory, it starts with the version notation and contains a build file + it.isDirectory && it.name.startsWith("v1_") && File("${it.path}/build.gradle.kts").exists() +}?.forEach { + include(it.name) +} diff --git a/v1_19_R1/build.gradle.kts b/v1_19_R1/build.gradle.kts index 8e7bb5b4..e3318d3e 100644 --- a/v1_19_R1/build.gradle.kts +++ b/v1_19_R1/build.gradle.kts @@ -1,14 +1,3 @@ -import io.papermc.paperweight.userdev.ReobfArtifactConfiguration - -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.19-R0.1-SNAPSHOT") } - -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION -} diff --git a/v1_19_R2/build.gradle.kts b/v1_19_R2/build.gradle.kts index 2c519c7c..223b2186 100644 --- a/v1_19_R2/build.gradle.kts +++ b/v1_19_R2/build.gradle.kts @@ -1,15 +1,4 @@ -import io.papermc.paperweight.userdev.ReobfArtifactConfiguration - -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.19.3-R0.1-SNAPSHOT") - compileOnly(project(":v1_19_R1")) -} - -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION + implementation(project(":v1_19_R1")) } diff --git a/v1_19_R3/build.gradle.kts b/v1_19_R3/build.gradle.kts index 887cea06..c4e7c61b 100644 --- a/v1_19_R3/build.gradle.kts +++ b/v1_19_R3/build.gradle.kts @@ -1,15 +1,4 @@ -import io.papermc.paperweight.userdev.ReobfArtifactConfiguration - -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") - compileOnly(project(":v1_19_R1")) -} - -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION + implementation(project(":v1_19_R1")) } diff --git a/v1_20_R1/build.gradle.kts b/v1_20_R1/build.gradle.kts index d968892f..7e1ca84c 100644 --- a/v1_20_R1/build.gradle.kts +++ b/v1_20_R1/build.gradle.kts @@ -1,15 +1,4 @@ -import io.papermc.paperweight.userdev.ReobfArtifactConfiguration - -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT") - compileOnly(project(":v1_19_R1")) -} - -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION + implementation(project(":v1_19_R1")) } diff --git a/v1_20_R2/build.gradle.kts b/v1_20_R2/build.gradle.kts index cf1ebde8..05d91c22 100644 --- a/v1_20_R2/build.gradle.kts +++ b/v1_20_R2/build.gradle.kts @@ -1,15 +1,4 @@ -import io.papermc.paperweight.userdev.ReobfArtifactConfiguration - -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT") - compileOnly(project(":v1_19_R1")) -} - -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION + implementation(project(":v1_19_R1")) } diff --git a/v1_20_R3/build.gradle.kts b/v1_20_R3/build.gradle.kts index e93f7768..ef5137e4 100644 --- a/v1_20_R3/build.gradle.kts +++ b/v1_20_R3/build.gradle.kts @@ -1,15 +1,10 @@ import io.papermc.paperweight.userdev.ReobfArtifactConfiguration -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT") compileOnly(project(":v1_19_R1")) } tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION + paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.REOBF_PRODUCTION } diff --git a/v1_20_R4/build.gradle.kts b/v1_20_R4/build.gradle.kts index b02f6535..e0ff64e3 100644 --- a/v1_20_R4/build.gradle.kts +++ b/v1_20_R4/build.gradle.kts @@ -1,15 +1,15 @@ import io.papermc.paperweight.userdev.ReobfArtifactConfiguration -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT") - compileOnly(project(":v1_19_R1")) + implementation(project(":v1_19_R1")) } -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +tasks { + reobfJar { + paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.REOBF_PRODUCTION + } + withType().configureEach { + options.release = 21 + } } diff --git a/v1_21_R1/build.gradle.kts b/v1_21_R1/build.gradle.kts index 0b777faa..4ac47c77 100644 --- a/v1_21_R1/build.gradle.kts +++ b/v1_21_R1/build.gradle.kts @@ -1,15 +1,15 @@ import io.papermc.paperweight.userdev.ReobfArtifactConfiguration -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT") - compileOnly(project(":v1_20_R4")) + implementation(project(":v1_20_R4")) } -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +tasks { + reobfJar { + paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.REOBF_PRODUCTION + } + withType().configureEach { + options.release = 21 + } } diff --git a/v1_21_R2/build.gradle.kts b/v1_21_R2/build.gradle.kts index d043ab9f..85b65584 100644 --- a/v1_21_R2/build.gradle.kts +++ b/v1_21_R2/build.gradle.kts @@ -1,16 +1,16 @@ import io.papermc.paperweight.userdev.ReobfArtifactConfiguration -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT") - compileOnly(project(":v1_20_R4")) - compileOnly(project(":v1_21_R1")) + implementation(project(":v1_20_R4")) + implementation(project(":v1_21_R1")) } -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +tasks { + reobfJar { + paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.REOBF_PRODUCTION + } + withType().configureEach { + options.release = 21 + } } diff --git a/v1_21_R3/build.gradle.kts b/v1_21_R3/build.gradle.kts index b76b4135..8d679cce 100644 --- a/v1_21_R3/build.gradle.kts +++ b/v1_21_R3/build.gradle.kts @@ -1,17 +1,17 @@ import io.papermc.paperweight.userdev.ReobfArtifactConfiguration -plugins { - id("io.papermc.paperweight.userdev") -} - dependencies { paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT") - compileOnly(project(":v1_20_R4")) - compileOnly(project(":v1_21_R1")) - compileOnly(project(":v1_21_R2")) + implementation(project(":v1_20_R4")) + implementation(project(":v1_21_R1")) + implementation(project(":v1_21_R2")) } -tasks.reobfJar { - paperweight.reobfArtifactConfiguration = - ext.get("paperCompiler") as? ReobfArtifactConfiguration ?: ReobfArtifactConfiguration.REOBF_PRODUCTION +tasks { + reobfJar { + paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.REOBF_PRODUCTION + } + withType().configureEach { + options.release = 21 + } } From a9a8f651e5cb409681fc190e68ba6ebac382159f Mon Sep 17 00:00:00 2001 From: Jordan Date: Tue, 15 Apr 2025 22:25:53 +0100 Subject: [PATCH 3/3] Update to upstream --- v1_21_R4/build.gradle.kts | 17 +++++++ v1_21_R4/pom.xml | 100 -------------------------------------- 2 files changed, 17 insertions(+), 100 deletions(-) create mode 100644 v1_21_R4/build.gradle.kts delete mode 100644 v1_21_R4/pom.xml diff --git a/v1_21_R4/build.gradle.kts b/v1_21_R4/build.gradle.kts new file mode 100644 index 00000000..b7793c61 --- /dev/null +++ b/v1_21_R4/build.gradle.kts @@ -0,0 +1,17 @@ +import io.papermc.paperweight.userdev.ReobfArtifactConfiguration + +dependencies { + paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT") + implementation(project(":v1_20_R4")) + implementation(project(":v1_21_R1")) + implementation(project(":v1_21_R2")) +} + +tasks { + reobfJar { + paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.REOBF_PRODUCTION + } + withType().configureEach { + options.release = 21 + } +} diff --git a/v1_21_R4/pom.xml b/v1_21_R4/pom.xml deleted file mode 100644 index 75b6d714..00000000 --- a/v1_21_R4/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - 4.0.0 - valhallammo-v1_21_R4 - - - me.athlaeos - valhallammo-parent - ${revision} - - - - 1.21.5 - - - - - org.spigotmc - spigot - ${spigotVersion}-R0.1-SNAPSHOT - remapped-mojang - provided - - - me.athlaeos - valhallammo-core - ${project.parent.version} - provided - - - me.athlaeos - valhallammo-v1_20_R4 - ${project.parent.version} - compile - - - me.athlaeos - valhallammo-v1_21_R1 - ${project.parent.version} - compile - - - me.athlaeos - valhallammo-v1_21_R2 - ${project.parent.version} - compile - - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigotVersion}-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - ${javaVersion} - ${javaVersion} - - - - - \ No newline at end of file