diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f81e10d --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.gradle/ +build/ + +.idea/ +*.iml +*.iws +*.ipr \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e51df9d --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 Terry + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..833bda8 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# SoupMechanics + Restore Health using Soups (Spigot 1.21+) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..26ddfdf --- /dev/null +++ b/build.gradle @@ -0,0 +1,55 @@ +plugins { + id 'java' +} + +group = 'dev.mending.sm' +version = '1.0.0' + +repositories { + mavenCentral() + maven { + name = "spigotmc-repo" + url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/groups/public/" + } +} + +dependencies { + compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT") + + compileOnly 'org.projectlombok:lombok:1.18.36' + annotationProcessor 'org.projectlombok:lombok:1.18.36' + + testCompileOnly 'org.projectlombok:lombok:1.18.36' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.36' +} + +def targetJavaVersion = 21 +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + sourceCompatibility = javaVersion + targetCompatibility = javaVersion + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + options.release.set(targetJavaVersion) + } +} + +processResources { + def props = [version: version] + inputs.properties props + filteringCharset 'UTF-8' + filesMatching('plugin.yml') { + expand props + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e69de29 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a441313 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..b740cf1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ff2365d --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'SoupMechanics' diff --git a/src/main/java/dev/mending/sm/SoupMechanics.java b/src/main/java/dev/mending/sm/SoupMechanics.java new file mode 100644 index 0000000..24a07f2 --- /dev/null +++ b/src/main/java/dev/mending/sm/SoupMechanics.java @@ -0,0 +1,50 @@ +package dev.mending.sm; + +import dev.mending.sm.config.impl.MainConfig; +import dev.mending.sm.listener.FoodLevelListener; +import dev.mending.sm.listener.PlayerInteractListener; +import dev.mending.sm.recipe.impl.CactusRecipe; +import dev.mending.sm.recipe.impl.CocoaRecipe; +import dev.mending.sm.utils.UpdateChecker; +import lombok.Getter; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; + +@Getter +public final class SoupMechanics extends JavaPlugin { + + private final MainConfig mainConfig = new MainConfig(this); + + @Override + public void onEnable() { + + mainConfig.init(); + registerEvents(getServer().getPluginManager()); + registerRecipes(); + + if (mainConfig.isCheckForUpdatesEnabled()) { + new UpdateChecker(this, "teraprath", "SoupMechanics").checkForUpdate(); + } + } + + private void registerEvents(final PluginManager pm) { + + if (mainConfig.isVanillaHungerBarDisabled()) { + pm.registerEvents(new FoodLevelListener(), this); + } + + pm.registerEvents(new PlayerInteractListener(mainConfig.getRestoreHealthAmount()), this); + } + + private void registerRecipes() { + + if (mainConfig.isRecipeCocoaBeansEnabled()) { + new CocoaRecipe().register(); + } + + if (mainConfig.isRecipeCactusEnabled()) { + new CactusRecipe().register(); + } + } + +} diff --git a/src/main/java/dev/mending/sm/config/BaseConfig.java b/src/main/java/dev/mending/sm/config/BaseConfig.java new file mode 100644 index 0000000..bb24485 --- /dev/null +++ b/src/main/java/dev/mending/sm/config/BaseConfig.java @@ -0,0 +1,50 @@ +package dev.mending.sm.config; + +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.plugin.java.JavaPlugin; + +import javax.annotation.Nonnull; +import java.io.File; +import java.io.IOException; + +public abstract class BaseConfig { + + protected final JavaPlugin plugin; + private final String fileName; + private File file; + private FileConfiguration config; + + public BaseConfig(@Nonnull JavaPlugin plugin, @Nonnull String fileName) { + this.plugin = plugin; + this.fileName = fileName + ".yml"; + } + + public void init() { + this.file = new File(plugin.getDataFolder(), this.fileName); + reload(); + } + + public void reload() { + if (!file.exists()) { + file.getParentFile().mkdirs(); + plugin.saveResource(this.fileName, false); + } + this.config = YamlConfiguration.loadConfiguration(file); + onLoad(this.config); + } + + public void save() { + try { + onPreSave(config); + config.save(file); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public abstract void onLoad(FileConfiguration config); + + public void onPreSave(FileConfiguration config) {}; + +} \ No newline at end of file diff --git a/src/main/java/dev/mending/sm/config/impl/MainConfig.java b/src/main/java/dev/mending/sm/config/impl/MainConfig.java new file mode 100644 index 0000000..caf5ba6 --- /dev/null +++ b/src/main/java/dev/mending/sm/config/impl/MainConfig.java @@ -0,0 +1,29 @@ +package dev.mending.sm.config.impl; + +import dev.mending.sm.config.BaseConfig; +import lombok.Getter; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.plugin.java.JavaPlugin; + +@Getter +public class MainConfig extends BaseConfig { + + private boolean checkForUpdatesEnabled; + private int restoreHealthAmount; + private boolean recipeCocoaBeansEnabled; + private boolean recipeCactusEnabled; + private boolean vanillaHungerBarDisabled; + + public MainConfig(JavaPlugin plugin) { + super(plugin, "config"); + } + + @Override + public void onLoad(FileConfiguration config) { + this.checkForUpdatesEnabled = config.getBoolean("check-for-updates"); + this.restoreHealthAmount = config.getInt("soup.restore-health-amount"); + this.recipeCocoaBeansEnabled = config.getBoolean("recipes.cocoa-beans"); + this.recipeCactusEnabled = config.getBoolean("recipes.cactus"); + this.vanillaHungerBarDisabled = config.getBoolean("vanilla-hunger-bar.disabled"); + } +} diff --git a/src/main/java/dev/mending/sm/listener/FoodLevelListener.java b/src/main/java/dev/mending/sm/listener/FoodLevelListener.java new file mode 100644 index 0000000..8e4a412 --- /dev/null +++ b/src/main/java/dev/mending/sm/listener/FoodLevelListener.java @@ -0,0 +1,13 @@ +package dev.mending.sm.listener; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.FoodLevelChangeEvent; + +public class FoodLevelListener implements Listener { + + @EventHandler + public void onFoodLevelChange(FoodLevelChangeEvent e) { + e.setCancelled(true); + } +} diff --git a/src/main/java/dev/mending/sm/listener/PlayerInteractListener.java b/src/main/java/dev/mending/sm/listener/PlayerInteractListener.java new file mode 100644 index 0000000..beb96f0 --- /dev/null +++ b/src/main/java/dev/mending/sm/listener/PlayerInteractListener.java @@ -0,0 +1,42 @@ +package dev.mending.sm.listener; + +import org.bukkit.GameMode; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.ItemStack; + +public class PlayerInteractListener implements Listener { + + private final int restoreHealth; + + public PlayerInteractListener(int restoreHealth) { + this.restoreHealth = restoreHealth; + } + + @EventHandler + public void onPlayerInteract(PlayerInteractEvent e) { + + if (e.getItem() != null && e.getItem().getType().equals(Material.MUSHROOM_STEW)) { + + final Player player = e.getPlayer(); + + if (player.getGameMode().equals(GameMode.CREATIVE) || player.getHealth() == 20) { + return; + } + + e.setCancelled(true); + + if (player.getHealth() + restoreHealth >= 20) { + player.setHealth(20); + } else { + player.setHealth(player.getHealth() + restoreHealth); + } + + player.getInventory().setItemInMainHand(new ItemStack(Material.BOWL)); + } + } + +} diff --git a/src/main/java/dev/mending/sm/recipe/BaseRecipe.java b/src/main/java/dev/mending/sm/recipe/BaseRecipe.java new file mode 100644 index 0000000..bb2927b --- /dev/null +++ b/src/main/java/dev/mending/sm/recipe/BaseRecipe.java @@ -0,0 +1,34 @@ +package dev.mending.sm.recipe; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.ShapelessRecipe; + +public abstract class BaseRecipe { + + private final NamespacedKey key; + private final ItemStack itemStack; + private ShapelessRecipe recipe; + + public BaseRecipe(String id, ItemStack itemStack) { + this.itemStack = itemStack; + this.key = new NamespacedKey("soupmechanics", id); + } + + public BaseRecipe setRecipe(Material... ingredients) { + ShapelessRecipe shapelessRecipe = new ShapelessRecipe(key, itemStack); + for (Material ingredient : ingredients) { + shapelessRecipe.addIngredient(ingredient); + } + this.recipe = shapelessRecipe; + return this; + } + + public void register() { + if (this.recipe != null) { + Bukkit.addRecipe(recipe); + } + } +} diff --git a/src/main/java/dev/mending/sm/recipe/impl/CactusRecipe.java b/src/main/java/dev/mending/sm/recipe/impl/CactusRecipe.java new file mode 100644 index 0000000..444704b --- /dev/null +++ b/src/main/java/dev/mending/sm/recipe/impl/CactusRecipe.java @@ -0,0 +1,13 @@ +package dev.mending.sm.recipe.impl; + +import dev.mending.sm.recipe.BaseRecipe; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + +public class CactusRecipe extends BaseRecipe { + + public CactusRecipe() { + super("cactus_stew", new ItemStack(Material.MUSHROOM_STEW)); + setRecipe(Material.BOWL, Material.CACTUS); + } +} diff --git a/src/main/java/dev/mending/sm/recipe/impl/CocoaRecipe.java b/src/main/java/dev/mending/sm/recipe/impl/CocoaRecipe.java new file mode 100644 index 0000000..23796fa --- /dev/null +++ b/src/main/java/dev/mending/sm/recipe/impl/CocoaRecipe.java @@ -0,0 +1,14 @@ +package dev.mending.sm.recipe.impl; + +import dev.mending.sm.recipe.BaseRecipe; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + +public class CocoaRecipe extends BaseRecipe { + + public CocoaRecipe() { + super("cocoa_stew", new ItemStack(Material.MUSHROOM_STEW)); + setRecipe(Material.BOWL, Material.COCOA_BEANS); + } + +} diff --git a/src/main/java/dev/mending/sm/utils/UpdateChecker.java b/src/main/java/dev/mending/sm/utils/UpdateChecker.java new file mode 100644 index 0000000..443a24f --- /dev/null +++ b/src/main/java/dev/mending/sm/utils/UpdateChecker.java @@ -0,0 +1,67 @@ +package dev.mending.sm.utils; + +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; + +import org.bukkit.plugin.java.JavaPlugin; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import javax.annotation.Nonnull; + +public class UpdateChecker { + + private static final String API_URL = "https://api.github.com/repos/%s/%s/releases/latest"; + private static final String DOWNLOAD_URL = "https://github.com/%s/%s/releases/latest"; + + private final JavaPlugin plugin; + + private final String owner; + private final String repo; + private final String updateMessage = "A new version of %s is available! Download v%s here: %s"; + + public UpdateChecker(@Nonnull JavaPlugin plugin, @Nonnull String owner, @Nonnull String repo) { + this.plugin = plugin; + this.owner = owner; + this.repo = repo; + } + + public String getLatestReleaseVersion() throws IOException, InterruptedException { + String url = String.format(API_URL, owner, repo); + HttpClient client = HttpClient.newHttpClient(); + + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(url)) + .header("Accept", "application/vnd.github+json") + .build(); + + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + + if (response.statusCode() == 200) { + JsonObject jsonResponse = JsonParser.parseString(response.body()).getAsJsonObject(); + return jsonResponse.get("tag_name").getAsString(); + } else { + throw new IOException("Failed to fetch release version. Status code: " + response.statusCode()); + } + } + + + public void checkForUpdate() { + plugin.getServer().getScheduler().runTaskAsynchronously(plugin, task -> { + try { + final String currentVersion = plugin.getDescription().getVersion(); + final String latestVersion = getLatestReleaseVersion(); + if (currentVersion.equals(latestVersion)) { + plugin.getLogger().info("You're using the latest version."); + } else { + plugin.getLogger().warning(String.format(updateMessage, plugin.getDescription().getName(), latestVersion, String.format(DOWNLOAD_URL, owner, repo))); + } + } catch (IOException | InterruptedException e) { + throw new RuntimeException(e); + } + }); + } +} \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..d41ef51 --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,8 @@ +check-for-updates: true +soup: + restore-health-amount: 7 +recipes: + cocoa-beans: true + cactus: true +vanilla-hunger-bar: + disabled: true \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..a78d286 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,6 @@ +name: SoupMechanics +version: '1.0.0' +main: dev.mending.sm.SoupMechanics +api-version: '1.21' +authors: [ MrMending ] +description: Restore Health using Soups