From 937a8dede1ac66056dee56c166c948fb23fddcd4 Mon Sep 17 00:00:00 2001
From: Zsolt Molnar <zsolt.molnarrr@gmail.com>
Date: Sun, 28 May 2023 14:48:51 +0200
Subject: [PATCH] Update default loot table configurations, add some enchanted
 loot

---
 CHANGELOG.md                                  |  1 +
 .../java/net/paladins/config/Default.java     | 34 +++++++++++++++----
 gradle.properties                             |  2 +-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94c02b6..ad1db9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 0.9.5
 
 - Add smithing table upgrade recipes to upgrade to netherite weapons
+- 
 
 # 0.9.4
 
diff --git a/common/src/main/java/net/paladins/config/Default.java b/common/src/main/java/net/paladins/config/Default.java
index 4edbbcb..bb132a6 100644
--- a/common/src/main/java/net/paladins/config/Default.java
+++ b/common/src/main/java/net/paladins/config/Default.java
@@ -25,14 +25,21 @@ public class Default {
 
         lootConfig = new LootConfig();
         final var weapons_tier_0 = "weapons_tier_0";
-        lootConfig.item_groups.put("weapons_tier_0", new LootConfig.ItemGroup(List.of(
+        lootConfig.item_groups.put(weapons_tier_0, new LootConfig.ItemGroup(List.of(
                 Weapons.acolyte_wand.id().toString(),
                 Weapons.wooden_great_hammer.id().toString(),
                 Weapons.stone_great_hammer.id().toString(),
                 Weapons.stone_claymore.id().toString()),
                 1
-        ));
-
+        ).chance(0.5F));
+        final var weapons_golden = "weapons_golden";
+        lootConfig.item_groups.put(weapons_golden, new LootConfig.ItemGroup(List.of(
+                Weapons.golden_mace.id().toString(),
+                Weapons.golden_claymore.id().toString(),
+                Weapons.golden_great_hammer.id().toString(),
+                Weapons.holy_wand.id().toString()),
+                1
+        ).chance(0.4F).enchant());
         final var weapons_one_handed_tier_1 = "weapons_one_handed_tier_1";
         lootConfig.item_groups.put(weapons_one_handed_tier_1, new LootConfig.ItemGroup(List.of(
                 Weapons.holy_wand.id().toString(),
@@ -61,6 +68,13 @@ public class Default {
                 Weapons.diamond_great_hammer.id().toString()),
                 1
         ).chance(0.3F));
+        final var weapons_two_handed_tier_2_enchanted = "weapons_two_handed_tier_2_enchanted";
+        lootConfig.item_groups.put(weapons_two_handed_tier_2_enchanted, new LootConfig.ItemGroup(List.of(
+                Weapons.holy_staff.id().toString(),
+                Weapons.diamond_claymore.id().toString(),
+                Weapons.diamond_great_hammer.id().toString()),
+                1
+        ).chance(0.3F).enchant());
 
         final var armor_tier_1 = "armor_tier_1";
         lootConfig.item_groups.put(armor_tier_1, new LootConfig.ItemGroup(joinLists(
@@ -68,6 +82,12 @@ public class Default {
                 Armors.priestArmorSet_t1.idStrings()),
                 1
         ).chance(0.25F));
+        final var armor_tier_1_enchanted = "armor_tier_1_enchanted";
+        lootConfig.item_groups.put(armor_tier_1_enchanted, new LootConfig.ItemGroup(joinLists(
+                Armors.paladinArmorSet_t1.idStrings(),
+                Armors.priestArmorSet_t1.idStrings()),
+                1
+        ).chance(0.25F).enchant());
         final var armor_tier_2 = "armor_tier_2";
         lootConfig.item_groups.put(armor_tier_2, new LootConfig.ItemGroup(joinLists(
                 Armors.paladinArmorSet_t2.idStrings(),
@@ -76,9 +96,11 @@ public class Default {
         ).chance(0.5F));
 
 
+        List.of("minecraft:chests/ruined_portal")
+                .forEach(id -> lootConfig.loot_tables.put(id, List.of(weapons_golden)));
+
         List.of("minecraft:chests/spawn_bonus_chest",
                         "minecraft:chests/igloo_chest",
-                        "minecraft:chests/ruined_portal",
                         "minecraft:chests/shipwreck_supply",
                         "minecraft:chests/jungle_temple")
                 .forEach(id -> lootConfig.loot_tables.put(id, List.of(weapons_tier_0)));
@@ -104,13 +126,13 @@ public class Default {
                         "minecraft:chests/woodland_mansion",
                         "minecraft:chests/simple_dungeon",
                         "minecraft:chests/underwater_ruin_big.json")
-                .forEach(id -> lootConfig.loot_tables.put(id, List.of(weapons_one_handed_tier_1, armor_tier_1)));
+                .forEach(id -> lootConfig.loot_tables.put(id, List.of(weapons_one_handed_tier_1, armor_tier_1_enchanted)));
 
         List.of("minecraft:chests/end_city_treasure",
                         "minecraft:chests/bastion_treasure",
                         "minecraft:chests/ancient_city",
                         "minecraft:chests/stronghold_library")
-                .forEach(id -> lootConfig.loot_tables.put(id, List.of(weapons_two_handed_tier_2, armor_tier_2)));
+                .forEach(id -> lootConfig.loot_tables.put(id, List.of(weapons_two_handed_tier_2_enchanted, armor_tier_2)));
 
 
         worldGenConfig = new WorldGenConfig();
diff --git a/gradle.properties b/gradle.properties
index 157f721..dcb5326 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,6 +20,6 @@ gecko_mc_prefix=1.19:
 gecko_lib_version_fabric=3.1.40
 gecko_lib_version_forge=3.1.39
 tiny_config_version=2.3.2
-spell_engine_version=0.9.17+1.19
+spell_engine_version=0.9.21+1.19
 spell_power_version=0.9.12+1.19
 runes_version=0.9.7+1.19
\ No newline at end of file