Ver Fonte

bugfixes

Kajetan Johannes Hammerle há 2 anos atrás
pai
commit
4b163a776b

+ 7 - 3
src/main/java/me/km/snuviscript/commands/BlockCommands.java

@@ -148,9 +148,13 @@ public class BlockCommands {
             l.getWorld().setBlockState(l.getBlockPos(), state, flag);
         });
         sm.registerFunction("block.newstate", (sc, in) -> {
-            BlockStateParser parser =
-                    new BlockStateParser(new StringReader(in[0].getString(sc)), true);
-            return parser.parse(true).getState();
+            try {
+                BlockStateParser parser =
+                        new BlockStateParser(new StringReader(in[0].getString(sc)), true);
+                return parser.parse(true).getState();
+            } catch(Exception e) {
+                return null;
+            }
         });
         sm.registerConsumer("block.setstate", (sc, in) -> {
             Location l = (Location) in[0].get(sc);

+ 2 - 1
src/main/resources/data/km/tags/items/axe.json

@@ -6,7 +6,8 @@
         "minecraft:iron_axe",
         "minecraft:golden_axe",
         "minecraft:diamond_axe",
+        "minecraft:netherite_axe",
         "km:copper_axe",
         "km:bronze_axe"
     ]
-}
+}

+ 2 - 1
src/main/resources/data/km/tags/items/boots.json

@@ -5,7 +5,8 @@
         "minecraft:iron_boots",
         "minecraft:golden_boots",
         "minecraft:diamond_boots",
+        "minecraft:netherite_boots",
         "km:copper_boots",
         "km:bronze_boots"
     ]
-}
+}

+ 2 - 1
src/main/resources/data/km/tags/items/chestplate.json

@@ -5,7 +5,8 @@
         "minecraft:iron_chestplate",
         "minecraft:golden_chestplate",
         "minecraft:diamond_chestplate",
+        "minecraft:netherite_chestplate",
         "km:copper_chestplate",
         "km:bronze_chestplate"
     ]
-}
+}

+ 2 - 1
src/main/resources/data/km/tags/items/helmet.json

@@ -6,7 +6,8 @@
         "minecraft:golden_helmet",
         "minecraft:diamond_helmet",
         "minecraft:turtle_helmet",
+        "minecraft:netherite_helmet",
         "km:copper_helmet",
         "km:bronze_helmet"
     ]
-}
+}

+ 2 - 1
src/main/resources/data/km/tags/items/hoe.json

@@ -6,7 +6,8 @@
         "minecraft:iron_hoe",
         "minecraft:golden_hoe",
         "minecraft:diamond_hoe",
+        "minecraft:netherite_hoe",
         "km:copper_hoe",
         "km:bronze_hoe"
     ]
-}
+}

+ 2 - 1
src/main/resources/data/km/tags/items/leggings.json

@@ -5,7 +5,8 @@
         "minecraft:iron_leggings",
         "minecraft:golden_leggings",
         "minecraft:diamond_leggings",
+        "minecraft:netherite_leggings",
         "km:copper_leggings",
         "km:bronze_leggings"
     ]
-}
+}

+ 2 - 1
src/main/resources/data/km/tags/items/pickaxe.json

@@ -6,7 +6,8 @@
         "minecraft:iron_pickaxe",
         "minecraft:golden_pickaxe",
         "minecraft:diamond_pickaxe",
+        "minecraft:netherite_pickaxe",
         "km:copper_pickaxe",
         "km:bronze_pickaxe"
     ]
-}
+}

+ 2 - 1
src/main/resources/data/km/tags/items/shovel.json

@@ -6,7 +6,8 @@
         "minecraft:iron_shovel",
         "minecraft:golden_shovel",
         "minecraft:diamond_shovel",
+        "minecraft:netherite_shovel",
         "km:copper_shovel",
         "km:bronze_shovel"
     ]
-}
+}

+ 2 - 1
src/main/resources/data/km/tags/items/sword.json

@@ -6,7 +6,8 @@
         "minecraft:iron_sword",
         "minecraft:golden_sword",
         "minecraft:diamond_sword",
+        "minecraft:netherite_sword",
         "km:copper_sword",
         "km:bronze_sword"
     ]
-}
+}