mirror of https://github.com/YatopiaMC/Yatopia.git
168 lines
6.2 KiB
Diff
168 lines
6.2 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 752d62eb3b87ab24260ec2c029bae0d2b0e3b908..e790d779d24c2c8d4a74d458839c11bc494eeef1 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,17 +19,26 @@
|
|
</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 -->
|
|
+
|
|
<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>
|
|
@@ -44,7 +53,7 @@
|
|
<dependency>
|
|
<groupId>io.netty</groupId>
|
|
<artifactId>netty-all</artifactId>
|
|
- <version>4.1.50.Final</version>
|
|
+ <version>4.1.58.Final</version>
|
|
</dependency>
|
|
<!-- Tuinity end - fix compile issue (cannot see new api) by moving netty include BEFORE server jar -->
|
|
<dependency>
|
|
@@ -61,7 +70,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>
|
|
<!--
|
|
@@ -73,19 +82,19 @@
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-core</artifactId>
|
|
- <version>2.8.1</version>
|
|
+ <version>2.14.0</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-slf4j-impl</artifactId>
|
|
- <version>2.8.1</version>
|
|
+ <version>2.14.0</version>
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-iostreams</artifactId>
|
|
- <version>2.8.1</version>
|
|
+ <version>2.14.0</version>
|
|
<scope>compile</scope>
|
|
<exclusions>
|
|
<!-- included in minecraft-server -->
|
|
@@ -144,14 +153,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.98</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<!-- for optimized protocol handling -->
|
|
@@ -161,6 +170,12 @@
|
|
<version>1.1.0-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>
|
|
@@ -174,6 +189,20 @@
|
|
<id>spigotmc-public</id>
|
|
<url>https://hub.spigotmc.org/nexus/content/groups/public/</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>
|
|
|
|
<pluginRepositories>
|
|
@@ -185,15 +214,15 @@
|
|
|
|
<!-- 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>
|