Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2025-02-27 09:11:51 +01:00
Code Issues Projects Releases Wiki Activity

Cleaned Up

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-10-18 07:15:58 -04:00
parent 384d4d2e5c
commit fa447bc8ef
7 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,8 +122,7 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
console.sendMessage(TextComponent.formatText("&7Action: &aEnabling&7..."));
settingsManager = new SettingsManager(this);
setupConfig();
enchantmentHandler = new EnchantmentHandler();
this.setupConfig();
String langMode = getConfig().getString("System.Language Mode");
Locale.init(this);
@ -134,14 +133,14 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
this.update();
}
hopperManager = new EHopperManager();
playerDataManager = new PlayerDataManager();
boostManager = new BoostManager();
this.enchantmentHandler = new EnchantmentHandler();
this.hopperManager = new EHopperManager();
this.playerDataManager = new PlayerDataManager();
this.boostManager = new BoostManager();
this.commandManager = new CommandManager(this);
loadLevelManager();
checkStorage();
this.loadLevelManager();
this.checkStorage();
/*
* Register hoppers into HopperManger from configuration

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

@ -1,11 +1,9 @@
package com.songoda.epichoppers.handlers;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.utils.Debugger;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

1
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/TeleportHandler.java
View File

@ -9,7 +9,6 @@ import com.songoda.epichoppers.utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player;

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

@ -14,7 +14,10 @@ import com.songoda.epichoppers.player.PlayerData;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import net.milkbowl.vault.economy.Economy;
import org.bukkit.*;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;

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

@ -4,7 +4,6 @@ import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.TeleportTrigger;
import com.songoda.epichoppers.hopper.EHopper;
import com.songoda.epichoppers.player.MenuType;
import com.songoda.epichoppers.player.PlayerData;
import com.songoda.epichoppers.player.SyncType;
import com.songoda.epichoppers.utils.Debugger;

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

@ -8,7 +8,7 @@ public class PlayerDataManager {
private final Map<UUID, PlayerData> registeredPlayers = new HashMap<>();
public PlayerData getPlayerData(UUID uuid) {
private PlayerData getPlayerData(UUID uuid) {
return (uuid != null) ? registeredPlayers.computeIfAbsent(uuid, PlayerData::new) : null;
}

49
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/SettingsManager.java
View File

@ -99,14 +99,13 @@ public class SettingsManager implements Listener {
event.setCancelled(true);
}
public void finishEditing(Player player) {
private void finishEditing(Player player) {
this.current.remove(player);
this.instance.saveConfig();
this.openEditor(player);
}
public void editObject(Player player, String current) {
private void editObject(Player player, String current) {
this.current.put(player, ChatColor.stripColor(current));
player.closeInventory();
@ -139,7 +138,7 @@ public class SettingsManager implements Listener {
player.openInventory(inventory);
}
public void openEditor(Player player) {
private void openEditor(Player player) {
Inventory inventory = Bukkit.createInventory(null, 54, pluginName + " Settings Editor");
FileConfiguration config = instance.getConfig();
@ -191,26 +190,26 @@ public class SettingsManager implements Listener {
}
public enum Setting {
o1("Main.Allow hopper Upgrading", true),
o2("Main.Upgrade With Economy", true),
o3("Main.Upgrade With XP", true),
o4("Main.Allow Players To Teleport Through Hoppers", true),
o6("Main.Support Enderchests", true),
o7("Main.Upgrade Particle Type", "SPELL_WITCH"),
o8("Main.Amount of Ticks Between Hops", 8L),
o9("Main.Amount of Ticks Between Teleport", 10L),
o10("Main.Timeout When Syncing Hoppers", 300L),
o11("Main.Max Hoppers Per Chunk", -1),
o12("Main.Display Helpful Tips For Operators", true),
o13("Main.Sounds Enabled", true),
o14("Main.BlockBreak Particle Type", "LAVA"),
o15("Main.BlockBreak Blacklisted Blocks", Arrays.asList("BEDROCK")),
o16("Interfaces.Replace Glass Type 1 With Rainbow Glass", false),
o17("Interfaces.Economy Icon", "SUNFLOWER"),
o18("Interfaces.XP Icon", "EXPERIENCE_BOTTLE"),
o19("Interfaces.Glass Type 1", 7),
o20("Interfaces.Glass Type 2", 11),
o21("Interfaces.Glass Type 3", 3),
HOPPER_UPGRADING("Main.Allow hopper Upgrading", true),
UPGRADE_WITH_ECONOMY("Main.Upgrade With Economy", true),
UPGRADE_WITH_XP("Main.Upgrade With XP", true),
TELEPORT("Main.Allow Players To Teleport Through Hoppers", true),
ENDERCHESTS("Main.Support Enderchests", true),
PARTICLE_TYPE("Main.Upgrade Particle Type", "SPELL_WITCH"),
HOP_TICKS("Main.Amount of Ticks Between Hops", 8L),
TELEPORT_TICKS("Main.Amount of Ticks Between Teleport", 10L),
SYNC_TIMEOUT("Main.Timeout When Syncing Hoppers", 300L),
MAX_CHUNK("Main.Max Hoppers Per Chunk", -1),
TIPS("Main.Display Helpful Tips For Operators", true),
SOUNDS("Main.Sounds Enabled", true),
BLOCKBREAK_PARTICLE("Main.BlockBreak Particle Type", "LAVA"),
BLACKLIST("Main.BlockBreak Blacklisted Blocks", Arrays.asList("BEDROCK")),
RAINBOW("Interfaces.Replace Glass Type 1 With Rainbow Glass", false),
ECO_ICON("Interfaces.Economy Icon", "SUNFLOWER"),
XP_ICON("Interfaces.XP Icon", "EXPERIANCE_BOTTLE"),
GLASS_TYPE_1("Interfaces.Glass Type 1", 7),
GLASS_TYPE_2("Interfaces.Glass Type 2", 11),
GLASS_TYPE_3("Interfaces.Glass Type 3", 3),
DATABASE_SUPPORT("Database.Activate Mysql Support", false),
DATABASE_IP("Database.IP", "127.0.0.1"),
@ -222,7 +221,7 @@ public class SettingsManager implements Listener {
DOWNLOAD_FILES("System.Download Needed Data Files", true),
LANGUGE_MODE("System.Language Mode", "en_US"),
o22("System.Debugger Enabled", false);
DEBUGGER("System.Debugger Enabled", false);
private String setting;
private Object option;