mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-12-04 08:33:27 +01:00
76a75f866b
* Updated Upstream and Sidestream(s) (Paper) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: d15161114 [Auto] Updated Upstream (Spigot) e8889e96a [Auto] Updated Upstream (CraftBukkit) 3bc888ba6 [Auto] Updated Upstream (CraftBukkit) * Updated Upstream and Sidestream(s) (Paper) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 3fea87edb [Auto] Updated Upstream (CraftBukkit) a111b1365 Send post ChatEvent messages as MessageType.CHAT * Updated Upstream and Sidestream(s) (Paper/Tuinity/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 3db3aaf39 [Auto] Updated Upstream (CraftBukkit) c953e51dd [Auto] Updated Upstream (CraftBukkit/Spigot) dc529c7a9 Fix PlayerEditBookEvent (#5463) Tuinity Changes: a0aa5ab Do not load 1 radius neighbours for lighting 5ccfa52 Fix terrible patch times af53d70 Stop large move vectors in player packet handling from killing the server 6e56ee7 Fix OBFHELPER for flushHeader in RegionFile 995d05c Do not update TE's in generating chunks Purpur Changes: 2e66f83 [ci-skip] Fix typo 6cbe4fc Change Logo Tuinity to Purpur 5e89d23 Updated Upstream (Paper & Airplane) * Updated Upstream and Sidestream(s) (Paper) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 304a216ba [CI-SKIP] Ignore gitignore when adding files in automation d8e384a16 [CI-SKIP] Drop `Allow PlayerEditBookEvent to fire for off hand` (#5471) * fix kotlin-stdlib dependency * update dependencies * how did that happen... * Updated Upstream and Sidestream(s) (Paper) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: de138fac4 [Auto] Updated Upstream (Bukkit) * Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 4492bc4cc remove l4j class no longer in existence from preload list be1370517 Updated Upstream (CraftBukkit) (#5484) d560151ec Bump mysql-connector-java to 8.0.23 (Fixes #5473) (#5474) 61f400f11 Update log4j to 2.11.2 for JDK 9+ compat (#5400) a98196585 Updated Upstream (Bukkit/CraftBukkit) Tuinity Changes: d5261ad Do not load chunks for getCubes by default da9cf98 Don't read neighbour chunk data off disk when converting chunks Airplane Changes: 8de8e82 Updated Upstream (Tuinity)
162 lines
6.0 KiB
Diff
162 lines
6.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: YatopiaMC <yatopiamc@gmail.com>
|
|
Date: Wed, 26 Feb 2020 17:08:07 +0100
|
|
Subject: [PATCH] Modify POM
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index cea712b94bb32ccda2895670859839d660bd0748..d16dce599382f285685e0990a63dd1bbadc62cac 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -1,11 +1,11 @@
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
- <artifactId>tuinity</artifactId>
|
|
+ <artifactId>yatopia</artifactId>
|
|
<packaging>jar</packaging>
|
|
<version>1.16.5-R0.1-SNAPSHOT</version>
|
|
- <name>Tuinity-Server</name>
|
|
- <url>https://github.com/Spottedleaf/Tuinity</url>
|
|
+ <name>Yatopia-Server</name>
|
|
+ <url>https://github.com/YatopiaMC/Yatopia</url>
|
|
|
|
<properties>
|
|
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
|
|
@@ -19,12 +19,21 @@
|
|
</properties>
|
|
|
|
<parent>
|
|
- <groupId>com.tuinity</groupId>
|
|
- <artifactId>tuinity-parent</artifactId>
|
|
+ <groupId>org.yatopiamc</groupId>
|
|
+ <artifactId>yatopia-parent</artifactId>
|
|
<version>dev-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
+ <!-- Yatopia start -->
|
|
+ <distributionManagement>
|
|
+ <repository>
|
|
+ <id>codemc-snapshots</id>
|
|
+ <url>https://repo.codemc.io/repository/nms-local/</url>
|
|
+ </repository>
|
|
+ </distributionManagement>
|
|
+ <!-- Yatopia end -->
|
|
+
|
|
<dependencyManagement>
|
|
<dependencies>
|
|
<dependency>
|
|
@@ -40,8 +49,8 @@
|
|
<dependencies>
|
|
<dependency>
|
|
<!-- Purpur start - our "upstream" is Paper (not Tuinity), so this is necessary for DependencyLoading.kt to work properly -->
|
|
- <groupId>net.pl3x.purpur</groupId>
|
|
- <artifactId>purpur-api</artifactId>
|
|
+ <groupId>org.yatopiamc</groupId>
|
|
+ <artifactId>yatopia-api</artifactId>
|
|
<!-- Purpur end -->
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
@@ -56,7 +65,7 @@
|
|
<dependency>
|
|
<groupId>io.netty</groupId>
|
|
<artifactId>netty-all</artifactId>
|
|
- <version>4.1.50.Final</version>
|
|
+ <version>4.1.63.Final</version>
|
|
</dependency>
|
|
<!-- Tuinity end - fix compile issue (cannot see new api) by moving netty include BEFORE server jar -->
|
|
<dependency>
|
|
@@ -73,7 +82,7 @@
|
|
<dependency>
|
|
<groupId>org.jline</groupId>
|
|
<artifactId>jline-terminal-jansi</artifactId>
|
|
- <version>3.12.1</version>
|
|
+ <version>3.19.0</version>
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
<!--
|
|
@@ -151,14 +160,14 @@
|
|
<dependency>
|
|
<groupId>org.hamcrest</groupId>
|
|
<artifactId>hamcrest-library</artifactId>
|
|
- <version>1.3</version>
|
|
+ <version>2.2</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<!-- for vanilla goal scanning -->
|
|
<dependency>
|
|
<groupId>io.github.classgraph</groupId>
|
|
<artifactId>classgraph</artifactId>
|
|
- <version>4.8.47</version>
|
|
+ <version>4.8.104</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<!-- for optimized protocol handling -->
|
|
@@ -182,6 +191,12 @@
|
|
<version>master-SNAPSHOT</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
+ <!-- Fast Math -->
|
|
+ <dependency>
|
|
+ <groupId>org.apache.commons</groupId>
|
|
+ <artifactId>commons-math3</artifactId>
|
|
+ <version>3.6.1</version>
|
|
+ </dependency>
|
|
</dependencies>
|
|
|
|
<repositories>
|
|
@@ -190,27 +205,37 @@
|
|
<id>jitpack.io</id>
|
|
<url>https://jitpack.io</url>
|
|
</repository>
|
|
- </repositories>
|
|
-
|
|
- <repositories>
|
|
<!-- Purpur - Snapshots -->
|
|
<repository>
|
|
<id>purpur-snapshots</id>
|
|
<url>https://repo.pl3x.net/</url>
|
|
</repository>
|
|
+ <repository>
|
|
+ <id>destroystokyo-repo</id>
|
|
+ <url>https://papermc.io/repo/repository/maven-public/</url>
|
|
+ </repository>
|
|
+ <repository>
|
|
+ <id>aikar</id>
|
|
+ <url>https://repo.aikar.co/nexus/content/repositories/aikar/</url>
|
|
+ </repository>
|
|
+ <!-- Yatopia - Add velocity repo to fix compile -->
|
|
+ <repository>
|
|
+ <id>velocity</id>
|
|
+ <url>https://nexus.velocitypowered.com/repository/maven-public/</url>
|
|
+ </repository>
|
|
</repositories>
|
|
|
|
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
|
<build>
|
|
- <finalName>tuinity-${minecraft.version}</finalName>
|
|
- <defaultGoal>install</defaultGoal> <!-- Paper -->
|
|
+ <finalName>yatopia-${minecraft.version}</finalName>
|
|
+ <defaultGoal>clean install</defaultGoal> <!-- Paper --> <!-- Yatopia -->
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>com.lukegb.mojo</groupId>
|
|
<artifactId>gitdescribe-maven-plugin</artifactId>
|
|
<version>1.3</version>
|
|
<configuration>
|
|
- <outputPrefix>git-Tuinity-</outputPrefix> <!-- Tuinity -->
|
|
+ <outputPrefix>git-Yatopia-</outputPrefix> <!-- Tuinity --> <!-- Yatopia -->
|
|
<scmDirectory>..</scmDirectory>
|
|
</configuration>
|
|
<executions>
|
|
@@ -385,7 +410,7 @@
|
|
<dependency>
|
|
<groupId>org.jetbrains.kotlin</groupId>
|
|
<artifactId>kotlin-stdlib</artifactId>
|
|
- <version>1.4.33-SNAPSHOT</version>
|
|
+ <version>1.4.32</version>
|
|
</dependency>
|
|
<!-- Purpur end -->
|
|
</dependencies>
|