From d5f8fb465f7eb3c1fc765e22ccbf522c40b2ec1a Mon Sep 17 00:00:00 2001 From: Sfiguz7 Date: Fri, 30 Aug 2019 23:21:33 +0200 Subject: [PATCH] Fixes#2 --- src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java | 2 +- src/me/mrCookieSlime/Slimefun/SlimefunStartup.java | 2 +- src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java | 6 +++--- src/plugin.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java b/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java index af280b84e..ab924d255 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"); diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java index a69222ae6..a23a1a6ca 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java @@ -194,7 +194,7 @@ public final class SlimefunStartup extends JavaPlugin { 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(); diff --git a/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java b/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java index 0004ed17f..5b30bc2b0 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; diff --git a/src/plugin.yml b/src/plugin.yml index 97d9b7cd2..7509adc2c 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