From 839990554e1b0907787b67a7d31b47b692af8dc9 Mon Sep 17 00:00:00 2001 From: Paul Reilly Date: Sun, 5 Mar 2023 22:35:52 -0600 Subject: [PATCH] Update Feb 2nd 2023 --- build/resources/main/config.yml | 17 ++ build/resources/main/plugin.yml | 16 ++ .../compileJava/previous-compilation-data.bin | Bin 0 -> 35043 bytes build/tmp/jar/MANIFEST.MF | 2 + gradlew | 263 +++++++----------- gradlew.bat | 14 +- .../io/github/paldiu/CraftingListener.java | 61 ---- .../java/io/github/paldiu/CraftingUtils.java | 30 ++ .../java/io/github/paldiu/Uncraftables.java | 2 +- .../io/github/paldiu/config/ConfigValues.java | 12 + .../paldiu/config/ItemMetaSupplier.java | 9 + .../github/paldiu/recipes/BedrockRecipe.java | 15 +- .../github/paldiu/recipes/CobWebRecipe.java | 17 ++ .../paldiu/recipes/CryingObsidianRecipe.java | 10 +- .../paldiu/recipes/DragonEggRecipe.java | 2 +- .../io/github/paldiu/recipes/EggRecipes.java | 163 ++++++----- .../paldiu/recipes/NetherStarRecipe.java | 16 +- .../paldiu/recipes/NetherWartRecipe.java | 7 +- .../paldiu/recipes/PhantomMembraneRecipe.java | 20 ++ .../paldiu/recipes/WitherSkullRecipe.java | 21 ++ src/main/resources/config.yml | 5 +- 21 files changed, 377 insertions(+), 325 deletions(-) create mode 100644 build/resources/main/config.yml create mode 100644 build/resources/main/plugin.yml create mode 100644 build/tmp/compileJava/previous-compilation-data.bin create mode 100644 build/tmp/jar/MANIFEST.MF delete mode 100644 src/main/java/io/github/paldiu/CraftingListener.java create mode 100644 src/main/java/io/github/paldiu/config/ItemMetaSupplier.java create mode 100644 src/main/java/io/github/paldiu/recipes/CobWebRecipe.java create mode 100644 src/main/java/io/github/paldiu/recipes/PhantomMembraneRecipe.java create mode 100644 src/main/java/io/github/paldiu/recipes/WitherSkullRecipe.java diff --git a/build/resources/main/config.yml b/build/resources/main/config.yml new file mode 100644 index 0000000..83bb814 --- /dev/null +++ b/build/resources/main/config.yml @@ -0,0 +1,17 @@ +barrier: true +bedrock: true +bell: true +crying_obsidian: true +dragon_egg: true +eggs: true +elytra: true +end_frame: true +horse_armor: true +music_discs: true +name_tag: true +nether_star: true +nether_wart: true +saddle: true +spawner: true +totem: true +trident: true \ No newline at end of file diff --git a/build/resources/main/plugin.yml b/build/resources/main/plugin.yml new file mode 100644 index 0000000..7719d6a --- /dev/null +++ b/build/resources/main/plugin.yml @@ -0,0 +1,16 @@ +name: Uncraftables +main: io.github.paldiu.Uncraftables +version: 1.2.0 +author: Paldiu +description: Adds in crafting recipes for uncraftable items. +api-version: 1.19 + +commands: + reload: + description: Reloads the plugin. + permission: uncraftables.reload + +permissions: + uncraftables.reload: + description: Allows the user to reload the plugin. + default: op \ No newline at end of file diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 0000000000000000000000000000000000000000..1302472fa6b500f7050e84ebd9d35bd1e12b8cf2 GIT binary patch literal 35043 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 '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} +APP_BASE_NAME=`basename "$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 +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 ;; +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 @@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + 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 @@ -140,101 +106,80 @@ 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 +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi 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 Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi # 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" ) +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=$( cygpath --unix "$JAVACMD" ) + 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 + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac 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. +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` -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' ' ' - )" '"$@"' +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f127cfd..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +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! -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% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/io/github/paldiu/CraftingListener.java b/src/main/java/io/github/paldiu/CraftingListener.java deleted file mode 100644 index 5e4efcf..0000000 --- a/src/main/java/io/github/paldiu/CraftingListener.java +++ /dev/null @@ -1,61 +0,0 @@ -package io.github.paldiu; - -import org.bukkit.Material; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.inventory.CraftItemEvent; -import org.bukkit.event.inventory.PrepareItemCraftEvent; -import org.bukkit.inventory.CraftingInventory; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.Recipe; -import org.bukkit.plugin.Plugin; - -public class CraftingListener implements Listener { - public CraftingListener(Plugin instance) { - instance.getServer().getPluginManager().registerEvents(this, instance); - } - - @EventHandler - public void preCraftEvent(PrepareItemCraftEvent e) { - final Recipe recipe = e.getRecipe(); - if (recipe == null) { return; } - - final ItemStack result = recipe.getResult(); - final CraftingInventory inv = e.getInventory(); - - if (e.isRepair()) { return; } - - if (result.getType().equals(Material.NETHER_WART)) { - result.setAmount(9); - inv.setResult(result); - } - if (result.getType().equals(Material.CRYING_OBSIDIAN)) { - result.setAmount(2); - inv.setResult(result); - } - if (result.getType().equals(Material.BEDROCK)) { - result.setAmount(4); - inv.setResult(result); - } - } - - @EventHandler - public void craftEvent(CraftItemEvent e) { - final ItemStack result = e.getRecipe().getResult(); - final CraftingInventory inv = e.getInventory(); - - if (result.getType().equals(Material.NETHER_WART)) { - result.setAmount(9); - inv.setResult(result); - } - if (result.getType().equals(Material.CRYING_OBSIDIAN)) { - result.setAmount(2); - inv.setResult(result); - } - if (result.getType().equals(Material.BEDROCK)) { - result.setAmount(4); - inv.setResult(result); - } - } - -} diff --git a/src/main/java/io/github/paldiu/CraftingUtils.java b/src/main/java/io/github/paldiu/CraftingUtils.java index 04c7593..a8b4c58 100644 --- a/src/main/java/io/github/paldiu/CraftingUtils.java +++ b/src/main/java/io/github/paldiu/CraftingUtils.java @@ -1,13 +1,17 @@ package io.github.paldiu; +import io.github.paldiu.config.ItemMetaSupplier; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapelessRecipe; +import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; +import java.util.function.Supplier; + public class CraftingUtils { private final Uncraftables plugin; @@ -26,8 +30,34 @@ public class CraftingUtils { return new ShapedRecipe(newKey(key), is); } + public final @NotNull ShapedRecipe shaped(Material result, int amount, String key) { + ItemStack is = new ItemStack(result); + is.setAmount(amount); + return new ShapedRecipe(newKey(key), is); + } + + public final @NotNull ShapedRecipe shaped(Material result, int amount, String key, ItemMetaSupplier customData) { + ItemStack is = new ItemStack(result); + is.setAmount(amount); + is.setItemMeta(customData.getFrom(is)); + return new ShapedRecipe(newKey(key), is); + } + public final @NotNull ShapelessRecipe shapeless(Material result, String key) { ItemStack is = new ItemStack(result); return new ShapelessRecipe(newKey(key), is); } + + public final @NotNull ShapelessRecipe shapeless(Material result, int amount, String key) { + ItemStack is = new ItemStack(result); + is.setAmount(amount); + return new ShapelessRecipe(newKey(key), is); + } + + public final @NotNull ShapelessRecipe shapeless(Material result, int amount, String key, ItemMetaSupplier customData) { + ItemStack is = new ItemStack(result); + is.setAmount(amount); + is.setItemMeta(customData.getFrom(is)); + return new ShapelessRecipe(newKey(key), is); + } } diff --git a/src/main/java/io/github/paldiu/Uncraftables.java b/src/main/java/io/github/paldiu/Uncraftables.java index 3fb4c64..4fdf53c 100644 --- a/src/main/java/io/github/paldiu/Uncraftables.java +++ b/src/main/java/io/github/paldiu/Uncraftables.java @@ -26,7 +26,6 @@ public class Uncraftables extends JavaPlugin { Bukkit.getLogger().info("[Uncraftables] Successfully enabled bStats metrics!"); register(); - new CraftingListener(this); Bukkit.getLogger().info("[Uncraftables] successfully loaded all recipes."); new ReloadCMD(this); @@ -51,6 +50,7 @@ public class Uncraftables extends JavaPlugin { new NameTagRecipe(this); new NetherStarRecipe(this); new NetherWartRecipe(this); + new PhantomMembraneRecipe(this); new SaddleRecipe(this); new SpawnerRecipe(this); new TotemRecipe(this); diff --git a/src/main/java/io/github/paldiu/config/ConfigValues.java b/src/main/java/io/github/paldiu/config/ConfigValues.java index 6dc28e7..de20fd7 100644 --- a/src/main/java/io/github/paldiu/config/ConfigValues.java +++ b/src/main/java/io/github/paldiu/config/ConfigValues.java @@ -76,4 +76,16 @@ public class ConfigValues { public boolean tridentEnabled() { return plugin.getYamlWrapper().getBoolean("trident"); } + + public boolean membraneEnabled() { + return plugin.getYamlWrapper().getBoolean("membrane"); + } + + public boolean cobWebEnabled() { + return plugin.getYamlWrapper().getBoolean("cobweb"); + } + + public boolean witherSkullEnabled() { + return plugin.getYamlWrapper().getBoolean("wither_skull"); + } } diff --git a/src/main/java/io/github/paldiu/config/ItemMetaSupplier.java b/src/main/java/io/github/paldiu/config/ItemMetaSupplier.java new file mode 100644 index 0000000..7b0112f --- /dev/null +++ b/src/main/java/io/github/paldiu/config/ItemMetaSupplier.java @@ -0,0 +1,9 @@ +package io.github.paldiu.config; + +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + +@FunctionalInterface +public interface ItemMetaSupplier { + ItemMeta getFrom(ItemStack itemStack); +} diff --git a/src/main/java/io/github/paldiu/recipes/BedrockRecipe.java b/src/main/java/io/github/paldiu/recipes/BedrockRecipe.java index 5bba229..84784cd 100644 --- a/src/main/java/io/github/paldiu/recipes/BedrockRecipe.java +++ b/src/main/java/io/github/paldiu/recipes/BedrockRecipe.java @@ -2,6 +2,7 @@ package io.github.paldiu.recipes; import io.github.paldiu.Uncraftables; import org.bukkit.Material; +import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapelessRecipe; public class BedrockRecipe extends Craftable { @@ -10,15 +11,11 @@ public class BedrockRecipe extends Craftable { if (!getConfigValues().bedrockEnabled()) return; - ShapelessRecipe recipe = getUtil().shapeless(Material.BEDROCK, "bedrock_recipe"); - recipe.addIngredient(2, Material.OBSIDIAN); - recipe.addIngredient(2, Material.STONE); - recipe.addIngredient(1, Material.DIAMOND); - recipe.addIngredient(1, Material.IRON_INGOT); - recipe.addIngredient(1, Material.COAL); - recipe.addIngredient(1, Material.WATER_BUCKET); - recipe.addIngredient(1, Material.LAVA_BUCKET); - recipe.getResult().setAmount(4); + ShapedRecipe recipe = getUtil().shaped(Material.BEDROCK, 4, "bedrock_recipe"); + recipe.shape("dod", "ono", "dod"); + recipe.setIngredient('d', Material.DIAMOND_BLOCK); + recipe.setIngredient('o', Material.OBSIDIAN); + recipe.setIngredient('n', Material.NETHERITE_BLOCK); getPlugin().getServer().addRecipe(recipe); } } diff --git a/src/main/java/io/github/paldiu/recipes/CobWebRecipe.java b/src/main/java/io/github/paldiu/recipes/CobWebRecipe.java new file mode 100644 index 0000000..d658437 --- /dev/null +++ b/src/main/java/io/github/paldiu/recipes/CobWebRecipe.java @@ -0,0 +1,17 @@ +package io.github.paldiu.recipes; + +import io.github.paldiu.Uncraftables; +import org.bukkit.Material; +import org.bukkit.inventory.ShapelessRecipe; + +public class CobWebRecipe extends Craftable { + public CobWebRecipe(Uncraftables plugin) { + super(plugin); + + if (!getConfigValues().cobWebEnabled()) return; + + ShapelessRecipe cobweb = getUtil().shapeless(Material.COBWEB, 2, "cobweb_recipe"); + cobweb.addIngredient(9, Material.STRING); + getPlugin().getServer().addRecipe(cobweb); + } +} diff --git a/src/main/java/io/github/paldiu/recipes/CryingObsidianRecipe.java b/src/main/java/io/github/paldiu/recipes/CryingObsidianRecipe.java index 46451bd..721ccd4 100644 --- a/src/main/java/io/github/paldiu/recipes/CryingObsidianRecipe.java +++ b/src/main/java/io/github/paldiu/recipes/CryingObsidianRecipe.java @@ -2,6 +2,7 @@ package io.github.paldiu.recipes; import io.github.paldiu.Uncraftables; import org.bukkit.Material; +import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapelessRecipe; public class CryingObsidianRecipe extends Craftable { @@ -10,10 +11,11 @@ public class CryingObsidianRecipe extends Craftable { if (!getConfigValues().cryingObsidianEnabled()) return; - ShapelessRecipe recipe = getUtil().shapeless(Material.CRYING_OBSIDIAN, "crying_obsidian_recipe"); - recipe.addIngredient(1, Material.OBSIDIAN); - recipe.addIngredient(4, Material.GHAST_TEAR); - recipe.getResult().setAmount(2); + ShapedRecipe recipe = getUtil().shaped(Material.CRYING_OBSIDIAN, 2, "crying_obsidian_recipe"); + recipe.shape("aga", "gog", "aga"); + recipe.setIngredient('a', Material.AIR); + recipe.setIngredient('o', Material.OBSIDIAN); + recipe.setIngredient('g', Material.GHAST_TEAR); getPlugin().getServer().addRecipe(recipe); } } diff --git a/src/main/java/io/github/paldiu/recipes/DragonEggRecipe.java b/src/main/java/io/github/paldiu/recipes/DragonEggRecipe.java index 55976bb..97823d5 100644 --- a/src/main/java/io/github/paldiu/recipes/DragonEggRecipe.java +++ b/src/main/java/io/github/paldiu/recipes/DragonEggRecipe.java @@ -13,7 +13,7 @@ public class DragonEggRecipe extends Craftable { ShapedRecipe recipe = getUtil().shaped(Material.DRAGON_EGG, "dragon_egg_recipe"); recipe.shape("obo", "beb", "obo"); - recipe.setIngredient('o', Material.OBSIDIAN); + recipe.setIngredient('o', Material.CRYING_OBSIDIAN); recipe.setIngredient('b', Material.DRAGON_BREATH); recipe.setIngredient('e', Material.DRAGON_HEAD); getPlugin().getServer().addRecipe(recipe); diff --git a/src/main/java/io/github/paldiu/recipes/EggRecipes.java b/src/main/java/io/github/paldiu/recipes/EggRecipes.java index e4cd8dc..d6b0ee9 100644 --- a/src/main/java/io/github/paldiu/recipes/EggRecipes.java +++ b/src/main/java/io/github/paldiu/recipes/EggRecipes.java @@ -2,8 +2,12 @@ package io.github.paldiu.recipes; import io.github.paldiu.Uncraftables; import org.bukkit.Material; +import org.bukkit.inventory.ItemFlag; +import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapelessRecipe; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.inventory.meta.SpawnEggMeta; public class EggRecipes extends Craftable { public EggRecipes(Uncraftables plugin) { @@ -31,6 +35,7 @@ public class EggRecipes extends Craftable { pandaEgg(); phantomEgg(); piglinEgg(); + piglinBruteEgg(); pillagerEgg(); polarBearEgg(); ravagerEgg(); @@ -79,7 +84,7 @@ public class EggRecipes extends Craftable { private void beeEgg() { ShapedRecipe beeEgg = getUtil().shaped(Material.BEE_SPAWN_EGG, "bee_egg_recipe"); - beeEgg.shape("aha","heh","aha"); + beeEgg.shape("aha", "heh", "aha"); beeEgg.setIngredient('a', Material.AIR); beeEgg.setIngredient('h', Material.HONEYCOMB); beeEgg.setIngredient('e', Material.EGG); @@ -88,7 +93,7 @@ public class EggRecipes extends Craftable { private void blazeEgg() { ShapedRecipe blazeEgg = getUtil().shaped(Material.BLAZE_SPAWN_EGG, "blaze_egg_recipe"); - blazeEgg.shape("sbs","beb","sbs"); + blazeEgg.shape("sbs", "beb", "sbs"); blazeEgg.setIngredient('s', Material.SOUL_SOIL); blazeEgg.setIngredient('b', Material.BLAZE_ROD); blazeEgg.setIngredient('e', Material.EGG); @@ -97,7 +102,7 @@ public class EggRecipes extends Craftable { private void caveSpiderEgg() { ShapedRecipe caveSpiderEgg = getUtil().shaped(Material.CAVE_SPIDER_SPAWN_EGG, "cave_spider_egg_recipe"); - caveSpiderEgg.shape("afa","ses","afa"); + caveSpiderEgg.shape("afa", "ses", "afa"); caveSpiderEgg.setIngredient('a', Material.AIR); caveSpiderEgg.setIngredient('f', Material.FERMENTED_SPIDER_EYE); caveSpiderEgg.setIngredient('s', Material.SPIDER_EYE); @@ -107,7 +112,7 @@ public class EggRecipes extends Craftable { private void creeperEgg() { ShapedRecipe creeperEgg = getUtil().shaped(Material.CREEPER_SPAWN_EGG, "creeper_egg_recipe"); - creeperEgg.shape("aga","geg","aga"); + creeperEgg.shape("aga", "geg", "aga"); creeperEgg.setIngredient('a', Material.AIR); creeperEgg.setIngredient('g', Material.GUNPOWDER); creeperEgg.setIngredient('e', Material.EGG); @@ -116,37 +121,43 @@ public class EggRecipes extends Craftable { private void dolphinEgg() { ShapedRecipe dolphin = getUtil().shaped(Material.DOLPHIN_SPAWN_EGG, "dolphin_egg_recipe"); - dolphin.shape("aca","wew","aca"); + dolphin.shape("aca", "wew", "aca"); dolphin.setIngredient('a', Material.AIR); dolphin.setIngredient('w', Material.WATER_BUCKET); - dolphin.setIngredient('c', Material.COD); + dolphin.setIngredient('c', Material.TROPICAL_FISH); dolphin.setIngredient('e', Material.EGG); getPlugin().getServer().addRecipe(dolphin); } private void drownedEgg() { ShapedRecipe drowned = getUtil().shaped(Material.DROWNED_SPAWN_EGG, "drowned_egg_recipe"); - drowned.shape("awa","fef","awa"); + drowned.shape("awa", "fef", "awa"); drowned.setIngredient('a', Material.AIR); drowned.setIngredient('w', Material.WATER_BUCKET); - drowned.setIngredient('f', Material.FISHING_ROD); + drowned.setIngredient('f', Material.KELP); drowned.setIngredient('e', Material.ZOMBIE_SPAWN_EGG); getPlugin().getServer().addRecipe(drowned); } private void elderGuardEgg() { ShapedRecipe eldGuard = getUtil().shaped(Material.ELDER_GUARDIAN_SPAWN_EGG, "elder_guardian_egg_recipe"); - eldGuard.shape("apa","ses","apa"); - eldGuard.setIngredient('a', Material.AIR); + eldGuard.shape( + "sbs", + "pep", + "sps"); + eldGuard.setIngredient('s', Material.PRISMARINE_CRYSTALS); eldGuard.setIngredient('p', Material.PRISMARINE_SHARD); eldGuard.setIngredient('e', Material.GUARDIAN_SPAWN_EGG); - eldGuard.setIngredient('s', Material.SPONGE); + eldGuard.setIngredient('b', Material.BEACON); getPlugin().getServer().addRecipe(eldGuard); } private void endermanEgg() { ShapedRecipe enderman = getUtil().shaped(Material.ENDERMAN_SPAWN_EGG, "enderman_egg_recipe"); - enderman.shape("apa","pep","apa"); + enderman.shape( + "apa", + "pep", + "apa"); enderman.setIngredient('a', Material.AIR); enderman.setIngredient('p', Material.ENDER_PEARL); enderman.setIngredient('e', Material.EGG); @@ -155,7 +166,7 @@ public class EggRecipes extends Craftable { private void endermiteEgg() { ShapedRecipe endermite = getUtil().shaped(Material.ENDERMITE_SPAWN_EGG, "endermite_egg_recipe"); - endermite.shape("apa","cec","apa"); + endermite.shape("apa", "cec", "apa"); endermite.setIngredient('a', Material.AIR); endermite.setIngredient('p', Material.ENDER_PEARL); endermite.setIngredient('c', Material.CHORUS_FRUIT); @@ -165,7 +176,7 @@ public class EggRecipes extends Craftable { private void evokerEgg() { ShapedRecipe evoker = getUtil().shaped(Material.EVOKER_SPAWN_EGG, "evoker_egg_recipe"); - evoker.shape("ata","eve","ata"); + evoker.shape("ata", "eve", "ata"); evoker.setIngredient('a', Material.AIR); evoker.setIngredient('t', Material.TOTEM_OF_UNDYING); evoker.setIngredient('e', Material.EMERALD); @@ -175,7 +186,7 @@ public class EggRecipes extends Craftable { private void foxEgg() { ShapedRecipe fox = getUtil().shaped(Material.FOX_SPAWN_EGG, "fox_egg_recipe"); - fox.shape("asa","ses","asa"); + fox.shape("asa", "ses", "asa"); fox.setIngredient('a', Material.AIR); fox.setIngredient('s', Material.SWEET_BERRIES); fox.setIngredient('e', Material.EGG); @@ -184,7 +195,7 @@ public class EggRecipes extends Craftable { private void ghastEgg() { ShapedRecipe ghast = getUtil().shaped(Material.GHAST_SPAWN_EGG, "ghast_egg_recipe"); - ghast.shape("sts","geg","sts"); + ghast.shape("sts", "geg", "sts"); ghast.setIngredient('s', Material.SOUL_SOIL); ghast.setIngredient('t', Material.GHAST_TEAR); ghast.setIngredient('g', Material.GUNPOWDER); @@ -194,7 +205,7 @@ public class EggRecipes extends Craftable { private void guardianEgg() { ShapedRecipe guardian = getUtil().shaped(Material.GUARDIAN_SPAWN_EGG, "guardian_egg_recipe"); - guardian.shape("apa","pep","apa"); + guardian.shape("apa", "pep", "apa"); guardian.setIngredient('a', Material.AIR); guardian.setIngredient('p', Material.PRISMARINE_SHARD); guardian.setIngredient('e', Material.EGG); @@ -203,7 +214,7 @@ public class EggRecipes extends Craftable { private void hoglinEgg() { ShapedRecipe hoglin = getUtil().shaped(Material.HOGLIN_SPAWN_EGG, "hoglin_egg_recipe"); - hoglin.shape("sls","pep","sls"); + hoglin.shape("sls", "pep", "sls"); hoglin.setIngredient('s', Material.SOUL_SOIL); hoglin.setIngredient('p', Material.PORKCHOP); hoglin.setIngredient('l', Material.LEATHER); @@ -213,19 +224,19 @@ public class EggRecipes extends Craftable { private void huskEgg() { ShapedRecipe husk = getUtil().shaped(Material.HUSK_SPAWN_EGG, "husk_egg_recipe"); - husk.shape("asa","rer","asa"); + husk.shape("asa", "ses", "asa"); husk.setIngredient('a', Material.AIR); husk.setIngredient('s', Material.SAND); husk.setIngredient('e', Material.ZOMBIE_SPAWN_EGG); - husk.setIngredient('r', Material.ROTTEN_FLESH); getPlugin().getServer().addRecipe(husk); } private void llamaEgg() { ShapedRecipe llama = getUtil().shaped(Material.LLAMA_SPAWN_EGG, "llama_egg_recipe"); - llama.shape("aca","lel","aca"); + llama.shape("aca", "lel", "ana"); llama.setIngredient('a', Material.AIR); llama.setIngredient('c', Material.WHITE_CARPET); + llama.setIngredient('n', Material.IRON_NUGGET); llama.setIngredient('e', Material.EGG); llama.setIngredient('l', Material.LEATHER); getPlugin().getServer().addRecipe(llama); @@ -233,16 +244,16 @@ public class EggRecipes extends Craftable { private void magmaCubeEgg() { ShapedRecipe magma_cube = getUtil().shaped(Material.MAGMA_CUBE_SPAWN_EGG, "magma_cube_egg_recipe"); - magma_cube.shape("scs","cec","scs"); + magma_cube.shape("scs", "cec", "scs"); magma_cube.setIngredient('s', Material.SOUL_SOIL); magma_cube.setIngredient('c', Material.MAGMA_CREAM); - magma_cube.setIngredient('e', Material.EGG); + magma_cube.setIngredient('e', Material.SLIME_SPAWN_EGG); getPlugin().getServer().addRecipe(magma_cube); } private void pandaEgg() { ShapedRecipe panda = getUtil().shaped(Material.PANDA_SPAWN_EGG, "panda_egg_recipe"); - panda.shape("aba","beb","aba"); + panda.shape("aba", "beb", "aba"); panda.setIngredient('a', Material.AIR); panda.setIngredient('b', Material.BAMBOO); panda.setIngredient('e', Material.EGG); @@ -251,7 +262,7 @@ public class EggRecipes extends Craftable { private void phantomEgg() { ShapedRecipe phantom = getUtil().shaped(Material.PHANTOM_SPAWN_EGG, "phantom_egg_recipe"); - phantom.shape("ama","mem","ama"); + phantom.shape("ama", "mem", "ama"); phantom.setIngredient('a', Material.AIR); phantom.setIngredient('m', Material.PHANTOM_MEMBRANE); phantom.setIngredient('e', Material.EGG); @@ -260,7 +271,7 @@ public class EggRecipes extends Craftable { private void piglinEgg() { ShapedRecipe piglin = getUtil().shaped(Material.PIGLIN_SPAWN_EGG, "piglin_egg_recipe"); - piglin.shape("sgs","nen","sgs"); + piglin.shape("sgs", "nen", "sgs"); piglin.setIngredient('s', Material.SOUL_SOIL); piglin.setIngredient('n', Material.GOLD_NUGGET); piglin.setIngredient('g', Material.GOLD_INGOT); @@ -268,19 +279,30 @@ public class EggRecipes extends Craftable { getPlugin().getServer().addRecipe(piglin); } + private void piglinBruteEgg() { + ShapedRecipe piglin_brute = getUtil().shaped(Material.PIGLIN_BRUTE_SPAWN_EGG, "piglin_brute_egg_recipe"); + piglin_brute.shape("sgs", "ael", "sgs"); + piglin_brute.setIngredient('s', Material.SOUL_SOIL); + piglin_brute.setIngredient('a', Material.GOLDEN_AXE); + piglin_brute.setIngredient('l', Material.LEATHER); + piglin_brute.setIngredient('g', Material.GOLD_INGOT); + piglin_brute.setIngredient('e', Material.PIGLIN_SPAWN_EGG); + } + private void pillagerEgg() { ShapedRecipe pillager = getUtil().shaped(Material.PILLAGER_SPAWN_EGG, "pillager_egg_recipe"); - pillager.shape("aca","*e*","aca"); + pillager.shape("aca", "wew", "ada"); pillager.setIngredient('a', Material.AIR); pillager.setIngredient('c', Material.CROSSBOW); - pillager.setIngredient('*', Material.ARROW); + pillager.setIngredient('d', Material.EMERALD); + pillager.setIngredient('w', Material.ARROW); pillager.setIngredient('e', Material.VILLAGER_SPAWN_EGG); getPlugin().getServer().addRecipe(pillager); } private void polarBearEgg() { ShapedRecipe polar_bear = getUtil().shaped(Material.POLAR_BEAR_SPAWN_EGG, "polar_bear_egg_recipe"); - polar_bear.shape("aca","ses","aca"); + polar_bear.shape("aca", "ses", "aca"); polar_bear.setIngredient('a', Material.AIR); polar_bear.setIngredient('c', Material.COD); polar_bear.setIngredient('e', Material.EGG); @@ -290,26 +312,27 @@ public class EggRecipes extends Craftable { private void ravagerEgg() { ShapedRecipe ravager = getUtil().shaped(Material.RAVAGER_SPAWN_EGG, "ravager_egg_recipe"); - ravager.shape("asa","ses","asa"); + ravager.shape("asa", "ded", "ada"); ravager.setIngredient('a', Material.AIR); ravager.setIngredient('s', Material.SADDLE); + ravager.setIngredient('d', Material.EMERALD); ravager.setIngredient('e', Material.HOGLIN_SPAWN_EGG); getPlugin().getServer().addRecipe(ravager); } private void shulkerEgg() { ShapedRecipe shulker = getUtil().shaped(Material.SHULKER_SPAWN_EGG, "shulker_egg_recipe"); - shulker.shape("scs","beb","scs"); + shulker.shape("scs", "beb", "scs"); shulker.setIngredient('s', Material.END_STONE); - shulker.setIngredient('c', Material.CHORUS_FRUIT); - shulker.setIngredient('b', Material.SHULKER_SHELL); + shulker.setIngredient('b', Material.CHORUS_FRUIT); + shulker.setIngredient('c', Material.SHULKER_SHELL); shulker.setIngredient('e', Material.EGG); getPlugin().getServer().addRecipe(shulker); } private void silverfishEgg() { ShapedRecipe silverfish = getUtil().shaped(Material.SILVERFISH_SPAWN_EGG, "silverfish_egg_recipe"); - silverfish.shape("asa","cec","asa"); + silverfish.shape("asa", "cec", "asa"); silverfish.setIngredient('a', Material.AIR); silverfish.setIngredient('s', Material.STONE_BRICKS); silverfish.setIngredient('c', Material.CHISELED_STONE_BRICKS); @@ -319,16 +342,18 @@ public class EggRecipes extends Craftable { private void skeletonEgg() { ShapedRecipe skeleton = getUtil().shaped(Material.SKELETON_SPAWN_EGG, "skeleton_egg_recipe"); - skeleton.shape("aba","beb","aba"); + skeleton.shape("asa", "bex", "aba"); skeleton.setIngredient('a', Material.AIR); skeleton.setIngredient('b', Material.BONE); + skeleton.setIngredient('x', Material.BOW); + skeleton.setIngredient('s', Material.SKELETON_SKULL); skeleton.setIngredient('e', Material.EGG); getPlugin().getServer().addRecipe(skeleton); } private void slimeEgg() { ShapedRecipe slime = getUtil().shaped(Material.SLIME_SPAWN_EGG, "slime_egg_recipe"); - slime.shape("asa","ses","asa"); + slime.shape("asa", "ses", "asa"); slime.setIngredient('a', Material.AIR); slime.setIngredient('s', Material.SLIME_BALL); slime.setIngredient('e', Material.EGG); @@ -337,7 +362,7 @@ public class EggRecipes extends Craftable { private void spiderEgg() { ShapedRecipe spider = getUtil().shaped(Material.SPIDER_SPAWN_EGG, "spider_egg_recipe"); - spider.shape("aia","ses","aia"); + spider.shape("aia", "ses", "aia"); spider.setIngredient('a', Material.AIR); spider.setIngredient('i', Material.SPIDER_EYE); spider.setIngredient('s', Material.STRING); @@ -347,17 +372,17 @@ public class EggRecipes extends Craftable { private void strayEgg() { ShapedRecipe stray = getUtil().shaped(Material.STRAY_SPAWN_EGG, "stray_egg_recipe"); - stray.shape("asa","iei","asa"); + stray.shape("asa", "iei", "asa"); stray.setIngredient('a', Material.AIR); - stray.setIngredient('s', Material.SNOWBALL); + stray.setIngredient('s', Material.BLUE_ICE); stray.setIngredient('e', Material.SKELETON_SPAWN_EGG); - stray.setIngredient('i', Material.ICE); + stray.setIngredient('i', Material.PACKED_ICE); getPlugin().getServer().addRecipe(stray); } private void striderEgg() { ShapedRecipe strider = getUtil().shaped(Material.STRIDER_SPAWN_EGG, "strider_egg_recipe"); - strider.shape("sls","lel","sls"); + strider.shape("sls", "lel", "sls"); strider.setIngredient('s', Material.SOUL_SOIL); strider.setIngredient('l', Material.LAVA_BUCKET); strider.setIngredient('e', Material.EGG); @@ -366,7 +391,7 @@ public class EggRecipes extends Craftable { private void vexEgg() { ShapedRecipe vex = getUtil().shaped(Material.VEX_SPAWN_EGG, "vex_egg_recipe"); - vex.shape("afa","fef","afa"); + vex.shape("afa", "fef", "afa"); vex.setIngredient('a', Material.AIR); vex.setIngredient('f', Material.FEATHER); vex.setIngredient('e', Material.EVOKER_SPAWN_EGG); @@ -375,7 +400,7 @@ public class EggRecipes extends Craftable { private void vindicatorEgg() { ShapedRecipe vindicator = getUtil().shaped(Material.VINDICATOR_SPAWN_EGG, "vindicator_egg_recipe"); - vindicator.shape("axa","*e*","axa"); + vindicator.shape("a*a", "*ex", "a*a"); vindicator.setIngredient('a', Material.AIR); vindicator.setIngredient('x', Material.IRON_AXE); vindicator.setIngredient('e', Material.PILLAGER_SPAWN_EGG); @@ -385,17 +410,17 @@ public class EggRecipes extends Craftable { private void witchEgg() { ShapedRecipe witch = getUtil().shaped(Material.WITCH_SPAWN_EGG, "witch_egg_recipe"); - witch.shape("apa","ses","apa"); + witch.shape("asa", "pep", "asa"); witch.setIngredient('a', Material.AIR); witch.setIngredient('p', Material.SPLASH_POTION); - witch.setIngredient('s', Material.STICK); + witch.setIngredient('s', Material.VINE); witch.setIngredient('e', Material.EGG); getPlugin().getServer().addRecipe(witch); } private void witherSkeletonEgg() { ShapedRecipe wither_skeleton = getUtil().shaped(Material.WITHER_SKELETON_SPAWN_EGG, "wither_skeleton_egg_recipe"); - wither_skeleton.shape("scs","cec","scs"); + wither_skeleton.shape("scs", "cec", "scs"); wither_skeleton.setIngredient('s', Material.SOUL_SOIL); wither_skeleton.setIngredient('c', Material.COAL); wither_skeleton.setIngredient('e', Material.SKELETON_SPAWN_EGG); @@ -404,7 +429,7 @@ public class EggRecipes extends Craftable { private void wolfEgg() { ShapedRecipe wolf = getUtil().shaped(Material.WOLF_SPAWN_EGG, "wolf_egg_recipe"); - wolf.shape("aba","nen","aba"); + wolf.shape("aba", "nen", "aba"); wolf.setIngredient('a', Material.AIR); wolf.setIngredient('b', Material.BONE); wolf.setIngredient('n', Material.NAME_TAG); @@ -414,7 +439,7 @@ public class EggRecipes extends Craftable { private void zoglinEgg() { ShapedRecipe zoglin = getUtil().shaped(Material.ZOGLIN_SPAWN_EGG, "zoglin_egg_recipe"); - zoglin.shape("srs","rer","srs"); + zoglin.shape("srs", "rer", "srs"); zoglin.setIngredient('s', Material.SOUL_SOIL); zoglin.setIngredient('r', Material.ROTTEN_FLESH); zoglin.setIngredient('e', Material.HOGLIN_SPAWN_EGG); @@ -423,7 +448,7 @@ public class EggRecipes extends Craftable { private void zombieEgg() { ShapedRecipe zombie = getUtil().shaped(Material.ZOMBIE_SPAWN_EGG, "zombie_egg_recipe"); - zombie.shape("ara","rer","ara"); + zombie.shape("ara", "rer", "ara"); zombie.setIngredient('a', Material.AIR); zombie.setIngredient('r', Material.ROTTEN_FLESH); zombie.setIngredient('e', Material.EGG); @@ -432,7 +457,7 @@ public class EggRecipes extends Craftable { private void zombieVillagerEgg() { ShapedRecipe zombie_villager = getUtil().shaped(Material.ZOMBIE_VILLAGER_SPAWN_EGG, "z_villager_egg_recipe"); - zombie_villager.shape("ara","rer","ara"); + zombie_villager.shape("ara", "rer", "ara"); zombie_villager.setIngredient('a', Material.AIR); zombie_villager.setIngredient('r', Material.ROTTEN_FLESH); zombie_villager.setIngredient('e', Material.VILLAGER_SPAWN_EGG); @@ -441,7 +466,7 @@ public class EggRecipes extends Craftable { private void zPiglinEgg() { ShapedRecipe zombie_piglin = getUtil().shaped(Material.ZOMBIFIED_PIGLIN_SPAWN_EGG, "z_piglin_egg_recipe"); - zombie_piglin.shape("srs","rer","srs"); + zombie_piglin.shape("srs", "rer", "srs"); zombie_piglin.setIngredient('s', Material.SOUL_SOIL); zombie_piglin.setIngredient('r', Material.ROTTEN_FLESH); zombie_piglin.setIngredient('e', Material.PIGLIN_SPAWN_EGG); @@ -452,7 +477,7 @@ public class EggRecipes extends Craftable { private void batEgg() { ShapedRecipe bat = getUtil().shaped(Material.BAT_SPAWN_EGG, "bat_egg_recipe"); - bat.shape("aba","fef","aba"); + bat.shape("aba", "fef", "aba"); bat.setIngredient('a', Material.AIR); bat.setIngredient('b', Material.APPLE); bat.setIngredient('e', Material.CHICKEN_SPAWN_EGG); @@ -462,7 +487,7 @@ public class EggRecipes extends Craftable { private void catEgg() { ShapedRecipe cat = getUtil().shaped(Material.CAT_SPAWN_EGG, "cat_egg_recipe"); - cat.shape("aca","ses","aca"); + cat.shape("aca", "ses", "aca"); cat.setIngredient('a', Material.AIR); cat.setIngredient('c', Material.COD); cat.setIngredient('s', Material.SALMON); @@ -472,7 +497,7 @@ public class EggRecipes extends Craftable { private void chickenEgg() { ShapedRecipe chimken = getUtil().shaped(Material.CHICKEN_SPAWN_EGG, "chicken_egg_recipe"); - chimken.shape("afa","fef","afa"); + chimken.shape("afa", "fef", "afa"); chimken.setIngredient('a', Material.AIR); chimken.setIngredient('f', Material.FEATHER); chimken.setIngredient('e', Material.EGG); @@ -481,7 +506,7 @@ public class EggRecipes extends Craftable { private void codEgg() { ShapedRecipe cod = getUtil().shaped(Material.COD_SPAWN_EGG, "cod_egg_recipe"); - cod.shape("aca","cec","aca"); + cod.shape("aca", "cec", "aca"); cod.setIngredient('a', Material.AIR); cod.setIngredient('c', Material.COD); cod.setIngredient('e', Material.EGG); @@ -490,7 +515,7 @@ public class EggRecipes extends Craftable { private void cowEgg() { ShapedRecipe coo = getUtil().shaped(Material.COW_SPAWN_EGG, "cow_egg_recipe"); - coo.shape("ala","lel","ala"); + coo.shape("ala", "lel", "ala"); coo.setIngredient('a', Material.AIR); coo.setIngredient('l', Material.LEATHER); coo.setIngredient('e', Material.EGG); @@ -505,7 +530,7 @@ public class EggRecipes extends Craftable { private void horseEgg() { ShapedRecipe hoarse = getUtil().shaped(Material.HORSE_SPAWN_EGG, "horse_egg_recipe"); - hoarse.shape("asa","lel","ala"); + hoarse.shape("asa", "lel", "ala"); hoarse.setIngredient('a', Material.AIR); hoarse.setIngredient('s', Material.SADDLE); hoarse.setIngredient('e', Material.EGG); @@ -515,7 +540,7 @@ public class EggRecipes extends Craftable { private void mooshroomEgg() { ShapedRecipe coo_pat = getUtil().shaped(Material.MOOSHROOM_SPAWN_EGG, "mooshroom_egg_recipe"); - coo_pat.shape("ara","rer","ara"); + coo_pat.shape("ara", "rer", "ara"); coo_pat.setIngredient('a', Material.AIR); coo_pat.setIngredient('r', Material.RED_MUSHROOM); coo_pat.setIngredient('e', Material.COW_SPAWN_EGG); @@ -531,7 +556,7 @@ public class EggRecipes extends Craftable { private void ocelotEgg() { ShapedRecipe ocky_way = getUtil().shaped(Material.OCELOT_SPAWN_EGG, "ocelot_egg_recipe"); - ocky_way.shape("aca","ses","aca"); + ocky_way.shape("aca", "ses", "aca"); ocky_way.setIngredient('a', Material.AIR); ocky_way.setIngredient('c', Material.COCOA_BEANS); ocky_way.setIngredient('s', Material.SALMON); @@ -541,7 +566,7 @@ public class EggRecipes extends Craftable { private void parrotEgg() { ShapedRecipe garrote = getUtil().shaped(Material.PARROT_SPAWN_EGG, "parrot_egg_recipe"); - garrote.shape("asa","fef","asa"); + garrote.shape("asa", "fef", "asa"); garrote.setIngredient('a', Material.AIR); garrote.setIngredient('s', Material.WHEAT_SEEDS); garrote.setIngredient('f', Material.FEATHER); @@ -551,7 +576,7 @@ public class EggRecipes extends Craftable { private void pigEgg() { ShapedRecipe pidge = getUtil().shaped(Material.PIG_SPAWN_EGG, "pig_egg_recipe"); - pidge.shape("aca","cec","aca"); + pidge.shape("aca", "cec", "aca"); pidge.setIngredient('a', Material.AIR); pidge.setIngredient('c', Material.PORKCHOP); pidge.setIngredient('e', Material.EGG); @@ -560,7 +585,7 @@ public class EggRecipes extends Craftable { private void pufferfishEgg() { ShapedRecipe paisson = getUtil().shaped(Material.PUFFERFISH_SPAWN_EGG, "pufferfish_egg_recipe"); - paisson.shape("apa","pep","apa"); + paisson.shape("apa", "pep", "apa"); paisson.setIngredient('a', Material.AIR); paisson.setIngredient('p', Material.PUFFERFISH); paisson.setIngredient('e', Material.EGG); @@ -569,7 +594,7 @@ public class EggRecipes extends Craftable { private void rabbitEgg() { ShapedRecipe rebillet = getUtil().shaped(Material.RABBIT_SPAWN_EGG, "rabbit_egg_recipe"); - rebillet.shape("aha","heh","afa"); + rebillet.shape("aha", "heh", "afa"); rebillet.setIngredient('a', Material.AIR); rebillet.setIngredient('h', Material.RABBIT_HIDE); rebillet.setIngredient('e', Material.EGG); @@ -579,7 +604,7 @@ public class EggRecipes extends Craftable { private void salmonEgg() { ShapedRecipe slammin_salmon = getUtil().shaped(Material.SALMON_SPAWN_EGG, "salmon_egg_recipe"); - slammin_salmon.shape("asa","ses","asa"); + slammin_salmon.shape("asa", "ses", "asa"); slammin_salmon.setIngredient('a', Material.AIR); slammin_salmon.setIngredient('s', Material.SALMON); slammin_salmon.setIngredient('e', Material.EGG); @@ -588,7 +613,7 @@ public class EggRecipes extends Craftable { private void sheepEgg() { ShapedRecipe haggis = getUtil().shaped(Material.SHEEP_SPAWN_EGG, "sheep_egg_recipe"); - haggis.shape("awa","mem","awa"); + haggis.shape("awa", "mem", "awa"); haggis.setIngredient('a', Material.AIR); haggis.setIngredient('w', Material.WHITE_WOOL); haggis.setIngredient('m', Material.MUTTON); @@ -605,7 +630,7 @@ public class EggRecipes extends Craftable { private void squidEgg() { ShapedRecipe squidge = getUtil().shaped(Material.SQUID_SPAWN_EGG, "squid_egg_recipe"); - squidge.shape("aia","iei","aia"); + squidge.shape("aia", "iei", "aia"); squidge.setIngredient('a', Material.AIR); squidge.setIngredient('i', Material.INK_SAC); squidge.setIngredient('e', Material.EGG); @@ -631,7 +656,7 @@ public class EggRecipes extends Craftable { private void turtleEgg() { ShapedRecipe tortuga = getUtil().shaped(Material.TURTLE_SPAWN_EGG, "turtle_egg_recipe"); - tortuga.shape("asa","ses","asa"); + tortuga.shape("asa", "ses", "asa"); tortuga.setIngredient('a', Material.AIR); tortuga.setIngredient('s', Material.SCUTE); tortuga.setIngredient('e', Material.EGG); @@ -640,7 +665,7 @@ public class EggRecipes extends Craftable { private void villagerEgg() { ShapedRecipe moron = getUtil().shaped(Material.VILLAGER_SPAWN_EGG, "villager_egg_recipe"); - moron.shape("aea","p*p","aea"); + moron.shape("aea", "p*p", "aea"); moron.setIngredient('a', Material.AIR); moron.setIngredient('e', Material.EGG); moron.setIngredient('p', Material.POPPY); @@ -650,7 +675,7 @@ public class EggRecipes extends Craftable { private void traderEgg() { ShapedRecipe dinkhead = getUtil().shaped(Material.WANDERING_TRADER_SPAWN_EGG, "trader_egg_recipe"); - dinkhead.shape("aea","e*e","aea"); + dinkhead.shape("aea", "e*e", "aea"); dinkhead.setIngredient('a', Material.AIR); dinkhead.setIngredient('e', Material.EMERALD); dinkhead.setIngredient('*', Material.VILLAGER_SPAWN_EGG); diff --git a/src/main/java/io/github/paldiu/recipes/NetherStarRecipe.java b/src/main/java/io/github/paldiu/recipes/NetherStarRecipe.java index 762879d..5fc6ae9 100644 --- a/src/main/java/io/github/paldiu/recipes/NetherStarRecipe.java +++ b/src/main/java/io/github/paldiu/recipes/NetherStarRecipe.java @@ -10,13 +10,13 @@ public class NetherStarRecipe extends Craftable { if (!getConfigValues().netherStarEnabled()) return; - ShapedRecipe recipe = getUtil().shaped(Material.NETHER_STAR, "nether_star_recipe"); - recipe.shape("nwn","sss","bqb"); - recipe.setIngredient('n', Material.NETHER_WART); - recipe.setIngredient('w', Material.WITHER_SKELETON_SKULL); - recipe.setIngredient('s', Material.SOUL_SAND); - recipe.setIngredient('b', Material.BLAZE_ROD); - recipe.setIngredient('q', Material.QUARTZ); - getPlugin().getServer().addRecipe(recipe); + ShapedRecipe nether_star = getUtil().shaped(Material.NETHER_STAR, "nether_star_recipe"); + nether_star.shape("nwn","sss","bqb"); + nether_star.setIngredient('n', Material.NETHER_WART); + nether_star.setIngredient('w', Material.WITHER_SKELETON_SKULL); + nether_star.setIngredient('s', Material.SOUL_SAND); + nether_star.setIngredient('b', Material.BLAZE_ROD); + nether_star.setIngredient('q', Material.QUARTZ); + getPlugin().getServer().addRecipe(nether_star); } } diff --git a/src/main/java/io/github/paldiu/recipes/NetherWartRecipe.java b/src/main/java/io/github/paldiu/recipes/NetherWartRecipe.java index 6496283..3bda6d9 100644 --- a/src/main/java/io/github/paldiu/recipes/NetherWartRecipe.java +++ b/src/main/java/io/github/paldiu/recipes/NetherWartRecipe.java @@ -10,9 +10,8 @@ public class NetherWartRecipe extends Craftable { if (!getConfigValues().netherWartEnabled()) return; - ShapelessRecipe recipe = getUtil().shapeless(Material.NETHER_WART, "netherwart_recipe"); - recipe.addIngredient(1, Material.NETHER_WART_BLOCK); - recipe.getResult().setAmount(9); - getPlugin().getServer().addRecipe(recipe); + ShapelessRecipe netherwart = getUtil().shapeless(Material.NETHER_WART, 9, "netherwart_recipe"); + netherwart.addIngredient(1, Material.NETHER_WART_BLOCK); + getPlugin().getServer().addRecipe(netherwart); } } diff --git a/src/main/java/io/github/paldiu/recipes/PhantomMembraneRecipe.java b/src/main/java/io/github/paldiu/recipes/PhantomMembraneRecipe.java new file mode 100644 index 0000000..9f0d457 --- /dev/null +++ b/src/main/java/io/github/paldiu/recipes/PhantomMembraneRecipe.java @@ -0,0 +1,20 @@ +package io.github.paldiu.recipes; + +import io.github.paldiu.Uncraftables; +import org.bukkit.Material; +import org.bukkit.inventory.ShapedRecipe; + +public class PhantomMembraneRecipe extends Craftable{ + public PhantomMembraneRecipe(Uncraftables plugin) { + super(plugin); + + if (!getConfigValues().membraneEnabled()) return; + + ShapedRecipe membrane = getUtil().shaped(Material.PHANTOM_MEMBRANE, "membrane_recipe"); + membrane.shape("sfs", "frf", "sfs"); + membrane.setIngredient('s', Material.SLIME_BALL); + membrane.setIngredient('f', Material.FEATHER); + membrane.setIngredient('r', Material.FIREWORK_STAR); + getPlugin().getServer().addRecipe(membrane); + } +} diff --git a/src/main/java/io/github/paldiu/recipes/WitherSkullRecipe.java b/src/main/java/io/github/paldiu/recipes/WitherSkullRecipe.java new file mode 100644 index 0000000..e560542 --- /dev/null +++ b/src/main/java/io/github/paldiu/recipes/WitherSkullRecipe.java @@ -0,0 +1,21 @@ +package io.github.paldiu.recipes; + +import io.github.paldiu.Uncraftables; +import org.bukkit.Material; +import org.bukkit.inventory.ShapedRecipe; + +public class WitherSkullRecipe extends Craftable { + + public WitherSkullRecipe(Uncraftables plugin) { + super(plugin); + + if (!getConfigValues().witherSkullEnabled()) return; + + ShapedRecipe recipe = getUtil().shaped(Material.WITHER_SKELETON_SKULL, "wither_skull_recipe"); + recipe.shape("scs", "coc", "scs"); + recipe.setIngredient('s', Material.SOUL_SOIL); + recipe.setIngredient('c', Material.COAL); + recipe.setIngredient('o', Material.SKELETON_SKULL); + getPlugin().getServer().addRecipe(recipe); + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 83bb814..7836a3d 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,12 +1,14 @@ barrier: true bedrock: true bell: true +cobweb: true crying_obsidian: true dragon_egg: true eggs: true elytra: true end_frame: true horse_armor: true +membrane: true music_discs: true name_tag: true nether_star: true @@ -14,4 +16,5 @@ nether_wart: true saddle: true spawner: true totem: true -trident: true \ No newline at end of file +trident: true +wither_skull: true \ No newline at end of file