From bfc9d61bcd424d1a73feb7696f95f36434088c8b Mon Sep 17 00:00:00 2001 From: B1n_ry Date: Mon, 11 Mar 2024 01:05:09 +0100 Subject: [PATCH] Changed trinket default drop rule to be the default drop rule for trinkets --- CHANGELOG.md | 7 ++++++- src/main/java/com/b1n_ry/yigd/Yigd.java | 2 +- src/main/java/com/b1n_ry/yigd/compat/TrinketsCompat.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcb5fe8..bf901eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,13 @@ ### Fixes * Fixed mod clearing player inventory when trying to claim a grave that had generated before removing a compatible inventory mod -* Improved compat and fixed crash with Beans Backpacks +* Fixed crash with Beans Backpacks * No longer sending error message to player when claiming the grave by breaking it +* Default trinket drop rule will now actually be default + +### Changes +* Improved compatibility with Beans Backpacks, by dropping the backpack instead of the +items inside it when it's supposed to be dropped --- diff --git a/src/main/java/com/b1n_ry/yigd/Yigd.java b/src/main/java/com/b1n_ry/yigd/Yigd.java index 5ce23b9..daa41e2 100644 --- a/src/main/java/com/b1n_ry/yigd/Yigd.java +++ b/src/main/java/com/b1n_ry/yigd/Yigd.java @@ -78,7 +78,7 @@ public void onInitialize() { Registry.register(Registries.ENCHANTMENT, new Identifier(MOD_ID, "death_sight"), DEATH_SIGHT_ENCHANTMENT); } if (config.extraFeatures.deathScroll.enabled) { - DEATH_SCROLL_ITEM = new DeathScrollItem(new FabricItemSettings()); + DEATH_SCROLL_ITEM = new DeathScrollItem(new FabricItemSettings().requires()); Registry.register(Registries.ITEM, new Identifier(MOD_ID, "death_scroll"), DEATH_SCROLL_ITEM); } if (config.extraFeatures.graveKeys.enabled) { diff --git a/src/main/java/com/b1n_ry/yigd/compat/TrinketsCompat.java b/src/main/java/com/b1n_ry/yigd/compat/TrinketsCompat.java index 574ccd8..c97a93a 100644 --- a/src/main/java/com/b1n_ry/yigd/compat/TrinketsCompat.java +++ b/src/main/java/com/b1n_ry/yigd/compat/TrinketsCompat.java @@ -93,7 +93,7 @@ private DropRule convertDropRule(TrinketEnums.DropRule dropRule) { return switch (dropRule) { case KEEP -> DropRule.KEEP; case DESTROY -> DropRule.DESTROY; - default -> DropRule.PUT_IN_GRAVE; + default -> YigdConfig.getConfig().compatConfig.defaultTrinketsDropRule; }; }