Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@somemone0
somemone0 authored Mar 23, 2021
1 parent f8ca064 commit b119e01
Show file tree
Hide file tree
Showing 10 changed files with 334 additions and 77 deletions.
30 changes: 11 additions & 19 deletions src/main/java/com/somemone/storageplus/StoragePlus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ public final class StoragePlus extends JavaPlugin {
public static ArrayList<OpenStorage> openStorages;
public static ConfigHandler configHandler;

public static ArrayList<PersonalStorage> personalStorages;
public static ArrayList<ChunkStorage> chunkStorages;
public static ArrayList<GroupStorage> groupStorages;
// public static ArrayList<PersonalStorage> personalStorages;
// public static ArrayList<ChunkStorage> chunkStorages;
// public static ArrayList<GroupStorage> groupStorages;
public static StoragePlus plugin;

public static ArrayList<Player> closedByPlugin;
Expand All @@ -44,9 +44,9 @@ public final class StoragePlus extends JavaPlugin {
@Override
public void onEnable() {

personalStorages = new ArrayList<>();
chunkStorages = new ArrayList<>();
groupStorages = new ArrayList<>();
//personalStorages = new ArrayList<>();
//chunkStorages = new ArrayList<>();
//groupStorages = new ArrayList<>();
openStorages = new ArrayList<>();
closedByPlugin = new ArrayList<>();
dataFolder = this.getDataFolder();
Expand All @@ -60,21 +60,16 @@ public void onEnable() {
getCommand("pstorage").setExecutor(new PersonalStorageCommand());
getCommand("cstorage").setExecutor(new ChunkStorageCommand());
getCommand("gstorage").setExecutor(new GroupStorageCommand());
getCommand("bvadmin").setExecutor(new AdminCommand());
getCommand("stadmin").setExecutor(new AdminCommand());
getCommand("staccept").setExecutor(new AcceptCommand());

getCommand("pstorage").setTabCompleter(new MyTabCompleter());
getCommand("cstorage").setTabCompleter(new MyTabCompleter());
getCommand("gstorage").setTabCompleter(new MyTabCompleter());
getCommand("bvadmin").setTabCompleter(new MyTabCompleter());
getCommand("stadmin").setTabCompleter(new MyTabCompleter());



try {
loadStorages();
} catch (IOException | InvalidConfigurationException e) {
e.printStackTrace();
}

if (!setupEconomy()) {
Logger.getLogger("Minecraft").severe("Bigventories disabled due to no Vault dependency found!");
Expand All @@ -91,15 +86,11 @@ public void onEnable() {
public void onDisable() {
// Plugin shutdown logic

try {
saveStorages();
} catch (IOException e) {
e.printStackTrace();
}
}

}


/**
public static void saveStorages () throws IOException {
// Closing all OpenStorages to permanent storage
Expand Down Expand Up @@ -290,6 +281,7 @@ public static void loadStorages () throws IOException, InvalidConfigurationExcep
}
}
**/

public static Economy getEcon() {
return econ;
Expand Down
22 changes: 12 additions & 10 deletions src/main/java/com/somemone/storageplus/command/AdminCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if (ps != null) {
switch (args[0]) {
case "view":
if (sender.hasPermission("bva.view")) {
if (sender.hasPermission("sta.view")) {
if (StoragePlus.openStorages.size() > 0) {
for (OpenStorage os : StoragePlus.openStorages) {
if (os.uuid == ps.uuid) {
Expand All @@ -68,7 +68,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St

case "delete":

if (sender.hasPermission("bva.delete")) {
if (sender.hasPermission("sta.delete")) {
if (StoragePlus.openStorages.size() > 0) {

for (OpenStorage os : StoragePlus.openStorages) {
Expand Down Expand Up @@ -123,7 +123,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St

switch (args[0]) {
case "view":
if (sender.hasPermission("bva.view")) {
if (sender.hasPermission("sta.view")) {
if (StoragePlus.openStorages.size() > 0) {
for (OpenStorage os : StoragePlus.openStorages) {
if (os.uuid == cs.uuid) {
Expand All @@ -146,7 +146,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
break;
case "delete":

if (sender.hasPermission("bva.delete")) {
if (sender.hasPermission("sta.delete")) {
if (StoragePlus.openStorages.size() > 0) {
for (OpenStorage os : StoragePlus.openStorages) {
if (os.uuid == cs.uuid) {
Expand Down Expand Up @@ -177,7 +177,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St

switch (args[0]) {
case "view":
if (sender.hasPermission("bva.view")) {
if (sender.hasPermission("sta.view")) {
if (StoragePlus.openStorages.size() > 0) {
for (OpenStorage os : StoragePlus.openStorages) {
if (os.uuid == gs.uuid) {
Expand All @@ -200,7 +200,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
break;

case "delete":
if (sender.hasPermission("bva.delete")) {
if (sender.hasPermission("sta.delete")) {
if (StoragePlus.openStorages.size() > 0) {
for (OpenStorage os : StoragePlus.openStorages) {
if (os.uuid == gs.uuid) {
Expand All @@ -219,7 +219,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
}
break;
case "getplayers":
if (sender.hasPermission("bva.getplayers")) {
if (sender.hasPermission("sta.getplayers")) {

String playerList = "Players: " + ChatColor.GREEN + "";
for (UUID uuid : gs.accessList) {
Expand All @@ -228,6 +228,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
}
}

sender.sendMessage(playerList);

}
}
} else {
Expand All @@ -239,7 +241,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
} else if (args.length == 1 || args.length == 2) {
switch (args[0]) {
case "save":
if (sender.hasPermission("bva.save")) {
if (sender.hasPermission("sta.save")) {
try {
StoragePlus.saveStorages();
sender.sendMessage(ChatColor.GREEN + "Storages successfully saved!");
Expand All @@ -251,7 +253,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
}
break;
case "load":
if (sender.hasPermission("bva.load")) {
if (sender.hasPermission("sta.load")) {
try {
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "Loading to last saved configuration...");

Expand All @@ -277,7 +279,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
case "voucher":
sender.sendMessage(ChatColor.GOLD + "Created Voucher!");

if (sender.hasPermission("bva.voucher")) {
if (sender.hasPermission("sta.voucher")) {
if (args.length == 2) {
ItemStack item = new VoucherItem( Integer.parseInt(args[1]) ).getItem();
player.getInventory().addItem(item);
Expand Down
20 changes: 14 additions & 6 deletions src/main/java/com/somemone/storageplus/command/GroupStorageCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if (sender instanceof Player) {
Player player = (Player) sender;

if (args.length == 0) return false;

if (args.length == 1) {
if (StoragePlus.groupStorages.size() > 0) {

Expand Down Expand Up @@ -61,6 +63,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St

case "upgrade": // /gs upgrade group-name 3

if (true) {
sender.sendMessage(ChatColor.GOLD + "This command has been temporarily disabled!");
return true;
}

int rowsToAdd = 1;
try {
rowsToAdd = Integer.parseInt(args[2]);
Expand Down Expand Up @@ -106,7 +113,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if (fgs.name.equals(args[1])) {
if (fgs.owner == player.getUniqueId()) {

if (StoragePlus.getInvitedGroupStorages(Bukkit.getOfflinePlayer(args[2]).getUniqueId()) <= StoragePlus.configHandler.getGroupStorageNum()) {
if (StoragePlus.getInvitedGroupStorages(Bukkit.getOfflinePlayer(args[2]).getUniqueId()) < StoragePlus.configHandler.getGroupStorageNum()) {

if (Bukkit.getOfflinePlayer(args[2]).isOnline()) {

Expand Down Expand Up @@ -163,13 +170,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
}
}

if (StoragePlus.configHandler.getGroupStoragePrice(1) < StoragePlus.getEcon().getBalance(player) && StoragePlus.configHandler.getGroupStoragePrice(1) != 0) {
if (StoragePlus.getInvitedGroupStorages(player.getUniqueId()) < StoragePlus.configHandler.getGroupStorageNum() ) {
StoragePlus.getEcon().withdrawPlayer(player, StoragePlus.configHandler.getGroupStoragePrice(1));
newGS.accessList.add(player.getUniqueId());
StoragePlus.groupStorages.add(newGS);
sender.sendMessage(ChatColor.GREEN + "Group Storage successfully created!");
} else {
sender.sendMessage(ChatColor.RED + "Insufficient Funds!");
sender.sendMessage(ChatColor.RED + "You have too many storages!");
}

}
Expand All @@ -190,6 +196,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
return true;
} else {
sender.sendMessage(ChatColor.RED + "Player not in group");
return true;
}

} else {
Expand All @@ -211,7 +218,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if (StoragePlus.groupStorages.size() > 0) {
for (GroupStorage fgs : StoragePlus.groupStorages) {

if (fgs.name.equals(args[1]) && fgs.owner == player.getUniqueId()) {
if (fgs.name.equals(args[1]) && fgs.owner.equals(player.getUniqueId())) {

fgs.owner = Bukkit.getOfflinePlayer(args[2]).getUniqueId();
sender.sendMessage(ChatColor.GREEN + args[2] + " is now the owner of the Group!");
Expand All @@ -231,7 +238,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if (StoragePlus.groupStorages.size() > 0) {
GroupStorage storageToDelete = null;
for (GroupStorage fgs : StoragePlus.groupStorages) {
if (fgs.name.equals(args[1]) && fgs.owner == player.getUniqueId()) {

if (fgs.name.equals(args[1]) && fgs.owner.equals(player.getUniqueId())) {
storageToDelete = fgs;
}
}
Expand Down
16 changes: 11 additions & 5 deletions src/main/java/com/somemone/storageplus/command/MyTabCompleter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public class MyTabCompleter implements org.bukkit.command.TabCompleter {

List<String> list = new ArrayList<>();

if (command.getName() == "bva") {
if (command.getName().equals("sta")) {
if (args.length == 1) {
list.addAll(Arrays.asList("save", "load", "view", "delete", "voucher"));
list.addAll(Arrays.asList("save", "load", "view", "delete", "voucher", "get-players"));
} else if (args.length == 2) {
switch (args[0]) {
case "view":
Expand All @@ -34,6 +34,11 @@ public class MyTabCompleter implements org.bukkit.command.TabCompleter {
case "delete":
list.addAll(Arrays.asList("ps", "cs", "gs"));
break;
case "getplayers":
for (GroupStorage gs : StoragePlus.groupStorages) {
list.add(gs.name);
}
break;
}
} else if (args.length == 3) {
switch (args[2]) {
Expand All @@ -54,7 +59,6 @@ public class MyTabCompleter implements org.bukkit.command.TabCompleter {
}
} else if (command.getAliases().contains("ps")) {
if (args.length == 1) {
player.sendMessage("This was fired!");
list.addAll(Arrays.asList("create", "upgrade"));
}
} else if (command.getAliases().contains("cs")) {
Expand Down Expand Up @@ -121,8 +125,10 @@ public List<String> findGroupStorages (Player player) {

public List<String> findPlayersInStorages (GroupStorage gs) {
List<String> list = new ArrayList<>();
for (UUID uuid : gs.accessList) {
list.add( Bukkit.getOfflinePlayer(uuid).getName() );
if (gs != null) {
for (UUID uuid : gs.accessList) {
list.add(Bukkit.getOfflinePlayer(uuid).getName());
}
}
return list;
}
Expand Down
42 changes: 25 additions & 17 deletions src/main/java/com/somemone/storageplus/command/PersonalStorageCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.somemone.storageplus.StoragePlus;
import com.somemone.storageplus.storage.OpenStorage;
import com.somemone.storageplus.storage.PersonalStorage;
import com.somemone.storageplus.util.FileHandler;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
Expand All @@ -21,38 +22,45 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if (sender instanceof Player) {
Player player = (Player) sender;

PersonalStorage ps = FileHandler.loadPersonalStorage(player.getUniqueId());

if (ps == null) return false;

if (args.length == 0) {
if (StoragePlus.personalStorages.size() > 0) {
if (StoragePlus.personalStorages.size() == 0) return false;

for (PersonalStorage ps : StoragePlus.personalStorages) {
for (PersonalStorage ps : StoragePlus.personalStorages) {

if (ps.owner.equals(player.getUniqueId())) {
sender.sendMessage(ps.owner.toString());
sender.sendMessage(player.getUniqueId().toString());

// Check for open inventory
if (ps.owner.equals(player.getUniqueId())) {

if (StoragePlus.openStorages.size() > 0) {
for (OpenStorage os : StoragePlus.openStorages) {
if (os.uuid == ps.uuid) {
player.openInventory(os.inventory.get(0));
// Check for open inventory

return true;
}
if (StoragePlus.openStorages.size() > 0) {
for (OpenStorage os : StoragePlus.openStorages) {
if (os.uuid == ps.uuid) {
player.openInventory(os.inventory.get(0));

return true;
}
}
}

ArrayList<Inventory> inventories = ps.buildInventories();

OpenStorage openStorage = new OpenStorage(inventories, ps.uuid, true);
ArrayList<Inventory> inventories = ps.buildInventories();

StoragePlus.openStorages.add(openStorage);
OpenStorage openStorage = new OpenStorage(inventories, ps.uuid, true);

player.openInventory(openStorage.inventory.get(0));
StoragePlus.openStorages.add(openStorage);

return true;
player.openInventory(openStorage.inventory.get(0));

}
return true;

}


}
sender.sendMessage(ChatColor.RED + "You do not own a Personal Storage!");
return true;
Expand Down
Loading

0 comments on commit b119e01

Please sign in to comment.