mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-09-12 23:58:20 +02:00
adb131f051
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. Tuinity Changes: 2325c36 Updated Upstream (Paper) EMC Changes: a841b5a5 Fix more lore/item name issues (fixes witch gem issue) 1abb3fae Ensure server conversions on ExactChoice ingredients f2f9d2b0 Forgot to commit paper ref 388620d5 Updated Paper 7a0ae67b Add a null check for UUID to prevent npe later 9de409e0 Updated Paper 0d09eb9a Add new Empire Server API for managing fake players for the tablist Purpur Changes: da95725 Updated Upstream (Tuinity) 7194a16 Updated Upstream (Paper) 77373ea Updated Upstream (Tuinity) 0bae78d Drop async advancements patch for now AirplaneLite Changes: 7b4acbe h != k a07e80c Whoops, missed paperclip change 845c191 Add license to patch files fa671b7 Allow gradle wrapper in gitignore 04fc820 Rework strip raytracing patch f48f6b2 Updated Upstream (Tuinity) ec7c6df Fix encoding 9326301 Update upstream, fix utf8 20b8c79 Allow gradle wrapper in gitignore 6cd80e9 Updated Upstream (Tuinity)
109 lines
4.0 KiB
Diff
109 lines
4.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 174c0b67c1c5b41d80613128ebf2d78ee27f3cee..e20489a5834e9727a8c50435768ffe0e87af2188 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.4-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 -->
|
|
@@ -18,16 +18,25 @@
|
|
</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.org/repository/nms-local/</url>
|
|
+ </repository>
|
|
+ </distributionManagement>
|
|
+ <!-- Yatopia end -->
|
|
+
|
|
<dependencies>
|
|
<dependency>
|
|
- <groupId>com.tuinity</groupId>
|
|
- <artifactId>tuinity-api</artifactId>
|
|
+ <groupId>org.yatopiamc</groupId>
|
|
+ <artifactId>yatopia-api</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
@@ -151,6 +160,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>
|
|
@@ -164,6 +179,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>
|
|
@@ -175,15 +204,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>
|