diff --git a/CHANGELOG.md b/CHANGELOG.md index f3c5d3db..a2797f89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ We've added the mod [Tectonic] to amp up worldgen - Which means on the border be - Name Tags can now be crafted [\#54](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/54) - Ars Nouveau Saplings and Fruits have been added to the Market [\#54](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/54) - Chocobo Feathers may be used in place of feathers in most recipes [\#54](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/54) +- Add sawing compat recipes between different saws [\#61](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/61) +- New potions and potion recipes! [\#61](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/61) +- Uraninite may be converted to Uranium for use in other reactors [\#61](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/61) +- Flame Chocobos may now be bred together or with Golden Chocobos to produce more [\#61](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/61) +- New recipes for golden fruits [\#61](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/61) #### 🦟 Bugs Fixed diff --git a/config/chococraft-4-breeding.json b/config/chococraft-4-breeding.json index 5d61b3e1..cec02cc7 100644 --- a/config/chococraft-4-breeding.json +++ b/config/chococraft-4-breeding.json @@ -1,338 +1,347 @@ { - "BLACK": { - "GOLD, PINK, RED": [ - { - "childColor": "GOLD", - "conditions": "bothParentsFedGold", - "random": "above 90" - } - ], - "WHITE": [ - { - "childColor": "GOLD", - "conditions": "bothParentsFedGold", - "random": "above 50" - }, - { - "childColor": "WHITE", - "conditions": "bothParentsFedGold", - "random": "above 25" - }, - { - "childColor": "YELLOW", - "conditions": "none", - "random": "above 75" - }, - { - "childColor": "WHITE", - "conditions": "none", - "random": "above 38" - } - ], - "YELLOW, GREEN, BLUE": [ - { - "childColor": "secondParent", - "conditions": "none", - "random": "under 50" - } - ] - }, - "BLUE": { - "BLACK, WHITE": [ - { - "childColor": "YELLOW", - "conditions": "bothParentsFedGold", - "random": "above 70" - }, - { - "childColor": "secondParent", - "conditions": "bothParentsFedGold", - "random": "above 35" - }, - { - "childColor": "YELLOW", - "conditions": "none", - "random": "above 90" - }, - { - "childColor": "secondParent", - "conditions": "none", - "random": "above 45" - } - ], - "BLUE": [ - { - "childColor": "WHITE", - "conditions": "bothParentsFedGold", - "random": "above 60" - }, - { - "childColor": "BLUE", - "conditions": "bothParentsFedGold", - "random": "above 30" - }, - { - "childColor": "WHITE", - "conditions": "none", - "random": "above 80" - }, - { - "childColor": "BLUE", - "conditions": "none", - "random": "above 40" - } - ], - "YELLOW": [ - { - "childColor": "YELLOW", - "conditions": "none", - "random": "under 50" - } - ] - }, - "GOLD": { - "GOLD": [ - { - "childColor": "secondParent", - "conditions": "bothParentsFedGold", - "random": "none" - } - ], - "PINK, RED": [ - { - "childColor": "YELLOW", - "conditions": "bothParentsNotFedGold", - "random": "above 20" - } - ], - "YELLOW, GREEN, BLUE, WHITE, BLACK, PURPLE": [ - { - "childColor": "secondParent", - "conditions": "none", - "random": "none" - } - ] - }, - "GREEN": { - "BLACK, WHITE": [ - { - "childColor": "YELLOW", - "conditions": "bothParentsFedGold", - "random": "above 70" - }, - { - "childColor": "secondParent", - "conditions": "bothParentsFedGold", - "random": "above 35" - }, - { - "childColor": "YELLOW", - "conditions": "none", - "random": "above 90" - }, - { - "childColor": "secondParent", - "conditions": "none", - "random": "above 45" - } - ], - "BLUE": [ - { - "childColor": "WHITE", - "conditions": "bothParentsFedGold", - "random": "above 60" - }, - { - "childColor": "BLUE", - "conditions": "bothParentsFedGold", - "random": "above 30" - }, - { - "childColor": "WHITE", - "conditions": "none", - "random": "above 80" - }, - { - "childColor": "BLUE", - "conditions": "none", - "random": "above 40" - } - ], - "YELLOW": [ - { - "childColor": "YELLOW", - "conditions": "none", - "random": "under 50" - } - ] - }, - "PINK": { - "GOLD, PINK, RED": [ - { - "childColor": "YELLOW", - "conditions": "bothParentsNotFedGold", - "random": "above 20" - } - ], - "YELLOW, GREEN, BLUE, WHITE, BLACK, PURPLE": [ - { - "childColor": "secondParent", - "conditions": "none", - "random": "none" - } - ] - }, - "PURPLE": { - "YELLOW, GREEN, BLUE, WHITE, BLACK": [ - { - "childColor": "secondParent", - "conditions": "none", - "random": "none" - } - ] - }, - "RED": { - "GOLD, PINK, RED": [ - { - "childColor": "YELLOW", - "conditions": "bothParentsNotFedGold", - "random": "above 20" - } - ], - "YELLOW, GREEN, BLUE, WHITE, BLACK, PURPLE": [ - { - "childColor": "secondParent", - "conditions": "none", - "random": "none" - } - ] - }, - "WHITE": { - "BLACK": [ - { - "childColor": "GOLD", - "conditions": "bothParentsFedGold", - "random": "above 50" - }, - { - "childColor": "BLACK", - "conditions": "bothParentsFedGold", - "random": "above 25" - }, - { - "childColor": "YELLOW", - "conditions": "none", - "random": "above 75" - }, - { - "childColor": "BLACK", - "conditions": "none", - "random": "above 38" - } - ], - "GOLD, PINK, RED": [ - { - "childColor": "GOLD", - "conditions": "bothParentsFedGold", - "random": "above 70" - } - ], - "GREEN, BLUE": [ - { - "childColor": "YELLOW", - "conditions": "bothParentsFedGold", - "random": "above 70" - }, - { - "childColor": "secondParent", - "conditions": "bothParentsFedGold", - "random": "above 35" - }, - { - "childColor": "YELLOW", - "conditions": "none", - "random": "above 90" - }, - { - "childColor": "secondParent", - "conditions": "none", - "random": "above 45" - } - ], - "YELLOW": [ - { - "childColor": "BLACK", - "conditions": "bothParentsFedGold", - "random": "above 60" - }, - { - "childColor": "YELLOW", - "conditions": "bothParentsFedGold", - "random": "above 30" - }, - { - "childColor": "BLACK", - "conditions": "none", - "random": "above 80" - }, - { - "childColor": "YELLOW", - "conditions": "none", - "random": "above 40" - } - ] - }, - "YELLOW": { - "GREEN, BLUE, BLACK": [ - { - "childColor": "secondParent", - "conditions": "none", - "random": "above 50" - } - ], - "WHITE": [ - { - "childColor": "BLACK", - "conditions": "bothParentsFedGold", - "random": "above 60" - }, - { - "childColor": "WHITE", - "conditions": "bothParentsFedGold", - "random": "above 30" - }, - { - "childColor": "BLACK", - "conditions": "none", - "random": "above 80" - }, - { - "childColor": "WHITE", - "conditions": "none", - "random": "above 40" - } - ], - "YELLOW": [ - { - "childColor": "BLUE", - "conditions": "bothParentsFedGold", - "random": "above 80" - }, - { - "childColor": "GREEN", - "conditions": "bothParentsFedGold", - "random": "above 60" - }, - { - "childColor": "BLUE", - "conditions": "none", - "random": "above 60" - }, - { - "childColor": "GREEN", - "conditions": "none", - "random": "above 20" - } - ] - } -} \ No newline at end of file + "BLACK": { + "GOLD, PINK, RED": [ + { + "childColor": "GOLD", + "conditions": "bothParentsFedGold", + "random": "above 90" + } + ], + "WHITE": [ + { + "childColor": "GOLD", + "conditions": "bothParentsFedGold", + "random": "above 50" + }, + { + "childColor": "WHITE", + "conditions": "bothParentsFedGold", + "random": "above 25" + }, + { + "childColor": "YELLOW", + "conditions": "none", + "random": "above 75" + }, + { + "childColor": "WHITE", + "conditions": "none", + "random": "above 38" + } + ], + "YELLOW, GREEN, BLUE": [ + { + "childColor": "secondParent", + "conditions": "none", + "random": "under 50" + } + ] + }, + "BLUE": { + "BLACK, WHITE": [ + { + "childColor": "YELLOW", + "conditions": "bothParentsFedGold", + "random": "above 70" + }, + { + "childColor": "secondParent", + "conditions": "bothParentsFedGold", + "random": "above 35" + }, + { + "childColor": "YELLOW", + "conditions": "none", + "random": "above 90" + }, + { + "childColor": "secondParent", + "conditions": "none", + "random": "above 45" + } + ], + "BLUE": [ + { + "childColor": "WHITE", + "conditions": "bothParentsFedGold", + "random": "above 60" + }, + { + "childColor": "BLUE", + "conditions": "bothParentsFedGold", + "random": "above 30" + }, + { + "childColor": "WHITE", + "conditions": "none", + "random": "above 80" + }, + { + "childColor": "BLUE", + "conditions": "none", + "random": "above 40" + } + ], + "YELLOW": [ + { + "childColor": "YELLOW", + "conditions": "none", + "random": "under 50" + } + ] + }, + "GOLD": { + "GOLD": [ + { + "childColor": "secondParent", + "conditions": "bothParentsFedGold", + "random": "none" + } + ], + "PINK, RED": [ + { + "childColor": "YELLOW", + "conditions": "bothParentsNotFedGold", + "random": "above 20" + } + ], + "YELLOW, GREEN, BLUE, WHITE, BLACK, PURPLE, FLAME": [ + { + "childColor": "secondParent", + "conditions": "none", + "random": "none" + } + ] + }, + "GREEN": { + "BLACK, WHITE": [ + { + "childColor": "YELLOW", + "conditions": "bothParentsFedGold", + "random": "above 70" + }, + { + "childColor": "secondParent", + "conditions": "bothParentsFedGold", + "random": "above 35" + }, + { + "childColor": "YELLOW", + "conditions": "none", + "random": "above 90" + }, + { + "childColor": "secondParent", + "conditions": "none", + "random": "above 45" + } + ], + "BLUE": [ + { + "childColor": "WHITE", + "conditions": "bothParentsFedGold", + "random": "above 60" + }, + { + "childColor": "BLUE", + "conditions": "bothParentsFedGold", + "random": "above 30" + }, + { + "childColor": "WHITE", + "conditions": "none", + "random": "above 80" + }, + { + "childColor": "BLUE", + "conditions": "none", + "random": "above 40" + } + ], + "YELLOW": [ + { + "childColor": "YELLOW", + "conditions": "none", + "random": "under 50" + } + ] + }, + "PINK": { + "GOLD, PINK, RED": [ + { + "childColor": "YELLOW", + "conditions": "bothParentsNotFedGold", + "random": "above 20" + } + ], + "YELLOW, GREEN, BLUE, WHITE, BLACK, PURPLE": [ + { + "childColor": "secondParent", + "conditions": "none", + "random": "none" + } + ] + }, + "PURPLE": { + "YELLOW, GREEN, BLUE, WHITE, BLACK, PURPLE": [ + { + "childColor": "secondParent", + "conditions": "none", + "random": "none" + } + ] + }, + "FLAME": { + "YELLOW, GREEN, BLUE, WHITE, BLACK, FLAME": [ + { + "childColor": "secondParent", + "conditions": "none", + "random": "none" + } + ] + }, + "RED": { + "GOLD, PINK, RED": [ + { + "childColor": "YELLOW", + "conditions": "bothParentsNotFedGold", + "random": "above 20" + } + ], + "YELLOW, GREEN, BLUE, WHITE, BLACK, PURPLE": [ + { + "childColor": "secondParent", + "conditions": "none", + "random": "none" + } + ] + }, + "WHITE": { + "BLACK": [ + { + "childColor": "GOLD", + "conditions": "bothParentsFedGold", + "random": "above 50" + }, + { + "childColor": "BLACK", + "conditions": "bothParentsFedGold", + "random": "above 25" + }, + { + "childColor": "YELLOW", + "conditions": "none", + "random": "above 75" + }, + { + "childColor": "BLACK", + "conditions": "none", + "random": "above 38" + } + ], + "GOLD, PINK, RED": [ + { + "childColor": "GOLD", + "conditions": "bothParentsFedGold", + "random": "above 70" + } + ], + "GREEN, BLUE": [ + { + "childColor": "YELLOW", + "conditions": "bothParentsFedGold", + "random": "above 70" + }, + { + "childColor": "secondParent", + "conditions": "bothParentsFedGold", + "random": "above 35" + }, + { + "childColor": "YELLOW", + "conditions": "none", + "random": "above 90" + }, + { + "childColor": "secondParent", + "conditions": "none", + "random": "above 45" + } + ], + "YELLOW": [ + { + "childColor": "BLACK", + "conditions": "bothParentsFedGold", + "random": "above 60" + }, + { + "childColor": "YELLOW", + "conditions": "bothParentsFedGold", + "random": "above 30" + }, + { + "childColor": "BLACK", + "conditions": "none", + "random": "above 80" + }, + { + "childColor": "YELLOW", + "conditions": "none", + "random": "above 40" + } + ] + }, + "YELLOW": { + "GREEN, BLUE, BLACK": [ + { + "childColor": "secondParent", + "conditions": "none", + "random": "above 50" + } + ], + "WHITE": [ + { + "childColor": "BLACK", + "conditions": "bothParentsFedGold", + "random": "above 60" + }, + { + "childColor": "WHITE", + "conditions": "bothParentsFedGold", + "random": "above 30" + }, + { + "childColor": "BLACK", + "conditions": "none", + "random": "above 80" + }, + { + "childColor": "WHITE", + "conditions": "none", + "random": "above 40" + } + ], + "YELLOW": [ + { + "childColor": "BLUE", + "conditions": "bothParentsFedGold", + "random": "above 80" + }, + { + "childColor": "GREEN", + "conditions": "bothParentsFedGold", + "random": "above 60" + }, + { + "childColor": "BLUE", + "conditions": "none", + "random": "above 60" + }, + { + "childColor": "GREEN", + "conditions": "none", + "random": "above 20" + } + ] + } +} diff --git a/config/ftbquests/quests/chapters/1B26EF5BA11434F8.snbt b/config/ftbquests/quests/chapters/1B26EF5BA11434F8.snbt index d7d3dcb4..c36343c1 100644 --- a/config/ftbquests/quests/chapters/1B26EF5BA11434F8.snbt +++ b/config/ftbquests/quests/chapters/1B26EF5BA11434F8.snbt @@ -75,22 +75,12 @@ { dependencies: ["642CDBB28337670C"] id: "3D307863E39B9EFE" - rewards: [ - { - exclude_from_claim_all: true - id: "16AC43E9806EEDBF" - table_id: 23658154196454858L - type: "loot" - } - { - id: "098C2D0612C8678C" - item: { - count: 1 - id: "farmingforblockheads:feeding_trough" - } - type: "item" - } - ] + rewards: [{ + exclude_from_claim_all: true + id: "16AC43E9806EEDBF" + table_id: 23658154196454858L + type: "loot" + }] tasks: [ { id: "7A4E9B038040A28A" diff --git a/config/ftbquests/quests/chapters/multiverse.snbt b/config/ftbquests/quests/chapters/multiverse.snbt index e340aab4..4826523f 100644 --- a/config/ftbquests/quests/chapters/multiverse.snbt +++ b/config/ftbquests/quests/chapters/multiverse.snbt @@ -37,6 +37,12 @@ { dependencies: ["265FE8DFBF49A261"] id: "65613AB49D3D90D9" + rewards: [{ + exclude_from_claim_all: true + id: "103537C599661A2F" + table_id: 5796131842680319111L + type: "loot" + }] tasks: [{ id: "3DAFCC87C8ED7634" item: { count: 1, id: "multiverse:kaleidite_core" } @@ -163,6 +169,12 @@ { dependencies: ["0F04956D59A78393"] id: "265FE8DFBF49A261" + rewards: [{ + exclude_from_claim_all: true + id: "6DAF5BE1A1011F2F" + table_id: 167859363417192230L + type: "loot" + }] tasks: [{ id: "7AA3F42098022B5B" item: { count: 1, id: "multiverse:kaleidite_shard" } diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt index 466dbf87..daa97cb1 100644 --- a/config/ftbquests/quests/lang/en_us.snbt +++ b/config/ftbquests/quests/lang/en_us.snbt @@ -315,8 +315,8 @@ "These can spawn anywhere, so keep your eyes open as you explore. " "" "&a🛈 Tip: Bring your own way home, such " - "&a as a Mekanism Teleporter " - "&a or Warp Stone!" + "&a as a Mekanism Teleporter, Warp " + "&a Stone, or Stabilized Warp Scroll!" ] quest.0F04956D59A78393.title: "Multiverse" quest.0FCC51B49080984E.quest_desc: ["The following are various forms of fluid storage, from single block tanks to massive multi-block structures."] @@ -1057,17 +1057,19 @@ " &6Chocobo&r. It keeps all of the same " " abilities after this transformation." "{@pagebreak}" - " • &cFlame Chocobos&r cannot be bred. " - " Instead they are found roaming " - " The Nether. They are immune to fire," - " can swim in lava, and are capable" - " flyers." - "" - " • &5Purple Chocobos&r cannot be bred. " - " Instead they are found roaming " - " The Nether. They are immune to fire," - " can swim in lava, and are capable" - " flyers." + " • &cFlame Chocobos&r can only be found " + " in the Nether. When bred together " + " or with &6Golden Chocobos&r they may" + " produce &cFlame&r offspring. They are " + " immune to fire, can swim in lava, and " + " are capable flyers." + "" + " • &5Purple Chocobos&r can only be found " + " in the Nether. When bred together " + " or with &6Golden Chocobos&r they may" + " produce &5Purple&r offspring. They are " + " immune to fire, can swim in lava, and " + " are capable flyers." ] quest.3D307863E39B9EFE.title: "Breeding and Mutations" quest.3D334F8BDD0E4046.quest_desc: [ @@ -1100,6 +1102,7 @@ "" "These quests will help you discover this mod, which is largely centered around base defense, though offers some building aids as well." ] + quest.3D9527EAA5944C17.title: "Modular Force Fields" quest.3E622F93756E9BFA.quest_desc: [ "The first step to building a massive supercomputer capable of storing, crafting, and transferring all the various bits-n-bobs you could ever hope for, starts with a crystal." "" diff --git a/config/ftbquests/quests/reward_tables/02545B33A0B47726.snbt b/config/ftbquests/quests/reward_tables/02545B33A0B47726.snbt index 1ee226fa..949f93ee 100644 --- a/config/ftbquests/quests/reward_tables/02545B33A0B47726.snbt +++ b/config/ftbquests/quests/reward_tables/02545B33A0B47726.snbt @@ -127,6 +127,14 @@ } { item: { count: 1, id: "multiverse:kaleidite_core" }, random_bonus: 1 } { item: { count: 1, id: "minecraft:totem_of_undying" } } + { + count: 2 + item: { + count: 1 + id: "ars_nouveau:warp_scroll" + } + random_bonus: 2 + } ] use_title: true } diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json new file mode 100644 index 00000000..da625e4a --- /dev/null +++ b/kubejs/assets/kubejs/lang/en_us.json @@ -0,0 +1,61 @@ +{ + "item.minecraft.potion.effect.greater_strength": "Potion of Strength", + "item.minecraft.splash_potion.effect.greater_strength": "Splash Potion of Strength", + "item.minecraft.lingering_potion.effect.greater_strength": "Lingering Potion of Strength", + "item.minecraft.tipped_arrow.effect.greater_strength": "Arrow of Strength", + + "item.minecraft.potion.effect.greater_regeneration": "Potion of Regeneration", + "item.minecraft.splash_potion.effect.greater_regeneration": "Splash Potion of Regeneration", + "item.minecraft.lingering_potion.effect.greater_regeneration": "Lingering Potion of Regeneration", + "item.minecraft.tipped_arrow.effect.greater_regeneration": "Arrow of Regeneration", + + "item.minecraft.potion.effect.greater_mana_regen": "Potion of Mana Regeneration", + "item.minecraft.splash_potion.effect.greater_mana_regen": "Splash Potion of Mana Regeneration", + "item.minecraft.lingering_potion.effect.greater_mana_regen": "Lingering Potion of Mana Regeneration", + "item.minecraft.tipped_arrow.effect.greater_mana_regen": "Arrow of Mana Regeneration", + + "item.minecraft.potion.effect.greater_spell_damage": "Potion of Spell Damage", + "item.minecraft.splash_potion.effect.greater_spell_damage": "Splash Potion of Spell Damage", + "item.minecraft.lingering_potion.effect.greater_spell_damage": "Lingering Potion of Spell Damage", + "item.minecraft.tipped_arrow.effect.greater_spell_damage": "Arrow of Spell Damage", + + "item.minecraft.potion.effect.greater_shielding": "Potion of Shielding", + "item.minecraft.splash_potion.effect.greater_shielding": "Splash Potion of Shielding", + "item.minecraft.lingering_potion.effect.greater_shielding": "Lingering Potion of Shielding", + "item.minecraft.tipped_arrow.effect.greater_shielding": "Arrow of Shielding", + + "item.minecraft.potion.effect.greater_recovery": "Potion of Recovery", + "item.minecraft.splash_potion.effect.greater_recovery": "Splash Potion of Recovery", + "item.minecraft.lingering_potion.effect.greater_recovery": "Lingering Potion of Recovery", + "item.minecraft.tipped_arrow.effect.greater_recovery": "Arrow of Recovery", + + "item.minecraft.potion.effect.flight": "Potion of Flight", + "item.minecraft.splash_potion.effect.flight": "Splash Potion of Flight", + "item.minecraft.lingering_potion.effect.flight": "Lingering Potion of Flight", + "item.minecraft.tipped_arrow.effect.flight": "Arrow of Flight", + + "item.minecraft.potion.effect.long_flight": "Potion of Flight", + "item.minecraft.splash_potion.effect.long_flight": "Splash Potion of Flight", + "item.minecraft.lingering_potion.effect.long_flight": "Lingering Potion of Flight", + "item.minecraft.tipped_arrow.effect.long_flight": "Arrow of Flight", + + "item.minecraft.potion.effect.resistance": "Potion of Resistance", + "item.minecraft.splash_potion.effect.resistance": "Splash Potion of Resistance", + "item.minecraft.lingering_potion.effect.resistance": "Lingering Potion of Resistance", + "item.minecraft.tipped_arrow.effect.resistance": "Arrow of Resistance", + + "item.minecraft.potion.effect.long_resistance": "Potion of Resistance", + "item.minecraft.splash_potion.effect.long_resistance": "Splash Potion of Resistance", + "item.minecraft.lingering_potion.effect.long_resistance": "Lingering Potion of Resistance", + "item.minecraft.tipped_arrow.effect.long_resistance": "Arrow of Resistance", + + "item.minecraft.potion.effect.strong_resistance": "Potion of Resistance", + "item.minecraft.splash_potion.effect.strong_resistance": "Splash Potion of Resistance", + "item.minecraft.lingering_potion.effect.strong_resistance": "Lingering Potion of Resistance", + "item.minecraft.tipped_arrow.effect.strong_resistance": "Arrow of Resistance", + + "item.minecraft.potion.effect.greater_resistance": "Potion of Resistance", + "item.minecraft.splash_potion.effect.greater_resistance": "Splash Potion of Resistance", + "item.minecraft.lingering_potion.effect.greater_resistance": "Lingering Potion of Resistance", + "item.minecraft.tipped_arrow.effect.greater_resistance": "Arrow of Resistance" +} diff --git a/kubejs/server_scripts/item_events/tooltips.js b/kubejs/server_scripts/item_events/tooltips.js index b438cbe7..c762bfb5 100644 --- a/kubejs/server_scripts/item_events/tooltips.js +++ b/kubejs/server_scripts/item_events/tooltips.js @@ -21,12 +21,16 @@ ItemEvents.modifyTooltips((event) => { .white() .color('#808080') //any hex color */ - const recipes = []; + const recipes = [ + { + items: ['minecraft:reinforced_deepslate', 'modularrouters:blast_upgrade'], + text: [Text.of('Wither Immune').lightPurple()] + } + ]; recipes.forEach((recipe) => { event.add(recipe.items, recipe.text); }); - emi.items.disabled.forEach((item) => { event.add(item, [Text.of(disabled_item_tooltip).red()]); }); diff --git a/kubejs/server_scripts/loot_tables/chests/aquaculture/treasure_chest.js b/kubejs/server_scripts/loot_tables/chests/aquaculture/treasure_chest.js index 9e28d7d5..fbae5748 100644 --- a/kubejs/server_scripts/loot_tables/chests/aquaculture/treasure_chest.js +++ b/kubejs/server_scripts/loot_tables/chests/aquaculture/treasure_chest.js @@ -3,6 +3,9 @@ LootJS.lootTables((event) => { event .getLootTable('aquaculture:box/treasure_chest') .firstPool() + // TODO: Convert to AU + // .addEntry(LootEntry.of(AlmostUnified.getPreferredItemForTag('c:ingots/silver').getId()).withWeight(40)) + // .addEntry(LootEntry.of(AlmostUnified.getPreferredItemForTag('c:ingots/steel').getId()).withWeight(30)) .addEntry(LootEntry.of('modern_industrialization:silver_ingot').withWeight(40)) .addEntry(LootEntry.of('modern_industrialization:steel_ingot').withWeight(30)) .addEntry(LootEntry.of('powah:steel_energized').withWeight(20)) diff --git a/kubejs/server_scripts/loot_tables/chests/minecraft/shipwreck_supply.js b/kubejs/server_scripts/loot_tables/chests/minecraft/shipwreck_supply.js new file mode 100644 index 00000000..42158fed --- /dev/null +++ b/kubejs/server_scripts/loot_tables/chests/minecraft/shipwreck_supply.js @@ -0,0 +1,22 @@ +// https://docs.almostreliable.com/lootjs/ +LootJS.modifiers((event) => { + event.addTableModifier('minecraft:chests/shipwreck_supply').pool((pool) => { + pool.rolls([5, 8]) + .bonusRolls(0) + .addEntry(LootEntry.of('aquaculture:box').withWeight(16)) + .addEntry(LootEntry.of('aquaculture:lockbox').withWeight(8)); + }); +}); + +LootJS.lootTables((event) => { + event + .getLootTable('minecraft:chests/shipwreck_supply') + .firstPool() + .modifyEntry((itemEntry) => { + if (itemEntry.item.id.match(/:leather_/)) { + itemEntry.enchantRandomly(); + } + + return itemEntry; + }); +}); diff --git a/kubejs/server_scripts/loot_tables/chests/minecraft/shipwreck_treasure.js b/kubejs/server_scripts/loot_tables/chests/minecraft/shipwreck_treasure.js new file mode 100644 index 00000000..12d6d0cc --- /dev/null +++ b/kubejs/server_scripts/loot_tables/chests/minecraft/shipwreck_treasure.js @@ -0,0 +1,10 @@ +// https://docs.almostreliable.com/lootjs/ +LootJS.modifiers((event) => { + event.addTableModifier('minecraft:chests/shipwreck_treasure').pool((pool) => { + pool.rolls([5, 10]) + .bonusRolls(0) + .addEntry(LootEntry.of('aquaculture:box').withWeight(16)) + .addEntry(LootEntry.of('aquaculture:lockbox').withWeight(8)) + .addEntry(LootEntry.of('aquaculture:treasure_chest').withWeight(4)); + }); +}); diff --git a/kubejs/server_scripts/recipes/enigmatica/sawing.js b/kubejs/server_scripts/recipes/enigmatica/sawing.js new file mode 100644 index 00000000..52ef4fd5 --- /dev/null +++ b/kubejs/server_scripts/recipes/enigmatica/sawing.js @@ -0,0 +1,76 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:sawing/'; + const recipes = [ + { + input: 'neoforge:logs/archwood', + output: 'ars_nouveau:archwood_planks', + output_count: 6, + id: 'archwood_planks' + }, + { + input: 'arts_and_crafts:cork_logs', + output: 'arts_and_crafts:cork_planks', + output_count: 6, + id: 'cork_planks' + } + ]; + + event.forEachRecipe({ type: 'productivetrees:sawmill' }, (r) => { + let recipe = JSON.parse(r.json); + let recipe_id = r.getId(); + + let input = recipe.log.tag; + let output = recipe.planks.id; + let output_count = recipe.planks.count; + // TODO: Convert to AU + // let sawdust = AlmostUnified.getPreferredItemForTag('c:dusts/wood').getId(); + + if (recipe.log.tag.match(/productivetrees/)) { + recipes.push({ + from_productivetrees: true, + input: input, + output: output, + output_count: output_count, + id: recipe_id.split(':')[1] + }); + } + }); + + recipes.forEach((recipe) => { + if (!recipe.from_productivetrees) { + event + .custom({ + type: 'productivetrees:sawmill', + log: { tag: recipe.input }, + planks: { count: recipe.output_count, id: recipe.output }, + // TODO: Convert to AU + // secondary: { count: 2, id: sawdust }, + secondary: { count: 2, id: 'productivetrees:sawdust' } + }) + .id(`${id_prefix}sawmill/${recipe.id}`); + } + + event + .custom({ + type: 'mekanism:sawing', + input: { count: 1, tag: recipe.input }, + main_output: { count: recipe.output_count, id: recipe.output }, + secondary_chance: 0.25, + // TODO: Convert to AU + // secondary_output: { count: 1, id: sawdust }, + secondary_output: { count: 1, id: 'mekanism:sawdust' } + }) + .id(`${id_prefix}sawing/${recipe.id}`); + + event + .custom({ + type: 'modern_industrialization:cutting_machine', + fluid_inputs: [{ amount: 1, fluid: 'modern_industrialization:lubricant' }], + item_inputs: [{ amount: 1, tag: recipe.input }], + item_outputs: [{ amount: recipe.output_count, item: recipe.output }], + duration: 100, + eu: 2 + }) + .id(`${id_prefix}cutting_machine/${recipe.id}`); + }); +}); diff --git a/kubejs/server_scripts/recipes/mekanism/enriching.js b/kubejs/server_scripts/recipes/mekanism/enriching.js index 978ae825..a95b12ab 100644 --- a/kubejs/server_scripts/recipes/mekanism/enriching.js +++ b/kubejs/server_scripts/recipes/mekanism/enriching.js @@ -6,6 +6,13 @@ ServerEvents.recipes((event) => { input: { count: 4, tag: 'c:dusts/blaze' }, output: { count: 1, id: 'minecraft:blaze_rod' }, id: `${id_prefix}blaze_rod` + }, + { + input: { count: 1, tag: 'c:ingots/uraninite' }, + // TODO: Convert to AU + // output: { count: 1, id: AlmostUnified.getPreferredItemForTag('c:ingots/uranium').getId() }, + output: { count: 1, id: 'mekanism:ingot_uranium' }, + id: `${id_prefix}ingot_uranium` } ]; diff --git a/kubejs/server_scripts/recipes/mekanism/metallurgic_infusing.js b/kubejs/server_scripts/recipes/mekanism/metallurgic_infusing.js index 043efa1f..e699a87a 100644 --- a/kubejs/server_scripts/recipes/mekanism/metallurgic_infusing.js +++ b/kubejs/server_scripts/recipes/mekanism/metallurgic_infusing.js @@ -7,6 +7,24 @@ ServerEvents.recipes((event) => { item_input: { tag: 'c:foods/raw_meat', count: 1 }, chemical_input: { amount: 10, tag: 'mekanism:bio' }, id: `${id_prefix}rotten_flesh` + }, + { + output: { id: 'minecraft:golden_carrot', count: 1 }, + item_input: { item: 'minecraft:carrot', count: 1 }, + chemical_input: { amount: 10, tag: 'mekanism:gold' }, + id: `${id_prefix}golden_carrot` + }, + { + output: { id: 'minecraft:glistering_melon_slice', count: 1 }, + item_input: { item: 'minecraft:melon_slice', count: 1 }, + chemical_input: { amount: 10, tag: 'mekanism:gold' }, + id: `${id_prefix}glistering_melon_slice` + }, + { + output: { id: 'minecraft:golden_apple', count: 1 }, + item_input: { item: 'minecraft:apple', count: 1 }, + chemical_input: { amount: 80, tag: 'mekanism:gold' }, + id: `${id_prefix}golden_apple` } ]; diff --git a/kubejs/server_scripts/recipes/minecraft/potion_brewing.js b/kubejs/server_scripts/recipes/minecraft/potion_brewing.js new file mode 100644 index 00000000..85b8913c --- /dev/null +++ b/kubejs/server_scripts/recipes/minecraft/potion_brewing.js @@ -0,0 +1,228 @@ +MoreJS.registerPotionBrewing((event) => { + // Documentation: https://github.com/AlmostReliable/morejs/wiki/Potion-Brewing + + const recipes = [ + { + reagent: 'ars_nouveau:abjuration_essence', + input: 'minecraft:water', + output: 'minecraft:awkward' + }, + { + reagent: 'ars_nouveau:fire_essence', + input: 'minecraft:awkward', + output: 'minecraft:fire_resistance' + }, + { + reagent: 'minecraft:honeycomb', + input: 'minecraft:awkward', + output: 'minecraft:healing' + }, + { + reagent: 'ars_nouveau:water_essence', + input: 'minecraft:awkward', + output: 'minecraft:water_breathing' + }, + { + reagent: 'ars_nouveau:air_essence', + input: 'minecraft:awkward', + output: 'minecraft:invisibility' + }, + { + reagent: 'chococraft:gysahl_green', + input: 'minecraft:awkward', + output: 'minecraft:regeneration' + }, + { + reagent: 'ars_nouveau:manipulation_essence', + input: 'minecraft:awkward', + output: 'minecraft:strength' + }, + { + reagent: 'chococraft:chocobo_feather', + input: 'minecraft:awkward', + output: 'minecraft:slow_falling' + }, + { + reagent: 'chococraft:gold_gysahl', + input: 'minecraft:slow_falling', + output: 'kubejs:flight' + }, + { + reagent: 'chococraft:gold_gysahl', + input: 'minecraft:long_slow_falling', + output: 'kubejs:long_flight' + }, + { + reagent: 'minecraft:redstone', + input: 'kubejs:flight', + output: 'kubejs:long_flight' + }, + + { + reagent: 'ars_nouveau:earth_essence', + input: 'minecraft:awkward', + output: 'kubejs:resistance' + }, + { + reagent: 'minecraft:redstone', + input: 'kubejs:resistance', + output: 'kubejs:long_resistance' + }, + { + reagent: 'minecraft:glowstone_dust', + input: 'kubejs:resistance', + output: 'kubejs:strong_resistance' + }, + { + reagent: 'ars_nouveau:wilden_horn', + input: 'minecraft:water', + output: 'minecraft:strength' + }, + { + reagent: 'ars_nouveau:wilden_spike', + input: 'minecraft:water', + output: 'minecraft:long_water_breathing' + }, + { + reagent: 'ars_nouveau:wilden_wing', + input: 'minecraft:water', + output: 'minecraft:leaping' + } + ]; + + const ars_potions = [ + { reagent: 'ars_nouveau:bastion_pod', type: 'shielding' }, + { reagent: 'ars_nouveau:frostaya_pod', type: 'freezing' }, + { reagent: 'ars_nouveau:bombegranate_pod', type: 'blasting' }, + { reagent: 'ars_nouveau:mendosteen_pod', type: 'recovery' }, + { reagent: 'ars_nouveau:magebloom', type: 'spell_damage' }, + { reagent: 'ars_nouveau:sourceberry_bush', type: 'mana_regen' } + ]; + + ars_potions.forEach((potion) => { + recipes.push( + { + reagent: potion.reagent, + input: 'minecraft:awkward', + output: `ars_nouveau:${potion.type}_potion` + }, + { + reagent: 'minecraft:redstone', + input: `ars_nouveau:${potion.type}_potion`, + output: `ars_nouveau:${potion.type}_potion_long` + }, + { + reagent: 'minecraft:glowstone_dust', + input: `ars_nouveau:${potion.type}_potion`, + output: `ars_nouveau:${potion.type}_potion_strong` + } + ); + }); + + let greater_potions = [ + { output: 'kubejs:greater_strength', input: 'minecraft:strong_strength' }, + { output: 'kubejs:greater_regeneration', input: 'minecraft:strong_regeneration' }, + { output: 'kubejs:greater_mana_regen', input: 'ars_nouveau:mana_regen_potion_strong' }, + { output: 'kubejs:greater_spell_damage', input: 'ars_nouveau:spell_damage_potion_strong' }, + { output: 'kubejs:greater_shielding', input: 'ars_nouveau:shielding_potion_strong' }, + { output: 'kubejs:greater_recovery', input: 'ars_nouveau:recovery_potion_strong' }, + { output: 'kubejs:greater_resistance', input: 'kubejs:strong_resistance' } + ]; + + greater_potions.forEach((potion) => { + recipes.push({ + reagent: 'ae2:sky_dust', + input: potion.input, + output: potion.output + }); + }); + + recipes.forEach((recipe) => { + // console.log( + // `Registering recipe for ${recipe.output}. Reagent: ${recipe.reagent}, Input Potion: ${recipe.input}` + // ); + event.addPotionBrewing(recipe.reagent, recipe.input, recipe.output); + }); +}); + +// Potion Types + +/* +'ars_nouveau:shielding_potion_strong' +'ars_nouveau:shielding_potion_long' +'ars_nouveau:shielding_potion' + +'ars_nouveau:freezing_potion_strong' +'ars_nouveau:freezing_potion_long' +'ars_nouveau:freezing_potion' + +'ars_nouveau:blasting_potion_strong' +'ars_nouveau:blasting_potion_long' +'ars_nouveau:blasting_potion' + +'ars_nouveau:recovery_potion_strong' +'ars_nouveau:recovery_potion_long' +'ars_nouveau:recovery_potion' + +'ars_nouveau:spell_damage_potion_strong' +'ars_nouveau:spell_damage_potion_long' +'ars_nouveau:spell_damage_potion' + +'ars_nouveau:mana_regen_potion_strong' +'ars_nouveau:mana_regen_potion_long' +'ars_nouveau:mana_regen_potion' + +'minecraft:long_slow_falling' +'minecraft:slow_falling' + +'minecraft:luck' + +'minecraft:long_weakness' +'minecraft:weakness' + +'minecraft:strong_strength' +'minecraft:long_strength' +'minecraft:strength' + +'minecraft:strong_regeneration' +'minecraft:long_regeneration' +'minecraft:regeneration' + +'minecraft:strong_poison' +'minecraft:long_poison' +'minecraft:poison' + +'minecraft:strong_harming' +'minecraft:harming' + +'minecraft:strong_healing' +'minecraft:healing' + +'minecraft:long_water_breathing' +'minecraft:water_breathing' + +'minecraft:strong_turtle_master' +'minecraft:long_turtle_master' +'minecraft:turtle_master' + +'minecraft:strong_slowness' +'minecraft:long_slowness' +'minecraft:slowness' + +'minecraft:strong_swiftness' +'minecraft:long_swiftness' +'minecraft:swiftness' + +'minecraft:long_fire_resistance' +'minecraft:fire_resistance' + +'minecraft:strong_leaping' +'minecraft:long_leaping' +'minecraft:leaping' + +'minecraft:long_invisibility' +'minecraft:invisibility' + +'minecraft:long_night_vision' +'minecraft:night_vision' +*/ diff --git a/kubejs/server_scripts/recipes/modern_industrialization/blast_furnace.js b/kubejs/server_scripts/recipes/modern_industrialization/blast_furnace.js new file mode 100644 index 00000000..d8652c0a --- /dev/null +++ b/kubejs/server_scripts/recipes/modern_industrialization/blast_furnace.js @@ -0,0 +1,20 @@ +ServerEvents.recipes((event) => { + const id_prefix = 'enigmatica:modern_industrialization/implosion_compressor/'; + + const recipes = [ + { + item_inputs: [{ amount: 1, tag: 'c:ingots/uraninite' }], + // TODO: Convert to AU + // item_outputs: [{ amount: 1, item: AlmostUnified.getPreferredItemForTag('c:ingots/uranium').getId() }], + item_outputs: [{ amount: 1, item: 'modern_industrialization:uranium_ingot' }], + duration: 200, + eu: 128, + id: `${id_prefix}ingot_uranium` + } + ]; + + recipes.forEach((recipe) => { + recipe.type = 'modern_industrialization:blast_furnace'; + event.custom(recipe).id(recipe.id); + }); +}); diff --git a/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js b/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js index aeff69c6..c4eb7684 100644 --- a/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js +++ b/kubejs/server_scripts/tags/block/neoforge/storage_blocks.js @@ -14,7 +14,10 @@ ServerEvents.tags('block', (event) => { blazing: ['powah:blazing_crystal_block'], niotic: ['powah:niotic_crystal_block'], spirited: ['powah:spirited_crystal_block'], - nitro: ['powah:nitro_crystal_block'] + nitro: ['powah:nitro_crystal_block'], + + uranium: ['bigreactors:yellorium_block'], + raw_uranium: ['bigreactors:raw_yellorium_block'] }; Object.keys(additions).forEach((tag) => { diff --git a/kubejs/server_scripts/tags/entity_type/ars_nouveau/magic_find.js b/kubejs/server_scripts/tags/entity_type/ars_nouveau/magic_find.js new file mode 100644 index 00000000..97a16544 --- /dev/null +++ b/kubejs/server_scripts/tags/entity_type/ars_nouveau/magic_find.js @@ -0,0 +1,4 @@ +ServerEvents.tags('entity_type', (event) => { + let additions = ['chococraft:chocobo', 'the_bumblezone:rootmin', 'minecraft:allay']; + event.get('ars_nouveau:magic_find').add(additions); +}); diff --git a/kubejs/server_scripts/tags/item/arts_and_crafts/cork_logs.js b/kubejs/server_scripts/tags/item/arts_and_crafts/cork_logs.js new file mode 100644 index 00000000..d62921c8 --- /dev/null +++ b/kubejs/server_scripts/tags/item/arts_and_crafts/cork_logs.js @@ -0,0 +1,4 @@ +ServerEvents.tags('item', (event) => { + let additions = [/arts_and_crafts:.*cork_(log|wood)/]; + event.get('arts_and_crafts:cork_logs').add(additions); +}); diff --git a/kubejs/server_scripts/tags/item/neoforge/raw_materials.js b/kubejs/server_scripts/tags/item/neoforge/raw_materials.js index aec9ca56..623ab5a4 100644 --- a/kubejs/server_scripts/tags/item/neoforge/raw_materials.js +++ b/kubejs/server_scripts/tags/item/neoforge/raw_materials.js @@ -2,7 +2,8 @@ ServerEvents.tags('item', (event) => { let additions = { ferricore: ['justdirethings:raw_ferricore'], blazegold: ['justdirethings:raw_blazegold'], - eclipsealloy: ['justdirethings:raw_eclipsealloy'] + eclipsealloy: ['justdirethings:raw_eclipsealloy'], + uranium: ['bigreactors:raw_yellorium'] }; Object.keys(additions).forEach((tag) => { diff --git a/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js b/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js index 8716912f..e63bd9a8 100644 --- a/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js +++ b/kubejs/server_scripts/tags/item/neoforge/storage_blocks.js @@ -14,7 +14,10 @@ ServerEvents.tags('item', (event) => { blazing: ['powah:blazing_crystal_block'], niotic: ['powah:niotic_crystal_block'], spirited: ['powah:spirited_crystal_block'], - nitro: ['powah:nitro_crystal_block'] + nitro: ['powah:nitro_crystal_block'], + + uranium: ['bigreactors:yellorium_block'], + raw_uranium: ['bigreactors:raw_yellorium_block'] }; Object.keys(additions).forEach((tag) => { diff --git a/kubejs/startup_scripts/potion_registry.js b/kubejs/startup_scripts/potion_registry.js new file mode 100644 index 00000000..847ae019 --- /dev/null +++ b/kubejs/startup_scripts/potion_registry.js @@ -0,0 +1,61 @@ +StartupEvents.registry('potion', (event) => { + const recipes = [ + { + potion: 'ars_nouveau:flight', + types: [ + { name: 'base', duration: 480, amplifier: 0 }, + { name: 'long', duration: 1080, amplifier: 0 } + ] + }, + { + potion: 'minecraft:resistance', + types: [ + { name: 'base', duration: 180, amplifier: 0 }, + { name: 'long', duration: 480, amplifier: 0 }, + { name: 'strong', duration: 90, amplifier: 1 }, + { name: 'greater', duration: 90, amplifier: 3 } + ] + }, + { + potion: 'minecraft:strength', + types: [{ name: 'greater', duration: 90, amplifier: 3 }] + }, + { + potion: 'minecraft:regeneration', + types: [{ name: 'greater', duration: 22, amplifier: 3 }] + }, + { + potion: 'ars_nouveau:mana_regen', + types: [{ name: 'greater', duration: 180, amplifier: 3 }] + }, + { + potion: 'ars_nouveau:spell_damage', + types: [{ name: 'greater', duration: 180, amplifier: 3 }] + }, + { + potion: 'ars_nouveau:shielding', + types: [{ name: 'greater', duration: 180, amplifier: 3 }] + }, + { + potion: 'ars_nouveau:recovery', + types: [{ name: 'greater', duration: 180, amplifier: 3 }] + } + // { + // potion: 'occultism:double_jump', + // types: [ + // { name: 'base', duration: 180, amplifier: 0 }, + // { name: 'long', duration: 480, amplifier: 0 }, + // { name: 'strong', duration: 90, amplifier: 1 }, + // { name: 'greater', duration: 90, amplifier: 3 } + // ] + // } + ]; + + recipes.forEach((recipe) => { + recipe.types.forEach((type) => { + let potion_id = + type.name == 'base' ? recipe.potion.split(':')[1] : `${type.name}_${recipe.potion.split(':')[1]}`; + event.create(`${potion_id}`).effect(recipe.potion, type.duration * 20, type.amplifier); + }); + }); +});