Merge pull request EnigmaticaModpacks#5464 from MuteTiefling/patches

Small patches
MuteTiefling · Jul 9, 2024 · b3f3bf6 · b3f3bf6
2 parents e79c73b + de446ec
commit b3f3bf6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -10,6 +10,8 @@
 **Bug fixes**
 
 -   Fix IE assembler being unable to craft capacitors [\#5447](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5447) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Fix issues with Necrotic Bones in Tinker's quests [\#5464](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5464) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Remove invalid scene from hive ponder [\#5464](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5464) ([MuteTiefling](https://github.com/MuteTiefling))
 
 ### Enigmatica 6 & Enigmatica 6: Expert v1.9.0
 

diff --git a/config/ftbquests/quests/chapters/tinkers_construct.snbt b/config/ftbquests/quests/chapters/tinkers_construct.snbt
@@ -3262,7 +3262,14 @@
 			tasks: [{
 				id: "7C1FCB8F38A3F12E"
 				type: "item"
-				item: "tconstruct:necrotic_bone"
+				title: "Necrotic Bones"
+				item: {
+					id: "itemfilters:tag"
+					Count: 1b
+					tag: {
+						value: "forge:bones/wither"
+					}
+				}
 				count: 3L
 			}]
 			rewards: [{

diff --git a/kubejs/client_scripts/ponder/magic/resourcefulbees/mutation.js b/kubejs/client_scripts/ponder/magic/resourcefulbees/mutation.js
@@ -191,39 +191,39 @@ onEvent('ponder.registry', (event) => {
 
             scene.world().destroyBlock([1, 1, 1]);
 
-            scene.addKeyframe();
+            // scene.addKeyframe();
+            // scene
+            //     .overlay()
+            //     .showText(60)
+            //     .colored(PonderPalette.WHITE)
+            //     .text('It can also mutate a block of coal into a Steel Bee Egg.')
+            //     .independent(30);
 
-            scene
-                .overlay()
-                .showText(60)
-                .colored(PonderPalette.WHITE)
-                .text('It can also mutate a block of coal into a Steel Bee Egg.')
-                .independent(30);
+            // scene.idle(20);
 
-            scene.idle(20);
+            // scene.world().setBlock([1, 1, 1], util.getDefaultState('minecraft:coal_block'), true);
 
-            scene.world().setBlock([1, 1, 1], util.getDefaultState('minecraft:coal_block'), true);
+            // scene.idle(40);
 
-            scene.idle(40);
+            // scene.world().destroyBlock([1, 1, 1]);
+            // scene.idle(1);
+            // spawnEgg = scene
+            //     .world()
+            //     .createItemEntity([1, 1.5, 1], [0, 0, 0], Item.of('resourcefulbees:steel_bee_spawn_egg'));
 
-            scene.world().destroyBlock([1, 1, 1]);
-            scene.idle(1);
-            spawnEgg = scene
-                .world()
-                .createItemEntity([1, 1.5, 1], [0, 0, 0], Item.of('resourcefulbees:steel_bee_spawn_egg'));
-
-            scene.idle(40);
-
-            scene.addKeyframe();
+            // scene.idle(40);
 
+            // scene.world().modifyEntity(spawnEgg, (e) => {
+            //     e.mergeFullNBT({ Pos: [2, -1, 2] });
+            //     e.kill();
+            // });
             scene.world().modifyEntity(ironBee, (e) => {
                 e.mergeFullNBT({ Pos: [1.5, 0, 1.5] });
                 e.kill();
             });
-            scene.world().modifyEntity(spawnEgg, (e) => {
-                e.mergeFullNBT({ Pos: [2, -1, 2] });
-                e.kill();
-            });
+
+            scene.addKeyframe();
+
             scene.idle(20);
             var icyBee = scene.world().createEntity('resourcefulbees:icy_bee', [1.5, 4, 1.5]);
             scene.world().modifyEntity(icyBee, (e) => {