Fix matchCustomCondition and jsonFunction using wrong codec.

AlmostReliable · Aug 24, 2024 · 52d1039 · 52d1039
1 parent 29ac487
commit 52d1039
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning].
 # Unreleased
 
 - Fix `print` method for loot tables. Will now print the entries correctly.
+- Fix `matchCustomCondition` and `jsonFunction` using wrong codec.
 
 ## [3.1.0] - 2024-08-03
 

diff --git a/example_scripts/custom_condition.js b/example_scripts/custom_condition.js
@@ -0,0 +1,18 @@
+LootJS.lootTables((event) => {
+    event.getBlockTable('minecraft:coal_ore')
+            .clear()
+            .firstPool()
+            .addEntry(LootEntry.of('minecraft:diamond').matchCustomCondition({
+                condition: "minecraft:match_tool",
+                predicate: {
+                    enchantments: [
+                        {
+                            enchantment: "minecraft:silk_touch",
+                            levels: {
+                                min: 1,
+                            },
+                        },
+                    ],
+                },
+            }));
+})
diff --git a/src/main/java/com/almostreliable/lootjs/loot/LootConditionsContainer.java b/src/main/java/com/almostreliable/lootjs/loot/LootConditionsContainer.java
@@ -234,7 +234,7 @@ default C matchAllOf(LootItemCondition... conditions) {
 
     default C matchCustomCondition(JsonObject json) {
         var regOps = RegistryOps.create(JsonOps.INSTANCE, LootJS.lookup());
-        var condition = LootItemCondition.CODEC.parse(regOps, json).getOrThrow().value();
+        var condition = LootItemCondition.DIRECT_CODEC.parse(regOps, json).getOrThrow();
         return addCondition(condition);
     }
 

diff --git a/src/main/java/com/almostreliable/lootjs/loot/LootFunctionsContainer.java b/src/main/java/com/almostreliable/lootjs/loot/LootFunctionsContainer.java
@@ -154,7 +154,7 @@ default F toggleTooltips(Map<String, Boolean> toggles) {
 
     default F jsonFunction(JsonObject json) {
         var regOps = RegistryOps.create(JsonOps.INSTANCE, LootJS.lookup());
-        LootItemFunction function = LootItemFunctions.CODEC.parse(regOps, json).getOrThrow().value();
+        LootItemFunction function = LootItemFunctions.ROOT_CODEC.parse(regOps, json).getOrThrow();
         return addFunction(function);
     }