Upstream
/
Yatopia
mirror of https://github.com/YatopiaMC/Yatopia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update upstream, rename project

This commit is contained in:
tr7zw 2020-08-01 18:14:57 +02:00
parent 6fee6ac5ad
commit 2d4511a68c
8 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/build.yml vendored
View File

@ -1,18 +1,16 @@
name: YAPFA Build Script
name: Yatopia Build Script
on:
push:
paths-ignore:
- '*.md'
branches:
- dev/ver/1.16.1
- master
- ver/1.16.1
pull_request:
paths-ignore:
- '*.md'
branches:
- dev/ver/1.16.1
- master
- ver/1.16.1
jobs:
build:
@ -44,7 +42,7 @@ jobs:
name: Use ${{ matrix.java }} as the java target
with:
properties: '[{"maven.compiler.target": "${{ matrix.java }}"}]'
- name: Setup YAPFA Project
- name: Setup Yatopia Project
run: |
git submodule update --init --recursive -f
git config --global user.email "ci@github.com"
@ -56,23 +54,23 @@ jobs:
cd Tuinity
./tuinity jar
cd ..//
- name: Build YAPFA
- name: Build Yatopia
run: |
./yapfa full
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: YAPFA-${{ matrix.java }}
path: target/YAPFA-1.16.1-paperclip.jar
name: Yatopia-${{ matrix.java }}
path: target/Yatopia-1.16.1-paperclip.jar
- name: Deploy Release
if: github.ref == 'refs/heads/dev/ver/1.16.1'
uses: WebFreak001/deploy-nightly@v1.0.3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # automatically provided by github actions
with:
upload_url: https://uploads.github.com/repos/tr7zw/YAPFA/releases/28703947/assets{?name,label} # find out this value by opening https://api.github.com/repos/<owner>/<repo>/releases in your browser and copy the full "upload_url" value including the {?name,label} part
upload_url: https://uploads.github.com/repos/tr7zw/Yatopia/releases/28703947/assets{?name,label} # find out this value by opening https://api.github.com/repos/<owner>/<repo>/releases in your browser and copy the full "upload_url" value including the {?name,label} part
release_id: 28703947 # same as above (id can just be taken out the upload_url, it's used to find old releases)
asset_path: target/YAPFA-1.16.1-paperclip.jar # path to archive to upload
asset_name: YAPFA-1.16.1-JDK${{ matrix.java }}-paperclip.jar # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash
asset_path: target/Yatopia-1.16.1-paperclip.jar # path to archive to upload
asset_name: Yatopia-1.16.1-JDK${{ matrix.java }}-paperclip.jar # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash
asset_content_type: application/zip # required by GitHub API
max_releases: 3 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted

4
README.md
View File

@ -1,6 +1,6 @@
# YAPFA
# Yatopia (formerly YAPFA)
## (Yet another ~~Paper~~ Tuinity fork attempt)
[![Github-CI](https://github.com/tr7zw/YAPFA/workflows/CI/badge.svg)](https://github.com/tr7zw/YAPFA/actions?query=workflow%3ACI) [![CodeMC-CI](https://ci.codemc.io/job/Tr7zw/job/YAPFA/badge/icon?style=plastic)](https://ci.codemc.io/job/Tr7zw/job/YAPFA/)
[![Github-CI](https://github.com/tr7zw/Yatopia/workflows/CI/badge.svg)](https://github.com/tr7zw/Yatopia/actions?query=workflow%3ACI) [![CodeMC-CI](https://ci.codemc.io/job/Tr7zw/job/Yatopia/badge/icon?style=plastic)](https://ci.codemc.io/job/Tr7zw/job/YAPFA/)
[![Discord](https://img.shields.io/discord/342814924310970398?color=%237289DA&label=Discord&logo=discord&logoColor=white)](https://discordapp.com/invite/yk4caxM)
[![Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.herokuapp.com%2Ftr7zw%2Fpledges&style=for-the-badge)](https://www.patreon.com/tr7zw)

2
Tuinity

@ -1 +1 @@
Subproject commit c0f3b8bd515313446639115578b677cc14dd0b30
Subproject commit 650532ad9f1d74ee6324e4c63d5e0eaf2ccfdcf3

4
patches/server/0001-Modify-POM.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Modify POM
diff --git a/pom.xml b/pom.xml
index 6fd59681784a5cc369f4903b4da0d11174b805f2..df21e0a9396f99b62be433246ecf098dd8ac24f4 100644
index 6fd59681784a5cc369f4903b4da0d11174b805f2..9152dbe177a3847a409d8985f8615f9f5f00506a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@ -61,7 +61,7 @@ index 6fd59681784a5cc369f4903b4da0d11174b805f2..df21e0a9396f99b62be433246ecf098d
<build>
- <finalName>tuinity-${minecraft.version}</finalName>
- <defaultGoal>install</defaultGoal> <!-- Paper -->
+ <finalName>yapfa-${minecraft.version}</finalName>
+ <finalName>yatopia-${minecraft.version}</finalName>
+ <defaultGoal>clean install</defaultGoal> <!-- Paper -->
<plugins>
<plugin>

22
patches/server/0002-Brandings.patch
View File

@ -5,14 +5,14 @@ Subject: [PATCH] Brandings
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
index 74ed02fa9296583977bb721014b10ff8b708b43c..1a9eda0d8bec1d10b3c349a3e62a077b9bab94c7 100644
index 74ed02fa9296583977bb721014b10ff8b708b43c..a13c7b2b5bc79ecaea404779149ed02c4600a61b 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -18,6 +18,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
protected LineReader buildReader(LineReaderBuilder builder) {
return super.buildReader(builder
.appName("Paper")
+ .appName("YAPFA") // YAPFA
+ .appName("Yatopia") // Yatopia
.variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
.completer(new ConsoleCommandCompleter(this.server))
);
@ -44,20 +44,20 @@ index 0000000000000000000000000000000000000000..b7a73408ea6a1e66aa97a0d924d26fac
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0200f21cbec750ada4f92ecab93d21bc8b6f0dc0..626c32e6ea801047595a114c4ff61ec92be4c9d9 100644
index bb54a4aa718360ce38308ab23bde3669376bf595..b02f380271b3a658caa59615f77de6b684a174e8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1505,7 +1505,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1506,7 +1506,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
- return "Tuinity"; // Tuinity //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "YAPFA"; // YAPFA // Tuinity //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "Yatopia"; // Yatopia // Tuinity //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
}
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d434bd93bc26840129274f45a303fe2c1a44f132..8fc533009f417c1f18e7d118ac2ca1b8967e6a24 100644
index d434bd93bc26840129274f45a303fe2c1a44f132..a83fdf36fa5a47814e244810b688ea31ad7f8abc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
@ -65,12 +65,12 @@ index d434bd93bc26840129274f45a303fe2c1a44f132..8fc533009f417c1f18e7d118ac2ca1b8
public final class CraftServer implements Server {
- private final String serverName = "Tuinity"; // Paper // Tuinity
+ private final String serverName = "YAPFA"; // Paper // Tuinity // YAPFA
+ private final String serverName = "Yatopia"; // Paper // Tuinity // Yatopia
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 90c1067ca23e566a96d71e06c273d44397928b64..b10401598601e422d7d6835cc10fd4807bc24e49 100644
index 90c1067ca23e566a96d71e06c273d44397928b64..3f09cf5e98e3bd7ebf2bd4ecad85d77c5e229c80 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -326,7 +326,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@ -78,12 +78,12 @@ index 90c1067ca23e566a96d71e06c273d44397928b64..b10401598601e422d7d6835cc10fd480
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
- return new com.destroystokyo.paper.PaperVersionFetcher();
+ return new de.tr7zw.yapfa.YapfaVersionFetcher(); //YAPFA
+ return new de.tr7zw.yapfa.YapfaVersionFetcher(); //Yatopia
}
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 001b1e5197eaa51bfff9031aa6c69876c9a47960..e3c4ad3d35f339aced96562b9b6d64cf74f53ee0 100644
index 001b1e5197eaa51bfff9031aa6c69876c9a47960..d80dce74ec1a5b5b504281eda3d2c2b188278909 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 {
@ -91,7 +91,7 @@ index 001b1e5197eaa51bfff9031aa6c69876c9a47960..e3c4ad3d35f339aced96562b9b6d64cf
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/de.tr7zw.yapfa/yapfa-api/pom.properties"); // YAPFA
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/de.tr7zw.yapfa/yapfa-api/pom.properties"); // Yatopia
Properties properties = new Properties();
if (stream != null) {

10
patches/server/0005-Add-getLastTickMs-api.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add getLastTickMs() api
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 626c32e6ea801047595a114c4ff61ec92be4c9d9..8252fd263192e787d5d99967b6f1009a2827589d 100644
index b02f380271b3a658caa59615f77de6b684a174e8..ff02688f7b9f6b58c0006d4ba23c38d73869bac0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -933,6 +933,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -934,6 +934,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private static final java.math.BigDecimal TPS_BASE = new java.math.BigDecimal(1E9).multiply(new java.math.BigDecimal(SAMPLE_INTERVAL));
// Paper End
// Spigot End
@ -17,7 +17,7 @@ index 626c32e6ea801047595a114c4ff61ec92be4c9d9..8252fd263192e787d5d99967b6f1009a
protected void v() {
try {
@@ -997,7 +999,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -998,7 +1000,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(gameprofilertick);
this.methodProfiler.a();
this.methodProfiler.enter("tick");
@ -27,7 +27,7 @@ index 626c32e6ea801047595a114c4ff61ec92be4c9d9..8252fd263192e787d5d99967b6f1009a
this.methodProfiler.exitEnter("nextTickWait");
this.X = true;
this.W = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
@@ -1006,6 +1010,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1007,6 +1011,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.b();
this.b(gameprofilertick);
this.hasTicked = true;
@ -36,7 +36,7 @@ index 626c32e6ea801047595a114c4ff61ec92be4c9d9..8252fd263192e787d5d99967b6f1009a
} else {
this.a((CrashReport) null);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8fc533009f417c1f18e7d118ac2ca1b8967e6a24..3b0f4a5700c704728c88fab15305fa4701cfeb80 100644
index a83fdf36fa5a47814e244810b688ea31ad7f8abc..a35c516b6d2e3535e4455d7f65f71988a75d1df8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2388,4 +2388,13 @@ public final class CraftServer implements Server {

2
patches/server/0009-Add-NBT-API-as-first-class-lib.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add NBT-API as first-class lib
diff --git a/pom.xml b/pom.xml
index df21e0a9396f99b62be433246ecf098dd8ac24f4..863b375402498332bebc2b6fe1288c68ba66d92e 100644
index 9152dbe177a3847a409d8985f8615f9f5f00506a..f653ca995aabb73fb5cad56c3d39aeb8bc7b23d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,6 +306,10 @@

6
scripts/installLauncher.sh
View File

@ -17,7 +17,7 @@ echo "----------------------------------------"
set -e
paperworkdir="$basedir/Tuinity/Paper/work"
mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
serverjar="$basedir/YAPFA-Server/target/yapfa-$mcver.jar"
serverjar="$basedir/YAPFA-Server/target/yatopia-$mcver.jar"
vanillajar="$paperworkdir/Minecraft/$mcver/$mcver.jar"
(
@ -25,7 +25,7 @@ vanillajar="$paperworkdir/Minecraft/$mcver/$mcver.jar"
mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$serverjar" "-Dvanillajar=$vanillajar"
)
mkdir -p "$basedir/target"
cp "$paperworkdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/target/YAPFA-${mcver}-paperclip.jar"
cp "$paperworkdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/yatopia-${mcver}-paperclip.jar"
echo ""
echo " $(bashcolor 1 32)Success$(bashcolorend) - Saved launcher jar to target/YAPFA-${mcver}-launcher.jar"
echo " $(bashcolor 1 32)Success$(bashcolorend) - Saved launcher jar to target/yatopia-${mcver}-launcher.jar"