mirror of
https://github.com/GeorgH93/Minepacks.git
synced 2024-12-04 14:03:24 +01:00
Expose isDisabled and WorldBlacklistMode #135
This commit is contained in:
parent
f85586b7ee
commit
865148fee3
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 GeorgH93
|
* Copyright (C) 2020 GeorgH93
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -140,7 +140,16 @@ public interface MinepacksPlugin
|
|||||||
* Checks if an item is a backpack shortcut item.
|
* Checks if an item is a backpack shortcut item.
|
||||||
*
|
*
|
||||||
* @param itemStack item to check.
|
* @param itemStack item to check.
|
||||||
* @return
|
* @return true if the item is a backpack shortcut item, false if not.
|
||||||
*/
|
*/
|
||||||
boolean isBackpackItem(final @Nullable ItemStack itemStack);
|
boolean isBackpackItem(final @Nullable ItemStack itemStack);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if a player can use the backpack at its current location (or if the world is disabled in the config).
|
||||||
|
* <b>Does not check if the player has the permission to use the backpack!!!</b>
|
||||||
|
*
|
||||||
|
* @param player The player that should be checked.
|
||||||
|
* @return The configured reason why the player can not access at its current location. {@link WorldBlacklistMode#None} if the player can use the backpack.
|
||||||
|
*/
|
||||||
|
@NotNull WorldBlacklistMode isDisabled(Player player);
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2018 GeorgH93
|
* Copyright (C) 2020 GeorgH93
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,7 +15,7 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper;
|
package at.pcgamingfreaks.Minepacks.Bukkit.API;
|
||||||
|
|
||||||
public enum WorldBlacklistMode
|
public enum WorldBlacklistMode
|
||||||
{
|
{
|
@ -25,7 +25,7 @@
|
|||||||
import at.pcgamingfreaks.ConsoleColor;
|
import at.pcgamingfreaks.ConsoleColor;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.WorldBlacklistMode;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;
|
||||||
import at.pcgamingfreaks.Reflection;
|
import at.pcgamingfreaks.Reflection;
|
||||||
|
|
||||||
|
@ -22,8 +22,8 @@
|
|||||||
import at.pcgamingfreaks.Bukkit.MinecraftMaterial;
|
import at.pcgamingfreaks.Bukkit.MinecraftMaterial;
|
||||||
import at.pcgamingfreaks.ConsoleColor;
|
import at.pcgamingfreaks.ConsoleColor;
|
||||||
import at.pcgamingfreaks.Database.DatabaseConnectionConfiguration;
|
import at.pcgamingfreaks.Database.DatabaseConnectionConfiguration;
|
||||||
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.WorldBlacklistMode;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.OldFileUpdater;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.OldFileUpdater;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode;
|
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.MagicValues;
|
import at.pcgamingfreaks.Minepacks.Bukkit.MagicValues;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.ShrinkApproach;
|
import at.pcgamingfreaks.Minepacks.Bukkit.ShrinkApproach;
|
||||||
import at.pcgamingfreaks.YamlFileManager;
|
import at.pcgamingfreaks.YamlFileManager;
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
package at.pcgamingfreaks.Minepacks.Bukkit;
|
package at.pcgamingfreaks.Minepacks.Bukkit;
|
||||||
|
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.WorldBlacklistMode;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Listener.ItemFilter;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Listener.ItemFilter;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.WorldBlacklistMode;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Permissions;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Permissions;
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
import at.pcgamingfreaks.Bukkit.Util.HeadUtils;
|
import at.pcgamingfreaks.Bukkit.Util.HeadUtils;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearedEvent;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearedEvent;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.WorldBlacklistMode;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Permissions;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Permissions;
|
||||||
|
|
||||||
|
@ -23,15 +23,13 @@
|
|||||||
import at.pcgamingfreaks.Bukkit.Util.Utils;
|
import at.pcgamingfreaks.Bukkit.Util.Utils;
|
||||||
import at.pcgamingfreaks.ConsoleColor;
|
import at.pcgamingfreaks.ConsoleColor;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback;
|
import at.pcgamingfreaks.Minepacks.Bukkit.API.*;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager;
|
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin;
|
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Command.CommandManager;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Command.CommandManager;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Command.InventoryClearCommand;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Command.InventoryClearCommand;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Config;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Config;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Database;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Database;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode;
|
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Language;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Language;
|
||||||
|
import at.pcgamingfreaks.Minepacks.Bukkit.Listener.ItemFilter;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.Listener.*;
|
import at.pcgamingfreaks.Minepacks.Bukkit.Listener.*;
|
||||||
import at.pcgamingfreaks.Minepacks.Bukkit.SpecialInfoWorker.NoDatabaseWorker;
|
import at.pcgamingfreaks.Minepacks.Bukkit.SpecialInfoWorker.NoDatabaseWorker;
|
||||||
import at.pcgamingfreaks.StringUtils;
|
import at.pcgamingfreaks.StringUtils;
|
||||||
@ -371,6 +369,7 @@ public int getBackpackPermSize(Player player)
|
|||||||
return 9;
|
return 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public WorldBlacklistMode isDisabled(Player player)
|
public WorldBlacklistMode isDisabled(Player player)
|
||||||
{
|
{
|
||||||
if(worldBlacklistMode == WorldBlacklistMode.None || (worldBlacklistMode != WorldBlacklistMode.NoPlugin && player.hasPermission(Permissions.IGNORE_WORLD_BLACKLIST))) return WorldBlacklistMode.None;
|
if(worldBlacklistMode == WorldBlacklistMode.None || (worldBlacklistMode != WorldBlacklistMode.NoPlugin && player.hasPermission(Permissions.IGNORE_WORLD_BLACKLIST))) return WorldBlacklistMode.None;
|
||||||
|
2
pom.xml
2
pom.xml
@ -7,7 +7,7 @@
|
|||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<revision>2.3.21</revision>
|
<revision>2.3.21.1</revision>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
Loading…
Reference in New Issue
Block a user