SteamWar/BauSystem
SteamWar/BauSystem
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Releases Wiki Aktivität

Merge pull request 'Reworked Detonator' (#95) from detonator2.0 into master

Quellcode durchsuchen 
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2020-09-13 19:49:27 +02:00
Commit 1e465d36a3
10 geänderte Dateien mit 323 neuen und 434 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

62
BauSystem_12/src/de/steamwar/bausystem/world/AutoLoader_12.java
Datei anzeigen

@ -19,12 +19,18 @@
package de.steamwar.bausystem.world;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.event.block.Action;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.event.player.PlayerInteractEvent;
import java.util.List;
import java.util.stream.Collectors;
class AutoLoader_12 {
private AutoLoader_12(){}
@ -47,11 +53,25 @@ class AutoLoader_12 {
block.setData((byte)(block.getData() | 8));
else
block.setData((byte)(block.getData() & -9));
}else if(material == Material.STONE_PLATE || material == Material.WOOD_PLATE){
if(active)
block.setData((byte)1);
}else if(material == Material.STONE_PLATE || material == Material.WOOD_PLATE) {
if (active)
block.setData((byte) 1);
else
block.setData((byte)0);
block.setData((byte) 0);
}else if(material == Material.TRIPWIRE) {
if(active) {
ArmorStand armorStand = (ArmorStand) Bukkit.getWorlds().get(0).spawnEntity(location, EntityType.ARMOR_STAND);
armorStand.setVisible(false);
armorStand.setBasePlate(false);
armorStand.addScoreboardTag("detonator-" + location.getBlockX() + location.getBlockY() + location.getBlockZ());
}else {
List<Entity> entityList = Bukkit.getWorlds().get(0).getEntitiesByClasses(ArmorStand.class).stream().filter(entity ->
entity.getScoreboardTags().contains("detonator-" + location.getBlockX() + location.getBlockY() + location.getBlockZ()))
.limit(1)
.collect(Collectors.toList());
if(entityList.isEmpty()) return false;
entityList.get(0).remove();
}
}else{
return false;
}
@ -60,32 +80,30 @@ class AutoLoader_12 {
}
@SuppressWarnings("deprecation")
static void onPlayerInteract(IAutoLoader loader, PlayerInteractEvent event){
if(event.getAction() == Action.RIGHT_CLICK_BLOCK){
static Detoloader onPlayerInteractLoader(PlayerInteractEvent event){
Block block = event.getClickedBlock();
Material material = block.getType();
if(material == Material.LEVER){
if((block.getData() & 8) == 8) {
new IAutoLoader.RedstoneActivation(loader, block.getLocation(), loader.getLastActivation(), false);
loader.print("§eHebel zurückgesetzt", true);
return new Detoloader("Hebel", 0).setActive(false);
}else{
new IAutoLoader.RedstoneActivation(loader, block.getLocation(), 1, true);
loader.print("§eHebel betätigt", true);
return new Detoloader("Hebel", 0).setActive(true);
}
}else if(material == Material.STONE_BUTTON){
new IAutoLoader.TemporaryActivation(loader, block.getLocation(), 20);
loader.print("§eKnopf betätigt", true);
return new Detoloader("Knopf", Detoloader.STONE_BUTTON);
}else if(material == Material.WOOD_BUTTON){
new IAutoLoader.TemporaryActivation(loader, block.getLocation(), 30);
loader.print("§eKnopf betätigt", true);
}
}else if(event.getAction() == Action.PHYSICAL){
Block block = event.getClickedBlock();
Material material = block.getType();
if(material == Material.STONE_PLATE || material == Material.WOOD_PLATE){
new IAutoLoader.TemporaryActivation(loader, block.getLocation(), 20);
loader.print("§eDruckplatte betätigt", true);
return new Detoloader("Knopf", Detoloader.WOODEN_BUTTON);
}else if (material == Material.NOTE_BLOCK) {
return new Detoloader("Noteblock", Detoloader.NOTE_BLOCK);
}else if(material == Material.STONE_PLATE || material == Material.WOOD_PLATE){
return new Detoloader("Druckplatte", Detoloader.PRESSURE_PLATE);
}else if (material == Material.TRIPWIRE) {
return new Detoloader("Tripwire", Detoloader.TRIPWIRE);
}
return new Detoloader("§eUnbekannter Block betätigt (nicht aufgenommen)", -1).setAddBack(false);
}
static boolean getLever(Block block) {
return (block.getData() & 8) == 8;
}
}

75
BauSystem_12/src/de/steamwar/bausystem/world/Detonator_12.java
Datei anzeigen

@ -1,75 +0,0 @@
package de.steamwar.bausystem.world;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.NoteBlock;
import org.bukkit.craftbukkit.v1_12_R1.block.CraftNoteBlock;
import org.bukkit.material.*;
import org.bukkit.plugin.Plugin;
public class Detonator_12 {
public static void handleSwitch(Location location) {
Block block = location.getBlock();
switch (block.getType()) {
case WOOD_BUTTON:
handleButton(block, 30);
break;
case STONE_BUTTON:
handleButton(block, 20);
break;
case LEVER:
handleLever(block);
break;
case NOTE_BLOCK:
handleNoteBlock(block);
break;
case TRIPWIRE:
handleTripWire(block);
break;
}
}
private static void handleButton(Block block, int delay) {
Button btnpow = new Button(block.getType(), block.getData());
btnpow.setPowered(true);
block.setData(btnpow.getData());
updateBlock(block);
Bukkit.getScheduler().runTaskLater(getPlugin(), () -> {
btnpow.setPowered(false);
block.setData(btnpow.getData());
updateBlock(block);
}, delay);
}
private static void handleNoteBlock(Block block) {
NoteBlock noteBlock = new CraftNoteBlock(block);
if(!noteBlock.getNote().isSharped()) noteBlock.setNote(noteBlock.getNote().sharped());
else noteBlock.setNote(noteBlock.getNote().flattened());
block.setData(noteBlock.getRawData());
updateBlock(block);
}
private static void handleLever(Block block) {
Lever lever = new Lever(block.getType(), block.getData());
lever.setPowered(!lever.isPowered());
block.setData(lever.getData());
updateBlock(block);
}
private static void handleTripWire(Block block) {
Tripwire tripwire = new Tripwire(block.getType().getId(), block.getData());
tripwire.setActivated(!tripwire.isActivated());
block.setData(tripwire.getData());
updateBlock(block);
}
static void updateBlock(Block block) {
block.getState().update(true);
}
private static Plugin getPlugin() {
return Bukkit.getPluginManager().getPlugin("BauSystem");
}
}

36
BauSystem_15/src/de/steamwar/bausystem/world/AutoLoader_15.java
Datei anzeigen

@ -26,7 +26,6 @@ import org.bukkit.block.BlockFace;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Powerable;
import org.bukkit.block.data.type.Switch;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
class AutoLoader_15 {
@ -64,10 +63,12 @@ class AutoLoader_15 {
relative = block.getRelative(BlockFace.UP);
break;
default:
relative = block.getRelative(swtch.getFacing());
relative = block.getRelative(swtch.getFacing().getOppositeFace());
break;
}
updateBlock(relative);
}else if(block.getType() == Material.TRIPWIRE) {
updateBlock(block);
}
return true;
}
@ -78,37 +79,38 @@ class AutoLoader_15 {
block.setBlockData(data, true);
}
static void onPlayerInteract(IAutoLoader loader, PlayerInteractEvent event) {
if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.PHYSICAL)
return;
static Detoloader onPlayerInteractLoader(PlayerInteractEvent event) {
Block block = event.getClickedBlock();
assert block != null;
BlockData data = block.getBlockData();
if (!(data instanceof Powerable))
return;
return new Detoloader("§eUnbekannter Block betätigt (nicht aufgenommen)", -1).setAddBack(false);
Powerable powerable = (Powerable) data;
Material material = block.getType();
if (material == Material.LEVER) {
if (powerable.isPowered()) {
new IAutoLoader.RedstoneActivation(loader, block.getLocation(), loader.getLastActivation(), false);
loader.print("§eHebel zurückgesetzt", true);
return new Detoloader("Hebel", 0).setActive(false);
} else {
new IAutoLoader.RedstoneActivation(loader, block.getLocation(), 1, true);
loader.print("§eHebel betätigt", true);
return new Detoloader("Hebel", 0).setActive(true);
}
} else if (material == Material.STONE_BUTTON) {
new IAutoLoader.TemporaryActivation(loader, block.getLocation(), 20);
loader.print("§eKnopf betätigt", true);
return new Detoloader("Knopf", Detoloader.STONE_BUTTON);
} else if (material.name().contains("PRESSURE_PLATE")){
new IAutoLoader.TemporaryActivation(loader, block.getLocation(), 20);
loader.print("§eDruckplatte betätigt", true);
return new Detoloader("Druckplatte", Detoloader.PRESSURE_PLATE);
} else if (material.name().contains("BUTTON")) {
new IAutoLoader.TemporaryActivation(loader, block.getLocation(), 30);
loader.print("§eKnopf betätigt", true);
return new Detoloader("Knopf", Detoloader.WOODEN_BUTTON);
}else if (material == Material.NOTE_BLOCK) {
return new Detoloader("Noteblock", Detoloader.NOTE_BLOCK);
}else if (material.name().equals("TRIPWIRE")) {
return new Detoloader("Tripwire", Detoloader.TRIPWIRE);
} else {
loader.print("§eUnbekannter Block betätigt (nicht aufgenommen)", false);
return new Detoloader("§eUnbekannter Block betätigt (aufgenommen)", 0).setAddBack(false);
}
}
static boolean getLever(Block block) {
return ((Powerable)block.getBlockData()).isPowered();
}
}

135
BauSystem_15/src/de/steamwar/bausystem/world/Detonator_15.java
Datei anzeigen

@ -1,135 +0,0 @@
package de.steamwar.bausystem.world;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Openable;
import org.bukkit.block.data.Powerable;
import org.bukkit.block.data.type.NoteBlock;
import org.bukkit.block.data.type.Switch;
import org.bukkit.block.data.type.Tripwire;
import org.bukkit.plugin.Plugin;
public class Detonator_15 {
public static void handleSwitch(Location location) {
Block block = location.getBlock();
switch (block.getType()) {
case OAK_BUTTON:
case BIRCH_BUTTON:
case ACACIA_BUTTON:
case DARK_OAK_BUTTON:
case JUNGLE_BUTTON:
case SPRUCE_BUTTON:
case LEGACY_WOOD_BUTTON:
handleButton(block, 30);
break;
case STONE_BUTTON:
case LEGACY_STONE_BUTTON:
handleButton(block, 20);
break;
case NOTE_BLOCK:
case LEGACY_NOTE_BLOCK:
handleNoteBlock(block);
break;
case TRIPWIRE:
handleTripWire(block);
break;
case ACACIA_PRESSURE_PLATE:
case BIRCH_PRESSURE_PLATE:
case DARK_OAK_PRESSURE_PLATE:
case HEAVY_WEIGHTED_PRESSURE_PLATE:
case JUNGLE_PRESSURE_PLATE:
case LIGHT_WEIGHTED_PRESSURE_PLATE:
case OAK_PRESSURE_PLATE:
case SPRUCE_PRESSURE_PLATE:
case STONE_PRESSURE_PLATE:
handlePressurePlate(block);
break;
default:
if(block.getBlockData() instanceof Openable) {
Openable openable = (Openable) block.getBlockData();
openable.setOpen(!openable.isOpen());
block.setBlockData(openable);
} else if(block.getBlockData() instanceof Powerable) {
Powerable powerable = (Powerable) block.getBlockData();
powerable.setPowered(!powerable.isPowered());
block.setBlockData(powerable);
updateBlockface(block);
}
}
}
private static void handleButton(Block block, int delay) {
Powerable btnpow = (Powerable) block.getBlockData();
btnpow.setPowered(true);
block.setBlockData(btnpow);
updateBlockface(block);
Bukkit.getScheduler().runTaskLater(getPlugin(), () -> {
btnpow.setPowered(false);
block.setBlockData(btnpow);
updateBlockface(block);
}, delay);
}
private static void handleNoteBlock(Block block) {
NoteBlock noteBlock = (NoteBlock) block.getBlockData();
if(!noteBlock.getNote().isSharped()) noteBlock.setNote(noteBlock.getNote().sharped());
else noteBlock.setNote(noteBlock.getNote().flattened());
block.setBlockData(noteBlock);
}
private static void handleTripWire(Block block) {
Tripwire tripwire = (Tripwire) block.getBlockData();
if(tripwire.isAttached()) {
tripwire.setPowered(!tripwire.isPowered());
block.setBlockData(tripwire);
updateBlock(block);
} else {
tripwire.setPowered(!tripwire.isPowered());
block.setBlockData(tripwire);
}
}
private static void handlePressurePlate(Block block) {
Powerable pressureSensor = (Powerable) block.getBlockData();
pressureSensor.setPowered(true);
block.setBlockData(pressureSensor);
updateBlock(block.getRelative(BlockFace.DOWN));
Bukkit.getScheduler().runTaskLater(getPlugin(), () -> {
pressureSensor.setPowered(false);
block.setBlockData(pressureSensor);
updateBlock(block.getRelative(BlockFace.DOWN));
}, 20);
}
static void updateBlock(Block block) {
BlockData data = block.getBlockData();
block.setType(Material.BARRIER, true);
block.setBlockData(data, true);
}
static void updateBlockface(Block block) {
Block relativebtn;
if (!(block.getBlockData() instanceof Switch)) return;
switch (((Switch) block.getBlockData()).getFace()) {
case FLOOR:
relativebtn = block.getRelative(BlockFace.DOWN);
break;
case CEILING:
relativebtn = block.getRelative(BlockFace.UP);
break;
default:
relativebtn = block.getRelative(((Switch) block.getBlockData()).getFacing());
break;
}
updateBlock(relativebtn);
}
private static Plugin getPlugin() {
return Bukkit.getPluginManager().getPlugin("BauSystem");
}
}

87
BauSystem_API/src/de/steamwar/bausystem/world/Detoloader.java Normale Datei
Datei anzeigen

@ -0,0 +1,87 @@
/*
This file is a part of the SteamWar software.
Copyright (C) 2020 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 <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.world;
import org.bukkit.Location;
public class Detoloader {
String message;
int activation;
boolean active, addBack = true, useActive = false;
public Detoloader(String message, int activation) {
this.message = message;
this.activation = activation;
}
public String getBlock() {
return message;
}
public void setBlock(String message) {
this.message = message;
}
public int getActivation() {
return activation;
}
public boolean isActive() {
return active;
}
public Detoloader setActive(boolean active) {
useActive = true;
this.active = active;
return this;
}
public boolean isAddBack() {
return addBack;
}
public Detoloader setAddBack(boolean addBack) {
this.addBack = addBack;
return this;
}
static class DetonatorActivation {
int activation = -1;
Location location;
public DetonatorActivation(Location location) {
this.location = location;
}
public DetonatorActivation(int activation, Location location) {
this.activation = activation;
this.location = location;
}
}
//Timings
public static final int STONE_BUTTON = 20;
public static final int WOODEN_BUTTON = 30;
public static final int PRESSURE_PLATE = 20;
public static final int NOTE_BLOCK = 20;
public static final int TRIPWIRE = 10;
}

1
BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
Datei anzeigen

@ -121,7 +121,6 @@ public class BauSystem extends JavaPlugin implements Listener {
Bukkit.getPluginManager().registerEvents(new RegionListener(), this);
Bukkit.getPluginManager().registerEvents(new BauScoreboard(), this);
Bukkit.getPluginManager().registerEvents(new TraceListener(), this);
Bukkit.getPluginManager().registerEvents(new Detonator(), this);
Bukkit.getPluginManager().registerEvents(new ClipboardListener(), this);
new AFKStopper();
TNTTracer.init();

108
BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDetonator.java
Datei anzeigen

@ -1,30 +1,39 @@
/*
This file is a part of the SteamWar software.
Copyright (C) 2020 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 <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.commands;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.world.Detonator;
import de.steamwar.bausystem.world.Welt;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.ArrayList;
public class CommandDetonator implements CommandExecutor {
private void help(Player player) {
player.sendMessage("§8/§edetonator wand §8- §7Legt den Fernzünder ins Inventar");
player.sendMessage("§8/§edetonator detonate §8- §7Benutzt den Fernzünder");
player.sendMessage("§8/§edetonator reset §8- §7Löscht alle markierten Positionen");
player.sendMessage("§8/§edetonator add [X] [Y] [Z] §8- §7Fügt den Block an der Coordinate hinzu");
player.sendMessage("§8/§edetonator list §8- §7Zeigt dir alle Punkte an");
player.sendMessage("§8/§edetonator tp [Punkt] §8- §7Teleportiert dich zu dem Punkt");
player.sendMessage("§7Optionale Parameter mit §8<>§7, Benötigte Parameter mit §8[]");
}
private boolean permissionCheck(Player player) {
@ -54,72 +63,17 @@ public class CommandDetonator implements CommandExecutor {
case "item":
player.getInventory().setItemInMainHand(Detonator.WAND);
player.updateInventory();
Detonator.getDetonator(player);
break;
case "delete":
case "reset":
case "remove":
Detonator.INSTANCE.deleteLocations(player);
Detonator.deleteDetonator(player);
break;
case "detonate":
case "click":
case "use":
Detonator.INSTANCE.execute(player);
break;
case "add":
case "location":
case "loc":
if (args.length >= 4) {
try {
int x = Integer.parseInt(args[1]);
int y = Integer.parseInt(args[2]);
int z = Integer.parseInt(args[3]);
Detonator.INSTANCE.addLocation(player, new Location(player.getWorld(), x, y, z), true);
}catch (NumberFormatException e){
player.sendMessage(BauSystem.PREFIX + "§cBitte gebe eine valide Coordinate an!");
}
}else {
player.sendMessage(BauSystem.PREFIX + "§cBitte gebe eine valide Coordinate an!");
}
break;
case "list":
case "show":
if(!Detonator.INSTANCE.containsPlayer(player) ||
Detonator.INSTANCE.getLocations(player).isEmpty()) {
player.sendMessage(BauSystem.PREFIX + "§cDu hast keine Punkte!");
}else {
player.sendMessage(BauSystem.PREFIX + "§7Deine Punkte:");
int i = 0;
for (Detonator.Loc loc: Detonator.INSTANCE.getLocations(player)) {
i++;
sendTxtCmd(player, ChatMessageType.SYSTEM, newTxtCmd("§ePunkt " + i + "§8: §7[" + loc.getCords()[0]+ ", " + loc.getCords()[1] +
", " + loc.getCords()[2] + "]", "/detonator tp " + i));
}
}
break;
case "tp":
case "teleport":
if(!Detonator.INSTANCE.containsPlayer(player) ||
Detonator.INSTANCE.getLocations(player).isEmpty()) {
player.sendMessage(BauSystem.PREFIX + "§cDu hast keine Punkte!");
return true;
}
if(args.length <= 1) {
player.sendMessage(BauSystem.PREFIX + "§cNicht genug Argumente!");
return true;
}
try {
int i = Integer.parseInt(args[1]);
if(Detonator.INSTANCE.getLocations(player).size() <= i || i > 0) {
player.teleport(player.getLocation().zero().add(new ArrayList<>(Detonator.INSTANCE.getLocations(player)).get(i-1).getLocation()
.add(0.5, 0, 0.5)));
TextComponent.fromLegacyText("§aTeleportiert zu Punkt: " + args[1]);
}else {
player.sendMessage(BauSystem.PREFIX + "§cBitte gebe eine valide Punkt ein!");
}
}catch (NumberFormatException e) {
player.sendMessage(BauSystem.PREFIX + "§cBitte gebe eine valide Zahl ein!");
}
Detonator.getDetonator(player).execute();
break;
default:
help(player);
@ -127,22 +81,4 @@ public class CommandDetonator implements CommandExecutor {
return true;
}
public static TextComponent newTxtCmd(String txt, String cmd) {
TextComponent tc = new TextComponent();
tc.setText(txt);
tc.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, cmd));
return tc;
}
public static void sendTxtCmd(Player p, ChatMessageType chatMessageType ,TextComponent... tcs) {
TextComponent[] var5 = tcs;
int var4 = tcs.length;
for(int var3 = 0; var3 < var4; ++var3) {
TextComponent textComponent = var5[var3];
p.spigot().sendMessage(chatMessageType, textComponent);
}
}
}

24
BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDetonatorTabCompleter.java
Datei anzeigen

@ -1,3 +1,22 @@
/*
This file is a part of the SteamWar software.
Copyright (C) 2020 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 <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.commands;
import org.bukkit.command.Command;
@ -20,10 +39,7 @@ public class CommandDetonatorTabCompleter implements TabCompleter {
List<String> tabComplete = new ArrayList<>();
tabComplete.add("wand");
tabComplete.add("reset");
tabComplete.add("delete");
tabComplete.add("add");
tabComplete.add("list");
tabComplete.add("tp");
tabComplete.add("detonate");
if (args.length >= 2) {
return new ArrayList<>();

20
BauSystem_Main/src/de/steamwar/bausystem/world/AutoLoader.java
Datei anzeigen

@ -28,6 +28,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
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.event.player.PlayerQuitEvent;
@ -155,16 +156,31 @@ public class AutoLoader extends IAutoLoader implements Listener {
//BlockRedstoneEvent?
@EventHandler
public void onPlayerInteract(PlayerInteractEvent event){
if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.PHYSICAL)
return;
if(!setup || !event.getPlayer().equals(player))
return;
Detoloader detoloader = null;
switch(Core.getVersion()){
case 15:
AutoLoader_15.onPlayerInteract(this, event);
detoloader = AutoLoader_15.onPlayerInteractLoader(event);
break;
default:
AutoLoader_12.onPlayerInteract(this, event);
detoloader = AutoLoader_12.onPlayerInteractLoader(event);
}
if(detoloader == null) return;
if(detoloader.useActive)
new IAutoLoader.RedstoneActivation(this, event.getClickedBlock().getLocation()
, detoloader.getActivation() == 0 ? getLastActivation() : detoloader.getActivation()
, detoloader.isActive());
else
new IAutoLoader.TemporaryActivation(this, event.getClickedBlock().getLocation()
, detoloader.getActivation());
print(detoloader.addBack ? "§e" + detoloader.getBlock() + " betätigt" :
detoloader.getBlock(), detoloader.addBack);
}
@EventHandler

183
BauSystem_Main/src/de/steamwar/bausystem/world/Detonator.java
Datei anzeigen

@ -1,17 +1,35 @@
/*
This file is a part of the SteamWar software.
Copyright (C) 2020 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 <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.world;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.core.Core;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@ -20,94 +38,120 @@ import java.util.stream.Collectors;
public class Detonator implements Listener {
private final Map<Player, Set<Loc>> locs;
public static final ItemStack WAND;
private static final Map<Player, Detonator> players = new HashMap<>();
public static Detonator INSTANCE;
public static ItemStack WAND;
private final Set<Detoloader.DetonatorActivation> locs = new HashSet<>();
private final Player player;
public Detonator() {
locs = new HashMap<>();
static {
WAND = new ItemStack(Material.TRIPWIRE_HOOK, 1);
ItemMeta im = WAND.getItemMeta();
im.setDisplayName("§6Fernzünder");
im.addItemFlags(ItemFlag.HIDE_ENCHANTS);
List<String> lorelist = Arrays.asList("§eLinks Klick §8- §7Setzte einen Punkt zum Aktivieren",
"§eLinks Klick + Shift §8- §7Füge einen Punkt hinzu", "§eRechts Klick §8- §7Löse alle Punkte aus");
im.setLore(lorelist);
WAND.setItemMeta(im);
INSTANCE = this;
}
public void addLocation(Player player, Location location, boolean shift) {
if(!shift) locs.get(player).clear();
locs.get(player).add(new Loc(location.getBlockX(),
location.getBlockY(),
location.getBlockZ()));
public static Detonator getDetonator(Player player){
if(!players.containsKey(player))
return new Detonator(player);
return players.get(player);
}
public void deleteLocations(Player player) {
if(locs.containsKey(player)) locs.remove(player);
public Detonator(Player player) {
this.player = player;
Bukkit.getPluginManager().registerEvents(this, BauSystem.getPlugin());
players.put(player, this);
}
public void deleteLocation(Player player, Location location) {
if(locs.get(player).stream().filter(loc -> loc.equals(Loc.getFromLocation(location))).count() >= 1)
locs.get(player).remove(locs.get(player).stream().filter(loc -> Loc.getFromLocation(location)
.equals(loc)).limit(1).collect(Collectors.toList()).get(0));
public static void deleteDetonator(Player player) {
if(players.containsKey(player))
players.remove(player);
}
public Set<Loc> getLocations(Player player) {
return locs.get(player);
}
public void execute() {
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText("§a" + locs.size() + " Punkt(e) ausgelöst!"));
for (Detoloader.DetonatorActivation activation: getLocations()) {
public boolean containsPlayer(Player player) {
return locs.containsKey(player);
}
public void execute(Player player) {
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText("§a" + locs.get(player).size() + " Punkt(e) ausgelöst!"));
for (Loc loc: locs.get(player)) {
switch(Core.getVersion()){
Boolean powered;
if(activation.activation == -1) switch (Core.getVersion()) {
case 15:
Detonator_15.handleSwitch(loc.getLocation());
powered = AutoLoader_15.getLever(activation.location.getBlock());
AutoLoader_15.setRedstone(activation.location, !powered);
break;
default:
Detonator_12.handleSwitch(loc.getLocation());
powered = AutoLoader_12.getLever(activation.location.getBlock());
AutoLoader_12.setRedstone(activation.location, !powered);
}else switch (Core.getVersion()) {
case 15:
AutoLoader_15.setRedstone(activation.location, true);
Bukkit.getScheduler().runTaskLater(BauSystem.getPlugin(), () ->
AutoLoader_15.setRedstone(activation.location, false), activation.activation);
break;
default:
AutoLoader_12.setRedstone(activation.location, true);
Bukkit.getScheduler().runTaskLater(BauSystem.getPlugin(), () ->
AutoLoader_12.setRedstone(activation.location, false), activation.activation);
}
}
}
@EventHandler
public void onPlayerInteract(PlayerInteractEvent event) {
if(!event.getPlayer().equals(player))
return;
if (event.getItem() == null) return;
if (event.getItem().isSimilar(WAND)) {
event.setCancelled(true);
if(!locs.containsKey(event.getPlayer())) locs.put(event.getPlayer(), new HashSet<>());
switch (event.getAction()) {
case LEFT_CLICK_BLOCK:
Location location = event.getClickedBlock().getLocation();
if (event.getPlayer().isSneaking()){
if(locs.get(event.getPlayer()).stream().filter(loc -> loc.equals(Loc.getFromLocation(location)))
.count() >= 1) {
deleteLocation(event.getPlayer(), location);
event.getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent
.fromLegacyText("§cPunkt entfernt!"));
}else {
addLocation(event.getPlayer(), location, true);
event.getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent
.fromLegacyText("§aPunkt hinzugefügt!"));
Detoloader detoloader = null;
switch(Core.getVersion()){
case 15:
detoloader = AutoLoader_15.onPlayerInteractLoader(event);
break;
default:
detoloader = AutoLoader_12.onPlayerInteractLoader(event);
}
} else {
addLocation(event.getPlayer(), location, false);
event.getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent
.fromLegacyText("§aPunkt gesetzt!"));
if(detoloader == null) return;
if(event.getPlayer().isSneaking()) {
if(locs.stream().filter(detonatorActivation -> detonatorActivation.location.equals(event.getClickedBlock().getLocation())).collect(Collectors.toList()).size() == 1) {
locs.forEach(detonatorActivation -> {
if(detonatorActivation.location.equals(event.getClickedBlock().getLocation())) locs.remove(detonatorActivation);
});
print(detoloader.addBack ? "§e" + detoloader.getBlock() + " entfernt" :
detoloader.getBlock(), detoloader.addBack);
}else {
if(detoloader.getActivation() == 0) {
locs.add(new Detoloader.DetonatorActivation(event.getClickedBlock().getLocation()));
}else {
locs.add(new Detoloader.DetonatorActivation(detoloader.getActivation(), event.getClickedBlock().getLocation()));
}
print(detoloader.addBack ? "§e" + detoloader.getBlock() + " hinzugefügt" :
detoloader.getBlock(), detoloader.addBack);
}
}else {
locs.clear();
if(detoloader.getActivation() == 0) {
locs.add(new Detoloader.DetonatorActivation(event.getClickedBlock().getLocation()));
}else {
locs.add(new Detoloader.DetonatorActivation(detoloader.getActivation(), event.getClickedBlock().getLocation()));
}
print(detoloader.addBack ? "§e" + detoloader.getBlock() + " getsetzt" :
detoloader.getBlock(), detoloader.addBack);
}
break;
case RIGHT_CLICK_AIR:
case RIGHT_CLICK_BLOCK:
execute(event.getPlayer());
execute();
break;
}
}
@ -115,40 +159,21 @@ public class Detonator implements Listener {
@EventHandler(ignoreCancelled = true)
public void onPlayerQuit(PlayerQuitEvent event) {
if(locs.containsKey(event.getPlayer())) {
locs.remove(event.getPlayer());
}
deleteDetonator(event.getPlayer());
}
public static class Loc {
private final int x;
private final int y;
private final int z;
public Loc(int x, int y, int z) {
this.x = x;
this.y = y;
this.z = z;
Set<Detoloader.DetonatorActivation> getLocations() {
return locs;
}
public int[] getCords() {
return new int[] {x, y, z};
Player getPlayer() {
return player;
}
public Location getLocation() {
return new Location(Bukkit.getWorlds().get(0), x, y, z);
}
public static Loc getFromLocation(Location location) {
return new Loc(location.getBlockX(), location.getBlockY(), location.getBlockZ());
}
@Override
public boolean equals(Object o) {
if(!(o instanceof Loc)) return false;
Loc loc = (Loc) o;
return loc.getCords()[0] == x && loc.getCords()[1] == y && loc.getCords()[2] == z;
}
void print(String message, boolean withSize){
if(withSize)
getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message + " §8" + getLocations().size()));
else
getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message));
}
}