Merge 2a3033bc9b into df17fe7483

Also add that config option to our metrics

src/main/java/com/Acrobot/ChestShop/ChestShop.java

@@ -500,6 +500,9 @@ public class ChestShop extends JavaPlugin {
         bStats.addCustomChart(new SimplePie("allow-partial-transactions", () -> Properties.ALLOW_PARTIAL_TRANSACTIONS ? "enabled" : "disabled"));
         bStats.addCustomChart(new SimplePie("log-to-console", () -> Properties.LOG_TO_CONSOLE ? "enabled" : "disabled"));
         bStats.addCustomChart(new SimplePie("log-to-file", () -> Properties.LOG_TO_FILE ? "enabled" : "disabled"));
+        bStats.addCustomChart(new SimplePie("auto-update", () -> !Properties.TURN_OFF_UPDATES ? "enabled" : "disabled"));
+        bStats.addCustomChart(new SimplePie("release-notifications", () -> !Properties.TURN_OFF_UPDATE_NOTIFIER ? "enabled" : "disabled"));
+        bStats.addCustomChart(new SimplePie("dev-build-notifications", () -> !Properties.TURN_OFF_DEV_UPDATE_NOTIFIER ? "enabled" : "disabled"));
 
         bStats.addCustomChart(new AdvancedBarChart("pluginProperties", () -> {
             Map<String, int[]> map = new LinkedHashMap<>();
@@ -518,6 +521,9 @@ public class ChestShop extends JavaPlugin {
             map.put("bungeecord-messages", getChartArray(Properties.BUNGEECORD_MESSAGES));
             map.put("log-to-console", getChartArray(Properties.LOG_TO_CONSOLE));
             map.put("log-to-file", getChartArray(Properties.LOG_TO_FILE));
+            map.put("auto-update", getChartArray(!Properties.TURN_OFF_UPDATES));
+            map.put("release-notifications", getChartArray(!Properties.TURN_OFF_UPDATE_NOTIFIER));
+            map.put("dev-build-notifications", getChartArray(!Properties.TURN_OFF_DEV_UPDATE_NOTIFIER));
             return map;
         }));
         bStats.addCustomChart(new SimpleBarChart("shopContainers",
@@ -538,6 +544,14 @@ public class ChestShop extends JavaPlugin {
     private void startUpdater() {
         if (Properties.TURN_OFF_UPDATES) {
             getLogger().info("Auto-updater is disabled. If you want the plugin to automatically download new releases then set 'TURN_OFF_UPDATES' to 'false' in your config.yml!");
+            if (!Properties.TURN_OFF_UPDATE_NOTIFIER) {
+                final Updater updater = new Updater(this, PROJECT_BUKKITDEV_ID, this.getFile(), Updater.UpdateType.NO_DOWNLOAD, true);
+                getServer().getScheduler().runTaskAsynchronously(this, () -> {
+                    if (updater.getResult() == Updater.UpdateResult.UPDATE_AVAILABLE) {
+                        getLogger().info("There is a new version available: " + updater.getLatestName() + ". You can download it from https://dev.bukkit.org/projects/" + PROJECT_BUKKITDEV_ID);
+                    }
+                });
+            }
             return;
         }
 

src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java

@@ -103,6 +103,9 @@ public class Properties {
     @ConfigurationComment("Do you want to turn off the automatic updates of ChestShop?")
     public static boolean TURN_OFF_UPDATES = true;
 
+    @ConfigurationComment("Do you want to turn off the automatic notifications for releases?")
+    public static boolean TURN_OFF_UPDATE_NOTIFIER = false;
+
     @ConfigurationComment("Do you want to turn off the automatic notifications for new development builds?")
     public static boolean TURN_OFF_DEV_UPDATE_NOTIFIER = false;
 

src/main/java/com/Acrobot/ChestShop/Plugins/ItemBridge.java

@@ -12,7 +12,10 @@ import org.bukkit.inventory.ItemStack;
 import static com.Acrobot.Breeze.Utils.StringUtil.getMinecraftStringWidth;
 
 /**
- * @author Acrobot
+ * Support for the <a href="https://www.spigotmc.org/resources/77080/">ItemBridge plugin</a> to use their strings for
+ * custom items directly on ChestShop signs.
+ *
+ * @author Phoenix616
  */
 public class ItemBridge implements Listener {
 

src/main/java/com/Acrobot/ChestShop/Plugins/RedProtectBuilding.java

@@ -9,7 +9,9 @@ import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 
 /**
- * @author Acrobot
+ * Support RedProtect region checks.
+ *
+ * @author Phoenix616
  */
 public class RedProtectBuilding implements Listener {
     private RedProtect redProtect;

src/main/java/com/Acrobot/ChestShop/Updater/Updater.java

@@ -502,7 +502,7 @@ public final class Updater {
      * @return true if Updater should consider the remote version an update, false if not.
      */
     public boolean shouldUpdate(String localVersion, String remoteVersion) {
-        if (localVersion.contains("DEV") || getLatestType() != ReleaseType.RELEASE) {
+        if (this.type != Updater.UpdateType.NO_DOWNLOAD && localVersion.contains("DEV") || getLatestType() != ReleaseType.RELEASE) {
             return false; //Do not download alphas or betas
         }
 

src/main/resources/languages/lang.de.yml

@@ -16,6 +16,22 @@ iteminfo_book: |-
   &fAuthor: &7%author
   &fSeitenanzahl: &7%pages
 iteminfo_book_generation: "&fBuch Ausgabe: &7%generation"
+iteminfo_leather_color: "&fLederfarbe: &7Rot: %colorred, Grün: %colorgreen, Blau: %colorblue (Hex: #%colorhex)"
+iteminfo_bundle_items: "&fBündelgegenstände: &7%itemcount"
+iteminfo_axolotl_variant: "&fAxolotl Variante: &7%variant"
+iteminfo_recipes: "&fRezeptwissen:"
+iteminfo_map_view: |-
+  &fNummer der Karte: &7%id
+  &fWelt der Karte: &7%world
+  &fMitte der Karte: &7%x/%z
+  &fIst Karte gesperrt: &7locked
+iteminfo_map_location: "&fOrt der Karte: &7%location"
+iteminfo_tropical_fish: |-
+  &fFischmuster: &7%pattern
+  &fFarbe des Fischmusters: &7%patterncolor
+  &fFarbe des Fischkörpers: &7%bodycolor
+iteminfo_crossbow_projectiles: "&fAufgeladenes Armbrustprojektil:"
+iteminfo_crossbow_projectile: "&f%item"
 iteminfo_lore: |-
   &fBeschreibung:
   &r%lore