From 07b76f256e171a54d26fbd89b81c4186e7ca918e Mon Sep 17 00:00:00 2001 From: FordFriedel Date: Sat, 30 Mar 2024 13:43:37 -0400 Subject: [PATCH 1/3] feat: add toggle speedwalk for villiagers --- .../vane/trifles/FastWalkingListener.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java index 726eaaf5d..a3e999da0 100644 --- a/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java +++ b/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java @@ -1,12 +1,15 @@ package org.oddlama.vane.trifles; +import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerMoveEvent; +import org.oddlama.vane.annotation.config.ConfigBoolean; import org.oddlama.vane.core.Listener; import io.papermc.paper.event.entity.EntityMoveEvent; +import net.minecraft.world.entity.monster.Monster; public class FastWalkingListener extends Listener { @@ -16,6 +19,14 @@ public FastWalkingListener(FastWalkingGroup context) { super(context); this.fast_walking = context; } + @ConfigBoolean(def = false, desc = "Enable to allow hostile mobs to speed walk on paths.") + public boolean hostile_speedwalk; + + @ConfigBoolean(def = true, desc = "Disable to PREVENT villagers from speed walking on paths.") + public boolean villiager_speedwalk; + + @ConfigBoolean(def = false, desc = "Enable to allow ONLY players to speed walk on paths. (will override other path walk settings)") + public boolean players_only_speedwalk; @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void on_player_move(final PlayerMoveEvent event) { @@ -45,6 +56,15 @@ public void on_player_move(final PlayerMoveEvent event) { public void on_entity_move(final EntityMoveEvent event) { final var entity = event.getEntity(); + // Cancel event if speedwalking is only enabled for players + if(players_only_speedwalk) return; + + // Cancel event if speedwalking is disabled for Hostile mobs + if(entity instanceof Monster && !hostile_speedwalk) return; + + // Cancel event if speedwalking is disabled for Villiagers + if(entity.getType() == EntityType.VILLAGER && !villiager_speedwalk) return; + // Inspect block type just a little below var block = event.getTo().clone().subtract(0.0, 0.1, 0.0).getBlock(); if (!fast_walking.config_materials.contains(block.getType())) { From d36bcc1ead3e18a0832a593ef6b7f32fe207b09d Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Sat, 30 Mar 2024 13:44:18 -0400 Subject: [PATCH 2/3] chore: Fix typos --- .../java/org/oddlama/vane/trifles/FastWalkingListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java index a3e999da0..1ae85db67 100644 --- a/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java +++ b/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java @@ -23,7 +23,7 @@ public FastWalkingListener(FastWalkingGroup context) { public boolean hostile_speedwalk; @ConfigBoolean(def = true, desc = "Disable to PREVENT villagers from speed walking on paths.") - public boolean villiager_speedwalk; + public boolean villager_speedwalk; @ConfigBoolean(def = false, desc = "Enable to allow ONLY players to speed walk on paths. (will override other path walk settings)") public boolean players_only_speedwalk; @@ -62,8 +62,8 @@ public void on_entity_move(final EntityMoveEvent event) { // Cancel event if speedwalking is disabled for Hostile mobs if(entity instanceof Monster && !hostile_speedwalk) return; - // Cancel event if speedwalking is disabled for Villiagers - if(entity.getType() == EntityType.VILLAGER && !villiager_speedwalk) return; + // Cancel event if speedwalking is disabled for villagers + if(entity.getType() == EntityType.VILLAGER && !villager_speedwalk) return; // Inspect block type just a little below var block = event.getTo().clone().subtract(0.0, 0.1, 0.0).getBlock(); From 9e8f81f831114f5d46713cc770afd38de47f3fd1 Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Sat, 30 Mar 2024 13:46:22 -0400 Subject: [PATCH 3/3] chore: Improve config descriptions --- .../java/org/oddlama/vane/trifles/FastWalkingListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java index 1ae85db67..74f44640d 100644 --- a/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java +++ b/vane-trifles/src/main/java/org/oddlama/vane/trifles/FastWalkingListener.java @@ -19,13 +19,13 @@ public FastWalkingListener(FastWalkingGroup context) { super(context); this.fast_walking = context; } - @ConfigBoolean(def = false, desc = "Enable to allow hostile mobs to speed walk on paths.") + @ConfigBoolean(def = false, desc = "Whether hostile mobs should be allowed to fast walk on paths.") public boolean hostile_speedwalk; - @ConfigBoolean(def = true, desc = "Disable to PREVENT villagers from speed walking on paths.") + @ConfigBoolean(def = true, desc = "Whether villagers should be allowed to fast walk on paths.") public boolean villager_speedwalk; - @ConfigBoolean(def = false, desc = "Enable to allow ONLY players to speed walk on paths. (will override other path walk settings)") + @ConfigBoolean(def = false, desc = "Whether players should be the only entities allowed to fast walk on paths (will override other path walk settings).") public boolean players_only_speedwalk; @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)