From b60d5bcc554fba076bbe1b52127cb7aec37ad244 Mon Sep 17 00:00:00 2001
From: copygirl <copygirl@mcft.net>
Date: Wed, 20 Jul 2022 11:12:16 +0200
Subject: [PATCH] Cleanup and Reliquary mob charms

---
 config/jei/blacklist.cfg                      | 25 +++++++++++++++++++
 kubejs/server_scripts/eccentric_tome.js       |  1 -
 kubejs/server_scripts/harvest_moon_crops.js   | 13 ----------
 .../removal/reliquary_mob_charms.js           | 11 ++++++++
 4 files changed, 36 insertions(+), 14 deletions(-)
 delete mode 100644 kubejs/server_scripts/harvest_moon_crops.js
 create mode 100644 kubejs/server_scripts/removal/reliquary_mob_charms.js

diff --git a/config/jei/blacklist.cfg b/config/jei/blacklist.cfg
index 2f9dce0..46cd4fb 100644
--- a/config/jei/blacklist.cfg
+++ b/config/jei/blacklist.cfg
@@ -1889,6 +1889,22 @@ quark:shiba_spawn_egg
 quark:stoneling_spawn_egg
 quark:toretoise_spawn_egg
 quark:wraith_spawn_egg
+reliquary:mob_charm
+reliquary:mob_charm_belt
+reliquary:mob_charm_fragment
+reliquary:mob_charm_fragment:{entity:"alexsmobs:bone_serpent_part"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:bone_serpent"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:crimson_mosquito"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:dropbear"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:guster"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:mimicube"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:rocky_roller"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:skelewag"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:soul_vulture"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:straddler"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:void_worm_part"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:void_worm"}
+reliquary:mob_charm_fragment:{entity:"alexsmobs:warped_mosco"}
 reliquary:mob_charm_fragment:{entity:"ars_elemental:air_mage"}
 reliquary:mob_charm_fragment:{entity:"ars_elemental:earth_mage"}
 reliquary:mob_charm_fragment:{entity:"ars_elemental:fire_mage"}
@@ -1913,9 +1929,17 @@ reliquary:mob_charm_fragment:{entity:"creeperoverhaul:savannah_creeper"}
 reliquary:mob_charm_fragment:{entity:"creeperoverhaul:snowy_creeper"}
 reliquary:mob_charm_fragment:{entity:"creeperoverhaul:spruce_creeper"}
 reliquary:mob_charm_fragment:{entity:"creeperoverhaul:swamp_creeper"}
+reliquary:mob_charm_fragment:{entity:"minecraft:blaze"}
 reliquary:mob_charm_fragment:{entity:"minecraft:ghast"}
 reliquary:mob_charm_fragment:{entity:"minecraft:giant"}
 reliquary:mob_charm_fragment:{entity:"minecraft:illusioner"}
+reliquary:mob_charm_fragment:{entity:"minecraft:zombie"}
+reliquary:mob_charm_fragment:{entity:"nourished_end:cerulean_anglerfish"}
+reliquary:mob_charm_fragment:{entity:"nourished_end:flarebug"}
+reliquary:mob_charm_fragment:{entity:"nourished_end:giant_isopod"}
+reliquary:mob_charm_fragment:{entity:"nourished_end:isopod"}
+reliquary:mob_charm_fragment:{entity:"nourished_end:radjelly"}
+reliquary:mob_charm_fragment:{entity:"nourished_end:ringling"}
 reliquary:mob_charm_fragment:{entity:"quark:forgotten"}
 reliquary:mob_charm_fragment:{entity:"quark:wraith"}
 reliquary:mob_charm_fragment:{entity:"stalwart_dungeons:awful_ghast"}
@@ -2011,6 +2035,7 @@ reliquary:mob_charm:{entity:"creeperoverhaul:spruce_creeper"}
 reliquary:mob_charm:{entity:"creeperoverhaul:swamp_creeper"}
 reliquary:mob_charm:{entity:"minecraft:ghast"}
 reliquary:mob_charm:{entity:"minecraft:giant"}
+reliquary:mob_charm:{entity:"minecraft:hoglin"}
 reliquary:mob_charm:{entity:"minecraft:illusioner"}
 reliquary:mob_charm:{entity:"quark:forgotten"}
 reliquary:mob_charm:{entity:"quark:wraith"}
diff --git a/kubejs/server_scripts/eccentric_tome.js b/kubejs/server_scripts/eccentric_tome.js
index 34420fa..4b4f393 100644
--- a/kubejs/server_scripts/eccentric_tome.js
+++ b/kubejs/server_scripts/eccentric_tome.js
@@ -9,7 +9,6 @@ let FILLED_ECCENTRIC_TOME = Item.of("eccentrictome:tome", '{'
     + 'immersiveengineering:{0:{Count:1b,id:"immersiveengineering:manual"}},'
     + 'littlelogistics:{0:{Count:1b,id:"patchouli:guide_book",tag:{"patchouli:book":"littlelogistics:guide"}}},'
     + 'malum:{0:{Count:1b,id:"malum:encyclopedia_arcana"}},'
-    + 'pneumaticcraft:{0:{Count:1b,id:"patchouli:guide_book",tag:{"patchouli:book":"pneumaticcraft:book"}}},'
     + 'tconstruct:{'
       + '0:{Count:1b,id:"tconstruct:tinkers_gadgetry"},'
       + '1:{Count:1b,id:"tconstruct:mighty_smelting"},'
diff --git a/kubejs/server_scripts/harvest_moon_crops.js b/kubejs/server_scripts/harvest_moon_crops.js
deleted file mode 100644
index c56b882..0000000
--- a/kubejs/server_scripts/harvest_moon_crops.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// priority: 0
-
-onEvent("item.tags", event => {
-  event.add("enhancedcelestials:harvest_moon_crops", [
-
-    "farmersdelight:cabbage",
-    "farmersdelight:onion",
-    "farmersdelight:rice_panicle",
-    "farmersdelight:rice",
-    "farmersdelight:tomato"
-
-  ]);
-});
diff --git a/kubejs/server_scripts/removal/reliquary_mob_charms.js b/kubejs/server_scripts/removal/reliquary_mob_charms.js
new file mode 100644
index 0000000..e21df05
--- /dev/null
+++ b/kubejs/server_scripts/removal/reliquary_mob_charms.js
@@ -0,0 +1,11 @@
+// priority: 0
+
+onEvent("recipes", event => {
+  // These recipes appear to be dynamic and can't be removed through KubeJS.
+  event.remove({ output: "reliquary:mob_charm_belt" });
+  event.remove({ id: /^reliquary:mob_charm/ });
+  event.remove({ id: /^reliquary:reliquary\.fragment_to_spawn_egg/ });
+
+  // Mob Charm Fragment recipes can be removed just fine.
+  event.remove({ id: /^reliquary:mob_charm_fragments/ });
+});