From 4fa4782d7bb1c149472026053abd1cedbb4a66d7 Mon Sep 17 00:00:00 2001 From: Minenash Date: Wed, 30 Jan 2019 21:42:40 -0500 Subject: Renamed ModBetterDirectional to ModLogDirectional --- .../modules/blockplacemods/BlockPlaceMods.java | 6 +- .../blockplacemods/mods/ModBetterDirectional.java | 73 ---------------------- .../blockplacemods/mods/ModLogDirectional.java | 73 ++++++++++++++++++++++ 3 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 src/main/java/com/redstoner/modules/blockplacemods/mods/ModBetterDirectional.java create mode 100644 src/main/java/com/redstoner/modules/blockplacemods/mods/ModLogDirectional.java diff --git a/src/main/java/com/redstoner/modules/blockplacemods/BlockPlaceMods.java b/src/main/java/com/redstoner/modules/blockplacemods/BlockPlaceMods.java index 1306235..d840dae 100644 --- a/src/main/java/com/redstoner/modules/blockplacemods/BlockPlaceMods.java +++ b/src/main/java/com/redstoner/modules/blockplacemods/BlockPlaceMods.java @@ -8,7 +8,7 @@ import com.redstoner.coremods.moduleLoader.ModuleLoader; import com.redstoner.misc.CommandHolderType; import com.redstoner.misc.Main; import com.redstoner.modules.Module; -import com.redstoner.modules.blockplacemods.mods.ModBetterDirectional; +import com.redstoner.modules.blockplacemods.mods.ModLogDirectional; import com.redstoner.modules.blockplacemods.mods.ModCauldron; import com.redstoner.modules.blockplacemods.mods.ModSlab; import com.redstoner.modules.datamanager.DataManager; @@ -35,8 +35,8 @@ public class BlockPlaceMods implements Module, Listener { private final BlockPlaceMod[] modsToRegister = { new ModCauldron(), new ModSlab(), - new ModBetterDirectional("Observer", Material.OBSERVER, "observers", false), - new ModBetterDirectional("Piston", Material.PISTON, "pistons", false), + new ModLogDirectional("Observer", Material.OBSERVER, "observers", false), + new ModLogDirectional("Piston", Material.PISTON, "pistons", false), }; @Override diff --git a/src/main/java/com/redstoner/modules/blockplacemods/mods/ModBetterDirectional.java b/src/main/java/com/redstoner/modules/blockplacemods/mods/ModBetterDirectional.java deleted file mode 100644 index 99a9f5d..0000000 --- a/src/main/java/com/redstoner/modules/blockplacemods/mods/ModBetterDirectional.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.redstoner.modules.blockplacemods.mods; - -import com.redstoner.modules.blockplacemods.BlockPlaceMod; -import com.redstoner.modules.blockplacemods.ModType; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.block.data.Directional; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.block.BlockPlaceEvent; - -public class ModBetterDirectional extends BlockPlaceMod { - private static final BlockFace[][][] dirMap = { - { - { null, null, null }, - { null, BlockFace.WEST, null }, // (-1, 0, 0) - { null, null, null } - }, - { - { null, BlockFace.DOWN, null }, // (0, -1, 0) - { BlockFace.NORTH, BlockFace.SELF, BlockFace.SOUTH }, // (0, 0, x) - { null, BlockFace.UP, null } // (0, 1, 0) - }, - { - { null, null, null }, - { null, BlockFace.EAST, null }, // (1, 0, 0) - { null, null, null } - } - }; - - private final Material material; - - public ModBetterDirectional(String name, Material material, String materialPlural, boolean enabledByDefault) { - super( - name, - "With this mod enabled " + materialPlural + " are placed with the bottom on the block clicked.", - ModType.STATELESS, - null, - enabledByDefault, - "BetterDirectional" + material.name().toLowerCase() - ); - - this.material = material; - } - - @EventHandler (priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onBlockPlace(BlockPlaceEvent event) { - if ( - event.getBlock().getType() == material - && !event.getPlayer().isSneaking() - && hasEnabled(event.getPlayer()) - && event.getPlayer().getGameMode() == GameMode.CREATIVE - ) { - Block block = event.getBlock(); - Directional data = (Directional) block.getBlockData(); - - data.setFacing(getDirection(event)); - block.setBlockData(data); - } - } - - private BlockFace getDirection(BlockPlaceEvent event) { - Location original = event.getBlockPlaced().getLocation(); - Location against = event.getBlockAgainst().getLocation(); - - Location dir = original.subtract(against); - - return dirMap[dir.getBlockX() + 1][dir.getBlockY() + 1][dir.getBlockZ() + 1]; - } -} diff --git a/src/main/java/com/redstoner/modules/blockplacemods/mods/ModLogDirectional.java b/src/main/java/com/redstoner/modules/blockplacemods/mods/ModLogDirectional.java new file mode 100644 index 0000000..9fb2b6a --- /dev/null +++ b/src/main/java/com/redstoner/modules/blockplacemods/mods/ModLogDirectional.java @@ -0,0 +1,73 @@ +package com.redstoner.modules.blockplacemods.mods; + +import com.redstoner.modules.blockplacemods.BlockPlaceMod; +import com.redstoner.modules.blockplacemods.ModType; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.block.data.Directional; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.block.BlockPlaceEvent; + +public class ModLogDirectional extends BlockPlaceMod { + private static final BlockFace[][][] dirMap = { + { + { null, null, null }, + { null, BlockFace.WEST, null }, // (-1, 0, 0) + { null, null, null } + }, + { + { null, BlockFace.DOWN, null }, // (0, -1, 0) + { BlockFace.NORTH, BlockFace.SELF, BlockFace.SOUTH }, // (0, 0, x) + { null, BlockFace.UP, null } // (0, 1, 0) + }, + { + { null, null, null }, + { null, BlockFace.EAST, null }, // (1, 0, 0) + { null, null, null } + } + }; + + private final Material material; + + public ModLogDirectional(String name, Material material, String materialPlural, boolean enabledByDefault) { + super( + name, + "With this mod enabled " + materialPlural + " are placed with the bottom on the block clicked.", + ModType.STATELESS, + null, + enabledByDefault, + "BetterDirectional" + material.name().toLowerCase() + ); + + this.material = material; + } + + @EventHandler (priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onBlockPlace(BlockPlaceEvent event) { + if ( + event.getBlock().getType() == material + && !event.getPlayer().isSneaking() + && hasEnabled(event.getPlayer()) + && event.getPlayer().getGameMode() == GameMode.CREATIVE + ) { + Block block = event.getBlock(); + Directional data = (Directional) block.getBlockData(); + + data.setFacing(getDirection(event)); + block.setBlockData(data); + } + } + + private BlockFace getDirection(BlockPlaceEvent event) { + Location original = event.getBlockPlaced().getLocation(); + Location against = event.getBlockAgainst().getLocation(); + + Location dir = original.subtract(against); + + return dirMap[dir.getBlockX() + 1][dir.getBlockY() + 1][dir.getBlockZ() + 1]; + } +} -- cgit v1.2.3