From 48a43affe28c3e08bce05cf0814628338593295c Mon Sep 17 00:00:00 2001 From: zeng-github01 Date: Thu, 14 Aug 2025 22:51:55 +0800 Subject: [PATCH 1/2] Fix disk label lost on read-only mode --- src/main/scala/li/cil/oc/server/fs/FileSystem.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala index ef3451bf9..32186fdf4 100755 --- a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala @@ -160,14 +160,18 @@ object FileSystem extends api.detail.FileSystemAPI { abstract class ItemLabel(val stack: ItemStack) extends Label - class ReadOnlyLabel(val label: String) extends Label { + class ReadOnlyLabel(private var label: String) extends Label { def setLabel(value: String) = throw new IllegalArgumentException("label is read only") def getLabel = label private final val LabelTag = Settings.namespace + "fs.label" - override def load(nbt: NBTTagCompound) {} + override def load(nbt: NBTTagCompound): Unit = { + if (nbt.hasKey(LabelTag)) { + label = nbt.getString(LabelTag) + } + } override def save(nbt: NBTTagCompound) { if (label != null) { From 9e4f2649835057e230c6bd5a4fc599b2fd1caca4 Mon Sep 17 00:00:00 2001 From: zeng-github01 Date: Thu, 14 Aug 2025 22:55:52 +0800 Subject: [PATCH 2/2] minor change --- src/main/scala/li/cil/oc/server/fs/FileSystem.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala index 32186fdf4..70d3db4a7 100755 --- a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala +++ b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala @@ -167,7 +167,7 @@ object FileSystem extends api.detail.FileSystemAPI { private final val LabelTag = Settings.namespace + "fs.label" - override def load(nbt: NBTTagCompound): Unit = { + override def load(nbt: NBTTagCompound) { if (nbt.hasKey(LabelTag)) { label = nbt.getString(LabelTag) }