mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

[CI skip] Minor refactoring

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-11-03 23:43:11 +01:00
parent 57da6db9be
commit 8895beb83a
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/me/mrCookieSlime/Slimefun/Objects/LockedCategory.java
View File

@ -3,14 +3,13 @@ package me.mrCookieSlime.Slimefun.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.api.PlayerProfile; import me.mrCookieSlime.Slimefun.api.PlayerProfile;
import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.Slimefun;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
/** /**
* Represents a {@link Category} that cannot be opened until the parent category/categories * Represents a {@link Category} that cannot be opened until the parent category/categories
* are fully unlocked. * are fully unlocked.
@ -112,10 +111,9 @@ public class LockedCategory extends Category {
* *
* @since 4.0 * @since 4.0
*/ */
@SuppressWarnings("deprecation")
public boolean hasUnlocked(Player p) { public boolean hasUnlocked(Player p) {
PlayerProfile profile = PlayerProfile.get(p); return hasUnlocked(p, PlayerProfile.get(p));
return hasUnlocked(p, profile);
} }
public boolean hasUnlocked(Player p, PlayerProfile profile) { public boolean hasUnlocked(Player p, PlayerProfile profile) {

5
src/main/java/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java
View File

@ -34,8 +34,9 @@ public final class MiscSetup {
private MiscSetup() {} private MiscSetup() {}
public static void setupMisc() { public static void setupMisc() {
if (SlimefunItem.getByID("COMMON_TALISMAN") != null && (Boolean) Slimefun.getItemValue("COMMON_TALISMAN", "recipe-requires-nether-stars")) { SlimefunItem talisman = SlimefunItem.getByID("COMMON_TALISMAN");
SlimefunItem.getByID("COMMON_TALISMAN").setRecipe(new ItemStack[] {SlimefunItems.MAGIC_LUMP_2, SlimefunItems.GOLD_8K, SlimefunItems.MAGIC_LUMP_2, null, new ItemStack(Material.NETHER_STAR), null, SlimefunItems.MAGIC_LUMP_2, SlimefunItems.GOLD_8K, SlimefunItems.MAGIC_LUMP_2}); if (talisman != null && (boolean) Slimefun.getItemValue(talisman.getID(), "recipe-requires-nether-stars")) {
talisman.setRecipe(new ItemStack[] {SlimefunItems.MAGIC_LUMP_2, SlimefunItems.GOLD_8K, SlimefunItems.MAGIC_LUMP_2, null, new ItemStack(Material.NETHER_STAR), null, SlimefunItems.MAGIC_LUMP_2, SlimefunItems.GOLD_8K, SlimefunItems.MAGIC_LUMP_2});
} }
SlimefunItem.setRadioactive(SlimefunItems.URANIUM); SlimefunItem.setRadioactive(SlimefunItems.URANIUM);

4
src/main/java/me/mrCookieSlime/Slimefun/commands/subcommands/OpenGuideCommand.java
View File

@ -7,6 +7,7 @@ import me.mrCookieSlime.Slimefun.SlimefunGuide;
import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.SlimefunPlugin;
import me.mrCookieSlime.Slimefun.commands.SlimefunCommand; import me.mrCookieSlime.Slimefun.commands.SlimefunCommand;
import me.mrCookieSlime.Slimefun.commands.SubCommand; import me.mrCookieSlime.Slimefun.commands.SubCommand;
import me.mrCookieSlime.Slimefun.guides.SlimefunGuideLayout;
public class OpenGuideCommand extends SubCommand { public class OpenGuideCommand extends SubCommand {
@ -23,7 +24,8 @@ public class OpenGuideCommand extends SubCommand {
public void onExecute(CommandSender sender, String[] args) { public void onExecute(CommandSender sender, String[] args) {
if (sender instanceof Player) { if (sender instanceof Player) {
if (sender.hasPermission("slimefun.command.open_guide")) { if (sender.hasPermission("slimefun.command.open_guide")) {
SlimefunGuide.openGuide((Player) sender, SlimefunPlugin.getCfg().getBoolean("guide.default-view-book")); boolean book = SlimefunPlugin.getCfg().getBoolean("guide.default-view-book");
SlimefunGuide.openGuide((Player) sender, book ? SlimefunGuideLayout.BOOK: SlimefunGuideLayout.CHEST);
} }
else { else {
SlimefunPlugin.getLocal().sendMessage(sender, "messages.no-permission", true); SlimefunPlugin.getLocal().sendMessage(sender, "messages.no-permission", true);

1
src/main/java/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java
View File

@ -38,6 +38,7 @@ public class PlaceholderAPIHook extends PlaceholderExpansion {
return true; return true;
} }
@SuppressWarnings("deprecation")
@Override @Override
public String onRequest(OfflinePlayer p, String params) { public String onRequest(OfflinePlayer p, String params) {
if (params.equals("researches_total_xp_levels_spent")) { if (params.equals("researches_total_xp_levels_spent")) {