More fix found by AI

Author: james58899

src/main/java/org/spongepowered/common/mixin/realtime/entity/player/ItemCooldownManagerMixin_RealTime.java

@@ -60,7 +60,7 @@ public abstract class ItemCooldownManagerMixin_RealTime {
 
     @Redirect(method = "tick",
         at = @At(value = "FIELD", target = "Lnet/minecraft/world/item/ItemCooldowns;tickCount:I", opcode = Opcodes.PUTFIELD, ordinal = 0))
-    private void realTimeImpl$adjustForRealTimeExperiencePickUpDelay(final ItemCooldowns self, final int modifier) {
+    private void realTimeImpl$adjustForRealTimeItemCooldown(final ItemCooldowns self, final int modifier) {
         final long currentNanos = System.nanoTime();
         long realTimeTicks = Math.max(1, (currentNanos - lastTickNanos) / 50000000);
         lastTickNanos = currentNanos;

src/main/kotlin/one/oktw/galaxy/block/CustomBlockHelper.kt

@@ -51,8 +51,9 @@ object CustomBlockHelper {
             // Create block entity and read data
             val entity = item.getBlock().createBlockEntity(pos)
             stack2.get(DataComponents.BLOCK_ENTITY_DATA)?.let {
-                val reporter = ProblemReporter.ScopedCollector(entity.problemPath(), LogUtils.getLogger())
-                entity.readCopyableData(TagValueInput.create(reporter, world.registryAccess(), it.copyTagWithoutId()))
+                ProblemReporter.ScopedCollector(entity.problemPath(), LogUtils.getLogger()).use { reporter ->
+                    entity.readCopyableData(TagValueInput.create(reporter, world.registryAccess(), it.copyTagWithoutId()))
+                }
             }
             entity.applyComponentsFromItemStack(stack2)
             // Set facing

src/main/kotlin/one/oktw/galaxy/block/entity/TestGuiBlockEntity.kt

@@ -59,7 +59,7 @@ class TestGuiBlockEntity(type: BlockEntityType<*>, pos: BlockPos, modelItem: Ite
     ).createItemStack()
     private val closeAllButton = Gui(
         GuiModelBuilder().withButton(GuiButton.BUTTON).withIcon(GuiIcon.CROSS_MARK).build(),
-        Component.nullToEmpty("CLOSE ALL")
+        Component.literal("CLOSE ALL")
     ).createItemStack()
     private val plusButton = Gui(
         GuiModelBuilder().withButton(GuiButton.BUTTON).withIcon(GuiIcon.PLUS_SIGN).build()
@@ -69,7 +69,7 @@ class TestGuiBlockEntity(type: BlockEntityType<*>, pos: BlockPos, modelItem: Ite
     private val inventory = NonNullList.withSize(3 * 9, ItemStack.EMPTY)
 
     private val gui = GUI.Builder(MenuType.GENERIC_9x6)
-        .setTitle(Component.nullToEmpty("Test GUI"))
+        .setTitle(Component.literal("Test GUI"))
         .setBackground("A", ResourceLocation.fromNamespaceAndPath("galaxy", "gui_font/container_layout/test_gui"))
         .blockEntity(this)
         .apply {
@@ -93,7 +93,7 @@ class TestGuiBlockEntity(type: BlockEntityType<*>, pos: BlockPos, modelItem: Ite
         }
 
     private val gui2 = GUI.Builder(MenuType.GENERIC_9x4)
-        .setTitle(Component.nullToEmpty("Test GUI2"))
+        .setTitle(Component.literal("Test GUI2"))
         .setBackground("B", ResourceLocation.fromNamespaceAndPath("galaxy", "gui_font/container_layout/test_gui"))
         .blockEntity(this)
         .apply {

src/main/kotlin/one/oktw/galaxy/command/commands/Join.kt

@@ -80,15 +80,15 @@ class Join : Command, CoroutineScope by CoroutineScope(Dispatchers.Default + Sup
     private fun execute(source: CommandSourceStack, collection: Collection<NameAndId>): Int {
         val sourcePlayer = source.playerOrException
         if (!lock.getOrPut(sourcePlayer) { Mutex() }.tryLock()) {
-            source.sendSuccess({ Component.nullToEmpty("請稍後...") }, false)
+            source.sendSuccess({ Component.literal("請稍後...") }, false)
             return com.mojang.brigadier.Command.SINGLE_SUCCESS
         }
 
         val targetPlayer = collection.first()
 
         ServerPlayNetworking.send(sourcePlayer, ProxyAPIPayload(CreateGalaxy(targetPlayer.id)))
         source.sendSuccess(
-            { Component.nullToEmpty(if (sourcePlayer.gameProfile.id == targetPlayer.id) "正在加入您的星系" else "正在加入 ${targetPlayer.name} 的星系") },
+            { Component.literal(if (sourcePlayer.gameProfile.id == targetPlayer.id) "正在加入您的星系" else "正在加入 ${targetPlayer.name} 的星系") },
             false
         )
 
@@ -102,17 +102,17 @@ class Join : Command, CoroutineScope by CoroutineScope(Dispatchers.Default + Sup
                 if (data.uuid != targetPlayer.id) return
 
                 when (data.stage) {
-                    Queue -> sourcePlayer.displayClientMessage(Component.nullToEmpty("正在等待星系載入"), false)
-                    Creating -> sourcePlayer.displayClientMessage(Component.nullToEmpty("星系載入中..."), false)
-                    Starting -> sourcePlayer.displayClientMessage(Component.nullToEmpty("星系正在啟動請稍後..."), false)
+                    Queue -> sourcePlayer.displayClientMessage(Component.literal("正在等待星系載入"), false)
+                    Creating -> sourcePlayer.displayClientMessage(Component.literal("星系載入中..."), false)
+                    Starting -> sourcePlayer.displayClientMessage(Component.literal("星系正在啟動請稍後..."), false)
                     Started -> {
-                        sourcePlayer.displayClientMessage(Component.nullToEmpty("星系已載入！"), false)
+                        sourcePlayer.displayClientMessage(Component.literal("星系已載入！"), false)
                         lock[sourcePlayer]?.unlock()
                         lock.remove(sourcePlayer)
                     }
 
                     Failed -> {
-                        sourcePlayer.displayClientMessage(Component.nullToEmpty("星系載入失敗，請聯絡開發團隊！"), false)
+                        sourcePlayer.displayClientMessage(Component.literal("星系載入失敗，請聯絡開發團隊！"), false)
                         lock[sourcePlayer]?.unlock()
                         lock.remove(sourcePlayer)
                     }

src/main/kotlin/one/oktw/galaxy/command/commands/admin/Creative.kt

@@ -54,7 +54,7 @@ class Creative {
         val itemBrowser = CustomItemBrowser()
         val inventory = SimpleContainer(6 * 3)
         return GUI.Builder(MenuType.GENERIC_9x3)
-            .setTitle(Component.nullToEmpty("Galaxy"))
+            .setTitle(Component.literal("Galaxy"))
             .setBackground("A", ResourceLocation.fromNamespaceAndPath("galaxy", "gui_font/container_layout/ht_crafting_table"))
             .apply {
                 var i = 0

src/main/kotlin/one/oktw/galaxy/command/commands/admin/RegisterBlock.kt

@@ -59,7 +59,7 @@ class RegisterBlock {
 
                 it.source.level.removeBlockEntity(blockPos)
                 it.source.level.setBlockEntity(block.createBlockEntity(blockPos))
-                it.source.sendSuccess({ Component.nullToEmpty("Registered block at ${blockPos.x}, ${blockPos.y}, ${blockPos.z} to ${block.identifier}") }, true)
+                it.source.sendSuccess({ Component.literal("Registered block at ${blockPos.x}, ${blockPos.y}, ${blockPos.z} to ${block.identifier}") }, true)
 
                 return@executes Command.SINGLE_SUCCESS
             }

src/main/kotlin/one/oktw/galaxy/gui/GUISBackStackManager.kt

@@ -26,10 +26,12 @@ import kotlinx.coroutines.runBlocking
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.player.Player
 import one.oktw.galaxy.util.MinecraftAsyncExecutor
+import java.lang.ref.WeakReference
 import java.util.concurrent.ConcurrentLinkedDeque
 
-class GUISBackStackManager(private val player: ServerPlayer) :
+class GUISBackStackManager(player: ServerPlayer) :
     CoroutineScope by CoroutineScope(MinecraftAsyncExecutor(player.level().server).asCoroutineDispatcher()) {
+    private val player = WeakReference(player)
     private val stack = ConcurrentLinkedDeque<GUI>()
 
     companion object {
@@ -46,6 +48,7 @@ class GUISBackStackManager(private val player: ServerPlayer) :
     }
 
     fun open(gui: GUI) {
+        val player = player.get() ?: return
         gui.onClose { this.closeCallback(gui, it) }
         stack.offerLast(gui)
         if (player.level().server.isSameThread) {
@@ -57,7 +60,7 @@ class GUISBackStackManager(private val player: ServerPlayer) :
     }
 
     private fun closeCallback(gui: GUI, player: Player) {
-        if (player == this.player && gui == stack.lastOrNull()) {
+        if (player == this.player.get() && gui == stack.lastOrNull()) {
             stack.pollLast() // Remove closed
 
             // Delay 1 tick to workaround open GUI on close callback

src/main/kotlin/one/oktw/galaxy/item/Gui.kt

@@ -32,5 +32,5 @@ class Gui(customModelData: CustomModelData, private val name: Component? = null)
         hideTooltip = name == null
     ) {
 
-    override fun getName(): Component = name ?: Component.nullToEmpty("")
+    override fun getName(): Component = name ?: Component.empty()
 }