Skip to content
This repository was archived by the owner on Oct 13, 2025. It is now read-only.
Merged
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.gradle
build

# Nycticorax
# Sapling
build-data/dev-imports.txt
run

Expand Down
8 changes: 4 additions & 4 deletions sapling-api/build.gradle.kts.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
srcDir(generatedDir)
// Leaf start - project setup
srcDir(file("../paper-api/src/main/java"))
+ srcDir(file("../leaf-api/src/main/java")) // Nycticorax - project setup
+ srcDir(file("../leaf-api/src/main/java")) // Sapling - project setup
}
resources {
srcDir(file("../paper-api/src/main/resources"))
+ srcDir(file("../leaf-api/src/main/resources")) // Nycticorax - project setup
+ srcDir(file("../leaf-api/src/main/resources")) // Sapling - project setup
}
}
test {
java {
srcDir(file("../paper-api/src/test/java"))
+ srcDir(file("../leaf-api/src/test/java")) // Nycticorax - project setup
+ srcDir(file("../leaf-api/src/test/java")) // Sapling - project setup
}
resources {
srcDir(file("../paper-api/src/test/resources"))
+ srcDir(file("../leaf-api/src/test/resources")) // Nycticorax - project setup
+ srcDir(file("../leaf-api/src/test/resources")) // Sapling - project setup
// Leaf end - project setup
}
}
4 changes: 2 additions & 2 deletions sapling-api/paper-patches/features/0001-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand


diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
index c198304386e83edc2ec582fdf66d97d624004771..8a7936606873a09c222746b5b90ec1e2049a6f9a 100644
index c198304386e83edc2ec582fdf66d97d624004771..10bc705260a6212a65a2e7e56ce4a7052b03ba39 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -41,6 +41,13 @@ public interface ServerBuildInfo {
Expand All @@ -16,7 +16,7 @@ index c198304386e83edc2ec582fdf66d97d624004771..8a7936606873a09c222746b5b90ec1e2
+ /**
+ * The brand id for Sapling.
+ */
+ Key BRAND_NYCTICORAX_ID = Key.key("winds-studio", "sapling");
+ Key BRAND_SAPLING_ID = Key.key("winds-studio", "sapling");
+ // Sapling end - Rebrand
+
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ Subject: [PATCH] Version fetcher without build number


diff --git a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
index 4c69c10f6b4dacb33ed3eb55437ec88422792f71..07dc01376499fed82bdb7e8982afb5b500f66fce 100644
index 4c69c10f6b4dacb33ed3eb55437ec88422792f71..a1a0614aabcd663647ff97d02cef158278ac0cd8 100644
--- a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
+++ b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
@@ -66,7 +66,7 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
public @NotNull Component getVersionMessage() {
final Component updateMessage;
final ServerBuildInfo build = ServerBuildInfo.buildInfo();
- if (build.buildNumber().isEmpty() || build.gitCommit().isEmpty()) { // Gale - branding changes - version fetcher
+ if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) { // Gale - branding changes - version fetcher // Nycticorax - do not require build number
+ if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) { // Gale - branding changes - version fetcher // Sapling - do not require build number
updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
} else {
updateMessage = getUpdateStatusMessage(this.gitHubOrganizationName + "/" + this.gitHubRepoName, build); // Gale - branding changes - version fetcher
8 changes: 4 additions & 4 deletions sapling-server/minecraft-patches/features/0001-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ Subject: [PATCH] Rebrand


diff --git a/net/minecraft/CrashReport.java b/net/minecraft/CrashReport.java
index 18e63dca2a315ad01fa5b80ec126f4eac71f45fd..d1aa941a91836fa1da52f5d4b2b6c71531d52082 100644
index 18e63dca2a315ad01fa5b80ec126f4eac71f45fd..14932dc46d2fded537f04dae0461c52b264cb9b3 100644
--- a/net/minecraft/CrashReport.java
+++ b/net/minecraft/CrashReport.java
@@ -30,7 +30,7 @@ public class CrashReport {
private boolean trackingStackTrace = true;
private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0];
private final SystemReport systemReport = new SystemReport();
- private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO LEAF INSTEAD!", ""); // Leaf - Rebrand
+ private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO NYCTICORYX INSTEAD!", ""); // Leaf - Rebrand // Sapling - Rebrand
+ private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO SAPLING INSTEAD!", ""); // Leaf - Rebrand // Sapling - Rebrand

public CrashReport(String title, Throwable exception) {
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper
diff --git a/net/minecraft/world/damagesource/DamageSource.java b/net/minecraft/world/damagesource/DamageSource.java
index 5a663f66820d95449ccf9117e72159a10bcd04d6..abd0dbc1e409162f381d9866047b4ba84b44c4c1 100644
index 5a663f66820d95449ccf9117e72159a10bcd04d6..08cb3a1e892b7e0f32c927c5a084d220105718bd 100644
--- a/net/minecraft/world/damagesource/DamageSource.java
+++ b/net/minecraft/world/damagesource/DamageSource.java
@@ -75,7 +75,7 @@ public class DamageSource {
Expand All @@ -31,7 +31,7 @@ index 5a663f66820d95449ccf9117e72159a10bcd04d6..abd0dbc1e409162f381d9866047b4ba8
final DamageSource damageSource = this.copy();
damageSource.eventEntityDamager = entity;
diff --git a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
index 3634d68c77ee99567b51a9a848d7cbbb218a0ba7..cb5607073234dc8a66167125f051f850eaa2c97a 100644
index 3634d68c77ee99567b51a9a848d7cbbb218a0ba7..efd5d32764ae5a473802d178415d69c82ba4e4d4 100644
--- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
@@ -308,7 +308,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
Expand Down
Loading