commit 5d843211c03a8018cf92cb6b89d451dbe4094de1 Author: Teriuihi Date: Fri Oct 18 17:49:49 2024 +0200 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..2a65317 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..690f4c6 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..13722c8 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,26 @@ +pipeline { + agent any + stages { + stage('Gradle') { + steps { + sh 'gradlew shadowJar' + } + } + stage('Archive') { + steps { + archiveArtifacts artifacts: 'build/libs/', followSymlinks: false + } + } + stage('discord') { + when { + anyOf { + branch 'main' + branch 'master' + } + } + steps { + discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook + } + } + } +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..f279a86 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("java") +} + +group = "com.alttd.custommobs" +version = "1.0-SNAPSHOT" + +dependencies { + testImplementation(platform("org.junit:junit-bom:5.10.0")) + testImplementation("org.junit.jupiter:junit-jupiter") + compileOnly("com.alttd:Galaxy-API:1.21-R0.1-SNAPSHOT") { + isChanging = true + } + + compileOnly("org.projectlombok:lombok:1.18.32") + annotationProcessor("org.projectlombok:lombok:1.18.32") + + implementation("org.apache.logging.log4j:log4j-api:2.23.1") + implementation("org.apache.logging.log4j:log4j-core:2.23.1") + + implementation("org.reflections:reflections:0.10.2") +} + +tasks.test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 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..71c22b8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Sep 01 17:29:10 CEST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 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..107acd3 --- /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/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..9b83150 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,16 @@ +rootProject.name = "CustomMobs" + +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy + } + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) +} + +pluginManagement { + repositories { + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/com/alttd/custommobs/Main.java b/src/main/java/com/alttd/custommobs/Main.java new file mode 100644 index 0000000..fdcd179 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/Main.java @@ -0,0 +1,41 @@ +package com.alttd.custommobs; + +import com.alttd.custommobs.commands.CommandManager; +import com.alttd.custommobs.config.Config; +import com.alttd.custommobs.config.Messages; +import com.alttd.custommobs.config.MobTypes; +import com.alttd.custommobs.listeners.SpawnerListener; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.plugin.java.JavaPlugin; + +@Slf4j +public class Main extends JavaPlugin { + + @Override + public void onEnable() { + log.info("Plugin enabled!"); + reloadConfigs(); + registerEvents(); + registerCommands(); + } + + private void registerCommands() { + new CommandManager(this); + } + + private void registerEvents() { + getServer().getPluginManager().registerEvents(new SpawnerListener(this), this); + } + + public void reloadConfigs() { + Config.reload(); + Messages.reload(); + MobTypes.reload(); + } + + @Override + public void onDisable() { + log.info("Plugin disabled!"); + } + +} \ No newline at end of file diff --git a/src/main/java/com/alttd/custommobs/abilities/Ability.java b/src/main/java/com/alttd/custommobs/abilities/Ability.java new file mode 100644 index 0000000..a2ed8d7 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/abilities/Ability.java @@ -0,0 +1,14 @@ +package com.alttd.custommobs.abilities; + +import com.alttd.custommobs.Main; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Mob; + +public interface Ability { + + boolean onCooldown(); + + void attack(Mob attacker, LivingEntity target, Main main); + + String getName(); +} diff --git a/src/main/java/com/alttd/custommobs/abilities/EntityModifier.java b/src/main/java/com/alttd/custommobs/abilities/EntityModifier.java new file mode 100644 index 0000000..bd6e49c --- /dev/null +++ b/src/main/java/com/alttd/custommobs/abilities/EntityModifier.java @@ -0,0 +1,11 @@ +package com.alttd.custommobs.abilities; + +import org.bukkit.entity.LivingEntity; + +public interface EntityModifier { + + void apply(LivingEntity entity); + + String getName(); + +} diff --git a/src/main/java/com/alttd/custommobs/abilities/MobType.java b/src/main/java/com/alttd/custommobs/abilities/MobType.java new file mode 100644 index 0000000..bfdc795 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/abilities/MobType.java @@ -0,0 +1,6 @@ +package com.alttd.custommobs.abilities; + +import java.util.List; + +public record MobType(List abilities, List entityModifiers) { +} diff --git a/src/main/java/com/alttd/custommobs/abilities/MobTypeApplier.java b/src/main/java/com/alttd/custommobs/abilities/MobTypeApplier.java new file mode 100644 index 0000000..e3c031a --- /dev/null +++ b/src/main/java/com/alttd/custommobs/abilities/MobTypeApplier.java @@ -0,0 +1,27 @@ +package com.alttd.custommobs.abilities; + +import com.alttd.custommobs.Main; +import com.alttd.custommobs.abilitymob.AbilityMob; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Mob; + +public class MobTypeApplier { + + private final Main main; + + public MobTypeApplier(Main main) { + this.main = main; + } + + public void apply(LivingEntity entity, MobType mobType) { + mobType.entityModifiers().forEach(modifier -> modifier.apply(entity)); + if (mobType.abilities().isEmpty()) + return; + + if (!(entity instanceof Mob mob)) { + return; + } + new AbilityMob(mob, mobType.abilities(), main); + } + +} diff --git a/src/main/java/com/alttd/custommobs/abilities/abilities/FireBombAbility.java b/src/main/java/com/alttd/custommobs/abilities/abilities/FireBombAbility.java new file mode 100644 index 0000000..d2cf226 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/abilities/abilities/FireBombAbility.java @@ -0,0 +1,34 @@ +package com.alttd.custommobs.abilities.abilities; + +import com.alttd.custommobs.Main; +import com.alttd.custommobs.abilities.Ability; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Mob; +import org.bukkit.util.Vector; + +public class FireBombAbility implements Ability { + + @Override + public boolean onCooldown() { + return false; + } + + @Override + public void attack(Mob mob, LivingEntity target, Main main) { + mob.setTarget(target); + Location location = mob.getLocation(); + Vector directionVector = target.getLocation().toVector().subtract(location.toVector()).normalize(); + Bukkit.getScheduler().getMainThreadExecutor(main).execute(() -> + location.getWorld().spawn(location, org.bukkit.entity.Fireball.class, fireball -> { + fireball.setShooter(mob); + fireball.setDirection(directionVector); + })); + } + + @Override + public String getName() { + return "fire_bomb"; + } +} diff --git a/src/main/java/com/alttd/custommobs/abilities/modifiers/AttributeModifier.java b/src/main/java/com/alttd/custommobs/abilities/modifiers/AttributeModifier.java new file mode 100644 index 0000000..16ee8c1 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/abilities/modifiers/AttributeModifier.java @@ -0,0 +1,34 @@ +package com.alttd.custommobs.abilities.modifiers; + +import com.alttd.custommobs.abilities.EntityModifier; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.attribute.Attribute; +import org.bukkit.attribute.AttributeInstance; +import org.bukkit.entity.LivingEntity; + +@Slf4j +public class AttributeModifier implements EntityModifier { + + private final double value; + private final Attribute attribute; + + public AttributeModifier(Attribute attribute, double value) { + this.value = value; + this.attribute = attribute; + } + + @Override + public void apply(LivingEntity entity) { + AttributeInstance attributeInstance = entity.getAttribute(attribute); + if (attributeInstance == null) { + log.warn("Entity {} has no {} attribute", entity.getName(), attribute.name()); + return; + } + attributeInstance.setBaseValue(value); + } + + @Override + public String getName() { + return attribute.name(); + } +} diff --git a/src/main/java/com/alttd/custommobs/abilitymob/AbilityMob.java b/src/main/java/com/alttd/custommobs/abilitymob/AbilityMob.java new file mode 100644 index 0000000..99080cd --- /dev/null +++ b/src/main/java/com/alttd/custommobs/abilitymob/AbilityMob.java @@ -0,0 +1,64 @@ +package com.alttd.custommobs.abilitymob; + +import com.alttd.custommobs.Main; +import com.alttd.custommobs.abilities.Ability; +import com.alttd.custommobs.config.Config; +import io.papermc.paper.threadedregions.scheduler.ScheduledTask; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.entity.Mob; +import org.bukkit.entity.Player; + +import java.util.List; +import java.util.Random; +import java.util.UUID; + +@Slf4j +public class AbilityMob implements Runnable { + + private final Main main; + private final Mob mob; + private final List abilities; + private ScheduledTask task; + private static final AbilityThread ABILITY_THREAD = new AbilityThread(); + private final UUID taskId = UUID.randomUUID(); + + public AbilityMob(Mob mob, List abilities, Main main) { + this.main = main; + this.mob = mob; + this.mob.getScheduler().runAtFixedRate(main, this::setTask, this, 1, 1); + this.abilities = abilities; + } + + private void setTask(ScheduledTask task) { + this.task = task; + } + + public void cancelTask() { + if (task != null) { + task.cancel(); + } + } + + @Override + public void run() { + if (mob.isDead()) { + cancelTask(); + if (Config.SETTINGS.DEBUG) { + log.debug("Entity died, cancelling ability task"); + } + return; + } + ABILITY_THREAD.scheduleTask(taskId, () -> { + List abilityList = abilities.stream().filter(Ability::onCooldown).toList(); + if (abilityList.isEmpty()) { + return; + } + + Ability randomAbility = abilityList.get(new Random().nextInt(abilityList.size())); + + List playerList = mob.getLocation().getNearbyPlayers(20).stream().toList(); + randomAbility.attack(mob, playerList.get(new Random().nextInt(playerList.size())), main); + }); + } + +} diff --git a/src/main/java/com/alttd/custommobs/abilitymob/AbilityThread.java b/src/main/java/com/alttd/custommobs/abilitymob/AbilityThread.java new file mode 100644 index 0000000..ce0a999 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/abilitymob/AbilityThread.java @@ -0,0 +1,59 @@ +package com.alttd.custommobs.abilitymob; + +import lombok.extern.slf4j.Slf4j; + +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +@Slf4j +public class AbilityThread { + + private final ExecutorService executorService; + private final LinkedBlockingQueue taskQueue; + private final ConcurrentHashMap> tasksMap; + + public AbilityThread() { + executorService = Executors.newSingleThreadExecutor(); + taskQueue = new LinkedBlockingQueue<>(); + tasksMap = new ConcurrentHashMap<>(); + + startProcessing(); + } + + private void startProcessing() { + executorService.execute(() -> { + while (!Thread.currentThread().isInterrupted()) { + try { + Runnable task = taskQueue.take(); + task.run(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + }); + } + + public synchronized void scheduleTask(UUID identifier, Runnable task) { + if (identifier == null) { + log.warn("Received task with null identifier, skipping"); + return; + } + if (tasksMap.containsKey(identifier)) { + log.debug("Already scheduled task with identifier {}, skipping", identifier); + return; + } + Future future = executorService.submit(() -> { + try { + task.run(); + } finally { + tasksMap.remove(identifier); + } + }); + + tasksMap.put(identifier, future); + } +} diff --git a/src/main/java/com/alttd/custommobs/commands/CommandManager.java b/src/main/java/com/alttd/custommobs/commands/CommandManager.java new file mode 100644 index 0000000..8bd0275 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/commands/CommandManager.java @@ -0,0 +1,89 @@ +package com.alttd.custommobs.commands; + +import com.alttd.custommobs.Main; +import com.alttd.custommobs.commands.subcommands.Spawn; +import com.alttd.custommobs.config.Messages; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.command.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +@Getter +@Slf4j +public class CommandManager implements CommandExecutor, TabExecutor { + private final List subCommands; + + public CommandManager(Main main) { + PluginCommand command = main.getCommand("fish"); + if (command == null) { + subCommands = null; + log.error("Unable to find transfer command."); + return; + } + command.setExecutor(this); + command.setTabCompleter(this); + + subCommands = Arrays.asList( + new Spawn(main) + ); + } + + @Override + public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String cmd, @NotNull String[] args) { + if (args.length == 0) { + commandSender.sendRichMessage(Messages.HELP.HELP_MESSAGE_WRAPPER.replaceAll("", subCommands.stream() + .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) + .map(SubCommand::getHelpMessage) + .collect(Collectors.joining("\n")))); + return true; + } + + SubCommand subCommand = getSubCommand(args[0]); + if (subCommand == null) + return false; + + if (!commandSender.hasPermission(subCommand.getPermission())) { + commandSender.sendRichMessage(Messages.GENERIC.NO_PERMISSION); + return true; + } + + if (!subCommand.onCommand(commandSender, args)) { + commandSender.sendRichMessage(subCommand.getHelpMessage()); + } + return true; + } + + @Override + public @Nullable List onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String cmd, @NotNull String[] args) { + List res = new ArrayList<>(); + + if (args.length <= 1) { + res.addAll(subCommands.stream() + .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) + .map(SubCommand::getName) + .filter(name -> args.length == 0 || name.startsWith(args[0])) + .toList() + ); + } else { + SubCommand subCommand = getSubCommand(args[0]); + if (subCommand != null && commandSender.hasPermission(subCommand.getPermission())) + res.addAll(subCommand.getTabComplete(commandSender, args).stream() + .filter(str -> str.toLowerCase().startsWith(args[args.length - 1].toLowerCase())) + .toList()); + } + return res; + } + + private SubCommand getSubCommand(String cmdName) { + return subCommands.stream() + .filter(subCommand -> subCommand.getName().equals(cmdName)) + .findFirst() + .orElse(null); + } +} \ No newline at end of file diff --git a/src/main/java/com/alttd/custommobs/commands/SubCommand.java b/src/main/java/com/alttd/custommobs/commands/SubCommand.java new file mode 100644 index 0000000..0ef3c40 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/commands/SubCommand.java @@ -0,0 +1,22 @@ +package com.alttd.custommobs.commands; + +import org.bukkit.command.CommandSender; + +import java.util.List; + +public abstract class SubCommand { + + public SubCommand() {} + + public abstract boolean onCommand(CommandSender commandSender, String[] args); + + public abstract String getName(); + + public String getPermission() { + return "fish." + getName(); + } + + public abstract List getTabComplete(CommandSender commandSender, String[] args); + + public abstract String getHelpMessage(); +} diff --git a/src/main/java/com/alttd/custommobs/commands/subcommands/Spawn.java b/src/main/java/com/alttd/custommobs/commands/subcommands/Spawn.java new file mode 100644 index 0000000..584779a --- /dev/null +++ b/src/main/java/com/alttd/custommobs/commands/subcommands/Spawn.java @@ -0,0 +1,132 @@ +package com.alttd.custommobs.commands.subcommands; + +import com.alttd.custommobs.Main; +import com.alttd.custommobs.abilities.MobType; +import com.alttd.custommobs.abilities.MobTypeApplier; +import com.alttd.custommobs.commands.SubCommand; +import com.alttd.custommobs.config.Messages; +import com.alttd.custommobs.config.MobTypes; +import com.alttd.custommobs.utility.SpawnableTargetBlock; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.*; + +import java.util.List; +import java.util.Optional; + +@Slf4j +public class Spawn extends SubCommand { + + private final MobTypeApplier mobTypeApplier; + + public Spawn(Main main) { + this.mobTypeApplier = new MobTypeApplier(main); + } + + @Override + public boolean onCommand(CommandSender commandSender, String[] args) { + if (args.length != 3 && args.length != 7) { + log.debug("Invalid argument length: {} expected 2 or 6", args.length); + return false; + } + Optional optionalMobType = MobTypes.MOB_TYPES.get(args[1]); + if (optionalMobType.isEmpty()) { + return false; + } + MobType mobType = optionalMobType.get(); + + EntityType entityType; + try { + entityType = EntityType.valueOf(args[2]); + } catch (IllegalArgumentException e) { + log.debug("Invalid mob type {}", args[2]); + return false; + } + if (!entityType.isSpawnable() || !isMob(entityType)) { + return false; + } + + Optional optionalLocation = getLocation(commandSender, args); + if (optionalLocation.isEmpty()) { + return false; + } + Location location = optionalLocation.get(); + + spawnMob(location.getWorld(), location, entityType, mobType); + return true; + } + + private Optional getLocation(CommandSender commandSender, String[] args) { + if (args.length == 3 && commandSender instanceof Player player) { + return new SpawnableTargetBlock().getSpawnableTargetBlock(player, 50); + } else if (args.length == 7) { + return getLocation(args); + } else { + log.debug("Expected player with argument length of 2"); + return Optional.empty(); + } + } + + private Optional getLocation(String[] args) { + World world = Bukkit.getWorld(args[3]); + if (world == null) { + return Optional.empty(); + } + try { + double x = Double.parseDouble(args[4]); + double y = Double.parseDouble(args[5]); + double z = Double.parseDouble(args[6]); + return Optional.of(new Location(world, x, y, z)); + } catch (NumberFormatException e) { + log.debug("Invalid coordinates x: {}, y: {}, z: {}", args[4], args[5], args[6]); + return Optional.empty(); + } + } + + public boolean isMob(EntityType entityType) { + if (entityType == null) { + return false; + } + try { + Class entityClass = entityType.getEntityClass(); + if (entityClass == null) { + return false; + } + Class mobEntityClass = Class.forName("org.bukkit.entity." + entityClass.getSimpleName()); + return Mob.class.isAssignableFrom(mobEntityClass); + } catch (ClassNotFoundException e) { + return false; + } + } + + private void spawnMob(World world, Location location, EntityType entityType, MobType mobType) { + if (entityType.getEntityClass() == null) { + log.warn("Tried to spawn entity with null entity class {}", entityType.name()); + return; + } + Entity entity = world.spawn(location, entityType.getEntityClass()); + if (!(entity instanceof LivingEntity livingEntity)) { + log.warn("Spawned entity is not a living entity? {}", entityType.name()); + return; + } + mobTypeApplier.apply(livingEntity, mobType); + } + + @Override + public String getName() { + return "spawn"; + } + + @Override + public List getTabComplete(CommandSender commandSender, String[] args) { + return List.of(); + } + + @Override + public String getHelpMessage() { + return Messages.HELP.SPAWN; + } +} diff --git a/src/main/java/com/alttd/custommobs/config/AbstractConfig.java b/src/main/java/com/alttd/custommobs/config/AbstractConfig.java new file mode 100644 index 0000000..46d3003 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/config/AbstractConfig.java @@ -0,0 +1,148 @@ +package com.alttd.custommobs.config; + +import com.alttd.custommobs.Main; +import com.google.common.collect.ImmutableMap; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Slf4j +@SuppressWarnings({"unused", "SameParameterValue"}) +abstract class AbstractConfig { + File file; + YamlConfiguration yaml; + + AbstractConfig(Main main, String filename) { + init(new File(main.getDataFolder(), filename), filename); + } + + AbstractConfig(File file, String filename) { + init(new File(file.getPath() + File.separator + filename), filename); + } + + private void init(File file, String filename) { + this.file = file; + this.yaml = new YamlConfiguration(); + try { + yaml.load(file); + } catch (IOException ignore) { + } catch (InvalidConfigurationException ex) { + log.error("Could not load {}, please correct your syntax errors", filename, ex); + throw new RuntimeException(ex); + } + yaml.options().copyDefaults(true); + } + + void readConfig(Class clazz, Object instance) { + for (Class declaredClass : clazz.getDeclaredClasses()) { + for (Method method : declaredClass.getDeclaredMethods()) { + if (!Modifier.isPrivate(method.getModifiers())) { + continue; + } + if (method.getParameterTypes().length != 0 || method.getReturnType() != Void.TYPE) { + continue; + } + try { + method.setAccessible(true); + method.invoke(instance); + } catch (InvocationTargetException ex) { + throw new RuntimeException(ex.getCause()); + } catch (Exception ex) { + log.error("Error invoking {}.", method, ex); + } + } + } + + save(); + } + + private void save() { + try { + yaml.save(file); + } catch (IOException ex) { + log.error("Could not save {}.", file.toString(), ex); + } + } + + void set(String prefix, String path, Object val) { + path = prefix + path; + yaml.addDefault(path, val); + yaml.set(path, val); + save(); + } + + String getString(String prefix, String path, String def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getString(path, yaml.getString(path)); + } + + boolean getBoolean(String prefix, String path, boolean def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getBoolean(path, yaml.getBoolean(path)); + } + + int getInt(String prefix, String path, int def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getInt(path, yaml.getInt(path)); + } + + double getDouble(String prefix, String path, double def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getDouble(path, yaml.getDouble(path)); + } + + List getList(String prefix, String path, T def) { + path = prefix + path; + yaml.addDefault(path, def); + List list = yaml.getList(path, yaml.getList(path)); + return list == null ? null : list.stream().map(Object::toString).collect(Collectors.toList()); + } + + List getStringList(String prefix, String path, List def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getStringList(path); + } + + @NonNull + Map getMap(String prefix, @NonNull String path, final @Nullable Map def) { + path = prefix + path; + final ImmutableMap.Builder builder = ImmutableMap.builder(); + if (def != null && yaml.getConfigurationSection(path) == null) { + yaml.addDefault(path, def.isEmpty() ? new HashMap<>() : def); + return def; + } + final ConfigurationSection section = yaml.getConfigurationSection(path); + if (section != null) { + for (String key : section.getKeys(false)) { + @SuppressWarnings("unchecked") + final T val = (T) section.get(key); + if (val != null) { + builder.put(key, val); + } + } + } + return builder.build(); + } + + ConfigurationSection getConfigurationSection(String path) { + return yaml.getConfigurationSection(path); + } +} \ No newline at end of file diff --git a/src/main/java/com/alttd/custommobs/config/Config.java b/src/main/java/com/alttd/custommobs/config/Config.java new file mode 100644 index 0000000..5d8390b --- /dev/null +++ b/src/main/java/com/alttd/custommobs/config/Config.java @@ -0,0 +1,40 @@ +package com.alttd.custommobs.config; + +import lombok.extern.slf4j.Slf4j; + +import java.io.File; + +@Slf4j +public class Config extends AbstractConfig{ + + static Config config; + + Config() { + super( + new File(File.separator + + "mnt" + File.separator + + "configs" + File.separator + + "custommobs"), + "config.yml"); + } + + public static void reload() { + log.info("Reloading config"); + config = new Config(); + config.readConfig(Config.class, null); + } + + public static class SETTINGS { + private static final String prefix = "settings."; + public static boolean DEBUG = false; + public static boolean WARNINGS = true; + + @SuppressWarnings("unused") + private static void load() { + log.info("Warnings logging is {}\nDebug logging is {}", WARNINGS, DEBUG); + DEBUG = config.getBoolean(prefix, "debug", DEBUG); + WARNINGS = config.getBoolean(prefix, "warnings", WARNINGS); + } + } + +} diff --git a/src/main/java/com/alttd/custommobs/config/Messages.java b/src/main/java/com/alttd/custommobs/config/Messages.java new file mode 100644 index 0000000..bfd18e8 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/config/Messages.java @@ -0,0 +1,55 @@ +package com.alttd.custommobs.config; + +import lombok.extern.slf4j.Slf4j; + +import java.io.File; + +@Slf4j +public class Messages extends AbstractConfig { + static Messages config; + + Messages() { + super( + new File(File.separator + + "mnt" + File.separator + + "configs" + File.separator + + "custommobs"), + "messages.yml"); + } + + public static void reload() { + config = new Messages(); + config.readConfig(Messages.class, null); + log.info("Reloading messages"); + } + + public static class HELP { + private static final String prefix = "help."; + + public static String HELP_MESSAGE_WRAPPER = "Main help:\n"; + public static String HELP_MESSAGE = "Show this menu: /cm help"; + public static String SPAWN = "Spawn a mob of a specific type: /cm spawn [ ]"; + + @SuppressWarnings("unused") + private static void load() { + HELP_MESSAGE_WRAPPER = config.getString(prefix, "help-wrapper", HELP_MESSAGE_WRAPPER); + HELP_MESSAGE = config.getString(prefix, "help", HELP_MESSAGE); + SPAWN = config.getString(prefix, "spawn", SPAWN); + } + } + + public static class GENERIC { + private static final String prefix = "generic."; + + public static String NO_PERMISSION = "'>You don't have permission for this command"; + public static String PLAYER_ONLY = "This command can only be executed as a player"; + public static String PLAYER_NOT_FOUND = "Unable to find online player "; + + @SuppressWarnings("unused") + private static void load() { + NO_PERMISSION = config.getString(prefix, "no-permission", NO_PERMISSION); + PLAYER_ONLY = config.getString(prefix, "player-only", PLAYER_ONLY); + PLAYER_NOT_FOUND = config.getString(prefix, "player-only", PLAYER_NOT_FOUND); + } + } +} diff --git a/src/main/java/com/alttd/custommobs/config/MobTypes.java b/src/main/java/com/alttd/custommobs/config/MobTypes.java new file mode 100644 index 0000000..636683c --- /dev/null +++ b/src/main/java/com/alttd/custommobs/config/MobTypes.java @@ -0,0 +1,98 @@ +package com.alttd.custommobs.config; + +import com.alttd.custommobs.abilities.Ability; +import com.alttd.custommobs.abilities.modifiers.AttributeModifier; +import com.alttd.custommobs.abilities.EntityModifier; +import com.alttd.custommobs.abilities.MobType; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.attribute.Attribute; +import org.reflections.Reflections; + +import java.io.File; +import java.util.*; + +@Slf4j +public class MobTypes extends AbstractConfig { + static MobTypes config; + + MobTypes() { + super( + new File(File.separator + + "mnt" + File.separator + + "configs" + File.separator + + "custommobs"), + "mob-types.yml"); + } + + public static void reload() { + log.info("Reloading mob types"); + config = new MobTypes(); + config.readConfig(MobTypes.class, null); + } + + public static class MOB_TYPES { + private static final String prefix = "mob-types."; + protected static Object2ObjectOpenHashMap MOB_TYPES = new Object2ObjectOpenHashMap<>(); + + public static Optional get(String name) { + if (!MOB_TYPES.containsKey(name)) { + return Optional.empty(); + } + return Optional.of(MOB_TYPES.get(name)); + } + + @SuppressWarnings("unused") + private static void load() { + MOB_TYPES.clear(); + Set keys = config.getConfigurationSection(prefix.substring(0, prefix.length() - 1)).getKeys(false); + keys.forEach(key -> { + List abilities = config.getStringList(prefix + key, ".abilities", null).stream() + .map(MobTypes.MOB_TYPES::getAbility) + .filter(Optional::isPresent) + .map(Optional::get) + .toList(); + List entityModifiers = new ArrayList<>(); + config.getConfigurationSection(prefix + key + ".modifiers").getKeys(false).forEach(modifier -> { + String attribute = config.getString(prefix + key + ".modifiers." + modifier, "attribute", null); + if (attribute == null) { + return; + } + EntityModifier value = getAttribute(attribute, config.getDouble(prefix + key + ".modifiers." + modifier, "value", 1)); + if (value == null) + return; + entityModifiers.add(value); + }); + MOB_TYPES.put(key, new MobType(abilities, entityModifiers)); + }); + } + + private static EntityModifier getAttribute(String attributeName, double value) { + try { + Attribute attribute = Attribute.valueOf(attributeName); + return new AttributeModifier(attribute, value); + } catch (IllegalArgumentException e) { + log.error("Invalid attribute {}", attributeName, e); + return null; + } + } + + private static Optional getAbility(String name) { + Optional first = new Reflections("com.alttd.custommobs.abilities").getSubTypesOf(Ability.class).stream().map(entry -> { + try { + return entry.getDeclaredConstructor().newInstance(); + } catch (Exception e) { + return null; + } + }) + .filter(Objects::nonNull) + .map(entry -> (Ability) entry) + .filter(entry -> entry.getName().equals(name)) + .findFirst(); + if (first.isEmpty()) { + log.warn("Invalid ability {}", name); + } + return first; + } + } +} diff --git a/src/main/java/com/alttd/custommobs/listeners/SpawnerListener.java b/src/main/java/com/alttd/custommobs/listeners/SpawnerListener.java new file mode 100644 index 0000000..7548214 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/listeners/SpawnerListener.java @@ -0,0 +1,51 @@ +package com.alttd.custommobs.listeners; + +import com.alttd.custommobs.Main; +import com.alttd.custommobs.abilities.MobType; +import com.alttd.custommobs.abilities.MobTypeApplier; +import com.alttd.custommobs.config.MobTypes; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.block.CreatureSpawner; +import org.bukkit.entity.LivingEntity; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.SpawnerSpawnEvent; +import org.bukkit.metadata.MetadataValue; + +import java.util.List; +import java.util.Optional; + +@Slf4j +public class SpawnerListener implements Listener { + + private final MobTypeApplier mobTypeApplier; + + public SpawnerListener(Main main) { + mobTypeApplier = new MobTypeApplier(main); + } + + @EventHandler + public void onSpawnerSpawn(SpawnerSpawnEvent event) { + CreatureSpawner spawner = event.getSpawner(); + if (spawner == null) { + return; + } + if (!spawner.hasMetadata("CustomMob")) { + return; + } + if (!(event.getEntity() instanceof LivingEntity livingEntity)) { + return; + } + + List customMob = spawner.getMetadata("CustomMob"); + Optional optionalMobType = MobTypes.MOB_TYPES.get(customMob.getFirst().asString()); + if (optionalMobType.isEmpty()) { + log.warn("Unable to retrieve mob type for spawner at {} with mob type {}", spawner.getLocation(), customMob.getFirst().asString()); + return; + } + + MobType mobType = optionalMobType.get(); + mobTypeApplier.apply(livingEntity, mobType); + } + +} diff --git a/src/main/java/com/alttd/custommobs/utility/SpawnableTargetBlock.java b/src/main/java/com/alttd/custommobs/utility/SpawnableTargetBlock.java new file mode 100644 index 0000000..b1d0d60 --- /dev/null +++ b/src/main/java/com/alttd/custommobs/utility/SpawnableTargetBlock.java @@ -0,0 +1,39 @@ +package com.alttd.custommobs.utility; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.entity.Player; +import org.bukkit.util.BlockIterator; + +import java.util.Optional; + +public class SpawnableTargetBlock { + + public Optional getSpawnableTargetBlock(Player player, int maxDistance) { + BlockIterator iter = new BlockIterator(player, maxDistance); + while (iter.hasNext()) { + Block block = iter.next(); + if (isSpawnable(block)) { + return Optional.of(block.getLocation()); + } + } + return Optional.empty(); + } + + private boolean isSpawnable(Block block) { + Material material = block.getType(); + + if (material == Material.AIR) { + return false; + } + + Block blockAbove = block.getRelative(BlockFace.UP); + if (blockAbove.getType() != Material.AIR) { + return false; + } + + return block.getType().isSolid(); + } +} \ No newline at end of file