Fix a crash & create in LootTableEvent

AlmostReliable · Jul 25, 2024 · 2b662d8 · 2b662d8
1 parent a71a076
commit 2b662d8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning].
 
 - /
 
+## [3.0.4] - 2024-07-25
+
+- Fix `.create` in loot tables event
+
 ## [3.0.3] - 2024-07-22
 
 - Bump kubejs version

diff --git a/example_scripts/create_loot_table.js b/example_scripts/create_loot_table.js
@@ -0,0 +1,5 @@
+LootJS.lootTables(e => {
+    e.create("lootjs:blocks/test_table", "block").createPool((pool) => {
+        pool.addEntry(LootEntry.of("minecraft:stick").limitCount(10, 32));
+    });
+});
diff --git a/src/main/java/com/almostreliable/lootjs/core/entry/ItemLootEntry.java b/src/main/java/com/almostreliable/lootjs/core/entry/ItemLootEntry.java
@@ -38,7 +38,7 @@ public ItemLootEntry(ItemStack itemStack) {
             getFunctions().setCount(ConstantValue.exactly(itemStack.getCount()));
         }
 
-        if (!itemStack.getComponents().isEmpty()) {
+        if (!itemStack.isComponentsPatchEmpty()) {
             DataComponentPatch.Builder builder = DataComponentPatch.builder();
             for (TypedDataComponent<?> component : itemStack.getComponents()) {
                 builder.set(Utils.cast(component.type()), component.value());

diff --git a/src/main/java/com/almostreliable/lootjs/mixin/ReloadableServerRegistriesMixin.java b/src/main/java/com/almostreliable/lootjs/mixin/ReloadableServerRegistriesMixin.java
@@ -18,7 +18,7 @@
 @Mixin(value = ReloadableServerRegistries.class, priority = 1337)
 public class ReloadableServerRegistriesMixin {
 
-    @Inject(method = "apply", at = @At("RETURN"))
+    @Inject(method = "apply", at = @At("HEAD"))
     private static void lootjs$runLootTableEventJS(LayeredRegistryAccess<RegistryLayer> arg, List<WritableRegistry<?>> list, CallbackInfoReturnable<LayeredRegistryAccess<RegistryLayer>> cir) {
         WritableRegistry<LootTable> registry = null;
         try {