From 3f9f263d3e68dc03ae0f3faeeb21853adf2a8eb0 Mon Sep 17 00:00:00 2001 From: poqdavid Date: Fri, 18 Mar 2022 09:22:56 -0400 Subject: [PATCH] Version 1.7 --- gradle.properties | 2 +- .../nyxcore/Permissions/EffectPermission.java | 1 + .../poqdavid/nyx/nyxcore/Utils/CoreTools.java | 42 +++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 160ba1b..54b0562 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ m_description=Core plugin for all of my Nyx plugins. ## Version m_major=1 -m_minor=6 +m_minor=7 m_api=S7.4 m_suffix=STABLE diff --git a/src/main/java/io/github/poqdavid/nyx/nyxcore/Permissions/EffectPermission.java b/src/main/java/io/github/poqdavid/nyx/nyxcore/Permissions/EffectPermission.java index ab87f51..8a4254e 100644 --- a/src/main/java/io/github/poqdavid/nyx/nyxcore/Permissions/EffectPermission.java +++ b/src/main/java/io/github/poqdavid/nyx/nyxcore/Permissions/EffectPermission.java @@ -37,6 +37,7 @@ public class EffectPermission { public static final String COMMAND_TASK_OTHER = "NyxCore.Effect.Command.TaskOther"; public static final String COMMAND_RELOAD = "NyxCore.Effect.Command.Reload"; + public static final String COMMAND_PARTICLES = "NyxCore.Effect.Command.Particles"; public static final String EFFECTS = "NyxCore.Effect.Effects"; } diff --git a/src/main/java/io/github/poqdavid/nyx/nyxcore/Utils/CoreTools.java b/src/main/java/io/github/poqdavid/nyx/nyxcore/Utils/CoreTools.java index 33d41d2..e383805 100644 --- a/src/main/java/io/github/poqdavid/nyx/nyxcore/Utils/CoreTools.java +++ b/src/main/java/io/github/poqdavid/nyx/nyxcore/Utils/CoreTools.java @@ -27,6 +27,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import io.github.poqdavid.nyx.nyxcore.NyxCore; +import io.github.poqdavid.nyx.nyxcore.Permissions.BackpackPermission; import io.github.poqdavid.nyx.nyxcore.Utils.Setting.NyxMarket.NMSettings; import io.github.poqdavid.nyx.nyxcore.Utils.Setting.NyxTools.NTSettings; import net.minecraft.entity.player.EntityPlayer; @@ -579,4 +580,45 @@ public static Text getItemName(ItemStack itemStack) { public static Text getItemName(ItemStackSnapshot itemStack) { return itemStack.get(Keys.DISPLAY_NAME).orElse(Text.of(itemStack.getTranslation().get())); } + + public static int getBackpackSize(User user) { + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_SIX)) + return 6; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_FIVE)) + return 5; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_FOUR)) + return 4; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_THREE)) + return 3; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_TWO)) + return 2; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_ONE)) + return 1; + return 1; + } + + public static int getBackpackSize(User user, Integer size) { + if (size == 0) { + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_SIX)) + return 6; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_FIVE)) + return 5; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_FOUR)) + return 4; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_THREE)) + return 3; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_TWO)) + return 2; + if (user.hasPermission(BackpackPermission.COMMAND_BACKPACK_SIZE_ONE)) + return 1; + return 1; + } else { + if (size < 6) { + return 6; + } else { + return size; + } + } + + } }