SBDevelopment/V10Lift
3
0
Fork 0
Code Issues 11 Pull requests Releases Wiki Activity Actions

Added some new things, and some commands

Browse source
This commit is contained in:
stijnb1234 2020-01-31 15:31:33 +01:00
parent 61b23816c0
commit 2c3ef91e0c
3 changed files with 139 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/nl/SBDeveloper/V10Lift/API/Runnables/MoveLift.java
View file

@ -11,7 +11,6 @@ import org.bukkit.block.BlockState;
import org.bukkit.block.Chest;
import org.bukkit.block.Sign;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
@ -20,12 +19,10 @@ import java.util.*;
public class MoveLift implements Runnable {
private final String liftName;
private final long speed;
private final int ft;
public MoveLift(String liftName, long speed) {
this.liftName = liftName;
this.speed = speed;
if (speed > 32L) {
ft = 1;
@ -46,8 +43,8 @@ public class MoveLift implements Runnable {
@Override
public void run() {
Iterator < LiftBlock > iter;
ArrayList < LiftBlock > tb = new ArrayList < LiftBlock > ();
Iterator<LiftBlock> iter;
ArrayList<LiftBlock> tb = new ArrayList<>();
Block block = null;
World world;
Location loc;
@ -56,7 +53,7 @@ public class MoveLift implements Runnable {
int y;
Chest c;
V10Entity v10ent;
Iterator < V10Entity > veiter;
Iterator<V10Entity> veiter;
Sign sign;
LiftBlock lb;
Lift lift;

119
src/main/java/nl/SBDeveloper/V10Lift/Commands/V10LiftCommand.java
View file

@ -9,6 +9,7 @@ import nl.SBDeveloper.V10Lift.Utils.LocationSerializer;
import nl.SBDeveloper.V10Lift.V10LiftPlugin;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
@ -103,10 +104,126 @@ public class V10LiftCommand implements CommandExecutor {
} else {
sender.sendMessage(ChatColor.RED + "You don't have the permission to do this!");
}
} else if (args[0].equalsIgnoreCase("build") && args.length == 1) {
//v10lift build
if (!(sender instanceof Player)) {
sender.sendMessage(ChatColor.RED + "You have to be a player to do this.");
}
if (sender.hasPermission("v10lift.build") || sender.hasPermission("v10lift.admin")) {
return buildCommand(sender);
} else {
sender.sendMessage(ChatColor.RED + "You don't have the permission to do this!");
}
} else if (args[0].equalsIgnoreCase("rope") && args.length == 2) {
//v10lift rope add || v10lift rope del
if (!(sender instanceof Player)) {
sender.sendMessage(ChatColor.RED + "You have to be a player to do this.");
}
if (sender.hasPermission("v10lift.build") || sender.hasPermission("v10lift.admin")) {
return ropeCommand(sender, args);
} else {
sender.sendMessage(ChatColor.RED + "You don't have the permission to do this!");
}
} else if (args[0].equalsIgnoreCase("door") && (args.length == 1 || args.length == 2)) {
//v10lift door <Name> || v10lift door
if (!(sender instanceof Player)) {
sender.sendMessage(ChatColor.RED + "You have to be a player to do this.");
}
if (sender.hasPermission("v10lift.build") || sender.hasPermission("v10lift.admin")) {
return doorCommand(sender, args);
} else {
sender.sendMessage(ChatColor.RED + "You don't have the permission to do this!");
}
}
return false;
}
private boolean doorCommand(CommandSender sender, String[] args) {
Player p = (Player) sender;
if (!DataManager.containsEditPlayer(p.getUniqueId())) {
sender.sendMessage(ChatColor.RED + "First switch on the editor mode!");
return true;
}
if (DataManager.containsDoorEditPlayer(p.getUniqueId())) {
DataManager.removeDoorEditPlayer(p.getUniqueId());
sender.sendMessage(ChatColor.RED + "Door editor mode disabled!");
return true;
}
Lift lift = DataManager.getLift(DataManager.getEditPlayer(p.getUniqueId()));
String floor = null;
if (args.length < 2) {
Location loc = p.getLocation();
Floor f = new Floor(loc.getBlockY() - 1, Objects.requireNonNull(loc.getWorld(), "World was null at doorCommand").getName());
if (!lift.getFloors().containsValue(f)) {
sender.sendMessage(ChatColor.RED + "Automatic floor detection failed!");
return true;
}
for (Map.Entry<String, Floor> e : lift.getFloors().entrySet()) {
Floor fl = e.getValue();
if (fl.equals(f)) {
floor = e.getKey();
break;
}
}
} else {
floor = args[2];
if (!lift.getFloors().containsKey(floor)) {
sender.sendMessage(ChatColor.RED + "The floor " + args[2] + " doesn't exists!");
return true;
}
}
DataManager.addDoorEditPlayer(p.getUniqueId(), floor);
sender.sendMessage(ChatColor.GREEN + "Now right-click on the door blocks!");
sender.sendMessage(ChatColor.GREEN + "Then do /v10lift door to save it.");
return true;
}
private boolean ropeCommand(CommandSender sender, String[] args) {
Player p = (Player) sender;
if (!DataManager.containsEditPlayer(p.getUniqueId())) {
sender.sendMessage(ChatColor.RED + "First switch on the editor mode!");
return true;
}
if (args[1].equalsIgnoreCase("add")) {
if (DataManager.containsRopeEditPlayer(p.getUniqueId()) || DataManager.containsRopeRemovesPlayer(p.getUniqueId())) {
sender.sendMessage(ChatColor.RED + "You're still adjusting the emergency stairs.");
return true;
}
DataManager.addRopeEditPlayer(p.getUniqueId(), null);
sender.sendMessage(ChatColor.GREEN + "Now right-click on the beginning and the end of the emergency stairs.");
} else if (args[1].equalsIgnoreCase("del")) {
if (DataManager.containsRopeEditPlayer(p.getUniqueId()) || DataManager.containsRopeRemovesPlayer(p.getUniqueId())) {
sender.sendMessage(ChatColor.RED + "You're still adjusting the emergency stairs.");
return true;
}
DataManager.addRopeRemovesPlayer(p.getUniqueId());
sender.sendMessage(ChatColor.GREEN + "Now right-click on the the emergency stairs.");
}
return true;
}
private boolean buildCommand(CommandSender sender) {
Player p = (Player) sender;
if (!DataManager.containsEditPlayer(p.getUniqueId())) {
sender.sendMessage(ChatColor.RED + "First switch on the editor mode!");
return true;
}
if (DataManager.containsBuilderPlayer(p.getUniqueId())) {
DataManager.removeBuilderPlayer(p.getUniqueId());
V10LiftPlugin.getAPI().sortLiftBlocks(DataManager.getEditPlayer(p.getUniqueId()));
sender.sendMessage(ChatColor.GREEN + "Construction mode disabled!");
} else {
DataManager.addBuilderPlayer(p.getUniqueId());
sender.sendMessage(ChatColor.GREEN + "Now right-click on the elevator blocks!");
sender.sendMessage(ChatColor.GREEN + "Then do /v10lift build to save it!");
}
return true;
}
private boolean renameCommand(CommandSender sender, String[] args) {
Player p = (Player) sender;
if (!DataManager.containsEditPlayer(p.getUniqueId())) {
@ -316,7 +433,7 @@ public class V10LiftCommand implements CommandExecutor {
}
DataManager.removeRopeEditPlayer(p.getUniqueId());
DataManager.removeRopeRemovesPlayer(p.getUniqueId());
DataManager.removeDoorEditsPlayer(p.getUniqueId());
DataManager.removeDoorEditPlayer(p.getUniqueId());
BlockState bs;
Sign sign;

32
src/main/java/nl/SBDeveloper/V10Lift/Managers/DataManager.java
View file

@ -20,7 +20,7 @@ public class DataManager {
private static ArrayList<UUID> builder = new ArrayList<>();
private static LinkedHashMap<UUID, String> ropeEdits = new LinkedHashMap<>();
private static ArrayList<UUID> ropeRemoves = new ArrayList<>();
private static ArrayList<UUID> doorEdits = new ArrayList<>();
private static HashMap<UUID, String> doorEdits = new HashMap<>();
private static ArrayList<UUID> whoisReq = new ArrayList<>();
private static HashMap<String, Integer> movingTasks = new HashMap<>();
@ -132,6 +132,23 @@ public class DataManager {
return movingTasks.get(liftName);
}
// //
public static boolean containsDoorEditPlayer(UUID player) {
return doorEdits.containsKey(player);
}
public static void addDoorEditPlayer(UUID player, String floorName) {
doorEdits.put(player, floorName);
}
public static void removeDoorEditPlayer(UUID player) {
doorEdits.remove(player);
}
public static String getDoorEditPlayer(UUID player) {
return doorEdits.get(player);
}
/* ArrayList methods */
// //
@ -186,19 +203,6 @@ public class DataManager {
ropeRemoves.remove(player);
}
// //
public static boolean containsDoorEditsPlayer(UUID player) {
return doorEdits.contains(player);
}
public static void addDoorEditsPlayer(UUID player) {
doorEdits.add(player);
}
public static void removeDoorEditsPlayer(UUID player) {
doorEdits.remove(player);
}
// //
public static boolean containsInputRemovesPlayer(UUID player) {
return inputRemoves.contains(player);