Allow two variations of syntax in fromString (#96)

* Allow two variations of syntax in fromString * Added comments to show differences between the variations
PrismarineJS · Mar 17, 2024 · 52fda55 · 52fda55
1 parent 38e8e87
commit 52fda55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -248,9 +248,12 @@ function provider (registry, { Biome, version }) {
       if (str.startsWith('minecraft:')) str = str.substring(10)
       const name = str.split('[', 1)[0]
       const propertiesStr = str.slice(name.length + 1, -1).split(',')
-      if (version.type === 'pc') {
+      if (!str.includes('["')) {
+        // Example state: `minecraft:candle[lit=true]` -> candle, {lit: "true"}
         return Block.fromProperties(name, Object.fromEntries(propertiesStr.map(property => property.split('='))), biomeId)
-      } else if (version.type === 'bedrock') {
+      } else {
+        // Kept for backwards compatibility
+        // Example state: `minecraft:candle["lit":true]` -> candle, {lit: 1}
         return Block.fromProperties(name, Object.fromEntries(propertiesStr.map(property => {
           const [key, value] = property.split(':')
           return [key.slice(1, -1), value.startsWith('"') ? value.slice(1, -1) : { true: 1, false: 0 }[value] ?? parseInt(value)]

diff --git a/test/basic.test.js b/test/basic.test.js
@@ -168,6 +168,7 @@ describe('fromString', () => {
   const versions = {
     1.18: 'minecraft:candle[lit=true]',
     'pe_1.18.0': 'minecraft:candle["lit":true]',
+    1.19: 'minecraft:candle["lit":true]',
     '1.20': 'minecraft:candle[lit=true]'
   }
   for (const [version, str] of Object.entries(versions)) {