Merge pull request #490 from MuteTiefling/e9efeedback

E9E Feedback
EnigmaticaModpacks · Jul 15, 2023 · e9fcc73 · e9fcc73
2 parents cf03292 + ca7b677
commit e9fcc73
Show file tree

Hide file tree

Showing 13 changed files with 239 additions and 30 deletions.
diff --git a/config/ftbquests/quests/chapters/chapter_one.snbt b/config/ftbquests/quests/chapters/chapter_one.snbt
@@ -930,7 +930,7 @@
 				""
 				"================================="
 				""
-				"Obtaining Basalz Shards: "
+				"Obtaining Blizz Cubes: "
 				""
 				"Seek out Spawners in the world and break them. They have a chance of causing a rupture in space, allowing creatures of all types to flow through, including Basalz and other elementals. Defeat them and close the rift to obtain Basalz Shards."
 			]

diff --git a/config/ftbquests/quests/chapters/natures_aura.snbt b/config/ftbquests/quests/chapters/natures_aura.snbt
@@ -1329,7 +1329,7 @@
 				""
 				"● Skyseeker’s Pickaxe: Instantly teleports mined blocks into the user’s inventory."
 				""
-				"● Skyseeker’s Handaxe: Capable of chipping entire trees in a single action."
+				"● Skyseeker’s Handaxe: Capable of chopping entire trees in a single action."
 				""
 				"● Skyseeker’s Shovel: Upon Right-Click, replaces the target block with whatever block is held in the off-hand."
 				""

diff --git a/config/ftbquests/quests/chapters/natures_aura_expert.snbt b/config/ftbquests/quests/chapters/natures_aura_expert.snbt
@@ -1285,7 +1285,7 @@
 				""
 				"● Skyseeker’s Pickaxe: Instantly teleports mined blocks into the user’s inventory."
 				""
-				"● Skyseeker’s Handaxe: Capable of chipping entire trees in a single action."
+				"● Skyseeker’s Handaxe: Capable of chopping entire trees in a single action."
 				""
 				"● Skyseeker’s Shovel: Upon Right-Click, replaces the target block with whatever block is held in the off-hand."
 				""

diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js
@@ -283,13 +283,24 @@ jei.expert.items.disabled = [
     'create:electron_tube',
     'create:mechanical_crafter',
     'create:experience_nugget',
+    'create:andesite_alloy_block',
 
     'createaddition:alternator',
     'createaddition:modular_accumulator',
     'createaddition:capacitor',
     'createaddition:portable_energy_interface',
     'createaddition:digital_adapter',
 
+    'emendatusenigmatica:refined_glowstone_nugget',
+    'emendatusenigmatica:refined_glowstone_ingot',
+    'emendatusenigmatica:refined_glowstone_block',
+    'emendatusenigmatica:refined_obsidian_dust',
+    'emendatusenigmatica:refined_obsidian_nugget',
+    'emendatusenigmatica:refined_obsidian_ingot',
+    'emendatusenigmatica:refined_obsidian_block',
+    'emendatusenigmatica:andesite_block',
+    'emendatusenigmatica:andesite_ingot',
+
     'immersiveengineering:capacitor_hv',
     'immersiveengineering:capacitor_lv',
     'immersiveengineering:capacitor_mv',
@@ -387,6 +398,9 @@ jei.expert.items.disabled = [
     /mekanism:.*_control_circuit/,
     /mekanism:hazmat/,
     /mekanism:scuba/,
+    'mekanism:pellet_plutonium',
+    'mekanism:alloy_atomic',
+    'mekanism:alloy_infused',
     'mekanism:upgrade_stone_generator',
     'mekanism:upgrade_filter',
     'mekanism:logistical_sorter',
@@ -600,13 +614,62 @@ jei.expert.items.disabled = [
     'rftoolsbase:information_screen',
     'rftoolsbase:crafting_card',
 
+    'sophisticatedbackpacks:advanced_feeding_upgrade',
+    'sophisticatedbackpacks:feeding_upgrade',
+    'sophisticatedbackpacks:advanced_pump_upgrade',
+    'sophisticatedbackpacks:pump_upgrade',
+    'sophisticatedbackpacks:xp_pump_upgrade',
+    'sophisticatedbackpacks:tank_upgrade',
+    'sophisticatedbackpacks:advanced_tool_swapper_upgrade',
+    'sophisticatedbackpacks:tool_swapper_upgrade',
+    'sophisticatedbackpacks:auto_blasting_upgrade',
+    'sophisticatedbackpacks:blasting_upgrade',
+    'sophisticatedbackpacks:auto_smelting_upgrade',
+    'sophisticatedbackpacks:smelting_upgrade',
+    'sophisticatedbackpacks:auto_smoking_upgrade',
+    'sophisticatedbackpacks:smoking_upgrade',
     'sophisticatedbackpacks:battery_upgrade',
-    'sophisticatedstorage:gold_to_netherite_tier_upgrade',
-    'sophisticatedstorage:iron_to_netherite_tier_upgrade',
-    'sophisticatedstorage:iron_to_diamond_tier_upgrade',
-    'sophisticatedstorage:basic_to_netherite_tier_upgrade',
-    'sophisticatedstorage:basic_to_diamond_tier_upgrade',
+
+    'sophisticatedstorage:advanced_feeding_upgrade',
+    'sophisticatedstorage:feeding_upgrade',
+    'sophisticatedstorage:advanced_pump_upgrade',
+    'sophisticatedstorage:pump_upgrade',
+    'sophisticatedstorage:xp_pump_upgrade',
+    'sophisticatedstorage:auto_blasting_upgrade',
+    'sophisticatedstorage:blasting_upgrade',
+    'sophisticatedstorage:auto_smelting_upgrade',
+    'sophisticatedstorage:smelting_upgrade',
+    'sophisticatedstorage:auto_smoking_upgrade',
+    'sophisticatedstorage:smoking_upgrade',
+    'sophisticatedstorage:crafting_upgrade',
+    'sophisticatedstorage:limited_barrel_1',
+    'sophisticatedstorage:limited_barrel_2',
+    'sophisticatedstorage:limited_barrel_3',
+    'sophisticatedstorage:limited_barrel_4',
+    'sophisticatedstorage:limited_diamond_barrel_1',
+    'sophisticatedstorage:limited_diamond_barrel_2',
+    'sophisticatedstorage:limited_diamond_barrel_3',
+    'sophisticatedstorage:limited_diamond_barrel_4',
+    'sophisticatedstorage:limited_gold_barrel_1',
+    'sophisticatedstorage:limited_gold_barrel_2',
+    'sophisticatedstorage:limited_gold_barrel_3',
+    'sophisticatedstorage:limited_gold_barrel_4',
+    'sophisticatedstorage:limited_iron_barrel_1',
+    'sophisticatedstorage:limited_iron_barrel_2',
+    'sophisticatedstorage:limited_iron_barrel_3',
+    'sophisticatedstorage:limited_iron_barrel_4',
+    'sophisticatedstorage:limited_netherite_barrel_1',
+    'sophisticatedstorage:limited_netherite_barrel_2',
+    'sophisticatedstorage:limited_netherite_barrel_3',
+    'sophisticatedstorage:limited_netherite_barrel_4',
+
     'sophisticatedstorage:basic_to_gold_tier_upgrade',
+    'sophisticatedstorage:basic_to_diamond_tier_upgrade',
+    'sophisticatedstorage:basic_to_netherite_tier_upgrade',
+    'sophisticatedstorage:iron_to_diamond_tier_upgrade',
+    'sophisticatedstorage:iron_to_netherite_tier_upgrade',
+    'sophisticatedstorage:gold_to_netherite_tier_upgrade',
+    'sophisticatedstorage:diamond_to_netherite_tier_upgrade',
 
     'superiorshields:copper_shield',
     'superiorshields:diamond_shield',

diff --git a/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/naga.js b/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/naga.js
@@ -8,6 +8,17 @@ ServerEvents.genericLootTables((event) => {
             pool.addItem(Item.of('twilightforest:naga_scale'), 1, [5, 15]);
         });
 
+        table.addPool((pool) => {
+            pool.rolls = [1, 1];
+            pool.addItem(
+                Item.of('twilightforest:ironwood_hoe')
+                    .enchant('minecraft:unbreaking', 5)
+                    .enchant('apotheosis:natures_blessing', 3),
+                1,
+                1
+            );
+        });
+
         table.addPool((pool) => {
             pool.rolls = [1, 1];
             pool.addItem(
@@ -20,8 +31,8 @@ ServerEvents.genericLootTables((event) => {
                         { id: 'quark:yellow_blossom_sapling', Count: 1 },
                         { id: 'quark:red_blossom_sapling', Count: 1 },
 
-                        { id: 'hexerei:willow_sapling', Count: 1 },
-                        { id: 'hexerei:mahogany_sapling', Count: 1 },
+                        { id: 'hexerei:willow_sapling', Count: 2 },
+                        { id: 'hexerei:mahogany_sapling', Count: 2 },
 
                         { id: 'hexerei:mandrake_flower', Count: 3 },
                         { id: 'hexerei:yellow_dock_bush', Count: 3 },

diff --git a/kubejs/server_scripts/expert/recipes/ars_elemental/shaped.js b/kubejs/server_scripts/expert/recipes/ars_elemental/shaped.js
@@ -14,6 +14,16 @@ ServerEvents.recipes((event) => {
                 C: '#forge:gems/source'
             },
             id: `${id_prefix}everfull_urn`
+        },
+        {
+            output: 'ars_elemental:caster_bag',
+            pattern: ['BAB', 'ACA', 'AAA'],
+            key: {
+                A: '#forge:leather',
+                B: 'ars_nouveau:magebloom_fiber',
+                C: '#forge:gems/source'
+            },
+            id: 'ars_elemental:caster_bag'
         }
     ];
 

diff --git a/kubejs/server_scripts/expert/recipes/ars_nouveau/imbuement.js b/kubejs/server_scripts/expert/recipes/ars_nouveau/imbuement.js
@@ -76,6 +76,62 @@ ServerEvents.recipes((event) => {
             source: 500,
             id: `ars_nouveau:imbuement_manipulation_essence`
         },
+        {
+            output: 'ars_nouveau:fire_essence',
+            count: 4,
+            reagent: '#forge:storage_blocks/source',
+            inputs: ['twilightforest:fiery_blood', 'hexerei:dried_yellow_dock_flowers', 'minecraft:blaze_rod'],
+            source: 2000,
+            id: `${id_prefix}imbuement_fire_essence_from_block`
+        },
+        {
+            output: 'ars_nouveau:air_essence',
+            count: 4,
+            reagent: '#forge:storage_blocks/source',
+            inputs: ['twilightforest:raven_feather', 'hexerei:dried_sage', 'thermal:blitz_rod'],
+            source: 2000,
+            id: `${id_prefix}imbuement_air_essence_from_block`
+        },
+        {
+            output: 'ars_nouveau:water_essence',
+            count: 4,
+            reagent: '#forge:storage_blocks/source',
+            inputs: ['twilightforest:alpha_yeti_fur', 'hexerei:dried_belladonna_flowers', 'thermal:blizz_rod'],
+            source: 2000,
+            id: `${id_prefix}imbuement_water_essence_from_block`
+        },
+        {
+            output: 'ars_nouveau:earth_essence',
+            count: 4,
+            reagent: '#forge:storage_blocks/source',
+            inputs: ['twilightforest:magic_beans', 'hexerei:mandrake_root', 'thermal:basalz_rod'],
+            source: 2000,
+            id: `${id_prefix}imbuement_earth_essence_from_block`
+        },
+        {
+            output: 'ars_nouveau:abjuration_essence',
+            count: 4,
+            reagent: '#forge:storage_blocks/source',
+            inputs: ['#forge:ingots/bronze', 'twilightforest:cicada', 'twilightforest:naga_scale'],
+            source: 2000,
+            id: `${id_prefix}imbuement_abjuration_essence_from_block`
+        },
+        {
+            output: 'ars_nouveau:conjuration_essence',
+            count: 4,
+            reagent: '#forge:storage_blocks/source',
+            inputs: ['#forge:ingots/silver', 'ars_nouveau:magebloom_block', 'minecraft:compass'],
+            source: 2000,
+            id: `${id_prefix}imbuement_conjuration_essence_from_block`
+        },
+        {
+            output: 'ars_nouveau:manipulation_essence',
+            count: 4,
+            reagent: '#forge:storage_blocks/source',
+            inputs: ['#forge:ingots/copper', 'minecraft:redstone_lamp', 'minecraft:clock'],
+            source: 2000,
+            id: `${id_prefix}imbuement_manipulation_essence_from_block`
+        },
         {
             output: 'naturesaura:infused_stone',
             count: 1,

diff --git a/kubejs/server_scripts/expert/recipes/ars_nouveau/shapeless.js b/kubejs/server_scripts/expert/recipes/ars_nouveau/shapeless.js
@@ -56,6 +56,11 @@ ServerEvents.recipes((event) => {
                 '#forge:dusts/moon_dust'
             ],
             id: 'ars_nouveau:ritual_flight'
+        },
+        {
+            output: '2x ars_nouveau:end_fiber',
+            inputs: ['ars_nouveau:magebloom_fiber', 'ars_nouveau:magebloom_fiber', '#forge:dusts/end_stone'],
+            id: 'ars_nouveau:end_fiber'
         }
     ];
 

diff --git a/kubejs/server_scripts/expert/recipes/enigmatica/blasting.js b/kubejs/server_scripts/expert/recipes/enigmatica/blasting.js
@@ -84,6 +84,9 @@ ServerEvents.recipes((event) => {
 
     const metals = Object.keys(metal_properties);
     metals.forEach((metal) => {
+        if (metal == 'refined_obsidian') {
+            return;
+        }
         let preferredIngot = AlmostUnified.getPreferredItemForTag(`forge:ingots/${metal}`).getId();
         if (Item.exists(`emendatusenigmatica:${metal}_dust`) && !preferredIngot.includes('graphite')) {
             recipes.push({

diff --git a/kubejs/server_scripts/expert/recipes/enigmatica/remove.js b/kubejs/server_scripts/expert/recipes/enigmatica/remove.js
@@ -57,7 +57,7 @@ ServerEvents.recipes((event) => {
         { id: 'ae2:network/blocks/energy_dense_energy_cell' },
         { id: 'ae2:network/blocks/quantum_link' },
         { id: 'ae2:network/blocks/controller' },
-        { id: `ae2:network/crafting/cpu_crafting_unit` },
+        { id: 'ae2:network/crafting/cpu_crafting_unit' },
         { id: 'ae2:network/parts/quartz_fiber_part' },
         { id: 'ae2:network/wireless_terminal' },
         { id: 'ae2:network/upgrade_wireless_crafting_terminal' },
@@ -89,6 +89,7 @@ ServerEvents.recipes((event) => {
         { id: /create:pressing\/.*_ingot/ },
         { id: /create:brass_(ladder|scaffolding|bars)_from_ingots_brass_stonecutting/ },
         { id: /create:copycat_.*_from_ingots_zinc_stonecutting/ },
+        { id: /create:.*andesite_alloy/ },
         { id: 'create:crafting/kinetics/white_sail' },
         { id: 'create:crafting/kinetics/empty_blaze_burner' },
         { id: 'create:crafting/kinetics/mechanical_crafter' },
@@ -99,8 +100,8 @@ ServerEvents.recipes((event) => {
         { id: 'create:mixing/andesite_alloy' },
         { id: 'create:mechanical_crafting/wand_of_symmetry' },
         { id: 'create:mechanical_crafting/extendo_grip' },
-        { id: `create:mechanical_crafting/crushing_wheel` },
-        { id: `create:mechanical_crafting/potato_cannon` },
+        { id: 'create:mechanical_crafting/crushing_wheel' },
+        { id: 'create:mechanical_crafting/potato_cannon' },
         { id: 'create:item_application/brass_casing_from_wood' },
         { id: 'create:item_application/brass_casing_from_log' },
         { id: 'create:conversion_0' },
@@ -126,8 +127,9 @@ ServerEvents.recipes((event) => {
         { id: /emendatusenigmatica:rod\/from_ingot/ },
         { id: /emendatusenigmatica:gear\/from_ingot/ },
         { id: /emendatusenigmatica:dust\/from_gem/ },
+        { id: /emendatusenigmatica:.*andesite/ },
 
-        { id: `enigmaticunity:dim_source_producer` },
+        { id: 'enigmaticunity:dim_source_producer' },
 
         { id: 'farmersdelight:integration/immersiveengineering/metalpress/pumpkin' },
 
@@ -143,7 +145,7 @@ ServerEvents.recipes((event) => {
         { id: 'hexerei:blood_sigil_from_mixing_cauldron' },
         { id: 'hexerei:herb_jar_from_mixing_cauldron' },
         { id: 'hexerei:mixing_cauldron' },
-        { id: `hexerei:moon_dust_from_mixing_cauldron` },
+        { id: 'hexerei:moon_dust_from_mixing_cauldron' },
 
         { id: /empty_shell/, mod: 'immersiveengineering' },
         { id: /empty_casing/, mod: 'immersiveengineering' },
@@ -172,7 +174,7 @@ ServerEvents.recipes((event) => {
         { id: 'immersiveengineering:crafting/current_transformer' },
         { id: 'immersiveengineering:crafting/redstone_breaker' },
         { id: 'immersiveengineering:crafting/breaker_switch' },
-        { id: `immersiveengineering:crafting/cloche` },
+        { id: 'immersiveengineering:crafting/cloche' },
         { id: 'immersiveengineering:blueprint/electron_tube' },
         { id: 'immersiveengineering:blueprint/component_electronic' },
         { id: 'immersiveengineering:blueprint/light_bulb' },
@@ -204,15 +206,15 @@ ServerEvents.recipes((event) => {
         { id: 'industrialforegoing:dissolution_chamber/mechanical_dirt' },
         { id: 'industrialforegoing:dissolution_chamber/pink_slime_ingot' },
         { id: 'industrialforegoing:crusher/sand_silicon' },
-        { id: `industrialforegoing:laser_drill_fluid/ether_gas` },
+        { id: 'industrialforegoing:laser_drill_fluid/ether_gas' },
         { id: 'industrialforegoing:machine_frame_pity' },
         { id: 'industrialforegoing:plastic' },
         { id: 'industrialforegoing:washing_factory' },
         { id: 'industrialforegoing:fermentation_station' },
         { id: 'industrialforegoing:fluid_sieving_machine' },
         { id: 'industrialforegoing:ore_laser_base' },
         { id: 'industrialforegoing:fluid_laser_base' },
-        { id: `industrialforegoing:dryrubber` },
+        { id: 'industrialforegoing:dryrubber' },
         { id: 'industrialforegoing:latex_processing_unit' },
         { id: 'industrialforegoing:mob_duplicator' },
         { id: 'industrialforegoing:bioreactor' },
@@ -252,6 +254,8 @@ ServerEvents.recipes((event) => {
         { id: /mekanism:thermal_evaporation/ },
         { id: /mekanism:control_circuit/ },
         { id: /mekanism:upgrade\// },
+        { id: /refined_obsidian/ },
+        { id: /refined_glowstone/ },
         { id: 'mekanism:crushing/charcoal_dust' },
         { id: 'mekanism:enriching/hdpe_sheet' },
         { id: 'mekanism:compat/ae2/fluix_crystal_to_dust' },
@@ -443,10 +447,10 @@ ServerEvents.recipes((event) => {
         { id: 'powah:crafting/energizing_rod_basic' },
         { id: 'powah:energizing/ender_core' },
         { id: 'powah:energizing/blazing_crystal' },
-        { id: `powah:energizing/spirited_crystal` },
-        { id: `powah:energizing/niotic_crystal` },
-        { id: `powah:energizing/energized_steel` },
-        { id: `powah:energizing/nitro_crystal` },
+        { id: 'powah:energizing/spirited_crystal' },
+        { id: 'powah:energizing/niotic_crystal' },
+        { id: 'powah:energizing/energized_steel' },
+        { id: 'powah:energizing/nitro_crystal' },
 
         {
             id: /powah:crafting\/(thermo_generator|solar_panel|furnator|magmator|reactor|energy|cable|battery|ender)/
@@ -482,14 +486,14 @@ ServerEvents.recipes((event) => {
         { id: 'sophisticatedstorage:gold_to_diamond_tier_upgrade' },
         { id: 'sophisticatedstorage:stack_upgrade_tier_4' },
 
-        { id: `spirit:soul_engulfing/soul_powder` },
-        { id: `spirit:soul_engulfing/soul_powder_block` },
-        { id: `spirit:soul_engulfing/soul_slate` },
-        { id: `spirit:soul_engulfing/soul_steel` },
-        { id: `spirit:soul_engulfing/soul_steel_block` },
-        { id: `spirit:soul_engulfing/crude_soul_crystal` },
-        { id: `spirit:soul_engulfing/soul_crystal_shard` },
-        { id: `spirit:soul_engulfing/soul_crystal` },
+        { id: 'spirit:soul_engulfing/soul_powder' },
+        { id: 'spirit:soul_engulfing/soul_powder_block' },
+        { id: 'spirit:soul_engulfing/soul_slate' },
+        { id: 'spirit:soul_engulfing/soul_steel' },
+        { id: 'spirit:soul_engulfing/soul_steel_block' },
+        { id: 'spirit:soul_engulfing/crude_soul_crystal' },
+        { id: 'spirit:soul_engulfing/soul_crystal_shard' },
+        { id: 'spirit:soul_engulfing/soul_crystal' },
 
         { id: 'starbunclemania:fluid_jar' },
         { id: 'starbunclemania:fluid_sourcelink' },

diff --git a/kubejs/server_scripts/expert/recipes/farmersdelight/cutting.js b/kubejs/server_scripts/expert/recipes/farmersdelight/cutting.js
@@ -40,6 +40,15 @@ ServerEvents.recipes((event) => {
             result: [{ item: 'minecraft:leather' }, { item: 'twilightforest:knightmetal_ingot', chance: 0.1 }],
             tool: { tag: 'forge:shears' },
             id: `farmersdelight:cutting/saddle`
+        },
+        {
+            ingredients: [{ item: 'minecraft:dripstone_block' }],
+            result: [{ item: 'minecraft:pointed_dripstone', count: 4 }],
+            tool: {
+                type: 'farmersdelight:tool_action',
+                action: 'pickaxe_dig'
+            },
+            id: `${id_prefix}pointed_dripstone`
         }
     ];