diff --git a/.DS_Store b/.DS_Store index 12499a0..344e744 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/README.md b/README.md index 38888da..aa7d9b0 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -gradle wrapper -./gradlew clean build +./rebuild.sh after git clone! Open the Command Palette: Cmd+Shift+P • Developer: reload window @@ -13,4 +12,5 @@ IDEA: schere verschiedene versionen pferde/mule/cats/schafe/Axolotl/tropical etc 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 \ No newline at end of file +TO RELEASE: jukeboxes können mit Redstone gesteuert werden + crafted music +TO RELEASE: Squids won't spawn \ No newline at end of file diff --git a/betterhoppers/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/betterhoppers/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4e71169..890aaea 100644 Binary files a/betterhoppers/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/betterhoppers/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/betterhoppers/.gradle/buildOutputCleanup/cache.properties b/betterhoppers/.gradle/buildOutputCleanup/cache.properties index 7ff97e6..2a70299 100644 --- a/betterhoppers/.gradle/buildOutputCleanup/cache.properties +++ b/betterhoppers/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Wed Jul 02 13:32:02 CEST 2025 +#Sun Jul 20 15:58:26 CEST 2025 gradle.version=8.14.2 diff --git a/chestex/.gradle/8.9/checksums/checksums.lock b/chestex/.gradle/8.9/checksums/checksums.lock index 6c2616e..3b1546c 100644 Binary files a/chestex/.gradle/8.9/checksums/checksums.lock and b/chestex/.gradle/8.9/checksums/checksums.lock differ diff --git a/chestex/.gradle/8.9/executionHistory/executionHistory.lock b/chestex/.gradle/8.9/executionHistory/executionHistory.lock deleted file mode 100644 index e00cf1c..0000000 Binary files a/chestex/.gradle/8.9/executionHistory/executionHistory.lock and /dev/null differ diff --git a/chestex/.gradle/8.9/fileHashes/fileHashes.lock b/chestex/.gradle/8.9/fileHashes/fileHashes.lock index 921c401..b32bb84 100644 Binary files a/chestex/.gradle/8.9/fileHashes/fileHashes.lock and b/chestex/.gradle/8.9/fileHashes/fileHashes.lock differ diff --git a/chestex/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/chestex/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d8c08bf..3c559d2 100644 Binary files a/chestex/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/chestex/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/chestex/.gradle/buildOutputCleanup/cache.properties b/chestex/.gradle/buildOutputCleanup/cache.properties index 62ba7b2..af7e39f 100644 --- a/chestex/.gradle/buildOutputCleanup/cache.properties +++ b/chestex/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Sun Mar 09 01:37:27 CET 2025 -gradle.version=8.9 +#Sun Jul 20 16:03:35 CEST 2025 +gradle.version=8.14.2 diff --git a/chestex/build.gradle.kts b/chestex/build.gradle.kts new file mode 100755 index 0000000..18f476f --- /dev/null +++ b/chestex/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + `java-library` + id("io.papermc.paperweight.userdev") version "2.0.0-beta.14" + id("xyz.jpenilla.run-paper") version "2.3.1" // Adds runServer and runMojangMappedServer tasks for testing +} +group = "de.hessj.chestex" +version = "1.0-SNAPSHOT" +description = "chestex" + +tasks.withType { + destinationDirectory.set(file("../")) +} + +dependencies { + //implementation(files("../craftbukkit.jar")) + implementation(files("../helper-1.0-SNAPSHOT.jar")) + paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT") +} + +tasks { + // Configure reobfJar to run when invoking the build task + assemble { + dependsOn(reobfJar) + } + + compileJava { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + + // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable. + // See https://openjdk.java.net/jeps/247 for more information. + options.release.set(21) + } + javadoc { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + } + processResources { + filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything + val props = mapOf( + "name" to project.name, + "version" to project.version, + "description" to project.description, + "apiVersion" to "1.21" + ) + inputs.properties(props) + filesMatching("plugin.yml") { + expand(props) + } + } +} \ No newline at end of file diff --git a/craftbukkit.jar b/craftbukkit.jar old mode 100755 new mode 100644 diff --git a/environmentex-1.0-SNAPSHOT.textClipping b/environmentex-1.0-SNAPSHOT.textClipping deleted file mode 100644 index 946a6d9..0000000 Binary files a/environmentex-1.0-SNAPSHOT.textClipping and /dev/null differ diff --git a/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3118f81..23ef873 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 60c98f3..537b428 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 944,74 ms. +[INFO] Finished after 844,07 ms. diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/App$1.class b/environmentex/build/classes/java/main/de/hessj/environmentex/App$1.class index 3620df2..6f3c6ef 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/App$1.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/App$1.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/App$2.class b/environmentex/build/classes/java/main/de/hessj/environmentex/App$2.class index c306c32..2607aae 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/App$2.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/App$2.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/App.class b/environmentex/build/classes/java/main/de/hessj/environmentex/App.class index a46cc2c..3afd709 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/App.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/App.class differ diff --git a/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar b/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar index b334b41..95c8d43 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 d8bdafe..f46eb38 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/App.java b/environmentex/src/main/java/de/hessj/environmentex/App.java index 9e9a9fb..7ec04c1 100755 --- a/environmentex/src/main/java/de/hessj/environmentex/App.java +++ b/environmentex/src/main/java/de/hessj/environmentex/App.java @@ -78,7 +78,8 @@ public class App extends JavaPlugin { } catch (IOException e) { e.printStackTrace(); } - + SquidPrevention.removeSquidReceipes(); + SquidPrevention.addCustomSquidRecipes(); getServer().recipeIterator().forEachRemaining(recipe -> { if (recipe instanceof ShapelessRecipe) { ShapelessRecipe shapelessRecipe = (ShapelessRecipe) recipe; @@ -460,6 +461,7 @@ public class App extends JavaPlugin { pM.registerEvents(new BetterTotems(), this); pM.registerEvents(new CustomMusicDiscs(), this); pM.registerEvents(new PinFeature(), this); + pM.registerEvents(new SquidPrevention(), this); getCommand("test").setExecutor(new EnvironmentExCommands()); getCommand("y").setExecutor(new EnvironmentExCommands()); getCommand("n").setExecutor(new EnvironmentExCommands()); diff --git a/environmentex/src/main/java/de/hessj/environmentex/SquidPrevention.java b/environmentex/src/main/java/de/hessj/environmentex/SquidPrevention.java new file mode 100644 index 0000000..1108301 --- /dev/null +++ b/environmentex/src/main/java/de/hessj/environmentex/SquidPrevention.java @@ -0,0 +1,61 @@ +package de.hessj.environmentex; + +import java.util.Iterator; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; +import org.bukkit.entity.EntityType; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntitySpawnEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.Recipe; +import org.bukkit.inventory.RecipeChoice; +import org.bukkit.inventory.ShapelessRecipe; + +public class SquidPrevention implements Listener { + @EventHandler + public void onSquidSpawn(EntitySpawnEvent event) { + if (event.getEntityType() == EntityType.SQUID || event.getEntityType() == EntityType.GLOW_SQUID) { + event.setCancelled(true); + } + } + + public static void removeSquidReceipes() { + Iterator it = Bukkit.recipeIterator(); + while (it.hasNext()) { + Recipe recipe = it.next(); + if (recipe instanceof ShapelessRecipe sr && + sr.getResult().getType() == Material.WRITABLE_BOOK) { + it.remove(); // remove the default Book and Quill recipe + } + } + } + + public static void addCustomSquidRecipes() { + ItemStack bookAndQuill = new ItemStack(Material.WRITABLE_BOOK); + + ShapelessRecipe customRecipe = new ShapelessRecipe( + new NamespacedKey("environmentex", "custom_book_and_quill"), + bookAndQuill); + + customRecipe.addIngredient(Material.BOOK); + customRecipe.addIngredient(Material.FEATHER); + customRecipe.addIngredient(Material.BLACK_DYE); + Bukkit.addRecipe(customRecipe); + + ItemStack blackdye = new ItemStack(Material.BLACK_DYE); + + ShapelessRecipe blackcustomRecipe = new ShapelessRecipe( + new NamespacedKey("environmentex", "custom_black_dye"), + blackdye); + + // Use RecipeChoice.MaterialChoice for multiple options + RecipeChoice choice = new RecipeChoice.MaterialChoice(Material.COAL, Material.CHARCOAL); + blackcustomRecipe.addIngredient(choice); + + Bukkit.addRecipe(blackcustomRecipe); + + } +} diff --git a/helper/.gradle/8.13/checksums/checksums.lock b/helper/.gradle/8.13/checksums/checksums.lock deleted file mode 100644 index 1251117..0000000 Binary files a/helper/.gradle/8.13/checksums/checksums.lock and /dev/null differ diff --git a/helper/.gradle/8.13/executionHistory/executionHistory.bin b/helper/.gradle/8.13/executionHistory/executionHistory.bin deleted file mode 100644 index 3b85010..0000000 Binary files a/helper/.gradle/8.13/executionHistory/executionHistory.bin and /dev/null differ diff --git a/helper/.gradle/8.13/executionHistory/executionHistory.lock b/helper/.gradle/8.13/executionHistory/executionHistory.lock deleted file mode 100644 index 4ebd890..0000000 Binary files a/helper/.gradle/8.13/executionHistory/executionHistory.lock and /dev/null differ diff --git a/helper/.gradle/8.13/fileChanges/last-build.bin b/helper/.gradle/8.13/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/helper/.gradle/8.13/fileChanges/last-build.bin and /dev/null differ diff --git a/helper/.gradle/8.13/fileHashes/fileHashes.bin b/helper/.gradle/8.13/fileHashes/fileHashes.bin deleted file mode 100644 index a3db794..0000000 Binary files a/helper/.gradle/8.13/fileHashes/fileHashes.bin and /dev/null differ diff --git a/helper/.gradle/8.13/fileHashes/fileHashes.lock b/helper/.gradle/8.13/fileHashes/fileHashes.lock deleted file mode 100644 index f43887e..0000000 Binary files a/helper/.gradle/8.13/fileHashes/fileHashes.lock and /dev/null differ diff --git a/helper/.gradle/8.13/fileHashes/resourceHashesCache.bin b/helper/.gradle/8.13/fileHashes/resourceHashesCache.bin deleted file mode 100644 index b8f384c..0000000 Binary files a/helper/.gradle/8.13/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/helper/.gradle/8.13/gc.properties b/helper/.gradle/8.13/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9941efd..eed8326 100644 Binary files a/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/helper/.gradle/buildOutputCleanup/cache.properties b/helper/.gradle/buildOutputCleanup/cache.properties index 5351117..29363d8 100644 --- a/helper/.gradle/buildOutputCleanup/cache.properties +++ b/helper/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Sun Jun 29 17:50:55 CEST 2025 -gradle.version=8.9 +#Sun Jul 20 15:55:06 CEST 2025 +gradle.version=8.14.2 diff --git a/helper/.gradle/caches/paperweight/taskCache/reobfJar.log b/helper/.gradle/caches/paperweight/taskCache/reobfJar.log index 1572d42..7dbd927 100644 --- a/helper/.gradle/caches/paperweight/taskCache/reobfJar.log +++ b/helper/.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.10.4/d78e8e115ba5ac99421ce2d5e84e88b91a5f08b7/tiny-remapper-0.10.4-fat.jar net.fabricmc.tinyremapper.Main /Users/janik/Desktop/MCPlugins/helper-1.0-SNAPSHOT.jar /Users/janik/Desktop/MCPlugins/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar /Users/janik/Desktop/MCPlugins/helper/.gradle/caches/paperweight/taskCache/reobfMappings.tiny mojang spigot /Users/janik/Desktop/MCPlugins/helper/.gradle/caches/paperweight/taskCache/mappedServerJar.jar --threads=1 -Finished after 915,81 ms. +Finished after 822,94 ms. diff --git a/helper/.gradle/file-system.probe b/helper/.gradle/file-system.probe index ac73c27..8221d6c 100644 Binary files a/helper/.gradle/file-system.probe and b/helper/.gradle/file-system.probe differ diff --git a/helper/build/classes/java/main/de/hessj/helper/Helper.class b/helper/build/classes/java/main/de/hessj/helper/Helper.class index e39e0a5..5360478 100644 Binary files a/helper/build/classes/java/main/de/hessj/helper/Helper.class and b/helper/build/classes/java/main/de/hessj/helper/Helper.class differ diff --git a/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar b/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar index 0246260..a2181e6 100644 Binary files a/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar and b/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar differ diff --git a/helper/build/reports/problems/problems-report.html b/helper/build/reports/problems/problems-report.html index c36574d..caa33c7 100644 --- a/helper/build/reports/problems/problems-report.html +++ b/helper/build/reports/problems/problems-report.html @@ -650,12 +650,12 @@ code + .copy-button { diff --git a/helper/build/tmp/compileJava/previous-compilation-data.bin b/helper/build/tmp/compileJava/previous-compilation-data.bin index a5a9ff9..e533156 100644 Binary files a/helper/build/tmp/compileJava/previous-compilation-data.bin and b/helper/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/helper/src/main/java/de/hessj/helper/Helper.java b/helper/src/main/java/de/hessj/helper/Helper.java index b44b89a..f8a06af 100755 --- a/helper/src/main/java/de/hessj/helper/Helper.java +++ b/helper/src/main/java/de/hessj/helper/Helper.java @@ -68,6 +68,7 @@ public class Helper { interactableBlocks.add(Material.LEVER); interactableBlocks.add(Material.STONE_BUTTON); interactableBlocks.add(Material.OAK_BUTTON); + interactableBlocks.add(Material.PALE_OAK_BUTTON); interactableBlocks.add(Material.BIRCH_BUTTON); interactableBlocks.add(Material.BAMBOO_BUTTON); interactableBlocks.add(Material.DARK_OAK_BUTTON); @@ -76,6 +77,7 @@ public class Helper { interactableBlocks.add(Material.ACACIA_BUTTON); interactableBlocks.add(Material.STONE_PRESSURE_PLATE); interactableBlocks.add(Material.OAK_PRESSURE_PLATE); + interactableBlocks.add(Material.PALE_OAK_PRESSURE_PLATE); interactableBlocks.add(Material.BIRCH_PRESSURE_PLATE); interactableBlocks.add(Material.BAMBOO_PRESSURE_PLATE); interactableBlocks.add(Material.DARK_OAK_PRESSURE_PLATE); @@ -89,6 +91,7 @@ public class Helper { interactableBlocks.add(Material.REPEATER); interactableBlocks.add(Material.LECTERN); interactableBlocks.add(Material.OAK_DOOR); + interactableBlocks.add(Material.PALE_OAK_DOOR); interactableBlocks.add(Material.BIRCH_DOOR); interactableBlocks.add(Material.BAMBOO_DOOR); interactableBlocks.add(Material.DARK_OAK_DOOR); @@ -96,6 +99,7 @@ public class Helper { interactableBlocks.add(Material.JUNGLE_DOOR); interactableBlocks.add(Material.ACACIA_DOOR); interactableBlocks.add(Material.OAK_TRAPDOOR); + interactableBlocks.add(Material.PALE_OAK_TRAPDOOR); interactableBlocks.add(Material.BIRCH_TRAPDOOR); interactableBlocks.add(Material.BAMBOO_TRAPDOOR); interactableBlocks.add(Material.DARK_OAK_TRAPDOOR); @@ -103,6 +107,7 @@ public class Helper { interactableBlocks.add(Material.JUNGLE_TRAPDOOR); interactableBlocks.add(Material.ACACIA_TRAPDOOR); interactableBlocks.add(Material.OAK_FENCE_GATE); + interactableBlocks.add(Material.PALE_OAK_FENCE_GATE); interactableBlocks.add(Material.BIRCH_FENCE_GATE); interactableBlocks.add(Material.BAMBOO_FENCE_GATE); interactableBlocks.add(Material.DARK_OAK_FENCE_GATE); @@ -115,6 +120,7 @@ public class Helper { interactableBlocks.add(Material.MINECART); interactableBlocks.add(Material.TNT_MINECART); interactableBlocks.add(Material.OAK_BOAT); + interactableBlocks.add(Material.PALE_OAK_BOAT); interactableBlocks.add(Material.BIRCH_BOAT); interactableBlocks.add(Material.BAMBOO_RAFT); interactableBlocks.add(Material.DARK_OAK_BOAT); @@ -122,6 +128,7 @@ public class Helper { interactableBlocks.add(Material.JUNGLE_BOAT); interactableBlocks.add(Material.ACACIA_BOAT); interactableBlocks.add(Material.OAK_CHEST_BOAT); + interactableBlocks.add(Material.PALE_OAK_CHEST_BOAT); interactableBlocks.add(Material.BIRCH_CHEST_BOAT); interactableBlocks.add(Material.BAMBOO_CHEST_RAFT); interactableBlocks.add(Material.DARK_OAK_CHEST_BOAT); diff --git a/pokeballs/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/pokeballs/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1611e94..fc178af 100644 Binary files a/pokeballs/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/pokeballs/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/pokeballs/.gradle/buildOutputCleanup/cache.properties b/pokeballs/.gradle/buildOutputCleanup/cache.properties index ec8480f..a8b5e56 100644 --- a/pokeballs/.gradle/buildOutputCleanup/cache.properties +++ b/pokeballs/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Wed Mar 12 11:51:57 CET 2025 -gradle.version=8.9 +#Sun Jul 20 15:58:39 CEST 2025 +gradle.version=8.14.2 diff --git a/rebuild.sh b/rebuild.sh new file mode 100755 index 0000000..dee8600 --- /dev/null +++ b/rebuild.sh @@ -0,0 +1,15 @@ +#!/bin/bash +curr_folder=$(pwd) +rm -rf *-SNAPSHOT.jar +cd helper && gradle wrapper && ./gradlew clean build && gradle build +cd $curr_folder +cd betterhoppers && gradle wrapper && ./gradlew clean build && gradle build +cd $curr_folder +cd chestex && gradle wrapper && ./gradlew clean build && gradle build +cd $curr_folder +cd dailyquests && gradle wrapper && ./gradlew clean build && gradle build +cd $curr_folder +cd environmentex && gradle wrapper && ./gradlew clean build && gradle build +cd $curr_folder +cd pokeballs && gradle wrapper && ./gradlew clean build && gradle build +cd $curr_folder