diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 1c2e27d..f35116c 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2024-09-27T22:53:27.7505476 Languages: en_us -e5b4987236e5e227983b26ba39936f4ae55adc0e assets/collectorsreap/lang/en_us.json +// 1.20.1 2024-09-27T23:46:53.2908468 Languages: en_us +10f1d84e9bcb7773cf8a6d6a1d22442287ad26a8 assets/collectorsreap/lang/en_us.json diff --git a/src/generated/resources/assets/collectorsreap/lang/en_us.json b/src/generated/resources/assets/collectorsreap/lang/en_us.json index 41bbe93..a32fbf2 100644 --- a/src/generated/resources/assets/collectorsreap/lang/en_us.json +++ b/src/generated/resources/assets/collectorsreap/lang/en_us.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "Pomegranates can be found as a wild bush in warped forests.", "desc.collectorsreap.pomegranate.pollination": "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee.", "desc.collectorsreap.portobello": "Portobellos can be rarely found in meadows.", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "Corrosion", "effect.collectorsreap.corrosion.description": "Provides the user a defensive acid shield, corroding projectiles and damaging attack weapons.", "effect.collectorsreap.volatility": "Volatility", diff --git a/src/main/java/net/brdle/collectorsreap/common/ModEvents.java b/src/main/java/net/brdle/collectorsreap/common/ModEvents.java index 07b73cc..2b66edd 100644 --- a/src/main/java/net/brdle/collectorsreap/common/ModEvents.java +++ b/src/main/java/net/brdle/collectorsreap/common/ModEvents.java @@ -41,7 +41,7 @@ public void setup(FMLCommonSetupEvent e) { compost(CRItems.POMEGRANATE, 0.3F); compost(CRItems.POMEGRANATE_SLICE, 0.2F); compost(CRItems.POMEGRANATE_SEEDS, 0.1F); - compost(CRItems.STYGIAN_POMEGRANATE, 0.3F); + compost(CRItems.STYGIAN_POMEGRANATE, 0.35F); // if (ModList.get().isLoaded("neapolitan")) { diff --git a/src/main/java/net/brdle/collectorsreap/compat/JEIPlugin.java b/src/main/java/net/brdle/collectorsreap/compat/JEIPlugin.java index f65f1ea..6aa6ff3 100644 --- a/src/main/java/net/brdle/collectorsreap/compat/JEIPlugin.java +++ b/src/main/java/net/brdle/collectorsreap/compat/JEIPlugin.java @@ -60,7 +60,8 @@ public void registerRecipes(IRecipeRegistration registration) { String pomTranslationKey = "desc." + CollectorsReap.MODID + "." + Util.name(CRItems.POMEGRANATE); List pomStack = List.of(Util.gs(CRItems.POMEGRANATE), Util.gs(CRItems.POMEGRANATE_SLICE)); if (CRConfig.POMEGRANATE_POLLINATION.get()) { - registration.addItemStackInfo(pomStack, Component.translatable(pomTranslationKey), + registration.addItemStackInfo(pomStack, + Component.translatable(pomTranslationKey), Component.translatable(pomTranslationKey + ".pollination") ); } else { @@ -68,6 +69,12 @@ public void registerRecipes(IRecipeRegistration registration) { } if (ModList.get().isLoaded("mynethersdelight")) { + if (CRConfig.verify(CRItems.STYGIAN_POMEGRANATE)) { + registration.addItemStackInfo( + Util.gs(CRItems.STYGIAN_POMEGRANATE), + Component.translatable("desc." + CollectorsReap.MODID + "." + Util.name(CRItems.STYGIAN_POMEGRANATE)) + ); + } registration.addItemStackInfo(Util.gs(CRItems.PORTOBELLO_COLONY), Component.translatable("mynethersdelight.jei.info.mushroom_colony")); } } diff --git a/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java b/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java index 5449bec..db6c2b1 100644 --- a/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java +++ b/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java @@ -45,6 +45,7 @@ private void addText() { add("desc." + CollectorsReap.MODID + "." + Util.name(CRItems.LIME) + ".pollination", "A flowering Lime Bush will grow fruit when pollinated by a Bee."); add("desc." + CollectorsReap.MODID + "." + Util.name(CRItems.POMEGRANATE), "Pomegranates can be found as a wild bush in warped forests."); add("desc." + CollectorsReap.MODID + "." + Util.name(CRItems.POMEGRANATE) + ".pollination", "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee."); + add("desc." + CollectorsReap.MODID + "." + Util.name(CRItems.STYGIAN_POMEGRANATE), "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil."); add("config.jade.plugin_" + CollectorsReap.MODID + ".crop_progress", "Crop Progress"); add(CollectorsReap.MODID + ".subtitle.urchin_dart.throw", "Urchin Dart thrown"); add(CollectorsReap.MODID + ".subtitle.urchin_dart.hit", "Urchin Dart hits"); diff --git a/src/main/resources/assets/collectorsreap/lang/es_es.json b/src/main/resources/assets/collectorsreap/lang/es_es.json index 04c4434..d5ce8a0 100644 --- a/src/main/resources/assets/collectorsreap/lang/es_es.json +++ b/src/main/resources/assets/collectorsreap/lang/es_es.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "Se encuentra en los bosques distorcionados.", "desc.collectorsreap.pomegranate.pollination": "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee.", "desc.collectorsreap.portobello": "Encontrado en prados.", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "Corrosión", "effect.collectorsreap.corrosion.description": "Provee al usuario un escudo de ácido defensivo, corroyendo proyectiles y dañando las armas de ataque.", "effect.collectorsreap.volatility": "Volatilidad", diff --git a/src/main/resources/assets/collectorsreap/lang/es_mx.json b/src/main/resources/assets/collectorsreap/lang/es_mx.json index f9dc994..9eab9d8 100644 --- a/src/main/resources/assets/collectorsreap/lang/es_mx.json +++ b/src/main/resources/assets/collectorsreap/lang/es_mx.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "Se encuentra en los bosques distorcionados.", "desc.collectorsreap.pomegranate.pollination": "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee.", "desc.collectorsreap.portobello": "Encontrado en prados.", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "Corrosión", "effect.collectorsreap.corrosion.description": "Provee al usuario un escudo de ácido defensivo, corroyendo proyectiles y dañando las armas de ataque.", "effect.collectorsreap.volatility": "Volatilidad", diff --git a/src/main/resources/assets/collectorsreap/lang/ja_jp.json b/src/main/resources/assets/collectorsreap/lang/ja_jp.json index 173c718..44d3ac5 100644 --- a/src/main/resources/assets/collectorsreap/lang/ja_jp.json +++ b/src/main/resources/assets/collectorsreap/lang/ja_jp.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "Found in Warped Forests.", "desc.collectorsreap.pomegranate.pollination": "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee.", "desc.collectorsreap.portobello": "Found in Meadows.", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "Corrosion", "effect.collectorsreap.corrosion.description": "Provides the user a defensive acid shield, corroding projectiles and damaging attack weapons.", "effect.collectorsreap.volatility": "Volatility", diff --git a/src/main/resources/assets/collectorsreap/lang/ko_kr.json b/src/main/resources/assets/collectorsreap/lang/ko_kr.json index 4426dc0..e8dc70d 100644 --- a/src/main/resources/assets/collectorsreap/lang/ko_kr.json +++ b/src/main/resources/assets/collectorsreap/lang/ko_kr.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "뒤틀린 숲에서 발견할 수 있습니다.", "desc.collectorsreap.pomegranate.pollination": "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee.", "desc.collectorsreap.portobello": "목초지에서 발견할 수 있습니다.", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "Corrosion", "effect.collectorsreap.corrosion.description": "Provides the user a defensive acid shield, corroding projectiles and damaging attack weapons.", "effect.collectorsreap.volatility": "Volatility", diff --git a/src/main/resources/assets/collectorsreap/lang/ru_ru.json b/src/main/resources/assets/collectorsreap/lang/ru_ru.json index 1f4a8ee..2bb9dc1 100644 --- a/src/main/resources/assets/collectorsreap/lang/ru_ru.json +++ b/src/main/resources/assets/collectorsreap/lang/ru_ru.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "Можно найти в искаженном лесу.", "desc.collectorsreap.pomegranate.pollination": "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee.", "desc.collectorsreap.portobello": "Можно найти на лугах.", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "Коррозия", "effect.collectorsreap.corrosion.description": "Даёт игроку защитный кислотный щит, который разъедает снаряды и атакующее оружие.", "effect.collectorsreap.volatility": "Летучесть", diff --git a/src/main/resources/assets/collectorsreap/lang/uk_ua.json b/src/main/resources/assets/collectorsreap/lang/uk_ua.json index 70c3861..d9f3ad2 100644 --- a/src/main/resources/assets/collectorsreap/lang/uk_ua.json +++ b/src/main/resources/assets/collectorsreap/lang/uk_ua.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "Можна знайти в Багряних лісах.", "desc.collectorsreap.pomegranate.pollination": "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee.", "desc.collectorsreap.portobello": "Можна знайти на Луках.", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "Корозія", "effect.collectorsreap.corrosion.description": "Дає гравцеві захисний, кислотний щит, що роз'їдає снаряди та пошкоджує атакуючу зброю.", "effect.collectorsreap.volatility": "Невловимість", diff --git a/src/main/resources/assets/collectorsreap/lang/vi_vn.json b/src/main/resources/assets/collectorsreap/lang/vi_vn.json index 8444090..db38467 100644 --- a/src/main/resources/assets/collectorsreap/lang/vi_vn.json +++ b/src/main/resources/assets/collectorsreap/lang/vi_vn.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "Tìm Trong Rừng Cong Vênh.", "desc.collectorsreap.pomegranate.pollination": "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee.", "desc.collectorsreap.portobello": "Tìm Trong Đồng Cỏ.", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "Ăn Mòn", "effect.collectorsreap.corrosion.description": "Cung Cấp Axit Phòng Thủ.", "effect.collectorsreap.volatility": "Biến Động", diff --git a/src/main/resources/assets/collectorsreap/lang/zh_cn.json b/src/main/resources/assets/collectorsreap/lang/zh_cn.json index 906d40e..467bfdf 100644 --- a/src/main/resources/assets/collectorsreap/lang/zh_cn.json +++ b/src/main/resources/assets/collectorsreap/lang/zh_cn.json @@ -63,6 +63,7 @@ "desc.collectorsreap.pomegranate": "可在诡异森林中找到。", "desc.collectorsreap.pomegranate.pollination": "开花的石榴树丛在蜜蜂授粉后会在主世界中长出果实。", "desc.collectorsreap.portobello": "可在草甸中找到。", + "desc.collectorsreap.stygian_pomegranate": "Stygian Pomegranates are a dangerous variant that can be occasionally picked from Pomegranate Bushes growing on Resurgent Soil.", "effect.collectorsreap.corrosion": "酸蚀护盾", "effect.collectorsreap.corrosion.description": "为效果持有者提供一个防御性的酸性护盾，护盾将抵消效果持有者受到的弹射物伤害和爆炸伤害", "effect.collectorsreap.volatility": "挥溅",