diff --git a/.gitignore b/.gitignore index 88188f0..5e189fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ # Project exclude paths -/out/ -/target/ -.idea/ \ No newline at end of file +/out +/target + +# IDE +.idea +*.iml +*.iws +*.ipr \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index c2e8852..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 030a248..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index cba6cf6..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index de3b93a..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_api_4_11_0.xml b/.idea/libraries/Maven__net_kyori_adventure_api_4_11_0.xml deleted file mode 100644 index 101abe7..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_api_4_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_key_4_11_0.xml b/.idea/libraries/Maven__net_kyori_adventure_key_4_11_0.xml deleted file mode 100644 index ec1cb5c..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_key_4_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml b/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml deleted file mode 100644 index a59d7d8..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index b0c7b49..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 19a4f17..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/CommandPanels.iml b/CommandPanels.iml deleted file mode 100644 index 8c2f857..0000000 --- a/CommandPanels.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/me/rockyhawk/commandpanels/formatter/Placeholders.java b/src/me/rockyhawk/commandpanels/formatter/Placeholders.java index 10387c0..a548e2a 100644 --- a/src/me/rockyhawk/commandpanels/formatter/Placeholders.java +++ b/src/me/rockyhawk/commandpanels/formatter/Placeholders.java @@ -20,7 +20,7 @@ public class Placeholders extends PlaceholderExpansion { loadPlaceholders(); } - private void loadPlaceholders(){ + private void loadPlaceholders() { resolvers.add(new SessionDataPlaceholder()); resolvers.add(new DataPlaceholder()); resolvers.add(new RandomPlaceholder()); @@ -43,7 +43,7 @@ public class Placeholders extends PlaceholderExpansion { @Override public String getVersion() { - return ctx.plugin.getDescription().getVersion(); + return ctx.plugin.getPluginMeta().getVersion(); } @Override @@ -54,7 +54,7 @@ public class Placeholders extends PlaceholderExpansion { for (PlaceholderResolver resolver : resolvers) { try { String value = resolver.resolve(player, params, ctx); - if(value != null){ + if (value != null) { return value; } } catch (Exception e) {