Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-29 06:05:14 +01:00
Code Issues Projects Releases Wiki Activity
e7dfd4d75e
Yatopia/patches/server/0001-Modify-POM.patch
Simon Gardling 679a88af3f
Upstream (#447) 
* Updated Upstream and Sidestream(s) (Paper/Airplane/Purpur/Empirecraft)

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:
4b78c0b80 [CI-SKIP] [Auto] Rebuild Patches
2d9ff13eb forced whitelist: use configuable kick message (fixes #5417) (#5418)
000cec2ab bug #5432 - post modern event even if legacy event is cancelled
6c83bc6e5 Remove from Map by key
857852c28 Make sure to remove correct TE during TE tick
f7b4abb25 [Auto] Updated Upstream (Bukkit/CraftBukkit)

Airplane Changes:
9a4bd85 Remove Multithreaded Tracker
1068498 Updated Upstream (Tuinity)

Purpur Changes:
083a86e [ci-skip] Update for Toothpick changes
8b9b214 Updated Upstream (Paper & Tuinity)

Empirecraft Changes:
6b5cffc2 Updated Paper

* Updated Upstream and Sidestream(s) (Airplane/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.

Airplane Changes:
3ed988c Use AIR library for configuration parsing

Purpur Changes:
9631959 Add 5 sec TPS to GUI (#260)
2a0a5e6 [ci-skip] Bump Toothpick Kotlin version
02b3444 Add back multithreaded entity tracker
43b4a2f Updated Upstream (Paper & Airplane)

* update gradle from 6.8.2 to 6.8.3

* fix build (hopefully)

* 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:
211f8e041 Prevent light queue overfill when no players are online

* well that was dumb

* FINALLY it works

* Updated Upstream and Sidestream(s) (Empirecraft)

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.

Empirecraft Changes:
018fcff7 Updated Paper
2021-04-03 15:49:43 -04:00

164 lines
6.1 KiB
Diff
Raw Blame History

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 9d9ea5cff8a07c445837de74b3f887316cd79772..67c70c38214f39739d56121dde76a12f584f2a64 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.59.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 -->
@@ -175,6 +184,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>
@@ -188,19 +203,32 @@
<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>
Reference in New Issue View Git Blame Copy Permalink