DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Avoid leaving "empty" tags of fluid containers

Browse Source
This commit is contained in:
DBotThePony 2023-08-26 18:39:21 +07:00
parent 8e962f69ff
commit 16ca531a76
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt
View File

@ -41,14 +41,35 @@ class BlockMatteryFluidHandler(val onChanged: (new: FluidStack, old: FluidStack)
return FluidStack.loadFluidStackFromNBT(sub[nbtName] as? CompoundTag ?: return FluidStack.EMPTY) return FluidStack.loadFluidStackFromNBT(sub[nbtName] as? CompoundTag ?: return FluidStack.EMPTY)
} }
set(value) { set(value) {
var sub = itemStack.tagNotNull.get(BlockItem.BLOCK_ENTITY_TAG) as? CompoundTag if (value.isEmpty) {
val tag = itemStack.tag ?: return
val subTag = tag.get(BlockItem.BLOCK_ENTITY_TAG) as? CompoundTag
if (sub == null) { if (subTag == null) {
sub = CompoundTag() if (tag.isEmpty) {
itemStack.tagNotNull[BlockItem.BLOCK_ENTITY_TAG] = sub itemStack.tag = null
}
} else {
subTag.remove(nbtName)
if (subTag.isEmpty) {
tag.remove(BlockItem.BLOCK_ENTITY_TAG)
if (tag.isEmpty) {
itemStack.tag = null
}
}
}
} else {
var sub = itemStack.tagNotNull.get(BlockItem.BLOCK_ENTITY_TAG) as? CompoundTag
if (sub == null) {
sub = CompoundTag()
itemStack.tagNotNull[BlockItem.BLOCK_ENTITY_TAG] = sub
}
sub[nbtName] = value.writeToNBT(CompoundTag())
} }
sub[nbtName] = value.writeToNBT(CompoundTag())
} }
} }
} }

16
src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/ItemMatteryFluidHandler.kt
View File

@ -23,7 +23,21 @@ open class ItemMatteryFluidHandler(val itemStack: ItemStack, private val _capaci
override var fluid: FluidStack override var fluid: FluidStack
get() { return FluidStack.loadFluidStackFromNBT(itemStack.tag?.get("fluid") as? CompoundTag ?: return FluidStack.EMPTY) } get() { return FluidStack.loadFluidStackFromNBT(itemStack.tag?.get("fluid") as? CompoundTag ?: return FluidStack.EMPTY) }
set(value) { itemStack.tagNotNull["fluid"] = value.writeToNBT(CompoundTag()) } set(value) {
if (value.isEmpty) {
val tag = itemStack.tag
if (tag != null) {
tag.remove("fluid")
if (tag.isEmpty) {
itemStack.tag = null
}
}
} else {
itemStack.tagNotNull["fluid"] = value.writeToNBT(CompoundTag())
}
}
final override val capacity: Int final override val capacity: Int
get() = _capacity.asInt get() = _capacity.asInt