Compare commits
15
Commits
02e10104fc
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b82651ee0c | ||
|
|
6dfc229bff | ||
|
|
f28fdc43ec | ||
|
|
de03444bc6 | ||
|
|
0d31d85fd4 | ||
|
|
5ced572237 | ||
|
|
f9c4ff1b1c | ||
|
|
105c914483 | ||
|
|
aa4abfcdee | ||
|
|
e76bd6f5bb | ||
|
|
bf8890f3e9 | ||
|
|
1aa81ec3af | ||
|
|
ac6bf03c45 | ||
|
|
f6c9aaef66 | ||
|
|
bbc7de6751 |
+1
-1
@@ -45,4 +45,4 @@ out/
|
||||
# Linux temp files
|
||||
*~
|
||||
|
||||
!gradle/wrapper/gradle-wrapper.jar
|
||||
*.bat
|
||||
|
||||
Vendored
+44
@@ -0,0 +1,44 @@
|
||||
pipeline {
|
||||
agent any
|
||||
stages {
|
||||
stage('Gradle') {
|
||||
steps {
|
||||
withCredentials([usernamePassword(credentialsId: 'alttd-publish-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
|
||||
sh '''
|
||||
chmod +x gradlew
|
||||
./gradlew build -PalttdDevPublishUser=$USERNAME -PalttdDevPublishPass=$PASSWORD
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Publish to Maven') {
|
||||
steps {
|
||||
withCredentials([usernamePassword(credentialsId: 'alttd-publish-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
|
||||
sh '''
|
||||
chmod +x gradlew
|
||||
./gradlew :api:publish -PalttdDevPublishUser=$USERNAME -PalttdDevPublishPass=$PASSWORD
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Archive') {
|
||||
steps {
|
||||
archiveArtifacts artifacts: 'plugin/build/libs/DataLockLib*.jar, api/build/libs/DataLockLibApi*.jar', followSymlinks: false
|
||||
}
|
||||
}
|
||||
|
||||
stage('discord') {
|
||||
when {
|
||||
anyOf {
|
||||
branch 'main'
|
||||
branch 'master'
|
||||
}
|
||||
}
|
||||
steps {
|
||||
discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
# DataLockLib
|
||||
___
|
||||
|
||||
## **Developer API**
|
||||
Repository
|
||||
```kotlin
|
||||
repositories {
|
||||
maven {
|
||||
url = uri("https://repo.destro.xyz/snapshots")
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.alttd.datalock:api:1.0.0-SNAPSHOT")
|
||||
}
|
||||
```
|
||||
|
||||
## **Usage**
|
||||
An instance of DataLock can be obtained by using this code.
|
||||
```
|
||||
DataLockAPI datalock = DataLockAPI.get();
|
||||
```
|
||||
|
||||
## **Downloads**
|
||||
There are currently no downloads provided. Jars can only be obtained by building from source.
|
||||
|
||||
## **Building**
|
||||
|
||||
#### Initial setup
|
||||
Clone the repo using `git clone https://github.com/Altitude-Devs/DataLockLib.git`.
|
||||
|
||||
#### Building
|
||||
Use the command `./gradlew build --stacktrace` in the project root directory.
|
||||
The compiled jar will be placed in directory `/plugin/build/libs/`.
|
||||
|
||||
## **Commands**
|
||||
|
||||
| Command | Description | Permission |
|
||||
|---------------------|-----------------------------|-----------------------------|
|
||||
|
||||
## **Permissions**
|
||||
|
||||
| Permission | Description |
|
||||
|-----------------------------|------------------------------------------------|
|
||||
|
||||
## **Configuration**
|
||||
|
||||
```yaml
|
||||
|
||||
```
|
||||
|
||||
## **Support**
|
||||
|
||||
## **License**
|
||||
[LICENSE](LICENSE)
|
||||
+14
-12
@@ -1,27 +1,29 @@
|
||||
plugins {
|
||||
`maven-publish`
|
||||
id("java-library")
|
||||
id("maven-publish")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT")
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
||||
// Configure API-specific settings
|
||||
base {
|
||||
archivesName.set("DataLockLibApi")
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
create<MavenPublication>("mavenJava") {
|
||||
artifactId = "api"
|
||||
from(components["java"])
|
||||
}
|
||||
}
|
||||
|
||||
repositories{
|
||||
repositories {
|
||||
maven {
|
||||
name = "maven"
|
||||
url = uri("https://repo.destro.xyz/snapshots")
|
||||
credentials(PasswordCredentials::class)
|
||||
name = "nexus"
|
||||
url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
|
||||
credentials {
|
||||
username = project.findProperty("alttdDevPublishUser")?.toString()
|
||||
password = project.findProperty("alttdDevPublishPass")?.toString()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+6
-2
@@ -1,13 +1,12 @@
|
||||
package com.alttd.datalock;
|
||||
|
||||
import com.alttd.datalock.ResponseType;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class LockResponseEvent extends Event {
|
||||
|
||||
private final HandlerList handlers = new HandlerList();
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private final String channel;
|
||||
private final ResponseType responseType;
|
||||
private final String data;
|
||||
@@ -37,6 +36,11 @@ public class LockResponseEvent extends Event {
|
||||
return result;
|
||||
}
|
||||
|
||||
public static @NotNull HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
+10
-34
@@ -1,48 +1,24 @@
|
||||
|
||||
plugins {
|
||||
id("java")
|
||||
id("com.github.johnrengelman.shadow") version "7.1.0"
|
||||
id("maven-publish")
|
||||
}
|
||||
|
||||
allprojects {
|
||||
group = "com.alttd.datalock"
|
||||
version = "1.0.0-SNAPSHOT"
|
||||
version = "1.2.0-SNAPSHOT"
|
||||
description = "Altitude DataLock Library."
|
||||
}
|
||||
|
||||
subprojects {
|
||||
apply<JavaLibraryPlugin>()
|
||||
apply(plugin = "maven-publish")
|
||||
apply(plugin = "java-library")
|
||||
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion.set(JavaLanguageVersion.of(17))
|
||||
dependencies {
|
||||
compileOnly("io.papermc.paper:paper-api:26.2.build.+")
|
||||
}
|
||||
|
||||
tasks {
|
||||
jar {
|
||||
from(sourceSets.main.get().output)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks {
|
||||
jar {
|
||||
enabled = false
|
||||
}
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
create<MavenPublication>("mavenJava") {
|
||||
from(components["java"])
|
||||
}
|
||||
}
|
||||
|
||||
repositories{
|
||||
maven {
|
||||
name = "maven"
|
||||
url = uri("https://repo.destro.xyz/snapshots")
|
||||
credentials(PasswordCredentials::class)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT")
|
||||
}
|
||||
|
||||
Vendored
BIN
Binary file not shown.
+3
-1
@@ -1,5 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -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/master/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/.
|
||||
@@ -80,13 +82,11 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# 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"'
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@@ -114,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.
|
||||
@@ -133,22 +132,29 @@ location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
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
|
||||
@@ -165,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" )
|
||||
|
||||
@@ -193,18 +198,27 @@ if "$cygwin" || "$msys" ; then
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
|
||||
Vendored
+22
-18
@@ -13,8 +13,10 @@
|
||||
@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
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@@ -25,7 +27,8 @@
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
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
|
||||
|
||||
@@ -56,32 +59,33 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
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 %*
|
||||
"%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
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
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!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
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
|
||||
|
||||
+17
-62
@@ -1,77 +1,32 @@
|
||||
import java.io.ByteArrayOutputStream
|
||||
import java.io.FileOutputStream
|
||||
import java.net.URL
|
||||
|
||||
plugins {
|
||||
`maven-publish`
|
||||
id("com.github.johnrengelman.shadow")
|
||||
id("net.minecrell.plugin-yml.bukkit") version "0.5.1"
|
||||
id("xyz.jpenilla.run-paper") version "1.0.6"
|
||||
id("java-library")
|
||||
id("net.minecrell.plugin-yml.bukkit") version "0.6.0" // Plugin for generating plugin.yml
|
||||
id("com.gradleup.shadow") version "9.6.1"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(project(":api")) // API
|
||||
compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT") // Galaxy
|
||||
implementation(project(":api"))
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
||||
jar {
|
||||
enabled = false
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
archiveFileName.set("${rootProject.name}.jar")
|
||||
}
|
||||
|
||||
build {
|
||||
dependsOn(shadowJar)
|
||||
}
|
||||
|
||||
runServer {
|
||||
val dir = File(System.getProperty("user.home") + "/share/devserver/")
|
||||
if (!dir.parentFile.exists()) {
|
||||
dir.parentFile.mkdirs()
|
||||
}
|
||||
runDirectory.set(dir)
|
||||
|
||||
val fileName = "/galaxy.jar"
|
||||
val file = File(dir.path + fileName)
|
||||
|
||||
if (!file.parentFile.exists()) {
|
||||
file.parentFile.mkdirs()
|
||||
}
|
||||
if (!file.exists()) {
|
||||
download("https://repo.destro.xyz/snapshots/com/alttd/Galaxy-Server/Galaxy-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar", file)
|
||||
}
|
||||
serverJar(file)
|
||||
minecraftVersion("1.19.2")
|
||||
}
|
||||
|
||||
// Plugin-specific configurations
|
||||
base {
|
||||
archivesName.set("DataLockLib")
|
||||
}
|
||||
|
||||
// Bukkit plugin configuration
|
||||
bukkit {
|
||||
name = rootProject.name
|
||||
main = "$group.${rootProject.name}"
|
||||
version = gitCommit()
|
||||
apiVersion = "1.19"
|
||||
main = "${project.group}.${rootProject.name}"
|
||||
apiVersion = "1.21"
|
||||
authors = listOf("Teriuihi")
|
||||
description = project.description
|
||||
version = project.version.toString()
|
||||
}
|
||||
|
||||
fun gitCommit(): String {
|
||||
val os = ByteArrayOutputStream()
|
||||
project.exec {
|
||||
isIgnoreExitValue = true
|
||||
commandLine = "git rev-parse --short HEAD".split(" ")
|
||||
standardOutput = os
|
||||
}
|
||||
return String(os.toByteArray()).trim()
|
||||
tasks.shadowJar {
|
||||
archiveClassifier.set("")
|
||||
}
|
||||
|
||||
fun download(link: String, path: File) {
|
||||
URL(link).openStream().use { input ->
|
||||
FileOutputStream(path).use { output ->
|
||||
input.copyTo(output)
|
||||
}
|
||||
}
|
||||
}
|
||||
tasks.build {
|
||||
dependsOn(tasks.shadowJar)
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Level;
|
||||
|
||||
public class DataLock implements DataLockAPI {
|
||||
|
||||
@@ -13,14 +14,15 @@ public class DataLock implements DataLockAPI {
|
||||
|
||||
public static DataLock getInstance() {
|
||||
if (instance == null)
|
||||
instance = new DataLock();
|
||||
new DataLock();
|
||||
return instance;
|
||||
}
|
||||
|
||||
private final PluginMessageListener pluginMessageListener;
|
||||
private final DataLockLib plugin;
|
||||
private final Idempotency activeRequests;
|
||||
protected DataLock() {
|
||||
private DataLock() {
|
||||
instance = this;
|
||||
DataLockAPI.Provider.register(this);
|
||||
pluginMessageListener = new PluginMessageListener();
|
||||
plugin = DataLockLib.getInstance();
|
||||
@@ -33,6 +35,7 @@ public class DataLock implements DataLockAPI {
|
||||
ByteArrayDataOutput out = ByteStreams.newDataOutput();
|
||||
out.writeUTF(requestType.subChannel);
|
||||
out.writeUTF(idempotencyData.data());
|
||||
out.writeUTF(idempotencyData.idempotencyToken().toString());
|
||||
plugin.getServer().sendPluginMessage(plugin, idempotencyData.channel(), out.toByteArray());
|
||||
}
|
||||
|
||||
@@ -44,6 +47,7 @@ public class DataLock implements DataLockAPI {
|
||||
|
||||
@Override
|
||||
public synchronized void registerChannel(String channel) {
|
||||
DataLockLib.getInstance().getLogger().log(Level.INFO, "Registering plugin channel on [" + channel + "]");
|
||||
activeChannels.add(channel);
|
||||
plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, channel);
|
||||
plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, channel, pluginMessageListener);
|
||||
@@ -72,8 +76,8 @@ public class DataLock implements DataLockAPI {
|
||||
@Override
|
||||
public void run() {
|
||||
for (RequestType requestType : RequestType.values()) {
|
||||
for (IdempotencyData next : activeRequests.getIdempotencyData(requestType)) {
|
||||
sendPluginMessage(requestType, next);
|
||||
for (IdempotencyData idempotencyData : activeRequests.getIdempotencyData(requestType)) {
|
||||
sendPluginMessage(requestType, idempotencyData);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ public class DataLockLib extends JavaPlugin {
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
dataLock = new DataLock();
|
||||
dataLock = DataLock.getInstance();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,6 +7,7 @@ import org.bukkit.scheduler.BukkitRunnable;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Level;
|
||||
|
||||
class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessageListener {
|
||||
|
||||
@@ -23,43 +24,45 @@ class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessage
|
||||
return;
|
||||
}
|
||||
ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
|
||||
String data = in.readUTF();
|
||||
String subChannel = in.readUTF();
|
||||
boolean result = in.readBoolean();
|
||||
String data = in.readUTF();
|
||||
UUID idempotency = UUID.fromString(in.readUTF());
|
||||
IdempotencyData idempotencyData = new IdempotencyData(channel, data, idempotency);
|
||||
DataLockLib.getInstance().getLogger().log(Level.INFO, "Received plugin message on [" + subChannel + "] about data: [" + data + "]");
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
switch (in.readUTF()) {
|
||||
switch (subChannel) {
|
||||
case "try-lock-result" -> {
|
||||
if (!alreadyReceived.putIdempotencyData(RequestType.TRY_LOCK, idempotencyData))
|
||||
return;
|
||||
DataLock.getInstance().removeActiveRequest(RequestType.TRY_LOCK, idempotencyData);
|
||||
new LockResponseEvent(true, channel, ResponseType.TRY_LOCK_RESULT, data, result);
|
||||
new LockResponseEvent(true, channel, ResponseType.TRY_LOCK_RESULT, data, result).callEvent();
|
||||
}
|
||||
case "queue-lock-failed" -> {
|
||||
if (!alreadyReceived.putIdempotencyData(RequestType.TRY_LOCK, idempotencyData))
|
||||
return;
|
||||
DataLock.getInstance().removeActiveRequest(RequestType.TRY_LOCK, idempotencyData);
|
||||
new LockResponseEvent(true, channel, ResponseType.QUEUE_LOCK_FAILED, data, result);
|
||||
new LockResponseEvent(true, channel, ResponseType.QUEUE_LOCK_FAILED, data, result).callEvent();
|
||||
}
|
||||
case "try-unlock-result" -> {
|
||||
if (!alreadyReceived.putIdempotencyData(RequestType.TRY_UNLOCK, idempotencyData))
|
||||
return;
|
||||
DataLock.getInstance().removeActiveRequest(RequestType.TRY_UNLOCK, idempotencyData);
|
||||
new LockResponseEvent(true, channel, ResponseType.TRY_UNLOCK_RESULT, data, result);
|
||||
new LockResponseEvent(true, channel, ResponseType.TRY_UNLOCK_RESULT, data, result).callEvent();
|
||||
}
|
||||
case "locked-queue-lock" -> {
|
||||
if (!alreadyReceived.putIdempotencyData(RequestType.TRY_LOCK, idempotencyData))
|
||||
return;
|
||||
DataLock.getInstance().removeActiveRequest(RequestType.TRY_LOCK, idempotencyData);
|
||||
new LockResponseEvent(true, channel, ResponseType.LOCKED_QUEUE_LOCK, data, result);
|
||||
new LockResponseEvent(true, channel, ResponseType.LOCKED_QUEUE_LOCK, data, result).callEvent();
|
||||
}
|
||||
case "check-lock-result" -> {
|
||||
if (!alreadyReceived.putIdempotencyData(RequestType.CHECK_LOCK, idempotencyData))
|
||||
return;
|
||||
DataLock.getInstance().removeActiveRequest(RequestType.CHECK_LOCK, idempotencyData);
|
||||
new LockResponseEvent(true, channel, ResponseType.CHECK_LOCK_RESULT, data, result);
|
||||
new LockResponseEvent(true, channel, ResponseType.CHECK_LOCK_RESULT, data, result).callEvent();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+8
-1
@@ -6,7 +6,10 @@ include(":plugin")
|
||||
dependencyResolutionManagement {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
|
||||
maven {
|
||||
name = "papermc"
|
||||
url = uri("https://repo.papermc.io/repository/maven-public/")
|
||||
}
|
||||
}
|
||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||
}
|
||||
@@ -14,5 +17,9 @@ dependencyResolutionManagement {
|
||||
pluginManagement {
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
maven {
|
||||
name = "papermc"
|
||||
url = uri("https://repo.papermc.io/repository/maven-public/")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user