Merge pull request 'added Anti Player Loot despawn' (#16) from feature/AntiPlayerLootDespawn into master

Reviewed-on: #16

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'com.gradleup.shadow' version "8.3.5"
+    id 'com.gradleup.shadow' version "9.6.1"
 }
 
 allprojects {
@@ -29,7 +29,7 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion = JavaLanguageVersion.of(25)
         }
     }
 }

common/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     implementation project(':core')
 
-    compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
     compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
     implementation 'com.sparkjava:spark-core:2.9.4'

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMessages/ChatMessages.java

@@ -25,7 +25,7 @@ public class ChatMessages extends Appliance {
     public Component addReportActions(Component message, String username) {
         return message
             .hoverEvent(HoverEvent.showText(Component.text("Klicke, um diesen Spieler zu reporten").color(NamedTextColor.GOLD)))
-            .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.SUGGEST_COMMAND, String.format("/report %s ", username)));
+            .clickEvent(ClickEvent.suggestCommand(String.format("/report %s ", username)));
     }
 
     @Override

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java

@@ -85,7 +85,7 @@ public class Report extends Appliance {
                         .append(
                             Component
                                 .text(createdReport.data().url(), NamedTextColor.GRAY)
-                                .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, createdReport.data().url()))
+                                .clickEvent(ClickEvent.openUrl(createdReport.data().url()))
                         )
                         .appendNewline()
                         .appendNewline()

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/security/antiFormattedBook/AntiFormattedBook.java

@@ -32,7 +32,7 @@ public class AntiFormattedBook extends Appliance {
 
         if (component instanceof TextComponent tc && tc.content().indexOf(SECTION) >= 0) return true;
 
-        if (component instanceof NBTComponent<?, ?> nbt) {
+        if (component instanceof NBTComponent<?> nbt) {
             if (nbt.separator() != null && this.hasFormattingDeep(nbt.separator())) return true;
         }
 

core/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
     compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
     implementation 'com.sparkjava:spark-core:2.9.4'

core/src/main/java/eu/mhsl/craftattack/spawn/core/util/IteratorUtil.java

@@ -32,7 +32,7 @@ public class IteratorUtil {
     }
 
     public static void times(int times, Runnable callback) {
-        IntStream.range(0, times).forEach(value -> callback.run());
+        IntStream.range(0, times).forEach(_ -> callback.run());
     }
 
     public static <T> void iterateListInGlobal(int sectionStart, List<T> list, BiConsumer<Integer, T> callback) {

craftattack/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation project(':core')
     implementation project(':common')
 
-    compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
     compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
     implementation 'com.sparkjava:spark-core:2.9.4'

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/newYearFirework/NewYearFirework.java

@@ -0,0 +1,48 @@
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.newYearFirework;
+
+import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
+import org.bukkit.Color;
+import org.bukkit.FireworkEffect;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Firework;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.meta.FireworkMeta;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Locale;
+
+public class NewYearFirework extends Appliance {
+    private static final String namespace = NewYearFirework.class.getSimpleName().toLowerCase(Locale.ROOT);
+    public static NamespacedKey fireworkKey = new NamespacedKey(namespace, "newyear_firework".toLowerCase());
+
+    public void spawnFirework(Player player) {
+        for (int i = 0; i < 5; i++) {
+            Firework firework = player.getWorld().spawn(player.getLocation(), Firework.class);
+            firework.getPersistentDataContainer().set(fireworkKey, PersistentDataType.BOOLEAN, true);
+            FireworkMeta fireworkMeta = firework.getFireworkMeta();
+            fireworkMeta.addEffect(FireworkEffect.builder()
+                    .with(FireworkEffect.Type.BALL)
+                    .withColor(Color.AQUA, Color.RED, Color.LIME, Color.ORANGE, Color.YELLOW)
+                    .withFade(Color.FUCHSIA, Color.WHITE)
+                    .trail(true)
+                    .flicker(true)
+                    .build()
+            );
+            fireworkMeta.setPower((int) (i % 3 + 0.25));
+            firework.setFireworkMeta(fireworkMeta);
+        }
+    }
+
+    public boolean shouldSpawnFirework() {
+        return LocalDate.now().getDayOfYear() == 1;
+    }
+
+    @Override
+    protected @NotNull List<Listener> listeners() {
+        return List.of(new NewYearFireworkListener());
+    }
+}

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/newYearFirework/NewYearFireworkListener.java

@@ -0,0 +1,21 @@
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.newYearFirework;
+
+import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
+import org.bukkit.entity.Firework;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+class NewYearFireworkListener extends ApplianceListener<NewYearFirework> {
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        if(!this.getAppliance().shouldSpawnFirework()) return;
+        this.getAppliance().spawnFirework(event.getPlayer());
+    }
+    @EventHandler
+    public void onDamage(EntityDamageByEntityEvent event) {
+        if(!(event.getDamager() instanceof Firework firework)) return;
+        if(!firework.getPersistentDataContainer().has(NewYearFirework.fireworkKey)) return;
+        event.setCancelled(true);
+    }
+}

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/quarzRecipe/QuarzRecipe.java

@@ -0,0 +1,42 @@
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.quarzRecipe;
+
+import eu.mhsl.craftattack.spawn.core.Main;
+import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.ShapelessRecipe;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class QuarzRecipe extends Appliance {
+    private NamespacedKey recipeKey;
+    @Override
+    public void onEnable() {
+        this.recipeKey = new NamespacedKey(Main.instance(), "quarz_block_to_quarz");
+
+        ShapelessRecipe recipe = new ShapelessRecipe(this.recipeKey, new ItemStack(Material.QUARTZ, 4));
+        recipe.addIngredient(Material.QUARTZ_BLOCK);
+
+        Bukkit.addRecipe(recipe);
+        Bukkit.getOnlinePlayers().forEach(this::unlock);
+    }
+
+    @Override
+    public void onDisable() {
+        Bukkit.removeRecipe(this.recipeKey);
+    }
+
+    public void unlock(Player player) {
+        player.discoverRecipe(this.recipeKey);
+    }
+
+    @Override
+    protected @NotNull List<Listener> listeners() {
+        return List.of(new QuarzRecipeListener());
+    }
+}

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/quarzRecipe/QuarzRecipeListener.java

@@ -0,0 +1,12 @@
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.quarzRecipe;
+
+import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+class QuarzRecipeListener extends ApplianceListener<QuarzRecipe> {
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        this.getAppliance().unlock(event.getPlayer());
+    }
+}

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/antiPlayerLootDespawn/AntiPlayerLootDespawn.java

@@ -0,0 +1,45 @@
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.antiPlayerLootDespawn;
+
+import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Item;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Locale;
+
+public class AntiPlayerLootDespawn extends Appliance {
+    private static final int extraCycles = 5;
+    private static final String namespace = AntiPlayerLootDespawnListener.class.getSimpleName().toLowerCase(Locale.ROOT);
+    public static NamespacedKey cyclesKey = new NamespacedKey(namespace, "item_deaths_cycles".toLowerCase());
+
+    public void markItems(List<ItemStack> item) {
+        item.forEach(itemStack ->
+            itemStack.editPersistentDataContainer(persistentDataContainer ->
+                persistentDataContainer.set(cyclesKey, PersistentDataType.INTEGER, extraCycles)
+            )
+        );
+    }
+
+    public boolean isItemAboveMaxAge(Item item) {
+        ItemStack itemStack = item.getItemStack();
+
+        int cycles = itemStack.getPersistentDataContainer()
+                .getOrDefault(AntiPlayerLootDespawn.cyclesKey, PersistentDataType.INTEGER, 0);
+
+        itemStack.editPersistentDataContainer(data ->
+                data.set(AntiPlayerLootDespawn.cyclesKey, PersistentDataType.INTEGER, cycles - 1)
+        );
+
+        item.setItemStack(itemStack);
+        return cycles > 0;
+    }
+
+    @Override
+    protected @NotNull List<Listener> listeners() {
+        return List.of(new AntiPlayerLootDespawnListener());
+    }
+}

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/antiPlayerLootDespawn/AntiPlayerLootDespawnListener.java

@@ -0,0 +1,19 @@
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.antiPlayerLootDespawn;
+
+import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.ItemDespawnEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+
+class AntiPlayerLootDespawnListener extends ApplianceListener<AntiPlayerLootDespawn> {
+
+    @EventHandler
+    public void onDeath(PlayerDeathEvent event) {
+        this.getAppliance().markItems(event.getDrops());
+    }
+
+    @EventHandler
+    public void onItemDespawn(ItemDespawnEvent event) {
+        event.setCancelled(this.getAppliance().isItemAboveMaxAge(event.getEntity()));
+    }
+}

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/security/antiGrief/AntiGrief.java

@@ -20,7 +20,7 @@ import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListMap;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java

@@ -26,10 +26,8 @@ import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
-import static java.util.Map.entry;
 import static org.bukkit.Sound.MUSIC_DISC_LAVA_CHICKEN;
 
 public class ProjectStart extends Appliance {
@@ -57,17 +55,23 @@ public class ProjectStart extends Appliance {
         )
     );
 
-    private final Map<GameRule<Boolean>, Boolean> gameRulesAfterStart = Map.ofEntries(
+    private record GameRuleSetting<T>(GameRule<T> rule, T before, T after) {
-        entry(GameRule.DO_DAYLIGHT_CYCLE, true),
+        void apply(boolean afterStart) {
-        entry(GameRule.DO_INSOMNIA, true),
+            IteratorUtil.worlds(world -> world.setGameRule(this.rule, afterStart ? this.after : this.before));
-        entry(GameRule.DISABLE_RAIDS, false),
+        }
-        entry(GameRule.DO_FIRE_TICK, true),
+    }
-        entry(GameRule.DO_ENTITY_DROPS, true),
+
-        entry(GameRule.DO_PATROL_SPAWNING, true),
+    private final List<GameRuleSetting<?>> gameRules = List.of(
-        entry(GameRule.DO_TRADER_SPAWNING, true),
+        new GameRuleSetting<>(GameRules.ADVANCE_TIME, false, true),
-        entry(GameRule.DO_WEATHER_CYCLE, true),
+        new GameRuleSetting<>(GameRules.SPAWN_PHANTOMS, false, true),
-        entry(GameRule.FALL_DAMAGE, true),
+        new GameRuleSetting<>(GameRules.RAIDS, false, true),
-        entry(GameRule.FIRE_DAMAGE, true)
+        new GameRuleSetting<>(GameRules.ENTITY_DROPS, false, true),
+        new GameRuleSetting<>(GameRules.SPAWN_PATROLS, false, true),
+        new GameRuleSetting<>(GameRules.SPAWN_WANDERING_TRADERS, false, true),
+        new GameRuleSetting<>(GameRules.ADVANCE_WEATHER, false, true),
+        new GameRuleSetting<>(GameRules.FALL_DAMAGE, false, true),
+        new GameRuleSetting<>(GameRules.FIRE_DAMAGE, false, true),
+        new GameRuleSetting<>(GameRules.FIRE_SPREAD_RADIUS_AROUND_PLAYER, 0, -1)
     );
 
     public ProjectStart() {
@@ -76,7 +80,7 @@ public class ProjectStart extends Appliance {
         this.countdown.addCustomAnnouncement(
             new Countdown.CustomAnnouncements(
                 counter -> counter == this.startMusicAt,
-                counter -> this.glassLocation
+                _ -> this.glassLocation
                     .getWorld()
                     .playSound(this.glassLocation, MUSIC_DISC_LAVA_CHICKEN, SoundCategory.RECORDS, 500f, 1f)
             )
@@ -121,7 +125,7 @@ public class ProjectStart extends Appliance {
         this.setEnabled(false);
 
         IteratorUtil.worlds(World::getWorldBorder, worldBorder -> worldBorder.setSize(worldBorder.getMaxSize()));
-        IteratorUtil.worlds(world -> IteratorUtil.setGameRules(this.gameRulesAfterStart, false));
+        this.gameRules.forEach(setting -> setting.apply(true));
         Bukkit.getWorlds().getFirst().setFullTime(0);
 
         this.netherFireLocations.forEach(location -> Objects.requireNonNull(this.startWorld).getBlockAt(location).setType(Material.FIRE));
@@ -168,7 +172,7 @@ public class ProjectStart extends Appliance {
             worldBorder.setDamageAmount(0);
         });
 
-        IteratorUtil.worlds(world -> world, world -> IteratorUtil.setGameRules(this.gameRulesAfterStart, true));
+        this.gameRules.forEach(setting -> setting.apply(false));
         this.resetAdvancements();
 
         this.blockCycle.reset();

event/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation project(':common')
     implementation project(':core')
 
-    compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
     compileOnly 'org.geysermc.floodgate:api:2.2.4-SNAPSHOT'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
     implementation 'com.sparkjava:spark-core:2.9.4'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

local.gradle.example

@@ -1,6 +1,6 @@
 tasks.register('deployVaroPlugin', Copy) {
     dependsOn ":varo:shadowJar"
-    from { project(":varo").shadowJar.archivePath }
+    from { project(":varo").shadowJar.archiveFile }
     into file('path') // path to plugins folder
     rename { fileName -> "varo.jar" }
 }
@@ -10,15 +10,15 @@ tasks.register("uploadVaroPlugin") {
 
     doLast {
         def jarFile = project(":varo").tasks.named("shadowJar").get().outputs.files.singleFile
-        exec {
+        providers.exec {
             commandLine "scp", "-4", "-P", "22", jarFile.absolutePath, "user@host:path/varo.jar"
-        }
+        }.result.get()
     }
 }
 
 tasks.register('deployCraftAttackPlugin', Copy) {
     dependsOn ":craftattack:shadowJar"
-    from { project(":craftattack").shadowJar.archivePath }
+    from { project(":craftattack").shadowJar.archiveFile }
     into file('path') // path to plugins folder
     rename { fileName -> "craftattack.jar" }
 }

varo/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation project(':core')
     implementation project(':common')
 
-    compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:26.2.build.129-stable'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
     implementation 'com.sparkjava:spark-core:2.9.4'
 }

varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/metaGameplay/forbiddenItems/ForbiddenPotionsListener.java

@@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerItemConsumeEvent;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffect;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 import java.util.Collection;
 
 class ForbiddenPotionsListener extends ApplianceListener<ForbiddenItems> {