From 8967e2c915ee8ad10e3bd9caded1596a63a48430 Mon Sep 17 00:00:00 2001 From: xGinko Date: Fri, 6 Oct 2023 13:39:49 +0200 Subject: [PATCH] improve comment and sort default entries alphabetically --- .../modules/gameplay/PreventOptimizedDamage.java | 7 ++++--- .../modules/gameplay/PreventOptimizedDamage.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/gameplay/PreventOptimizedDamage.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/gameplay/PreventOptimizedDamage.java index 045228c..114fbe2 100644 --- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/gameplay/PreventOptimizedDamage.java +++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/gameplay/PreventOptimizedDamage.java @@ -27,9 +27,10 @@ public class PreventOptimizedDamage implements VillagerOptimizerModule, Listener config.addComment("gameplay.prevent-damage-to-optimized.enable", "Configure what kind of damage you want to cancel for optimized villagers here."); config.getList("gameplay.prevent-damage-to-optimized.damage-causes-to-cancel", - Arrays.stream(EntityDamageEvent.DamageCause.values()).map(Enum::name).toList(), """ - These are all current entries in the game. Remove what you do not want blocked. Remember sometimes players need to dispose of villagers. - Refer to https://jd.papermc.io/paper/1.20/org/bukkit/event/entity/EntityDamageEvent.DamageCause.html for correct names and a description.\s""" + Arrays.stream(EntityDamageEvent.DamageCause.values()).map(Enum::name).sorted().toList(), """ + These are all current entries in the game. Remove what you do not need blocked.\s + If you want a description or need to add a previously removed type, refer to:\s + https://jd.papermc.io/paper/1.20/org/bukkit/event/entity/EntityDamageEvent.DamageCause.html""" ).forEach(configuredDamageCause -> { try { EntityDamageEvent.DamageCause damageCause = EntityDamageEvent.DamageCause.valueOf(configuredDamageCause); diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/gameplay/PreventOptimizedDamage.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/gameplay/PreventOptimizedDamage.java index 73f5040..a11949b 100644 --- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/gameplay/PreventOptimizedDamage.java +++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/gameplay/PreventOptimizedDamage.java @@ -32,9 +32,10 @@ public class PreventOptimizedDamage implements VillagerOptimizerModule, Listener this.push = config.getBoolean("gameplay.prevent-damage-to-optimized.prevent-push-from-attack", true, "Prevents optimized villagers from getting pushed by an attacking entity"); config.getList("gameplay.prevent-damage-to-optimized.damage-causes-to-cancel", - Arrays.stream(EntityDamageEvent.DamageCause.values()).map(Enum::name).toList(), """ - These are all current entries in the game. Remove what you do not need blocked. Remember sometimes players need to dispose of villagers. - Refer to https://jd.papermc.io/paper/1.20/org/bukkit/event/entity/EntityDamageEvent.DamageCause.html for correct names and a description.\s""" + Arrays.stream(EntityDamageEvent.DamageCause.values()).map(Enum::name).sorted().toList(), """ + These are all current entries in the game. Remove what you do not need blocked.\s + If you want a description or need to add a previously removed type, refer to:\s + https://jd.papermc.io/paper/1.20/org/bukkit/event/entity/EntityDamageEvent.DamageCause.html""" ).forEach(configuredDamageCause -> { try { EntityDamageEvent.DamageCause damageCause = EntityDamageEvent.DamageCause.valueOf(configuredDamageCause);