diff --git a/README.md b/README.md index aa7d9b0..fb8e82a 100755 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ TO RELEASE: ignorevote command TO RELEASE: waterbottle + sponge = empty bottle -> Warum nochmal? TO RELEASE: Autocrafter TO RELEASE: jukeboxes können mit Redstone gesteuert werden + crafted music -TO RELEASE: Squids won't spawn \ No newline at end of file +TO RELEASE: Squids won't spawn + GLOWSTONE DUST für Rahmen \ No newline at end of file diff --git a/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 23ef873..267f4c4 100644 Binary files a/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log b/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log index 537b428..9cdd84f 100644 --- a/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log +++ b/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log @@ -1,2 +1,2 @@ Command: /opt/homebrew/Cellar/openjdk/23.0.2/libexec/openjdk.jdk/Contents/Home/bin/java -Xmx1G -classpath /Users/janik/.gradle/caches/modules-2/files-2.1/net.fabricmc/tiny-remapper/0.11.1/6c1f29838864ba8f495855edfc8ef17706fedb5d/tiny-remapper-0.11.1-fat.jar net.fabricmc.tinyremapper.Main /Users/janik/Desktop/MCPlugins/environmentex-1.0-SNAPSHOT.jar /Users/janik/Desktop/MCPlugins/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar /Users/janik/Desktop/MCPlugins/environmentex/.gradle/caches/paperweight/taskCache/reobfMappings.tiny mojang spigot /Users/janik/Desktop/MCPlugins/environmentex/.gradle/caches/paperweight/taskCache/mappedServerJar.jar --threads=1 -[INFO] Finished after 844,07 ms. +[INFO] Finished after 1350,93 ms. diff --git a/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar b/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar index 95c8d43..eafdd0f 100644 Binary files a/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar and b/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar differ diff --git a/environmentex/build/tmp/compileJava/previous-compilation-data.bin b/environmentex/build/tmp/compileJava/previous-compilation-data.bin index f46eb38..d780927 100644 Binary files a/environmentex/build/tmp/compileJava/previous-compilation-data.bin and b/environmentex/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/environmentex/src/main/java/de/hessj/environmentex/SquidPrevention.java b/environmentex/src/main/java/de/hessj/environmentex/SquidPrevention.java index 1108301..c352d96 100644 --- a/environmentex/src/main/java/de/hessj/environmentex/SquidPrevention.java +++ b/environmentex/src/main/java/de/hessj/environmentex/SquidPrevention.java @@ -30,6 +30,10 @@ public class SquidPrevention implements Listener { sr.getResult().getType() == Material.WRITABLE_BOOK) { it.remove(); // remove the default Book and Quill recipe } + if (recipe instanceof ShapelessRecipe sr && + sr.getResult().getType() == Material.GLOW_ITEM_FRAME) { + it.remove(); // remove the default Book and Quill recipe + } } } @@ -57,5 +61,16 @@ public class SquidPrevention implements Listener { Bukkit.addRecipe(blackcustomRecipe); + ItemStack glow_frame = new ItemStack(Material.GLOW_ITEM_FRAME); + + ShapelessRecipe glow_framecustomRecipe = new ShapelessRecipe( + new NamespacedKey("environmentex", "custom_glow_frame"), + glow_frame); + + glow_framecustomRecipe.addIngredient(Material.GLOWSTONE_DUST); + glow_framecustomRecipe.addIngredient(Material.ITEM_FRAME); + + Bukkit.addRecipe(glow_framecustomRecipe); + } }