Compare commits
7
Commits
c9b919879a
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1be3e898b1 | ||
|
|
e47ff95c3f | ||
|
|
81da9bac32 | ||
|
|
8e0a9ffdad | ||
|
|
9482a8d17b | ||
|
|
36863fc46a | ||
|
|
1bb016ab8c |
Vendored
+6
-5
@@ -3,11 +3,12 @@ pipeline {
|
||||
stages {
|
||||
stage('Gradle') {
|
||||
steps {
|
||||
withCredentials([usernamePassword(credentialsId: 'destro-repo-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
|
||||
sh '''
|
||||
chmod +x gradlew
|
||||
./gradlew build -PalttdDevPublishUser=$USERNAME -PalttdDevPublishPass=$PASSWORD
|
||||
'''
|
||||
withCredentials([usernamePassword(credentialsId: 'alttd-snapshot-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
|
||||
sh '''
|
||||
set +x
|
||||
chmod +x gradlew
|
||||
./gradlew build -PalttdSnapshotUsername=$USERNAME -PalttdSnapshotPassword=$PASSWORD
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,9 +3,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") {
|
||||
isChanging = true
|
||||
}
|
||||
compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
|
||||
compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate
|
||||
compileOnly("net.luckperms:api:5.3") // Luckperms
|
||||
|
||||
|
||||
@@ -4,11 +4,10 @@ import com.alttd.boosterapi.data.Booster;
|
||||
import com.alttd.boosterapi.data.BoosterType;
|
||||
import com.alttd.boosterapi.util.Logger;
|
||||
import com.fasterxml.jackson.core.*;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.*;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.LinkedList;
|
||||
@@ -20,6 +19,9 @@ public class BoosterFileStorage {
|
||||
|
||||
private File CONFIG_FILE;
|
||||
private final Logger logger;
|
||||
private WatchService watchService;
|
||||
private Thread watchThread;
|
||||
|
||||
public BoosterFileStorage(Logger logger) {
|
||||
this.logger = logger;
|
||||
logger.info("Preparing booster file storage...");
|
||||
@@ -29,103 +31,198 @@ public class BoosterFileStorage {
|
||||
private void init() {
|
||||
File CONFIG_PATH = new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "Boosters");
|
||||
if (!CONFIG_PATH.exists()) {
|
||||
if (!CONFIG_PATH.mkdir())
|
||||
if (!CONFIG_PATH.mkdir()) {
|
||||
logger.severe("Unable to create json storage directory");
|
||||
}
|
||||
}
|
||||
CONFIG_FILE = new File(CONFIG_PATH, "storage.json");
|
||||
if (!CONFIG_FILE.exists()) {
|
||||
try {
|
||||
if (!CONFIG_FILE.createNewFile())
|
||||
logger.severe("Unable to create json storeage file");
|
||||
if (!CONFIG_FILE.createNewFile()) {
|
||||
logger.severe("Unable to create json storage file");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
mapper.enable(SerializationFeature.INDENT_OUTPUT);
|
||||
}
|
||||
|
||||
public synchronized List<Booster> reload() {
|
||||
/**
|
||||
* Attempts to reload the whole storage file.
|
||||
*
|
||||
* Optional.empty() means the file was invalid/incomplete and callers should
|
||||
* keep their current in-memory state rather than replacing it.
|
||||
*/
|
||||
public synchronized Optional<List<Booster>> reload() {
|
||||
logger.debug("Reloading boosters...");
|
||||
return loadBoosters();
|
||||
}
|
||||
|
||||
private List<Booster> loadBoosters() {
|
||||
List<Booster> boosters = new LinkedList<>();
|
||||
/**
|
||||
* Watches storage.json and asks the owner of the cache to reload whenever
|
||||
* the file changes or is replaced.
|
||||
*/
|
||||
public synchronized void startWatching(Runnable onReload) {
|
||||
if (watchThread != null && watchThread.isAlive())
|
||||
return;
|
||||
|
||||
try {
|
||||
JsonParser parser = new JsonFactory().createParser(CONFIG_FILE);
|
||||
if (parser == null) {
|
||||
logger.warning("Unable to load in boosters from storage file.");
|
||||
return boosters;
|
||||
Path directory = CONFIG_FILE.toPath().getParent();
|
||||
watchService = FileSystems.getDefault().newWatchService();
|
||||
directory.register(
|
||||
watchService,
|
||||
StandardWatchEventKinds.ENTRY_MODIFY,
|
||||
StandardWatchEventKinds.ENTRY_CREATE
|
||||
);
|
||||
|
||||
watchThread = new Thread(() -> watchLoop(onReload), "booster-storage-watcher");
|
||||
watchThread.setDaemon(true);
|
||||
watchThread.start();
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Unable to watch booster storage file", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void watchLoop(Runnable onReload) {
|
||||
Path fileName = CONFIG_FILE.toPath().getFileName();
|
||||
|
||||
while (!Thread.currentThread().isInterrupted()) {
|
||||
try {
|
||||
WatchKey key = watchService.take();
|
||||
boolean changed = false;
|
||||
|
||||
for (WatchEvent<?> event : key.pollEvents()) {
|
||||
if (event.kind() == StandardWatchEventKinds.OVERFLOW)
|
||||
continue;
|
||||
|
||||
Path changedFile = (Path) event.context();
|
||||
if (fileName.equals(changedFile))
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if (!key.reset())
|
||||
break;
|
||||
|
||||
if (changed) {
|
||||
try {
|
||||
onReload.run();
|
||||
} catch (RuntimeException e) {
|
||||
logger.severe("Unable to reload boosters after storage file changed: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
} catch (ClosedWatchServiceException e) {
|
||||
break;
|
||||
}
|
||||
parser.nextToken();
|
||||
while (parser.currentToken() != null && parser.currentToken().isStructStart()) {
|
||||
}
|
||||
}
|
||||
|
||||
private Optional<List<Booster>> loadBoosters() {
|
||||
List<Booster> boosters = new LinkedList<>();
|
||||
|
||||
try (JsonParser parser = new JsonFactory().createParser(CONFIG_FILE)) {
|
||||
JsonToken token = parser.nextToken();
|
||||
|
||||
// An empty file represents an empty booster list.
|
||||
if (token == null)
|
||||
return Optional.of(boosters);
|
||||
|
||||
while (token != null) {
|
||||
if (token != JsonToken.START_OBJECT)
|
||||
return invalid("Expected booster object start but found " + token);
|
||||
|
||||
Optional<Booster> optionalBooster = loadBooster(parser);
|
||||
if (optionalBooster.isEmpty())
|
||||
continue;
|
||||
if (optionalBooster.isEmpty()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
Booster booster = optionalBooster.get();
|
||||
logger.debug("Loading booster:" + booster.getBoosterType());
|
||||
boosters.add(booster);
|
||||
if (parser.nextToken() != null && !parser.currentToken().isStructEnd()) {
|
||||
logger.warning("Last loaded booster had more data than expected, skipping it...");
|
||||
while (!parser.nextToken().isStructEnd())
|
||||
;
|
||||
|
||||
token = parser.nextToken();
|
||||
if (token != JsonToken.END_OBJECT) {
|
||||
return invalid("Expected booster object end but found " + token);
|
||||
}
|
||||
parser.nextToken();
|
||||
|
||||
token = parser.nextToken();
|
||||
}
|
||||
parser.close();
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
|
||||
return Optional.of(boosters);
|
||||
} catch (IOException | IllegalArgumentException e) {
|
||||
logger.warning("Unable to load boosters from storage file: " + e.getMessage());
|
||||
return Optional.empty();
|
||||
}
|
||||
return boosters;
|
||||
}
|
||||
|
||||
public Optional<Booster> loadBooster(JsonParser parser) throws IOException {
|
||||
JsonToken jsonToken = parser.getCurrentToken();
|
||||
if (!jsonToken.isStructStart())
|
||||
return error("Didn't find struct start");
|
||||
|
||||
jsonToken = parser.nextToken();
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"boosterUUID".equals(parser.getCurrentName()))
|
||||
JsonToken jsonToken = parser.nextToken();
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"boosterUUID".equals(parser.getCurrentName())) {
|
||||
return error("Didn't find boosterUUID at expected location");
|
||||
parser.nextValue();
|
||||
}
|
||||
if (parser.nextToken() != JsonToken.VALUE_STRING) {
|
||||
return error("boosterUUID was not a string");
|
||||
}
|
||||
UUID boosterUUID = UUID.fromString(parser.getValueAsString());
|
||||
|
||||
jsonToken = parser.nextToken();
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"activatorName".equals(parser.getCurrentName()))
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"activatorName".equals(parser.getCurrentName())) {
|
||||
return error("Didn't find activatorName at expected location");
|
||||
parser.nextValue();
|
||||
}
|
||||
if (parser.nextToken() != JsonToken.VALUE_STRING) {
|
||||
return error("activatorName was not a string");
|
||||
}
|
||||
String activatorName = parser.getValueAsString();
|
||||
|
||||
jsonToken = parser.nextToken();
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"boosterType".equals(parser.getCurrentName()))
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"boosterType".equals(parser.getCurrentName())) {
|
||||
return error("Didn't find boosterType at expected location");
|
||||
parser.nextValue();
|
||||
}
|
||||
if (parser.nextToken() != JsonToken.VALUE_STRING) {
|
||||
return error("boosterType was not a string");
|
||||
}
|
||||
BoosterType boosterType = BoosterType.getByName(parser.getValueAsString());
|
||||
if (boosterType == null) {
|
||||
return error("Unknown boosterType");
|
||||
}
|
||||
|
||||
jsonToken = parser.nextToken();
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"startingTime".equals(parser.getCurrentName()))
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"startingTime".equals(parser.getCurrentName())) {
|
||||
return error("Didn't find startingTime at expected location");
|
||||
parser.nextValue();
|
||||
Instant startingTime = Instant.ofEpochMilli(parser.getValueAsLong());
|
||||
}
|
||||
if (parser.nextToken() != JsonToken.VALUE_NUMBER_INT) {
|
||||
return error("startingTime was not an integer");
|
||||
}
|
||||
Instant startingTime = Instant.ofEpochMilli(parser.getLongValue());
|
||||
|
||||
jsonToken = parser.nextToken();
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"duration".equals(parser.getCurrentName()))
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"duration".equals(parser.getCurrentName())) {
|
||||
return error("Didn't find duration at expected location");
|
||||
parser.nextValue();
|
||||
Duration duration = Duration.ofMillis(parser.getValueAsLong());
|
||||
}
|
||||
if (parser.nextToken() != JsonToken.VALUE_NUMBER_INT) {
|
||||
return error("duration was not an integer");
|
||||
}
|
||||
Duration duration = Duration.ofMillis(parser.getLongValue());
|
||||
|
||||
jsonToken = parser.nextToken();
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"multiplier".equals(parser.getCurrentName()))
|
||||
if (jsonToken != JsonToken.FIELD_NAME || !"multiplier".equals(parser.getCurrentName())) {
|
||||
return error("Didn't find multiplier at expected location");
|
||||
parser.nextValue();
|
||||
double multiplier = parser.getValueAsDouble();
|
||||
}
|
||||
JsonToken multiplierToken = parser.nextToken();
|
||||
if (multiplierToken != JsonToken.VALUE_NUMBER_INT && multiplierToken != JsonToken.VALUE_NUMBER_FLOAT) {
|
||||
return error("multiplier was not a number");
|
||||
}
|
||||
double multiplier = parser.getDoubleValue();
|
||||
|
||||
return Optional.of(new Booster(boosterUUID, activatorName, boosterType, startingTime, duration, multiplier));
|
||||
}
|
||||
|
||||
private <T> Optional<T> invalid(String error) {
|
||||
logger.severe(error);
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private Optional<Booster> error(String error) {
|
||||
logger.severe(error);
|
||||
return Optional.empty();
|
||||
@@ -143,7 +240,6 @@ public class BoosterFileStorage {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void saveBooster(Booster booster, JsonGenerator generator) throws IOException {
|
||||
generator.writeStartObject();
|
||||
|
||||
|
||||
@@ -17,16 +17,23 @@ public class BoosterCache {
|
||||
public BoosterCache(BoosterFileStorage boosterFileStorage) {
|
||||
this.boosterFileStorage = boosterFileStorage;
|
||||
reloadBoosters();
|
||||
boosterFileStorage.startWatching(this::reloadBoosters);
|
||||
}
|
||||
|
||||
public synchronized void reloadBoosters() {
|
||||
boosters.clear();
|
||||
List<Booster> allBoosters = boosterFileStorage.reload();
|
||||
for (Booster booster : allBoosters) {
|
||||
LinkedList<Booster> list = boosters.getOrDefault(booster.getBoosterType(), new LinkedList<>());
|
||||
Optional<List<Booster>> reloadedBoosters = boosterFileStorage.reload();
|
||||
if (reloadedBoosters.isEmpty())
|
||||
return;
|
||||
|
||||
HashMap<BoosterType, LinkedList<Booster>> newBoosters = new HashMap<>();
|
||||
for (Booster booster : reloadedBoosters.get()) {
|
||||
LinkedList<Booster> list = newBoosters.getOrDefault(booster.getBoosterType(), new LinkedList<>());
|
||||
list.add(booster);
|
||||
boosters.put(booster.getBoosterType(), list);
|
||||
newBoosters.put(booster.getBoosterType(), list);
|
||||
}
|
||||
|
||||
boosters.clear();
|
||||
boosters.putAll(newBoosters);
|
||||
updateOrder();
|
||||
}
|
||||
|
||||
@@ -43,21 +50,23 @@ public class BoosterCache {
|
||||
LinkedList<Booster> list = boosters.get(boosterType);
|
||||
Booster oldActive = null;
|
||||
if (list.size() > 1) {
|
||||
oldActive = list.get(0);
|
||||
oldActive = list.getFirst();
|
||||
}
|
||||
list.sort(Booster::compareTo);
|
||||
if (oldActive != null && !list.get(0).getBoosterUUID().equals(oldActive.getBoosterUUID())) {
|
||||
if (oldActive != null && !list.getFirst().getBoosterUUID().equals(oldActive.getBoosterUUID())) {
|
||||
oldActive.updateDuration();
|
||||
}
|
||||
}
|
||||
|
||||
public synchronized Optional<Booster> getActiveBooster(BoosterType boosterType) {
|
||||
if (!boosters.containsKey(boosterType))
|
||||
if (!boosters.containsKey(boosterType)) {
|
||||
return Optional.empty();
|
||||
}
|
||||
LinkedList<Booster> list = boosters.get(boosterType);
|
||||
if (list.isEmpty())
|
||||
if (list.isEmpty()) {
|
||||
return Optional.empty();
|
||||
return Optional.of(list.get(0));
|
||||
}
|
||||
return Optional.of(list.getFirst());
|
||||
}
|
||||
|
||||
public synchronized List<Booster> getAllActiveBoosters() {
|
||||
|
||||
@@ -29,6 +29,7 @@ public enum BoosterType {
|
||||
CROSSBOWS("crossbows", MCMMO),
|
||||
MACES("maces", MCMMO),
|
||||
TRIDENTS("tridents", MCMMO),
|
||||
SPEARS("spears", MCMMO),
|
||||
|
||||
/**
|
||||
* MYPET - Boosts MyPet exp gains
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
plugins {
|
||||
`java-library`
|
||||
`maven-publish`
|
||||
id("io.github.goooler.shadow") version "8.1.8"
|
||||
id("com.gradleup.shadow") version "9.6.1"
|
||||
}
|
||||
|
||||
allprojects {
|
||||
group = "com.alttd.boosters"
|
||||
version = "1.0.0-BETA-SNAPSHOT"
|
||||
version = System.getenv("BUILD_NUMBER") ?: "1.0.0-BETA-SNAPSHOT"
|
||||
description = "Easily manage all boosters on the Altitude Minecraft Server Network."
|
||||
|
||||
apply<JavaLibraryPlugin>()
|
||||
@@ -14,7 +14,7 @@ allprojects {
|
||||
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion.set(JavaLanguageVersion.of(21))
|
||||
languageVersion.set(JavaLanguageVersion.of(25))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
# Copyright © 2015 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.
|
||||
@@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/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/.
|
||||
@@ -84,7 +86,7 @@ done
|
||||
# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||
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
|
||||
@@ -112,7 +114,6 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
@@ -170,7 +171,6 @@ fi
|
||||
# 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" )
|
||||
|
||||
@@ -203,15 +203,14 @@ fi
|
||||
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,
|
||||
# * 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" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
|
||||
Vendored
+3
-2
@@ -13,6 +13,8 @@
|
||||
@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 ##########################################################################
|
||||
@@ -68,11 +70,10 @@ 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 %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
@@ -1,20 +1,17 @@
|
||||
plugins {
|
||||
`maven-publish`
|
||||
id("io.github.goooler.shadow")
|
||||
id("com.gradleup.shadow")
|
||||
id("net.minecrell.plugin-yml.bukkit") version "0.5.1"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// API
|
||||
implementation(project(":boosters-api"))
|
||||
// Galaxy
|
||||
compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") {
|
||||
isChanging = true
|
||||
}
|
||||
compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
|
||||
// MyPet
|
||||
compileOnly("de.keyle:mypet:3.12-SNAPSHOT")
|
||||
compileOnly("de.keyle:mypet-api:4.0.1-SNAPSHOT")
|
||||
// mcMMO
|
||||
compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.2.004") {
|
||||
compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.3.000") {
|
||||
exclude("com.sk89q.worldguard")
|
||||
}
|
||||
|
||||
@@ -39,7 +36,8 @@ tasks {
|
||||
bukkit {
|
||||
name = rootProject.name
|
||||
main = "$group.BoostersPlugin"
|
||||
apiVersion = "1.21"
|
||||
version = "${rootProject.version}"
|
||||
apiVersion = "26.2"
|
||||
authors = listOf("destro174", "akastijn")
|
||||
softDepend = listOf("MyPet", "mcMMO")
|
||||
commands {
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.alttd.boosters.listeners;
|
||||
import com.alttd.boosterapi.data.Booster;
|
||||
import com.alttd.boosterapi.data.BoosterCache;
|
||||
import com.alttd.boosterapi.data.BoosterType;
|
||||
import de.Keyle.MyPet.api.event.MyPetExpEvent;
|
||||
import de.Keyle.MyPet.api.event.PetExpEvent;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
|
||||
@@ -18,15 +18,16 @@ public class MyPetListener implements Listener {
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onMyPetExpEvent(MyPetExpEvent event) {
|
||||
public void onMyPetExpEvent(PetExpEvent event) {
|
||||
double exp = event.getPet().getExp();
|
||||
if (exp == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
Optional<Booster> myPetBooster = boosterCache.getActiveBooster(BoosterType.MYPET);
|
||||
if (myPetBooster.isEmpty())
|
||||
if (myPetBooster.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Booster booster = myPetBooster.get();
|
||||
event.setExp(booster.useMultiplier(event.getExp()));
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.alttd.boosters.listeners;
|
||||
|
||||
import com.alttd.boosterapi.data.BoosterCache;
|
||||
import com.alttd.boosterapi.data.BoosterType;
|
||||
import com.destroystokyo.paper.event.entity.PhantomPreSpawnEvent;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
@@ -16,7 +17,7 @@ public class PhantomSpawnListener implements Listener {
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPhantomPreSpawn(com.destroystokyo.paper.event.entity.PhantomPreSpawnEvent event) {
|
||||
public void onPhantomPreSpawn(PhantomPreSpawnEvent event) {
|
||||
Entity spawningEntity = event.getSpawningEntity();
|
||||
if (spawningEntity instanceof Player
|
||||
&& boosterCache.getActiveBooster(BoosterType.PHANTOM).isPresent()) {
|
||||
|
||||
@@ -23,8 +23,9 @@ public class mcMMOListener implements Listener {
|
||||
String skillName = event.getSkill().name();
|
||||
BoosterType type = BoosterType.getByName(skillName);
|
||||
Optional<Booster> optionalBooster = boosterCache.getActiveBooster(type);
|
||||
if (optionalBooster.isEmpty())
|
||||
if (optionalBooster.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Booster booster = optionalBooster.get();
|
||||
event.setRawXpGained(Math.round(booster.useMultiplier(event.getRawXpGained())));
|
||||
|
||||
+20
-7
@@ -1,5 +1,8 @@
|
||||
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(":velocity")
|
||||
|
||||
@@ -7,19 +10,29 @@ dependencyResolutionManagement {
|
||||
repositories {
|
||||
// mavenLocal()
|
||||
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://oss.sonatype.org/content/groups/public/") // Adventure
|
||||
maven("https://repo.papermc.io/repo/repository/maven-public/") // Velocity
|
||||
maven("https://repo.spongepowered.org/maven") // Configurate
|
||||
maven("https://nexus.neetgames.com/repository/maven-releases/") // mcMMO
|
||||
// maven("https://maven.enginehub.org/repo/") // worldguard
|
||||
maven { // mypet
|
||||
name = "GitHubPackages"
|
||||
url = uri("https://maven.pkg.github.com/MyPetORG/MyPet")
|
||||
credentials {
|
||||
username = providers.gradleProperty("GitHubPackagesUsername").orNull
|
||||
password = providers.gradleProperty("GitHubPackagesPassword").orNull
|
||||
}
|
||||
maven {
|
||||
name = "userderezzedRepoSnapshots"
|
||||
url = uri("https://repo.userderezzed.dev/snapshots")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
plugins {
|
||||
`maven-publish`
|
||||
id("io.github.goooler.shadow")
|
||||
id("com.gradleup.shadow")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// API
|
||||
implementation(project(":boosters-api")) {
|
||||
exclude("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT")
|
||||
exclude("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
|
||||
}
|
||||
// Velocity
|
||||
compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") // Velocity
|
||||
|
||||
@@ -23,7 +23,7 @@ import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
|
||||
// TODO use the version created in build.gradle.kts
|
||||
@Plugin(id = "boosterplugin", name = "BoosterPlugin", version = "1.0.0",
|
||||
description = "Easily manage all boosters on the Altitude Minecraft Server Network.",
|
||||
authors = {"destro174", "teri"},
|
||||
authors = {"destro174", "akastijn"},
|
||||
dependencies = {@Dependency(id = "luckperms"),@Dependency(id = "proxydiscordlink")}
|
||||
)
|
||||
public class VelocityBoosters {
|
||||
|
||||
Reference in New Issue
Block a user