Merge pull request #899 from MuteTiefling/ritual-updates

Tree of Life Updates

changelogs/CHANGELOG.md

@@ -5,6 +5,8 @@
 -   [Expert] Adjust sophisticated storage stack upgrade recipes to account for new copper tier [\#878](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/878)
 -   [Expert] Market recipe now uses all 5 archwood saplings to help avoid confusion with the recipe [\#881](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/881)
 -   [Expert] Reduce mining level of Redstone to make the early game a little less confusing [\#888](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/888)
+-   [Expert] The Tree of Life no longer grows with Pedestals inside, which often mess up item placement. Existing ToLs will work with pedestals but newly built/upgraded ones will generate with Liveroot blocks in their place instead. [\#899](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/899)
+-   [Expert] Custom Pentacles will now display with the standard checkerboard floor instead of all black. [\#899](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/899)
 
 ### 🐛 Fixed Bugs
 

kubejs/server_scripts/base/tags/blocks/enigmatica/tree_of_life_pillar.js

@@ -0,0 +1,3 @@
+ServerEvents.tags('block', (event) => {
+    event.get(`enigmatica:tree_of_life_pillar`).add(['twilightforest:liveroot_block', 'supplementaries:pedestal']);
+});

kubejs/server_scripts/expert/recipes/occultism/pentacles.js

@@ -173,7 +173,11 @@ ServerEvents.highPriorityData((event) => {
                 W: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_white' },
                 G: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_gold' },
                 P: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_purple' },
-                S: { type: 'modonomicon:block', block: 'supplementaries:pedestal' },
+                S: {
+                    type: 'modonomicon:tag',
+                    display: 'twilightforest:liveroot_block',
+                    tag: '#enigmatica:tree_of_life_pillar'
+                },
                 B: { type: 'modonomicon:block', block: 'occultism:sacrificial_bowl' },
                 A: { type: 'modonomicon:tag', tag: 'enigmatica:heartwoods/stage_1' }
             },
@@ -253,7 +257,11 @@ ServerEvents.highPriorityData((event) => {
                 W: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_white' },
                 G: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_gold' },
                 P: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_purple' },
-                S: { type: 'modonomicon:block', block: 'supplementaries:pedestal' },
+                S: {
+                    type: 'modonomicon:tag',
+                    display: 'twilightforest:liveroot_block',
+                    tag: '#enigmatica:tree_of_life_pillar'
+                },
                 B: { type: 'modonomicon:block', block: 'occultism:sacrificial_bowl' },
                 A: { type: 'modonomicon:tag', tag: 'enigmatica:heartwoods/stage_2' }
             },
@@ -333,7 +341,11 @@ ServerEvents.highPriorityData((event) => {
                 W: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_white' },
                 G: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_gold' },
                 P: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_purple' },
-                S: { type: 'modonomicon:block', block: 'supplementaries:pedestal' },
+                S: {
+                    type: 'modonomicon:tag',
+                    display: 'twilightforest:liveroot_block',
+                    tag: '#enigmatica:tree_of_life_pillar'
+                },
                 B: { type: 'modonomicon:block', block: 'occultism:sacrificial_bowl' },
                 A: { type: 'modonomicon:tag', tag: 'enigmatica:heartwoods/stage_3' }
             },
@@ -413,7 +425,11 @@ ServerEvents.highPriorityData((event) => {
                 W: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_white' },
                 G: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_gold' },
                 P: { type: 'modonomicon:block', block: 'occultism:chalk_glyph_purple' },
-                S: { type: 'modonomicon:block', block: 'supplementaries:pedestal' },
+                S: {
+                    type: 'modonomicon:tag',
+                    display: 'twilightforest:liveroot_block',
+                    tag: '#enigmatica:tree_of_life_pillar'
+                },
                 B: { type: 'modonomicon:block', block: 'occultism:sacrificial_bowl' },
                 A: { type: 'modonomicon:tag', tag: 'enigmatica:heartwoods/stage_4' }
             },
@@ -488,10 +504,22 @@ ServerEvents.highPriorityData((event) => {
     pentacles.forEach((pentacle) => {
         pentacle.type = 'modonomicon:dense';
 
-        // Set background display. Same size as pentacle, every block is otherstone.
-        // 9 is used as the key in following Occultism's convention.
-        pentacle.pattern.push(pentacle.pattern[0].map((pattern) => pattern.replace(/./g, '9')));
-        pentacle.mapping['9'] = { type: 'modonomicon:display', display: 'occultism:otherstone' };
+        // Set background display. Same size as pentacle, blocks alternate between otherstone and andesite.
+        // * and + are used as the keys following Occultism's convention.
+        let ground = [];
+        let pattern = pentacle.pattern[0];
+
+        for (let i = 0; i < pattern.length; i++) {
+            let row = '';
+            for (let j = 0; j < pattern[i].length; j++) {
+                row += (i + j) % 2 == 0 ? '*' : '+';
+            }
+            ground.push(row);
+        }
+
+        pentacle.pattern.push(ground);
+        pentacle.mapping['*'] = { type: 'modonomicon:display', display: 'occultism:otherstone' };
+        pentacle.mapping['+'] = { type: 'modonomicon:display', display: 'minecraft:stone' };
 
         event.addJson(`occultism:modonomicon/multiblocks/${pentacle.name}.json`, pentacle);