mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
d5c9306a7f
* init 1.21.4, and boom! * build change, but weight not work * just work * Build changes, and delete timings * Fix API patches (#406) * Fix API patches * merge --------- Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> * 0006/0129 * 0009/0129 * 0011/0129 * 0018/0129 * 0030/0129 * 0035/0129 * 0043/0129 * 0048/0129 * 0049/0129 * 0057/0129 * 0065/0129 * 0086/0129 (#408) * 0072/0129 * 0080/0129 * Readd patch infos * 0086/0129 * Delete applied patches * 0087/0129 * 0091/0129 * 0097/0129 * 0101/0129 * 102/129 * 0107/0129 * 0112/0129 * 0118/0129 * 0129/0129, 100% patched * fix some * server work * Protocol... (#409) * Jade v7 * Fix changed part for Jade * Formatting imports, add Lms Paster protocol * REI payloads 5/8 * Add REI support, remove unnecessary content in Jade * Rename * Make jade better * Make action work * fix action jar * Fix some protocol * Fix bot action, and entity tickCount * Fix Warden GameEventListener register on load * Fix extra Raider drop * Fix grindstone overstacking * Update Paper, and some doc * Merge * [ci skip] Update Action --------- Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
71 lines
4.5 KiB
Diff
71 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sun, 26 Jan 2025 13:58:49 +0800
|
|
Subject: [PATCH] Build changes
|
|
|
|
|
|
diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java
|
|
index 4d344559a20a0c35c181e297e81788c747363ec9..9d25c263508da5b6a027132e6cc071b675e4af44 100644
|
|
--- a/ca/spottedleaf/moonrise/paper/PaperHooks.java
|
|
+++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java
|
|
@@ -28,7 +28,7 @@ import net.minecraft.world.phys.AABB;
|
|
import java.util.List;
|
|
import java.util.function.Predicate;
|
|
|
|
-public final class PaperHooks extends BaseChunkSystemHooks implements PlatformHooks {
|
|
+public class PaperHooks extends BaseChunkSystemHooks implements PlatformHooks { // Leaves - not final
|
|
|
|
@Override
|
|
public String getBrand() {
|
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
|
index ae220a732c78ab076261f20b5a54c71d7fceb407..5dfdf76c8de5eda9a02f9a5fa1c3bada8ec7dcde 100644
|
|
--- a/net/minecraft/server/MinecraftServer.java
|
|
+++ b/net/minecraft/server/MinecraftServer.java
|
|
@@ -1192,7 +1192,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
LOGGER.info("*************************************************************************************");
|
|
LOGGER.info("This is the first time you're starting this server.");
|
|
LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
|
|
- LOGGER.info("View this and more helpful information here: https://docs.papermc.io/paper/next-steps");
|
|
+ LOGGER.info("View this and more helpful information here: https://docs.leavesmc.org/leaves/guides/next-steps"); // Leaves - change
|
|
LOGGER.info("*************************************************************************************");
|
|
}
|
|
// Paper end - Add onboarding message for initial server start
|
|
@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
|
|
@DontObfuscate
|
|
public String getServerModName() {
|
|
- return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
|
|
+ return org.leavesmc.leaves.LeavesConfig.mics.serverModName; // Leaves - Custom // Paper
|
|
}
|
|
|
|
public SystemReport fillSystemReport(SystemReport systemReport) {
|
|
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
index 97a294d2f5c1ddf0af7ffec3e1425eb329c5751b..fc9f1b1cde5516eee06d6365645386cd0e3d14ec 100644
|
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
@@ -223,9 +223,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
|
thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
|
|
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
|
|
this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
|
|
- com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
|
|
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
|
|
|
|
+ com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics // Leaves - down
|
|
+
|
|
this.setPvpAllowed(properties.pvp);
|
|
this.setFlightAllowed(properties.allowFlight);
|
|
this.setMotd(properties.motd);
|
|
diff --git a/net/minecraft/server/gui/MinecraftServerGui.java b/net/minecraft/server/gui/MinecraftServerGui.java
|
|
index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..a2b69a0cc34adb4d3da00250db8320b26d0ed697 100644
|
|
--- a/net/minecraft/server/gui/MinecraftServerGui.java
|
|
+++ b/net/minecraft/server/gui/MinecraftServerGui.java
|
|
@@ -183,7 +183,7 @@ public class MinecraftServerGui extends JComponent {
|
|
|
|
// Paper start - Add onboarding message for initial server start
|
|
private JComponent buildOnboardingPanel() {
|
|
- String onboardingLink = "https://docs.papermc.io/paper/next-steps";
|
|
+ String onboardingLink = "https://docs.leavesmc.org/leaves/guides/next-steps"; // Leaves - change
|
|
JPanel jPanel = new JPanel();
|
|
|
|
javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:");
|