diff --git a/.gitignore b/.gitignore index ecfe4dc..ec39ba2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ target/ *.log .idea/ .DS_Store +ChestsPlusPlus.iml diff --git a/ChestsPlusPlus.iml b/ChestsPlusPlus.iml index 82e1f31..90da624 100644 --- a/ChestsPlusPlus.iml +++ b/ChestsPlusPlus.iml @@ -1,5 +1,10 @@ + + + diff --git a/pom.xml b/pom.xml index e6f14f3..69a5947 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.jamesdpeters.chests ChestsPlusPlus - 1.15 v1.4.1-DEV + 1.15 v1.5-BETA 8 @@ -157,6 +157,12 @@ maven-release-plugin 3.0.0-M1 + + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + diff --git a/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java b/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java index e9da2de..117a898 100644 --- a/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java +++ b/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java @@ -10,7 +10,13 @@ import com.jamesdpeters.minecraft.chests.maventemplates.BuildConstants; import com.jamesdpeters.minecraft.chests.misc.Permissions; import com.jamesdpeters.minecraft.chests.misc.Settings; import com.jamesdpeters.minecraft.chests.misc.Stats; -import com.jamesdpeters.minecraft.chests.serialize.*; +import com.jamesdpeters.minecraft.chests.serialize.AutoCraftingStorage; +import com.jamesdpeters.minecraft.chests.serialize.Config; +import com.jamesdpeters.minecraft.chests.serialize.InventoryStorage; +import com.jamesdpeters.minecraft.chests.serialize.LinkedChest; +import com.jamesdpeters.minecraft.chests.serialize.MaterialSerializer; +import com.jamesdpeters.minecraft.chests.serialize.RecipeSerializable; +import com.jamesdpeters.minecraft.chests.serialize.SpigotConfig; import com.jamesdpeters.minecraft.chests.versionchecker.UpdateCheck; import fr.minuskube.inv.InventoryManager; import org.bstats.bukkit.Metrics; @@ -80,9 +86,11 @@ public class ChestsPlusPlus extends JavaPlugin { INVENTORY_MANAGER.init(); boolean isDev = BuildConstants.VERSION.contains("DEV"); + boolean isBeta = BuildConstants.VERSION.contains("BETA"); if(isDev) getLogger().warning("You are currently running a Dev build - update checker disabled! Build: "+BuildConstants.VERSION); + if(isBeta) getLogger().warning("You are currently running a Beta build - update checker disabled! Build: "+BuildConstants.VERSION); - if(Settings.isUpdateCheckEnabled() && !isDev) { + if(Settings.isUpdateCheckEnabled() && !isDev && !isBeta) { String SPIGOT_URL = "https://www.spigotmc.org/resources/chests-chest-linking-hopper-filtering-remote-chests-menus.71355/"; UpdateCheck updateChecker = UpdateCheck .of(this) diff --git a/src/main/java/com/jamesdpeters/minecraft/chests/versionchecker/UpdateCheck.java b/src/main/java/com/jamesdpeters/minecraft/chests/versionchecker/UpdateCheck.java index b25f852..eb7392b 100644 --- a/src/main/java/com/jamesdpeters/minecraft/chests/versionchecker/UpdateCheck.java +++ b/src/main/java/com/jamesdpeters/minecraft/chests/versionchecker/UpdateCheck.java @@ -3,16 +3,16 @@ package com.jamesdpeters.minecraft.chests.versionchecker; import com.google.common.base.Preconditions; import com.google.common.io.Resources; import com.google.common.net.HttpHeaders; -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; - -import javax.net.ssl.HttpsURLConnection; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.Charset; import java.util.Objects; import java.util.function.BiConsumer; +import javax.net.ssl.HttpsURLConnection; +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; + public class UpdateCheck {