diff options
author | Dico200 <dico.karssiens@gmail.com> | 2017-11-15 18:46:37 +0000 |
---|---|---|
committer | Dico200 <dico.karssiens@gmail.com> | 2017-11-15 18:46:37 +0000 |
commit | a7514074e222f2836193331c3615e334a8b9ffe7 (patch) | |
tree | d28dda9b2a362d68db77e4481fe0a3d7f7c2dbb4 | |
parent | df122f639ff1cfbe000388593fa88d6ff0f6f17e (diff) |
Convert to Maven
-rw-r--r-- | build.gradle | 21 | ||||
-rw-r--r-- | example/CommandManagerExample.iml | 26 | ||||
-rw-r--r-- | example/pom.xml | 50 | ||||
-rw-r--r-- | example/src/main/java/com/nemez/cmdMgrExample/CmdMgrExample.java (renamed from src/main/java/com/nemez/cmdMgrExample/CmdMgrExample.java) | 132 | ||||
-rw-r--r-- | example/src/main/java/com/nemez/cmdMgrExample/example.cmd (renamed from src/main/java/com/nemez/cmdMgrExample/example.cmd) | 72 | ||||
-rwxr-xr-x | gradlew | 172 | ||||
-rw-r--r-- | gradlew.bat | 84 | ||||
-rw-r--r-- | pom.xml | 42 | ||||
-rw-r--r-- | src/main/resources/plugin.yml | 4 |
9 files changed, 220 insertions, 383 deletions
diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 7c7fd50..0000000 --- a/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'java' -apply plugin: 'eclipse' -archivesBaseName = 'CommandManager' -version = '2.0' - -task wrapper(type: Wrapper) { - gradleVersion = '3.2.1' -} - -repositories { - mavenCentral() - - maven { - // spigot - url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" - } -} - -dependencies { - compile 'org.bukkit:bukkit:1.11.2-R0.1-SNAPSHOT' -} diff --git a/example/CommandManagerExample.iml b/example/CommandManagerExample.iml new file mode 100644 index 0000000..b0ce3b2 --- /dev/null +++ b/example/CommandManagerExample.iml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.19" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.12.2-R0.1-SNAPSHOT" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: com.redstoner:CommandManager:1.0" level="project" /> + </component> +</module>
\ No newline at end of file diff --git a/example/pom.xml b/example/pom.xml new file mode 100644 index 0000000..55f7311 --- /dev/null +++ b/example/pom.xml @@ -0,0 +1,50 @@ +<?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>com.redstoner</groupId> + <artifactId>CommandManagerExample</artifactId> + <version>0.1</version> + + <packaging>jar</packaging> + + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + + <repositories> + <repository> + <id>spigot-repo</id> + <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> + </repository> + </repositories> + + <dependencies> + <!--Spigot API--> + <dependency> + <groupId>org.spigotmc</groupId> + <artifactId>spigot-api</artifactId> + <version>1.12.2-R0.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <!--Bukkit API--> + <dependency> + <groupId>org.bukkit</groupId> + <artifactId>bukkit</artifactId> + <version>1.12.2-R0.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>com.redstoner</groupId> + <artifactId>CommandManager</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + + +</project>
\ No newline at end of file diff --git a/src/main/java/com/nemez/cmdMgrExample/CmdMgrExample.java b/example/src/main/java/com/nemez/cmdMgrExample/CmdMgrExample.java index bac96df..41d714f 100644 --- a/src/main/java/com/nemez/cmdMgrExample/CmdMgrExample.java +++ b/example/src/main/java/com/nemez/cmdMgrExample/CmdMgrExample.java @@ -1,66 +1,66 @@ -package com.nemez.cmdMgrExample;
-
-import java.io.File;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.nemez.cmdmgr.Command;
-import com.nemez.cmdmgr.CommandManager;
-
-public class CmdMgrExample extends JavaPlugin {
-
- public void onEnable() {
- CommandManager.registerCommand(new File("plugins/example.cmd"), this, this);
- }
-
- public void onDisable() {
-
- }
-
- @Command(hook="home_empty")
- public boolean executeHomeNull(CommandSender sender) {
- sender.sendMessage("You executed an empty /home");
- return true;
- }
-
- @Command(hook="home_set")
- public boolean executeSetHome(CommandSender sender, String name) {
- sender.sendMessage("You executed:");
- sender.sendMessage("/home set " + name);
- return true;
- }
-
- @Command(hook="home_set_coords")
- public boolean executeSetHomeBasedOnCoords(CommandSender sender, String name, int x, int y, int z) {
- sender.sendMessage("You executed:");
- sender.sendMessage("/home set " + name + " " + x + " " + y + " " + z);
- return true;
- }
-
- @Command(hook="home_del")
- public void executeDelHome(CommandSender sender, String name, boolean aFlag) {
- sender.sendMessage("You executed:");
- sender.sendMessage("/home del " + name);
- sender.sendMessage("-a - " + aFlag);
- }
-
- @Command(hook="home_list")
- public void executeListHomes(CommandSender sender) {
- sender.sendMessage("You executed:");
- sender.sendMessage("/home list");
- }
-
- @Command(hook="home_tp")
- public void executeTeleportHome(CommandSender sender, String name) {
- sender.sendMessage("You executed:");
- sender.sendMessage("/home " + name);
- }
-
- @Command(hook="noskope")
- public boolean executeMagik(CommandSender sender) {
- sender.sendMessage("You executed!!!!!!!!!:");
- sender.sendMessage("/home yolo swag");
- return true;
- }
-}
+package com.nemez.cmdMgrExample; + +import java.io.File; + +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.java.JavaPlugin; + +import com.nemez.cmdmgr.Command; +import com.nemez.cmdmgr.CommandManager; + +public class CmdMgrExample extends JavaPlugin { + + public void onEnable() { + CommandManager.registerCommand(new File("plugins/example.cmd"), this, this); + } + + public void onDisable() { + + } + + @Command(hook="home_empty") + public boolean executeHomeNull(CommandSender sender) { + sender.sendMessage("You executed an empty /home"); + return true; + } + + @Command(hook="home_set") + public boolean executeSetHome(CommandSender sender, String name) { + sender.sendMessage("You executed:"); + sender.sendMessage("/home set " + name); + return true; + } + + @Command(hook="home_set_coords") + public boolean executeSetHomeBasedOnCoords(CommandSender sender, String name, int x, int y, int z) { + sender.sendMessage("You executed:"); + sender.sendMessage("/home set " + name + " " + x + " " + y + " " + z); + return true; + } + + @Command(hook="home_del") + public void executeDelHome(CommandSender sender, String name, boolean aFlag) { + sender.sendMessage("You executed:"); + sender.sendMessage("/home del " + name); + sender.sendMessage("-a - " + aFlag); + } + + @Command(hook="home_list") + public void executeListHomes(CommandSender sender) { + sender.sendMessage("You executed:"); + sender.sendMessage("/home list"); + } + + @Command(hook="home_tp") + public void executeTeleportHome(CommandSender sender, String name) { + sender.sendMessage("You executed:"); + sender.sendMessage("/home " + name); + } + + @Command(hook="noskope") + public boolean executeMagik(CommandSender sender) { + sender.sendMessage("You executed!!!!!!!!!:"); + sender.sendMessage("/home yolo swag"); + return true; + } +} diff --git a/src/main/java/com/nemez/cmdMgrExample/example.cmd b/example/src/main/java/com/nemez/cmdMgrExample/example.cmd index 8ec5b45..da36e44 100644 --- a/src/main/java/com/nemez/cmdMgrExample/example.cmd +++ b/example/src/main/java/com/nemez/cmdMgrExample/example.cmd @@ -1,36 +1,36 @@ -
-command home {
- alias h;
- alias bleh;
- set [string:name] {
- [int:x] [int:y] [int:z] {
- run home_set_coords name x y z;
- perm home.set.xyz;
- help Sets a new home at coordinates XYZ;
- }
- run home_set name;
- perm home.set;
- help Sets a new home;
- type none;
- }
- del [optional:-a] [string:name] {
- run home_del name -a;
- help Deletes a home\n&cCannot be undone!;
- perm home.del;
- }
- list {
- help Shows all homes;
- run home_list;
- perm home.list;
- }
- [string:name] {
- perm home.tp;
- help Teleports to a home;
- run home_tp name;
- }
- yolo swag {
- perm yo.mamma;
- help Reks you;
- run noskope;
- }
-}
+ +command home { + alias h; + alias bleh; + set [string:name] { + [int:x] [int:y] [int:z] { + run home_set_coords name x y z; + perm home.set.xyz; + help Sets a new home at coordinates XYZ; + } + run home_set name; + perm home.set; + help Sets a new home; + type none; + } + del [optional:-a] [string:name] { + run home_del name -a; + help Deletes a home\n&cCannot be undone!; + perm home.del; + } + list { + help Shows all homes; + run home_list; + perm home.list; + } + [string:name] { + perm home.tp; + help Teleports to a home; + run home_tp name; + } + yolo swag { + perm yo.mamma; + help Reks you; + run noskope; + } +} diff --git a/gradlew b/gradlew deleted file mode 100755 index 4453cce..0000000 --- a/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## 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="" - -# 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, switch paths to Windows format before running java -if $cygwin ; 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=$((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" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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 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=
-
-@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 init
-
-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 init
-
-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
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-: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 %CMD_LINE_ARGS%
-
-: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
@@ -0,0 +1,42 @@ +<?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>com.redstoner</groupId> + <artifactId>CommandManager</artifactId> + <version>1.0</version> + + <packaging>jar</packaging> + + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + + <repositories> + <repository> + <id>spigot-repo</id> + <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> + </repository> + </repositories> + + <dependencies> + <!--Spigot API--> + <dependency> + <groupId>org.spigotmc</groupId> + <artifactId>spigot-api</artifactId> + <version>1.12.2-R0.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <!--Bukkit API--> + <dependency> + <groupId>org.bukkit</groupId> + <artifactId>bukkit</artifactId> + <version>1.12.2-R0.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + </dependencies> + +</project>
\ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index 0bba185..0000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: CommandManagerTest
-main: com.nemez.cmdMgrExample.CmdMgrExample
-version: 13.37
-author: Nemes
|