Merge pull request #168 from GeorgH93/MC1.17

Add support for MC 1.17 (Closes #167)
This commit is contained in:
GeorgH93 2021-06-16 23:27:00 +02:00 committed by GitHub
commit f0b880df61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 8 deletions

View File

@ -25,8 +25,16 @@
<mainClass>${project.groupId}.${project.artifactId}.Bukkit.${project.artifactId}</mainClass>
<releaseType>Normal</releaseType>
<updateChannel>Release</updateChannel>
<mavenShade.version>3.3.0-SNAPSHOT</mavenShade.version>
</properties>
<pluginRepositories>
<pluginRepository>
<id>apache-snapshot</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
<!-- Minepacks API -->
<dependency>
@ -38,7 +46,7 @@
<dependency>
<groupId>at.pcgamingfreaks</groupId>
<artifactId>PluginLib</artifactId>
<version>1.0.30-SNAPSHOT</version>
<version>1.0.33-SNAPSHOT</version>
</dependency>
<!-- BadRabbit -->
<dependency>
@ -83,7 +91,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>${mavenShade.version}</version>
<executions>
<execution>
<phase>package</phase>
@ -151,7 +159,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>${mavenShade.version}</version>
<executions>
<execution>
<phase>package</phase>
@ -243,7 +251,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>${mavenShade.version}</version>
<executions>
<execution>
<phase>package</phase>

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 GeorgH93
* Copyright (C) 2021 GeorgH93
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -21,6 +21,6 @@
public class MagicValues
{
public static final String MIN_PCGF_PLUGIN_LIB_VERSION = "1.0.28-SNAPSHOT";
public static final String MIN_PCGF_PLUGIN_LIB_VERSION = "1.0.33-SNAPSHOT";
public static final MCVersion MIN_MC_VERSION_FOR_UPDATES = MCVersion.MC_1_8;
}

View File

@ -116,7 +116,7 @@ public void onEnable()
private boolean checkMcVersion()
{
if(MCVersion.is(MCVersion.UNKNOWN) || !MCVersion.isUUIDsSupportAvailable() || MCVersion.isNewerThan(MCVersion.MC_NMS_1_16_R3))
if(MCVersion.is(MCVersion.UNKNOWN) || !MCVersion.isUUIDsSupportAvailable() || MCVersion.isNewerThan(MCVersion.MC_NMS_1_17_R1))
{
this.warnOnVersionIncompatibility();
this.setEnabled(false);

View File

@ -7,7 +7,7 @@
<packaging>pom</packaging>
<properties>
<revision>2.3.24</revision>
<revision>2.4-RC1</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>