From 9aa784529374a80d8ac67244c3b53589c15128b9 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Fri, 30 Aug 2019 23:21:34 +0200 Subject: [PATCH] Refactored Code --- .../Slimefun/Objects/Research.java | 4 +- .../SlimefunItem/machines/AutoEnchanter.java | 2 +- .../machines/ElectricDustWasher.java | 4 +- .../SlimefunItem/multiblocks/OreWasher.java | 2 +- .../Slimefun/Setup/MiscSetup.java | 2 +- .../mrCookieSlime/Slimefun/SlimefunGuide.java | 8 ++-- .../Slimefun/SlimefunStartup.java | 6 +-- .../Slimefun/api/BlockStorage.java | 2 +- .../Slimefun/api/PlayerProfile.java | 2 +- .../Slimefun/utils/Settings.java | 38 +++++++++---------- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/Research.java b/src/me/mrCookieSlime/Slimefun/Objects/Research.java index c832015d7..eec384d4a 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/Research.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/Research.java @@ -80,7 +80,7 @@ public class Research { } public boolean isEnabled() { - return SlimefunStartup.instance.getSettings().RESEARCHES_ENABLED && enabled; + return SlimefunStartup.instance.getSettings().researchesEnabled && enabled; } /** @@ -214,7 +214,7 @@ public class Research { */ public boolean canUnlock(Player p) { if (!isEnabled()) return true; - return (p.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().RESEARCHES_FREE_IN_CREATIVE) || p.getLevel() >= this.cost; + return (p.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().researchesFreeInCreative) || p.getLevel() >= this.cost; } /** diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java index 0e6d14ceb..6e18e8b4e 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java @@ -123,7 +123,7 @@ public class AutoEnchanter extends AContainer { special_amount += EmeraldEnchants.getInstance().getRegistry().getEnchantments(target).size(); } - if (amount > 0 && special_amount <= SlimefunStartup.instance.getSettings().EMERALD_ENCHANTS_LIMIT) { + if (amount > 0 && special_amount <= SlimefunStartup.instance.getSettings().emeraldEnchantsLimit) { ItemStack newItem = target.clone(); for (Map.Entry e: enchantments.entrySet()) { newItem.addUnsafeEnchantment(e.getKey(), e.getValue()); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java index 6dd036788..2afbd4b28 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java @@ -81,7 +81,7 @@ public abstract class ElectricDustWasher extends AContainer { else { for (int slot: getInputSlots()) { if (SlimefunManager.isItemSimiliar(BlockStorage.getInventory(b).getItemInSlot(slot), SlimefunItems.SIFTED_ORE, true)) { - if (!SlimefunStartup.instance.getSettings().DUST_WASHER_LEGACY) { + if (!SlimefunStartup.instance.getSettings().legacyDustWasher) { boolean empty_slot = false; for (int output_slot: getOutputSlots()) { if (BlockStorage.getInventory(b).getItemInSlot(output_slot) == null) { @@ -94,7 +94,7 @@ public abstract class ElectricDustWasher extends AContainer { ItemStack adding = OreWasher.items[new Random().nextInt(OreWasher.items.length)]; MachineRecipe r = new MachineRecipe(4 / getSpeed(), new ItemStack[0], new ItemStack[] {adding}); - if (SlimefunStartup.instance.getSettings().DUST_WASHER_LEGACY && !fits(b, r.getOutput())) return; + if (SlimefunStartup.instance.getSettings().legacyDustWasher && !fits(b, r.getOutput())) return; BlockStorage.getInventory(b).replaceExistingItem(slot, InvUtils.decreaseItem(BlockStorage.getInventory(b).getItemInSlot(slot), 1)); processing.put(b, r); progress.put(b, r.getTicks()); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreWasher.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreWasher.java index 45367927f..663428aed 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreWasher.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreWasher.java @@ -56,7 +56,7 @@ public class OreWasher extends MultiBlockMachine { ItemStack adding = items[new Random().nextInt(items.length)]; Inventory outputInv = null; - if (!SlimefunStartup.instance.getSettings().ORE_WASHER_LEGACY) { + if (!SlimefunStartup.instance.getSettings().legacyOreWasher) { // This is a fancy way of checking if there is empty space in the inv; by checking if an unobtainable item could fit in it. // However, due to the way the method findValidOutputInv() functions, the dummyAdding will never actually be added to the real inventory, // so it really doesn't matter what item the ItemStack is made by. SlimefunItems.DEBUG_FISH however, signals that it's diff --git a/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java index c37bf5a0d..fef2b0f6b 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java @@ -160,7 +160,7 @@ public final class MiscSetup { // Favour 8 Cobblestone -> 1 Sand Recipe over 1 Cobblestone -> 1 Gravel Recipe Stream stream = grinder_recipes.stream(); - if (!settings.ORE_GRINDER_LEGACY) { + if (!settings.legacyOreGrinder) { stream = stream.sorted((a, b) -> Integer.compare(b[0].getAmount(), a[0].getAmount())); } diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index 396c31940..4eabea7b7 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -567,7 +567,7 @@ public final class SlimefunGuide { openCategory(p, category, true, selected_page, book); } else { - if (!(p.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().RESEARCHES_FREE_IN_CREATIVE)) { + if (!(p.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().researchesFreeInCreative)) { p.setLevel(p.getLevel() - research.getCost()); } @@ -706,12 +706,12 @@ public final class SlimefunGuide { openCategory(p, category, true, selected_page, book); } else { - if (!(pl.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().RESEARCHES_FREE_IN_CREATIVE)) { + if (!(pl.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().researchesFreeInCreative)) { pl.setLevel(pl.getLevel() - research.getCost()); } if (pl.getGameMode() == GameMode.CREATIVE) { - research.unlock(pl, SlimefunStartup.instance.getSettings().RESEARCHES_FREE_IN_CREATIVE); + research.unlock(pl, SlimefunStartup.instance.getSettings().researchesFreeInCreative); openCategory(pl, category, survival, selected_page, book); } else { @@ -780,7 +780,7 @@ public final class SlimefunGuide { final SlimefunItem sfItem = SlimefunItem.getByItem(item); - if (sfItem == null && !SlimefunStartup.instance.getSettings().GUIDE_SHOW_VANILLA_RECIPES) return; + if (sfItem == null && !SlimefunStartup.instance.getSettings().guideShowVanillaRecipes) return; ItemStack[] recipe = new ItemStack[9]; ItemStack recipeType = null; diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java index dbada7c7e..539bf6e16 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java @@ -191,7 +191,7 @@ public final class SlimefunStartup extends JavaPlugin { MiscSetup.loadDescriptions(); settings = new Settings(config); - settings.RESEARCHES_ENABLED = getResearchCfg().getBoolean("enable-researching"); + settings.researchesEnabled = getResearchCfg().getBoolean("enable-researching"); settings.SMELTERY_FIRE_BREAK_CHANCE = (Integer) Slimefun.getItemValue("SMELTERY", "chance.fireBreak"); System.out.println("[Slimefun] Loading Researches..."); @@ -301,10 +301,10 @@ public final class SlimefunStartup extends JavaPlugin { ticker = new TickerTask(); - getServer().getScheduler().runTaskTimer(this, new PlayerAutoSaver(), 2000L, settings.BLOCK_AUTO_SAVE_DELAY * 60L * 20L); + getServer().getScheduler().runTaskTimer(this, new PlayerAutoSaver(), 2000L, settings.blocksAutoSaveDelay * 60L * 20L); // Starting all ASYNC Tasks - getServer().getScheduler().runTaskTimerAsynchronously(this, new BlockAutoSaver(), 2000L, settings.BLOCK_AUTO_SAVE_DELAY * 60L * 20L); + getServer().getScheduler().runTaskTimerAsynchronously(this, new BlockAutoSaver(), 2000L, settings.blocksAutoSaveDelay * 60L * 20L); getServer().getScheduler().runTaskTimerAsynchronously(this, ticker, 100L, config.getInt("URID.custom-ticker-delay")); getServer().getScheduler().runTaskTimerAsynchronously(this, () -> utilities.connectors.forEach(GitHubConnector::pullFile), 80L, 60 * 60 * 20L); diff --git a/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java index c72523af4..0624bd648 100644 --- a/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -103,7 +103,7 @@ public class BlockStorage { System.err.println("[Slimefun] should probably look into it!"); } else if (file.getName().endsWith(".sfb")) { - if (timestamp + SlimefunStartup.instance.getSettings().BLOCK_LOADING_INFO_DELAY < System.currentTimeMillis()) { + if (timestamp + SlimefunStartup.instance.getSettings().blocksInfoLoadingDelay < System.currentTimeMillis()) { System.out.println("[Slimefun] Loading Blocks... " + Math.round((((done * 100.0F) / total) * 100.0F) / 100.0F) + "% done (\"" + w.getName() + "\")"); timestamp = System.currentTimeMillis(); } diff --git a/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java b/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java index 5b30bc2b0..2e715fec6 100644 --- a/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java +++ b/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java @@ -161,7 +161,7 @@ public final class PlayerProfile { } public String getTitle() { - List titles = SlimefunStartup.instance.getSettings().RESEARCHES_TITLES; + List titles = SlimefunStartup.instance.getSettings().researchesTitles; int index = Math.round(Float.valueOf(String.valueOf(Math.round(((researches.size() * 100.0F) / Research.list().size()) * 100.0F) / 100.0F)) / 100.0F) * titles.size(); if (index > 0) index--; diff --git a/src/me/mrCookieSlime/Slimefun/utils/Settings.java b/src/me/mrCookieSlime/Slimefun/utils/Settings.java index 76081b083..8f6382c0d 100644 --- a/src/me/mrCookieSlime/Slimefun/utils/Settings.java +++ b/src/me/mrCookieSlime/Slimefun/utils/Settings.java @@ -6,37 +6,37 @@ import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; public final class Settings { - public boolean RESEARCHES_ENABLED; - public boolean RESEARCHES_FREE_IN_CREATIVE; - public List RESEARCHES_TITLES; + public boolean researchesEnabled; + public boolean researchesFreeInCreative; + public List researchesTitles; - public int BLOCK_LOADING_INFO_DELAY; - public int BLOCK_AUTO_SAVE_DELAY; + public int blocksInfoLoadingDelay; + public int blocksAutoSaveDelay; - public boolean GUIDE_SHOW_VANILLA_RECIPES; + public boolean guideShowVanillaRecipes; - public int EMERALD_ENCHANTS_LIMIT; + public int emeraldEnchantsLimit; - public boolean DUST_WASHER_LEGACY; - public boolean ORE_GRINDER_LEGACY; - public boolean ORE_WASHER_LEGACY; + public boolean legacyDustWasher; + public boolean legacyOreGrinder; + public boolean legacyOreWasher; public int SMELTERY_FIRE_BREAK_CHANCE; public Settings(Config cfg) { - RESEARCHES_FREE_IN_CREATIVE = cfg.getBoolean("options.allow-free-creative-research"); - RESEARCHES_TITLES = cfg.getStringList("research-ranks"); + researchesFreeInCreative = cfg.getBoolean("options.allow-free-creative-research"); + researchesTitles = cfg.getStringList("research-ranks"); - BLOCK_LOADING_INFO_DELAY = cfg.getInt("URID.info-delay"); - BLOCK_AUTO_SAVE_DELAY = cfg.getInt("options.auto-save-delay-in-minutes"); + blocksInfoLoadingDelay = cfg.getInt("URID.info-delay"); + blocksAutoSaveDelay = cfg.getInt("options.auto-save-delay-in-minutes"); - GUIDE_SHOW_VANILLA_RECIPES = cfg.getBoolean("options.show-vanilla-recipes-in-guide"); + guideShowVanillaRecipes = cfg.getBoolean("options.show-vanilla-recipes-in-guide"); - EMERALD_ENCHANTS_LIMIT = cfg.getInt("options.emerald-enchantment-limit"); + emeraldEnchantsLimit = cfg.getInt("options.emerald-enchantment-limit"); - DUST_WASHER_LEGACY = cfg.getBoolean("options.legacy-dust-washer"); - ORE_WASHER_LEGACY = cfg.getBoolean("options.legacy-ore-washer"); - ORE_GRINDER_LEGACY = cfg.getBoolean("options.legacy-ore-grinder"); + legacyDustWasher = cfg.getBoolean("options.legacy-dust-washer"); + legacyOreWasher = cfg.getBoolean("options.legacy-ore-washer"); + legacyOreGrinder = cfg.getBoolean("options.legacy-ore-grinder"); } }