diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..f1e8b94 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,39 @@ +name: Java CI + +on: + workflow_dispatch: + push: + pull_request: + +jobs: + # Build Movecraft-CoreProtect + build: + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout Movecraft-CoreProtect + uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + build-scan-publish: true + build-scan-terms-of-use-url: "https://gradle.com/terms-of-service" + build-scan-terms-of-use-agree: "yes" + + - name: Build with Gradle + run: ./gradlew clean build --parallel + + - name: Stage jar + run: mkdir staging && cp build/libs/Movecraft-CoreProtect.jar staging && mv staging/Movecraft-CoreProtect.jar staging/Movecraft-CoreProtect_$GITHUB_SHA.jar + - name: Upload jar + uses: actions/upload-artifact@v4 + with: + name: Movecraft-CoreProtect_Dev-Build + path: staging/Movecraft-CoreProtect_*.jar diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index 3aeb4e5..0000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Java CI - -on: [workflow_dispatch, push, pull_request] - -jobs: - # Build Movecraft-CoreProtect - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout Movecraft-CoreProtect - uses: actions/checkout@v2 - with: - path: Movecraft-CoreProtect - - name: Set up JDK 17 - uses: actions/setup-java@v2 - with: - distribution: 'temurin' - java-version: '17' - - name: Cache Maven packages - id: cacheMain - uses: actions/cache@v2 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2 - restore-keys: ${{ runner.os }}-m2 - - # Build Movecraft-CoreProtect - - name: Build Movecraft-CoreProtect - run: mvn -B package -T 1C --file Movecraft-CoreProtect/pom.xml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Stage jar - run: mkdir staging && cp Movecraft-CoreProtect/target/Movecraft-CoreProtect*.jar staging - - name: Rename jar - run: mv staging/Movecraft-CoreProtect*.jar staging/Movecraft-CoreProtect_$GITHUB_SHA.jar - - name: Upload jar - uses: actions/upload-artifact@v2 - with: - name: Movecraft-CoreProtect_Dev-Build - path: staging/Movecraft-CoreProtect_*.jar \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..c9360da --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,34 @@ +name: Publish package to GitHub Packages + +on: + workflow_dispatch: + release: + types: [created, prereleased] + +jobs: + # Build Movecraft-CoreProtect + build: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout Movecraft-CoreProtect + uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + build-scan-publish: true + build-scan-terms-of-use-url: "https://gradle.com/terms-of-service" + build-scan-terms-of-use-agree: "yes" + + - name: Build with Gradle + run: ./gradlew clean build publish --parallel + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 1c91930..3fd1d56 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,26 @@ buildNumber.properties # Common working directory run/ + +### GitHub example for gradle +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties + +# Cache of project +.gradletasknamecache + +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath diff --git a/README.md b/README.md index 5b5c516..ec893ca 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,26 @@ # Movecraft CoreProtect Addon -![CoreProtect](https://github.com/TylerS1066/Movecraft-CoreProtect/actions/workflows/maven.yml/badge.svg) +![CoreProtect](https://github.com/APDevTeam/Movecraft-CoreProtect/actions/workflows/gradle.yml/badge.svg) Home of the code for the following features: - CoreProtect logging support ## Version support -The `main` branch is coded for 1.14.4 to 1.18.1 and Movecraft 8.x. +The `main` branch is coded for 1.14.4+ and Movecraft 8.x. ## Download -Devevlopment builds can be found on the [GitHub Actions tab](https://github.com/TylerS1066/Movecraft-CoreProtect/actions) of this repository. +Releases can be found on the [releases tab](https://github.com/APDevTeam/Movecraft-CoreProtect/releases). -Stable builds can be found on [our SpigotMC page](TBD). +Development builds can be found on the [GitHub Actions tab](https://github.com/APDevTeam/Movecraft-CoreProtect/actions) of this repository. ## Building -This plugin requires that the user setup their GitHub token in maven to authenticate with GitHub Packages, as described in [this wiki page](https://github.com/APDevTeam/Movecraft/wiki/Documentation). - -Then, run the following to build Movecraft-CoreProtect through `maven`. +Run the following to build Movecraft-CoreProtect: ``` -mvn clean install +./gradlew clean build --parallel ``` -Jars are located in `/target`. - +Jars are located in `/build/libs` directory. ## Support -[Github Issues](https://github.com/TylerS1066/Movecraft-CoreProtect/issues) +[Github Issues](https://github.com/APDevTeam/Movecraft-CoreProtect/issues) [Discord](http://bit.ly/JoinAP-Dev) diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..0919781 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,62 @@ +plugins { + `java-library` + `maven-publish` + id("io.github.0ffz.github-packages") version "1.2.1" +} + +repositories { + gradlePluginPortal() + mavenLocal() + mavenCentral() + maven("https://repo.papermc.io/repository/maven-public/") + maven { githubPackage("apdevteam/movecraft")(this) } + maven("https://maven.playpro.com") +} + +dependencies { + api("org.jetbrains:annotations-java5:24.1.0") + compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT") + compileOnly("net.countercraft:movecraft:+") + compileOnly("net.coreprotect:coreprotect:22.4") +} + +group = "net.countercraft.movecraft.coreprotect" +version = "1.0.0_beta-1_gradle" +description = "Movecraft-CoreProtect" +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +tasks.jar { + archiveBaseName.set("Movecraft-CoreProtect") + archiveClassifier.set("") + archiveVersion.set("") + +} + +tasks.processResources { + from(rootProject.file("LICENSE.md")) + filesMatching("*.yml") { + expand(mapOf("projectVersion" to project.version)) + } +} + +publishing { + publications { + create("maven") { + groupId = "net.countercraft.movecraft.coreprotect" + artifactId = "movecraft-coreprotect" + version = "${project.version}" + + artifact(tasks.jar) + } + } + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/apdevteam/movecraft-coreprotect") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 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..a441313 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..b740cf1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,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=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +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 0000000..25da30d --- /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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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 39acad2..0000000 --- a/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - 4.0.0 - - net.countercraft.movecraft.coreprotect - Movecraft-CoreProtect - 1.0.0_beta-1 - jar - - Movecraft-CoreProtect - - Movecraft Integration with CoreProtect - - UTF-8 - - https://github.com/TylerS1066/Movecraft-CoreProtect - - - Movecraft-CoreProtect - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 13 - 13 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - . - . - - LICENSE.md - - - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - github - GitHub APDevTeam/Movecraft Apache Maven Packages - https://maven.pkg.github.com/APDevTeam/Movecraft - - true - - - true - - - - playpro-repo - https://maven.playpro.com - - - - - - org.spigotmc - spigot-api - 1.14.4-R0.1-SNAPSHOT - provided - - - net.countercraft - movecraft - LATEST - provided - - - net.coreprotect - coreprotect - 21.3 - provided - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..a1c2bab --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "Movecraft-CoreProtect" diff --git a/src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/Config.java b/src/main/java/net/countercraft/movecraft/coreprotect/Config.java similarity index 63% rename from src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/Config.java rename to src/main/java/net/countercraft/movecraft/coreprotect/Config.java index df04e49..8631c13 100644 --- a/src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/Config.java +++ b/src/main/java/net/countercraft/movecraft/coreprotect/Config.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.coreprotect.movecraftcoreprotect; +package net.countercraft.movecraft.coreprotect; public class Config { public static boolean LOG_INTERACTIONS = true; diff --git a/src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/MovecraftCoreProtect.java b/src/main/java/net/countercraft/movecraft/coreprotect/MovecraftCoreProtect.java similarity index 84% rename from src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/MovecraftCoreProtect.java rename to src/main/java/net/countercraft/movecraft/coreprotect/MovecraftCoreProtect.java index 96620d9..8440e84 100644 --- a/src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/MovecraftCoreProtect.java +++ b/src/main/java/net/countercraft/movecraft/coreprotect/MovecraftCoreProtect.java @@ -1,9 +1,9 @@ -package net.countercraft.movecraft.coreprotect.movecraftcoreprotect; +package net.countercraft.movecraft.coreprotect; import net.coreprotect.CoreProtect; import net.coreprotect.CoreProtectAPI; -import net.countercraft.movecraft.coreprotect.movecraftcoreprotect.listeners.CraftDetectListener; -import net.countercraft.movecraft.coreprotect.movecraftcoreprotect.listeners.CraftReleaseListener; +import net.countercraft.movecraft.coreprotect.listeners.CraftDetectListener; +import net.countercraft.movecraft.coreprotect.listeners.CraftReleaseListener; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/listeners/CraftDetectListener.java b/src/main/java/net/countercraft/movecraft/coreprotect/listeners/CraftDetectListener.java similarity index 91% rename from src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/listeners/CraftDetectListener.java rename to src/main/java/net/countercraft/movecraft/coreprotect/listeners/CraftDetectListener.java index be0f707..94c05b7 100644 --- a/src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/listeners/CraftDetectListener.java +++ b/src/main/java/net/countercraft/movecraft/coreprotect/listeners/CraftDetectListener.java @@ -1,9 +1,9 @@ -package net.countercraft.movecraft.coreprotect.movecraftcoreprotect.listeners; +package net.countercraft.movecraft.coreprotect.listeners; import net.coreprotect.CoreProtectAPI; import net.countercraft.movecraft.MovecraftLocation; -import net.countercraft.movecraft.coreprotect.movecraftcoreprotect.Config; -import net.countercraft.movecraft.coreprotect.movecraftcoreprotect.MovecraftCoreProtect; +import net.countercraft.movecraft.coreprotect.Config; +import net.countercraft.movecraft.coreprotect.MovecraftCoreProtect; import net.countercraft.movecraft.craft.PilotedCraft; import net.countercraft.movecraft.craft.type.CraftType; import net.countercraft.movecraft.events.CraftDetectEvent; diff --git a/src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/listeners/CraftReleaseListener.java b/src/main/java/net/countercraft/movecraft/coreprotect/listeners/CraftReleaseListener.java similarity index 91% rename from src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/listeners/CraftReleaseListener.java rename to src/main/java/net/countercraft/movecraft/coreprotect/listeners/CraftReleaseListener.java index 8f987e4..9354d89 100644 --- a/src/main/java/net/countercraft/movecraft/coreprotect/movecraftcoreprotect/listeners/CraftReleaseListener.java +++ b/src/main/java/net/countercraft/movecraft/coreprotect/listeners/CraftReleaseListener.java @@ -1,9 +1,9 @@ -package net.countercraft.movecraft.coreprotect.movecraftcoreprotect.listeners; +package net.countercraft.movecraft.coreprotect.listeners; import net.coreprotect.CoreProtectAPI; import net.countercraft.movecraft.MovecraftLocation; -import net.countercraft.movecraft.coreprotect.movecraftcoreprotect.Config; -import net.countercraft.movecraft.coreprotect.movecraftcoreprotect.MovecraftCoreProtect; +import net.countercraft.movecraft.coreprotect.Config; +import net.countercraft.movecraft.coreprotect.MovecraftCoreProtect; import net.countercraft.movecraft.craft.PilotedCraft; import net.countercraft.movecraft.craft.type.CraftType; import net.countercraft.movecraft.events.CraftReleaseEvent; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 39b39f6..5a5a5f2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,8 @@ name: Movecraft-CoreProtect -version: '${project.version}' -main: net.countercraft.movecraft.coreprotect.movecraftcoreprotect.MovecraftCoreProtect -api-version: 1.14 +version: ${projectVersion} +main: net.countercraft.movecraft.coreprotect.MovecraftCoreProtect +api-version: 1.18 depend: [ Movecraft, CoreProtect ] authors: [ TylerS1066 ] description: Movecraft Integration with CoreProtect -website: https://github.com/TylerS1066/Movecraft-CoreProtect +website: https://github.com/APDevTeam/Movecraft-CoreProtect