Upstream/ChestsPlusPlus
1
0
Fork 0
mirror of https://github.com/JamesPeters98/ChestsPlusPlus.git synced 2024-11-29 22:23:25 +01:00
Code Issues Projects Releases Wiki Activity

1.5 Beta Commit

Browse Source
This commit is contained in:
James 2020-06-26 21:23:55 +01:00
parent df40c70780
commit b0cd758516
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ target/
*.log *.log
.idea/ .idea/
.DS_Store .DS_Store
ChestsPlusPlus.iml

5
ChestsPlusPlus.iml
View File

@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="CheckStyle-IDEA-Module">
<option name="configuration">
<map />
</option>
</component>
<component name="FacetManager"> <component name="FacetManager">
<facet type="minecraft" name="Minecraft"> <facet type="minecraft" name="Minecraft">
<configuration> <configuration>

8
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.jamesdpeters.chests</groupId> <groupId>com.jamesdpeters.chests</groupId>
<artifactId>ChestsPlusPlus</artifactId> <artifactId>ChestsPlusPlus</artifactId>
<version>1.15 v1.4.1-DEV</version> <version>1.15 v1.5-BETA</version>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
@ -157,6 +157,12 @@
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M1</version> <version>3.0.0-M1</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
</plugins> </plugins>
<!--Tell maven to enable resource filtering so we can use macros like '${project.version}' inside of our plugin.yml--> <!--Tell maven to enable resource filtering so we can use macros like '${project.version}' inside of our plugin.yml-->

12
src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java
View File

@ -10,7 +10,13 @@ import com.jamesdpeters.minecraft.chests.maventemplates.BuildConstants;
import com.jamesdpeters.minecraft.chests.misc.Permissions; import com.jamesdpeters.minecraft.chests.misc.Permissions;
import com.jamesdpeters.minecraft.chests.misc.Settings; import com.jamesdpeters.minecraft.chests.misc.Settings;
import com.jamesdpeters.minecraft.chests.misc.Stats; 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 com.jamesdpeters.minecraft.chests.versionchecker.UpdateCheck;
import fr.minuskube.inv.InventoryManager; import fr.minuskube.inv.InventoryManager;
import org.bstats.bukkit.Metrics; import org.bstats.bukkit.Metrics;
@ -80,9 +86,11 @@ public class ChestsPlusPlus extends JavaPlugin {
INVENTORY_MANAGER.init(); INVENTORY_MANAGER.init();
boolean isDev = BuildConstants.VERSION.contains("DEV"); 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(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/"; String SPIGOT_URL = "https://www.spigotmc.org/resources/chests-chest-linking-hopper-filtering-remote-chests-menus.71355/";
UpdateCheck updateChecker = UpdateCheck UpdateCheck updateChecker = UpdateCheck
.of(this) .of(this)

8
src/main/java/com/jamesdpeters/minecraft/chests/versionchecker/UpdateCheck.java
View File

@ -3,16 +3,16 @@ package com.jamesdpeters.minecraft.chests.versionchecker;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.io.Resources; import com.google.common.io.Resources;
import com.google.common.net.HttpHeaders; 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.io.IOException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Objects; import java.util.Objects;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import javax.net.ssl.HttpsURLConnection;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;
public class UpdateCheck { public class UpdateCheck {