From 781c77182728ea4b646c0d79e0a2d80962741e1d Mon Sep 17 00:00:00 2001 From: rockyhawk64 Date: Fri, 17 Mar 2023 15:01:53 +1100 Subject: [PATCH] 3.18.5.1 --- .idea/artifacts/CommandPanels.xml | 9 --------- .idea/compiler.xml | 2 +- .idea/encodings.xml | 14 ++++++++++++++ .idea/libraries/CustomItemsAPI_PLACEHOLDER.xml | 9 --------- ...en__com_github_Realizedd_TokenManager_3_2_4.xml | 13 +++++++++++++ ...en__net_Indyuce_MMOItems_API_6_9_2_SNAPSHOT.xml | 6 +++--- CommandPanels.iml | 3 +-- pom.xml | 13 ++++++++++--- resource/plugin.yml | 2 +- .../commandpanels/classresources/ItemCreation.java | 6 +++--- 10 files changed, 46 insertions(+), 31 deletions(-) delete mode 100644 .idea/artifacts/CommandPanels.xml create mode 100644 .idea/encodings.xml delete mode 100644 .idea/libraries/CustomItemsAPI_PLACEHOLDER.xml create mode 100644 .idea/libraries/Maven__com_github_Realizedd_TokenManager_3_2_4.xml diff --git a/.idea/artifacts/CommandPanels.xml b/.idea/artifacts/CommandPanels.xml deleted file mode 100644 index fab8697..0000000 --- a/.idea/artifacts/CommandPanels.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/CommandPanels - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 09d877c..f8595a0 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..5338f27 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/CustomItemsAPI_PLACEHOLDER.xml b/.idea/libraries/CustomItemsAPI_PLACEHOLDER.xml deleted file mode 100644 index 1cb21a4..0000000 --- a/.idea/libraries/CustomItemsAPI_PLACEHOLDER.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_Realizedd_TokenManager_3_2_4.xml b/.idea/libraries/Maven__com_github_Realizedd_TokenManager_3_2_4.xml new file mode 100644 index 0000000..42c39cc --- /dev/null +++ b/.idea/libraries/Maven__com_github_Realizedd_TokenManager_3_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_Indyuce_MMOItems_API_6_9_2_SNAPSHOT.xml b/.idea/libraries/Maven__net_Indyuce_MMOItems_API_6_9_2_SNAPSHOT.xml index e6ecc8b..f11a8eb 100644 --- a/.idea/libraries/Maven__net_Indyuce_MMOItems_API_6_9_2_SNAPSHOT.xml +++ b/.idea/libraries/Maven__net_Indyuce_MMOItems_API_6_9_2_SNAPSHOT.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/CommandPanels.iml b/CommandPanels.iml index c5fa91b..658e00a 100644 --- a/CommandPanels.iml +++ b/CommandPanels.iml @@ -1,6 +1,6 @@ - + @@ -13,7 +13,6 @@ - diff --git a/pom.xml b/pom.xml index 597a07e..9bde26a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,14 @@ CommandPanels DEV + + 1.8 + UTF-8 + src + + + ${src.dir} org.apache.maven.plugins @@ -44,13 +51,13 @@ - src/main/resource + resource - src/main/resource_editor + resource_editor - src/main/resource_example + resource_example diff --git a/resource/plugin.yml b/resource/plugin.yml index 08b160b..0764ed1 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.18.5.0 +version: 3.18.5.1 main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/classresources/ItemCreation.java b/src/me/rockyhawk/commandpanels/classresources/ItemCreation.java index f2363c2..1cb12a1 100644 --- a/src/me/rockyhawk/commandpanels/classresources/ItemCreation.java +++ b/src/me/rockyhawk/commandpanels/classresources/ItemCreation.java @@ -1,6 +1,6 @@ package me.rockyhawk.commandpanels.classresources; -import com.jojodmo.customitems.api.CustomItemsAPI; +//import com.jojodmo.customitems.api.CustomItemsAPI; import me.arcaniax.hdb.api.HeadDatabaseAPI; import me.rockyhawk.commandpanels.CommandPanels; import me.rockyhawk.commandpanels.api.Panel; @@ -111,10 +111,10 @@ public class ItemCreation { } //creates Custom Items items - if(matraw.split("\\s")[0].equalsIgnoreCase("cui=") && plugin.getServer().getPluginManager().isPluginEnabled("CustomItems")){ + /*if(matraw.split("\\s")[0].equalsIgnoreCase("cui=") && plugin.getServer().getPluginManager().isPluginEnabled("CustomItems")){ s = CustomItemsAPI.getCustomItem("cui:" + matraw.split("\\s")[1]); normalCreation = false; - } + }*/ //creates a written book item if(matraw.split("\\s")[0].equalsIgnoreCase("book=")){