Altitude/PlayerUtils
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix_rotate #1

Merged
stijn merged 3 commits from fix_rotate into master 2024-08-04 20:29:46 +00:00
Conversation 0 Commits 3 Files Changed 2 +19 -1
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3f6d11547 - Show all commits

2
src/main/java/com/alttd/playerutils/PlayerUtils.java
View File

@ -55,7 +55,7 @@ public final class PlayerUtils extends JavaPlugin {
pluginManager.registerEvents(new XpBottleEvent(this, logger), this); pluginManager.registerEvents(new XpBottleEvent(this, logger), this);
pluginManager.registerEvents(new TeleportEvent(), this); pluginManager.registerEvents(new TeleportEvent(), this);
RotateBlockEvent rotateBlockEvent = new RotateBlockEvent(); RotateBlockEvent rotateBlockEvent = new RotateBlockEvent(logger);
pluginManager.registerEvents(rotateBlockEvent, this); pluginManager.registerEvents(rotateBlockEvent, this);
playerUtilsCommand.addSubCommand(new RotateBlock(rotateBlockEvent)); playerUtilsCommand.addSubCommand(new RotateBlock(rotateBlockEvent));
} }

18
src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java
View File

@ -1,5 +1,6 @@
package com.alttd.playerutils.event_listeners; package com.alttd.playerutils.event_listeners;
import com.alttd.playerutils.util.Logger;
import org.bukkit.Axis; import org.bukkit.Axis;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@ -16,15 +17,22 @@ import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.slf4j.LoggerFactory;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class RotateBlockEvent implements Listener { public class RotateBlockEvent implements Listener {
private static final org.slf4j.Logger log = LoggerFactory.getLogger(RotateBlockEvent.class);
private final HashSet<UUID> rotateEnabled = new HashSet<>(); private final HashSet<UUID> rotateEnabled = new HashSet<>();
private final Logger logger;
private static final List<BlockFace> VALID_FOUR_STATES = List.of(BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST); private static final List<BlockFace> VALID_FOUR_STATES = List.of(BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST);
public RotateBlockEvent(Logger logger) {
this.logger = logger;
}
public synchronized boolean toggleRotate(UUID uuid) { public synchronized boolean toggleRotate(UUID uuid) {
if (rotateEnabled.contains(uuid)) { if (rotateEnabled.contains(uuid)) {
@ -55,11 +63,14 @@ public class RotateBlockEvent implements Listener {
return; return;
Material type = block.getType(); Material type = block.getType();
logger.debug(String.format("Material %s with action %s", type, event.getAction().isLeftClick() ? "left click" : "right click"));
if (type.equals(Material.IRON_TRAPDOOR) && event.getAction().isLeftClick()) { if (type.equals(Material.IRON_TRAPDOOR) && event.getAction().isLeftClick()) {
event.setCancelled(true); event.setCancelled(true);
logger.debug("Toggling trap door");
toggleTrapDoor(block, player); toggleTrapDoor(block, player);
} else if (Tag.BIG_DRIPLEAF_PLACEABLE.isTagged(type) && event.getAction().isLeftClick()) { } else if (Tag.BIG_DRIPLEAF_PLACEABLE.isTagged(type) && event.getAction().isLeftClick()) {
event.setCancelled(true); event.setCancelled(true);
logger.debug("Toggling drip leaf");
toggleDripLeaf(block, player); toggleDripLeaf(block, player);
} else if (Tag.STAIRS.isTagged(type)) { } else if (Tag.STAIRS.isTagged(type)) {
event.setCancelled(true); event.setCancelled(true);
@ -94,24 +105,31 @@ public class RotateBlockEvent implements Listener {
BigDripleaf.Tilt[] values = BigDripleaf.Tilt.values(); BigDripleaf.Tilt[] values = BigDripleaf.Tilt.values();
int ordinal = bigDripleaf.getTilt().ordinal(); int ordinal = bigDripleaf.getTilt().ordinal();
logger.debug("drip leaf is on tilt %d".formatted(ordinal));
if (++ordinal == values.length) { if (++ordinal == values.length) {
ordinal = 0; ordinal = 0;
} }
bigDripleaf.setTilt(values[ordinal]); bigDripleaf.setTilt(values[ordinal]);
logger.debug("drip leaf set to tilt %d".formatted(ordinal));
block.setBlockAndForget(bigDripleaf); block.setBlockAndForget(bigDripleaf);
logger.debug("drip leaf set");
} }
private void toggleTrapDoor(Block block, Player player) { private void toggleTrapDoor(Block block, Player player) {
if (!(block instanceof TrapDoor trapDoor)) { if (!(block instanceof TrapDoor trapDoor)) {
logger.debug("Trap door early return 1");
return; return;
} }
if (cannotBuild(block, player)) { if (cannotBuild(block, player)) {
logger.debug("Trap door early return 2");
return; return;
} }
logger.debug("Trap door is %s".formatted(trapDoor.isOpen() ? "open" : "closed"));
trapDoor.setOpen(!trapDoor.isOpen()); trapDoor.setOpen(!trapDoor.isOpen());
logger.debug(String.format("Trap door set to %s", trapDoor.isOpen() ? "open" : "close"));
} }
private void toggleRails(Block block, Player player) { private void toggleRails(Block block, Player player) {