From f0bc7dc997c3add52f113528eae304aad505b6db Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Sat, 8 Jul 2023 13:15:17 +0200 Subject: [PATCH] feat: add all crusher tiers as catalyst in jei --- src/generated/resources/assets/occultism/lang/en_us.json | 6 +++--- .../data/occultism/recipes/crushing/iesnium_dust.json | 1 + .../recipes/crushing/iesnium_dust_from_ingot.json | 1 + .../occultism/recipes/crushing/iesnium_dust_from_raw.json | 1 + .../klikli_dev/occultism/datagen/lang/ENUSProvider.java | 7 ++++--- .../klikli_dev/occultism/integration/jei/JeiPlugin.java | 6 ++++++ 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index 6c26ab17d..4d8112265 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -1012,7 +1012,7 @@ "item.occultism.ritual_dummy.possess_skeleton": "Ritual: Summon Possessed Skeleton", "item.occultism.ritual_dummy.possess_skeleton.tooltip": " The possessed Skeleton is immune to daylight and always drop at least one Skeleton Skull when killed.", "item.occultism.ritual_dummy.summon_afrit_crusher": "Ritual: Summon Afrit Crusher", - "item.occultism.ritual_dummy.summon_afrit_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.", + "item.occultism.ritual_dummy.summon_afrit_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n§7§oNote: Some recipes may require higher tier crushers.", "item.occultism.ritual_dummy.summon_afrit_rain_weather": "Ritual: Rainy Weather", "item.occultism.ritual_dummy.summon_afrit_rain_weather.tooltip": "Summons an bound Afrit that creates rain.", "item.occultism.ritual_dummy.summon_afrit_thunder_weather": "Ritual: Thunderstorm", @@ -1020,7 +1020,7 @@ "item.occultism.ritual_dummy.summon_djinni_clear_weather": "Ritual: Clear Weather", "item.occultism.ritual_dummy.summon_djinni_clear_weather.tooltip": "Summons a Djinni that clears the weather.", "item.occultism.ritual_dummy.summon_djinni_crusher": "Ritual: Summon Djinni Crusher", - "item.occultism.ritual_dummy.summon_djinni_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.", + "item.occultism.ritual_dummy.summon_djinni_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n§7§oNote: Some recipes may require higher tier crushers.", "item.occultism.ritual_dummy.summon_djinni_day_time": "Ritual: Summoning of Dawn", "item.occultism.ritual_dummy.summon_djinni_day_time.tooltip": "Summons a Djinni that sets the time to high noon.", "item.occultism.ritual_dummy.summon_djinni_manage_machine": "Ritual: Summon Djinni Machine Operator", @@ -1030,7 +1030,7 @@ "item.occultism.ritual_dummy.summon_foliot_cleaner": "Ritual: Summon Foliot Janitor", "item.occultism.ritual_dummy.summon_foliot_cleaner.tooltip": "The janitor will pick up dropped items and deposit them into a target inventory.", "item.occultism.ritual_dummy.summon_foliot_crusher": "Ritual: Summon Foliot Crusher", - "item.occultism.ritual_dummy.summon_foliot_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively doubling the metal output.", + "item.occultism.ritual_dummy.summon_foliot_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively doubling the metal output.\n§7§oNote: Some recipes may require higher tier crushers.", "item.occultism.ritual_dummy.summon_foliot_lumberjack": "Ritual: Summon Foliot Lumberjack", "item.occultism.ritual_dummy.summon_foliot_lumberjack.tooltip": "The lumberjack will harvest trees in it's working area and deposit the dropped items into the specified chest.", "item.occultism.ritual_dummy.summon_foliot_otherstone_trader": "Ritual: Summon Otherstone Trader", diff --git a/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust.json b/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust.json index f2803123e..ad7249b40 100644 --- a/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust.json +++ b/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust.json @@ -18,6 +18,7 @@ ], "crushing_time": 200, "ignore_crushing_multiplier": false, + "min_tier": 4, "ingredient": { "tag": "forge:ores/iesnium" }, diff --git a/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_ingot.json b/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_ingot.json index 86da90fc3..e904e05b4 100644 --- a/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_ingot.json +++ b/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_ingot.json @@ -17,6 +17,7 @@ } ], "crushing_time": 200, + "min_tier": 4, "ignore_crushing_multiplier": true, "ingredient": { "tag": "forge:ingots/iesnium" diff --git a/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_raw.json b/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_raw.json index c8f3928df..1db80b06f 100644 --- a/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_raw.json +++ b/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_raw.json @@ -17,6 +17,7 @@ } ], "crushing_time": 200, + "min_tier": 4, "ignore_crushing_multiplier": false, "ingredient": { "tag": "forge:raw_materials/iesnium" diff --git a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java index a6653114e..206d4763b 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java @@ -32,6 +32,7 @@ import com.klikli_dev.occultism.registry.OccultismBlocks; import com.klikli_dev.occultism.registry.OccultismEntities; import com.klikli_dev.occultism.registry.OccultismItems; +import net.minecraft.ChatFormatting; import net.minecraft.Util; import net.minecraft.data.PackOutput; import net.minecraft.network.chat.contents.TranslatableContents; @@ -2888,11 +2889,11 @@ private void addRitualDummies() { this.add("item.occultism.ritual_dummy.summon_djinni_night_time", "Ritual: Summoning of Dusk"); this.add("item.occultism.ritual_dummy.summon_djinni_night_time.tooltip", "Summons a Djinni that sets the time to midnight."); this.add("item.occultism.ritual_dummy.summon_foliot_crusher", "Ritual: Summon Foliot Crusher"); - this.add("item.occultism.ritual_dummy.summon_foliot_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively doubling the metal output."); + this.add("item.occultism.ritual_dummy.summon_foliot_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively doubling the metal output.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher tier crushers."); this.add("item.occultism.ritual_dummy.summon_djinni_crusher", "Ritual: Summon Djinni Crusher"); - this.add("item.occultism.ritual_dummy.summon_djinni_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers."); + this.add("item.occultism.ritual_dummy.summon_djinni_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher tier crushers."); this.add("item.occultism.ritual_dummy.summon_afrit_crusher", "Ritual: Summon Afrit Crusher"); - this.add("item.occultism.ritual_dummy.summon_afrit_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers."); + this.add("item.occultism.ritual_dummy.summon_afrit_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher tier crushers."); this.add("item.occultism.ritual_dummy.summon_marid_crusher", "Ritual: Summon Marid Crusher"); this.add("item.occultism.ritual_dummy.summon_marid_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers."); this.add("item.occultism.ritual_dummy.summon_foliot_lumberjack", "Ritual: Summon Foliot Lumberjack"); diff --git a/src/main/java/com/klikli_dev/occultism/integration/jei/JeiPlugin.java b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiPlugin.java index 1be35f092..11c2c5460 100644 --- a/src/main/java/com/klikli_dev/occultism/integration/jei/JeiPlugin.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiPlugin.java @@ -132,6 +132,12 @@ public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { registration.addRecipeCatalyst(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Occultism.MODID, "ritual_dummy/summon_marid_crusher"))), JeiRecipeTypes.CRUSHING); + registration.addRecipeCatalyst(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Occultism.MODID, "ritual_dummy/summon_afrit_crusher"))), + JeiRecipeTypes.CRUSHING); + registration.addRecipeCatalyst(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Occultism.MODID, "ritual_dummy/summon_djinni_crusher"))), + JeiRecipeTypes.CRUSHING); + registration.addRecipeCatalyst(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Occultism.MODID, "ritual_dummy/summon_foliot_crusher"))), + JeiRecipeTypes.CRUSHING); } @Override