fix: possessed weak shulker loot table

Closes #1172
klikli-dev · Jul 27, 2024 · f8935af · f8935af
1 parent 407341a
commit f8935af
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/src/generated/resources/data/occultism/loot_table/entities/possessed_weak_shulker.json b/src/generated/resources/data/occultism/loot_table/entities/possessed_weak_shulker.json
@@ -12,12 +12,6 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "conditions": [
-            {
-              "chance": 0.1,
-              "condition": "minecraft:random_chance"
-            }
-          ],
           "functions": [
             {
               "add": false,
@@ -30,7 +24,13 @@
             }
           ],
           "name": "minecraft:shulker_shell"
-        },
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
         {
           "type": "minecraft:item",
           "functions": [

diff --git a/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismEntityLoot.java b/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismEntityLoot.java
@@ -305,20 +305,15 @@ public LootTable.Builder weakShulkerTable(){
         return LootTable.lootTable()
                 .withPool(
                         LootPool.lootPool()
-                                .setRolls(ConstantValue.exactly(1.0F)
-                                )
-                                .add(
-                                        LootItem.lootTableItem(Items.SHULKER_SHELL)
-                                                .apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0F, 1.0F))
-                                                )
-                                                .when(LootItemRandomChanceCondition.randomChance(0.1F))
-                                )
-                                .add(
-                                        LootItem.lootTableItem(Items.CHORUS_FRUIT)
-                                                .apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0F, 3.0F))
-                                                )
-                                )
+                                .setRolls(ConstantValue.exactly(1.0F))
+                                .add(LootItem.lootTableItem(Items.SHULKER_SHELL)
+                                        .apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0F, 1.0F))))
                                 .when(LootItemRandomChanceCondition.randomChance(0.1F))
+                ) .withPool(
+                        LootPool.lootPool()
+                                .setRolls(ConstantValue.exactly(1.0F))
+                                .add(LootItem.lootTableItem(Items.CHORUS_FRUIT)
+                                        .apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0F, 3.0F))))
                 );
     }
 }