diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5d6b3e1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +# Created by .ignore support plugin (hsz.mobi) +### Java template +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Gradle template +**/.gradle +**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# IDEA files +.idea/ +**/out/ + +src/test/resources/resourcepack/ +src/test/resources/model_mappings.json diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..f194ea5 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,50 @@ +plugins { + id("java") + `maven-publish` + signing +} + +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 + + withSourcesJar() + withJavadocJar() +} + +repositories { + mavenCentral() +} + +publishing { + publications.create("maven") { + groupId = "ca.atlasengine" + artifactId = "minestom-projectiles" + version = "1.0.0" + + from(components["java"]) + } + + repositories { + maven { + name = "WorldSeed" + url = uri("https://reposilite.worldseed.online/public") + credentials(PasswordCredentials::class) + authentication { + create("basic") + } + } + } +} + +dependencies { + testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + + compileOnly("net.minestom:minestom-snapshots:f1d5940855") + testImplementation("net.minestom:minestom-snapshots:f1d5940855") +} + +tasks.getByName("test") { + useJUnitPlatform() +} 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..a824584 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat May 18 14:50:15 EDT 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..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 b/settings.gradle new file mode 100644 index 0000000..5e62fbc --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'MinestomProjectiles' + diff --git a/src/main/java/ca/atlasengine/projectiles/AbstractProjectile.java b/src/main/java/ca/atlasengine/projectiles/AbstractProjectile.java new file mode 100644 index 0000000..3ff9482 --- /dev/null +++ b/src/main/java/ca/atlasengine/projectiles/AbstractProjectile.java @@ -0,0 +1,116 @@ +package ca.atlasengine.projectiles; + +import net.minestom.server.MinecraftServer; +import net.minestom.server.ServerFlag; +import net.minestom.server.collision.Aerodynamics; +import net.minestom.server.collision.CollisionUtils; +import net.minestom.server.collision.PhysicsResult; +import net.minestom.server.collision.ShapeImpl; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; +import net.minestom.server.entity.Entity; +import net.minestom.server.entity.EntityType; +import net.minestom.server.event.EventDispatcher; +import net.minestom.server.event.entity.EntityTickEvent; +import net.minestom.server.event.entity.projectile.ProjectileCollideWithEntityEvent; +import net.minestom.server.instance.Chunk; +import net.minestom.server.instance.block.Block; +import net.minestom.server.utils.chunk.ChunkCache; +import net.minestom.server.utils.chunk.ChunkUtils; +import org.jetbrains.annotations.NotNull; + +public abstract class AbstractProjectile extends Entity implements Projectile { + protected final Entity shooter; + private PhysicsResult previousPhysicsResult; + + public AbstractProjectile(EntityType type, Entity shooter) { + super(type); + this.shooter = shooter; + } + + @Override + public void shoot(Point from, double power, double spread) { + var to = from.add(shooter.getPosition().direction()); + shoot(from, to, power, spread); + } + + protected PhysicsResult computePhysics(@NotNull Pos entityPosition, @NotNull Vec currentVelocity, @NotNull Block.Getter blockGetter, @NotNull Aerodynamics aerodynamics) { + var newVelocity = updateVelocity(entityPosition, currentVelocity, blockGetter, aerodynamics, true, false, onGround, false); + + var newPhysicsResult = CollisionUtils.handlePhysics( + blockGetter, + this.boundingBox, + entityPosition, newVelocity, + previousPhysicsResult, true + ); + + previousPhysicsResult = newPhysicsResult; + return newPhysicsResult; + } + + @Override + protected void movementTick() { + this.gravityTickCount = onGround ? 0 : gravityTickCount + 1; + if (vehicle != null) return; + + final Block.Getter chunkCache = new ChunkCache(instance, currentChunk, Block.STONE); + PhysicsResult result = computePhysics( + position, velocity.div(ServerFlag.SERVER_TICKS_PER_SECOND), + chunkCache, getAerodynamics()); + + Chunk finalChunk = ChunkUtils.retrieve(instance, currentChunk, result.newPosition()); + if (!ChunkUtils.isLoaded(finalChunk)) return; + + if (result.hasCollision()) { + Block hitBlock = null; + Point hitPoint = null; + if (result.collisionShapes()[0] instanceof ShapeImpl block) { + hitBlock = block.block(); + hitPoint = result.collisionPoints()[0]; + } + if (result.collisionShapes()[1] instanceof ShapeImpl block) { + hitBlock = block.block(); + hitPoint = result.collisionPoints()[1]; + } + if (result.collisionShapes()[2] instanceof ShapeImpl block) { + hitBlock = block.block(); + hitPoint = result.collisionPoints()[2]; + } + + if (hitBlock == null) return; + handleBlockCollision(hitBlock, hitPoint, position); + } else { + velocity = result.newVelocity().mul(ServerFlag.SERVER_TICKS_PER_SECOND).mul(0.99); + } + + onGround = result.isOnGround(); + + refreshPosition(result.newPosition(), true, false); + if (hasVelocity()) sendPacketToViewers(getVelocityPacket()); + } + + protected void checkEntityCollision(Pos previousPos, Pos currentPos) { + var diff = currentPos.sub(previousPos).asVec(); + + PhysicsResult entityResult = CollisionUtils.checkEntityCollisions(instance, boundingBox, previousPos, diff, diff.length(), + entity -> entity != shooter && entity != this, previousPhysicsResult); + + if (entityResult.hasCollision()) { + Entity hitEntity = (Entity) entityResult.collisionShapes()[0]; + handleEntityCollision(hitEntity, entityResult.newPosition(), currentPos); + } + } + + protected void updatePosition(long time) { + if (instance == null || isRemoved() || !ChunkUtils.isLoaded(currentChunk)) return; + + movementTick(); + super.update(time); + EventDispatcher.call(new EntityTickEvent(this)); + } + + abstract protected void handleBlockCollision(Block hitBlock, Point hitPos, Pos posBefore); + abstract protected void handleEntityCollision(Entity hitEntity, Point hitPos, Pos posBefore); + abstract protected @NotNull Vec updateVelocity(@NotNull Pos entityPosition, @NotNull Vec currentVelocity, @NotNull Block.@NotNull Getter blockGetter, @NotNull Aerodynamics aerodynamics, boolean positionChanged, boolean entityFlying, boolean entityOnGround, boolean entityNoGravity); +} diff --git a/src/main/java/ca/atlasengine/projectiles/BowModule.java b/src/main/java/ca/atlasengine/projectiles/BowModule.java new file mode 100644 index 0000000..59ca49f --- /dev/null +++ b/src/main/java/ca/atlasengine/projectiles/BowModule.java @@ -0,0 +1,59 @@ +package ca.atlasengine.projectiles; + +import ca.atlasengine.projectiles.entities.ArrowProjectile; +import net.kyori.adventure.sound.Sound; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.entity.Player; +import net.minestom.server.event.EventNode; +import net.minestom.server.event.item.ItemUpdateStateEvent; +import net.minestom.server.event.player.PlayerItemAnimationEvent; +import net.minestom.server.event.trait.EntityEvent; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.Material; +import net.minestom.server.sound.SoundEvent; +import net.minestom.server.tag.Tag; +import org.jetbrains.annotations.NotNull; + +import java.util.concurrent.ThreadLocalRandom; +import java.util.function.BiFunction; + +public class BowModule { + private static final Tag CHARGE_SINCE_TAG = Tag.Long("bow_charge_since").defaultValue(Long.MAX_VALUE); + private static final Tag BOW_POWER = Tag.Double("bow_power").defaultValue(0.0); + + public BowModule(@NotNull EventNode node, BiFunction arrowSupplier) { + node.addListener(PlayerItemAnimationEvent.class, event -> { + if (event.getItemAnimationType() != PlayerItemAnimationEvent.ItemAnimationType.BOW) return; + event.getPlayer().setTag(CHARGE_SINCE_TAG, System.currentTimeMillis()); + }); + node.addListener(ItemUpdateStateEvent.class, event -> { + if (event.getItemStack().material() != Material.BOW) return; + Player player = event.getPlayer(); + long duration = System.currentTimeMillis()-player.getTag(CHARGE_SINCE_TAG); + double power = getPower(duration); + + if (power < 0.1) return; + event.getPlayer().setTag(BOW_POWER, power); + + var spectralArrow = arrowSupplier.apply(player, event.getItemStack()); + if (power == 1) spectralArrow.setCritical(true); + + Pos shootPosition = player.getPosition().add(0, player.getEyeHeight()-0.1, 0); + spectralArrow.shoot(shootPosition.asVec(), power*3, 1f); // this method already sets the instance + player.getInstance().playSound(Sound.sound(SoundEvent.ENTITY_ARROW_SHOOT, Sound.Source.PLAYER, 1f, getRandomPitchFromPower(power)), player); + }); + } + + private double getPower(long duration) { + double secs = duration/1000.0; + double pow = (secs * secs + secs * 2.0) / 3.0; + if (pow > 1) { + pow = 1; + } + return pow; + } + + private float getRandomPitchFromPower(double power) { + return (float) (1.0f / (ThreadLocalRandom.current().nextFloat() * 0.4f + 1.2f) + power * 0.5f); + } +} \ No newline at end of file diff --git a/src/main/java/ca/atlasengine/projectiles/Projectile.java b/src/main/java/ca/atlasengine/projectiles/Projectile.java new file mode 100644 index 0000000..3c23f17 --- /dev/null +++ b/src/main/java/ca/atlasengine/projectiles/Projectile.java @@ -0,0 +1,9 @@ +package ca.atlasengine.projectiles; + +import net.minestom.server.coordinate.Point; +import org.jetbrains.annotations.NotNull; + +public interface Projectile { + void shoot(@NotNull Point from, double power, double spread); + void shoot(@NotNull Point from, @NotNull Point to, double power, double spread); +} \ No newline at end of file diff --git a/src/main/java/ca/atlasengine/projectiles/entities/ArrowProjectile.java b/src/main/java/ca/atlasengine/projectiles/entities/ArrowProjectile.java new file mode 100644 index 0000000..d741b41 --- /dev/null +++ b/src/main/java/ca/atlasengine/projectiles/entities/ArrowProjectile.java @@ -0,0 +1,163 @@ +package ca.atlasengine.projectiles.entities; + +import ca.atlasengine.projectiles.AbstractProjectile; +import net.minestom.server.MinecraftServer; +import net.minestom.server.ServerFlag; +import net.minestom.server.collision.Aerodynamics; +import net.minestom.server.collision.BoundingBox; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; +import net.minestom.server.entity.Entity; +import net.minestom.server.entity.EntityType; +import net.minestom.server.entity.metadata.projectile.ProjectileMeta; +import net.minestom.server.event.EventDispatcher; +import net.minestom.server.event.entity.EntityShootEvent; +import net.minestom.server.event.entity.projectile.ProjectileCollideWithEntityEvent; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.BlockHandler; +import org.jetbrains.annotations.NotNull; + +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; + +// https://gist.github.com/hapily04/a463cbed41d2cfba04a58ecc62fa61f9 +public class ArrowProjectile extends AbstractProjectile { + private static final BoundingBox SMALL_BOUNDING_BOX = new BoundingBox(0.01, 0.01, 0.01); + + private boolean critical = false; + private boolean firstTick = true; + private boolean inBlock = false; + + public boolean isCritical() { + return critical; + } + + public void setCritical(boolean critical) { + this.critical = critical; + } + + public ArrowProjectile(EntityType type, Entity shooter) { + super(type, shooter); + setup(); + this.setBoundingBox(SMALL_BOUNDING_BOX); + } + + private void setup() { + this.hasCollision = false; + if (getEntityMeta() instanceof ProjectileMeta projectileMeta) { + projectileMeta.setShooter(this.shooter); + } + } + + @Override + public void tick(long time) { + if (removed || inBlock) return; + + final Pos posBefore = getPosition(); + updatePosition(time); + final Pos posNow = getPosition(); + + Vec diff = Vec.fromPoint(posNow.sub(posBefore)); + float yaw = (float) Math.toDegrees(Math.atan2(diff.x(), diff.z())); + float pitch = (float) Math.toDegrees(Math.atan2(diff.y(), Math.sqrt(diff.x() * diff.x() + diff.z() * diff.z()))); + this.position = posNow.withView(yaw, pitch); + + if (firstTick) { + firstTick = false; + setView(yaw, pitch); + } + + checkEntityCollision(posBefore, posNow); + } + + public void shoot(@NotNull Point from, @NotNull Point to, double power, double spread) { + var instance = shooter.getInstance(); + if (instance == null) return; + + float yaw = -shooter.getPosition().yaw(); + float originalPitch = -shooter.getPosition().pitch(); + float pitch = originalPitch - 35f; + + double pitchDiff = pitch - 45; + if (pitchDiff == 0) pitchDiff = 0.0001; + double pitchAdjust = pitchDiff * 0.002145329238474369D; + + double dx = to.x() - from.x(); + double dy = to.y() - from.y() + pitchAdjust; + double dz = to.z() - from.z(); + if (!hasNoGravity()) { + final double xzLength = Math.sqrt(dx * dx + dz * dz); + dy += xzLength * 0.20000000298023224D; + } + + final double length = Math.sqrt(dx * dx + dy * dy + dz * dz); + dx /= length; + dy /= length; + dz /= length; + Random random = ThreadLocalRandom.current(); + spread *= 0.007499999832361937D; + dx += random.nextGaussian() * spread; + dy += random.nextGaussian() * spread; + dz += random.nextGaussian() * spread; + + final EntityShootEvent shootEvent = new EntityShootEvent(this.shooter, this, from, power, spread); + EventDispatcher.call(shootEvent); + if (shootEvent.isCancelled()) { + remove(); + return; + } + + final double mul = ServerFlag.SERVER_TICKS_PER_SECOND * power; + Vec v = new Vec(dx * mul, dy * mul * 0.9, dz * mul); + + this.setInstance(instance, new Pos(from.x(), from.y(), from.z(), yaw, originalPitch)).whenComplete((result, throwable) -> { + if (throwable != null) { + throwable.printStackTrace(); + } else { + synchronizePosition(); // initial synchronization, required to be 100% precise + setVelocity(v); + } + }); + } + + @Override + protected void handleBlockCollision(Block hitBlock, Point hitPos, Pos posBefore) { + velocity = Vec.ZERO; + setNoGravity(true); + + inBlock = true; + velocity = Vec.fromPoint(hitPos.sub(posBefore)); + Vec v = velocity.normalize().mul(0.01f); // required so the entity is lit (just outside the block) + + // if the value is zero, it will be unlit. If the value is more than 0.01, there will be noticeable pitch change visually + position = new Pos(hitPos.x()-v.x(), hitPos.y()-v.y(), hitPos.z()-v.z(), posBefore.yaw(), posBefore.pitch()); + MinecraftServer.getSchedulerManager().scheduleNextTick(this::synchronizePosition); // required as in rare situations there will be a slight disagreement with the client and server on if it hit or not | also scheduling next tick so it doesn't jump to the hit position until it has actually hit + BlockHandler blockHandler = hitBlock.handler(); + if (blockHandler == null) return; + blockHandler.onTouch(new BlockHandler.Touch(hitBlock, instance, hitPos, this)); + } + + @Override + protected void handleEntityCollision(Entity hitEntity, Point hitPos, Pos posBefore) { + ProjectileCollideWithEntityEvent e = new ProjectileCollideWithEntityEvent(this, Pos.fromPoint(hitPos), hitEntity); + MinecraftServer.getGlobalEventHandler().call(e); + if (!e.isCancelled()) { + remove(); + } + } + + protected @NotNull Vec updateVelocity(@NotNull Pos entityPosition, @NotNull Vec currentVelocity, @NotNull Block.@NotNull Getter blockGetter, @NotNull Aerodynamics aerodynamics, boolean positionChanged, boolean entityFlying, boolean entityOnGround, boolean entityNoGravity) { + if (!positionChanged) { + return entityFlying ? Vec.ZERO : new Vec(0.0, entityNoGravity ? 0.0 : -aerodynamics.gravity() * aerodynamics.verticalAirResistance(), 0.0); + } else { + double drag = entityOnGround ? blockGetter.getBlock(entityPosition.sub(0.0, 0.5000001, 0.0)).registry().friction() * aerodynamics.horizontalAirResistance() : aerodynamics.horizontalAirResistance(); + double gravity = entityFlying ? 0.0 : aerodynamics.gravity(); + double gravityDrag = entityFlying ? 0.6 : aerodynamics.verticalAirResistance(); + double x = currentVelocity.x() * drag; + double y = entityNoGravity ? currentVelocity.y() : (currentVelocity.y() - gravity) * gravityDrag; + double z = currentVelocity.z() * drag; + return new Vec(Math.abs(x) < 1.0E-6 ? 0.0 : x, Math.abs(y) < 1.0E-6 ? 0.0 : y, Math.abs(z) < 1.0E-6 ? 0.0 : z); + } + } +} diff --git a/src/main/java/ca/atlasengine/projectiles/entities/FireballProjectile.java b/src/main/java/ca/atlasengine/projectiles/entities/FireballProjectile.java new file mode 100644 index 0000000..5c85d17 --- /dev/null +++ b/src/main/java/ca/atlasengine/projectiles/entities/FireballProjectile.java @@ -0,0 +1,119 @@ +package ca.atlasengine.projectiles.entities; + +import ca.atlasengine.projectiles.AbstractProjectile; +import net.minestom.server.MinecraftServer; +import net.minestom.server.ServerFlag; +import net.minestom.server.collision.Aerodynamics; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; +import net.minestom.server.entity.Entity; +import net.minestom.server.entity.EntityType; +import net.minestom.server.event.EventDispatcher; +import net.minestom.server.event.entity.EntityShootEvent; +import net.minestom.server.event.entity.projectile.ProjectileCollideWithEntityEvent; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.BlockHandler; +import org.jetbrains.annotations.NotNull; + +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; + +public class FireballProjectile extends AbstractProjectile { + boolean inBlock = false; + + public FireballProjectile(EntityType type, Entity shooter) { + super(type, shooter); + this.setNoGravity(true); + } + + @Override + public void tick(long time) { + if (removed || inBlock) return; + + final Pos posBefore = getPosition(); + updatePosition(time); + final Pos posNow = getPosition(); + + checkEntityCollision(posBefore, posNow); + } + + @Override + public void shoot(@NotNull Point from, @NotNull Point to, double power, double spread) { + var instance = shooter.getInstance(); + if (instance == null) return; + + float yaw = -shooter.getPosition().yaw(); + float originalPitch = -shooter.getPosition().pitch(); + + double pitchDiff = originalPitch; + if (pitchDiff == 0) pitchDiff = 0.0001; + double pitchAdjust = pitchDiff * 0.002145329238474369D; + + double dx = to.x() - from.x(); + double dy = to.y() - from.y() + pitchAdjust; + double dz = to.z() - from.z(); + if (!hasNoGravity()) { + final double xzLength = Math.sqrt(dx * dx + dz * dz); + dy += xzLength * 0.20000000298023224D; + } + + final double length = Math.sqrt(dx * dx + dy * dy + dz * dz); + dx /= length; + dy /= length; + dz /= length; + Random random = ThreadLocalRandom.current(); + spread *= 0.007499999832361937D; + dx += random.nextGaussian() * spread; + dy += random.nextGaussian() * spread; + dz += random.nextGaussian() * spread; + + final EntityShootEvent shootEvent = new EntityShootEvent(this.shooter, this, from, power, spread); + EventDispatcher.call(shootEvent); + if (shootEvent.isCancelled()) { + remove(); + return; + } + + final double mul = ServerFlag.SERVER_TICKS_PER_SECOND * power; + Vec v = new Vec(dx * mul, dy * mul * 0.9, dz * mul); + + this.setInstance(instance, new Pos(from.x(), from.y() - this.boundingBox.height()/2, from.z(), yaw, originalPitch)).whenComplete((result, throwable) -> { + if (throwable != null) { + throwable.printStackTrace(); + } else { + synchronizePosition(); // initial synchronization, required to be 100% precise + setVelocity(v); + } + }); + } + + @Override + protected void handleBlockCollision(Block hitBlock, Point hitPos, Pos posBefore) { + velocity = Vec.ZERO; + setNoGravity(true); + + velocity = Vec.fromPoint(hitPos.sub(posBefore)); + Vec v = velocity.normalize().mul(0.01f); // required so the entity is lit (just outside the block) + + // if the value is zero, it will be unlit. If the value is more than 0.01, there will be noticeable pitch change visually + position = new Pos(hitPos.x()-v.x(), hitPos.y()-v.y(), hitPos.z()-v.z(), posBefore.yaw(), posBefore.pitch()); + MinecraftServer.getSchedulerManager().scheduleNextTick(this::synchronizePosition); // required as in rare situations there will be a slight disagreement with the client and server on if it hit or not | also scheduling next tick so it doesn't jump to the hit position until it has actually hit + BlockHandler blockHandler = hitBlock.handler(); + if (blockHandler == null) return; + blockHandler.onTouch(new BlockHandler.Touch(hitBlock, instance, hitPos, this)); + } + + @Override + protected void handleEntityCollision(Entity hitEntity, Point hitPos, Pos posBefore) { + ProjectileCollideWithEntityEvent e = new ProjectileCollideWithEntityEvent(this, Pos.fromPoint(hitPos), hitEntity); + MinecraftServer.getGlobalEventHandler().call(e); + } + + protected @NotNull Vec updateVelocity(@NotNull Pos entityPosition, @NotNull Vec currentVelocity, @NotNull Block.@NotNull Getter blockGetter, @NotNull Aerodynamics aerodynamics, boolean positionChanged, boolean entityFlying, boolean entityOnGround, boolean entityNoGravity) { + double x = currentVelocity.x(); + double y = currentVelocity.y(); + double z = currentVelocity.z(); + return new Vec(Math.abs(x) < 1.0E-6 ? 0.0 : x, Math.abs(y) < 1.0E-6 ? 0.0 : y, Math.abs(z) < 1.0E-6 ? 0.0 : z); + } +} diff --git a/src/main/java/ca/atlasengine/projectiles/entities/ThrownItemProjectile.java b/src/main/java/ca/atlasengine/projectiles/entities/ThrownItemProjectile.java new file mode 100644 index 0000000..e1fe2aa --- /dev/null +++ b/src/main/java/ca/atlasengine/projectiles/entities/ThrownItemProjectile.java @@ -0,0 +1,121 @@ +package ca.atlasengine.projectiles.entities; + +import ca.atlasengine.projectiles.AbstractProjectile; +import net.minestom.server.MinecraftServer; +import net.minestom.server.ServerFlag; +import net.minestom.server.collision.Aerodynamics; +import net.minestom.server.coordinate.Point; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.coordinate.Vec; +import net.minestom.server.entity.Entity; +import net.minestom.server.entity.EntityType; +import net.minestom.server.event.EventDispatcher; +import net.minestom.server.event.entity.EntityShootEvent; +import net.minestom.server.event.entity.projectile.ProjectileCollideWithEntityEvent; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.BlockHandler; +import net.minestom.server.network.packet.server.play.ParticlePacket; +import net.minestom.server.particle.Particle; +import org.jetbrains.annotations.NotNull; + +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; + +public class ThrownItemProjectile extends AbstractProjectile { + boolean inBlock = false; + + public ThrownItemProjectile(EntityType type, Entity shooter) { + super(type, shooter); + } + + @Override + public void tick(long time) { + if (removed || inBlock) return; + + final Pos posBefore = getPosition(); + updatePosition(time); + final Pos posNow = getPosition(); + + System.out.println(posNow); + + checkEntityCollision(posBefore, posNow); + } + + @Override + public void shoot(@NotNull Point from, @NotNull Point to, double power, double spread) { + var instance = shooter.getInstance(); + if (instance == null) return; + + float yaw = -shooter.getPosition().yaw(); + float originalPitch = -shooter.getPosition().pitch(); + + double pitchDiff = originalPitch - 45f; + if (pitchDiff == 0) pitchDiff = 0.0001; + double pitchAdjust = pitchDiff * 0.002145329238474369D; + + double dx = to.x() - from.x(); + double dy = to.y() - from.y() + pitchAdjust; + double dz = to.z() - from.z(); + + if (!hasNoGravity()) { + final double xzLength = Math.sqrt(dx * dx + dz * dz); + dy += xzLength * 0.20000000298023224D; + } + + final double length = Math.sqrt(dx * dx + dy * dy + dz * dz); + dx /= length; + dy /= length; + dz /= length; + Random random = ThreadLocalRandom.current(); + spread *= 0.007499999832361937D; + dx += random.nextGaussian() * spread; + dy += random.nextGaussian() * spread; + dz += random.nextGaussian() * spread; + + final EntityShootEvent shootEvent = new EntityShootEvent(this.shooter, this, from, power, spread); + EventDispatcher.call(shootEvent); + if (shootEvent.isCancelled()) { + remove(); + return; + } + + final double mul = ServerFlag.SERVER_TICKS_PER_SECOND * power; + Vec v = new Vec(dx * mul, dy * mul * 0.9, dz * mul); + + this.setInstance(instance, new Pos(from.x(), from.y() - this.boundingBox.height()/2, from.z(), yaw, originalPitch)).whenComplete((result, throwable) -> { + if (throwable != null) { + throwable.printStackTrace(); + } else { + synchronizePosition(); // initial synchronization, required to be 100% precise + setVelocity(v); + } + }); + } + + @Override + protected void handleBlockCollision(Block hitBlock, Point hitPos, Pos posBefore) { + velocity = Vec.ZERO; + setNoGravity(true); + inBlock = true; + + // if the value is zero, it will be unlit. If the value is more than 0.01, there will be noticeable pitch change visually + position = new Pos(hitPos.x(), hitPos.y(), hitPos.z(), posBefore.yaw(), posBefore.pitch()); + MinecraftServer.getSchedulerManager().scheduleNextTick(this::synchronizePosition); // required as in rare situations there will be a slight disagreement with the client and server on if it hit or not | also scheduling next tick so it doesn't jump to the hit position until it has actually hit + BlockHandler blockHandler = hitBlock.handler(); + if (blockHandler == null) return; + blockHandler.onTouch(new BlockHandler.Touch(hitBlock, instance, hitPos, this)); + } + + @Override + protected void handleEntityCollision(Entity hitEntity, Point hitPos, Pos posBefore) { + ProjectileCollideWithEntityEvent e = new ProjectileCollideWithEntityEvent(this, Pos.fromPoint(hitPos), hitEntity); + MinecraftServer.getGlobalEventHandler().call(e); + } + + protected @NotNull Vec updateVelocity(@NotNull Pos entityPosition, @NotNull Vec currentVelocity, @NotNull Block.@NotNull Getter blockGetter, @NotNull Aerodynamics aerodynamics, boolean positionChanged, boolean entityFlying, boolean entityOnGround, boolean entityNoGravity) { + double x = currentVelocity.x(); + double y = currentVelocity.y() - 0.03; + double z = currentVelocity.z(); + return new Vec(Math.abs(x) < 1.0E-6 ? 0.0 : x, Math.abs(y) < 1.0E-6 ? 0.0 : y, Math.abs(z) < 1.0E-6 ? 0.0 : z); + } +} \ No newline at end of file diff --git a/src/test/java/Main.java b/src/test/java/Main.java new file mode 100644 index 0000000..e4a0e89 --- /dev/null +++ b/src/test/java/Main.java @@ -0,0 +1,135 @@ +import ca.atlasengine.projectiles.BowModule; +import ca.atlasengine.projectiles.entities.ArrowProjectile; +import ca.atlasengine.projectiles.entities.FireballProjectile; +import ca.atlasengine.projectiles.entities.ThrownItemProjectile; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; +import net.minestom.server.MinecraftServer; +import net.minestom.server.adventure.audience.Audiences; +import net.minestom.server.command.CommandManager; +import net.minestom.server.coordinate.Pos; +import net.minestom.server.entity.EntityType; +import net.minestom.server.entity.GameMode; +import net.minestom.server.entity.Player; +import net.minestom.server.event.GlobalEventHandler; +import net.minestom.server.event.player.*; +import net.minestom.server.event.server.ServerTickMonitorEvent; +import net.minestom.server.extras.lan.OpenToLAN; +import net.minestom.server.instance.InstanceContainer; +import net.minestom.server.instance.InstanceManager; +import net.minestom.server.instance.LightingChunk; +import net.minestom.server.instance.block.Block; +import net.minestom.server.item.ItemComponent; +import net.minestom.server.item.ItemStack; +import net.minestom.server.item.Material; +import net.minestom.server.monitoring.TickMonitor; +import net.minestom.server.timer.TaskSchedule; +import net.minestom.server.utils.MathUtils; +import net.minestom.server.world.DimensionType; + +import java.util.Collection; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + +public class Main { + public static void main(String[] args) { + MinecraftServer minecraftServer = MinecraftServer.init(); + + InstanceManager instanceManager = MinecraftServer.getInstanceManager(); + InstanceContainer lobby = instanceManager.createInstanceContainer(DimensionType.OVERWORLD); + lobby.setChunkSupplier(LightingChunk::new); + lobby.enableAutoChunkLoad(true); + lobby.setGenerator(unit -> unit.modifier().fillHeight(0, 1, Block.STONE)); + lobby.setTimeRate(0); + instanceManager.registerInstance(lobby); + + // Commands + { + CommandManager manager = MinecraftServer.getCommandManager(); + manager.setUnknownCommandCallback((sender, c) -> sender.sendMessage("Command not found.")); + } + + // Events + { + GlobalEventHandler handler = MinecraftServer.getGlobalEventHandler(); + + // Login + handler.addListener(AsyncPlayerConfigurationEvent.class, event -> { + final Player player = event.getPlayer(); + player.setRespawnPoint(new Pos(0.5, 16, 0.5)); + event.setSpawningInstance(lobby); + }); + + handler.addListener(PlayerSpawnEvent.class, event -> { + if (!event.isFirstSpawn()) return; + final Player player = event.getPlayer(); + + var bow = ItemStack.builder(Material.BOW).set(ItemComponent.CHARGED_PROJECTILES, List.of(ItemStack.of(Material.ARROW))).build(); + player.setItemInMainHand(bow); + + player.setGameMode(GameMode.CREATIVE); + player.setEnableRespawnScreen(false); + player.getInventory().addItemStack(ItemStack.of(Material.ARROW, 64)); + player.getInventory().addItemStack(ItemStack.of(Material.FIRE_CHARGE, 64)); + + Audiences.all().sendMessage(Component.text( + player.getUsername() + " has joined", + NamedTextColor.GREEN + )); + + player.eventNode().addListener(PlayerUseItemEvent.class, e -> { + if (e.getHand() != Player.Hand.MAIN) return; + if (e.getItemStack().material() == Material.FIRE_CHARGE) { + new ThrownItemProjectile(EntityType.SNOWBALL, e.getPlayer()).shoot(e.getPlayer().getPosition().add(0, e.getPlayer().getEyeHeight(), 0).asVec(), 1, 1); + } + }); + + new BowModule(player.eventNode(), (p, i) -> new ArrowProjectile(EntityType.ARROW, p)); + }); + + // Logout + handler.addListener(PlayerDisconnectEvent.class, event -> Audiences.all().sendMessage(Component.text( + event.getPlayer().getUsername() + " has left", + NamedTextColor.RED + ))); + + // Chat + handler.addListener(PlayerChatEvent.class, chatEvent -> { + chatEvent.setChatFormat((event) -> Component.text(event.getEntity().getUsername()) + .append(Component.text(" | ", NamedTextColor.DARK_GRAY) + .append(Component.text(event.getMessage(), NamedTextColor.WHITE)))); + }); + + // Monitoring + AtomicReference lastTick = new AtomicReference<>(); + handler.addListener(ServerTickMonitorEvent.class, event -> lastTick.set(event.getTickMonitor())); + + // Header/footer + MinecraftServer.getSchedulerManager().scheduleTask(() -> { + Collection players = MinecraftServer.getConnectionManager().getOnlinePlayers(); + if (players.isEmpty()) return; + + final Runtime runtime = Runtime.getRuntime(); + final TickMonitor tickMonitor = lastTick.get(); + final long ramUsage = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024; + + final Component header = Component.newline() + .append(Component.text("RAM USAGE: " + ramUsage + " MB", NamedTextColor.GRAY).append(Component.newline()) + .append(Component.text("TICK TIME: " + MathUtils.round(tickMonitor.getTickTime(), 2) + "ms", NamedTextColor.GRAY))).append(Component.newline()); + + final Component footer = Component.newline() + .append(Component.text(" Projectile Demo ") + .color(TextColor.color(57, 200, 73)) + .append(Component.newline())); + + Audiences.players().sendPlayerListHeaderAndFooter(header, footer); + }, TaskSchedule.tick(10), TaskSchedule.tick(10)); + } + + OpenToLAN.open(); + + minecraftServer.start("0.0.0.0", 25565); + System.out.println("Server startup done!"); + } +}