AriasCreations/LibAC-dart
3
0
Fork 0
Code Issues 1 Pull requests Projects 3 Releases Packages Wiki Activity Actions

Fix negative number handling for snbt parsers

Browse source
This commit is contained in:
zontreck 2025-01-22 03:12:53 -07:00
parent 18e98ca918
commit 900a5358a8
7 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/consts.dart
View file

@ -1,3 +1,4 @@
class Constants {
static const VERSION = "1.3.010625+1127";
static const VERSION = "1.3.012225+0304";
static const NBT_REVISION = "1.3.012225+0304";
}

3
lib/nbt/Stream.dart
View file

@ -537,7 +537,8 @@ class StringReader {
// Read a number (int or double)
String readNumber() {
StringBuffer result = StringBuffer();
while (canRead && (isDigit(peek()) || peek() == '.' || peek() == '-')) {
while (canRead &&
(isDigit(peek()) || peek() == '.' || peek() == '-' || peek() == "+")) {
result.write(next());
}
return result.toString();

4
lib/nbt/Tag.dart
View file

@ -73,6 +73,10 @@ enum TagType {
break;
}
if (val == "-" || val == "+") {
reader.next();
}
if (val == '{') {
ret = TagType.Compound; // Detected a CompoundTag
reader.next(); // Consume '{'

9
lib/nbt/impl/DoubleTag.dart
View file

@ -1,3 +1,5 @@
import 'package:intl/intl.dart';
import '../Stream.dart';
import '../Tag.dart';
@ -41,13 +43,16 @@ class DoubleTag extends Tag {
@override
void prettyPrint(int indent, bool recurse) {
NumberFormat nf = NumberFormat("###.##", "en_US");
print(
"${"".padLeft(indent, '\t')}${Tag.getCanonicalName(getTagType())}: $value");
"${"".padLeft(indent, '\t')}${Tag.getCanonicalName(getTagType())}: ${nf.format(value)}");
}
@override
void writeStringifiedValue(StringBuilder builder, int indent, bool isList) {
builder.append("${isList ? "".padLeft(indent, '\t') : ""}${value}d");
NumberFormat nf = NumberFormat("###.##", "en_US");
builder.append(
"${isList ? "".padLeft(indent, '\t') : ""}${nf.format(value)}d");
}
@override

9
lib/nbt/impl/FloatTag.dart
View file

@ -1,3 +1,5 @@
import 'package:intl/intl.dart';
import '../Stream.dart';
import '../Tag.dart';
@ -40,13 +42,16 @@ class FloatTag extends Tag {
@override
void prettyPrint(int indent, bool recurse) {
NumberFormat nf = NumberFormat("###.##", "en_US");
print(
"${"".padLeft(indent, '\t')}${Tag.getCanonicalName(getTagType())}: $value");
"${"".padLeft(indent, '\t')}${Tag.getCanonicalName(getTagType())}: ${nf.format(value)}");
}
@override
void writeStringifiedValue(StringBuilder builder, int indent, bool isList) {
builder.append("${isList ? "".padLeft(indent, '\t') : ""}${value}f");
NumberFormat nf = NumberFormat("###.##", "en_US");
builder.append(
"${isList ? "".padLeft(indent, '\t') : ""}${nf.format(value)}f");
}
@override

3
pubspec.yaml
View file

@ -1,6 +1,6 @@
name: libac_dart
description: "Aria's Creations code library"
version: 1.3.010625+1127
version: 1.3.012225+0304
homepage: "https://zontreck.com"
environment:
@ -11,6 +11,7 @@ dependencies:
crypto: ^3.0.3
dio: ^5.5.0+1
encrypt: ^5.0.3
intl: ^0.20.1
# path: ^1.8.0
dev_dependencies:

8
test/nbt_test.dart
View file

@ -144,4 +144,12 @@ void main() {
CompoundTag CT =
await SnbtIo.readFromFile("test/displayLoreTest.snbt") as CompoundTag;
}, timeout: Timeout(Duration(minutes: 10)));
test("Test negative numbers from SNBT", () async {
String snbt = "{test: -932.0d}";
CompoundTag ct = await SnbtIo.readFromString(snbt) as CompoundTag;
expect(ct["test"]!.getTagType(), TagType.Double);
expect(ct["test"]!.asDouble(), -932.0);
});
}