Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-09-28 23:57:28 +02:00
Code Issues Projects Releases Wiki Activity

Cleaned code

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-10-02 19:22:11 -04:00
parent 59c0a97af0
commit e097aa0324
11 changed files with 112 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java
View File

@ -2,12 +2,15 @@ package com.songoda.epichoppers;
import com.google.common.base.Preconditions;
import com.songoda.arconix.api.mcupdate.MCUpdate;
import com.songoda.arconix.api.methods.formatting.TextComponent;
import com.songoda.arconix.api.methods.serialize.Serialize;
import com.songoda.arconix.api.utils.ConfigWrapper;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.api.EpicHoppers;
import com.songoda.epichoppers.api.EpicHoppersAPI;
import com.songoda.epichoppers.api.hopper.*;
import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.HopperManager;
import com.songoda.epichoppers.api.hopper.TeleportTrigger;
import com.songoda.epichoppers.api.hopper.levels.Level;
import com.songoda.epichoppers.api.hopper.levels.LevelManager;
import com.songoda.epichoppers.api.hopper.levels.modules.Module;
@ -27,10 +30,7 @@ import com.songoda.epichoppers.hopper.levels.ELevelManager;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.songoda.epichoppers.hopper.levels.modules.ModuleBlockBreak;
import com.songoda.epichoppers.hopper.levels.modules.ModuleSuction;
import com.songoda.epichoppers.listeners.BlockListeners;
import com.songoda.epichoppers.listeners.HopperListeners;
import com.songoda.epichoppers.listeners.InteractListeners;
import com.songoda.epichoppers.listeners.InventoryListeners;
import com.songoda.epichoppers.listeners.*;
import com.songoda.epichoppers.player.PlayerDataManager;
import com.songoda.epichoppers.storage.Storage;
import com.songoda.epichoppers.storage.StorageItem;
@ -117,9 +117,9 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
Arconix.pl().hook(this);
console.sendMessage(Arconix.pl().getApi().format().formatText("&a============================="));
console.sendMessage(Arconix.pl().getApi().format().formatText("&7EpicHoppers " + this.getDescription().getVersion() + " by &5Brianna <3&7!"));
console.sendMessage(Arconix.pl().getApi().format().formatText("&7Action: &aEnabling&7..."));
console.sendMessage(TextComponent.formatText("&a============================="));
console.sendMessage(TextComponent.formatText("&7EpicHoppers " + this.getDescription().getVersion() + " by &5Brianna <3&7!"));
console.sendMessage(TextComponent.formatText("&7Action: &aEnabling&7..."));
settingsManager = new SettingsManager(this);
setupConfig();
@ -217,6 +217,7 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
// Register Listeners
pluginManager.registerEvents(new HopperListeners(this), this);
pluginManager.registerEvents(new EntityListeners(this), this);
pluginManager.registerEvents(new BlockListeners(this), this);
pluginManager.registerEvents(new InteractListeners(this), this);
pluginManager.registerEvents(new InventoryListeners(this), this);
@ -232,18 +233,17 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
if (pluginManager.isPluginEnabled("USkyBlock")) this.register(HookUSkyBlock::new);
if (pluginManager.isPluginEnabled("WorldGuard")) this.register(HookWorldGuard::new);
console.sendMessage(Arconix.pl().getApi().format().formatText("&a============================="));
console.sendMessage(TextComponent.formatText("&a============================="));
}
public void onDisable() {
saveToFile();
this.storage.closeConnection();
this.protectionHooks.clear();
console.sendMessage(Arconix.pl().getApi().format().formatText("&a============================="));
console.sendMessage(Arconix.pl().getApi().format().formatText("&7EpicHoppers " + this.getDescription().getVersion() + " by &5Brianna <3!"));
console.sendMessage(Arconix.pl().getApi().format().formatText("&7Action: &cDisabling&7..."));
console.sendMessage(Arconix.pl().getApi().format().formatText("&a============================="));
console.sendMessage(TextComponent.formatText("&a============================="));
console.sendMessage(TextComponent.formatText("&7EpicHoppers " + this.getDescription().getVersion() + " by &5Brianna <3!"));
console.sendMessage(TextComponent.formatText("&7Action: &cDisabling&7..."));
console.sendMessage(TextComponent.formatText("&a============================="));
}
private void update() {
@ -482,7 +482,7 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
public ItemStack newHopperItem(Level level) {
ItemStack item = new ItemStack(Material.HOPPER, 1);
ItemMeta itemmeta = item.getItemMeta();
itemmeta.setDisplayName(Arconix.pl().getApi().format().formatText(Methods.formatName(level.getLevel(), true)));
itemmeta.setDisplayName(TextComponent.formatText(Methods.formatName(level.getLevel(), true)));
item.setItemMeta(itemmeta);
return item;
}

3
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/boost/BoostManager.java
View File

@ -1,8 +1,5 @@
package com.songoda.epichoppers.boost;
import com.songoda.epichoppers.EpicHoppersPlugin;
import org.bukkit.Bukkit;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;

29
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/EnchantmentHandler.java
View File

@ -16,16 +16,6 @@ import java.util.ArrayList;
*/
public class EnchantmentHandler {
private EpicHoppersPlugin instance;
public EnchantmentHandler(EpicHoppersPlugin instance) {
this.instance = instance;
}
public EnchantmentHandler() {
}
public ItemStack createSyncTouch(ItemStack item, Block b) {
try {
ItemMeta itemmeta = item.getItemMeta();
@ -45,25 +35,6 @@ public class EnchantmentHandler {
return null;
}
public void giveSyncTouchBook(Player p) {
try {
boolean isEmpty = false;
for (ItemStack item : p.getInventory().getContents()) {
if (item == null) {
isEmpty = true;
}
}
if (!isEmpty) {
p.sendMessage(instance.references.getPrefix() + instance.getLocale().getMessage("event.inventory.noroom"));
} else {
ItemStack book = getbook();
p.getInventory().addItem(book);
}
} catch (Exception e) {
Debugger.runReport(e);
}
}
public ItemStack getbook() {
try {
ItemStack book = new ItemStack(Material.ENCHANTED_BOOK);

12
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/HopHandler.java
View File

@ -5,13 +5,19 @@ import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import com.songoda.epichoppers.boost.BoostData;
import com.songoda.epichoppers.utils.Debugger;
import org.bukkit.*;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.Hopper;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.*;
import org.bukkit.inventory.FurnaceInventory;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
/**
* Created by songoda on 3/14/2017.

3
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/EHopper.java
View File

@ -6,10 +6,9 @@ import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Filter;
import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.levels.Level;
import com.songoda.epichoppers.api.hopper.TeleportTrigger;
import com.songoda.epichoppers.api.hopper.levels.Level;
import com.songoda.epichoppers.boost.BoostData;
import com.songoda.epichoppers.hopper.levels.modules.ModuleAutoCrafting;
import com.songoda.epichoppers.player.MenuType;
import com.songoda.epichoppers.player.PlayerData;
import com.songoda.epichoppers.utils.Debugger;

12
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/BlockListeners.java
View File

@ -3,8 +3,8 @@ package com.songoda.epichoppers.listeners;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.levels.Level;
import com.songoda.epichoppers.api.hopper.TeleportTrigger;
import com.songoda.epichoppers.api.hopper.levels.Level;
import com.songoda.epichoppers.hopper.EFilter;
import com.songoda.epichoppers.hopper.EHopper;
import com.songoda.epichoppers.utils.Debugger;
@ -25,14 +25,12 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.permissions.PermissionAttachmentInfo;
import java.util.Map;
/**
* Created by songoda on 3/14/2017.
*/
public class BlockListeners implements Listener {
private EpicHoppersPlugin instance;
private final EpicHoppersPlugin instance;
public BlockListeners(EpicHoppersPlugin instance) {
this.instance = instance;
@ -63,7 +61,7 @@ public class BlockListeners implements Listener {
ItemStack item = e.getItemInHand().clone();
instance.getHopperManager().addHopper(e.getBlock().getLocation(), new EHopper(e.getBlock(), instance.getLevelFromItem(item), player.getUniqueId(), player.getUniqueId(),null, new EFilter(), TeleportTrigger.DISABLED, null));
instance.getHopperManager().addHopper(e.getBlock().getLocation(), new EHopper(e.getBlock(), instance.getLevelFromItem(item), player.getUniqueId(), player.getUniqueId(), null, new EFilter(), TeleportTrigger.DISABLED, null));
} catch (Exception ee) {
Debugger.runReport(ee);
@ -73,8 +71,8 @@ public class BlockListeners implements Listener {
private int maxHoppers(Player player) {
int limit = -1;
for (PermissionAttachmentInfo permissionAttachmentInfo : player.getEffectivePermissions()) {
if (!permissionAttachmentInfo.getPermission().toLowerCase().startsWith("epichoppers.limit")) continue;
limit = Integer.parseInt(permissionAttachmentInfo.getPermission().split("\\.")[2]);
if (!permissionAttachmentInfo.getPermission().toLowerCase().startsWith("epichoppers.limit")) continue;
limit = Integer.parseInt(permissionAttachmentInfo.getPermission().split("\\.")[2]);
}
if (limit == -1) limit = instance.getConfig().getInt("Main.Max Hoppers Per Chunk");
return limit;

65
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/EntityListeners.java
View File

@ -1,4 +1,67 @@
package com.songoda.epichoppers.listeners;
public class EntityListeners {
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class EntityListeners implements Listener {
private final EpicHoppersPlugin instance;
private Map<UUID, Player> ents = new HashMap<>();
public EntityListeners(EpicHoppersPlugin instance) {
this.instance = instance;
}
@EventHandler
public void onDed(EntityDamageByEntityEvent e) {
try {
if (!(e.getDamager() instanceof Player)) return;
Player p = (Player) e.getDamager();
if (!Methods.isSync(p)) return;
double d = ((LivingEntity) e.getEntity()).getHealth() - e.getDamage();
if (d < 1) {
ents.put(e.getEntity().getUniqueId(), p);
}
} catch (Exception ee) {
Debugger.runReport(ee);
}
}
@EventHandler
public void onDrop(EntityDeathEvent e) {
try {
if (!ents.containsKey(e.getEntity().getUniqueId())) return;
Player p = ents.get(e.getEntity().getUniqueId());
ItemStack item = p.getItemInHand();
ItemMeta meta = item.getItemMeta();
Location location = Arconix.pl().getApi().serialize().unserializeLocation(meta.getLore().get(1).replaceAll("§", ""));
if (location.getBlock().getType() != Material.CHEST) return;
InventoryHolder ih = (InventoryHolder) location.getBlock().getState();
for (ItemStack is : e.getDrops()) {
ih.getInventory().addItem(is);
}
e.getDrops().clear();
} catch (Exception ee) {
Debugger.runReport(ee);
}
}
}

73
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java
View File

@ -1,107 +1,38 @@
package com.songoda.epichoppers.listeners;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.inventory.InventoryMoveItemEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
/**
* Created by songoda on 4/18/2017.
*/
public class HopperListeners implements Listener {
private EpicHoppersPlugin instance;
private final EpicHoppersPlugin instance;
public HopperListeners(EpicHoppersPlugin instance) {
this.instance = instance;
}
@EventHandler(ignoreCancelled = true)
public void onHop(InventoryMoveItemEvent e) {
try {
Inventory source = e.getSource();
if (!instance.getHopperManager().isHopper(e.getSource().getLocation())) return;
Hopper hopper = instance.getHopperManager().getHopper(e.getSource().getLocation());
if (source.getHolder() instanceof Hopper && hopper.getSyncedBlock() != null) {
e.setCancelled(true);
e.setCancelled(true);
}
} catch (Exception ee) {
Debugger.runReport(ee);
}
}
private Map<UUID, Player> ents = new HashMap<>();
@EventHandler
public void onDed(EntityDamageByEntityEvent e) {
try {
if (e.getDamager() instanceof Player) {
Player p = (Player) e.getDamager();
if (Methods.isSync(p)) {
double d = ((LivingEntity) e.getEntity()).getHealth() - e.getDamage();
if (d < 1) {
ents.put(e.getEntity().getUniqueId(), p);
}
}
}
} catch (Exception ee) {
Debugger.runReport(ee);
}
}
@EventHandler
public void onDrop(EntityDeathEvent e) {
try {
if (ents.containsKey(e.getEntity().getUniqueId())) {
Player p = ents.get(e.getEntity().getUniqueId());
ItemStack item = p.getItemInHand();
ItemMeta meta = item.getItemMeta();
Location location = Arconix.pl().getApi().serialize().unserializeLocation(meta.getLore().get(1).replaceAll("§", ""));
if (location.getBlock().getType() == Material.CHEST) {
InventoryHolder ih = (InventoryHolder) location.getBlock().getState();
for (ItemStack is : e.getDrops()) {
ih.getInventory().addItem(is);
}
e.getDrops().clear();
}
}
} catch (Exception ee) {
Debugger.runReport(ee);
}
}
private int getItemCount(Inventory inventory, ItemStack item) {
int amount = 0;
for (ItemStack inventoryItem : inventory) {
if (!item.isSimilar(inventoryItem)) continue;
amount += inventoryItem.getAmount();
}
return amount;
}
}

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InteractListeners.java
View File

@ -25,7 +25,7 @@ import org.bukkit.inventory.ItemStack;
*/
public class InteractListeners implements Listener {
private EpicHoppersPlugin instance;
private final EpicHoppersPlugin instance;
public InteractListeners(EpicHoppersPlugin instance) {
this.instance = instance;
@ -83,7 +83,7 @@ public class InteractListeners implements Listener {
playerData.setLastHopper(hopper);
if (instance.getConfig().getBoolean("Main.Allow hopper Upgrading")
&& !player.getInventory().getItemInMainHand().getType().name().contains("PICKAXE")) {
((EHopper)hopper).overview(player);
((EHopper) hopper).overview(player);
e.setCancelled(true);
return;
}
@ -92,7 +92,7 @@ public class InteractListeners implements Listener {
if (player.hasPermission("EpicHoppers.Admin")) {
playerData.setLastHopper(hopper);
player.sendMessage(instance.getLocale().getMessage("event.hopper.syncnext"));
((EHopper)hopper).timeout(player);
((EHopper) hopper).timeout(player);
player.closeInventory();
}
e.setCancelled(true);

24
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InventoryListeners.java
View File

@ -23,7 +23,7 @@ import org.bukkit.inventory.ItemStack;
*/
public class InventoryListeners implements Listener {
private EpicHoppersPlugin instance;
private final EpicHoppersPlugin instance;
public InventoryListeners(EpicHoppersPlugin instance) {
this.instance = instance;
@ -97,26 +97,26 @@ public class InventoryListeners implements Listener {
} else if (hopper.getTeleportTrigger() == TeleportTrigger.WALK_ON) {
hopper.setTeleportTrigger(TeleportTrigger.DISABLED);
}
((EHopper)hopper).overview(player);
((EHopper) hopper).overview(player);
return;
}
player.closeInventory();
} else if (event.getCurrentItem().getItemMeta().hasDisplayName() && event.getCurrentItem().getItemMeta().getDisplayName().equals(instance.getLocale().getMessage("interface.hopper.filtertitle")) && (hopper.getLevel().isFilter() || player.hasPermission("EpicHoppers.Filter"))) {
if (!event.getCurrentItem().getItemMeta().getDisplayName().equals("§l")) {
((EHopper)hopper).filter(player);
((EHopper) hopper).filter(player);
}
} else if (event.getSlot() == 11 && player.hasPermission("EpicHoppers.Upgrade.XP")) {
if (!event.getCurrentItem().getItemMeta().getDisplayName().equals("§l")) {
((EHopper)hopper).upgrade("XP", player);
((EHopper) hopper).upgrade("XP", player);
player.closeInventory();
}
} else if (event.getSlot() == 15 && player.hasPermission("EpicHoppers.Upgrade.ECO")) {
if (!event.getCurrentItem().getItemMeta().getDisplayName().equals("§l")) {
((EHopper)hopper).upgrade("ECO", player);
((EHopper) hopper).upgrade("ECO", player);
player.closeInventory();
}
} else if (event.getCurrentItem().getItemMeta().getDisplayName().equals(instance.getLocale().getMessage("interface.hopper.craftingtitle"))) {
((EHopper)hopper).crafting(player);
((EHopper) hopper).crafting(player);
} else if (event.getCurrentItem().getItemMeta().getDisplayName().equals(instance.getLocale().getMessage("interface.hopper.synchopper"))) {
if (event.isRightClick()) {
player.sendMessage(instance.references.getPrefix() + instance.getLocale().getMessage("event.hopper.desync"));
@ -132,7 +132,7 @@ public class InventoryListeners implements Listener {
if (can) {
playerData.setSyncType(SyncType.REGULAR);
player.sendMessage(instance.references.getPrefix() + instance.getLocale().getMessage("event.hopper.syncnext"));
((EHopper)hopper).timeout(player);
((EHopper) hopper).timeout(player);
}
}
player.closeInventory();
@ -157,11 +157,11 @@ public class InventoryListeners implements Listener {
}
Hopper hopper = playerData.getLastHopper();
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> ((EHopper)hopper).compile(player), 1);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> ((EHopper) hopper).compile(player), 1);
if (e.getSlot() == 40) {
playerData.setSyncType(SyncType.FILTERED);
player.sendMessage(instance.references.getPrefix() + instance.getLocale().getMessage("event.hopper.syncnext"));
((EHopper)hopper).timeout(player);
((EHopper) hopper).timeout(player);
player.closeInventory();
return true;
}
@ -216,7 +216,7 @@ public class InventoryListeners implements Listener {
@EventHandler
public void onClose(InventoryCloseEvent event) {
try {
Player player = (Player)event.getPlayer();
Player player = (Player) event.getPlayer();
PlayerData playerData = instance.getPlayerDataManager().getPlayerData(player);
if (playerData.getInMenu() == MenuType.CRAFTING) {
Hopper hopper = instance.getHopperManager().getHopperFromPlayer(player);
@ -225,7 +225,7 @@ public class InventoryListeners implements Listener {
}
if (playerData.getInMenu() == MenuType.FILTER) {
Hopper hopper = instance.getHopperManager().getHopperFromPlayer(player);
((EHopper)hopper).compile(player);
((EHopper) hopper).compile(player);
}
if (playerData.getInMenu() != MenuType.NOT_IN) {
Hopper hopper = instance.getHopperManager().getHopperFromPlayer(player);
@ -234,7 +234,7 @@ public class InventoryListeners implements Listener {
}
playerData.setInMenu(MenuType.NOT_IN);
if (playerData.getSyncType() == SyncType.FILTERED) {
((EHopper)playerData.getLastHopper()).compile(player);
((EHopper) playerData.getLastHopper()).compile(player);
}
} catch (Exception e) {
Debugger.runReport(e);

2
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/PlayerData.java
View File

@ -17,7 +17,7 @@ public class PlayerData {
private Date lastTeleport = null; // Null means off.
public PlayerData(UUID playerUUID) {
PlayerData(UUID playerUUID) {
this.playerUUID = playerUUID;
}