diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 5de7995..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-kind: pipeline
-type: docker
-name: compliance
-
-steps:
- - name: build
- image: maven:3-openjdk-16
- commands:
- - mvn install
-
----
-kind: pipeline
-type: docker
-name: release
-
-trigger:
- branch:
- - main
- event:
- - push
-
-steps:
- - name: build
- image: maven:3-openjdk-16
- commands:
- - mvn package
- - name: gitea-release
- pull: always
- image: jolheiser/drone-gitea-main:latest
- settings:
- token:
- from_secret: gitea_token
- base: https://git.canopymc.net
- files:
- - "target/Mixtape-*.jar"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 3d13e3f..0ffd7e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
.idea/
*.iml
target/
+build/
+.gradle/
dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..5fe2126
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1,29 @@
+clone:
+ git:
+ image: "woodpeckerci/plugin-git:next"
+pipeline:
+ compliance:
+ commands:
+ - "gradle build"
+ - "gradle test"
+ image: "gradle:7.4-jdk17"
+ when:
+ event: pull_request
+ build:
+ commands:
+ - "gradle shadowJar"
+ image: "gradle:7.4-jdk17"
+ when:
+ branch: main
+ event: push
+ release:
+ image: jolheiser/drone-gitea-main:latest
+ settings:
+ token:
+ from_secret: gitea_token
+ base: https://git.jojodev.com
+ files:
+ - "build/libs/*.jar"
+ when:
+ branch: main
+ event: push
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..af211de
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,44 @@
+plugins {
+ id 'java'
+ id 'com.github.johnrengelman.shadow' version '6.0.0'
+}
+
+repositories {
+ mavenLocal()
+ maven {
+ url = uri('https://hub.spigotmc.org/nexus/content/groups/public/')
+ }
+
+ maven {
+ url = uri('https://oss.sonatype.org/content/groups/public/')
+ }
+
+ maven {
+ url = uri('https://mvn.jojodev.com/releases')
+ }
+
+ maven {
+ url = uri('https://repo.maven.apache.org/maven2/')
+ }
+}
+
+dependencies {
+ implementation 'xyz.etztech:plugin-api:1.0.7'
+ compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT'
+}
+
+group = 'xyz.etztech'
+version = '2.3'
+description = 'Mixtape'
+java.sourceCompatibility = JavaVersion.VERSION_1_8
+
+shadowJar {
+ project.configurations.implementation.canBeResolved = true
+ configurations = [project.configurations.implementation]
+ relocate 'xyz.etztech.core', 'shadow.xyz.etztech.core'
+ archiveClassifier.set('')
+}
+
+tasks.withType(JavaCompile) {
+ options.encoding = 'UTF-8'
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..41d9927
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..41dfb87
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..1b6c787
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,234 @@
+#!/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/master/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
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&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*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ 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 \
+ "$@"
+
+# 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 0000000..ac1b06f
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 7b533e0..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
- 4.0.0
-
- xyz.etztech
- Mixtape
- 2.2
- jar
-
- Mixtape
-
- A Command wRapper plugin.
-
- UTF-8
-
-
-
- clean package
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0
-
-
- 1.8
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.1.0
-
-
- package
-
- shade
-
-
-
-
-
-
-
- src/main/resources
- true
-
-
-
-
-
-
- spigotmc-repo
- https://hub.spigotmc.org/nexus/content/groups/public/
-
-
- sonatype
- https://oss.sonatype.org/content/groups/public/
-
-
- canopy-repo
- https://mvn.canopymc.net/
-
-
-
-
-
- org.spigotmc
- spigot-api
- 1.15.2-R0.1-SNAPSHOT
- provided
-
-
- xyz.etztech
- plugin-api
- 1.0.7
-
-
-
-
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..abc859b
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'Mixtape'
diff --git a/src/main/java/xyz/etztech/mixtape/Database.java b/src/main/java/xyz/etztech/mixtape/Database.java
index 3cc8bac..c23ed52 100644
--- a/src/main/java/xyz/etztech/mixtape/Database.java
+++ b/src/main/java/xyz/etztech/mixtape/Database.java
@@ -21,24 +21,21 @@ public class Database extends DataSource {
}
private void create() {
- try {
- Connection connection = getConnection();
+ try (Connection connection = getConnection()) {
final String CREATE = "CREATE TABLE IF NOT EXISTS `aliases` ( `id` INT AUTO_INCREMENT PRIMARY KEY, `uuid` VARCHAR(36) NOT NULL, `from` VARCHAR(200) NOT NULL, `to` VARCHAR(200) NOT NULL, `type` VARCHAR(7) NOT NULL );";
PreparedStatement pst = connection.prepareStatement(CREATE);
pst.execute();
- connection.close();
} catch (Exception ex) {
ex.printStackTrace();
}
}
public void insert(String uuid, String from, String to, AliasType type) {
- try {
+ try (Connection connection = getConnection()) {
int existingId = exists(uuid, from);
if (existingId > 0) {
delete(existingId);
}
- Connection connection = getConnection();
final String MERGE = "INSERT INTO `aliases` (`uuid`, `from`, `to`, `type`) VALUES (?, ?, ?, ?);";
PreparedStatement pst = connection.prepareStatement(MERGE);
pst.setString(1, uuid);
@@ -46,20 +43,17 @@ public class Database extends DataSource {
pst.setString(3, to);
pst.setString(4, type.name());
pst.executeUpdate();
- connection.close();
} catch (Exception ex) {
ex.printStackTrace();
}
}
public void purge(String uuid) {
- try {
- Connection connection = getConnection();
+ try (Connection connection = getConnection()) {
final String PURGE = "DELETE FROM `aliases` WHERE `uuid` = ?;";
PreparedStatement pst = connection.prepareStatement(PURGE);
pst.setString(1, uuid);
pst.executeUpdate();
- connection.close();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -67,8 +61,7 @@ public class Database extends DataSource {
public List getAliases(String uuid) {
List results = new ArrayList<>();
- try {
- Connection connection = getConnection();
+ try (Connection connection = getConnection()) {
final String SELECT = "SELECT `uuid`, `from`, `to`, `type` FROM `aliases` WHERE `uuid` = ?;";
PreparedStatement pst = connection.prepareStatement(SELECT);
pst.setString(1, uuid);
@@ -81,7 +74,6 @@ public class Database extends DataSource {
alias.setType(AliasType.valueOf(rs.getString("type")));
results.add(alias);
}
- connection.close();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -90,8 +82,7 @@ public class Database extends DataSource {
public List getAliases(String uuid, AliasType type) {
List results = new ArrayList<>();
- try {
- Connection connection = getConnection();
+ try (Connection connection = getConnection()) {
final String SELECT = "SELECT `uuid`, `from`, `to`, `type` FROM `aliases` WHERE `uuid` = ? AND `type` = ?;";
PreparedStatement pst = connection.prepareStatement(SELECT);
pst.setString(1, uuid);
@@ -105,7 +96,6 @@ public class Database extends DataSource {
alias.setType(AliasType.valueOf(rs.getString("type")));
results.add(alias);
}
- connection.close();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -113,8 +103,7 @@ public class Database extends DataSource {
}
public Alias getAlias(String uuid, String from) {
- try {
- Connection connection = getConnection();
+ try (Connection connection = getConnection()) {
final String SELECT = "SELECT `uuid`, `from`, `to`, `type` FROM `aliases` WHERE `uuid` = ? AND `from` = ?;";
PreparedStatement pst = connection.prepareStatement(SELECT);
pst.setString(1, uuid);
@@ -128,7 +117,6 @@ public class Database extends DataSource {
alias.setType(AliasType.valueOf(rs.getString("type")));
return alias;
}
- connection.close();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -137,8 +125,7 @@ public class Database extends DataSource {
public int exists(String uuid, String from) {
- try {
- Connection connection = getConnection();
+ try (Connection connection = getConnection()) {
final String SELECT = "SELECT `id` FROM `aliases` WHERE `uuid` = ? AND `from` = ?;";
PreparedStatement pst = connection.prepareStatement(SELECT);
pst.setString(1, uuid);
@@ -147,7 +134,6 @@ public class Database extends DataSource {
if (rs.next()) {
return rs.getInt("id");
}
- connection.close();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -155,13 +141,11 @@ public class Database extends DataSource {
}
public void delete(int id) {
- try {
- Connection connection = getConnection();
+ try (Connection connection = getConnection()) {
final String DELETE = "DELETE FROM `aliases` WHERE `id` = ?;";
PreparedStatement pst = connection.prepareStatement(DELETE);
pst.setInt(1, id);
pst.executeUpdate();
- connection.close();
} catch (Exception ex) {
ex.printStackTrace();
}
diff --git a/src/main/java/xyz/etztech/mixtape/Mixtape.java b/src/main/java/xyz/etztech/mixtape/Mixtape.java
index aa5f6b1..805e158 100644
--- a/src/main/java/xyz/etztech/mixtape/Mixtape.java
+++ b/src/main/java/xyz/etztech/mixtape/Mixtape.java
@@ -33,11 +33,11 @@ public final class Mixtape extends JavaPlugin {
reloadConfig();
database = new Database(this);
- this.getCommand("mixtape").setExecutor(new CommandMixtape(this));
- this.getCommand("alias").setExecutor(new CommandAlias(this, Database.AliasType.CHAT));
- this.getCommand("/alias").setExecutor(new CommandAlias(this, Database.AliasType.COMMAND));
+ new CommandMixtape(this);
+ new CommandAlias(this, Database.AliasType.CHAT);
+ new CommandAlias(this, Database.AliasType.COMMAND);
- getServer().getPluginManager().registerEvents(new CommandPreprocessListener(this), this);
+ new CommandPreprocessListener(this);
}
@Override
diff --git a/src/main/java/xyz/etztech/mixtape/commands/CommandAlias.java b/src/main/java/xyz/etztech/mixtape/commands/CommandAlias.java
index 58763e6..6d01372 100644
--- a/src/main/java/xyz/etztech/mixtape/commands/CommandAlias.java
+++ b/src/main/java/xyz/etztech/mixtape/commands/CommandAlias.java
@@ -21,6 +21,7 @@ public class CommandAlias implements CommandExecutor {
public CommandAlias(Mixtape plugin, Database.AliasType aliasType) {
this.plugin = plugin;
this.aliasType = aliasType;
+ plugin.getCommand(aliasType == Database.AliasType.CHAT ? "" : "/" + "alias").setExecutor(this);
}
@Override
diff --git a/src/main/java/xyz/etztech/mixtape/commands/CommandMixtape.java b/src/main/java/xyz/etztech/mixtape/commands/CommandMixtape.java
index d19d4e8..fa9f332 100644
--- a/src/main/java/xyz/etztech/mixtape/commands/CommandMixtape.java
+++ b/src/main/java/xyz/etztech/mixtape/commands/CommandMixtape.java
@@ -17,6 +17,7 @@ public class CommandMixtape implements CommandExecutor {
public CommandMixtape(Mixtape plugin) {
this.plugin = plugin;
+ plugin.getCommand("mixtape").setExecutor(this);
}
@Override
diff --git a/src/main/java/xyz/etztech/mixtape/listeners/CommandPreprocessListener.java b/src/main/java/xyz/etztech/mixtape/listeners/CommandPreprocessListener.java
index 14cd259..4e076fd 100644
--- a/src/main/java/xyz/etztech/mixtape/listeners/CommandPreprocessListener.java
+++ b/src/main/java/xyz/etztech/mixtape/listeners/CommandPreprocessListener.java
@@ -30,6 +30,7 @@ public class CommandPreprocessListener implements Listener {
public CommandPreprocessListener(Mixtape plugin) {
this.plugin = plugin;
+ plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@EventHandler(priority= EventPriority.HIGH, ignoreCancelled=true)