Fixed (real)

+ Fixed some build issues
+ Added reload command
+ Bumped version
+ Add woodpecker pipeline

.gitignore

@@ -1,4 +1,3 @@
 .idea/
-*.iml
-target/
-dependency-reduced-pom.xml
+build/
+.gradle/

.woodpecker.yml

@@ -0,0 +1,29 @@
+clone:
+  git:
+    image: "woodpeckerci/plugin-git:next"
+pipeline:
+  compliance:
+    image: "gradle:8.3-jdk17"
+    commands:
+      - "gradle build"
+      - "gradle test"
+    when:
+      event: pull_request
+  build:
+    image: "gradle:8.3-jdk17"
+    commands:
+      - "gradle shadowJar"
+    when:
+      event: push
+      branch: main
+  release:
+    image: jolheiser/drone-gitea-main:latest
+    settings:
+      base: https://git.jojodev.com
+      token:
+        from_secret: gitea_token
+      files:
+        - "build/libs/*.jar"
+    when:
+      event: push
+      branch: main

build.gradle

@@ -0,0 +1,85 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    id 'java'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        url = uri('https://hub.spigotmc.org/nexus/content/groups/public/')
+    }
+
+    maven {
+        url = uri('https://mvnrepository.com/artifact/')
+    }
+
+    maven {
+        url = uri('https://mvn.jojodev.com/releases')
+
+        // allowInsecureProtocol = true
+    }
+
+    maven {
+        url = uri('https://jcenter.bintray.com')
+
+        // allowInsecureProtocol = true
+    }
+
+    maven {
+        url = uri('https://jitpack.io')
+    }
+
+    maven {
+        url = uri('https://repo.maven.apache.org/maven2/')
+    }
+
+    maven {
+        url = uri('https://oss.sonatype.org/content/groups/public/')
+    }
+
+    maven {
+        url = uri('https://mvnrepository.com/artifact/org.apache.commons/commons-lang3')
+    }
+}
+
+dependencies {
+    implementation 'xyz.etztech:plugin-api:1.0.7'
+    compileOnly 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
+    implementation 'org.apache.commons:commons-lang3:3.13.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+group = 'com.zerohighdef'
+version = '2.0'
+description = 'GeoffreyMC'
+java.sourceCompatibility = JavaVersion.VERSION_1_8
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+tasks.withType(Javadoc) {
+    options.encoding = 'UTF-8'
+}
+
+shadowJar {
+    project.configurations.implementation.canBeResolved = true
+    configurations = [project.configurations.implementation]
+    relocate 'xyz.etztech.core', 'shadow.xyz.etztech.core'
+    archiveClassifier.set('')
+}
+
+tasks.named('test', Test) {
+    useJUnitPlatform()
+
+    maxHeapSize = '1G'
+
+    testLogging {
+        events "passed"
+    }
+}

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -0,0 +1,249 @@
+#!/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.
+#
+
+##############################################################################
+#
+#   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/subprojects/plugins/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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=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=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, 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.
+
+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" "$@"

gradlew.bat

@@ -0,0 +1,92 @@
+@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=.
+@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.
+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% 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

pom.xml

@@ -1,148 +0,0 @@
-
-<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>com.zerohighdef</groupId>
-    <artifactId>GeoffreyMC</artifactId>
-    <!-- Version is used in plugin.yml -->
-    <version>1.0</version>
-    <packaging>jar</packaging>
-
-    <!-- Plugin Information -->
-    <!-- Name, Description, and URL are used in plugin.yml -->
-    <name>GeoffreyMC</name>
-    <description>A plugin for accessing Geoffrey in-game</description>
-    <url>https://geoffrey.zerohighdef.com/</url>
-
-
-    <developers>
-        <developer>
-            <name>ZeroHD</name>
-            <url>https://www.zerohighdef.com</url>
-        </developer>
-    </developers>
-
-    <properties>
-        <!--  Author and MainClass are used in plugin.yml -->
-        <author>ZeroHD</author>
-        <mainClass>com.zerohighdef.geoffrey.GeoffreyMC</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.14.4-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
-        <dependency>
-            <groupId>xyz.etztech</groupId>
-            <artifactId>EtzCore</artifactId>
-            <version>1.0.5</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>RELEASE</version>
-            <scope>test</scope>
-        </dependency>
-
-
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>mvn-repo</id>
-            <url>https://mvnrepository.com/artifact/</url>
-        </repository>
-        <repository>
-            <id>etztech-repo</id>
-            <url>http://repo.etztech.xyz</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>
-
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <defaultGoal>clean install</defaultGoal>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <!-- Keeping filtering at true here reduces plugin.yml redundancy! -->
-                <filtering>true</filtering>
-                <includes>
-                    <include>plugin.yml</include>
-                    <include>config.yml</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <!-- Keep filtering at false for other resources to prevent bad magic -->
-                <filtering>false</filtering>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                    <exclude>plugin.yml</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <!-- Build an executable JAR -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>xyz.etztech.minecraftmanager.MinecraftManager</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

settings.gradle

@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'GeoffreyMC'

src/main/java/com/zerohighdef/geoffrey/Commands/AddItemCommand.java

@@ -7,14 +7,13 @@ import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
 import com.zerohighdef.geoffrey.Objects.GeoffreyUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.text.ParseException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/zerohighdef/geoffrey/Commands/AddLocationCommand.java

@@ -7,7 +7,7 @@ import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
 import com.zerohighdef.geoffrey.Objects.GeoffreyUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/AddOwnerCommand.java

@@ -6,7 +6,7 @@ import com.zerohighdef.geoffrey.Models.GeoffreyLocation;
 import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/AddResidentCommand.java

@@ -2,11 +2,10 @@ package com.zerohighdef.geoffrey.Commands;
 
 import com.google.gson.JsonElement;
 import com.zerohighdef.geoffrey.GeoffreyMC;
-import com.zerohighdef.geoffrey.Models.GeoffreyPlayer;
 import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/AddResourceCommand.java

@@ -7,7 +7,7 @@ import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
 import com.zerohighdef.geoffrey.Objects.GeoffreyUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/AddTunnelCommand.java

@@ -8,7 +8,7 @@ import com.zerohighdef.geoffrey.Models.GeoffreyTunnel;
 import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/DeleteCommand.java

@@ -6,7 +6,7 @@ import com.zerohighdef.geoffrey.GeoffreyMC;
 import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/DeleteItemCommand.java

@@ -7,14 +7,13 @@ import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
 import com.zerohighdef.geoffrey.Objects.GeoffreyUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.text.ParseException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/zerohighdef/geoffrey/Commands/DeleteResourceCommand.java

@@ -7,7 +7,7 @@ import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
 import com.zerohighdef.geoffrey.Objects.GeoffreyUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/EditNameCommand.java

@@ -7,7 +7,6 @@ import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
 import com.zerohighdef.geoffrey.Objects.GeoffreyUtil;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/EditPosCommand.java

@@ -7,7 +7,7 @@ import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
 import com.zerohighdef.geoffrey.Objects.GeoffreyUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/FindCommand.java

@@ -5,7 +5,7 @@ import com.zerohighdef.geoffrey.GeoffreyMC;
 import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/FindFarmCommand.java

@@ -5,7 +5,7 @@ import com.zerohighdef.geoffrey.GeoffreyMC;
 import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/Geoffrey.java

@@ -0,0 +1,37 @@
+package com.zerohighdef.geoffrey.Commands;
+
+import com.zerohighdef.geoffrey.GeoffreyMC;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import java.util.Objects;
+
+public class Geoffrey implements CommandExecutor {
+    protected GeoffreyMC plugin;
+
+    public Geoffrey(GeoffreyMC plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 0)
+        {
+            sender.sendMessage(ChatColor.GREEN + "GeoffreyMC v" + plugin.getDescription().getVersion());
+            sender.sendMessage(ChatColor.GREEN + "/geoffrey reload - reloads the plugin config");
+        }
+        else {
+            if (Objects.equals(args[0], "reload")) {
+                plugin.reloadConfig();
+                sender.sendMessage(ChatColor.GREEN + "Plugin reloaded!");
+            }
+            else {
+                sender.sendMessage(ChatColor.RED + "Unknown subcommand!");
+            }
+        }
+
+        return true;
+    }
+}

src/main/java/com/zerohighdef/geoffrey/Commands/RemoveResidentCommand.java

@@ -5,7 +5,7 @@ import com.zerohighdef.geoffrey.GeoffreyMC;
 import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/RestockCommand.java

@@ -7,7 +7,7 @@ import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
 import com.zerohighdef.geoffrey.Objects.GeoffreyUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/Commands/SellingCommand.java

@@ -6,7 +6,7 @@ import com.zerohighdef.geoffrey.GeoffreyMC;
 import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import com.zerohighdef.geoffrey.Objects.GeoffreyCommandError;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/com/zerohighdef/geoffrey/GeoffreyMC.java

@@ -1,6 +1,7 @@
 package com.zerohighdef.geoffrey;
 
 import com.zerohighdef.geoffrey.Commands.*;
+import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -21,10 +22,6 @@ public final class GeoffreyMC extends JavaPlugin {
         reloadConfig();
 
         if (isEnabled()) {
-            APIToken = config.getString("geoffrey_api.key");
-            baseAPIURL = config.getString("geoffrey_api.api_base_url");
-            baseURL = config.getString("geoffrey_api.base_url");
-
             FindCommand findCommand = new FindCommand(this);
             this.getCommand("geoffrey_find").setExecutor(findCommand);
 
@@ -96,6 +93,9 @@ public final class GeoffreyMC extends JavaPlugin {
 
             TunnelCommand tunnelCommand = new TunnelCommand(this);
             this.getCommand("geoffrey_tunnel").setExecutor(tunnelCommand);
+
+            Geoffrey geoffrey_command = new Geoffrey(this);
+            this.getCommand("geoffrey").setExecutor(geoffrey_command);
         }
 
     }
@@ -113,7 +113,11 @@ public final class GeoffreyMC extends JavaPlugin {
     public void reloadConfig() {
         super.reloadConfig();
         config = Bukkit.getPluginManager().getPlugin("GeoffreyMC").getConfig();
+        APIToken = config.getString("geoffrey_api.key");
+        baseAPIURL = config.getString("geoffrey_api.api_base_url");
+        baseURL = config.getString("geoffrey_api.base_url");
 
+        log("API URL: " + baseAPIURL);
     }
 
     public String getAPIToken() {

src/main/java/com/zerohighdef/geoffrey/Objects/GeoffreyAPICallback.java

@@ -78,7 +78,7 @@ public abstract class GeoffreyAPICallback implements ICallback {
 
             stringBuilder.append(geoffreyShop.getFormattedLocationString());
             stringBuilder.append("\n");
-            stringBuilder.append(geoffreyShop.getInfoString().getFormattedItemListing());
+            stringBuilder.append(geoffreyShop.getFirstItem().getFormattedItemListing());
             stringBuilder.append("\n");
         }
 

src/main/java/com/zerohighdef/geoffrey/Objects/GeoffreyCommand.java

@@ -4,7 +4,7 @@ import com.zerohighdef.geoffrey.GeoffreyMC;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import xyz.etztech.core.web.CoreWeb;
+import xyz.etztech.core.web.Http;
 import xyz.etztech.core.web.ICallback;
 
 import java.util.Map;
@@ -25,10 +25,10 @@ public class GeoffreyCommand implements CommandExecutor {
         params.put("api", plugin.getAPIToken());
 
         if (requestType == Method.GET) {
-            CoreWeb.asyncGetCallback(plugin, url, params, callback);
+            Http.asyncGetCallback(plugin, url, params, callback);
         }
         else {
-            CoreWeb.asyncPostCallback(plugin, url, params, callback);
+            Http.asyncPostCallback(plugin, url, params, callback);
         }
 
     }

src/main/resources/plugin.yml

@@ -1,7 +1,9 @@
-name: ${name}
-version: ${version}
+name: GeoffreyMC
+version: 2.0
 description: Geoffrey API Plugin for PaperMC
-main: ${mainClass}
+authors: [ZeroHD]
+main: com.zerohighdef.geoffrey.GeoffreyMC
+api-version: 1.13
 
 commands:
   geoffrey_find:
@@ -144,6 +146,10 @@ commands:
     aliases: [tunnel]
     permission: geoffrey.search
     usage: /tunnel [player name]
+  geoffrey:
+    description: Geoffrey base command
+    permission: geoffrey.admin
+    usage: /geoffrey
 
 permissions:
   add:
@@ -155,3 +161,6 @@ permissions:
   register:
     description: Permission to register for Geoffrey
     default: false
+  admin:
+    description: Permission to use admin commands
+    default: false