Merge pull request #474 from MuteTiefling/e9e-textures-and-more

E9E Texture updates and more

config/ftbquests/quests/chapters/chapter_one.snbt

@@ -607,7 +607,7 @@
 			]
 			title: "Applied Energistics"
 			x: -9.0d
-			y: 2.5d
+			y: 3.0d
 		}
 		{
 			dependencies: ["7CFD3DFD4C593EB5"]
@@ -674,7 +674,7 @@
 				}
 			]
 			x: 2.0d
-			y: 0.5d
+			y: 1.0d
 		}
 		{
 			dependencies: ["7AD5D1665CA3DF4F"]
@@ -1200,7 +1200,7 @@
 			}]
 			title: "Familiar Friends"
 			x: 2.0d
-			y: -1.5d
+			y: -1.0d
 		}
 		{
 			dependencies: ["79B755D0BDB6A8B7"]
@@ -1364,7 +1364,7 @@
 				}
 			]
 			x: 1.5d
-			y: 1.5d
+			y: 2.0d
 		}
 		{
 			dependencies: ["7CFD3DFD4C593EB5"]
@@ -1405,7 +1405,7 @@
 				}
 			]
 			x: 2.5d
-			y: -0.5d
+			y: 0.0d
 		}
 		{
 			dependencies: ["7CFD3DFD4C593EB5"]
@@ -1441,7 +1441,7 @@
 				type: "item"
 			}]
 			x: 1.5d
-			y: -0.5d
+			y: 0.0d
 		}
 		{
 			dependencies: ["7CFD3DFD4C593EB5"]
@@ -1514,7 +1514,7 @@
 			}]
 			title: "Familiars"
 			x: 1.0d
-			y: 0.5d
+			y: 1.0d
 		}
 		{
 			dependencies: ["7CFD3DFD4C593EB5"]
@@ -1537,7 +1537,7 @@
 				type: "item"
 			}]
 			x: 2.5d
-			y: 1.5d
+			y: 2.0d
 		}
 		{
 			dependencies: ["7CFD3DFD4C593EB5"]
@@ -1594,7 +1594,7 @@
 				}
 			]
 			x: 3.0d
-			y: 0.5d
+			y: 1.0d
 		}
 		{
 			dependencies: ["11AB47232D9F5D6D"]
@@ -1647,7 +1647,7 @@
 		{
 			dependencies: ["729E9D41A28D0E4D"]
 			description: [
-				"Restoring the Tree of Life to its full glory will be no easy task. Use the knowledge obtained thus far to grow the seedling. With time and sacrifice, it will grow stronger. "
+				"Restoring the Tree of Life to its full glory will be no easy task. Use the knowledge obtained thus far to grow the Primordial Seed. With time and sacrifice, it will grow stronger. "
 				""
 				"Choose a ritual site with plenty of room to give the tree the space it needs to take root. Performing this ritual will grow the tree immediately, centered upon the ritual pentacle. "
 			]
@@ -1819,14 +1819,15 @@
 				""
 				"That all seems rather far out of reach for now, but simple transport seems viable at least."
 				""
-				"================================="
+				"========================================"
 				""
 				"Begin by locating some Certus Quartz; the Wilden Grove will undoubtedly have left some behind in their ore mounds. "
 				""
 				"Through the natural transmutation magics imbued in a Botanist’s Pickaxe, it should be possible to purify the quartz and induce it to grow. "
 			]
 			hide_dependency_lines: true
 			id: "0BAE6EBFEA3026B9"
+			min_width: 250
 			rewards: [{
 				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/alchemists_delight"
 				icon: "kubejs:alchemists_delight"
@@ -1842,8 +1843,8 @@
 				type: "item"
 			}]
 			title: "Certus Farming"
-			x: -9.0d
-			y: 1.5d
+			x: -9.5d
+			y: 2.0d
 		}
 		{
 			dependencies: ["4B874AA448FF4C7A"]
@@ -2173,7 +2174,124 @@
 				type: "item"
 			}]
 			x: 2.0d
-			y: 2.5d
+			y: 3.0d
+		}
+		{
+			dependencies: ["66A59B3CD77FB54A"]
+			description: [
+				"One of the few remaining guardians of these lands, the Questing Ram makes its home in the Enchanted Forest. "
+				""
+				"Seek them out and complete their task. It is doubtful they’ll know precisely what happened, but they may have knowledge vital to the restoration of the Tree of Life.  "
+				""
+				"================================="
+				""
+				"Obtain Wool of each color and provide it to the Ram. "
+			]
+			id: "032D29DD7D946EDB"
+			rewards: [{
+				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/sorcerers_delight"
+				icon: "kubejs:sorcerers_delight"
+				id: "69D3102DD62060D9"
+				player_command: false
+				title: "Sorcerer's Delight"
+				type: "command"
+			}]
+			shape: "hexagon"
+			tasks: [{
+				id: "45865EFBDFC3E239"
+				item: "twilightforest:quest_ram_trophy"
+				type: "item"
+			}]
+			title: "Questing Ram"
+			x: -3.5d
+			y: -4.0d
+		}
+		{
+			dependencies: ["032D29DD7D946EDB"]
+			description: [
+				"The Questing Ram has agreed to assist in renewing the Tree of Life by providing the necessary knowledge for recreating the Primordial Seed. However, they’ll need some help to do so. "
+				""
+				"Summon forth the elemental spirits of this land to imbue their energy into the Seed."
+			]
+			hide: true
+			id: "1DC39E690B6178EF"
+			rewards: [{
+				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/sorcerers_delight"
+				icon: "kubejs:sorcerers_delight"
+				id: "67BBB8A5B92C7AE7"
+				player_command: false
+				title: "Sorcerer's Delight"
+				type: "command"
+			}]
+			shape: "heart"
+			tasks: [{
+				id: "644F047CE0367F5A"
+				item: "kubejs:primordial_seed"
+				type: "item"
+			}]
+			x: -3.5d
+			y: -3.0d
+		}
+		{
+			dependencies: ["3B372F597A05E777"]
+			description: [
+				"While the Dark Tower itself is largely infested with Towerwood Borers, it’s trivial to attract more of the critters. Getting rid of them, on the other hand, may prove a little more complicated. "
+				""
+				"They don’t come alone, however, so care should be taken!"
+			]
+			hide_dependency_lines: true
+			icon: {
+				Count: 1b
+				id: "gateways:gate_pearl"
+				tag: {
+					gateway: "gateways:swarm_gate_large"
+				}
+			}
+			id: "5D1FCC45134CB879"
+			rewards: [{
+				count: 4
+				id: "291E911003FDDDA7"
+				item: "emendatusenigmatica:carminite_gem"
+				type: "item"
+			}]
+			shape: "hexagon"
+			tasks: [
+				{
+					entity: "minecraft:endermite"
+					icon: "minecraft:spawner"
+					id: "534A73E9BF329237"
+					type: "kill"
+					value: 5L
+				}
+				{
+					entity: "twilightforest:towerwood_borer"
+					id: "2E7B9A411B813DED"
+					type: "kill"
+					value: 5L
+				}
+				{
+					entity: "minecraft:silverfish"
+					icon: "minecraft:spawner"
+					id: "1567106A573CDBAD"
+					type: "kill"
+					value: 5L
+				}
+				{
+					id: "7849128B7816AA53"
+					item: {
+						Count: 1b
+						id: "gateways:gate_pearl"
+						tag: {
+							gateway: "gateways:swarm_gate_small"
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+			]
+			title: "Summon Mite Swarms"
+			x: -8.5d
+			y: 2.0d
 		}
 	]
 	title: "Chapter One"

kubejs/assets/kubejs/lang/en_us.json

@@ -212,6 +212,20 @@
     "ritual.enigmatica.occultism/ritual/ritual_summon_whirlisprig_from_shards.interrupted": "Ritual of Calling interrupted.",
     "ritual.enigmatica.occultism/ritual/ritual_summon_whirlisprig_from_shards.conditions": "Not all requirements for this ritual are met.",
 
+    "item.kubejs.ritual_summon_siren_from_shards": "Ritual: Summon Siren",
+    "item.kubejs.ritual_summon_siren_from_shards.tooltip": "Summon a Siren",
+    "ritual.enigmatica.occultism/ritual/ritual_summon_siren_from_shards.started": "Ritual of Calling started.",
+    "ritual.enigmatica.occultism/ritual/ritual_summon_siren_from_shards.finished": "Ritual of Calling completed.",
+    "ritual.enigmatica.occultism/ritual/ritual_summon_siren_from_shards.interrupted": "Ritual of Calling interrupted.",
+    "ritual.enigmatica.occultism/ritual/ritual_summon_siren_from_shards.conditions": "Not all requirements for this ritual are met.",
+
+    "item.kubejs.ritual_summon_firenando_from_shards": "Ritual: Summon Firenando",
+    "item.kubejs.ritual_summon_firenando_from_shards.tooltip": "Summon a Firenando",
+    "ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.started": "Ritual of Calling started.",
+    "ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.finished": "Ritual of Calling completed.",
+    "ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.interrupted": "Ritual of Calling interrupted.",
+    "ritual.enigmatica.occultism/ritual/ritual_summon_firenando_from_shards.conditions": "Not all requirements for this ritual are met.",
+
     "item.kubejs.ritual_craft_willow_broom": "Ritual: Craft Willow Broom",
     "item.kubejs.ritual_craft_willow_broom.tooltip": "Bind a fae into a broom to obtain the power of flight.",
     "ritual.enigmatica.occultism/ritual/ritual_craft_willow_broom.started": "Ritual of Binding started.",
@@ -584,6 +598,22 @@
     "ritual.enigmatica.occultism/ritual/blitz_gate_large.interrupted": "Large Air Elemental Gateway Interrupted",
     "ritual.enigmatica.occultism/ritual/blitz_gate_large.conditions": "Not all requirements for this ritual are met.",
 
+    "gateways.swarm_gate": "Mite Swarm Gate",
+    "gateways.swarm_gate_small": "Small Mite Swarm Gate",
+    "gateways.swarm_gate_large": "Large Mite Swarm Gate",
+    "ritual.enigmatica.occultism/ritual/swarm_gate_small.started": "Started Opening Small Mite Swarm Gateway",
+    "ritual.enigmatica.occultism/ritual/swarm_gate_small.finished": "Small Mite Swarm Gateway Opened",
+    "ritual.enigmatica.occultism/ritual/swarm_gate_small.interrupted": "Small Mite Swarm Gateway Interrupted",
+    "ritual.enigmatica.occultism/ritual/swarm_gate_small.conditions": "Not all requirements for this ritual are met.",
+    "ritual.enigmatica.occultism/ritual/swarm_gate.started": "Started Opening Mite Swarm Gateway",
+    "ritual.enigmatica.occultism/ritual/swarm_gate.finished": "Mite Swarm Gateway Opened",
+    "ritual.enigmatica.occultism/ritual/swarm_gate.interrupted": "Mite Swarm Gateway Interrupted",
+    "ritual.enigmatica.occultism/ritual/swarm_gate.conditions": "Not all requirements for this ritual are met.",
+    "ritual.enigmatica.occultism/ritual/swarm_gate_large.started": "Started Opening Large Mite Swarm Gateway",
+    "ritual.enigmatica.occultism/ritual/swarm_gate_large.finished": "Large Mite Swarm Gateway Opened",
+    "ritual.enigmatica.occultism/ritual/swarm_gate_large.interrupted": "Large Mite Swarm Gateway Interrupted",
+    "ritual.enigmatica.occultism/ritual/swarm_gate_large.conditions": "Not all requirements for this ritual are met.",
+
     "gateways.death_tome_gate": "Death Tome Gate",
     "gateways.death_tome_gate_small": "Small Death Tome Gate",
     "gateways.death_tome_gate_large": "Large Death Tome Gate",

kubejs/assets/kubejs/models/block/heartwood_stage_1.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "end": "byg:block/zelkova/log_top",
+        "side": "kubejs:block/heartwood_stage_1"
+    }
+}

kubejs/assets/kubejs/models/block/heartwood_stage_1_inactive.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "end": "byg:block/zelkova/log_top",
+        "side": "kubejs:block/heartwood_stage_1"
+    }
+}

kubejs/assets/kubejs/models/block/heartwood_stage_2.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "end": "byg:block/zelkova/log_top",
+        "side": "kubejs:block/heartwood_stage_2"
+    }
+}

kubejs/assets/kubejs/models/block/heartwood_stage_2_inactive.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "end": "byg:block/zelkova/log_top",
+        "side": "kubejs:block/heartwood_stage_2"
+    }
+}

kubejs/assets/kubejs/models/block/heartwood_stage_3.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "end": "byg:block/zelkova/log_top",
+        "side": "kubejs:block/heartwood_stage_3"
+    }
+}

kubejs/assets/kubejs/models/block/heartwood_stage_3_inactive.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "end": "byg:block/zelkova/log_top",
+        "side": "kubejs:block/heartwood_stage_3"
+    }
+}

kubejs/assets/kubejs/models/block/heartwood_stage_4.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "end": "byg:block/zelkova/log_top",
+        "side": "kubejs:block/heartwood_stage_4"
+    }
+}

kubejs/assets/kubejs/models/block/heartwood_stage_4_inactive.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "end": "byg:block/zelkova/log_top",
+        "side": "kubejs:block/heartwood_stage_4"
+    }
+}

kubejs/client_scripts/base/jei_descriptions.js

@@ -364,7 +364,7 @@ JEIEvents.information((event) => {
         },
         {
             items: ['twilightforest:borer_essence'],
-            text: [`Drops from Towerwood Borers.`]
+            text: [`Drops from Towerwood Borers which may be found by breaking Infested Towerwood in the Dark Tower.`]
         },
         {
             items: ['twilightforest:liveroot'],

kubejs/client_scripts/expert/textures.js

@@ -53,6 +53,13 @@ ClientEvents.highPriorityAssets((event) => {
                 textures: { layer0: 'kubejs:item/shears' }
             }
         },
+        {
+            path: 'minecraft:models/item/heart_of_the_sea',
+            json_model: {
+                parent: 'minecraft:item/generated',
+                textures: { layer0: 'kubejs:item/heart_of_the_sea' }
+            }
+        },
         {
             path: 'occultism:models/block/golden_sacrificial_bowl',
             json_model: {