diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 0a4d5524..7b886859 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -11,7 +11,7 @@ jobs:
steps:
# 1. Check out the current working tree
- name: Checkout ArmorStandEditor Repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
@@ -53,7 +53,7 @@ jobs:
#6 Upload Artifacts (Debug Purposes)
- name: Upload Artifact for Debugging
- uses: actions/upload-artifact@v2.3.1
+ uses: actions/upload-artifact@v3.0.0
with:
name: artifact
path: /home/runner/work/ArmorStandEditor/ArmorStandEditor/target/armorstandeditor-*-*.jar
diff --git a/README.md b/README.md
index d1786f71..eb6f637b 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,8 @@ For versions older than 1.17, then please use [the original versions download pa
The Latest Downloads Shortcut Links:
* [Unstable 1.1x-DEV Versions](https://github.com/Wolfst0rm/ArmorStandEditor/actions) - **Use these at your own risk. Limited Support is provided for testing purposes**
-* [1.18.1](https://www.spigotmc.org/threads/armorstandeditor-reborn.517132)
+* [1.18.2](https://www.spigotmc.org/threads/armorstandeditor-reborn.517132)
+* [1.18.1](https://github.com/Wolfieheart/ArmorStandEditor/releases/tag/1.18.1-33)
* [1.18](https://github.com/Wolfst0rm/ArmorStandEditor/releases/tag/1.18-31)
* [1.17.1](https://github.com/Wolfst0rm/ArmorStandEditor/releases/tag/1.17.1-30)
* [1.17](https://github.com/Wolfst0rm/ArmorStandEditor/releases/tag/1.17.1-27)
diff --git a/pom.xml b/pom.xml
index 9a15b78b..5c928ec0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
io.github.rypofalem.armorstandeditor
armorstandeditor
jar
- 1.18.1-33.1
+ 1.18.2-34
armorstandeditor
http://maven.apache.org
@@ -24,14 +24,15 @@
+
spigot-repo
https://hub.spigotmc.org/nexus/content/repositories/snapshots/
- jitpack.io
- https://jitpack.io
+ glaremasters repo
+ https://repo.glaremasters.me/repository/towny/
@@ -45,14 +46,14 @@
org.spigotmc
spigot-api
- 1.18.1-R0.1-SNAPSHOT
+ 1.18.2-R0.1-SNAPSHOT
provided
- com.github.TownyAdvanced
- Towny
- 0.97.5.1
+ com.palmergames.bukkit.towny
+ towny
+ 0.98.0.0
provided
diff --git a/src/main/java/io/github/rypofalem/armorstandeditor/ArmorStandEditorPlugin.java b/src/main/java/io/github/rypofalem/armorstandeditor/ArmorStandEditorPlugin.java
index ff34bcb3..d1f44381 100644
--- a/src/main/java/io/github/rypofalem/armorstandeditor/ArmorStandEditorPlugin.java
+++ b/src/main/java/io/github/rypofalem/armorstandeditor/ArmorStandEditorPlugin.java
@@ -19,9 +19,12 @@
package io.github.rypofalem.armorstandeditor;
-import de.jeff_media.updatechecker.*;
import io.github.rypofalem.armorstandeditor.language.Language;
-import io.github.rypofalem.armorstandeditor.Metrics.*;
+
+import de.jeff_media.updatechecker.*;
+
+import org.bstats.bukkit.Metrics;
+import org.bstats.bukkit.Metrics.*;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -153,7 +156,6 @@ public void onEnable(){
nmsVersion.startsWith("v1_17")){
getLogger().warning("Minecraft Version: " + nmsVersion + " is supported, but not latest.");
getLogger().warning("ArmorStandEditor will still work, but please update to the latest Version of " + nmsVersionNotLatest + ". Loading continuing.");
- } else {
getLogger().info("Minecraft Version: " + nmsVersion + " is supported. Loading continuing.");
}
getServer().getPluginManager().enablePlugin(this);
diff --git a/src/main/java/io/github/rypofalem/armorstandeditor/Metrics.java b/src/main/java/org/bstats/bukkit/Metrics.java
similarity index 97%
rename from src/main/java/io/github/rypofalem/armorstandeditor/Metrics.java
rename to src/main/java/org/bstats/bukkit/Metrics.java
index 0f1481bd..0b2c7105 100644
--- a/src/main/java/io/github/rypofalem/armorstandeditor/Metrics.java
+++ b/src/main/java/org/bstats/bukkit/Metrics.java
@@ -1,4 +1,18 @@
-package io.github.rypofalem.armorstandeditor;
+/*
+ * This Metrics class was auto-generated and can be copied into your project if you are
+ * not using a build tool like Gradle or Maven for dependency management.
+ *
+ * IMPORTANT: You are not allowed to modify this class, except changing the package.
+ *
+ * Unallowed modifications include but are not limited to:
+ * - Remove the option for users to opt-out
+ * - Change the frequency for data submission
+ * - Obfuscate the code (every obfucator should allow you to make an exception for specific files)
+ * - Reformat the code (if you use a linter, add an exception)
+ *
+ * Violations will result in a ban of your plugin and account from bStats.
+ */
+package org.bstats.bukkit;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@@ -139,7 +153,7 @@ private int getPlayerAmount() {
public static class MetricsBase {
/** The version of the Metrics class. */
- public static final String METRICS_VERSION = "2.2.1";
+ public static final String METRICS_VERSION = "3.0.0";
private static final ScheduledExecutorService scheduler =
Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics"));
@@ -224,6 +238,7 @@ public MetricsBase(
this.logResponseStatusText = logResponseStatusText;
checkRelocation();
if (enabled) {
+ // WARNING: Removing the option to opt-out will get your plugin banned from bStats
startSubmitting();
}
}
@@ -360,9 +375,9 @@ private static byte[] compress(final String str) throws IOException {
}
}
- public static class AdvancedBarChart extends CustomChart {
+ public static class DrilldownPie extends CustomChart {
- private final Callable