diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 067f1902..28809efe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,14 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.9.0 with: java-version: 17 - distribution: 'temurin' - cache: maven - - name: Build with Maven - run: mvn --batch-mode --update-snapshots clean package + distribution: 'adopt' + cache: gradle + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.6 + - name: Run build with Gradle Wrapper + run: gradle build diff --git a/.gitignore b/.gitignore index 6b6da0f8..b691bc51 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ target /target/* /target/ /.idea/ +/build/ +/.gradle/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..d668689c --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'org.springframework.boot' version '3.0.2' +} + +apply plugin: 'java' +apply plugin: 'io.spring.dependency-management' + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.0.1' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework:spring-jdbc:5.3.23' + implementation 'org.springframework:spring-beans:6.0.3' + implementation 'org.reflections:reflections:0.10.2' + implementation 'com.github.twitch4j:twitch4j:1.13.0' + implementation 'ch.qos.logback:logback-classic:1.4.5' + implementation 'org.junit.jupiter:junit-jupiter-api:5.9.1' + runtimeOnly 'org.springframework.boot:spring-boot-devtools:3.0.1' + runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.0.9' + testImplementation 'org.springframework.boot:spring-boot-starter-test:3.0.1' +} + +group = 'de.orciument' +version = '0.0.1-SNAPSHOT' +description = 'JavaTwitchBot' +java.sourceCompatibility = JavaVersion.VERSION_17 + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} + +tasks.withType(Javadoc).configureEach { + options.encoding = 'UTF-8' +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..f398c33c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..65dcd68d --- /dev/null +++ b/gradlew @@ -0,0 +1,244 @@ +#!/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##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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 "$*" +} >&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 + 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" && ! "$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 + +# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/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 diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 5c7fadb1..00000000 --- a/pom.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - 4.0.0 - - - - org.springframework.boot - spring-boot-starter-parent - 3.0.1 - - - de.orciument - JavaTwitchBot - 0.0.1-SNAPSHOT - JavaTwitchBot - JavaTwitchBot - - 17 - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.mariadb.jdbc - mariadb-java-client - runtime - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework - spring-beans - - - org.reflections - reflections - 0.10.2 - - - com.github.twitch4j - twitch4j - 1.12.0 - - - ch.qos.logback - logback-classic - - - org.springframework - spring-jdbc - 5.3.23 - - - org.junit.jupiter - junit-jupiter-api - - - - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - src - - - src/resources - - - src/main/modules/ - - - - - - - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..85e47421 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'JavaTwitchBot' diff --git a/src/main/Application.java b/src/main/java/main/Application.java similarity index 100% rename from src/main/Application.java rename to src/main/java/main/Application.java diff --git a/src/main/inputs/Twitch4J/Twitch4JInput.java b/src/main/java/main/Twitch4J/Twitch4JInput.java similarity index 99% rename from src/main/inputs/Twitch4J/Twitch4JInput.java rename to src/main/java/main/Twitch4J/Twitch4JInput.java index 46d738d3..ac2cfb90 100644 --- a/src/main/inputs/Twitch4J/Twitch4JInput.java +++ b/src/main/java/main/Twitch4J/Twitch4JInput.java @@ -1,4 +1,4 @@ -package main.inputs.Twitch4J; +package main.Twitch4J; import com.github.philippheuer.credentialmanager.domain.OAuth2Credential; import com.github.philippheuer.events4j.simple.SimpleEventHandler; diff --git a/src/main/inputs/Twitch4J/TwitchAccount.java b/src/main/java/main/Twitch4J/TwitchAccount.java similarity index 96% rename from src/main/inputs/Twitch4J/TwitchAccount.java rename to src/main/java/main/Twitch4J/TwitchAccount.java index 469dc785..c3533162 100644 --- a/src/main/inputs/Twitch4J/TwitchAccount.java +++ b/src/main/java/main/Twitch4J/TwitchAccount.java @@ -1,4 +1,4 @@ -package main.inputs.Twitch4J; +package main.Twitch4J; import jakarta.persistence.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/inputs/Twitch4J/TwitchAccountRepo.java b/src/main/java/main/Twitch4J/TwitchAccountRepo.java similarity index 93% rename from src/main/inputs/Twitch4J/TwitchAccountRepo.java rename to src/main/java/main/Twitch4J/TwitchAccountRepo.java index ff3da993..27b05423 100644 --- a/src/main/inputs/Twitch4J/TwitchAccountRepo.java +++ b/src/main/java/main/Twitch4J/TwitchAccountRepo.java @@ -1,4 +1,4 @@ -package main.inputs.Twitch4J; +package main.Twitch4J; import org.jetbrains.annotations.NotNull; import org.springframework.data.repository.CrudRepository; diff --git a/src/main/modules/core/Twitch4JHandler.java b/src/main/java/main/modules/core/Twitch4JHandler.java similarity index 100% rename from src/main/modules/core/Twitch4JHandler.java rename to src/main/java/main/modules/core/Twitch4JHandler.java diff --git a/src/main/modules/testModule/Core_FollowHandler.java b/src/main/java/main/modules/testModule/Core_FollowHandler.java similarity index 100% rename from src/main/modules/testModule/Core_FollowHandler.java rename to src/main/java/main/modules/testModule/Core_FollowHandler.java diff --git a/src/main/modules/testModule/HookExampleClass.java b/src/main/java/main/modules/testModule/HookExampleClass.java similarity index 100% rename from src/main/modules/testModule/HookExampleClass.java rename to src/main/java/main/modules/testModule/HookExampleClass.java diff --git a/src/main/modules/testModule/resources/templates/test.html b/src/main/java/main/modules/testModule/resources/templates/test.html similarity index 100% rename from src/main/modules/testModule/resources/templates/test.html rename to src/main/java/main/modules/testModule/resources/templates/test.html diff --git a/src/main/modules/testModule/testController.java b/src/main/java/main/modules/testModule/testController.java similarity index 100% rename from src/main/modules/testModule/testController.java rename to src/main/java/main/modules/testModule/testController.java diff --git a/src/main/system/ASCIIProgressbar.java b/src/main/java/main/system/ASCIIProgressbar.java similarity index 100% rename from src/main/system/ASCIIProgressbar.java rename to src/main/java/main/system/ASCIIProgressbar.java diff --git a/src/main/system/StopWatch.java b/src/main/java/main/system/StopWatch.java similarity index 100% rename from src/main/system/StopWatch.java rename to src/main/java/main/system/StopWatch.java diff --git a/src/main/system/commandSystem/CommandProcessor.java b/src/main/java/main/system/commandSystem/CommandProcessor.java similarity index 100% rename from src/main/system/commandSystem/CommandProcessor.java rename to src/main/java/main/system/commandSystem/CommandProcessor.java diff --git a/src/main/system/commandSystem/CommandProcessorTest.java b/src/main/java/main/system/commandSystem/CommandProcessorTest.java similarity index 100% rename from src/main/system/commandSystem/CommandProcessorTest.java rename to src/main/java/main/system/commandSystem/CommandProcessorTest.java diff --git a/src/main/system/commandSystem/repositories/Command.java b/src/main/java/main/system/commandSystem/repositories/Command.java similarity index 100% rename from src/main/system/commandSystem/repositories/Command.java rename to src/main/java/main/system/commandSystem/repositories/Command.java diff --git a/src/main/system/commandSystem/repositories/CommandRepo.java b/src/main/java/main/system/commandSystem/repositories/CommandRepo.java similarity index 100% rename from src/main/system/commandSystem/repositories/CommandRepo.java rename to src/main/java/main/system/commandSystem/repositories/CommandRepo.java diff --git a/src/main/system/commandSystem/repositories/CooldownType.java b/src/main/java/main/system/commandSystem/repositories/CooldownType.java similarity index 100% rename from src/main/system/commandSystem/repositories/CooldownType.java rename to src/main/java/main/system/commandSystem/repositories/CooldownType.java diff --git a/src/main/system/commandSystem/repositories/Message.java b/src/main/java/main/system/commandSystem/repositories/Message.java similarity index 100% rename from src/main/system/commandSystem/repositories/Message.java rename to src/main/java/main/system/commandSystem/repositories/Message.java diff --git a/src/main/system/commandSystem/repositories/MessageRepo.java b/src/main/java/main/system/commandSystem/repositories/MessageRepo.java similarity index 100% rename from src/main/system/commandSystem/repositories/MessageRepo.java rename to src/main/java/main/system/commandSystem/repositories/MessageRepo.java diff --git a/src/main/system/commandSystem/repositories/TPermSetConverter.java b/src/main/java/main/system/commandSystem/repositories/TPermSetConverter.java similarity index 93% rename from src/main/system/commandSystem/repositories/TPermSetConverter.java rename to src/main/java/main/system/commandSystem/repositories/TPermSetConverter.java index 34941f74..aff8fa61 100644 --- a/src/main/system/commandSystem/repositories/TPermSetConverter.java +++ b/src/main/java/main/system/commandSystem/repositories/TPermSetConverter.java @@ -2,10 +2,8 @@ import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; -import main.system.commandSystem.repositories.TwitchUserPermissions; import java.util.HashSet; -import java.util.List; import java.util.StringJoiner; @Converter diff --git a/src/main/system/commandSystem/repositories/TwitchUser.java b/src/main/java/main/system/commandSystem/repositories/TwitchUser.java similarity index 100% rename from src/main/system/commandSystem/repositories/TwitchUser.java rename to src/main/java/main/system/commandSystem/repositories/TwitchUser.java diff --git a/src/main/system/commandSystem/repositories/TwitchUserPermissions.java b/src/main/java/main/system/commandSystem/repositories/TwitchUserPermissions.java similarity index 100% rename from src/main/system/commandSystem/repositories/TwitchUserPermissions.java rename to src/main/java/main/system/commandSystem/repositories/TwitchUserPermissions.java diff --git a/src/main/system/commandSystem/repositories/TwitchUserRepo.java b/src/main/java/main/system/commandSystem/repositories/TwitchUserRepo.java similarity index 100% rename from src/main/system/commandSystem/repositories/TwitchUserRepo.java rename to src/main/java/main/system/commandSystem/repositories/TwitchUserRepo.java diff --git a/src/main/system/eventSystem/EventDispatcher.java b/src/main/java/main/system/eventSystem/EventDispatcher.java similarity index 94% rename from src/main/system/eventSystem/EventDispatcher.java rename to src/main/java/main/system/eventSystem/EventDispatcher.java index 88007b62..155ee09e 100644 --- a/src/main/system/eventSystem/EventDispatcher.java +++ b/src/main/java/main/system/eventSystem/EventDispatcher.java @@ -28,8 +28,8 @@ public static void main(String[] args) throws InvocationTargetException, Illegal private static final Set eventHandler = scanForSubscriber(); private static Set scanForSubscriber() { -// Reflections reflections = new Reflections("main.modules", Scanners.MethodsAnnotated); - Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("main.modules").addScanners(Scanners.MethodsAnnotated)); +// Reflections reflections = new Reflections("main.main.modules", Scanners.MethodsAnnotated); + Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("main.main.modules").addScanners(Scanners.MethodsAnnotated)); Set methods = reflections.getMethodsAnnotatedWith(Subscribe.class); //Die Methoden müssen static sein und dürfen nur einen Parameter haben, // und dieser Parameter muss gleich mit der Klasse in der Annotation sein diff --git a/src/main/system/eventSystem/Subscribe.java b/src/main/java/main/system/eventSystem/Subscribe.java similarity index 100% rename from src/main/system/eventSystem/Subscribe.java rename to src/main/java/main/system/eventSystem/Subscribe.java diff --git a/src/main/system/hookSystem/Hook.java b/src/main/java/main/system/hookSystem/Hook.java similarity index 100% rename from src/main/system/hookSystem/Hook.java rename to src/main/java/main/system/hookSystem/Hook.java diff --git a/src/main/system/hookSystem/HookMethodRunner.java b/src/main/java/main/system/hookSystem/HookMethodRunner.java similarity index 97% rename from src/main/system/hookSystem/HookMethodRunner.java rename to src/main/java/main/system/hookSystem/HookMethodRunner.java index b1fb8098..94b602c8 100644 --- a/src/main/system/hookSystem/HookMethodRunner.java +++ b/src/main/java/main/system/hookSystem/HookMethodRunner.java @@ -47,7 +47,7 @@ private static String invokeHookMethod(Method method, Message message, HashMap scanForHooks() { - Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("main.modules").addScanners(Scanners.MethodsAnnotated)); + Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("main.main.modules").addScanners(Scanners.MethodsAnnotated)); Set methods = reflections.getMethodsAnnotatedWith(Hook.class); //Die Methoden müssen static sein und müssen als ersten Parameter die message haben und danach eine beliebige Anzahl von Strings Set collect = methods.stream() diff --git a/src/main/system/hookSystem/HookParser.java b/src/main/java/main/system/hookSystem/HookParser.java similarity index 100% rename from src/main/system/hookSystem/HookParser.java rename to src/main/java/main/system/hookSystem/HookParser.java diff --git a/src/main/system/hookSystem/HookTest.java b/src/main/java/main/system/hookSystem/HookTest.java similarity index 100% rename from src/main/system/hookSystem/HookTest.java rename to src/main/java/main/system/hookSystem/HookTest.java diff --git a/src/main/system/inputSystem/Input.java b/src/main/java/main/system/inputSystem/Input.java similarity index 100% rename from src/main/system/inputSystem/Input.java rename to src/main/java/main/system/inputSystem/Input.java diff --git a/src/main/system/inputSystem/InputManager.java b/src/main/java/main/system/inputSystem/InputManager.java similarity index 100% rename from src/main/system/inputSystem/InputManager.java rename to src/main/java/main/system/inputSystem/InputManager.java diff --git a/src/main/system/inputSystem/TwitchBotInput.java b/src/main/java/main/system/inputSystem/TwitchBotInput.java similarity index 100% rename from src/main/system/inputSystem/TwitchBotInput.java rename to src/main/java/main/system/inputSystem/TwitchBotInput.java diff --git a/src/resources/application.properties b/src/main/resources/application.properties similarity index 100% rename from src/resources/application.properties rename to src/main/resources/application.properties diff --git a/src/resources/logback.xml b/src/main/resources/logback.xml similarity index 100% rename from src/resources/logback.xml rename to src/main/resources/logback.xml diff --git a/src/resources/META-INF/MANIFEST.MF b/src/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 8983f06c..00000000 --- a/src/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: main.Application -