Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Update Upstream (Folia)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Folia Changes :
PaperMC/Folia@c1e3c3c Bump paper-mojangapi and Gradle
PaperMC/Folia@1e5e215 Implement command execution support for RCON
  • Loading branch information
Euphillya committed Nov 26, 2023
1 parent 48014a6 commit 11f0ecb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ tasks.register("foliaRefLatest") {
)

val foliaLatestCommitJson = layout.cache.resolve("foliaLatestCommit.json");
download.get().download("https://api.github.com/repos/PaperMC/Folia/commits/dev/1.20.2", foliaLatestCommitJson);
download.get().download("https://api.github.com/repos/PaperMC/Folia/commits/master", foliaLatestCommitJson);
val foliaLatestCommit = gson.fromJson<paper.libs.com.google.gson.JsonObject>(foliaLatestCommitJson)["sha"].asString;

copy {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = fr.euphilia.tenseimc
version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2

foliaRef = 3843340cba3aac68f5ab54bd8a0cafd2670a9458
foliaRef = 1e5e2154c9f88d788cecf0b9fcc77ece7d1f8663

org.gradle.caching=true
org.gradle.parallel=false
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0001-Rebranding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Rebranding


diff --git a/build.gradle.kts b/build.gradle.kts
index a748157d6ce9c088ed3c663d9ddd6f5c2d82b6d8..5ac001438f997793a22d45444976c7729ad90843 100644
index 0cd12a854e544e867abfd94c18a9f138ba57e587..e130e7ed56af1bde44a82cc355fe8b1892366e37 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
Expand All @@ -14,7 +14,7 @@ index a748157d6ce9c088ed3c663d9ddd6f5c2d82b6d8..5ac001438f997793a22d45444976c772
// Folia start
- implementation(project(":folia-api"))
+ implementation(project(":TenseiMC-api")) // TenseiMC
implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
exclude("io.papermc.paper", "paper-api")
}
@@ -68,13 +68,13 @@ tasks.jar {
Expand Down Expand Up @@ -134,7 +134,7 @@ index 4b189b54c8f326939a7b9ffdfb35edfb7d8cee63..87835b23e8e58b310da972c76dd620ac

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 4b43134f38ba203a309a412055461b57934da8f9..efc20a7fa1b81c16fbc96f1a00c0eda2f814649e 100644
index bc778637c7d4371cafa9bcda67f8965f57cc66d6..c0a91ec9c5996f803088ad1ceb4e86370785c8f3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
Expand Down

0 comments on commit 11f0ecb

Please sign in to comment.