From 1c47d8960830e598ea783230d6e3638af9e3776a Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 10 Dec 2021 11:36:15 +0100 Subject: [PATCH] Add SmartPlaceBehaviour Extract behaviours from SmartPlaceListener Signed-off-by: yoyosource --- .../smartplace/SmartPlaceBehaviour.java | 45 ++++++++++ .../smartplace/SmartPlaceListener.java | 88 ++++++------------- .../behaviour/BlockPlaceBehaviour.java | 60 +++++++++++++ .../behaviour/BlockRotatingBehaviour.java | 81 +++++++++++++++++ .../behaviour/ReverseRepeaterBehaviour.java | 55 ++++++++++++ .../bausystem/linkage/LinkageType.java | 11 ++- 6 files changed, 276 insertions(+), 64 deletions(-) create mode 100644 BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceBehaviour.java create mode 100644 BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/BlockPlaceBehaviour.java create mode 100644 BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/BlockRotatingBehaviour.java create mode 100644 BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/ReverseRepeaterBehaviour.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceBehaviour.java b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceBehaviour.java new file mode 100644 index 00000000..19ca8d0d --- /dev/null +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceBehaviour.java @@ -0,0 +1,45 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.bausystem.features.smartplace; + +import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.player.PlayerInteractEvent; + +public interface SmartPlaceBehaviour { + + enum SmartPlaceResult { + APPLIED, + IGNORED + } + + enum SmartPlaceType { + PLACE, + INTERACT_DIRECT, // Before checking if block is interacteable + INTERACT_INDIRECT, // After checking if block is interacteable + } + + SmartPlaceType getType(); + default SmartPlaceResult place(BlockPlaceEvent event) { + return SmartPlaceResult.IGNORED; + } + default SmartPlaceResult interact(PlayerInteractEvent event) { + return SmartPlaceResult.IGNORED; + } +} diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java index 74adbee9..b63abbb0 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java @@ -23,41 +23,39 @@ import de.steamwar.bausystem.configplayer.Config; import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.Linked; import org.bukkit.GameMode; -import org.bukkit.Material; -import org.bukkit.World; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Directional; import org.bukkit.block.data.Rotatable; -import org.bukkit.block.data.type.Repeater; -import org.bukkit.event.Event; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.inventory.InventoryHolder; + +import java.util.ArrayList; +import java.util.List; @Linked(LinkageType.LISTENER) public class SmartPlaceListener implements Listener { + private static List smartPlaceBehaviours = new ArrayList<>(); + + public static void add(SmartPlaceBehaviour smartPlaceBehaviour) { + smartPlaceBehaviours.add(smartPlaceBehaviour); + } + @EventHandler public void onBlockPlace(BlockPlaceEvent event) { if (event.getPlayer().isSneaking() && Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) { - Block block = event.getBlockPlaced(); - BlockData blockData = block.getBlockData(); - if (blockData instanceof Directional) { - Directional directional = (Directional) blockData; - BlockFace blockFace = directional.getFacing().getOppositeFace(); - if (directional.getFaces().contains(blockFace)) { - directional.setFacing(blockFace); + SmartPlaceBehaviour.SmartPlaceResult smartPlaceResult = SmartPlaceBehaviour.SmartPlaceResult.IGNORED; + for (SmartPlaceBehaviour smartPlaceBehaviour : smartPlaceBehaviours) { + if (smartPlaceBehaviour.getType() == SmartPlaceBehaviour.SmartPlaceType.PLACE) { + smartPlaceBehaviour.place(event); + } + if (smartPlaceResult == SmartPlaceBehaviour.SmartPlaceResult.APPLIED) { + break; } - } else if (blockData instanceof Rotatable) { - Rotatable rotatable = (Rotatable) blockData; - rotatable.setRotation(rotatable.getRotation()); } - block.setBlockData(blockData); } } @@ -67,20 +65,14 @@ public class SmartPlaceListener implements Listener { if (event.getPlayer().getGameMode() == GameMode.SPECTATOR) return; if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return; - // Reverse repeater - if (event.getPlayer().isSneaking()) { - if (event.getClickedBlock().getType() == Material.REPEATER) { - if (event.getItem() != null && event.getMaterial() != Material.REPEATER) { - return; - } - Repeater repeater = (Repeater) event.getClickedBlock().getBlockData(); - int i = repeater.getDelay() - 1; - if (i <= 0) i += 4; - repeater.setDelay(i); - event.getClickedBlock().setBlockData(repeater); - event.setCancelled(true); + for (SmartPlaceBehaviour smartPlaceBehaviour : smartPlaceBehaviours) { + SmartPlaceBehaviour.SmartPlaceResult smartPlaceResult = SmartPlaceBehaviour.SmartPlaceResult.IGNORED; + if (smartPlaceBehaviour.getType() == SmartPlaceBehaviour.SmartPlaceType.INTERACT_DIRECT) { + smartPlaceResult = smartPlaceBehaviour.interact(event); + } + if (smartPlaceResult == SmartPlaceBehaviour.SmartPlaceResult.APPLIED) { + return; } - return; } if (!event.getClickedBlock().getType().isInteractable()) return; @@ -95,38 +87,14 @@ public class SmartPlaceListener implements Listener { return; } - if (event.getClickedBlock().getType() == event.getMaterial() || event.getMaterial() == Material.HOPPER) { - if (!(event.getClickedBlock().getState() instanceof InventoryHolder)) { - return; + for (SmartPlaceBehaviour smartPlaceBehaviour : smartPlaceBehaviours) { + SmartPlaceBehaviour.SmartPlaceResult smartPlaceResult = SmartPlaceBehaviour.SmartPlaceResult.IGNORED; + if (smartPlaceBehaviour.getType() == SmartPlaceBehaviour.SmartPlaceType.INTERACT_INDIRECT) { + smartPlaceResult = smartPlaceBehaviour.interact(event); } - } else { - BlockData blockData = event.getMaterial().createBlockData(); - if (blockData instanceof Directional) { - return; - } - if (blockData instanceof Rotatable) { + if (smartPlaceResult == SmartPlaceBehaviour.SmartPlaceResult.APPLIED) { return; } } - - // TODO: Fix block setting - event.setUseInteractedBlock(Event.Result.DENY); - World world = event.getPlayer().getWorld(); - Block block = world.getBlockAt(event.getClickedBlock().getX() + event.getBlockFace().getModX(), event.getClickedBlock().getY() + event.getBlockFace().getModY(), event.getClickedBlock().getZ() + event.getBlockFace().getModZ()); - block.setType(event.getMaterial()); - BlockData blockData = event.getItem().getType().createBlockData(); - BlockFace blockFace = event.getBlockFace(); - if (block.getType() == Material.HOPPER || block.getType() == Material.OBSERVER) { - blockFace = blockFace.getOppositeFace(); - } - if (blockData instanceof Directional) { - Directional directional = (Directional) blockData; - if (directional.getFaces().contains(blockFace)) { - directional.setFacing(blockFace); - } - } else if (blockData instanceof Rotatable) { - ((Rotatable) blockData).setRotation(blockFace); - } - block.setBlockData(blockData); } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/BlockPlaceBehaviour.java b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/BlockPlaceBehaviour.java new file mode 100644 index 00000000..8b7ee259 --- /dev/null +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/BlockPlaceBehaviour.java @@ -0,0 +1,60 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.bausystem.features.smartplace.behaviour; + +import de.steamwar.bausystem.features.smartplace.SmartPlaceBehaviour; +import de.steamwar.bausystem.linkage.LinkageType; +import de.steamwar.bausystem.linkage.Linked; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.block.data.BlockData; +import org.bukkit.block.data.Directional; +import org.bukkit.block.data.Rotatable; +import org.bukkit.event.block.BlockPlaceEvent; + +@Linked(LinkageType.SMART_PLACE) +public class BlockPlaceBehaviour implements SmartPlaceBehaviour { + + @Override + public SmartPlaceType getType() { + return SmartPlaceType.PLACE; + } + + @Override + public SmartPlaceResult place(BlockPlaceEvent event) { + SmartPlaceResult smartPlaceResult = SmartPlaceResult.IGNORED; + Block block = event.getBlockPlaced(); + BlockData blockData = block.getBlockData(); + if (blockData instanceof Directional) { + Directional directional = (Directional) blockData; + BlockFace blockFace = directional.getFacing().getOppositeFace(); + if (directional.getFaces().contains(blockFace)) { + directional.setFacing(blockFace); + } + smartPlaceResult = SmartPlaceResult.APPLIED; + } else if (blockData instanceof Rotatable) { + Rotatable rotatable = (Rotatable) blockData; + rotatable.setRotation(rotatable.getRotation()); + smartPlaceResult = SmartPlaceResult.APPLIED; + } + block.setBlockData(blockData); + return smartPlaceResult; + } +} diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/BlockRotatingBehaviour.java b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/BlockRotatingBehaviour.java new file mode 100644 index 00000000..29071148 --- /dev/null +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/BlockRotatingBehaviour.java @@ -0,0 +1,81 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.bausystem.features.smartplace.behaviour; + +import de.steamwar.bausystem.features.smartplace.SmartPlaceBehaviour; +import de.steamwar.bausystem.linkage.LinkageType; +import de.steamwar.bausystem.linkage.Linked; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.block.data.BlockData; +import org.bukkit.block.data.Directional; +import org.bukkit.block.data.Rotatable; +import org.bukkit.event.Event; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.InventoryHolder; + +@Linked(LinkageType.SMART_PLACE) +public class BlockRotatingBehaviour implements SmartPlaceBehaviour { + + @Override + public SmartPlaceType getType() { + return SmartPlaceType.INTERACT_INDIRECT; + } + + @Override + public SmartPlaceResult interact(PlayerInteractEvent event) { + if (event.getClickedBlock().getType() == event.getMaterial() || event.getMaterial() == Material.HOPPER) { + if (!(event.getClickedBlock().getState() instanceof InventoryHolder)) { + return SmartPlaceResult.IGNORED; + } + } else { + BlockData blockData = event.getMaterial().createBlockData(); + if (blockData instanceof Directional) { + return SmartPlaceResult.IGNORED; + } + if (blockData instanceof Rotatable) { + return SmartPlaceResult.IGNORED; + } + } + + // TODO: Fix block setting + event.setUseInteractedBlock(Event.Result.DENY); + World world = event.getPlayer().getWorld(); + Block block = world.getBlockAt(event.getClickedBlock().getX() + event.getBlockFace().getModX(), event.getClickedBlock().getY() + event.getBlockFace().getModY(), event.getClickedBlock().getZ() + event.getBlockFace().getModZ()); + block.setType(event.getMaterial()); + BlockData blockData = event.getItem().getType().createBlockData(); + BlockFace blockFace = event.getBlockFace(); + if (block.getType() == Material.HOPPER || block.getType() == Material.OBSERVER) { + blockFace = blockFace.getOppositeFace(); + } + if (blockData instanceof Directional) { + Directional directional = (Directional) blockData; + if (directional.getFaces().contains(blockFace)) { + directional.setFacing(blockFace); + } + } else if (blockData instanceof Rotatable) { + ((Rotatable) blockData).setRotation(blockFace); + } + block.setBlockData(blockData); + return SmartPlaceResult.APPLIED; + } +} diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/ReverseRepeaterBehaviour.java b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/ReverseRepeaterBehaviour.java new file mode 100644 index 00000000..2c4a071a --- /dev/null +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/behaviour/ReverseRepeaterBehaviour.java @@ -0,0 +1,55 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.bausystem.features.smartplace.behaviour; + +import de.steamwar.bausystem.features.smartplace.SmartPlaceBehaviour; +import de.steamwar.bausystem.linkage.LinkageType; +import de.steamwar.bausystem.linkage.Linked; +import org.bukkit.Material; +import org.bukkit.block.data.type.Repeater; +import org.bukkit.event.player.PlayerInteractEvent; + +@Linked(LinkageType.SMART_PLACE) +public class ReverseRepeaterBehaviour implements SmartPlaceBehaviour { + + @Override + public SmartPlaceType getType() { + return SmartPlaceType.INTERACT_DIRECT; + } + + @Override + public SmartPlaceResult interact(PlayerInteractEvent event) { + if (event.getPlayer().isSneaking()) { + if (event.getClickedBlock().getType() == Material.REPEATER) { + if (event.getItem() != null && event.getMaterial() != Material.REPEATER) { + return SmartPlaceResult.APPLIED; + } + Repeater repeater = (Repeater) event.getClickedBlock().getBlockData(); + int i = repeater.getDelay() - 1; + if (i <= 0) i += 4; + repeater.setDelay(i); + event.getClickedBlock().setBlockData(repeater); + event.setCancelled(true); + } + return SmartPlaceResult.APPLIED; + } + return SmartPlaceResult.IGNORED; + } +} diff --git a/BauSystem_Main/src/de/steamwar/bausystem/linkage/LinkageType.java b/BauSystem_Main/src/de/steamwar/bausystem/linkage/LinkageType.java index 9b501472..ab9f6be6 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/linkage/LinkageType.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/linkage/LinkageType.java @@ -20,13 +20,15 @@ package de.steamwar.bausystem.linkage; import de.steamwar.bausystem.BauSystem; -import de.steamwar.bausystem.configplayer.ConfigConverter; import de.steamwar.bausystem.configplayer.Config; +import de.steamwar.bausystem.configplayer.ConfigConverter; import de.steamwar.bausystem.features.gui.BauGUI; -import de.steamwar.bausystem.features.slaves.panzern.Panzern; -import de.steamwar.bausystem.features.slaves.panzern.PanzernAlgorithm; import de.steamwar.bausystem.features.script.ScriptExecutor; import de.steamwar.bausystem.features.script.SpecialCommand; +import de.steamwar.bausystem.features.slaves.panzern.Panzern; +import de.steamwar.bausystem.features.slaves.panzern.PanzernAlgorithm; +import de.steamwar.bausystem.features.smartplace.SmartPlaceBehaviour; +import de.steamwar.bausystem.features.smartplace.SmartPlaceListener; import de.steamwar.bausystem.linkage.specific.BauGuiItem; import de.steamwar.bausystem.linkage.specific.ScoreboardItem; import de.steamwar.command.SWCommand; @@ -58,7 +60,8 @@ public enum LinkageType { SCRIPT_COMMAND(4, false, SpecialCommand.class::isAssignableFrom, o -> ScriptExecutor.SPECIAL_COMMANDS.add((SpecialCommand) o)), CONFIG_CONVERTER(5, false, ConfigConverter.class::isAssignableFrom, o -> Config.addConfigConverter((ConfigConverter) o)), SCOREBOARD(6, false, ScoreboardItem.class::isAssignableFrom, o -> {}), - PANZERN(7, false, PanzernAlgorithm.class::isAssignableFrom, o -> Panzern.add((PanzernAlgorithm) o)); + PANZERN(7, false, PanzernAlgorithm.class::isAssignableFrom, o -> Panzern.add((PanzernAlgorithm) o)), + SMART_PLACE(8, false, SmartPlaceBehaviour.class::isAssignableFrom, o -> SmartPlaceListener.add((SmartPlaceBehaviour) o)); private final int order;