diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..053ae71 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,72 @@ +name: Java CI + +on: + workflow_dispatch: + push: + pull_request: + +jobs: + # Build AP-Turrets + build: + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout AP-Turrets + uses: actions/checkout@v4 + with: + path: AP-Turrets + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' + - name: Checkout Movecraft-Combat + uses: actions/checkout@v3 + with: + repository: 'APDevTeam/Movecraft-Combat' + path: Movecraft-Combat + ref: 'main' + - name: Checkout Movecraft-WorldGuard + uses: actions/checkout@v3 + with: + repository: 'APDevTeam/Movecraft-WorldGuard' + path: Movecraft-WorldGuard + ref: 'main' + - 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: Cache Maven packages + id: cacheMain + uses: actions/cache@v3 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2 + restore-keys: ${{ runner.os }}-m2 + + # Build Movecraft-Combat + - name: Build Movecraft-Combat + run: mvn -B package -T 1C --file Movecraft-Combat/pom.xml + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # Build Movecraft-WorldGuard + - name: Build Movecraft-WorldGuard + run: mvn -B package -T 1C --file Movecraft-WorldGuard/pom.xml + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Build AP-Turrets + run: cd AP-Turrets && ./gradlew clean build + + - name: Stage jar + run: mkdir staging && cp AP-Turrets/build/libs/AP-Turrets.jar staging && mv staging/AP-Turrets.jar staging/AP-Turrets_$GITHUB_SHA.jar + - name: Upload jar + uses: actions/upload-artifact@v4 + with: + name: AP-Turrets_Dev-Build + path: staging/AP-Turrets_*.jar diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index dec3147..0000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,105 +0,0 @@ -name: Java CI - -on: [workflow_dispatch, push, pull_request] - -jobs: - # Build 1.14.4 NMS - pillage_1_14_4: - runs-on: ubuntu-latest - steps: - - name: Set up JDK 13 - uses: actions/setup-java@v3 - with: - distribution: 'adopt-hotspot' - java-version: '13' - - name: Cache 1.14.4 Maven package - id: cachePillage - uses: actions/cache@v3 - with: - path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/ - key: ${{ runner.os }}-1.14.4 - restore-keys: ${{ runner.os }}-1.14.4 - - name: Cache Maven packages - id: cacheMain - uses: actions/cache@v3 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2_1.14.4 - restore-keys: ${{ runner.os }}-m2_1.14.4 - - - name: Setup BuildTools - run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - - name: Check 1.14.4 - id: pillage - run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/craftbukkit-1.14.4-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false" - - name: Build 1.14.4 - if: steps.pillage.outputs.sucess != 'true' - run: cd BuildTools && java -jar BuildTools.jar --rev 1.14.4 --compile craftbukkit - - build: - runs-on: ubuntu-latest - needs: [pillage_1_14_4] - - steps: - - name: Checkout AP-Turrets - uses: actions/checkout@v3 - with: - path: AP-Turrets - - name: Checkout Movecraft-Combat - uses: actions/checkout@v3 - with: - repository: 'TylerS1066/Movecraft-Combat' - path: Movecraft-Combat - ref: 'main' - - name: Checkout Movecraft-WorldGuard - uses: actions/checkout@v3 - with: - repository: 'APDevTeam/Movecraft-WorldGuard' - path: Movecraft-WorldGuard - ref: 'main' - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - distribution: 'adopt-hotspot' - java-version: '17' - - name: Cache 1.14.4 Maven package - id: cachePillage - uses: actions/cache@v3 - with: - path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/ - key: ${{ runner.os }}-1.14.4 - restore-keys: ${{ runner.os }}-1.14.4 - - name: Cache Maven packages - id: cacheMain - uses: actions/cache@v3 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2 - restore-keys: ${{ runner.os }}-m2 - - # Build Movecraft-Combat - - name: Build Movecraft-Combat - run: mvn -B package -T 1C --file Movecraft-Combat/pom.xml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # Build Movecraft-WorldGuard - - name: Build Movecraft-WorldGuard - run: mvn -B package -T 1C --file Movecraft-WorldGuard/pom.xml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Build AP-Turrets - run: mvn -B package -T 1C --file AP-Turrets/pom.xml - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Stage jar - run: mkdir staging && cp AP-Turrets/target/AP-Turrets.jar staging - - name: Rename jar - run: mv staging/AP-Turrets.jar staging/AP-Turrets_$GITHUB_SHA.jar - - name: Upload jar - uses: actions/upload-artifact@v3 - with: - name: AP-Turrets_Dev-Build - path: staging/AP-Turrets_*.jar diff --git a/.gitignore b/.gitignore index 7ec89ba..1a1ee8f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,27 @@ hs_err_pid* target/* libs/* .vscode/* + +### 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 c7151ab..cf8da8c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # AP-Turrets Mounted Guns! -**Built and tested in Java 11 on Spigot 1.14.4 with Movecraft 8.x** +**Built and tested in Java 17 on Paper 1.18.2 with Movecraft 8.x** Dev builds are provided with no claim to functionality at the [GitHub actions page](https://github.com/APDevTeam/Ap-Turrets/actions). diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..68aab05 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,57 @@ +plugins { + `java-library` + `maven-publish` + id("io.papermc.paperweight.userdev") version "1.7.1" + id("io.github.0ffz.github-packages") version "1.2.1" +} + +repositories { + gradlePluginPortal() + mavenLocal() + githubPackage("apdevteam/movecraft") + maven { + url = uri("https://repo.maven.apache.org/maven2/") + } + maven { + url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") + } + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + } + maven { + url = uri("https://maven.enginehub.org/repo/") + } + maven { + url = uri("https://jitpack.io") + } +} + +dependencies { + api("org.jetbrains:annotations-java5:24.1.0") + paperweight.paperDevBundle("1.18.2-R0.1-SNAPSHOT") + compileOnly("net.countercraft:movecraft:+") + compileOnly(files("../Movecraft-WorldGuard/target/Movecraft-WorldGuard.jar")) + compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.7") + compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") +} + +group = "snowleapord.github.com" +version = "3.0.0_beta-2" +description = "APTurrets" + +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +tasks.assemble { + dependsOn(tasks.reobfJar) +} + +tasks.reobfJar { + outputJar = layout.buildDirectory.file("libs/AP-Turrets.jar") +} + +tasks.processResources { + from(rootProject.file("LICENSE.md")) + filesMatching("*.yml") { + expand(mapOf("projectVersion" to project.version)) + } +} 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 b889a58..0000000 --- a/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - 4.0.0 - - snowleapord.github.com - APTurrets - 3.0.0_beta-2 - - - AP-Turrets - src/main/java - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 13 - 13 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.2 - - - package - - shade - - - false - true - - - - - - - - src/main/resources - true - - - . - . - - LICENSE.md - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sonatype - https://oss.sonatype.org/content/repositories/snapshots - - - enginehub-repo - https://maven.enginehub.org/repo/ - - - jitpack.io - https://jitpack.io - - - github - GitHub APDevTeam/Movecraft Apache Maven Packages - https://maven.pkg.github.com/APDevTeam/Movecraft - - true - - - true - - - - - - - org.spigotmc - spigot-api - 1.14.4-R0.1-SNAPSHOT - provided - - - - org.bukkit - craftbukkit - 1.14.4-R0.1-SNAPSHOT - provided - - - net.countercraft - movecraft - LATEST - provided - - - net.countercraft.movecraft.worldguard - Movecraft-WorldGuard - LATEST - system - ${project.basedir}/../Movecraft-WorldGuard/target/Movecraft-WorldGuard.jar - - - com.sk89q.worldguard - worldguard-bukkit - 7.0.7 - provided - - - com.github.MilkBowl - VaultAPI - 1.7.1 - provided - - - org.jetbrains - annotations-java5 - 23.1.0 - compile - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..c3eb886 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "APTurrets" diff --git a/src/main/java/com/snowleopard1863/APTurrets/TracerManager.java b/src/main/java/com/snowleopard1863/APTurrets/TracerManager.java deleted file mode 100644 index 95e9af4..0000000 --- a/src/main/java/com/snowleopard1863/APTurrets/TracerManager.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.snowleopard1863.APTurrets; - -import org.bukkit.entity.Arrow; -import org.bukkit.entity.Player; -import org.bukkit.metadata.FixedMetadataValue; - -import java.util.HashSet; - -public class TracerManager { - private final HashSet tracedArrows = new HashSet<>(); - - public void disable() { - tracedArrows.clear(); - } - - public boolean isTraced(Arrow a) { - return tracedArrows.contains(a); - } - - public HashSet getTracedArrows() { - return tracedArrows; - } - - public void removeTracedArrow(Arrow a) { - tracedArrows.remove(a); - } - - public void startTracing(Arrow arrow) { - arrow.setMetadata("tracer", new FixedMetadataValue(TurretsMain.getInstance(), true)); - tracedArrows.add(arrow); - arrow.setCritical(false); - - try { - Object packet = TurretsMain.getInstance().getNMSUtils().getNMSClass("PacketPlayOutEntityDestroy").getConstructor(int[].class).newInstance(new int[]{arrow.getEntityId()}); - for(Player p : TurretsMain.getInstance().getServer().getOnlinePlayers()) { - Object nmsPlayer = p.getClass().getMethod("getHandle").invoke(p); - Object pConn = nmsPlayer.getClass().getField("playerConnection").get(nmsPlayer); - pConn.getClass().getMethod("sendPacket", TurretsMain.getInstance().getNMSUtils().getNMSClass("Packet")).invoke(pConn, packet); - } - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/src/main/java/com/snowleopard1863/APTurrets/TurretManager.java b/src/main/java/com/snowleopard1863/APTurrets/TurretManager.java index 0820939..ae28b75 100644 --- a/src/main/java/com/snowleopard1863/APTurrets/TurretManager.java +++ b/src/main/java/com/snowleopard1863/APTurrets/TurretManager.java @@ -7,6 +7,8 @@ import net.countercraft.movecraft.worldguard.MovecraftWorldGuard; import net.countercraft.movecraft.worldguard.utils.WorldGuardUtils.State; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import org.bukkit.Bukkit; import org.bukkit.Effect; import org.bukkit.Location; @@ -114,12 +116,7 @@ public void fire(Player player) { return; Arrow arrow = launchArrow(player); - - if (Config.UseParticleTracers) { - TurretsMain.getInstance().getTracerManager().startTracing(arrow); - } else { - arrow.setCritical(true); - } + arrow.setCritical(true); World world = player.getWorld(); world.playSound(player.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1.0F, 2.0F); @@ -130,16 +127,12 @@ public void fire(Player player) { private Arrow launchArrow(Player player) { Arrow arrow; try { - Object nmsPlayer = player.getClass().getMethod("getHandle").invoke(player); - Object nmsWorld = nmsPlayer.getClass().getMethod("getWorld").invoke(nmsPlayer); - Object nmsArrow = TurretsMain.getInstance().getNMSUtils().getNMSClass("EntityTippedArrow") - .getConstructor(TurretsMain.getInstance().getNMSUtils().getNMSClass("World"), - TurretsMain.getInstance().getNMSUtils().getNMSClass("EntityLiving")) - .newInstance(nmsWorld, nmsPlayer); - nmsArrow.getClass().getMethod("setNoGravity", boolean.class).invoke(nmsArrow, true); - nmsWorld.getClass().getMethod("addEntity", TurretsMain.getInstance().getNMSUtils().getNMSClass("Entity")) - .invoke(nmsWorld, nmsArrow); - arrow = (Arrow) nmsArrow.getClass().getMethod("getBukkitEntity").invoke(nmsArrow); + ServerPlayer nmsPlayer = (ServerPlayer) player.getClass().getMethod("getHandle").invoke(player); + ServerLevel nmsWorld = nmsPlayer.getLevel(); + net.minecraft.world.entity.projectile.Arrow nmsArrow = new net.minecraft.world.entity.projectile.Arrow(nmsWorld, nmsPlayer); + nmsArrow.setNoGravity(true); + nmsWorld.addFreshEntity(nmsArrow); + arrow = (Arrow) nmsArrow.getBukkitEntity(); } catch (Exception e) { throw new ArrowLaunchException("Something went wrong when trying to launch an arrow", e); } diff --git a/src/main/java/com/snowleopard1863/APTurrets/TurretsMain.java b/src/main/java/com/snowleopard1863/APTurrets/TurretsMain.java index fc70e4b..7103f49 100644 --- a/src/main/java/com/snowleopard1863/APTurrets/TurretsMain.java +++ b/src/main/java/com/snowleopard1863/APTurrets/TurretsMain.java @@ -2,8 +2,6 @@ import com.snowleopard1863.APTurrets.config.Config; import com.snowleopard1863.APTurrets.listener.*; -import com.snowleopard1863.APTurrets.task.ArrowTracerTask; -import com.snowleopard1863.APTurrets.utils.NMSUtils; import net.milkbowl.vault.economy.Economy; import org.bukkit.ChatColor; import org.bukkit.event.Listener; @@ -20,9 +18,7 @@ public static TurretsMain getInstance() { return instance; } - private NMSUtils nmsUtils; private TurretManager turretManager; - private TracerManager tracerManager; public void onEnable() { saveDefaultConfig(); @@ -36,7 +32,6 @@ public void onEnable() { Config.IncindiaryChance = getConfig().getDouble("IncindiaryChance", 0.1D); Config.Damage = getConfig().getDouble("Damage", 2.5D); Config.ArrowVelocity = getConfig().getDouble("ArrowVelocity", 4.0D); - Config.UseParticleTracers = getConfig().getBoolean("UseParticleTracers", true); Config.DelayBetweenShots = getConfig().getDouble("DelayBetweenShots", 0.2D); Config.DoRaycast = getConfig().getBoolean("DoRaycast", false); Config.RaycastRadians = getConfig().getDouble("RaycastAngle", 5.0D) / 180.0 * Math.PI; @@ -71,10 +66,6 @@ public void onEnable() { return; } - if (Config.UseParticleTracers) { - getServer().getScheduler().scheduleSyncRepeatingTask(this, new ArrowTracerTask(), 0L, 0L); - } - getServer().getPluginManager().registerEvents(this, this); getServer().getPluginManager().registerEvents(new EntityDamageEntityListener(), this); getServer().getPluginManager().registerEvents(new PlayerDeathListener(), this); @@ -86,16 +77,13 @@ public void onEnable() { getServer().getPluginManager().registerEvents(new ProjectileHitListener(), this); getServer().getPluginManager().registerEvents(new SignChangeListener(), this); - nmsUtils = new NMSUtils(getServer().getClass().getPackage().getName()); turretManager = new TurretManager(); - tracerManager = new TracerManager(); getLogger().info(getDescription().getName() + " v" + getDescription().getVersion() + " has been enabled."); instance = this; } public void onDisable() { turretManager.disable(); - tracerManager.disable(); getLogger().info(getDescription().getName() + " v" + getDescription().getVersion() + " has been disabled."); } @@ -103,15 +91,7 @@ public Economy getEconomy() { return economy; } - public NMSUtils getNMSUtils() { - return nmsUtils; - } - public TurretManager getTurretManager() { return turretManager; } - - public TracerManager getTracerManager() { - return tracerManager; - } } diff --git a/src/main/java/com/snowleopard1863/APTurrets/config/Config.java b/src/main/java/com/snowleopard1863/APTurrets/config/Config.java index ee12154..b946c7b 100644 --- a/src/main/java/com/snowleopard1863/APTurrets/config/Config.java +++ b/src/main/java/com/snowleopard1863/APTurrets/config/Config.java @@ -13,7 +13,6 @@ public class Config { public static double IncindiaryChance = 0.1D; public static double ArrowVelocity = 4.0D; public static int KnockbackStrength = 2; - public static boolean UseParticleTracers = true; public static double DelayBetweenShots = 0.2D; public static boolean DoRaycast = false; public static double RaycastRadians = 2.0 / 180.0 * Math.PI; diff --git a/src/main/java/com/snowleopard1863/APTurrets/task/ArrowTracerTask.java b/src/main/java/com/snowleopard1863/APTurrets/task/ArrowTracerTask.java deleted file mode 100644 index e572283..0000000 --- a/src/main/java/com/snowleopard1863/APTurrets/task/ArrowTracerTask.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.snowleopard1863.APTurrets.task; - -import com.snowleopard1863.APTurrets.TurretsMain; -import org.bukkit.Particle; -import org.bukkit.entity.Arrow; - -import java.util.HashSet; - -public class ArrowTracerTask implements Runnable { - @Override - public void run() { - HashSet removeSet = new HashSet<>(); - for(Arrow a : TurretsMain.getInstance().getTracerManager().getTracedArrows()) { - a.getWorld().spawnParticle(Particle.CRIT, a.getLocation(), 1, 0.0D, 0.0D, 0.0D, 0.0D); - - if (a.isOnGround() || a.isDead() || a.getTicksLived() > 100) - removeSet.add(a); - } - for(Arrow a : removeSet) { - TurretsMain.getInstance().getTracerManager().removeTracedArrow(a); - a.remove(); - } - } -} diff --git a/src/main/java/com/snowleopard1863/APTurrets/utils/NMSUtils.java b/src/main/java/com/snowleopard1863/APTurrets/utils/NMSUtils.java deleted file mode 100644 index e141bed..0000000 --- a/src/main/java/com/snowleopard1863/APTurrets/utils/NMSUtils.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.snowleopard1863.APTurrets.utils; - -public class NMSUtils { - private final String serverVersion; - - public NMSUtils(String packageName) { - serverVersion = packageName.substring(packageName.lastIndexOf(".") + 1); - } - - public Class getNMSClass(String name) throws ClassNotFoundException { - return Class.forName("net.minecraft.server." + serverVersion + "." + name); - } -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 13ed229..e595dd8 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -7,7 +7,6 @@ Damage: 2.5 # How much damage this should deal IncindiaryChance: 0.1 # Chance to incinerate your enemies ArrowVelocity: 4.0 # Velocity for arrows to go KnockbackStrength: 2 # Knockback strength of the arrows -UseParticleTracers: true # Whether to use tracers DelayBetweenShots: 0.2 # Delay between each shot DoRaycast: false # Do raycast instant shots for elytra fliers RaycastAngle: 5.0 # Angle for the raycast cone of aiming diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d5d157e..21671e2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ main: com.snowleopard1863.APTurrets.TurretsMain -version: ${project.version} +version: ${projectVersion} name: APTurrets -api-version: 1.14 +api-version: 1.18 authors: [TylerS1066, Snowleopard1863, cccm5, MrUniverse_] depend: [Movecraft, Movecraft-WorldGuard, Vault]