mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-20 15:29:15 +00:00
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@45774b4 apply the rest of the unapplied patches PurpurMC/Purpur@dd826a3 Updated Upstream (Paper) PurpurMC/Purpur@778995d Updated Upstream (Paper) PurpurMC/Purpur@9ff84cb Updated Upstream (Paper) PurpurMC/Purpur@bd49055 [ci skip] replace paper with purpur in log message PurpurMC/Purpur@a122fd7 Updated Upstream (Paper) PurpurMC/Purpur@783acfe Updated Upstream (Paper) PurpurMC/Purpur@b5f1c48 Updated Upstream (Paper)
40 lines
2.8 KiB
Diff
40 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Fri, 21 Jun 2024 04:19:11 +0300
|
|
Subject: [PATCH] Parchment: Make FixLight use action bar
|
|
|
|
Original project: https://github.com/ProjectEdenGG/Parchment
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
|
|
index 85950a1aa732ab8c01ad28bec9e0de140e1a172e..a6df6eeeda88c50894e03742e25aa5652a770ba9 100644
|
|
--- a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
|
|
+++ b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
|
|
@@ -95,17 +95,20 @@ public final class FixLightCommand implements PaperSubcommand {
|
|
((StarLightLightingProvider)lightengine).starlight$serverRelightChunks(chunks,
|
|
(final ChunkPos chunkPos) -> {
|
|
++relitChunks[0];
|
|
- sender.getBukkitEntity().sendMessage(text().color(DARK_AQUA).append(
|
|
- text("Relit chunk ", BLUE), text(chunkPos.toString()),
|
|
- text(", progress: ", BLUE), text(ONE_DECIMAL_PLACES.get().format(100.0 * (double) (relitChunks[0]) / (double) pending[0]) + "%")
|
|
- ));
|
|
+ sender.getBukkitEntity().sendActionBar(text().color(DARK_AQUA).append(
|
|
+ text("Relighting Chunks: ", DARK_AQUA), text(chunkPos.toString()),
|
|
+ text(" " + relitChunks[0], net.kyori.adventure.text.format.NamedTextColor.YELLOW),
|
|
+ text("/", DARK_AQUA),
|
|
+ text(pending[0] + " ", net.kyori.adventure.text.format.NamedTextColor.YELLOW),
|
|
+ text("(" + (int) (Math.round(100.0 * (double) (relitChunks[0]) / (double) pending[0])) + "%)", net.kyori.adventure.text.format.NamedTextColor.YELLOW)
|
|
+ )); // DivineMC // Parchment - Make FixLight use action bar
|
|
},
|
|
(final int totalRelit) -> {
|
|
final long end = System.nanoTime();
|
|
sender.getBukkitEntity().sendMessage(text().color(DARK_AQUA).append(
|
|
- text("Relit ", BLUE), text(totalRelit),
|
|
- text(" chunks. Took ", BLUE), text(ONE_DECIMAL_PLACES.get().format(1.0e-6 * (end - start)) + "ms")
|
|
- ));
|
|
+ text("Relit ", DARK_AQUA), text(totalRelit, net.kyori.adventure.text.format.NamedTextColor.YELLOW),
|
|
+ text(" chunks. Took ", DARK_AQUA), text(ONE_DECIMAL_PLACES.get().format(1.0e-6 * (end - start)) + "ms", net.kyori.adventure.text.format.NamedTextColor.YELLOW)
|
|
+ )); // DivineMC // Parchment - Make FixLight use action bar
|
|
if (done != null) {
|
|
done.run();
|
|
}
|