Page MenuHomeDevCentral
Files F11407634

D3646.diff
No OneTemporary
Actions

D3646.diff
View Options

diff --git a/.arcconfig b/.arcconfig
new file mode 100644
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,4 @@
+{
+ "phabricator.uri": "https://devcentral.nasqueron.org/",
+ "repository.callsign": "QVR"
+}
diff --git a/.gitignore b/.gitignore
new file mode 100644
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.gradle
+build/
+plugins/**/gradle/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
diff --git a/plugins/suhayl/build.gradle.kts b/plugins/suhayl/build.gradle.kts
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/build.gradle.kts
@@ -0,0 +1,30 @@
+plugins {
+ id("java")
+}
+
+group = "org.eu.loupsgris.quilvaryn"
+version = "0.1-SNAPSHOT"
+
+java {
+ toolchain {
+ languageVersion.set(JavaLanguageVersion.of(21))
+ }
+}
+
+repositories {
+ mavenCentral()
+
+ maven {
+ name = "papermc"
+ url = uri("https://repo.papermc.io/repository/maven-public/")
+ }
+}
+
+dependencies {
+ testImplementation(platform("org.junit:junit-bom:5.10.0"))
+ testImplementation("org.junit.jupiter:junit-jupiter")
+ testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
+ // Paper API (includes Bukkit + Spigot)
+ compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
+}
diff --git a/plugins/suhayl/gradlew b/plugins/suhayl/gradlew
new file mode 100755
--- /dev/null
+++ b/plugins/suhayl/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/plugins/suhayl/gradlew.bat b/plugins/suhayl/gradlew.bat
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/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/plugins/suhayl/settings.gradle.kts b/plugins/suhayl/settings.gradle.kts
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "suhayl"
diff --git a/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/SuhaylPlugin.java b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/SuhaylPlugin.java
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/SuhaylPlugin.java
@@ -0,0 +1,29 @@
+package org.eu.loupsgris.quilvaryn;
+
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import org.eu.loupsgris.quilvaryn.config.DefaultSuhaylConfig;
+import org.eu.loupsgris.quilvaryn.config.SuhaylConfig;
+import org.eu.loupsgris.quilvaryn.listeners.HappyGhastBehavior;
+import org.eu.loupsgris.quilvaryn.listeners.OptimizedWeather;
+
+public class SuhaylPlugin extends JavaPlugin {
+
+ public SuhaylConfig config;
+
+ @Override
+ public void onEnable() {
+ config = new DefaultSuhaylConfig();
+
+ // Register features
+ Bukkit.getPluginManager().registerEvents(new OptimizedWeather(this), this);
+ Bukkit.getPluginManager().registerEvents(new HappyGhastBehavior(this), this);
+ }
+
+ @Override
+ public void onDisable() {
+ getLogger().info("Suhayl quality of life plugin disabled.");
+ }
+
+}
diff --git a/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/config/DefaultSuhaylConfig.java b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/config/DefaultSuhaylConfig.java
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/config/DefaultSuhaylConfig.java
@@ -0,0 +1,10 @@
+package org.eu.loupsgris.quilvaryn.config;
+
+public class DefaultSuhaylConfig extends SuhaylConfig {
+
+ public DefaultSuhaylConfig() {
+ happyGhastSpeedBoost = 2.0;
+ rainRate = 0.7;
+ }
+
+}
diff --git a/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/config/SuhaylConfig.java b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/config/SuhaylConfig.java
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/config/SuhaylConfig.java
@@ -0,0 +1,16 @@
+package org.eu.loupsgris.quilvaryn.config;
+
+public class SuhaylConfig {
+
+ /*
+ * No-op values:
+ * 1.0 for multipliers
+ *
+ * Actual default values are in Default- class.
+ */
+
+ public double happyGhastSpeedBoost = 1.0;
+
+ public double rainRate = 1.0;
+
+}
diff --git a/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/listeners/HappyGhastBehavior.java b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/listeners/HappyGhastBehavior.java
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/listeners/HappyGhastBehavior.java
@@ -0,0 +1,96 @@
+package org.eu.loupsgris.quilvaryn.listeners;
+
+import org.bukkit.attribute.Attribute;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.HappyGhast;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Snowball;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDismountEvent;
+import org.bukkit.event.entity.EntityMountEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.ProjectileHitEvent;
+
+import org.eu.loupsgris.quilvaryn.SuhaylPlugin;
+import org.eu.loupsgris.quilvaryn.config.SuhaylConfig;
+import org.eu.loupsgris.quilvaryn.utils.EntityUtils;
+
+import java.util.Optional;
+import java.util.logging.Logger;
+
+public class HappyGhastBehavior implements Listener {
+
+ private final Logger logger;
+ private final SuhaylConfig config;
+
+ public static final double DEFAULT_HAPPY_GHAST_SPEED = 0.05;
+
+ public HappyGhastBehavior(SuhaylPlugin plugin) {
+ this.logger = plugin.getLogger();
+ this.config = plugin.config;
+ }
+
+ private double computeSpeed () {
+ return DEFAULT_HAPPY_GHAST_SPEED * config.happyGhastSpeedBoost;
+ }
+
+ private void updateSpeed (HappyGhast ghast, double speed) {
+ var attribute = ghast.getAttribute(Attribute.FLYING_SPEED);
+
+ if (attribute == null) {
+ logger.warning("HappyGhast flying speed attribute is null, can't update speed.");
+ return;
+ }
+
+ attribute.setBaseValue(speed);
+ }
+
+ @EventHandler
+ public void onHappyGhastMount(EntityMountEvent event) {
+ Entity entity = event.getMount();
+ if (!(entity instanceof HappyGhast ghast)) {
+ return;
+ }
+
+ updateSpeed(ghast, computeSpeed());
+ }
+
+ @EventHandler
+ public void onHappyGhastDismount(EntityDismountEvent event) {
+ Entity entity = event.getDismounted();
+ if (!(entity instanceof HappyGhast ghast)) {
+ return;
+ }
+
+ updateSpeed(ghast, DEFAULT_HAPPY_GHAST_SPEED);
+ }
+
+ /**
+ * Heals happy ghast on snowball hit
+ */
+ @EventHandler
+ public void onSnowballReceived(ProjectileHitEvent event) {
+ Entity entity = event.getHitEntity();
+ if (!(entity instanceof HappyGhast ghast)) {
+ return;
+ }
+
+ Projectile projectile = event.getEntity();
+ if (!(projectile instanceof Snowball)) {
+ return;
+ }
+
+ event.setCancelled(true);
+
+ Optional<Double> maxHealth = EntityUtils.getMaxHealth(ghast);
+ if (maxHealth.isEmpty()) {
+ return;
+ }
+
+ if (ghast.getHealth() < maxHealth.get()) {
+ ghast.heal(4.0, EntityRegainHealthEvent.RegainReason.EATING);
+ }
+ }
+
+}
diff --git a/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/listeners/OptimizedWeather.java b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/listeners/OptimizedWeather.java
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/listeners/OptimizedWeather.java
@@ -0,0 +1,33 @@
+package org.eu.loupsgris.quilvaryn.listeners;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.weather.WeatherChangeEvent;
+
+import org.eu.loupsgris.quilvaryn.SuhaylPlugin;
+import org.eu.loupsgris.quilvaryn.config.SuhaylConfig;
+
+import java.util.Random;
+
+public class OptimizedWeather implements Listener {
+
+ private final Random random;
+ private final SuhaylConfig config;
+
+ public OptimizedWeather(SuhaylPlugin plugin) {
+ this.config = plugin.config;
+ this.random = new Random();
+ }
+
+ @EventHandler
+ public void onWeatherChange(WeatherChangeEvent event) {
+ // When the weather is about to start raining,
+ // cancel it when below the rate.
+ if (event.toWeatherState()) {
+ if (random.nextDouble() < config.rainRate) {
+ event.setCancelled(true);
+ }
+ }
+ }
+
+}
diff --git a/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/utils/EntityUtils.java b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/utils/EntityUtils.java
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/src/main/java/org/eu/loupsgris/quilvaryn/utils/EntityUtils.java
@@ -0,0 +1,21 @@
+package org.eu.loupsgris.quilvaryn.utils;
+
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.entity.LivingEntity;
+
+import java.util.Optional;
+
+public final class EntityUtils {
+
+ public static Optional<Double> getMaxHealth(LivingEntity entity) {
+ AttributeInstance attr = entity.getAttribute(Attribute.MAX_HEALTH);
+
+ if (attr == null) {
+ return Optional.empty();
+ }
+
+ return Optional.of(attr.getValue());
+ }
+
+}
diff --git a/plugins/suhayl/src/main/resources/plugin.yml b/plugins/suhayl/src/main/resources/plugin.yml
new file mode 100644
--- /dev/null
+++ b/plugins/suhayl/src/main/resources/plugin.yml
@@ -0,0 +1,4 @@
+name: Suhayl
+version: 0.1.0
+main: org.eu.loupsgris.quilvaryn.SuhaylPlugin
+api-version: 1.20

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 26, 14:29 (8 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2935625
Default Alt Text
D3646.diff (20 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator