From 2655a1cf948f3f386317bfef534f5fa90232bfb6 Mon Sep 17 00:00:00 2001 From: Zrips Date: Fri, 11 Feb 2022 11:07:11 +0200 Subject: [PATCH] inclusion of glow_item_frame for block place action --- .../com/gamingmesh/jobs/config/ConfigManager.java | 5 +++++ .../com/gamingmesh/jobs/config/ShopManager.java | 15 +++++---------- src/main/resources/plugin.yml | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java index 42a3230c..eb0e07bd 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java @@ -657,6 +657,11 @@ public class ConfigManager { id = 18; meta = "1"; break c; + case "glowitemframe": + type = "GLOW_ITEM_FRAME"; + id = 0; + meta = "0"; + break c; case "painting": type = "PAINTING"; id = 9; diff --git a/src/main/java/com/gamingmesh/jobs/config/ShopManager.java b/src/main/java/com/gamingmesh/jobs/config/ShopManager.java index dc1f83c8..7626a4d4 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ShopManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ShopManager.java @@ -38,7 +38,6 @@ import net.Zrips.CMILib.GUI.CMIGuiButton; import net.Zrips.CMILib.GUI.GUIManager.GUIClickType; import net.Zrips.CMILib.GUI.GUIManager.GUIRows; import net.Zrips.CMILib.Items.CMIMaterial; -import net.Zrips.CMILib.Logs.CMIDebug; import net.Zrips.CMILib.Version.Version; @SuppressWarnings("deprecation") @@ -60,22 +59,18 @@ public class ShopManager { } private static GUIRows getGuiSize(List ls, @Deprecated int page) { - GUIRows guiSize = GUIRows.r1; + GUIRows guiSize = GUIRows.r6; int size = ls.size(); if (size <= 9) guiSize = GUIRows.r1; - - if (size <= 18) + else if (size <= 18) guiSize = GUIRows.r2; - - if (size <= 27) + else if (size <= 27) guiSize = GUIRows.r3; - - if (size <= 36) + else if (size <= 36) guiSize = GUIRows.r4; - - if (size <= 45) + else if (size <= 45) guiSize = GUIRows.r5; if (Jobs.getShopManager().getShopItemList().size() > 45) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6469b671..7e9020dc 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,7 +4,8 @@ main: com.gamingmesh.jobs.Jobs version: ${project.version} api-version: "1.13" website: https://www.spigotmc.org/resources/4216/ -authors: [Zrips, montlikadani] +authors: [Zrips] +contributors: [montlikadani] depend: [CMILib] softdepend: [Vault, Essentials, MythicMobs, McMMO, mcMMO, WorldGuard, MyPet, PlaceholderAPI, EcoEnchants, WildStacker, StackMob] commands: