EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows

Browse Source
This commit is contained in:
nossr50
2020-08-11 20:44:13 -07:00
parent 8ca6ef5782 a2f2614b10
commit 1d950be7e4
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@@ -48,6 +48,9 @@ Version 2.2.000
Notes: Notes:
These are the first new skills that I've written for mcMMO in about 9 years, I'll be listening closely to feedback and tweaking them often. These are the first new skills that I've written for mcMMO in about 9 years, I'll be listening closely to feedback and tweaking them often.
Version 2.1.141
Added some missing values for 1.16.2 compatibility modes
Version 2.1.140 Version 2.1.140
Fixed a few potential issues with scoreboards Fixed a few potential issues with scoreboards
Updated polish locale Updated polish locale

19
pom.xml
View File

@@ -99,6 +99,7 @@
<include>org.apache.tomcat:tomcat-jdbc</include> <include>org.apache.tomcat:tomcat-jdbc</include>
<include>org.apache.tomcat:tomcat-juli</include> <include>org.apache.tomcat:tomcat-juli</include>
<include>org.bstats:bstats-bukkit</include> <include>org.bstats:bstats-bukkit</include>
<include>net.kyori:adventure-api</include>
</includes> </includes>
</artifactSet> </artifactSet>
<relocations> <relocations>
@@ -151,8 +152,24 @@
<id>sk89q-repo</id> <id>sk89q-repo</id>
<url>https://maven.sk89q.com/repo/</url> <url>https://maven.sk89q.com/repo/</url>
</repository> </repository>
<!-- ... -->
<repository> <!-- for development builds -->
<id>sonatype-oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
<!-- ... -->
</repositories> </repositories>
<dependencies> <dependencies>
<!-- <dependency>-->
<!-- <groupId>net.kyori</groupId>-->
<!-- <artifactId>adventure-platform-bukkit</artifactId>-->
<!-- <version>4.0.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>net.kyori</groupId>-->
<!-- <artifactId>adventure-api</artifactId>-->
<!-- <version>4.0.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.apache.maven.scm</groupId> <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId> <artifactId>maven-scm-provider-gitexe</artifactId>
@@ -167,7 +184,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.2-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java
View File

@@ -120,6 +120,8 @@ public class CompatibilityManager {
case 16: case 16:
if (minecraftGameVersion.getPatchVersion().asInt() == 1) { if (minecraftGameVersion.getPatchVersion().asInt() == 1) {
return NMSVersion.NMS_1_16_1; return NMSVersion.NMS_1_16_1;
} else if(minecraftGameVersion.getPatchVersion().asInt() == 2) {
return NMSVersion.NMS_1_16_2;
} }
} }
} }

1
src/main/java/com/gmail/nossr50/util/nms/NMSVersion.java
View File

@@ -18,6 +18,7 @@ public enum NMSVersion {
//1.16 //1.16
NMS_1_16_1("1.16.1"), NMS_1_16_1("1.16.1"),
NMS_1_16_2("1.16.2"),
//Version not known to this build of mcMMO //Version not known to this build of mcMMO
UNSUPPORTED("unsupported"); UNSUPPORTED("unsupported");