diff --git a/src/me/mrCookieSlime/Slimefun/Events/MultiBlockInteractEvent.java b/src/me/mrCookieSlime/Slimefun/Events/MultiBlockInteractEvent.java index 23ab8c688..0737cc11d 100644 --- a/src/me/mrCookieSlime/Slimefun/Events/MultiBlockInteractEvent.java +++ b/src/me/mrCookieSlime/Slimefun/Events/MultiBlockInteractEvent.java @@ -12,10 +12,10 @@ public class MultiBlockInteractEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); - Player p; - MultiBlock mb; - Block b; - boolean cancelled; + private Player p; + private MultiBlock mb; + private Block b; + private boolean cancelled; public HandlerList getHandlers() { return handlers; diff --git a/src/me/mrCookieSlime/Slimefun/Events/ResearchUnlockEvent.java b/src/me/mrCookieSlime/Slimefun/Events/ResearchUnlockEvent.java index b4470bb91..9b2ba24aa 100644 --- a/src/me/mrCookieSlime/Slimefun/Events/ResearchUnlockEvent.java +++ b/src/me/mrCookieSlime/Slimefun/Events/ResearchUnlockEvent.java @@ -11,9 +11,9 @@ public class ResearchUnlockEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); - Player p; - Research r; - boolean cancelled; + private Player p; + private Research r; + private boolean cancelled; public HandlerList getHandlers() { return handlers; diff --git a/src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java b/src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java index 012d1058f..daf92475a 100644 --- a/src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java +++ b/src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java @@ -6,15 +6,15 @@ import org.bukkit.inventory.ItemStack; public interface OreGenResource { // Returns the default supply of this resource in that biome - public int getDefaultSupply(Biome biome); + int getDefaultSupply(Biome biome); // Name/ID e.g. "Oil" - public String getName(); + String getName(); // For the GEO-Scanner - public ItemStack getIcon(); + ItemStack getIcon(); // Measurement Unit e.g. "Buckets" - public String getMeasurementUnit(); + String getMeasurementUnit(); } diff --git a/src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java b/src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java index 40f81902b..1ec6e4ab5 100644 --- a/src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java +++ b/src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java @@ -1,27 +1,24 @@ package me.mrCookieSlime.Slimefun.GEO; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import org.bukkit.Chunk; import org.bukkit.block.Biome; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; +import me.mrCookieSlime.Slimefun.SlimefunStartup; import me.mrCookieSlime.Slimefun.api.BlockStorage; public final class OreGenSystem { private OreGenSystem() {} - public static Map map = new HashMap<>(); - public static Collection listResources() { - return map.values(); + return SlimefunStartup.instance.getUtilities().resources.values(); } public static void registerResource(OreGenResource resource) { - map.put(resource.getName(), resource); + SlimefunStartup.instance.getUtilities().resources.put(resource.getName(), resource); System.out.println("[Slimefun - GEO] Registering Ore Gen: " + resource.getName()); Config cfg = new Config("plugins/Slimefun/generators/" + resource.getName() + ".cfg"); @@ -32,7 +29,7 @@ public final class OreGenSystem { } public static OreGenResource getResource(String name) { - return map.get(name); + return SlimefunStartup.instance.getUtilities().resources.get(name); } private static int getDefault(OreGenResource resource, Biome biome) { diff --git a/src/me/mrCookieSlime/Slimefun/Setup/CSCoreLibLoader.java b/src/me/mrCookieSlime/Slimefun/Setup/CSCoreLibLoader.java index 280b30c8a..5f084a336 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/CSCoreLibLoader.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/CSCoreLibLoader.java @@ -19,10 +19,10 @@ import com.google.gson.JsonParser; public class CSCoreLibLoader { - Plugin plugin; - URL url; - URL download; - File file; + private Plugin plugin; + private URL url; + private URL download; + private File file; public CSCoreLibLoader(Plugin plugin) { this.plugin = plugin; diff --git a/src/me/mrCookieSlime/Slimefun/Setup/Files.java b/src/me/mrCookieSlime/Slimefun/Setup/Files.java index a56933e90..1bdf6148f 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/Files.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/Files.java @@ -2,7 +2,9 @@ package me.mrCookieSlime.Slimefun.Setup; import java.io.File; -public class Files { +public final class Files { + + private Files() {} public static File RESEARCHES = new File("plugins/Slimefun/Researches.yml"); public static File CONFIG = new File("plugins/Slimefun/config.yml"); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/Messages.java b/src/me/mrCookieSlime/Slimefun/Setup/Messages.java index cf7a9086a..55e1ff22b 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/Messages.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/Messages.java @@ -2,7 +2,9 @@ package me.mrCookieSlime.Slimefun.Setup; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Localization; -public class Messages { +public final class Messages { + + private Messages() {} public static Localization local; diff --git a/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java index c89ced948..230f2ac54 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java @@ -27,7 +27,9 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.AutomatedCrafting import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.SlimefunRecipes; -public class MiscSetup { +public final class MiscSetup { + + private MiscSetup() {} public static List post_handlers = new ArrayList<>(); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java index b35fed5c4..b76197012 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java @@ -7,7 +7,9 @@ import me.mrCookieSlime.Slimefun.api.Slimefun; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -public class ResearchSetup { +public final class ResearchSetup { + + private ResearchSetup() {} public static void setupResearches() { Slimefun.registerResearch(new Research(0, "Walking Sticks", 1), SlimefunItems.GRANDMAS_WALKING_STICK, SlimefunItems.GRANDPAS_WALKING_STICK); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java index 7a87f9891..01ed29f7e 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java @@ -17,7 +17,9 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunArmorPiece; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.VanillaItem; -public class SlimefunManager { +public final class SlimefunManager { + + private SlimefunManager() {} public static SlimefunStartup plugin; public static String PREFIX; @@ -26,7 +28,7 @@ public class SlimefunManager { public static void registerArmorSet(ItemStack baseComponent, ItemStack[] items, String idSyntax, PotionEffect[][] effects, boolean special, boolean slimefun) { String[] components = new String[] {"_HELMET", "_CHESTPLATE", "_LEGGINGS", "_BOOTS"}; Category cat = special ? Categories.MAGIC_ARMOR: Categories.ARMOR; - List recipes = new ArrayList(); + List recipes = new ArrayList<>(); recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, null, null, null}); recipes.add(new ItemStack[] {baseComponent, null, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent}); recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, baseComponent, null, baseComponent}); @@ -40,7 +42,7 @@ public class SlimefunManager { public static void registerArmorSet(ItemStack baseComponent, ItemStack[] items, String idSyntax, boolean slimefun, boolean vanilla) { String[] components = new String[] {"_HELMET", "_CHESTPLATE", "_LEGGINGS", "_BOOTS"}; Category cat = Categories.ARMOR; - List recipes = new ArrayList(); + List recipes = new ArrayList<>(); recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, null, null, null}); recipes.add(new ItemStack[] {baseComponent, null, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent}); recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, baseComponent, null, baseComponent}); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index 00332de37..fd2750707 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -161,7 +161,9 @@ import me.mrCookieSlime.Slimefun.holograms.Projector; import me.mrCookieSlime.Slimefun.holograms.ReactorHologram; import me.mrCookieSlime.Slimefun.listeners.AncientAltarListener; -public class SlimefunSetup { +public final class SlimefunSetup { + + private SlimefunSetup() {} public static void setupItems() { new SlimefunItem(Categories.WEAPONS, SlimefunItems.GRANDMAS_WALKING_STICK, "GRANDMAS_WALKING_STICK", RecipeType.ENHANCED_CRAFTING_TABLE, @@ -554,13 +556,14 @@ public class SlimefunSetup { new String[] {"chance.FLINT", "chance.CLAY", "chance.SIFTED_ORE"}, new Integer[] {47, 28, 15}) .register(true, new ItemInteractionHandler() { + private Random random = new Random(); + @Override public boolean onRightClick(ItemUseEvent e, Player p, ItemStack item) { if (SlimefunManager.isItemSimiliar(item, SlimefunItems.GOLD_PAN, true)) { if (e.getClickedBlock() != null && e.getClickedBlock().getType() == Material.GRAVEL) { if (CSCoreLib.getLib().getProtectionManager().canBuild(p.getUniqueId(), e.getClickedBlock(), true)) { List drops = new ArrayList<>(); - Random random = new Random(); if (random.nextInt(100) < (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.SIFTED_ORE")) drops.add(SlimefunItems.SIFTED_ORE); else if (random.nextInt(100) < (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.CLAY")) drops.add(new ItemStack(Material.CLAY_BALL)); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java index a9ac22381..cd1750ce2 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java @@ -7,8 +7,10 @@ import me.mrCookieSlime.Slimefun.api.Slimefun; * * @since 4.1.2 */ -public class WikiSetup { +public final class WikiSetup { + private WikiSetup() {} + /** * Setups the official Wiki links. */ diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index e184d7a5e..77ff40444 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -53,12 +53,13 @@ import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.hooks.github.Contributor; import me.mrCookieSlime.Slimefun.hooks.github.IntegerFormat; -public class SlimefunGuide { +public final class SlimefunGuide { + + private SlimefunGuide() {} public static Map> history = new HashMap<>(); public static int month = 0; - public static List contributors = new ArrayList<>(); public static int issues = 0; public static int forks = 0; /** @@ -163,7 +164,7 @@ public class SlimefunGuide { }); } - menu.addItem(1, new CustomItem(new ItemStack(Material.WRITABLE_BOOK), "&aCredits", "", "&7Version: &a" + SlimefunStartup.instance.getDescription().getVersion(), "&7Contributors: &e" + contributors.size(), "", "&7\u21E8 Click to see the people behind this Plugin")); + menu.addItem(1, new CustomItem(new ItemStack(Material.WRITABLE_BOOK), "&aCredits", "", "&7Version: &a" + SlimefunStartup.instance.getDescription().getVersion(), "&7Contributors: &e" + SlimefunStartup.instance.getUtilities().contributors.size(), "", "&7\u21E8 Click to see the people behind this Plugin")); menu.addMenuClickHandler(1, (pl, slot, item, action) -> { openCredits(pl, guide); return false; @@ -221,11 +222,11 @@ public class SlimefunGuide { int index = 9; double total = 0; - for (Contributor contributor : contributors) { + for (Contributor contributor : SlimefunStartup.instance.getUtilities().contributors) { total += contributor.getCommits(); } - for (final Contributor contributor: contributors) { + for (final Contributor contributor: SlimefunStartup.instance.getUtilities().contributors) { ItemStack skull = new ItemStack(Material.PLAYER_HEAD); try { diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java index e4b2bce44..922f9daec 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java @@ -436,15 +436,12 @@ public class SlimefunStartup extends JavaPlugin { AContainer.processing = null; AContainer.progress = null; Slimefun.guide_handlers = null; - EnergyNet.listeners = null; EnergyNet.machines_input = null; EnergyNet.machines_output = null; EnergyNet.machines_storage = null; CargoNet.faces = null; BlockStorage.universal_inventories = null; TickerTask.block_timings = null; - OreGenSystem.map = null; - SlimefunGuide.contributors = null; PlayerProfile.profiles = null; OreWasher.items = null; @@ -455,8 +452,7 @@ public class SlimefunStartup extends JavaPlugin { private void createDir(String path) { File file = new File(path); - if (!file.exists()) - file.mkdirs(); + if (!file.exists()) file.mkdirs(); } public static Config getCfg() { diff --git a/src/me/mrCookieSlime/Slimefun/Utilities.java b/src/me/mrCookieSlime/Slimefun/Utilities.java index 888af5e99..4bdcc2222 100644 --- a/src/me/mrCookieSlime/Slimefun/Utilities.java +++ b/src/me/mrCookieSlime/Slimefun/Utilities.java @@ -12,8 +12,10 @@ import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.inventory.ItemStack; +import me.mrCookieSlime.Slimefun.GEO.OreGenResource; import me.mrCookieSlime.Slimefun.ancient_altar.AltarRecipe; import me.mrCookieSlime.Slimefun.api.item_transport.CargoTransportEvent; +import me.mrCookieSlime.Slimefun.hooks.github.Contributor; import me.mrCookieSlime.Slimefun.hooks.github.GitHubConnector; /** @@ -45,8 +47,11 @@ public final class Utilities { public Set elevatorUsers = new HashSet<>(); public Set teleporterUsers = new HashSet<>(); + public Map resources = new HashMap<>(); + public Set connectors = new HashSet<>(); public Map contributorHeads = new HashMap<>(); + public List contributors = new ArrayList<>(); public List cargoTransportEvents = new ArrayList<>(); diff --git a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java index 83117afbd..223afe8e6 100644 --- a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java +++ b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java @@ -1,23 +1,21 @@ package me.mrCookieSlime.Slimefun.api.energy; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; -import me.mrCookieSlime.Slimefun.api.network.Network; -import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; -import me.mrCookieSlime.Slimefun.SlimefunStartup; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; -import me.mrCookieSlime.Slimefun.api.BlockStorage; -import me.mrCookieSlime.Slimefun.api.TickerTask; -import me.mrCookieSlime.Slimefun.holograms.EnergyHologram; - import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; +import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; +import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import me.mrCookieSlime.Slimefun.api.BlockStorage; +import me.mrCookieSlime.Slimefun.api.TickerTask; +import me.mrCookieSlime.Slimefun.api.network.Network; +import me.mrCookieSlime.Slimefun.holograms.EnergyHologram; + public class EnergyNet extends Network { public enum NetworkComponent { SOURCE, @@ -31,9 +29,7 @@ public class EnergyNet extends Network { public static Set machines_input = new HashSet(); public static Set machines_storage = new HashSet(); public static Set machines_output = new HashSet(); - - public static Map listeners = new HashMap(); - + public static NetworkComponent getComponent(Block b) { return getComponent(b.getLocation()); } diff --git a/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java index ed77ccacb..acbcf5a6e 100644 --- a/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java @@ -12,14 +12,16 @@ import com.google.gson.JsonParser; import me.mrCookieSlime.Slimefun.SlimefunGuide; import me.mrCookieSlime.Slimefun.SlimefunStartup; -public class GitHubSetup { - +public final class GitHubSetup { + + private GitHubSetup() {} + public static void setup() { new GitHubConnector() { @Override public void onSuccess(JsonElement element) { - SlimefunGuide.contributors.clear(); + SlimefunStartup.instance.getUtilities().contributors.clear(); JsonArray array = element.getAsJsonArray(); for (int i = 0; i < array.size(); i++) { @@ -33,10 +35,10 @@ public class GitHubSetup { if (!name.equals("invalid-email-address")) { Contributor contributor = new Contributor(name, job, commits); contributor.setProfile(profile); - SlimefunGuide.contributors.add(contributor); + SlimefunStartup.instance.getUtilities().contributors.add(contributor); } } - SlimefunGuide.contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0)); + SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0)); SlimefunStartup.instance.getServer().getScheduler().runTaskAsynchronously(SlimefunStartup.instance, () -> { for (JsonElement e: array) { @@ -87,10 +89,10 @@ public class GitHubSetup { @Override public void onFailure() { - SlimefunGuide.contributors.clear(); - SlimefunGuide.contributors.add(new Contributor("TheBusyBiscuit", "&cAuthor", 3)); - SlimefunGuide.contributors.add(new Contributor("John000708", "&cAuthor", 2)); - SlimefunGuide.contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0)); + SlimefunStartup.instance.getUtilities().contributors.clear(); + SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("TheBusyBiscuit", "&cAuthor", 3)); + SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("John000708", "&cAuthor", 2)); + SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0)); } @Override