Skip to content
This repository has been archived by the owner on Sep 23, 2023. It is now read-only.

我的建议 #75

Open
wants to merge 3 commits into
base: ver/1.19.2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Git Repository
uses: actions/checkout@v3.0.2
uses: actions/checkout@v3
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1.0.4
uses: gradle/wrapper-validation-action@master
- name: Set up JDK (GraalVM)
uses: graalvm/setup-graalvm@v1
with:
version: 'latest'
java-version: '17'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Pull Gradle Cache
uses: actions/cache@v3.0.4
uses: actions/cache@v3
id: gradle-cache
with:
path: ~/.gradle
Expand All @@ -31,17 +31,11 @@ jobs:
- name: Build
run: |
./gradlew -Dorg.gradle.jvmargs="-Dfile.encoding=UTF-8 -Dgraal.CompilerConfiguration=community -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true -Dgraal.SpeculativeGuardMovement=true -Dgraal.WriteableCodeCache=true --add-modules jdk.incubator.vector" createReobfPaperclipJar --stacktrace --no-daemon
- name: Archive Paperclip
uses: actions/[email protected]
- name: Release
if: github.ref_name == 'ver/1.19.2'
uses: marvinpinto/action-automatic-releases@latest
with:
name: Mirai-1.19.2
path: build/libs/mirai-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar
# - name: Release
# if: github.ref_name == 'ver/1.19'
# uses: marvinpinto/[email protected]
# with:
# repo_token: ${{ secrets.GITHUB_TOKEN }}
# automatic_release_tag: '1.19'
# prerelease: false
# title: 'Mirai 1.19'
# files: build/libs/mirai-paperclip-1.19-R0.1-SNAPSHOT-reobf.jar
title: "Mirai-1.19.2"
automatic_release_tag: "1.19.2"
repo_token: "${{ secrets.GITHUB_TOKEN }}"
files: build/libs/mirai-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h4>Mirai is ❗under heavy development❗ and contributions are welcome!</h4>
<h5><b>This project is experimental, its usage in production environment is discouraged if you are not ready to face possible bugs.</b></h5>

[![Build status](https://img.shields.io/github/workflow/status/etil2jz/Mirai/Build/ver/1.19?style=for-the-badge)](https://ci.codemc.io/job/etil2jz/job/Mirai-1.19/lastSuccessfulBuild)
[![Build status](https://img.shields.io/github/actions/workflow/status/Dreeam-qwq/Mirai/build.yml?branch=ver%2F1.19.2&style=for-the-badge)](https://github.com/Dreeam-qwq/Mirai/releases/tag/1.19.2)
[![Discord](https://img.shields.io/discord/928402257605701683?color=5865F2&label=discord&style=for-the-badge)](https://discord.gg/DdH6Yfu9gM)
</div>

Expand All @@ -26,7 +26,7 @@

## Downloads
The latest successful build can be downloaded here:
[mirai-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar](https://ci.codemc.io/job/etil2jz/job/Mirai-1.19/lastSuccessfulBuild/)
[mirai-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar](https://github.com/Dreeam-qwq/Mirai/releases/tag/1.19.2)

**Please note Java >= 17 is required.**

Expand Down
2 changes: 1 addition & 1 deletion build-data/dev-imports.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
# datafixerupper com/mojang/datafixers/util/Either.java
# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
# minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
# minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
# minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.9-SNAPSHOT"
id("io.papermc.paperweight.patcher") version "1.4.1"
}

repositories {
Expand All @@ -16,7 +16,7 @@ repositories {

dependencies {
remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
decompiler("org.quiltmc:quiltflower:1.8.1")
decompiler("org.quiltmc:quiltflower:1.9.0")
paperclip("io.papermc:paperclip:3.0.3-SNAPSHOT")
}

Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.vfs.watch=false
org.gradle.jvmargs = -Xmx4G

group=dev.etil.mirai
version=1.19.2-R0.1-SNAPSHOT
mcVersion=1.19.2
pufferfishRef=deb9638cd5243286685c20d254fdec9c2754979b
pufferfishRef=9b8cdc74a4bed029a68682a6f0b6ec039b5c2707
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
4 changes: 2 additions & 2 deletions patches/api/0007-Lobotomize-stuck-villagers.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/PurpurMC/Purpur

diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
index d61855b83da0776fe910dee8cde184c720571a71..b7b7963c07f9859df980017d0515ab437f7d9d10 100644
index c61e7e41aeb3d4f5f4ac47da8890051d8e97340d..12b08318f78c8144cc809dbccf0feabdd31f0ee2 100644
--- a/src/main/java/org/bukkit/entity/Villager.java
+++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -297,4 +297,14 @@ public interface Villager extends AbstractVillager {
@@ -328,4 +328,14 @@ public interface Villager extends AbstractVillager {
*/
public void clearReputations();
// Paper end
Expand Down
14 changes: 7 additions & 7 deletions patches/server/0001-Mirai-Branding-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Mirai Branding Changes


diff --git a/build.gradle.kts b/build.gradle.kts
index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..65441b943a97f8aa453f31bf5cf7f87862fdcc07 100644
index 5b43f5c27ce903c53cbce245477fbdefdc88733f..ca62be1aca4467b81e7398fa98863c1604ed3e46 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
@@ -7,7 +7,7 @@ plugins {
}

dependencies {
Expand All @@ -17,7 +17,7 @@ index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..65441b943a97f8aa453f31bf5cf7f878
// Pufferfish start
implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
exclude("io.papermc.paper", "paper-api")
@@ -84,7 +84,7 @@ tasks.jar {
@@ -82,7 +82,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
Expand Down Expand Up @@ -360,7 +360,7 @@ index 0000000000000000000000000000000000000000..7be6bb03891e0831ad72e581900fdf11
+}
\ 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 af9da39dffda01325af2ab3dd8b5e1efb18e013a..da9623b90f3d25dc4c3e3aa269c4ccd2c8a0a52c 100644
index 3cadf20891888b56ac70798d581d6a044a98c0a3..5f759d9b346d26ae1c85cd7fb7118de305d74d74 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -923,7 +923,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Expand All @@ -382,7 +382,7 @@ index af9da39dffda01325af2ab3dd8b5e1efb18e013a..da9623b90f3d25dc4c3e3aa269c4ccd2

public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b8efe50c860a7537f345f46f3b3d68906ad54006..adf6308c0d8dbd8919db60abce51082091005bd1 100644
index a4848a507f620cff686992c2e95039ca60af6d0e..61cd3485aa39b60b3bb376997856f4f036f9f8e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
Expand All @@ -395,10 +395,10 @@ index b8efe50c860a7537f345f46f3b3d68906ad54006..adf6308c0d8dbd8919db60abce510820
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 05cc8f9cdcd7e920bf9503f68efb16cd74a359a2..a0b8889efef36664feb47d9f8b97fae533d1f5bf 100644
index 47ff8c22bd9c7220df98268f6db224d1cd66a0ab..153238bea6408066c5ea9d218f1cc4e293fdd0a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -430,7 +430,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -435,7 +435,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
Expand Down
Loading