Merge pull request #440 from MuteTiefling/e9e-continued-feedback

E9E Testing - Continued Feedback
EnigmaticaModpacks · Jun 25, 2023 · 7523ff3 · 7523ff3
2 parents fa3a2df + 085be5a
commit 7523ff3
Show file tree

Hide file tree

Showing 14 changed files with 115 additions and 18 deletions.
diff --git a/config/ftbquests/quests/chapters/create.snbt b/config/ftbquests/quests/chapters/create.snbt
@@ -233,10 +233,8 @@
 					type: "item"
 				}
 				{
-					count: 4
-					id: "0000000000000D73"
-					item: "minecraft:magma_block"
-					title: "Magma Block"
+					id: "0C159F1488C9CC3B"
+					item: "minecraft:campfire"
 					type: "item"
 				}
 			]

diff --git a/config/ftbquests/quests/chapters/create_expert.snbt b/config/ftbquests/quests/chapters/create_expert.snbt
@@ -240,10 +240,8 @@
 					type: "item"
 				}
 				{
-					count: 4
-					id: "2DDBD673E27C84CB"
-					item: "minecraft:magma_block"
-					title: "Magma Block"
+					id: "2836A754827B4CA8"
+					item: "minecraft:campfire"
 					type: "item"
 				}
 			]

diff --git a/config/ftbquests/quests/chapters/occultism_expert.snbt b/config/ftbquests/quests/chapters/occultism_expert.snbt
@@ -50,6 +50,10 @@
 				"Burning the fruit causes a small rift to open into the Otherworld, creating a flame that exists primarily in that Other Place, simply toss it down and light it. This flame will not burn creatures but may be used to transmute or purify certain materials. "
 				""
 				"Finally, Spirits from the Otherworld adore the taste of this fruit and feeding it to them will help restore their health. "
+				""
+				"================================================="
+				""
+				"Fires can be started with Fire Charges as well as Flint and Steel."
 			]
 			hide_dependency_lines: true
 			icon: "occultism:spirit_fire"

diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
@@ -218,6 +218,27 @@
     "ritual.enigmatica.occultism/ritual/ritual_craft_willow_broom.interrupted": "Ritual of Binding interrupted.",
     "ritual.enigmatica.occultism/ritual/ritual_craft_willow_broom.conditions": "Not all requirements for this ritual are met.",
 
+    "item.kubejs.ritual_craft_witch_hazel_broom": "Ritual: Craft Witch Hazel Broom",
+    "item.kubejs.ritual_craft_witch_hazel_broom.tooltip": "Bind a fae into a broom to obtain the power of flight.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_witch_hazel_broom.started": "Ritual of Binding started.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_witch_hazel_broom.finished": "Ritual of Binding completed.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_witch_hazel_broom.interrupted": "Ritual of Binding interrupted.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_witch_hazel_broom.conditions": "Not all requirements for this ritual are met.",
+
+    "item.kubejs.ritual_craft_mahogany_broom": "Ritual: Craft Mahogany Broom",
+    "item.kubejs.ritual_craft_mahogany_broom.tooltip": "Bind a fae into a broom to obtain the power of flight.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_mahogany_broom.started": "Ritual of Binding started.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_mahogany_broom.finished": "Ritual of Binding completed.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_mahogany_broom.interrupted": "Ritual of Binding interrupted.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_mahogany_broom.conditions": "Not all requirements for this ritual are met.",
+
+    "item.kubejs.ritual_craft_archwood_broom": "Ritual: Craft Archwood Broom",
+    "item.kubejs.ritual_craft_archwood_broom.tooltip": "Bind a fae into a broom to obtain the power of flight.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_archwood_broom.started": "Ritual of Binding started.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_archwood_broom.finished": "Ritual of Binding completed.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_archwood_broom.interrupted": "Ritual of Binding interrupted.",
+    "ritual.enigmatica.occultism/ritual/ritual_craft_archwood_broom.conditions": "Not all requirements for this ritual are met.",
+
     "item.kubejs.ritual_craft_module_expansion_card": "Ritual: Craft Module Expansion Card",
     "item.kubejs.ritual_craft_module_expansion_card.tooltip": "Bind an Air Elemental to control Tube Modules.",
     "ritual.enigmatica.occultism/ritual/ritual_craft_module_expansion_card.started": "Ritual of Binding started.",

diff --git a/kubejs/client_scripts/base/jei_descriptions.js b/kubejs/client_scripts/base/jei_descriptions.js
@@ -388,6 +388,12 @@ JEIEvents.information((event) => {
             text: [
                 `The functionality of the Cardboard Box has been limited to simple Chests, Barrels, Crates, and other inventories that cannot otherwise be moved easily.`
             ]
+        },
+        {
+            items: ['twilightforest:red_thread'],
+            text: [
+                `This string-like item can be placed on any side of a block. When held, it will glow and be visible through other blocks. Helpful for markers or finding your way back home.`
+            ]
         }
     ];
 

diff --git a/kubejs/server_scripts/base/recipes/apotheosis/minibosses/minecraft.js b/kubejs/server_scripts/base/recipes/apotheosis/minibosses/minecraft.js
@@ -195,7 +195,7 @@ ServerEvents.highPriorityData((event) => {
         {
             id: 'vindicator',
             name: null,
-            chance: 1.0,
+            chance: 0.5,
             weight: 100,
             quality: 0,
             entities: ['minecraft:vindicator'],
@@ -211,7 +211,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 30, steps: 1, step: 0 }
+                        value: 26
                     }
                 ]
             }
@@ -235,7 +235,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 30, steps: 1, step: 0 }
+                        value: 26
                     }
                 ]
             }
@@ -394,7 +394,7 @@ ServerEvents.highPriorityData((event) => {
         {
             id: 'drowned',
             name: null,
-            chance: 1.0,
+            chance: 0.05,
             weight: 100,
             quality: 0,
             entities: ['minecraft:drowned'],

diff --git a/kubejs/server_scripts/base/tags/entity_type/enigmatica/mob_spawner_blacklist.js b/kubejs/server_scripts/base/tags/entity_type/enigmatica/mob_spawner_blacklist.js
@@ -3,8 +3,10 @@ ServerEvents.tags('entity_type', (event) => {
         .get('enigmatica:mob_spawner_blacklist')
         .add([
             /occultism/,
-            /ars_nouveau:familiar_.*/,
+            /ars_nouveau/,
+            /pneumaticcraft.*drone/,
             /ars_elemental:.*_familiar/,
+            '#forge:bosses',
             'twilightforest:naga',
             'twilightforest:lich',
             'twilightforest:minoshroom',
@@ -17,5 +19,6 @@ ServerEvents.tags('entity_type', (event) => {
             'minecraft:wither',
             'minecraft:ender_dragon',
             'quark:stoneling'
-        ]);
+        ])
+        .remove([/ars_nouveau:wilden/]);
 });
diff --git a/kubejs/server_scripts/base/tags/entity_type/spirit/collect_blacklisted.js b/kubejs/server_scripts/base/tags/entity_type/spirit/collect_blacklisted.js
@@ -0,0 +1,3 @@
+ServerEvents.tags('entity_type', (event) => {
+    event.get('spirit:collect_blacklisted').add(['#enigmatica:mob_spawner_blacklist']);
+});
diff --git a/kubejs/server_scripts/base/tags/items/forge/rods.js b/kubejs/server_scripts/base/tags/items/forge/rods.js
@@ -1,9 +1,12 @@
 ServerEvents.tags('item', (event) => {
-    event.add('forge:rods', ['thermal:blizz_rod', 'thermal:blitz_rod', 'thermal:basalz_rod']);
+    event.get('forge:rods').add(['thermal:blizz_rod', 'thermal:blitz_rod', 'thermal:basalz_rod']);
 
     event.add(`forge:rods/blizz`, 'thermal:blizz_rod');
     event.add(`forge:rods/blitz`, 'thermal:blitz_rod');
     event.add(`forge:rods/basalz`, 'thermal:basalz_rod');
+    event.add(`forge:rods/ancient`, 'naturesaura:ancient_stick');
+
+    event.get(`forge:rods/wooden`).remove(['naturesaura:ancient_stick']);
 
     event
         .get('forge:rods/all_metal')

diff --git a/kubejs/server_scripts/expert/loot_tables/chests/enigmatica/natures_aura_loot_boxes.js b/kubejs/server_scripts/expert/loot_tables/chests/enigmatica/natures_aura_loot_boxes.js
@@ -11,6 +11,7 @@ ServerEvents.genericLootTables((event) => {
             pool.addItem('naturesaura:ancient_log', 1, 16);
             pool.addItem('naturesaura:ender_crate', 1, 2);
             pool.addItem('naturesaura:spawn_lamp', 1, 1);
+            pool.addItem('naturesaura:furnace_heater', 1, 2);
 
             pool.addItem('minecraft:activator_rail', 1, [4, 8]);
             pool.addItem('minecraft:rail', 1, [8, 16]);

diff --git a/kubejs/server_scripts/expert/recipes/create/shaped.js b/kubejs/server_scripts/expert/recipes/create/shaped.js
@@ -357,7 +357,7 @@ ServerEvents.recipes((event) => {
             pattern: ['ABA', 'ACA', 'ABA'],
             key: {
                 A: '#forge:rods/iron',
-                B: '#forge:treated_wood_slab',
+                B: 'minecraft:smooth_stone_slab',
                 C: '#forge:gravel'
             },
             id: `${id_prefix}track_from_iron`
@@ -367,7 +367,7 @@ ServerEvents.recipes((event) => {
             pattern: ['ABA', 'ACA', 'ABA'],
             key: {
                 A: '#forge:rods/osmium',
-                B: '#forge:treated_wood_slab',
+                B: 'minecraft:smooth_stone_slab',
                 C: '#forge:gravel'
             },
             id: `${id_prefix}track_from_osmium`
@@ -377,7 +377,7 @@ ServerEvents.recipes((event) => {
             pattern: ['ABA', 'ACA', 'ABA'],
             key: {
                 A: '#forge:rods/bronze',
-                B: '#forge:treated_wood_slab',
+                B: 'minecraft:smooth_stone_slab',
                 C: '#forge:gravel'
             },
             id: `${id_prefix}track_from_bronze`

diff --git a/kubejs/server_scripts/expert/recipes/hexerei/pestle_and_mortar.js b/kubejs/server_scripts/expert/recipes/hexerei/pestle_and_mortar.js
@@ -83,6 +83,18 @@ ServerEvents.recipes((event) => {
             output: '8x naturesaura:gold_fiber',
             grindingTime: 2 * 20,
             id: `${id_prefix}gold_fiber`
+        },
+        {
+            inputs: [
+                'hexerei:belladonna_flowers',
+                'hexerei:belladonna_berries',
+                'hexerei:belladonna_berries',
+                'hexerei:belladonna_berries',
+                'hexerei:sage'
+            ],
+            output: '2x hexerei:mindful_trance_blend',
+            grindingTime: 2 * 20,
+            id: `hexerei:mindful_trance_blend_from_pestle_and_mortar`
         }
     ];
 

diff --git a/kubejs/server_scripts/expert/recipes/naturesaura/altar.js b/kubejs/server_scripts/expert/recipes/naturesaura/altar.js
@@ -127,6 +127,13 @@ ServerEvents.recipes((event) => {
             aura: 5000,
             time: 60,
             id: `${id_prefix}spore_blossom`
+        },
+        {
+            output: 'twilightforest:ore_magnet',
+            input: 'minecraft:lodestone',
+            aura: 90000,
+            time: 300,
+            id: `${id_prefix}ore_magnet`
         }
     ];
 

diff --git a/kubejs/server_scripts/expert/recipes/twilightforest/shaped.js b/kubejs/server_scripts/expert/recipes/twilightforest/shaped.js
@@ -24,6 +24,47 @@ ServerEvents.recipes((event) => {
                 D: '#forge:dusts/redstone'
             },
             id: `${id_prefix}moon_dial`
+        },
+        {
+            output: '8x twilightforest:red_thread',
+            pattern: ['AAA', 'ABA', 'AAA'],
+            key: {
+                A: '#forge:string',
+                B: 'twilightforest:torchberries'
+            },
+            id: `${id_prefix}red_thread`
+        },
+        {
+            output: 'twilightforest:moonworm_queen',
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: '#forge:dusts/moon_dust',
+                B: '#forge:essences/anima',
+                C: '#forge:essences/manipulation',
+                D: 'twilightforest:torchberries'
+            },
+            id: `${id_prefix}moonworm_queen`
+        },
+        {
+            output: 'twilightforest:moonworm_queen',
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: '#forge:dusts/moon_dust',
+                B: '#forge:essences/anima',
+                C: '#forge:essences/manipulation',
+                D: 'twilightforest:torchberries'
+            },
+            id: `${id_prefix}moonworm_queen`
+        },
+        {
+            output: 'twilightforest:transformation_powder',
+            pattern: ['AAA', 'ABA', 'ACA'],
+            key: {
+                A: '#forge:dusts/moon_dust',
+                B: '#forge:essences/manipulation',
+                C: 'thermal:satchel'
+            },
+            id: `${id_prefix}transformation_powder`
         }
     ];