Compare commits

..

No commits in common. "master" and "boostercommand" have entirely different histories.

11 changed files with 38 additions and 50 deletions

10
Jenkinsfile vendored
View File

@ -3,13 +3,7 @@ pipeline {
stages { stages {
stage('Gradle') { stage('Gradle') {
steps { steps {
withCredentials([usernamePassword(credentialsId: 'alttd-snapshot-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { sh './gradlew build'
sh '''
set +x
chmod +x gradlew
./gradlew build -PalttdSnapshotUsername=$USERNAME -PalttdSnapshotPassword=$PASSWORD
'''
}
} }
} }
stage('Archive') { stage('Archive') {
@ -23,4 +17,4 @@ pipeline {
} }
} }
} }
} }

View File

@ -3,7 +3,9 @@ plugins {
} }
dependencies { dependencies {
compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable") compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") {
isChanging = true
}
compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate
compileOnly("net.luckperms:api:5.3") // Luckperms compileOnly("net.luckperms:api:5.3") // Luckperms

View File

@ -1,16 +1,22 @@
plugins { plugins {
`java-library` `java-library`
`maven-publish` `maven-publish`
id("com.gradleup.shadow") version "9.6.1" id("io.github.goooler.shadow") version "8.1.8"
} }
allprojects { allprojects {
group = "com.alttd.boosters" group = "com.alttd.boosters"
version = System.getenv("BUILD_NUMBER") ?: "1.0.0-BETA-SNAPSHOT" version = "1.0.0-BETA-SNAPSHOT"
description = "Easily manage all boosters on the Altitude Minecraft Server Network." description = "Easily manage all boosters on the Altitude Minecraft Server Network."
apply<JavaLibraryPlugin>() apply<JavaLibraryPlugin>()
apply(plugin = "maven-publish") apply(plugin = "maven-publish")
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}
} }
subprojects { subprojects {

Binary file not shown.

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

15
gradlew vendored
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright © 2015 the original authors. # Copyright © 2015-2021 the original authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@ -57,7 +55,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -86,7 +84,7 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # 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 APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@ -114,6 +112,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;; NONSTOP* ) nonstop=true ;;
esac esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@ -171,6 +170,7 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" ) JAVACMD=$( cygpath --unix "$JAVACMD" )
@ -203,14 +203,15 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped. # 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 # * 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. # treated as '${Hostname}' itself on the command line.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ -classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available. # Stop when "xargs" is not available.

5
gradlew.bat vendored
View File

@ -13,8 +13,6 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@ -70,10 +68,11 @@ goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell

View File

@ -1,15 +1,18 @@
plugins { plugins {
`maven-publish` `maven-publish`
id("com.gradleup.shadow") id("io.github.goooler.shadow")
id("net.minecrell.plugin-yml.bukkit") version "0.5.1" id("net.minecrell.plugin-yml.bukkit") version "0.5.1"
} }
dependencies { dependencies {
// API // API
implementation(project(":boosters-api")) implementation(project(":boosters-api"))
compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable") // Galaxy
compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") {
isChanging = true
}
// MyPet // MyPet
compileOnly("de.keyle:mypet-api:4.0.0-SNAPSHOT") compileOnly("de.keyle:mypet:3.12-SNAPSHOT")
// mcMMO // mcMMO
compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.2.004") { compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.2.004") {
exclude("com.sk89q.worldguard") exclude("com.sk89q.worldguard")
@ -36,8 +39,7 @@ tasks {
bukkit { bukkit {
name = rootProject.name name = rootProject.name
main = "$group.BoostersPlugin" main = "$group.BoostersPlugin"
version = "${rootProject.version}" apiVersion = "1.21"
apiVersion = "26.2"
authors = listOf("destro174", "akastijn") authors = listOf("destro174", "akastijn")
softDepend = listOf("MyPet", "mcMMO") softDepend = listOf("MyPet", "mcMMO")
commands { commands {

View File

@ -3,7 +3,7 @@ package com.alttd.boosters.listeners;
import com.alttd.boosterapi.data.Booster; import com.alttd.boosterapi.data.Booster;
import com.alttd.boosterapi.data.BoosterCache; import com.alttd.boosterapi.data.BoosterCache;
import com.alttd.boosterapi.data.BoosterType; import com.alttd.boosterapi.data.BoosterType;
import de.Keyle.MyPet.api.event.PetExpEvent; import de.Keyle.MyPet.api.event.MyPetExpEvent;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -18,7 +18,7 @@ public class MyPetListener implements Listener {
} }
@EventHandler @EventHandler
public void onMyPetExpEvent(PetExpEvent event) { public void onMyPetExpEvent(MyPetExpEvent event) {
double exp = event.getPet().getExp(); double exp = event.getPet().getExp();
if (exp == 0) { if (exp == 0) {
return; return;

View File

@ -1,8 +1,5 @@
rootProject.name = "Boosters" rootProject.name = "Boosters"
val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME")
val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: System.getenv("NEXUS_PASSWORD")
include(":plugin") include(":plugin")
include(":velocity") include(":velocity")
@ -10,29 +7,16 @@ dependencyResolutionManagement {
repositories { repositories {
// mavenLocal() // mavenLocal()
mavenCentral() mavenCentral()
maven {
url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
credentials {
username = nexusUser
password = nexusPass
}
}
maven {
url = uri("https://repo.alttd.com/repository/alttd/")
credentials {
username = nexusUser
password = nexusPass
}
}
maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
maven("https://oss.sonatype.org/content/groups/public/") // Adventure maven("https://oss.sonatype.org/content/groups/public/") // Adventure
maven("https://repo.papermc.io/repo/repository/maven-public/") // Velocity maven("https://repo.papermc.io/repo/repository/maven-public/") // Velocity
maven("https://repo.spongepowered.org/maven") // Configurate maven("https://repo.spongepowered.org/maven") // Configurate
maven("https://nexus.neetgames.com/repository/maven-releases/") // mcMMO maven("https://nexus.neetgames.com/repository/maven-releases/") // mcMMO
// maven("https://maven.enginehub.org/repo/") // worldguard // maven("https://maven.enginehub.org/repo/") // worldguard
maven { maven { // mypet
name = "userderezzedRepoSnapshots" name = "GitHubPackages"
url = uri("https://repo.userderezzed.dev/snapshots") url = uri("https://maven.pkg.github.com/MyPetORG/MyPet")
credentials(PasswordCredentials::class)
} }
} }

View File

@ -1,6 +1,6 @@
plugins { plugins {
`maven-publish` `maven-publish`
id("com.gradleup.shadow") id("io.github.goooler.shadow")
} }
dependencies { dependencies {