From 7d40308cf9cdded54159b783b83149fd43f697b7 Mon Sep 17 00:00:00 2001
From: huskcasaca <100605532+huskcasaca@users.noreply.github.com>
Date: Thu, 29 Sep 2022 00:17:10 +0800
Subject: Port to 1.19.2

---
 .../keuin/kbackupfabric/notification/DistinctNotifiable.java |  4 +---
 .../kbackupfabric/notification/NotificationManager.java      | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/main/java/com/keuin/kbackupfabric/notification')

diff --git a/src/main/java/com/keuin/kbackupfabric/notification/DistinctNotifiable.java b/src/main/java/com/keuin/kbackupfabric/notification/DistinctNotifiable.java
index 4a01227..1972c4b 100644
--- a/src/main/java/com/keuin/kbackupfabric/notification/DistinctNotifiable.java
+++ b/src/main/java/com/keuin/kbackupfabric/notification/DistinctNotifiable.java
@@ -1,9 +1,7 @@
 package com.keuin.kbackupfabric.notification;
 
-import net.minecraft.network.MessageType;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
-import net.minecraft.util.Util;
 
 /**
  * Decouple from ServerPlayerEntity, in case further migration to other APIs.
@@ -34,7 +32,7 @@ public interface DistinctNotifiable {
 
             @Override
             public void notify(Text text) {
-                serverPlayerEntity.sendMessage(text, MessageType.SYSTEM, Util.NIL_UUID);
+                serverPlayerEntity.sendMessageToClient(text, true);
             }
 
             @Override
diff --git a/src/main/java/com/keuin/kbackupfabric/notification/NotificationManager.java b/src/main/java/com/keuin/kbackupfabric/notification/NotificationManager.java
index 92c119b..a2a241c 100644
--- a/src/main/java/com/keuin/kbackupfabric/notification/NotificationManager.java
+++ b/src/main/java/com/keuin/kbackupfabric/notification/NotificationManager.java
@@ -3,8 +3,8 @@ package com.keuin.kbackupfabric.notification;
 import com.keuin.kbackupfabric.metadata.BackupMetadata;
 import com.keuin.kbackupfabric.metadata.MetadataHolder;
 import com.keuin.kbackupfabric.util.DateUtil;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Style;
+import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
 import java.util.HashSet;
@@ -37,11 +37,11 @@ public class NotificationManager {
         if (MetadataHolder.hasMetadata()) {
             BackupMetadata backup = MetadataHolder.getMetadata();
             notifiable.notify(
-                    new LiteralText("The world has been restored to backup ")
-                            .append(new LiteralText("[" + backup.getBackupName() + "]").setStyle(Style.EMPTY.withColor(Formatting.GREEN)))
-                            .append(new LiteralText(" (created at "))
-                            .append(new LiteralText("[" + DateUtil.fromEpochMillis(backup.getBackupTime()) + "]").setStyle(Style.EMPTY.withColor(Formatting.GREEN)))
-                            .append(new LiteralText(")"))
+                    Text.literal("The world has been restored to backup ")
+                            .append(Text.literal("[" + backup.getBackupName() + "]").setStyle(Style.EMPTY.withColor(Formatting.GREEN)))
+                            .append(Text.literal(" (created at "))
+                            .append(Text.literal("[" + DateUtil.fromEpochMillis(backup.getBackupTime()) + "]").setStyle(Style.EMPTY.withColor(Formatting.GREEN)))
+                            .append(Text.literal(")"))
             );
         }
     }
-- 
cgit v1.2.3