Skip to content

Commit

Permalink
Removed whitespace that was unneeded (#1)
Browse files Browse the repository at this point in the history 
Added some comments to the events
Removed redundant casts and unused imports

Co-authored-by: Ian Tapply <[email protected]>
  • Loading branch information
@jeqostudios
jeqostudios and Ian Tapply authored Oct 4, 2023
1 parent f525f77 commit ceb2ace
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 147 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<url>https://jeqo.net/bloons</url>

<properties>
<java.version>1.8</java.version>
<java.version>1.17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down
49 changes: 9 additions & 40 deletions src/main/java/net/jeqo/bloons/Bloons.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package net.jeqo.bloons;

import net.jeqo.bloons.data.*;
import net.jeqo.bloons.data.BalloonCommand;
import net.jeqo.bloons.data.BalloonOwner;
import net.jeqo.bloons.data.BalloonTab;
import net.jeqo.bloons.data.UpdateChecker;
import net.jeqo.bloons.listeners.LeashHandlers;
import net.jeqo.bloons.listeners.MenuHandlers;
import net.jeqo.bloons.listeners.PlayerHandlers;
import net.jeqo.bloons.utils.Metrics;
import net.jeqo.bloons.utils.Utils;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.command.TabCompleter;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;

import java.util.HashMap;
import java.util.Objects;
Expand All @@ -34,14 +33,10 @@ public void onEnable() {
loadCommands(); loadListeners();
Metrics metrics = new Metrics(this, pluginId); updateChecker();
getConfig().options().copyDefaults(); saveDefaultConfig();


}


@Override
public void onDisable() {

Utils.log("|---[ BLOONS ]-------------------------------------------------------|");
Utils.log("| Shutting down... |");
Utils.log("|-------------------------------------------------[ MADE BY JEQO ]---|");
Expand All @@ -50,28 +45,8 @@ public void onDisable() {
owner.cancel();
}

HandlerList.unregisterAll((Plugin)this);
HandlerList.unregisterAll(this);
}





















int pluginId = 16872;
public void updateChecker() {
Expand All @@ -86,9 +61,9 @@ public void updateChecker() {
}

private void loadListeners() {
getServer().getPluginManager().registerEvents((Listener)new LeashHandlers(), (Plugin)this);
getServer().getPluginManager().registerEvents((Listener)new PlayerHandlers(), (Plugin)this);
getServer().getPluginManager().registerEvents((Listener)new MenuHandlers(), (Plugin)this);
getServer().getPluginManager().registerEvents(new LeashHandlers(), this);
getServer().getPluginManager().registerEvents(new PlayerHandlers(), this);
getServer().getPluginManager().registerEvents(new MenuHandlers(), this);
}

private void loadCommands() {
Expand All @@ -113,13 +88,7 @@ public static String getString(String path) {
return getInstance().getConfig().getString(path);
}


public static Integer getInt(String path) {
return getInstance().getConfig().getInt(path);
}


public static ConfigurationSection getConfigSec(String s) {
return instance.getConfig().getConfigurationSection(s);
}
}
35 changes: 9 additions & 26 deletions src/main/java/net/jeqo/bloons/data/BalloonCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
String balloonId;
BalloonOwner owner;
Bloons plugin = Bloons.getInstance();

if (args.length < 1) {
if (sender instanceof Player) {
player = (Player) sender;
Expand All @@ -38,13 +39,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("no-permission"));
return true;
}
ArrayList<ItemStack> items = new ArrayList<ItemStack>();
ArrayList<ItemStack> items = new ArrayList<>();
for (String key : Objects.requireNonNull(Bloons.getInstance().getConfig().getConfigurationSection("balloons")).getKeys(false)) {

ConfigurationSection keySection = Objects.requireNonNull(Bloons.getInstance().getConfig().getConfigurationSection("balloons")).getConfigurationSection(key);



if (Bloons.getString("hide-balloons-without-permission").equalsIgnoreCase("true")) {
if (player.hasPermission(Bloons.getString("balloons." + key + ".permission"))) {
assert keySection != null;
Expand All @@ -54,9 +53,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
meta.setLocalizedName(Bloons.getString("balloons." + key + ".id"));
if (Bloons.getString("balloons." + key + ".lore") != null) {
List<String> lore = keySection.getStringList("lore");
for (int i = 0; i < lore.size(); i++) {
lore.set(i, Utils.hex(lore.get(i)));
}
lore.replaceAll(Utils::hex);
meta.setLore(lore);
}
meta.setDisplayName(Utils.hex(keySection.getString("name")));
Expand All @@ -73,21 +70,15 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command

items.add(item);
}
}



else {
} else {
assert keySection != null;
ItemStack item = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(keySection.getString("material")))));
ItemMeta meta = item.getItemMeta();
assert meta != null;
meta.setLocalizedName(Bloons.getString("balloons." + key + ".id"));
if (Bloons.getString("balloons." + key + ".lore") != null) {
List<String> lore = keySection.getStringList("lore");
for (int i = 0; i < lore.size(); i++) {
lore.set(i, Utils.hex(lore.get(i)));
}
lore.replaceAll(Utils::hex);
meta.setLore(lore);
}
meta.setDisplayName(Utils.hex(keySection.getString("name")));
Expand All @@ -104,18 +95,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command

items.add(item);
}



}
new BalloonMenu(items, Bloons.getString("menu-title"), player);
return true;
}





switch (args[0]) {
case "equip":
if (args.length < 2) {
Expand Down Expand Up @@ -144,7 +128,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
return true;
}

Utils.removeBalloon(player, (BalloonOwner) Bloons.playerBalloons.get(player.getUniqueId()));
Utils.removeBalloon(player, Bloons.playerBalloons.get(player.getUniqueId()));
BalloonOwner.checkBalloonRemovalOrAdd(player, str1);
player.playSound(player.getLocation(), Sound.ENTITY_CHICKEN_EGG, 1, 1);
String balloonName = Bloons.getString("balloons." + str1 + ".name");
Expand All @@ -163,7 +147,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("no-permission"));
return true;
}
balloonOwner1 = (BalloonOwner) Bloons.playerBalloons.get(player.getUniqueId());
balloonOwner1 = Bloons.playerBalloons.get(player.getUniqueId());
if (balloonOwner1 == null) {
player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_DIDGERIDOO, 1, 1);
player.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("not-equipped"));
Expand Down Expand Up @@ -211,7 +195,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("player-not-found"));
return true;
}
owner = (BalloonOwner) Bloons.playerBalloons.get(player.getUniqueId());
owner = Bloons.playerBalloons.get(player.getUniqueId());
if (owner == null) {
player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_DIDGERIDOO, 1, 1);
sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("not-equipped"));
Expand All @@ -235,6 +219,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
usage(sender);
return true;
}

void usage(CommandSender sender) {
sender.sendMessage("");
if (sender.hasPermission("bloons.menu")) {
Expand All @@ -257,6 +242,4 @@ void usage(CommandSender sender) {
sender.sendMessage(Utils.hex(" #ff00ccB#f406cfl#e80bd3o#dd11d6o#d217dan#c61cdds #bb22e01#b028e4.#a42de70#9933eb.#8e39ee1#823ef5-#7744f5B#6c4af8E#604ffcT#5555ffA &7- &fMade by Jeqo"));
sender.sendMessage("");
}

String bloonsPrefix = Utils.hex("#ff00cc[#e207c5B#c50fbdl#a816b6o#8a1dafo#6d24a8n#502ca0s#333399] &r");
}
32 changes: 11 additions & 21 deletions src/main/java/net/jeqo/bloons/data/BalloonMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

public class BalloonMenu {

public ArrayList<Inventory> pages = new ArrayList<Inventory>();
public ArrayList<Inventory> pages = new ArrayList<>();
public UUID id;
public int currpage = 0;
public static HashMap<UUID, BalloonMenu> users = new HashMap<UUID, BalloonMenu>();
public static HashMap<UUID, BalloonMenu> users = new HashMap<>();
private Inventory getBlankPage(String name){
int pageSize = Bloons.getInt("menu-size");
Inventory page = Bukkit.createInventory(null, pageSize, Utils.hex(name));
Expand All @@ -45,45 +45,35 @@ private Inventory getBlankPage(String name){
removeMeta.setCustomModelData(Bloons.getInt("buttons.unequip.custom-model-data"));
removeBalloon.setItemMeta(removeMeta);





List<String> previousPageSlots = Bloons.getInstance().getConfig().getStringList("buttons.previous-page.slots");
for (int i = 0; i < previousPageSlots.size(); i++) {
if (Integer.parseInt(previousPageSlots.get(i)) < pageSize) {
page.setItem(Integer.parseInt(previousPageSlots.get(i)), prevPage);
for (String previousPageSlot : previousPageSlots) {
if (Integer.parseInt(previousPageSlot) < pageSize) {
page.setItem(Integer.parseInt(previousPageSlot), prevPage);
} else {
Utils.warn("Previous page button slot(s) out of bounds!");
}
}

List<String> unequipSlots = Bloons.getInstance().getConfig().getStringList("buttons.unequip.slots");
for (int i = 0; i < unequipSlots.size(); i++) {
if (Integer.parseInt(unequipSlots.get(i)) < pageSize){
page.setItem(Integer.parseInt(unequipSlots.get(i)), removeBalloon);
for (String unequipSlot : unequipSlots) {
if (Integer.parseInt(unequipSlot) < pageSize) {
page.setItem(Integer.parseInt(unequipSlot), removeBalloon);
} else {
Utils.warn("Unequip button slot(s) out of bounds!");
}
}

List<String> nextPageSlots = Bloons.getInstance().getConfig().getStringList("buttons.next-page.slots");
for (int i = 0; i < nextPageSlots.size(); i++) {
if (Integer.parseInt(nextPageSlots.get(i)) < pageSize) {
page.setItem(Integer.parseInt(nextPageSlots.get(i)), nextPage);
for (String nextPageSlot : nextPageSlots) {
if (Integer.parseInt(nextPageSlot) < pageSize) {
page.setItem(Integer.parseInt(nextPageSlot), nextPage);
} else {
Utils.warn("Next page button slot(s) out of bounds!");
}
}
return page;
}







public BalloonMenu(ArrayList<ItemStack> items, String name, Player p){
this.id = UUID.randomUUID();
Inventory page = getBlankPage(name);
Expand Down
Loading

0 comments on commit ceb2ace

Please sign in to comment.