From cba90b447f3da7fa07f279cd3a4dd86b8dcf675b Mon Sep 17 00:00:00 2001 From: f-raZ0R Date: Fri, 4 Oct 2024 08:12:49 -0400 Subject: [PATCH] polish as requested --- src/main/java/de/dafuqs/spectrum/items/food/SedativesItem.java | 3 ++- .../data/spectrum/recipes/mod_integration/affinity/TODO.txt | 1 - .../data/spectrum/recipes/mod_integration/bewitchment/TODO.txt | 0 .../mod_integration/create/enchantment_upgrade/capacity.json | 1 - .../create/enchantment_upgrade/potato_recovery.json | 1 - .../farmersdelight/enchantment_upgrade/backstabbing.json | 1 - .../data/spectrum/recipes/mod_integration/hephaestus/TODO.txt | 0 .../data/spectrum/recipes/mod_integration/malum/TODO.txt | 1 - .../spectrum/recipes/mod_integration/sandwichable/TODO.txt | 0 9 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/data/spectrum/recipes/mod_integration/affinity/TODO.txt delete mode 100644 src/main/resources/data/spectrum/recipes/mod_integration/bewitchment/TODO.txt delete mode 100644 src/main/resources/data/spectrum/recipes/mod_integration/hephaestus/TODO.txt delete mode 100644 src/main/resources/data/spectrum/recipes/mod_integration/malum/TODO.txt delete mode 100644 src/main/resources/data/spectrum/recipes/mod_integration/sandwichable/TODO.txt diff --git a/src/main/java/de/dafuqs/spectrum/items/food/SedativesItem.java b/src/main/java/de/dafuqs/spectrum/items/food/SedativesItem.java index 2653480dc6..fff5409160 100644 --- a/src/main/java/de/dafuqs/spectrum/items/food/SedativesItem.java +++ b/src/main/java/de/dafuqs/spectrum/items/food/SedativesItem.java @@ -1,5 +1,6 @@ package de.dafuqs.spectrum.items.food; +import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks; import de.dafuqs.spectrum.compat.neepmeat.NEEPMeatCompat; import de.dafuqs.spectrum.items.*; import de.dafuqs.spectrum.registries.*; @@ -32,7 +33,7 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { } } - if(FabricLoader.getInstance().isModLoaded("neepmeat")) + if(FabricLoader.getInstance().isModLoaded("neepmeat") && SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.NEEPMEAT_ID)) { NEEPMeatCompat.sedateEnlightenment(user); } diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/affinity/TODO.txt b/src/main/resources/data/spectrum/recipes/mod_integration/affinity/TODO.txt deleted file mode 100644 index 0d5bb88ec5..0000000000 --- a/src/main/resources/data/spectrum/recipes/mod_integration/affinity/TODO.txt +++ /dev/null @@ -1 +0,0 @@ -TODO:Actually play with the mod to get a good understanding of what compat to add \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/bewitchment/TODO.txt b/src/main/resources/data/spectrum/recipes/mod_integration/bewitchment/TODO.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/create/enchantment_upgrade/capacity.json b/src/main/resources/data/spectrum/recipes/mod_integration/create/enchantment_upgrade/capacity.json index bbf4f6fc1e..c038026281 100644 --- a/src/main/resources/data/spectrum/recipes/mod_integration/create/enchantment_upgrade/capacity.json +++ b/src/main/resources/data/spectrum/recipes/mod_integration/create/enchantment_upgrade/capacity.json @@ -1,6 +1,5 @@ { "type": "spectrum:enchantment_upgrade", - "group": "mod_compat", "enchantment": "create:capacity", "levels": [ { diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/create/enchantment_upgrade/potato_recovery.json b/src/main/resources/data/spectrum/recipes/mod_integration/create/enchantment_upgrade/potato_recovery.json index 4bcd009599..b525b4eebb 100644 --- a/src/main/resources/data/spectrum/recipes/mod_integration/create/enchantment_upgrade/potato_recovery.json +++ b/src/main/resources/data/spectrum/recipes/mod_integration/create/enchantment_upgrade/potato_recovery.json @@ -1,6 +1,5 @@ { "type": "spectrum:enchantment_upgrade", - "group": "mod_compat", "enchantment": "create:potato_recovery", "levels": [ { diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/farmersdelight/enchantment_upgrade/backstabbing.json b/src/main/resources/data/spectrum/recipes/mod_integration/farmersdelight/enchantment_upgrade/backstabbing.json index c6c17ca9a5..ebcf624280 100644 --- a/src/main/resources/data/spectrum/recipes/mod_integration/farmersdelight/enchantment_upgrade/backstabbing.json +++ b/src/main/resources/data/spectrum/recipes/mod_integration/farmersdelight/enchantment_upgrade/backstabbing.json @@ -1,6 +1,5 @@ { "type": "spectrum:enchantment_upgrade", - "group": "mod_compat", "enchantment": "farmersdelight:backstabbing", "levels": [ { diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/hephaestus/TODO.txt b/src/main/resources/data/spectrum/recipes/mod_integration/hephaestus/TODO.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/TODO.txt b/src/main/resources/data/spectrum/recipes/mod_integration/malum/TODO.txt deleted file mode 100644 index 408effd62f..0000000000 --- a/src/main/resources/data/spectrum/recipes/mod_integration/malum/TODO.txt +++ /dev/null @@ -1 +0,0 @@ -Might be delayed for 1.8.1 \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/sandwichable/TODO.txt b/src/main/resources/data/spectrum/recipes/mod_integration/sandwichable/TODO.txt deleted file mode 100644 index e69de29bb2..0000000000