diff --git a/.gitignore b/.gitignore index a1c2a23..5bafa86 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,9 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +#Files with sensitive info +config.yml +/WebAPI +/build +/.idea diff --git a/.gradle/6.7/executionHistory/executionHistory.bin b/.gradle/6.7/executionHistory/executionHistory.bin index 6e18ae7..67174aa 100644 Binary files a/.gradle/6.7/executionHistory/executionHistory.bin and b/.gradle/6.7/executionHistory/executionHistory.bin differ diff --git a/.gradle/6.7/executionHistory/executionHistory.lock b/.gradle/6.7/executionHistory/executionHistory.lock new file mode 100644 index 0000000..a0a5af5 Binary files /dev/null and b/.gradle/6.7/executionHistory/executionHistory.lock differ diff --git a/.gradle/6.7/fileHashes/fileHashes.bin b/.gradle/6.7/fileHashes/fileHashes.bin index c67f0ab..30d62e5 100644 Binary files a/.gradle/6.7/fileHashes/fileHashes.bin and b/.gradle/6.7/fileHashes/fileHashes.bin differ diff --git a/.gradle/6.7/fileHashes/fileHashes.lock b/.gradle/6.7/fileHashes/fileHashes.lock new file mode 100644 index 0000000..f3d921a Binary files /dev/null and b/.gradle/6.7/fileHashes/fileHashes.lock differ diff --git a/.gradle/6.7/fileHashes/resourceHashesCache.bin b/.gradle/6.7/fileHashes/resourceHashesCache.bin index e78576a..1c3b6cb 100644 Binary files a/.gradle/6.7/fileHashes/resourceHashesCache.bin and b/.gradle/6.7/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/6.7/javaCompile/classAnalysis.bin b/.gradle/6.7/javaCompile/classAnalysis.bin index d2ac9e1..136100f 100644 Binary files a/.gradle/6.7/javaCompile/classAnalysis.bin and b/.gradle/6.7/javaCompile/classAnalysis.bin differ diff --git a/.gradle/6.7/javaCompile/javaCompile.lock b/.gradle/6.7/javaCompile/javaCompile.lock new file mode 100644 index 0000000..854aab8 Binary files /dev/null and b/.gradle/6.7/javaCompile/javaCompile.lock differ diff --git a/.gradle/6.7/javaCompile/taskHistory.bin b/.gradle/6.7/javaCompile/taskHistory.bin index c0876d8..c125e75 100644 Binary files a/.gradle/6.7/javaCompile/taskHistory.bin and b/.gradle/6.7/javaCompile/taskHistory.bin differ diff --git a/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..03b261d Binary files /dev/null and b/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/7.1/dependencies-accessors/gc.properties b/.gradle/7.1/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/7.1/fileChanges/last-build.bin b/.gradle/7.1/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/7.1/fileChanges/last-build.bin differ diff --git a/.gradle/7.1/fileHashes/fileHashes.lock b/.gradle/7.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000..43f1dfa Binary files /dev/null and b/.gradle/7.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.1/gc.properties b/.gradle/7.1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..b3f0ab7 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 85c5ae0..2b9feb1 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Mon Jul 19 19:31:14 EDT 2021 +#Mon Jul 19 23:27:57 EDT 2021 gradle.version=6.7 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index e533c41..22b7533 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock new file mode 100644 index 0000000..d9002c4 Binary files /dev/null and b/.gradle/checksums/checksums.lock differ diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin deleted file mode 100644 index 83b4f95..0000000 Binary files a/.gradle/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin deleted file mode 100644 index 2e40fcc..0000000 Binary files a/.gradle/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 6759da8..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -SugarcaneWikiFAQ \ No newline at end of file diff --git a/.idea/modules/LunarBot.iml b/.idea/modules/LunarBot.iml new file mode 100644 index 0000000..bb6186c --- /dev/null +++ b/.idea/modules/LunarBot.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.idea/modules/SugarcaneWikiFAQ.iml b/.idea/modules/SugarcaneWikiFAQ.iml deleted file mode 100644 index abeecc0..0000000 --- a/.idea/modules/SugarcaneWikiFAQ.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3b905d6..6897914 100644 --- a/build.gradle +++ b/build.gradle @@ -4,10 +4,10 @@ plugins { id 'com.github.johnrengelman.shadow' version '5.2.0' } -mainClassName = 'org.sugarcanemc.wikifaqbot.Bot' +mainClassName = 'tech.nevets.lunarbot.Bot' -group 'org.sugarcanemc.wikifaqbot' -version '0.1.0' +group 'tech.nevets.lunarbot' +version '1.0' def jdaVer = '4.3.0_298' sourceCompatibility = targetCompatibility = 1.8 diff --git a/build/install/SugarcaneWikiFAQ-shadow/bin/SugarcaneWikiFAQ b/build/install/SugarcaneWikiFAQ-shadow/bin/SugarcaneWikiFAQ deleted file mode 100644 index 24a6be5..0000000 --- a/build/install/SugarcaneWikiFAQ-shadow/bin/SugarcaneWikiFAQ +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## SugarcaneWikiFAQ 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="SugarcaneWikiFAQ" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and SUGARCANE_WIKI_FAQ_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/lib/SugarcaneWikiFAQ-0.1.0-all.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" -jar "\"$CLASSPATH\"" "$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/build/install/SugarcaneWikiFAQ-shadow/bin/SugarcaneWikiFAQ.bat b/build/install/SugarcaneWikiFAQ-shadow/bin/SugarcaneWikiFAQ.bat deleted file mode 100644 index 069aa35..0000000 --- a/build/install/SugarcaneWikiFAQ-shadow/bin/SugarcaneWikiFAQ.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem SugarcaneWikiFAQ 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 SUGARCANE_WIKI_FAQ_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%\lib\SugarcaneWikiFAQ-0.1.0-all.jar - -@rem Execute SugarcaneWikiFAQ -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %SUGARCANE_WIKI_FAQ_OPTS% -jar "%CLASSPATH%" %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable SUGARCANE_WIKI_FAQ_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%SUGARCANE_WIKI_FAQ_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega \ No newline at end of file diff --git a/build/scriptsShadow/SugarcaneWikiFAQ b/build/scriptsShadow/SugarcaneWikiFAQ deleted file mode 100644 index 24a6be5..0000000 --- a/build/scriptsShadow/SugarcaneWikiFAQ +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## SugarcaneWikiFAQ 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="SugarcaneWikiFAQ" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and SUGARCANE_WIKI_FAQ_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/lib/SugarcaneWikiFAQ-0.1.0-all.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" -jar "\"$CLASSPATH\"" "$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/build/scriptsShadow/SugarcaneWikiFAQ.bat b/build/scriptsShadow/SugarcaneWikiFAQ.bat deleted file mode 100644 index 069aa35..0000000 --- a/build/scriptsShadow/SugarcaneWikiFAQ.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem SugarcaneWikiFAQ 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 SUGARCANE_WIKI_FAQ_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%\lib\SugarcaneWikiFAQ-0.1.0-all.jar - -@rem Execute SugarcaneWikiFAQ -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %SUGARCANE_WIKI_FAQ_OPTS% -jar "%CLASSPATH%" %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable SUGARCANE_WIKI_FAQ_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%SUGARCANE_WIKI_FAQ_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega \ No newline at end of file diff --git a/build/tmp/compileJava/source-classes-mapping.txt b/build/tmp/compileJava/source-classes-mapping.txt index 04083ba..c4c4351 100644 --- a/build/tmp/compileJava/source-classes-mapping.txt +++ b/build/tmp/compileJava/source-classes-mapping.txt @@ -1,18 +1,16 @@ -org/sugarcanemc/wikifaqbot/config/ConfigUtils.java - org.sugarcanemc.wikifaqbot.config.ConfigUtils -org/sugarcanemc/wikifaqbot/commands/InfoCmd.java - org.sugarcanemc.wikifaqbot.commands.InfoCmd -org/sugarcanemc/wikifaqbot/commands/DiceCmd.java - org.sugarcanemc.wikifaqbot.commands.DiceCmd -org/sugarcanemc/wikifaqbot/config/Config.java - org.sugarcanemc.wikifaqbot.config.Config -org/sugarcanemc/wikifaqbot/commands/PingCmd.java - org.sugarcanemc.wikifaqbot.commands.PingCmd -org/sugarcanemc/wikifaqbot/config/ConfigHandler.java - org.sugarcanemc.wikifaqbot.config.ConfigHandler -org/sugarcanemc/wikifaqbot/webapi/WebAPI.java - org.sugarcanemc.wikifaqbot.webapi.WebAPI -org/sugarcanemc/wikifaqbot/Bot.java - org.sugarcanemc.wikifaqbot.Bot -org/sugarcanemc/wikifaqbot/commands/CoinCmd.java - org.sugarcanemc.wikifaqbot.commands.CoinCmd +tech/nevets/lunarbot/config/ConfigHandler.java + tech.nevets.lunarbot.config.ConfigHandler +tech/nevets/lunarbot/commands/DiceCmd.java + tech.nevets.lunarbot.commands.DiceCmd +tech/nevets/lunarbot/config/Config.java + tech.nevets.lunarbot.config.Config +tech/nevets/lunarbot/commands/CoinCmd.java + tech.nevets.lunarbot.commands.CoinCmd +tech/nevets/lunarbot/commands/InfoCmd.java + tech.nevets.lunarbot.commands.InfoCmd +tech/nevets/lunarbot/commands/PingCmd.java + tech.nevets.lunarbot.commands.PingCmd +tech/nevets/lunarbot/config/ConfigUtils.java + tech.nevets.lunarbot.config.ConfigUtils +tech/nevets/lunarbot/Bot.java + tech.nevets.lunarbot.Bot diff --git a/build/tmp/shadowJar/MANIFEST.MF b/build/tmp/shadowJar/MANIFEST.MF index 59499bc..ddf8299 100644 --- a/build/tmp/shadowJar/MANIFEST.MF +++ b/build/tmp/shadowJar/MANIFEST.MF @@ -1,2 +1,3 @@ Manifest-Version: 1.0 +Main-Class: tech.nevets.lunarbot.Bot diff --git a/run/config.yml b/run/config.yml deleted file mode 100644 index da95c0b..0000000 --- a/run/config.yml +++ /dev/null @@ -1,2 +0,0 @@ -prefix: "!" -botToken: "ODY2ODE5NzQ2MDM2ODQyNTI2.YPYGzA.qz-ELkl_GOWZ7qbCJSNvimLPZyo" \ No newline at end of file diff --git a/run/start.cmd b/run/start.cmd deleted file mode 100644 index 2045a57..0000000 --- a/run/start.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -title Sugarcane Bot -"C:\Program Files\Java\jre1.8.0_291\bin\java.exe" -Xmx2G -Xms2G -jar SugarcaneWikiFAQ-0.1.0.jar -pause \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index d000718..504a35d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = 'SugarcaneWikiFAQ' +rootProject.name = 'LunarBot' diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/webapi/WebAPI.java b/src/main/java/org/sugarcanemc/wikifaqbot/webapi/WebAPI.java deleted file mode 100644 index 3c10609..0000000 --- a/src/main/java/org/sugarcanemc/wikifaqbot/webapi/WebAPI.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.sugarcanemc.wikifaqbot.webapi; - -import java.io.*; -import java.net.ServerSocket; -import java.net.Socket; -import java.util.StringTokenizer; - - -public class WebAPI implements Runnable { - - static final File WEB_ROOT = new File("/WebAPI"); - static final String DEFAULT_File = "index.html"; - static final String FILE_NOT_FOUND = "404.html"; - static final String METHOD_NOT_SUPPORTED = "mns.html"; // (file not supported) - - // port - static final int PORT = 80; - // port - - static final boolean verbose = true; - - private Socket connect; - - public void webapi(Socket c) { - connect = c; - } - - public static void main(String[] args){ - try { - ServerSocket serverConnect = new ServerSocket(PORT); - System.out.println("[WebAPI] WebAPI Started on " + "IP" + PORT); - //TODO Make sys.out read IP - while(true) { - WebAPI server = new WebAPI(); - if (verbose) { - System.out.println("[WebAPI] Connection Open."); - } - - Thread thread = new Thread(server); - thread.start(); - - } - } catch (IOException e) { - System.err.println("[WebAPI] Server Connection error"); - e.printStackTrace(); - } - - } - - - @Override - public void run() { - BufferedReader in = null; PrintWriter out = null; BufferedOutputStream dataOut = null; - String fileRequested = null; - - try{ - in = new BufferedReader(new InputStreamReader(connect.getInputStream())); - out = new PrintWriter(connect.getOutputStream()); - dataOut = new BufferedOutputStream(connect.getOutputStream()); - String input = in.readLine(); - StringTokenizer parse = new StringTokenizer(input); - String method = parse.nextToken().toUpperCase(); - fileRequested = parse.nextToken().toLowerCase(); - if(!method.equals("GET") && !method.equals("HEAD")) { - if (verbose) { - System.out.println("501 Not Implemeted: " + method + "method."); - } - } - else{ - - } - } catch(IOException e){ - e.printStackTrace(); - } - - } -} diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/Bot.java b/src/main/java/tech/nevets/lunarbot/Bot.java similarity index 72% rename from src/main/java/org/sugarcanemc/wikifaqbot/Bot.java rename to src/main/java/tech/nevets/lunarbot/Bot.java index 44199f3..671dd5b 100644 --- a/src/main/java/org/sugarcanemc/wikifaqbot/Bot.java +++ b/src/main/java/tech/nevets/lunarbot/Bot.java @@ -1,15 +1,15 @@ -package org.sugarcanemc.wikifaqbot; +package tech.nevets.lunarbot; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.entities.Activity; -import org.sugarcanemc.wikifaqbot.commands.CoinCmd; -import org.sugarcanemc.wikifaqbot.commands.DiceCmd; -import org.sugarcanemc.wikifaqbot.commands.InfoCmd; -import org.sugarcanemc.wikifaqbot.commands.PingCmd; -import org.sugarcanemc.wikifaqbot.config.Config; -import org.sugarcanemc.wikifaqbot.config.ConfigHandler; -import org.sugarcanemc.wikifaqbot.config.ConfigUtils; +import tech.nevets.lunarbot.commands.games.CoinCmd; +import tech.nevets.lunarbot.commands.games.DiceCmd; +import tech.nevets.lunarbot.commands.wiki.InfoCmd; +import tech.nevets.lunarbot.commands.games.PingCmd; +import tech.nevets.lunarbot.config.Config; +import tech.nevets.lunarbot.config.ConfigHandler; +import tech.nevets.lunarbot.config.ConfigUtils; import java.io.File; diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/commands/CoinCmd.java b/src/main/java/tech/nevets/lunarbot/commands/games/CoinCmd.java similarity index 89% rename from src/main/java/org/sugarcanemc/wikifaqbot/commands/CoinCmd.java rename to src/main/java/tech/nevets/lunarbot/commands/games/CoinCmd.java index 22427e9..cd7746c 100644 --- a/src/main/java/org/sugarcanemc/wikifaqbot/commands/CoinCmd.java +++ b/src/main/java/tech/nevets/lunarbot/commands/games/CoinCmd.java @@ -1,14 +1,13 @@ -package org.sugarcanemc.wikifaqbot.commands; +package tech.nevets.lunarbot.commands.games; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.sugarcanemc.wikifaqbot.config.ConfigHandler; +import tech.nevets.lunarbot.config.ConfigHandler; import java.io.FileNotFoundException; import java.util.Random; -import java.util.concurrent.ThreadLocalRandom; public class CoinCmd extends ListenerAdapter { @Override diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/commands/DiceCmd.java b/src/main/java/tech/nevets/lunarbot/commands/games/DiceCmd.java similarity index 91% rename from src/main/java/org/sugarcanemc/wikifaqbot/commands/DiceCmd.java rename to src/main/java/tech/nevets/lunarbot/commands/games/DiceCmd.java index 2706db9..a6543eb 100644 --- a/src/main/java/org/sugarcanemc/wikifaqbot/commands/DiceCmd.java +++ b/src/main/java/tech/nevets/lunarbot/commands/games/DiceCmd.java @@ -1,10 +1,10 @@ -package org.sugarcanemc.wikifaqbot.commands; +package tech.nevets.lunarbot.commands.games; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.sugarcanemc.wikifaqbot.config.ConfigHandler; +import tech.nevets.lunarbot.config.ConfigHandler; import java.io.FileNotFoundException; import java.util.Random; diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/commands/PingCmd.java b/src/main/java/tech/nevets/lunarbot/commands/games/PingCmd.java similarity index 90% rename from src/main/java/org/sugarcanemc/wikifaqbot/commands/PingCmd.java rename to src/main/java/tech/nevets/lunarbot/commands/games/PingCmd.java index fffed3b..67f81b5 100644 --- a/src/main/java/org/sugarcanemc/wikifaqbot/commands/PingCmd.java +++ b/src/main/java/tech/nevets/lunarbot/commands/games/PingCmd.java @@ -1,10 +1,10 @@ -package org.sugarcanemc.wikifaqbot.commands; +package tech.nevets.lunarbot.commands.games; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.sugarcanemc.wikifaqbot.config.ConfigHandler; +import tech.nevets.lunarbot.config.ConfigHandler; import java.io.FileNotFoundException; diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/commands/InfoCmd.java b/src/main/java/tech/nevets/lunarbot/commands/wiki/InfoCmd.java similarity index 92% rename from src/main/java/org/sugarcanemc/wikifaqbot/commands/InfoCmd.java rename to src/main/java/tech/nevets/lunarbot/commands/wiki/InfoCmd.java index 32f779d..fc9549c 100644 --- a/src/main/java/org/sugarcanemc/wikifaqbot/commands/InfoCmd.java +++ b/src/main/java/tech/nevets/lunarbot/commands/wiki/InfoCmd.java @@ -1,15 +1,15 @@ -package org.sugarcanemc.wikifaqbot.commands; +package tech.nevets.lunarbot.commands.wiki; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.sugarcanemc.wikifaqbot.config.ConfigHandler; +import tech.nevets.lunarbot.config.ConfigHandler; import java.io.FileNotFoundException; public class InfoCmd extends ListenerAdapter { - + @Override public void onMessageReceived(MessageReceivedEvent e) { if (e.getAuthor().isBot()) return; Message message = e.getMessage(); diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/config/Config.java b/src/main/java/tech/nevets/lunarbot/config/Config.java similarity index 89% rename from src/main/java/org/sugarcanemc/wikifaqbot/config/Config.java rename to src/main/java/tech/nevets/lunarbot/config/Config.java index a7f47f0..ecb47a0 100644 --- a/src/main/java/org/sugarcanemc/wikifaqbot/config/Config.java +++ b/src/main/java/tech/nevets/lunarbot/config/Config.java @@ -1,4 +1,4 @@ -package org.sugarcanemc.wikifaqbot.config; +package tech.nevets.lunarbot.config; public class Config { private String prefix; diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/config/ConfigHandler.java b/src/main/java/tech/nevets/lunarbot/config/ConfigHandler.java similarity index 97% rename from src/main/java/org/sugarcanemc/wikifaqbot/config/ConfigHandler.java rename to src/main/java/tech/nevets/lunarbot/config/ConfigHandler.java index ed1c79b..9f2be06 100644 --- a/src/main/java/org/sugarcanemc/wikifaqbot/config/ConfigHandler.java +++ b/src/main/java/tech/nevets/lunarbot/config/ConfigHandler.java @@ -1,4 +1,4 @@ -package org.sugarcanemc.wikifaqbot.config; +package tech.nevets.lunarbot.config; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; diff --git a/src/main/java/org/sugarcanemc/wikifaqbot/config/ConfigUtils.java b/src/main/java/tech/nevets/lunarbot/config/ConfigUtils.java similarity index 88% rename from src/main/java/org/sugarcanemc/wikifaqbot/config/ConfigUtils.java rename to src/main/java/tech/nevets/lunarbot/config/ConfigUtils.java index 00ec44f..8b66cca 100644 --- a/src/main/java/org/sugarcanemc/wikifaqbot/config/ConfigUtils.java +++ b/src/main/java/tech/nevets/lunarbot/config/ConfigUtils.java @@ -1,4 +1,4 @@ -package org.sugarcanemc.wikifaqbot.config; +package tech.nevets.lunarbot.config; import java.io.File; import java.io.FileWriter; @@ -25,7 +25,7 @@ public class ConfigUtils { try { FileWriter writer = new FileWriter("config.yml"); - writer.write("prefix: \"!\"\nbotToken: \"BOTTOKEN\"\nmode: \"default\""); + writer.write("prefix: \"!\"\nbotToken: \"BOTTOKEN\""); writer.close(); System.out.println("Successfully wrote to config.yml"); } catch (IOException e) { diff --git a/src/main/java/tech/nevets/lunarbot/webapi/WebAPI.java b/src/main/java/tech/nevets/lunarbot/webapi/WebAPI.java new file mode 100644 index 0000000..24aa617 --- /dev/null +++ b/src/main/java/tech/nevets/lunarbot/webapi/WebAPI.java @@ -0,0 +1,165 @@ +package tech.nevets.lunarbot.webapi; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.ServerSocket; +import java.net.Socket; + +public class WebAPI { + public static void main(String args[]) { + WebServer ws = new WebServer(); + ws.start(); + } + } + + class WebServer { + + + protected void start() { + ServerSocket s; + + System.out.println("Webserver starting up on port 80"); + System.out.println("(press ctrl-c to exit)"); + try { + // create the main server socket + s = new ServerSocket(80); + } catch (Exception e) { + System.out.println("Error: " + e); + return; + } + + System.out.println("Waiting for connection"); + for (;;) { + try { + + Socket remote = s.accept(); + + System.out.println("Connection, sending data."); + BufferedReader in = new BufferedReader(new InputStreamReader( + remote.getInputStream())); + PrintWriter out = new PrintWriter(remote.getOutputStream()); + + String str = "."; + while (!str.equals("")) + str = in.readLine(); + + out.println("HTTP/1.0 200 OK"); + out.println("Content-Type: text/html"); + out.println("Server: Bot"); + out.println(""); + out.println("

WebAPI is running

"); + out.flush(); + remote.close(); + } catch (Exception e) { + System.out.println("Error: " + e); + } + } + } + + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/** static final File WEB_ROOT = new File("/WebAPI"); + static final String DEFAULT_File = "index.html"; + static final String FILE_NOT_FOUND = "404.html"; + static final String METHOD_NOT_SUPPORTED = "mns.html"; // (file not supported) + + // port + static final int PORT = 80; + // port + + static final boolean verbose = true; + + private Socket connect; + + public void webapi(Socket c) { + connect = c; + } + + public static void main(String[] args){ + try { + ServerSocket serverConnect = new ServerSocket(PORT); + System.out.println("[WebAPI] WebAPI Started on " + "IP" + PORT); + while(true) { + WebAPI server = new WebAPI(); + if (verbose) { + System.out.println("[WebAPI] Connection Open."); + } + + Thread thread = new Thread(server); + thread.start(); + + } + } catch (IOException e) { + System.err.println("[WebAPI] Server Connection error"); + e.printStackTrace(); + } + + } + + + @Override + public void run() { + BufferedReader in = null; PrintWriter out = null; BufferedOutputStream dataOut = null; + String fileRequested = null; + + try{ + in = new BufferedReader(new InputStreamReader(connect.getInputStream())); + out = new PrintWriter(connect.getOutputStream()); + dataOut = new BufferedOutputStream(connect.getOutputStream()); + String input = in.readLine(); + StringTokenizer parse = new StringTokenizer(input); + String method = parse.nextToken().toUpperCase(); + fileRequested = parse.nextToken().toLowerCase(); + if(!method.equals("GET") && !method.equals("HEAD")) { + if (verbose) { + System.out.println("501 Not Implemeted: " + method + "method."); + } + File file = new File(WEB_ROOT, METHOD_NOT_SUPPORTED); + int fileLength = file.length(); + String conetentMimeType = "ext/html"; + byte[] fileData = readFileData(file, fileLength) + private byte[] readFileData(File file, int fileLength) { + FileInputStream fileIn = null; + byte[] fileData = new byte[fileLength]; + fileIn = new FileInputStream(file); + fileIn.read(fileData); + } + } + else{ + + } + } catch(IOException e){ + e.printStackTrace(); + } + + } +} +**/ \ No newline at end of file