90 lines
3.7 KiB
Diff
90 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
|
|
<tsao-chi@the-lingo.org>
|
|
Date: Fri, 14 Dec 2018 21:53:58 -0800
|
|
Subject: [PATCH] Akarin POM changes
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index e83e4241a56fe131a75fe21cc1518992c089da2c..a65381073fc6d4546280e36bb18a0b2dd54cfa93 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>akarin</artifactId>
|
|
<packaging>jar</packaging>
|
|
<version>1.16.5-R0.1-SNAPSHOT</version>
|
|
- <name>Tuinity-Server</name>
|
|
- <url>https://github.com/Spottedleaf/Tuinity</url>
|
|
+ <name>Akarin-Server</name>
|
|
+ <url>https://github.com/Akarin-project/Akarin</url>
|
|
|
|
<properties>
|
|
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
|
|
@@ -19,16 +19,16 @@
|
|
</properties>
|
|
|
|
<parent>
|
|
- <groupId>com.tuinity</groupId>
|
|
- <artifactId>tuinity-parent</artifactId>
|
|
+ <groupId>io.akarin.server</groupId>
|
|
+ <artifactId>akarin-parent</artifactId>
|
|
<version>dev-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
- <groupId>com.tuinity</groupId>
|
|
- <artifactId>tuinity-api</artifactId>
|
|
+ <groupId>io.akarin.server</groupId>
|
|
+ <artifactId>akarin-api</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
@@ -172,6 +172,10 @@
|
|
<id>spigotmc-public</id>
|
|
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
|
</repository>
|
|
+ <repository>
|
|
+ <id>velocity</id>
|
|
+ <url>https://repo.velocitypowered.com/snapshots/</url>
|
|
+ </repository>
|
|
</repositories>
|
|
|
|
<pluginRepositories>
|
|
@@ -183,7 +187,7 @@
|
|
|
|
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
|
<build>
|
|
- <finalName>tuinity-${minecraft.version}</finalName>
|
|
+ <finalName>akarin-${minecraft.version}</finalName>
|
|
<defaultGoal>install</defaultGoal> <!-- Paper -->
|
|
<plugins>
|
|
<plugin>
|
|
@@ -191,7 +195,7 @@
|
|
<artifactId>gitdescribe-maven-plugin</artifactId>
|
|
<version>1.3</version>
|
|
<configuration>
|
|
- <outputPrefix>git-Tuinity-</outputPrefix> <!-- Tuinity -->
|
|
+ <outputPrefix>git-Akarin-</outputPrefix> <!-- Akarin -->
|
|
<scmDirectory>..</scmDirectory>
|
|
</configuration>
|
|
<executions>
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
index 001b1e5197eaa51bfff9031aa6c69876c9a47960..9a7235b8e525fbc52ff7ce53156816f9bbdb5d6f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
@@ -11,7 +11,7 @@ public final class Versioning {
|
|
public static String getBukkitVersion() {
|
|
String result = "Unknown-Version";
|
|
|
|
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.tuinity/tuinity-api/pom.properties"); // Tuinity
|
|
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.akarin.server/akarin-api/pom.properties"); // Akarin
|
|
Properties properties = new Properties();
|
|
|
|
if (stream != null) {
|