Implement native fluid-state JSON decoding and encoding

This commit is contained in:
Ludovic Marie
2026-10-06 12:32:23 +02:00
parent 7984238b3e
commit 27cbdfdbde
8 changed files with 173 additions and 31 deletions
@@ -88,6 +88,23 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
blocks.block(fluid).0
)?;
}
for line in fs::read_to_string(dir.join("codec-inputs.txt"))?.lines() {
match FluidState::from_json(line) {
Err(_) => writeln!(out, "codec error")?,
Ok(state) => {
writeln!(
out,
"codec {} {} {} {} {}",
state.kind().name(),
state.amount(),
state.falling(),
state.is_source(),
blocks.block(state).0
)?;
writeln!(out, "encoded {}", state.to_json()?)?;
}
}
}
for line in fs::read_to_string(dir.join("inputs.txt"))?.lines() {
let f: Value = serde_json::from_str(line)?;
let fluid = fluids
+66
View File
@@ -61,6 +61,72 @@ pub struct FluidState {
falling: bool,
}
impl FluidState {
/// Native fluid states require an object; properties decode leniently.
pub fn from_json(json: &str) -> io::Result<Self> {
let value: serde_json::Value =
serde_json::from_str(json).map_err(|e| invalid(e.to_string()))?;
let name = value
.get("id")
.and_then(serde_json::Value::as_str)
.ok_or_else(|| invalid("missing fluid identifier"))?;
let (namespace, path) = name.split_once(':').unwrap_or(("minecraft", name));
let name = format!(
"{}:{path}",
if namespace.is_empty() {
"minecraft"
} else {
namespace
}
);
let kind =
FluidKind::from_name(&name).ok_or_else(|| invalid("unknown fluid identifier"))?;
if kind == FluidKind::Empty {
return Ok(Self::EMPTY);
}
let flowing = matches!(kind, FluidKind::FlowingWater | FluidKind::FlowingLava);
let mut state = Self {
kind,
amount: if flowing { 1 } else { 8 },
falling: true,
};
if let Some(properties) = value
.get("properties")
.and_then(serde_json::Value::as_object)
{
if let Some(value) = properties
.get("falling")
.and_then(serde_json::Value::as_str)
{
match value {
"true" => state.falling = true,
"false" => state.falling = false,
_ => {}
}
}
if flowing {
if let Some(value) = properties
.get("level")
.and_then(serde_json::Value::as_str)
.and_then(crate::registry::java_integer)
.filter(|v| (1..=8).contains(v))
{
state.amount = value as u8;
}
}
}
Ok(state)
}
pub fn to_json(self) -> io::Result<String> {
let mut value = serde_json::json!({"id": self.kind.name()});
if self.kind != FluidKind::Empty {
let mut properties = serde_json::json!({"falling": self.falling.to_string()});
if !self.is_source() {
properties["level"] = self.amount.to_string().into();
}
value["properties"] = properties;
}
serde_json::to_string(&value).map_err(|e| invalid(e.to_string()))
}
pub const EMPTY: Self = Self {
kind: FluidKind::Empty,
amount: 0,
+1
View File
@@ -3,6 +3,7 @@
mod json;
use crate::{DATA_VERSION, chunk::BlockState, compression::invalid, nbt::Tag};
pub use json::BlockStateJsonCodec;
pub(crate) use json::java_integer;
use std::{
collections::{BTreeMap, BTreeSet},
io,
+1 -1
View File
@@ -103,7 +103,7 @@ impl<'a> BlockStateJsonCodec<'a> {
}
}
fn java_integer(text: &str) -> Option<i32> {
pub(crate) fn java_integer(text: &str) -> Option<i32> {
let (negative, text) = if let Some(text) = text.strip_prefix('-') {
(true, text)
} else {