YOLO

Clean up YAML
Switched CI to woodpecker (#3 )
2022-01-11 03:10:09 +00:00 · 2022-01-11 03:07:37 +00:00 · 2022-01-11 03:05:18 +00:00 · 2021-06-09 01:50:29 +00:00 · 2021-03-16 01:57:37 +00:00
12 changed files with 443 additions and 70 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,5 @@
 *.iml
 target/
 dependency-reduced-pom.xml
+build/
+.gradle/
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -0,0 +1,19 @@
+clone: 
+  git: 
+    image: "woodpeckerci/plugin-git:next"
+pipeline: 
+  compliance: 
+    commands: 
+      - "gradle build"
+      - "gradle test"
+    image: "gradle:7.3-jdk17"
+    when: 
+      event: pull_request
+  release: 
+    commands: 
+      - "gradle publish"
+    secrets: 
+      - maven_password
+    image: "gradle:7.3-jdk17"
+    when: 
+      branch: master
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@ A collection of APIs for use in plugins.

 ## Releases

-[Reposilite](https://repo.etztech.xyz/releases/xyz/etztech/plugin-api)
+[Reposilite](https://mvn.birbmc.com/releases/xyz/etztech/plugin-api)

 ## MinecraftManager Interface

--- a/build.gradle
+++ b/build.gradle
@ -0,0 +1,45 @@
+plugins {
+    id 'java'
+    id 'maven-publish'
+}
+
+group = 'xyz.etztech'
+version = '1.0.7'
+sourceCompatibility = '8'
+
+repositories {
+    mavenLocal()
+    maven {url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'}
+    maven {url = 'https://jcenter.bintray.com'}
+    maven {url = 'https://jitpack.io'}
+}
+
+test {
+    useJUnitPlatform()
+}
+
+dependencies {
+    implementation 'com.zaxxer:HikariCP:3.4.5'
+    implementation 'com.h2database:h2:1.4.200'
+    compileOnly 'org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT'
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from(components.java)
+        }
+    }
+    repositories {
+        maven {
+            name = "jojodev"
+            url = "https://mvn.jojodev.com/releases"
+            credentials {
+                username = "admin"
+                password = System.getenv("MAVEN_PASSWORD")
+            }
+        }
+    }
+}
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/185
+++ b/185
@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or 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.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$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"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# 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
+    ;;
+  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"
+    which java >/dev/null 2>&1 || 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
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@ -0,0 +1,89 @@
+@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
+
+@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=.
+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%" == "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.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+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.
+
+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%"=="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
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/pom.xml
+++ b/pom.xml
@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>xyz.etztech</groupId>
-    <artifactId>plugin-api</artifactId>
-    <version>1.0.7</version>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.16.1-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>3.4.5</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.200</version>
-        </dependency>
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>mvn-repo</id>
-            <url>https://mvnrepository.com/artifact/</url>
-        </repository>
-        <repository> <!-- This repo fixes issues with transitive dependencies -->
-            <id>jcenter</id>
-            <url>http://jcenter.bintray.com</url>
-        </repository>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>etztech</id>
-            <url>https://repo.etztech.xyz/releases</url>
-        </repository>
-    </distributionManagement>
-
-</project>
--- a/settings.gradle
+++ b/settings.gradle
@ -0,0 +1 @@
+rootProject.name = 'plugin-api'
--- a/src/main/java/xyz/etztech/core/command/TickDuration.java
+++ b/src/main/java/xyz/etztech/core/command/TickDuration.java
@ -0,0 +1,60 @@
+package xyz.etztech.core.command;
+
+import java.time.Duration;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class TickDuration {
+
+    private Duration duration;
+
+    public TickDuration(Duration duration) {
+        this.duration = duration;
+    }
+
+    public long toTicks() {
+        return duration.getSeconds()*20;
+    }
+
+    public Duration getDuration() {
+        return duration;
+    }
+
+    /**
+     * Converts a time string (e.g. 10h1m3s) into a TickDuration
+     * @param time time string
+     * @return TickDuration
+     * @throws Exception on invalid time string
+     */
+    public static TickDuration parse(String time) throws Exception {
+        String timePattern = "(?:(?<hours>\\d+)h)?(?:(?<minutes>\\d+)m)?(?:(?<seconds>\\d+)s)?";
+        Pattern pattern = Pattern.compile(timePattern);
+        Matcher match = pattern.matcher(time);
+        Duration duration = Duration.ZERO;
+
+        if (!match.matches()) {
+            throw new Exception("Time format does not match");
+        }
+
+        String hourString = match.group("hours");
+        if (hourString != null) {
+            int hours = Integer.parseInt(hourString);
+            duration = duration.plusHours(hours);
+        }
+
+        String minuteString = match.group("minutes");
+        if (minuteString != null) {
+            int minutes = Integer.parseInt(minuteString);
+            duration = duration.plusMinutes(minutes);
+        }
+
+        String secondString = match.group("seconds");
+        if (secondString != null) {
+            int seconds = Integer.parseInt(secondString);
+            duration = duration.plusSeconds(seconds);
+        }
+
+        return new TickDuration(duration);
+    }
+}
--- a/src/test/java/xyz/etztech/core/command/TickDurationTest.java
+++ b/src/test/java/xyz/etztech/core/command/TickDurationTest.java
@ -0,0 +1,35 @@
+package xyz.etztech.core.command;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class TickDurationTest {
+    @Test
+    void parse() {
+        try {
+            TickDuration tickDuration = TickDuration.parse("1s");
+            assertEquals(20, tickDuration.toTicks());
+
+            tickDuration = TickDuration.parse("1m");
+            assertEquals(20*60, tickDuration.toTicks());
+
+            tickDuration = TickDuration.parse("1h");
+            assertEquals(20*60*60, tickDuration.toTicks());
+
+            tickDuration = TickDuration.parse("5h1m30s");
+            assertEquals(20*60*60*5 + 60*20 + 30*20, tickDuration.toTicks());
+        }
+        catch (Exception e) {
+            fail("Unable to parse time string");
+        }
+
+        try {
+            TickDuration tickDuration = TickDuration.parse("not a time");
+            fail();
+        }
+        catch (Exception e) {
+
+        }
+    }
+}
Author	SHA1	Message	Date
jolheiser	7fc3dac3db	YOLO ci/woodpecker/push/woodpecker Pipeline was successful Details	2022-01-11 03:10:09 +00:00
jolheiser	7173a70003	Clean up YAML	2022-01-11 03:07:37 +00:00
Joey Hines	700494f15b	Switched CI to woodpecker (#3 ) + Bumped gradle version Co-authored-by: jolheiser <john.olheiser@gmail.com> Reviewed-on: Minecraft/pluginapi#3 Co-authored-by: Joey Hines <joey@ahines.net> Co-committed-by: Joey Hines <joey@ahines.net>	2022-01-11 03:05:18 +00:00
Etzelia	8c780129cd	Update to BirbMC (#2 ) Update to BirbMC Signed-off-by: Etzelia <etzelia@hotmail.com> Reviewed-on: https://git.birbmc.com/BirbMC/pluginapi/pulls/2 Co-Authored-By: Etzelia <etzelia@hotmail.com> Co-Committed-By: Etzelia <etzelia@hotmail.com>	2021-06-09 01:50:29 +00:00
Etzelia	333819b7cd	gradle (#1 ) HTTPS jcenter Signed-off-by: Etzelia <etzelia@hotmail.com> Clean up repositories Signed-off-by: Etzelia <etzelia@hotmail.com> Move to Gradle Signed-off-by: Etzelia <etzelia@hotmail.com> Added TickDuration (#10) Added tests to .drone.yml + Added `mvn test` step to compliance Merge branch 'master' of https://git.etztech.xyz/Minecraft/PluginAPI into time_parser Added tests and renamed BukkitDuration to TickDuration Added BukkitDuration + Designed for parsing time arguments easily Co-authored-by: Joey Hines <joey@ahines.net> Reviewed-on: https://git.etztech.xyz/Minecraft/PluginAPI/pulls/10 Reviewed-by: Etzelia <etzelia@hotmail.com> Drone (#9) Add '.drone.yml' Reviewed-on: https://git.etztech.xyz/Minecraft/PluginAPI/pulls/9 Reviewed-by: ZeroHD <joey@ahines.net> Co-authored-by: ZeroHD <joey@ahines.net> Reviewed-on: https://git.birbmc.com/BirbMC/pluginapi/pulls/1 Co-Authored-By: Etzelia <etzelia@hotmail.com> Co-Committed-By: Etzelia <etzelia@hotmail.com>	2021-03-16 01:57:37 +00:00