From 3da4dce1f656593eae0cc0bb4ec9c8a8725a57b9 Mon Sep 17 00:00:00 2001 From: Sfiguz7 Date: Fri, 30 Aug 2019 23:12:47 +0200 Subject: [PATCH] Fixes --- src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java | 4 ++-- src/me/mrCookieSlime/Slimefun/Objects/Research.java | 4 ++-- src/me/mrCookieSlime/Slimefun/Setup/Files.java | 4 ++-- src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java | 2 +- src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java | 2 +- src/me/mrCookieSlime/Slimefun/SlimefunGuide.java | 6 +++--- src/me/mrCookieSlime/Slimefun/SlimefunStartup.java | 8 ++++---- .../Slimefun/androids/ProgrammableAndroid.java | 4 ++-- src/me/mrCookieSlime/Slimefun/androids/ScriptPart.java | 2 +- src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java | 8 ++++---- src/me/mrCookieSlime/Slimefun/utils/Settings.java | 10 +++++----- src/plugin.yml | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java b/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java index 9ce7bf58f..af280b84e 100644 --- a/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java +++ b/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java @@ -328,7 +328,7 @@ public final class SlimefunItems { public static final ItemStack ELECTRIC_MOTOR = new CustomItem(getSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGNiY2EwMTJmNjdlNTRkZTlhZWU3MmZmNDI0ZTA1NmMyYWU1OGRlNWVhY2M5NDlhYjJiY2Q5NjgzY2VjIn19fQ=="), "&cElectric Motor"); public static final ItemStack CARGO_MOTOR = new CustomItem(getSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGNiY2EwMTJmNjdlNTRkZTlhZWU3MmZmNDI0ZTA1NmMyYWU1OGRlNWVhY2M5NDlhYjJiY2Q5NjgzY2VjIn19fQ=="), "&3Cargo Motor"); public static final ItemStack SCROLL_OF_DIMENSIONAL_TELEPOSITION = new CustomItem(Material.PAPER, "&6Scroll of Dimensional Teleposition", "", "&cThis Scroll is capable of creating", "&ca temporary black Hole which pulls", "&cnearby Entities into itself and sends", "&cthem into another Dimension where", "&ceverything is turned around", "", "&rIn other words: Makes Entities turn by 180 Degrees"); - public static final ItemStack TOME_OF_KNOWLEDGE_SHARING = new CustomItem(Material.BOOK, "&6Tome of Knowledge Sharing", "&7Owner: &bNone", "", "&eRight Click&7 to bind this Tome to yourself", "", "", "&eRight Click&7 to obtain all Researches by", "&7the previously assigned Owner"); + public static final ItemStack TOME_OF_KNOWLEDGE_SHARING = new CustomItem(Material.BOOK, "&6Tome of Knowledge Sharing", "&7Owner: &bNone", "", "&eRight Click&7 to bind this Tome to yourself", "", "", "&eRight Click&7 to obtain all researches by", "&7the previously assigned Owner"); public static final ItemStack HARDENED_GLASS = new CustomItem(Material.LIGHT_GRAY_STAINED_GLASS, "&7Hardened Glass", "", "&rWithstands Explosions"); public static final ItemStack WITHER_PROOF_OBSIDIAN = new CustomItem(Material.OBSIDIAN, "&5Wither-Proof Obsidian", "", "&rWithstands Explosions", "&rWithstands Wither Bosses"); public static final ItemStack WITHER_PROOF_GLASS = new CustomItem(Material.PURPLE_STAINED_GLASS, "&5Wither-Proof Glass", "", "&rWithstands Explosions", "&rWithstands Wither Bosses"); @@ -637,7 +637,7 @@ public final class SlimefunItems { public static final ItemStack GPS_EMERGENCY_TRANSMITTER = new CustomItem(getSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjBjOWMxYTAyMmY0MGI3M2YxNGI0Y2JhMzdjNzE4YzZhNTMzZjNhMjg2NGI2NTM2ZDVmNDU2OTM0Y2MxZiJ9fX0="), "&cGPS Emergency Transmitter", "", "&rCarrying this in your Inventory", "&rautomatically sets a Waypoint", "&rat your Location when you die."); public static final ItemStack ANDROID_INTERFACE_FUEL = new CustomItem(Material.DISPENSER, "&7Android Interface &c(Fuel)", "", "&rItems stored in this Interface", "&rwill be inserted into an Android's Fuel Slot", "&rwhen its Script tells them to do so"); - public static final ItemStack ANDROID_INTERFACE_items = new CustomItem(Material.DISPENSER, "&7Android Interface &9(Items)", "", "&rItems stored in an Android's Inventory", "&rwill be inserted into this Interface", "&rwhen its Script tells them to do so"); + public static final ItemStack ANDROID_INTERFACE_ITEMS = new CustomItem(Material.DISPENSER, "&7Android Interface &9(Items)", "", "&rItems stored in an Android's Inventory", "&rwill be inserted into this Interface", "&rwhen its Script tells them to do so"); public static final ItemStack GPS_GEO_SCANNER = new CustomItem(getSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmFkOGNmZWIzODdhNTZlM2U1YmNmODUzNDVkNmE0MTdiMjQyMjkzODg3ZGIzY2UzYmE5MWZhNDA5YjI1NGI4NiJ9fX0="), "&bGPS Geo-Scanner", "", "&rScans a Chunk for natural Resources", "&rsuch as &8Oil"); public static final ItemStack OIL_PUMP = new CustomItem(getSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWZlMWEwNDBhNDI1ZTMxYTQ2ZDRmOWE5Yjk4MDZmYTJmMGM0N2VlODQ3MTFjYzE5MzJmZDhhYjMyYjJkMDM4In19fQ=="), "&rOil Pump", "", "&7Pumps up Oil and fills it into Buckets", "", "&c&l! &cMake sure to Geo-Scan the Chunk first"); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/Research.java b/src/me/mrCookieSlime/Slimefun/Objects/Research.java index f59f6d417..c832015d7 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().RESEARCHES_ENABLED && 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().RESEARCHES_FREE_IN_CREATIVE) || p.getLevel() >= this.cost; } /** diff --git a/src/me/mrCookieSlime/Slimefun/Setup/Files.java b/src/me/mrCookieSlime/Slimefun/Setup/Files.java index 686022578..84c480030 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/Files.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/Files.java @@ -6,14 +6,14 @@ public final class Files { private Files() {} - public static File Researches = new File("plugins/Slimefun/Researches.yml"); + public static File researches = new File("plugins/Slimefun/Researches.yml"); public static File config = new File("plugins/Slimefun/config.yml"); public static File items = new File("plugins/Slimefun/Items.yml"); public static File database = new File("data-storage/Slimefun/Players"); public static File whitelist = new File("plugins/Slimefun/whitelist.yml"); public static void cleanup() { - if (!Researches.exists()) { + if (!researches.exists()) { System.err.println("###############################################"); System.err.println("############## = - INFO - = #################"); System.err.println("###############################################"); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java index 737363505..5416778e5 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java @@ -177,7 +177,7 @@ public final class ResearchSetup { Slimefun.registerResearch(new Research(177, "Basic GPS Setup", 28), SlimefunItems.GPS_TRANSMITTER, SlimefunItems.GPS_CONTROL_PANEL, SlimefunItems.GPS_MARKER_TOOL); Slimefun.registerResearch(new Research(178, "GPS Emergency Waypoint", 30), SlimefunItems.GPS_EMERGENCY_TRANSMITTER); Slimefun.registerResearch(new Research(179, "Programmable Androids", 50), SlimefunItems.PROGRAMMABLE_ANDROID, SlimefunItems.PROGRAMMABLE_ANDROID_FARMER, SlimefunItems.PROGRAMMABLE_ANDROID_BUTCHER, SlimefunItems.PROGRAMMABLE_ANDROID_FISHERMAN, SlimefunItems.PROGRAMMABLE_ANDROID_MINER, SlimefunItems.PROGRAMMABLE_ANDROID_WOODCUTTER); - Slimefun.registerResearch(new Research(180, "Android Interfaces", 26), SlimefunItems.ANDROID_INTERFACE_FUEL, SlimefunItems.ANDROID_INTERFACE_items); + Slimefun.registerResearch(new Research(180, "Android Interfaces", 26), SlimefunItems.ANDROID_INTERFACE_FUEL, SlimefunItems.ANDROID_INTERFACE_ITEMS); Slimefun.registerResearch(new Research(181, "GEO-Scans", 30), SlimefunItems.GPS_GEO_SCANNER); Slimefun.registerResearch(new Research(182, "Combustion Reactor", 38), SlimefunItems.COMBUSTION_REACTOR); Slimefun.registerResearch(new Research(183, "Teleporter Base Components", 42), SlimefunItems.GPS_TELEPORTATION_MATRIX, SlimefunItems.GPS_TELEPORTER_PYLON); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index 31a872e5b..70eb532b4 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -3294,7 +3294,7 @@ public final class SlimefunSetup { } .register(true); - new SlimefunItem(Categories.ELECTRICITY, SlimefunItems.ANDROID_INTERFACE_items, "ANDROID_INTERFACE_items", RecipeType.ENHANCED_CRAFTING_TABLE, + new SlimefunItem(Categories.ELECTRICITY, SlimefunItems.ANDROID_INTERFACE_ITEMS, "ANDROID_INTERFACE_ITEMS", RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[] {SlimefunItems.PLASTIC_SHEET, SlimefunItems.PLASTIC_SHEET, SlimefunItems.PLASTIC_SHEET, SlimefunItems.PLASTIC_SHEET, SlimefunItems.BASIC_CIRCUIT_BOARD, new ItemStack(Material.BLUE_STAINED_GLASS), SlimefunItems.PLASTIC_SHEET, SlimefunItems.PLASTIC_SHEET, SlimefunItems.PLASTIC_SHEET}) .register(true); diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index 2cd8ef115..4d194e17f 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().RESEARCHES_FREE_IN_CREATIVE)) { 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().RESEARCHES_FREE_IN_CREATIVE)) { 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().RESEARCHES_FREE_IN_CREATIVE); openCategory(pl, category, survival, selected_page, book); } else { diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java index 246d0929f..a69222ae6 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java @@ -145,7 +145,7 @@ public final class SlimefunStartup extends JavaPlugin { utils.setupConfig(); // Loading all extra configs - researches = new Config(Files.Researches); + researches = new Config(Files.researches); items = new Config(Files.items); whitelist = new Config(Files.whitelist); @@ -191,10 +191,10 @@ public final class SlimefunStartup extends JavaPlugin { MiscSetup.loadDescriptions(); settings = new Settings(config); - settings.Researches_ENABLED = getResearchCfg().getBoolean("enable-researching"); + settings.RESEARCHES_ENABLED = getResearchCfg().getBoolean("enable-researching"); settings.SMELTERY_FIRE_BREAK_CHANCE = (Integer) Slimefun.getItemValue("SMELTERY", "chance.fireBreak"); - System.out.println("[Slimefun] Loading Researches..."); + System.out.println("[Slimefun] Loading researches..."); ResearchSetup.setupResearches(); MiscSetup.setupMisc(); @@ -365,7 +365,7 @@ public final class SlimefunStartup extends JavaPlugin { Files.config = null; Files.database = null; Files.items = null; - Files.Researches = null; + Files.researches = null; Files.whitelist = null; MultiBlock.list = null; Research.list = null; diff --git a/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java b/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java index d0e2f672f..1b415be18 100644 --- a/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java +++ b/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java @@ -351,8 +351,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem { case MOVE_AND_DIG_DOWN: movedig(b, face, b.getRelative(BlockFace.DOWN)); break; - case INTERFACE_items: - if (BlockStorage.check(b.getRelative(face), "ANDROID_INTERFACE_items") && b.getRelative(face).getState() instanceof Dispenser) { + case INTERFACE_ITEMS: + if (BlockStorage.check(b.getRelative(face), "ANDROID_INTERFACE_ITEMS") && b.getRelative(face).getState() instanceof Dispenser) { Dispenser d = (Dispenser) b.getRelative(face).getState(); for (int slot: getOutputSlots()) { ItemStack stack = BlockStorage.getInventory(b).getItemInSlot(slot); diff --git a/src/me/mrCookieSlime/Slimefun/androids/ScriptPart.java b/src/me/mrCookieSlime/Slimefun/androids/ScriptPart.java index b7db5f23b..eeb93a022 100644 --- a/src/me/mrCookieSlime/Slimefun/androids/ScriptPart.java +++ b/src/me/mrCookieSlime/Slimefun/androids/ScriptPart.java @@ -51,7 +51,7 @@ public enum ScriptPart { FARM_EXOTIC_DOWN(AndroidType.ADVANCED_FARMER, "&bAdvanced Harvest and Replant &7(Block underneath)", "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmQ0Mjk2YjMzM2QyNTMxOWFmM2YzMzA1MTc5N2Y5ZTZkODIxY2QxOWEwMTRmYjcxMzdiZWI4NmE0ZTllOTYifX19"), // Action - Interface - INTERFACE_items(AndroidType.NONE, "&9Push Inventory Contents to the faced Interface", "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTBhNGRiZjY2MjVjNDJiZTU3YThiYTJjMzMwOTU0YTc2YmRmMjI3ODU1NDBlODdhNWM5NjcyNjg1MjM4ZWMifX19"), + INTERFACE_ITEMS(AndroidType.NONE, "&9Push Inventory Contents to the faced Interface", "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTBhNGRiZjY2MjVjNDJiZTU3YThiYTJjMzMwOTU0YTc2YmRmMjI3ODU1NDBlODdhNWM5NjcyNjg1MjM4ZWMifX19"), INTERFACE_FUEL(AndroidType.NONE, "&cPull Fuel from the faced Interface", "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjQzMmY1MjgyYTUwNzQ1YjkxMmJlMTRkZWRhNTgxYmQ0YTA5Yjk3N2EzYzMyZDdlOTU3ODQ5MWZlZThmYTcifX19"); diff --git a/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java b/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java index 80fb07df8..0004ed17f 100644 --- a/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java +++ b/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java @@ -74,7 +74,7 @@ public final class PlayerProfile { } /** - * This method will save the Player's Researches and Backpacks to the hard drive + * This method will save the Player's researches and Backpacks to the hard drive */ public void save() { for (BackpackInventory backpack: backpacks.values()) { @@ -116,9 +116,9 @@ public final class PlayerProfile { } /** - * This Method will return all Researches that this Player has unlocked + * This Method will return all researches that this Player has unlocked * - * @return A Hashset of all Researches this Player has unlocked + * @return A Hashset of all researches this Player has unlocked */ public Set getResearches() { return researches; @@ -161,7 +161,7 @@ public final class PlayerProfile { } public String getTitle() { - List titles = SlimefunStartup.instance.getSettings().Researches_TITLES; + List titles = SlimefunStartup.instance.getSettings().RESEARCHES_TITLES; 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 4262a4a12..76081b083 100644 --- a/src/me/mrCookieSlime/Slimefun/utils/Settings.java +++ b/src/me/mrCookieSlime/Slimefun/utils/Settings.java @@ -6,9 +6,9 @@ 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 RESEARCHES_ENABLED; + public boolean RESEARCHES_FREE_IN_CREATIVE; + public List RESEARCHES_TITLES; public int BLOCK_LOADING_INFO_DELAY; public int BLOCK_AUTO_SAVE_DELAY; @@ -24,8 +24,8 @@ public final class Settings { 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"); + RESEARCHES_FREE_IN_CREATIVE = cfg.getBoolean("options.allow-free-creative-research"); + RESEARCHES_TITLES = 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"); diff --git a/src/plugin.yml b/src/plugin.yml index 7509adc2c..97d9b7cd2 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -19,7 +19,7 @@ permissions: description: Allows you to cheat Items default: op slimefun.cheat.researches: - description: Allows you to cheat Researches + description: Allows you to cheat researches default: op slimefun.stats.others: description: Allows you to see the Stats from other Players