Merge pull request #1004 from MuteTiefling/ae2-link-update

Fixes
EnigmaticaModpacks · Aug 26, 2024 · cdb1891 · cdb1891
2 parents 774e723 + cdf1d19
commit cdb1891
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 28 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -12,6 +12,9 @@
 -   [Expert] Corrected some English translations [\#981](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/981)
 -   Ancient Slabs/Stairs are now properly tagged [\#981](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/981)
 -   Fixed link to quantum bridge in ae2 quests [\#991](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/991)
+-   [Expert] Removed uncraftable item from storage quests [\#1004](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/1004)
+-   [Expert] Add missing Spark glyph to Death Tomes [\#1004](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/1004)
+-   Fixed more links in ae2 quests[\#1004](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/1004)
 
 ---
 

diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt
@@ -180,7 +180,7 @@
 				""
 				"While the math behind what a Byte is, exactly, can be a little complicated, know that Storage Cells will hold more total if they are limited to a single type than if they’re allowed to store multiple types."
 				""
-				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
+				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
 			]
 			id: "211D0FAA0B023EF0"
 			rewards: [{
@@ -210,7 +210,7 @@
 				""
 				"While the math behind what a Byte is, exactly, can be a little complicated, know that Storage Cells will hold more total if they are limited to a single type than if they’re allowed to store multiple types."
 				""
-				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
+				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
 			]
 			id: "6B9F725AE5A94531"
 			rewards: [{
@@ -240,7 +240,7 @@
 				""
 				"While the math behind what a Byte is, exactly, can be a little complicated, know that Storage Cells will hold more total if they are limited to a single type than if they’re allowed to store multiple types."
 				""
-				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
+				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
 			]
 			id: "22AB44AE329F9EA8"
 			rewards: [{
@@ -454,7 +454,7 @@
 			description: [
 				"P2P or Point to Point, is a concept of using a single channel to transmit up to 32. Setting up a P2P connection can certainly be daunting for players who are new to AE2, but the basics are fairly accessible."
 				""
-				"{\"text\":\"AE2 Wiki: P2P Tunnels\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/features/me-network/misc/p2p-tunnel\"}} "
+				"{\"text\":\"AE2 Wiki: P2P Tunnels\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/features/me-network/misc/p2p-tunnel\"}} "
 				""
 				"Refer to the following pages for an example on setting this up. "
 				""
@@ -1012,7 +1012,7 @@
 				""
 				"Getting started will require finding some Certus Quartz, and that’s going to take a little exploration. Get your boots and compass, it’s time to head out. "
 				""
-				"{\"text\":\"AE2 Wiki\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/\"}}"
+				"{\"text\":\"AE2 Wiki\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/\"}}"
 			]
 			hide: true
 			icon: "ae2:singularity"

diff --git a/config/ftbquests/quests/chapters/applied_energistics_2_expert.snbt b/config/ftbquests/quests/chapters/applied_energistics_2_expert.snbt
@@ -107,7 +107,7 @@
 				""
 				"While the math behind what a Byte is, exactly, can be a little complicated, know that Storage Cells will hold more total if they are limited to a single type than if they’re allowed to store multiple types."
 				""
-				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
+				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
 			]
 			id: "0B95DC452E02E964"
 			rewards: [{
@@ -137,7 +137,7 @@
 				""
 				"While the math behind what a Byte is, exactly, can be a little complicated, know that Storage Cells will hold more total if they are limited to a single type than if they’re allowed to store multiple types."
 				""
-				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
+				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
 			]
 			id: "4B21571216DCDC69"
 			rewards: [{
@@ -167,7 +167,7 @@
 				""
 				"While the math behind what a Byte is, exactly, can be a little complicated, know that Storage Cells will hold more total if they are limited to a single type than if they’re allowed to store multiple types."
 				""
-				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
+				"{\"text\":\"AE2 Wiki: Storage Maths\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/features/me-network/storage-cells#:~:text=Portable%20Fluid%20Storage-,Capacity%20Limits,-Storage%20cells%20have\"}}"
 			]
 			id: "73765EC8E099FD57"
 			rewards: [{
@@ -381,7 +381,7 @@
 			description: [
 				"P2P or Point to Point, is a concept of using a single channel to transmit up to 32. Setting up a P2P connection can certainly be daunting for players who are new to AE2, but the basics are fairly accessible."
 				""
-				"{\"text\":\"AE2 Wiki: P2P Tunnels\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/features/me-network/misc/p2p-tunnel\"}} "
+				"{\"text\":\"AE2 Wiki: P2P Tunnels\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/features/me-network/misc/p2p-tunnel\"}} "
 				""
 				"Refer to the following pages for an example on setting this up. "
 				""
@@ -934,7 +934,7 @@
 				""
 				"Getting started will require finding some Certus Quartz, and that’s going to take a little exploration. Get your boots, it’s time to head out. "
 				""
-				"{\"text\":\"AE2 Wiki\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://appliedenergistics.github.io/\"}}"
+				"{\"text\":\"AE2 Wiki\",\"color\":\"blue\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://guide.appliedenergistics.org/1.19.2/\"}}"
 			]
 			hide: true
 			icon: "ae2:singularity"

diff --git a/config/ftbquests/quests/chapters/storage_expert.snbt b/config/ftbquests/quests/chapters/storage_expert.snbt
@@ -1103,7 +1103,7 @@
 		}
 		{
 			dependencies: ["2A0CD26353B9E8C2"]
-			description: ["Add some extra features to your storage, like the ability to craft or use a stonecutter without leaving the interface. "]
+			description: ["Add some extra features to your storage, like the ability to use a stonecutter without leaving the interface. "]
 			id: "7D8D1C51AED92742"
 			rewards: [{
 				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/farmers_delight"
@@ -1114,23 +1114,7 @@
 			}]
 			tasks: [{
 				id: "538B1DB69502E750"
-				item: {
-					Count: 1b
-					id: "itemfilters:or"
-					tag: {
-						items: [
-							{
-								Count: 1b
-								id: "sophisticatedstorage:crafting_upgrade"
-							}
-							{
-								Count: 1b
-								id: "sophisticatedstorage:stonecutter_upgrade"
-							}
-						]
-					}
-				}
-				title: "Functional Upgrades"
+				item: "sophisticatedstorage:stonecutter_upgrade"
 				type: "item"
 			}]
 			x: -5.0d

diff --git a/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/death_tome.js b/kubejs/server_scripts/expert/loot_tables/entities/twilightforest/death_tome.js
@@ -21,6 +21,7 @@ ServerEvents.entityLootTables((event) => {
             pool.addItem('ars_elemental:glyph_undead_filter', 1);
             pool.addItem('ars_elemental:glyph_summon_filter', 1);
             pool.addItem('ars_elemental:glyph_not_summon_filter', 1);
+            pool.addItem('ars_elemental:glyph_spark', 2);
 
             pool.addItem('ars_nouveau:glyph_amplify', 2);
             pool.addItem('ars_nouveau:glyph_self', 2);

diff --git a/kubejs/server_scripts/normal/loot_tables/entities/twilightforest/death_tome.js b/kubejs/server_scripts/normal/loot_tables/entities/twilightforest/death_tome.js
@@ -25,6 +25,7 @@ ServerEvents.entityLootTables((event) => {
             pool.addItem('ars_elemental:glyph_not_insect_filter', 1);
             pool.addItem('ars_elemental:glyph_not_undead_filter', 1);
             pool.addItem('ars_elemental:glyph_undead_filter', 1);
+            pool.addItem('ars_elemental:glyph_spark', 2);
 
             pool.addItem('ars_nouveau:glyph_amplify', 1);
             pool.addItem('ars_nouveau:glyph_bounce', 1);