diff --git a/README.md b/README.md index 15408bf..38888da 100755 --- a/README.md +++ b/README.md @@ -1,9 +1,16 @@ +gradle wrapper +./gradlew clean build + +Open the Command Palette: Cmd+Shift+P + • Developer: reload window + ALLGEMEIN: recipes die custom items beinhalten werden nicht im crafting angezeigt (allgm. Bukkit problem) INFO: CustomItemIcon count: 22 BUG: Autocrafter nicht von seite möglich BUG: Music Disc 13 now unfunctional (vertrtbar) 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 diff --git a/betterhoppers/.gradle/8.9/fileHashes/fileHashes.lock b/betterhoppers/.gradle/8.9/fileHashes/fileHashes.lock index 36208c9..3af65fe 100644 Binary files a/betterhoppers/.gradle/8.9/fileHashes/fileHashes.lock and b/betterhoppers/.gradle/8.9/fileHashes/fileHashes.lock differ diff --git a/betterhoppers/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/betterhoppers/.gradle/buildOutputCleanup/buildOutputCleanup.lock index e2271a0..e51dd5c 100644 Binary files a/betterhoppers/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/betterhoppers/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/environmentex-1.0-SNAPSHOT.textClipping b/environmentex-1.0-SNAPSHOT.textClipping new file mode 100644 index 0000000..946a6d9 Binary files /dev/null and b/environmentex-1.0-SNAPSHOT.textClipping differ diff --git a/environmentex/.gradle/8.13/checksums/checksums.lock b/environmentex/.gradle/8.13/checksums/checksums.lock deleted file mode 100644 index 074919d..0000000 Binary files a/environmentex/.gradle/8.13/checksums/checksums.lock and /dev/null differ diff --git a/environmentex/.gradle/8.13/checksums/md5-checksums.bin b/environmentex/.gradle/8.13/checksums/md5-checksums.bin deleted file mode 100644 index 3831ed0..0000000 Binary files a/environmentex/.gradle/8.13/checksums/md5-checksums.bin and /dev/null differ diff --git a/environmentex/.gradle/8.13/checksums/sha1-checksums.bin b/environmentex/.gradle/8.13/checksums/sha1-checksums.bin deleted file mode 100644 index 132d36e..0000000 Binary files a/environmentex/.gradle/8.13/checksums/sha1-checksums.bin and /dev/null differ diff --git a/environmentex/.gradle/8.13/executionHistory/executionHistory.bin b/environmentex/.gradle/8.13/executionHistory/executionHistory.bin deleted file mode 100644 index 7b270c6..0000000 Binary files a/environmentex/.gradle/8.13/executionHistory/executionHistory.bin and /dev/null differ diff --git a/environmentex/.gradle/8.13/executionHistory/executionHistory.lock b/environmentex/.gradle/8.13/executionHistory/executionHistory.lock deleted file mode 100644 index 8abb1ca..0000000 Binary files a/environmentex/.gradle/8.13/executionHistory/executionHistory.lock and /dev/null differ diff --git a/environmentex/.gradle/8.13/fileChanges/last-build.bin b/environmentex/.gradle/8.13/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/environmentex/.gradle/8.13/fileChanges/last-build.bin and /dev/null differ diff --git a/environmentex/.gradle/8.13/fileHashes/fileHashes.bin b/environmentex/.gradle/8.13/fileHashes/fileHashes.bin deleted file mode 100644 index a1bee04..0000000 Binary files a/environmentex/.gradle/8.13/fileHashes/fileHashes.bin and /dev/null differ diff --git a/environmentex/.gradle/8.13/fileHashes/fileHashes.lock b/environmentex/.gradle/8.13/fileHashes/fileHashes.lock deleted file mode 100644 index 62e9375..0000000 Binary files a/environmentex/.gradle/8.13/fileHashes/fileHashes.lock and /dev/null differ diff --git a/environmentex/.gradle/8.13/fileHashes/resourceHashesCache.bin b/environmentex/.gradle/8.13/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 8ac9f1c..0000000 Binary files a/environmentex/.gradle/8.13/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/environmentex/.gradle/8.13/gc.properties b/environmentex/.gradle/8.13/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ab88222..1411005 100644 Binary files a/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/environmentex/.gradle/buildOutputCleanup/cache.properties b/environmentex/.gradle/buildOutputCleanup/cache.properties index 7eeaa53..77e1361 100644 --- a/environmentex/.gradle/buildOutputCleanup/cache.properties +++ b/environmentex/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Mon Mar 10 20:23:21 CET 2025 -gradle.version=8.13 +#Sun Jun 29 18:53:26 CEST 2025 +gradle.version=8.14.2 diff --git a/environmentex/.gradle/caches/paperweight/taskCache/mappedServerJar.jar b/environmentex/.gradle/caches/paperweight/taskCache/mappedServerJar.jar index 1cfc7b2..b26d0aa 100644 Binary files a/environmentex/.gradle/caches/paperweight/taskCache/mappedServerJar.jar and b/environmentex/.gradle/caches/paperweight/taskCache/mappedServerJar.jar differ diff --git a/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log b/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log index 9f34b56..a451174 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.10.4/d78e8e115ba5ac99421ce2d5e84e88b91a5f08b7/tiny-remapper-0.10.4-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 -Finished after 827,23 ms. +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 3356,66 ms. diff --git a/environmentex/.gradle/file-system.probe b/environmentex/.gradle/file-system.probe index 6442477..55fb95a 100644 Binary files a/environmentex/.gradle/file-system.probe and b/environmentex/.gradle/file-system.probe differ diff --git a/environmentex/.vscode/settings.json b/environmentex/.vscode/settings.json index e012065..7b016a8 100644 --- a/environmentex/.vscode/settings.json +++ b/environmentex/.vscode/settings.json @@ -1,4 +1,3 @@ { - "java.compile.nullAnalysis.mode": "automatic", - "java.configuration.updateBuildConfiguration": "interactive" + "java.compile.nullAnalysis.mode": "automatic" } \ No newline at end of file diff --git a/environmentex/bin/main/de/hessj/environmentex/AFKListener$1.class b/environmentex/bin/main/de/hessj/environmentex/AFKListener$1.class deleted file mode 100644 index eab8a9c..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/AFKListener$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/AFKListener.class b/environmentex/bin/main/de/hessj/environmentex/AFKListener.class deleted file mode 100644 index 497433f..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/AFKListener.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/App$1.class b/environmentex/bin/main/de/hessj/environmentex/App$1.class deleted file mode 100644 index cdd21a4..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/App$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/App$2.class b/environmentex/bin/main/de/hessj/environmentex/App$2.class deleted file mode 100644 index 0a6fe16..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/App$2.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/App.class b/environmentex/bin/main/de/hessj/environmentex/App.class deleted file mode 100644 index 9918eb8..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/App.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra$1.class b/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra$1.class deleted file mode 100644 index e2ef36d..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra$2.class b/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra$2.class deleted file mode 100644 index c27da0e..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra$2.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra.class b/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra.class deleted file mode 100644 index 0864472..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ArmoredElytra.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/AutoCrafter$1.class b/environmentex/bin/main/de/hessj/environmentex/AutoCrafter$1.class deleted file mode 100644 index bafb6a4..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/AutoCrafter$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/AutoCrafter.class b/environmentex/bin/main/de/hessj/environmentex/AutoCrafter.class deleted file mode 100644 index a950ad1..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/AutoCrafter.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/BetterTotems.class b/environmentex/bin/main/de/hessj/environmentex/BetterTotems.class deleted file mode 100644 index f24e95e..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/BetterTotems.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/CauldronConcrete.class b/environmentex/bin/main/de/hessj/environmentex/CauldronConcrete.class deleted file mode 100644 index 9e19b8a..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/CauldronConcrete.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/CustomItems.class b/environmentex/bin/main/de/hessj/environmentex/CustomItems.class deleted file mode 100644 index 0c2aef9..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/CustomItems.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs$1.class b/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs$1.class deleted file mode 100644 index 67c5cb3..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs$Song.class b/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs$Song.class deleted file mode 100644 index 174fbf7..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs$Song.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs.class b/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs.class deleted file mode 100644 index c8e5567..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/CustomMusicDiscs.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/CustomRecipes.class b/environmentex/bin/main/de/hessj/environmentex/CustomRecipes.class deleted file mode 100644 index 1b57c4b..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/CustomRecipes.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener$1.class b/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener$1.class deleted file mode 100644 index 9fec0cd..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener$2.class b/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener$2.class deleted file mode 100644 index 7b4f8ff..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener$2.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener.class b/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener.class deleted file mode 100644 index f2fb37c..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/DoubleDoorListener.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExCommands.class b/environmentex/bin/main/de/hessj/environmentex/EnvironmentExCommands.class deleted file mode 100644 index f5c1912..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExCommands.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$1.class b/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$1.class deleted file mode 100644 index 310a0d6..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$2.class b/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$2.class deleted file mode 100644 index 9085eda..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$2.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$3.class b/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$3.class deleted file mode 100644 index 2538116..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$3.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$4.class b/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$4.class deleted file mode 100644 index a4c6340..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$4.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$5.class b/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$5.class deleted file mode 100644 index bb9e3ab..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$5.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$6.class b/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$6.class deleted file mode 100644 index 92445b1..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners$6.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners.class b/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners.class deleted file mode 100644 index 2d0b07d..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/EnvironmentExListeners.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener$1.class b/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener$1.class deleted file mode 100644 index 84fbd88..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener$2.class b/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener$2.class deleted file mode 100644 index 51d1994..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener$2.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener.class b/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener.class deleted file mode 100644 index c7f1a27..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ExpBottleListener.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ExperienceManager.class b/environmentex/bin/main/de/hessj/environmentex/ExperienceManager.class deleted file mode 100644 index c388ab5..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ExperienceManager.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/Filter$1.class b/environmentex/bin/main/de/hessj/environmentex/Filter$1.class deleted file mode 100644 index 015a5fe..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/Filter$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/Filter.class b/environmentex/bin/main/de/hessj/environmentex/Filter.class deleted file mode 100644 index 0c0d077..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/Filter.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/HealthBarListener.class b/environmentex/bin/main/de/hessj/environmentex/HealthBarListener.class deleted file mode 100644 index 4d4f83e..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/HealthBarListener.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/InfinityWaterBucket$1.class b/environmentex/bin/main/de/hessj/environmentex/InfinityWaterBucket$1.class deleted file mode 100644 index ae73455..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/InfinityWaterBucket$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/InfinityWaterBucket.class b/environmentex/bin/main/de/hessj/environmentex/InfinityWaterBucket.class deleted file mode 100644 index 95fdb4a..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/InfinityWaterBucket.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/InvisibleFrame.class b/environmentex/bin/main/de/hessj/environmentex/InvisibleFrame.class deleted file mode 100644 index 3f42c77..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/InvisibleFrame.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ItemFrameUpdateRunnable.class b/environmentex/bin/main/de/hessj/environmentex/ItemFrameUpdateRunnable.class deleted file mode 100644 index 81303d4..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ItemFrameUpdateRunnable.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/LoginListener.class b/environmentex/bin/main/de/hessj/environmentex/LoginListener.class deleted file mode 100644 index 8a5eb59..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/LoginListener.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/MobBurner.class b/environmentex/bin/main/de/hessj/environmentex/MobBurner.class deleted file mode 100644 index 91c9da6..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/MobBurner.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/MobHeads.class b/environmentex/bin/main/de/hessj/environmentex/MobHeads.class deleted file mode 100644 index 8faba3a..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/MobHeads.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/PinFeature.class b/environmentex/bin/main/de/hessj/environmentex/PinFeature.class deleted file mode 100644 index a3d3fb8..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/PinFeature.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ShulkerGui$1.class b/environmentex/bin/main/de/hessj/environmentex/ShulkerGui$1.class deleted file mode 100644 index 6b641b1..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ShulkerGui$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ShulkerGui.class b/environmentex/bin/main/de/hessj/environmentex/ShulkerGui.class deleted file mode 100644 index 20986db..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ShulkerGui.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ShulkerPreview$1.class b/environmentex/bin/main/de/hessj/environmentex/ShulkerPreview$1.class deleted file mode 100644 index c7a5296..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ShulkerPreview$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/ShulkerPreview.class b/environmentex/bin/main/de/hessj/environmentex/ShulkerPreview.class deleted file mode 100644 index dca5db0..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/ShulkerPreview.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/VillagerListener$1.class b/environmentex/bin/main/de/hessj/environmentex/VillagerListener$1.class deleted file mode 100644 index f469cd6..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/VillagerListener$1.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/VillagerListener.class b/environmentex/bin/main/de/hessj/environmentex/VillagerListener.class deleted file mode 100644 index 9468ab6..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/VillagerListener.class and /dev/null differ diff --git a/environmentex/bin/main/de/hessj/environmentex/WorkbenchToGo.class b/environmentex/bin/main/de/hessj/environmentex/WorkbenchToGo.class deleted file mode 100644 index ef8ce0d..0000000 Binary files a/environmentex/bin/main/de/hessj/environmentex/WorkbenchToGo.class and /dev/null differ diff --git a/environmentex/bin/main/plugin.yml b/environmentex/bin/main/plugin.yml deleted file mode 100755 index 24a6c7a..0000000 --- a/environmentex/bin/main/plugin.yml +++ /dev/null @@ -1,24 +0,0 @@ -main: de.hessj.environmentex.App -name: EnvironmentExtenderPlugin -version: 0.1 -api-version: 1.19 -depend: [HelperPlugin] -commands: - test: - description: Vote mit "Ja" für den Nachtskip - usage: / - y: - description: Vote mit "Ja" für den Nachtskip - usage: / - n: - description: Vote mit "Nein" für den Nachtskip - usage: / - add: - description: Setzt den Whiteliststatus auf accepted - usage: / - afk: - description: Setzt den AFK Status - usage: / - pin: - description: ---- - usage: / \ No newline at end of file diff --git a/environmentex/build.gradle.kts b/environmentex/build.gradle.kts index 5c85390..7eced48 100755 --- a/environmentex/build.gradle.kts +++ b/environmentex/build.gradle.kts @@ -1,6 +1,6 @@ plugins { `java-library` - id("io.papermc.paperweight.userdev") version "2.0.0-beta.14" + id("io.papermc.paperweight.userdev") version "2.0.0-beta.17" id("xyz.jpenilla.run-paper") version "2.3.1" // Adds runServer and runMojangMappedServer tasks for testing } group = "de.hessj.environmentex" @@ -33,6 +33,13 @@ tasks { javadoc { options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything } + java { + sourceSets { + named("main") { + java.srcDir("src/main/java") + } + } +} processResources { filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything val props = mapOf( 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 8780bd5..3620df2 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 1d8ca33..c306c32 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 8bc3372..a46cc2c 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/classes/java/main/de/hessj/environmentex/CustomItems.class b/environmentex/build/classes/java/main/de/hessj/environmentex/CustomItems.class index 76a5715..9f32a50 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/CustomItems.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/CustomItems.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExCommands.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExCommands.class index 73fdac8..029f90b 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExCommands.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExCommands.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$1.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$1.class index 6787585..36caaef 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$1.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$1.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$2.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$2.class index 1782b5d..1f0cf16 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$2.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$2.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$3.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$3.class index 778c566..9c3cab6 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$3.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$3.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$4.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$4.class index 03815eb..fdb3488 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$4.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$4.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$5.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$5.class index 88546ee..e376f65 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$5.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$5.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$6.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$6.class index a510e45..9f29031 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$6.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$6.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$7.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$7.class index 729f2fb..62cff17 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$7.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners$7.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners.class b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners.class index 86e2eee..b4d85e1 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/EnvironmentExListeners.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/LoginListener.class b/environmentex/build/classes/java/main/de/hessj/environmentex/LoginListener.class index 39857a1..e434fe5 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/LoginListener.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/LoginListener.class differ diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/PinFeature.class b/environmentex/build/classes/java/main/de/hessj/environmentex/PinFeature.class index a0faa65..f302a8d 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/PinFeature.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/PinFeature.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 7d7b547..e729b92 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/reports/problems/problems-report.html b/environmentex/build/reports/problems/problems-report.html index ab3eac2..2a566b6 100644 --- a/environmentex/build/reports/problems/problems-report.html +++ b/environmentex/build/reports/problems/problems-report.html @@ -650,12 +650,12 @@ code + .copy-button { diff --git a/environmentex/build/resources/main/plugin.yml b/environmentex/build/resources/main/plugin.yml index 82de350..3868958 100755 --- a/environmentex/build/resources/main/plugin.yml +++ b/environmentex/build/resources/main/plugin.yml @@ -21,4 +21,7 @@ commands: usage: / pin: description: ---- + usage: / + ignorevote: + description: Setzt den Ignorevote Status usage: / \ No newline at end of file diff --git a/environmentex/build/tmp/compileJava/previous-compilation-data.bin b/environmentex/build/tmp/compileJava/previous-compilation-data.bin index 710c37c..1083a47 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/gradle/wrapper/gradle-wrapper.jar b/environmentex/gradle/wrapper/gradle-wrapper.jar index 9bbc975..1b33c55 100644 Binary files a/environmentex/gradle/wrapper/gradle-wrapper.jar and b/environmentex/gradle/wrapper/gradle-wrapper.jar differ diff --git a/environmentex/gradle/wrapper/gradle-wrapper.properties b/environmentex/gradle/wrapper/gradle-wrapper.properties index 37f853b..ff23a68 100644 --- a/environmentex/gradle/wrapper/gradle-wrapper.properties +++ b/environmentex/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/environmentex/gradlew b/environmentex/gradlew index faf9300..23d15a9 100755 --- a/environmentex/gradlew +++ b/environmentex/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/environmentex/gradlew.bat b/environmentex/gradlew.bat index 9b42019..5eed7ee 100644 --- a/environmentex/gradlew.bat +++ b/environmentex/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/environmentex/src/main/java/de/hessj/environmentex/App.java b/environmentex/src/main/java/de/hessj/environmentex/App.java index 097f46b..9e9a9fb 100755 --- a/environmentex/src/main/java/de/hessj/environmentex/App.java +++ b/environmentex/src/main/java/de/hessj/environmentex/App.java @@ -6,6 +6,8 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scheduler.BukkitTask; + import net.kyori.adventure.text.Component; import net.md_5.bungee.api.ChatColor; import org.bukkit.NamespacedKey; @@ -13,7 +15,9 @@ import org.bukkit.World; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; import org.bukkit.event.inventory.InventoryType; +import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; @@ -59,6 +63,9 @@ public class App extends JavaPlugin { public File tpYml = new File(this.getDataFolder() + "/texturepack.yml"); public FileConfiguration tpConfig = YamlConfiguration.loadConfiguration(tpYml); + + + @Override public void onEnable() { tpConfig.addDefault("url", "https://mc.hessj.de/texturepack/CUSTOM.zip"); @@ -431,7 +438,6 @@ public class App extends JavaPlugin { } private void listenerRegistration() { - pM.registerEvents(new LoginListener(), this); pM.registerEvents(new EnvironmentExListeners(), this); pM.registerEvents(new InvisibleFrame(), this); @@ -453,6 +459,7 @@ public class App extends JavaPlugin { pM.registerEvents(new ShulkerPreview(), this); pM.registerEvents(new BetterTotems(), this); pM.registerEvents(new CustomMusicDiscs(), this); + pM.registerEvents(new PinFeature(), this); getCommand("test").setExecutor(new EnvironmentExCommands()); getCommand("y").setExecutor(new EnvironmentExCommands()); getCommand("n").setExecutor(new EnvironmentExCommands()); @@ -460,6 +467,7 @@ public class App extends JavaPlugin { getCommand("afk").setExecutor(new EnvironmentExCommands()); getCommand("pin").setExecutor(new EnvironmentExCommands()); getCommand("pin").setTabCompleter(new PinFeature()); + getCommand("ignorevote").setExecutor(new EnvironmentExCommands()); } public void log(Object msg) { diff --git a/environmentex/src/main/java/de/hessj/environmentex/CustomItems.java b/environmentex/src/main/java/de/hessj/environmentex/CustomItems.java index 9135409..575bd9d 100755 --- a/environmentex/src/main/java/de/hessj/environmentex/CustomItems.java +++ b/environmentex/src/main/java/de/hessj/environmentex/CustomItems.java @@ -17,6 +17,7 @@ import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; import net.kyori.adventure.text.Component; + public class CustomItems implements Listener { public static ItemStack flintBlock = new ItemStack(Material.DIRT); diff --git a/environmentex/src/main/java/de/hessj/environmentex/EnvironmentExCommands.java b/environmentex/src/main/java/de/hessj/environmentex/EnvironmentExCommands.java index 681e995..e332c09 100755 --- a/environmentex/src/main/java/de/hessj/environmentex/EnvironmentExCommands.java +++ b/environmentex/src/main/java/de/hessj/environmentex/EnvironmentExCommands.java @@ -1,5 +1,6 @@ package de.hessj.environmentex; +import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.HashMap; @@ -18,18 +19,23 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import de.hessj.helper.Helper.Type; +import org.bukkit.scheduler.BukkitTask; public class EnvironmentExCommands implements CommandExecutor, Listener { public de.hessj.helper.Helper helper = new de.hessj.helper.Helper(); private final Map> playerPins = new HashMap<>(); - private HashMap bossBars = new HashMap<>(); - + public static final Map playerTasks = new HashMap<>(); + public static HashMap bossBars = new HashMap<>(); + int taskId; + @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (sender instanceof Player) { @@ -54,6 +60,33 @@ public class EnvironmentExCommands implements CommandExecutor, Listener { p.playerListName(App.helper.R3SMessage(Type.ERROR, "[AFK] " + p.getName())); } + if (label.equalsIgnoreCase("ignorevote")) { + + + + +if(args.length != 1){ +return false; +} +Player p = (Player) sender; + + + + if(!args[0].equalsIgnoreCase("false") && !args[0].equalsIgnoreCase("true")) { + p.sendMessage(helper.R3SMessage(Type.ERROR, + "Benutzung: /ignorevote ")); + return true; + } + + LoginListener.customConfig.set("players." + p.getUniqueId() + ".ignorevote", Boolean.parseBoolean(args[0])); + LoginListener.saveCustomYml(LoginListener.customConfig, LoginListener.customYml); + + + } + + + + if (label.equalsIgnoreCase("pin")) { Player p = (Player) sender; UUID playerId = p.getUniqueId(); @@ -61,7 +94,7 @@ public class EnvironmentExCommands implements CommandExecutor, Listener { if (args.length < 1) { p.sendMessage(helper.R3SMessage(Type.ERROR, - "Benutzung: /pin [name | id]")); + "Benutzung: /pin [name | id] | send [id | onlineplayer]")); return true; } @@ -69,6 +102,13 @@ public class EnvironmentExCommands implements CommandExecutor, Listener { Map pins = playerPins.get(playerId); switch (subCommand) { + case "send": + if (args.length < 3) { + p.sendMessage(helper.R3SMessage(Type.ERROR, "Benutzung: /pin send ")); + return true; + } + + break; case "set": if (args.length < 2) { p.sendMessage(helper.R3SMessage(Type.ERROR, "Benutzung: /pin set ")); @@ -172,6 +212,13 @@ public class EnvironmentExCommands implements CommandExecutor, Listener { } try { + + + + + + + int pinId1 = Integer.parseInt(args[1]); String pinName1 = PinFeature.pinConfig.getString(playerId + "." + pinId1 + ".name"); String locationString1 = PinFeature.pinConfig.getString(playerId + "." + pinId1 + ".loc"); @@ -188,14 +235,28 @@ public class EnvironmentExCommands implements CommandExecutor, Listener { int y = Integer.parseInt(locParts[2]); int z = Integer.parseInt(locParts[3]); - String worldLabel = "Overworld"; - if (worldName.endsWith("_nether")) - worldLabel = "Nether"; - if (worldName.endsWith("_end")) - worldLabel = "End"; + if(!p.getLocation().getWorld().getName().toString().equals(worldName.toString())) { + p.sendMessage(helper.R3SMessage(Type.ERROR, "Du kannst nur Pins aus deiner aktuellen Welt folgen.")); + return true; + } + +p.sendMessage(helper.R3SMessage(Type.SUCCESS, "Du folgst nun dem Pin '" + pinName1 + "'")); + + UUID uuid = p.getUniqueId(); + +if (playerTasks.containsKey(uuid)) { + BukkitTask existingTask = playerTasks.remove(uuid); // remove from map + existingTask.cancel(); // cancel the repeating task + } + + BukkitTask task = Bukkit.getScheduler().runTaskTimer(App.main, () -> { + int cur_x = (int) p.getLocation().getBlockX(); + int cur_y = (int) p.getLocation().getBlockY(); + int cur_z = (int) p.getLocation().getBlockZ(); + // BossBar erstellen/aktualisieren - BossBar bossBar = Bukkit.createBossBar(worldLabel + ": " + x + ", " + y + ", " + z, + BossBar bossBar = Bukkit.createBossBar("Entfernung: " + (cur_x-x) + ", " + (cur_y-y) + ", " + (cur_z-z), BarColor.WHITE, BarStyle.SOLID); bossBar.setProgress(0.0); @@ -206,7 +267,28 @@ public class EnvironmentExCommands implements CommandExecutor, Listener { bossBar.addPlayer(p); bossBars.put(p.getUniqueId(), bossBar); - p.sendMessage(helper.R3SMessage(Type.SUCCESS, "Du folgst nun dem Pin '" + pinName1 + "'")); + + }, 0L, 5L); + + playerTasks.put(uuid, task); + + + + + + + + + + + + + + + + + + } catch (NumberFormatException e) { p.sendMessage(helper.R3SMessage(Type.ERROR, "Kein Pin mit dieser ID gefunden.")); @@ -217,7 +299,13 @@ public class EnvironmentExCommands implements CommandExecutor, Listener { if (bossBars.containsKey(p.getUniqueId())) { bossBars.get(p.getUniqueId()).removeAll(); bossBars.remove(p.getUniqueId()); - p.sendMessage(helper.R3SMessage(Type.ERROR, "Du folgst nun keinem Pin mehr.")); + UUID uuid = p.getUniqueId(); + BukkitTask task = playerTasks.remove(uuid); + if (task != null) { + task.cancel(); + p.sendMessage(helper.R3SMessage(Type.ERROR, "Du folgst nun keinem Pin mehr.")); + } + } break; diff --git a/environmentex/src/main/java/de/hessj/environmentex/EnvironmentExListeners.java b/environmentex/src/main/java/de/hessj/environmentex/EnvironmentExListeners.java index 34ac3b4..c0066a8 100755 --- a/environmentex/src/main/java/de/hessj/environmentex/EnvironmentExListeners.java +++ b/environmentex/src/main/java/de/hessj/environmentex/EnvironmentExListeners.java @@ -1,5 +1,6 @@ package de.hessj.environmentex; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -24,6 +25,8 @@ import org.bukkit.block.data.BlockData; import org.bukkit.block.data.type.Fence; import org.bukkit.block.data.type.Leaves; import org.bukkit.block.data.type.Stairs; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Axolotl; import org.bukkit.entity.EntityType; import org.bukkit.entity.Fish; @@ -69,10 +72,9 @@ public class EnvironmentExListeners implements Listener { public static boolean voteIsGoing = false; public static int voteForYes; public static int voteForNo; - public static int onlinePlayers; + public static int voteablePlayers; public static ArrayList hasVoted = new ArrayList(); public static Location lastLoc; - public de.hessj.helper.Helper helper = new de.hessj.helper.Helper(); boolean isAlone() { @@ -116,10 +118,28 @@ public class EnvironmentExListeners implements Listener { voteIsGoing = true; voteForYes = 1; voteForNo = 0; - onlinePlayers = 0; + voteablePlayers = 0; hasVoted.add(e.getPlayer().getUniqueId()); for (Player p : App.main.getServer().getOnlinePlayers()) { - onlinePlayers++; + +if(p.playerListName().toString().contains("[AFK] ")){ + //skipping because AFK + continue; +} + + + + //wenn player AFK auch! +if(p.getUniqueId().equals(e.getPlayer().getUniqueId())){ + //skipping because sleeper + continue; +} +if(LoginListener.customConfig.getBoolean("players." + p.getUniqueId() + ".ignorevote")){ + //skipping because ignorevote + continue; +} + voteablePlayers++; + if (e.getBed().getWorld().isThundering()) { p.sendMessage(helper.R3SMessage(Type.INFO, e.getPlayer().getName() @@ -134,6 +154,20 @@ public class EnvironmentExListeners implements Listener { p.sendMessage(helper.R3SMessage(Type.INFO, "Du hast ab jetzt 10 Sekunden Zeit.")); } + + if(voteablePlayers == 0){ + if (e.getBed().getWorld().isThundering()) { + Bukkit.getWorlds().get(0).setTime(24000); + Bukkit.getWorlds().get(0).setStorm(false); + Bukkit.getWorlds().get(0).setThundering(false); + Bukkit.getWorlds().get(0).setWeatherDuration(6000); + } else { + Bukkit.getWorlds().get(0).setTime(24000); + } + voteIsGoing = false; + return; + } + Bukkit.getScheduler().scheduleSyncDelayedTask(App.main, new Runnable() { public void run() { voteIsGoing = false; @@ -145,7 +179,7 @@ public class EnvironmentExListeners implements Listener { p.sendMessage(helper.R3SMessage(Type.OK, "Das Gewitter wird durchgeschlafen. (" + voteForYes + "x Ja, " + voteForNo + "x Nein, " - + (onlinePlayers - voteForNo - voteForYes) + "x enthalten)")); + + (voteablePlayers - voteForNo - voteForYes) + "x enthalten)")); } @@ -153,7 +187,7 @@ public class EnvironmentExListeners implements Listener { p.sendMessage(helper.R3SMessage(Type.OK, "Die Nacht wird durchgeschlafen. (" + voteForYes + "x Ja, " + voteForNo + "x Nein, " - + (onlinePlayers - voteForNo - voteForYes) + "x enthalten)")); + + (voteablePlayers - voteForNo - voteForYes) + "x enthalten)")); } } @@ -175,14 +209,14 @@ public class EnvironmentExListeners implements Listener { p.sendMessage(helper.R3SMessage(Type.ERROR, "Das Gewitter wird nicht durchgeschlafen. (" + voteForYes + "x Ja, " + voteForNo - + "x Nein, " + (onlinePlayers - voteForNo - voteForYes) + + "x Nein, " + (voteablePlayers - voteForNo - voteForYes) + "x enthalten)")); } else { p.sendMessage(helper.R3SMessage(Type.ERROR, "Die Nacht wird nicht durchgeschlafen. (" + voteForYes + "x Ja, " + voteForNo - + "x Nein, " + (onlinePlayers - voteForNo - voteForYes) + + "x Nein, " + (voteablePlayers - voteForNo - voteForYes) + "x enthalten)")); } if (p.isSleeping()) { diff --git a/environmentex/src/main/java/de/hessj/environmentex/LoginListener.java b/environmentex/src/main/java/de/hessj/environmentex/LoginListener.java index 2240c65..06e6465 100755 --- a/environmentex/src/main/java/de/hessj/environmentex/LoginListener.java +++ b/environmentex/src/main/java/de/hessj/environmentex/LoginListener.java @@ -11,7 +11,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; - import de.hessj.helper.Helper.Type; import net.kyori.adventure.text.Component; import net.kyori.adventure.title.Title; @@ -36,6 +35,7 @@ public class LoginListener implements Listener { (DateTimeFormatter.ofPattern("dd.MM.YYYY-HH:mm:ss")).format(LocalDateTime.now())); customConfig.set("players." + e.getPlayer().getUniqueId() + ".whitelisted", false); customConfig.set("players." + e.getPlayer().getUniqueId() + ".hasSeenTutorial", false); + customConfig.set("players." + e.getPlayer().getUniqueId() + ".ignorevote", false); saveCustomYml(customConfig, customYml); } if (customConfig.getBoolean("players." + e.getPlayer().getUniqueId() + ".whitelisted")) { @@ -60,6 +60,7 @@ public class LoginListener implements Listener { public static void saveCustomYml(FileConfiguration ymlConfig, File ymlFile) { try { ymlConfig.save(ymlFile); + YamlConfiguration.loadConfiguration(ymlFile); } catch (IOException e) { e.printStackTrace(); } diff --git a/environmentex/src/main/java/de/hessj/environmentex/PinFeature.java b/environmentex/src/main/java/de/hessj/environmentex/PinFeature.java index 9854bb6..56e5a83 100644 --- a/environmentex/src/main/java/de/hessj/environmentex/PinFeature.java +++ b/environmentex/src/main/java/de/hessj/environmentex/PinFeature.java @@ -7,7 +7,7 @@ import java.util.Comparator; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; - +import org.bukkit.event.Listener; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; @@ -15,8 +15,12 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.player.PlayerChangedWorldEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.scheduler.BukkitTask; -public class PinFeature implements TabCompleter { +public class PinFeature implements TabCompleter, Listener { public static File pinYml = new File(App.main.getDataFolder() + "/pins.yml"); public static FileConfiguration pinConfig = YamlConfiguration.loadConfiguration(pinYml); @Override @@ -28,7 +32,7 @@ public List onTabComplete(CommandSender sender, Command cmd, String labe UUID playerId = player.getUniqueId(); if (args.length == 1) { - return Arrays.asList("set", "list", "remove", "follow", "unfollow"); + return Arrays.asList("set", "list", "remove", "follow", "unfollow", "send"); } if (args.length == 2) { @@ -42,7 +46,7 @@ public List onTabComplete(CommandSender sender, Command cmd, String labe return Collections.emptyList(); // Keine Argumente notwendig } - if (subCommand.equals("remove") || subCommand.equals("follow")) { + if (subCommand.equals("remove") || subCommand.equals("follow") || subCommand.equals("send") ) { ConfigurationSection playerSection = PinFeature.pinConfig.getConfigurationSection(playerId.toString()); if (playerSection != null) { return playerSection.getKeys(false).stream() @@ -56,4 +60,35 @@ public List onTabComplete(CommandSender sender, Command cmd, String labe //For more see EnvironmentExCommands.java +@EventHandler + public void onWorldChange(PlayerChangedWorldEvent event) { + + + + + + + if (EnvironmentExCommands.playerTasks.containsKey(event.getPlayer().getUniqueId())) { + BukkitTask existingTask = EnvironmentExCommands.playerTasks.remove(event.getPlayer().getUniqueId()); + existingTask.cancel(); // cancel the repeating task + + if (EnvironmentExCommands.bossBars.containsKey(event.getPlayer().getUniqueId())) { + EnvironmentExCommands.bossBars.get(event.getPlayer().getUniqueId()).removeAll(); + EnvironmentExCommands.bossBars.remove(event.getPlayer().getUniqueId()); + } + } + } + @EventHandler + public void onPlayerQuit(PlayerQuitEvent event) { + + + if (EnvironmentExCommands.playerTasks.containsKey(event.getPlayer().getUniqueId())) { + + BukkitTask existingTask = EnvironmentExCommands.playerTasks.remove(event.getPlayer().getUniqueId()); + existingTask.cancel(); // cancel the repeating task + } + + + + } } diff --git a/environmentex/src/main/resources/plugin.yml b/environmentex/src/main/resources/plugin.yml index 24a6c7a..4839a8c 100755 --- a/environmentex/src/main/resources/plugin.yml +++ b/environmentex/src/main/resources/plugin.yml @@ -21,4 +21,7 @@ commands: usage: / pin: description: ---- + usage: / + ignorevote: + description: Setzt den Ignorevote Status usage: / \ No newline at end of file diff --git a/helper/.gradle/8.13/executionHistory/executionHistory.bin b/helper/.gradle/8.13/executionHistory/executionHistory.bin index 5553804..3b85010 100644 Binary files a/helper/.gradle/8.13/executionHistory/executionHistory.bin and b/helper/.gradle/8.13/executionHistory/executionHistory.bin differ diff --git a/helper/.gradle/8.13/executionHistory/executionHistory.lock b/helper/.gradle/8.13/executionHistory/executionHistory.lock index a668750..4ebd890 100644 Binary files a/helper/.gradle/8.13/executionHistory/executionHistory.lock and b/helper/.gradle/8.13/executionHistory/executionHistory.lock differ diff --git a/helper/.gradle/8.13/fileHashes/fileHashes.bin b/helper/.gradle/8.13/fileHashes/fileHashes.bin index 468678c..a3db794 100644 Binary files a/helper/.gradle/8.13/fileHashes/fileHashes.bin and b/helper/.gradle/8.13/fileHashes/fileHashes.bin differ diff --git a/helper/.gradle/8.13/fileHashes/fileHashes.lock b/helper/.gradle/8.13/fileHashes/fileHashes.lock index f59e5dc..f43887e 100644 Binary files a/helper/.gradle/8.13/fileHashes/fileHashes.lock and b/helper/.gradle/8.13/fileHashes/fileHashes.lock differ diff --git a/helper/.gradle/8.13/fileHashes/resourceHashesCache.bin b/helper/.gradle/8.13/fileHashes/resourceHashesCache.bin index 83123b8..b8f384c 100644 Binary files a/helper/.gradle/8.13/fileHashes/resourceHashesCache.bin and b/helper/.gradle/8.13/fileHashes/resourceHashesCache.bin differ diff --git a/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ce4c941..9941efd 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 ec8480f..5351117 100644 --- a/helper/.gradle/buildOutputCleanup/cache.properties +++ b/helper/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Wed Mar 12 11:51:57 CET 2025 +#Sun Jun 29 17:50:55 CEST 2025 gradle.version=8.9 diff --git a/helper/.gradle/caches/paperweight/taskCache/mappedServerJar.jar b/helper/.gradle/caches/paperweight/taskCache/mappedServerJar.jar index 6956931..b26d0aa 100644 Binary files a/helper/.gradle/caches/paperweight/taskCache/mappedServerJar.jar and b/helper/.gradle/caches/paperweight/taskCache/mappedServerJar.jar differ diff --git a/helper/.gradle/caches/paperweight/taskCache/reobfJar.log b/helper/.gradle/caches/paperweight/taskCache/reobfJar.log index ac002a2..1572d42 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 836,17 ms. +Finished after 915,81 ms. diff --git a/helper/.gradle/file-system.probe b/helper/.gradle/file-system.probe index d677229..ac73c27 100644 Binary files a/helper/.gradle/file-system.probe and b/helper/.gradle/file-system.probe differ diff --git a/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar b/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar index 9179a7c..0246260 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/tmp/compileJava/previous-compilation-data.bin b/helper/build/tmp/compileJava/previous-compilation-data.bin index 315b57d..a5a9ff9 100644 Binary files a/helper/build/tmp/compileJava/previous-compilation-data.bin and b/helper/build/tmp/compileJava/previous-compilation-data.bin differ