Merge pull request AllTheMods#2869 from AllTheMods/bug-fixes

Bug fixes
TinyPandas · Jan 7, 2022 · 43c5ef5 · 43c5ef5
2 parents 6733eaf + 44913cc
commit 43c5ef5
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 41 deletions.
diff --git a/changelog/1.8.17.md b/changelog/1.8.17.md
@@ -21,7 +21,6 @@
 - FramedBlocks-2.11.3.jar
 - ftb-chunks-forge-1605.3.2-build.95.jar
 - HostileNeuralNetworks-1.16.5-1.0.4.jar
-- Iceberg-1.16.5-1.0.34.jar
 - kubejs-create-1605.1.4-build.12.jar
 - kubejs-forge-1605.3.19-build.258.jar
 - kubejs-immersive-engineering-1605.1.2-build.4.jar
@@ -42,3 +41,6 @@
 - XNetGases-1.16.5-2.3.9.jar
 ### Other Changes
 - Add sulfur to blaze drops from Hostile Neural Networks
+- Add more seeds to Botany Pots/Cloche (#2863)
+- Remove Redstone P2P quest (#2851)
+- Add smeltery recipes for Create crushed ores (#2849)
diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt
@@ -1156,39 +1156,6 @@
 				item: "appliedenergistics2:me_p2p_tunnel"
 			}]
 		}
-		{
-			x: -1.0d
-			y: -3.0d
-			dependencies: ["19299FC3C312F886"]
-			id: "5468CFE5CCC84ACC"
-			tasks: [
-				{
-					id: "212AB79A039305E3"
-					type: "item"
-					item: "appliedenergistics2:redstone_p2p_tunnel"
-				}
-				{
-					id: "7AE7F588A93A4B28"
-					type: "item"
-					item: "appliedenergistics2:item_p2p_tunnel"
-				}
-				{
-					id: "37DB80AF9100EEBE"
-					type: "item"
-					item: "appliedenergistics2:fluid_p2p_tunnel"
-				}
-				{
-					id: "600F540826528C28"
-					type: "item"
-					item: "appliedenergistics2:fe_p2p_tunnel"
-				}
-				{
-					id: "3737C51E0BE51641"
-					type: "item"
-					item: "appliedenergistics2:light_p2p_tunnel"
-				}
-			]
-		}
 		{
 			x: 1.0d
 			y: -3.0d

diff --git a/kubejs/client_scripts/jei_removals.js b/kubejs/client_scripts/jei_removals.js
@@ -185,7 +185,7 @@ onEvent('jei.hide.items', e => {
   hideStuff('solarflux', 'sp', [6, 7, 8])
   hideStuff('quark', 'crate', ['apple', 'carrot', 'beetroot', 'potato'])
   hideStuff('quark', 'block', ['bamboo', 'charcoal', 'sugar_cane'])
-  hideStuff('mysticalagriculture', 'seeds', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon'])
-  hideStuff('mysticalagriculture', 'essence', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon'])
+  hideStuff('mysticalagriculture', 'seeds', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon', 'lumium', 'enderium'])
+  hideStuff('mysticalagriculture', 'essence', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon', 'lumium', 'enderium'])
   //#endregion
 })
diff --git a/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js b/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js
@@ -118,7 +118,10 @@ onEvent('recipes', e => {
     'slime',
     'squid',
     'turtle',
-    'apatite'
+    'apatite',
+    'marble',
+    'limestone',
+    'basalt',
   ], 1750, 'prudentium')
   //Tier 3 Crops
   tier([
@@ -154,7 +157,8 @@ onEvent('recipes', e => {
     'lapis_lazuli',
     'nickel',
     'osmium',
-    'cobalt'
+    'ruby',
+    'sapphire',
   ], 3250, 'imperium')
   //Tier 5 Crops
   tier([

diff --git a/kubejs/server_scripts/mod_specific/immersive_engineering/cloche.js b/kubejs/server_scripts/mod_specific/immersive_engineering/cloche.js
@@ -46,7 +46,10 @@ onEvent('recipes', e => {
     'slime',
     'squid',
     'turtle',
-    'apatite'
+    'apatite',
+    'marble',
+    'limestone',
+    'basalt',
   ], 1750, '#misctags:farmland/tier2', 2)
   //Tier 3 Crops
   tier([
@@ -83,7 +86,9 @@ onEvent('recipes', e => {
     'lapis_lazuli',
     'nickel',
     'osmium',
-    'cobalt'
+    'cobalt',
+    'ruby',
+    'sapphire',
   ], 3250, '#misctags:farmland/tier4', 2)
   //Tier 5 Crops
   tier([

diff --git a/kubejs/server_scripts/mod_specific/mysticalagriculture/mysticalagriculture.js b/kubejs/server_scripts/mod_specific/mysticalagriculture/mysticalagriculture.js
@@ -46,7 +46,7 @@ onEvent('recipes', e => {
     result: { item: 'mysticalagriculture:marble_seeds' }
   }).id('kubejs:mysticalagriculture/marble_seeds')
 
-  utils.listOf(['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon']).forEach(type => {
+  utils.listOf(['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'chrome', 'electrum', 'elementium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril', 'tinkers_bronze', 'ironwood', 'steeleaf', 'pig_iron', 'slimesteel', 'rose_gold', 'queens_slime', 'manyullyn', 'fiery_ingot', 'knightmetal', 'hepatizon', 'lumium', 'enderium']).forEach(type => {
     utils.listOf(['seeds', 'essence']).forEach(name => {
       e.remove({ output: `mysticalagriculture:${type}_${name}` })
       e.remove({ input: `mysticalagriculture:${type}_${name}` })

diff --git a/kubejs/server_scripts/unify.js b/kubejs/server_scripts/unify.js
@@ -226,6 +226,15 @@ onEvent('recipes', e => {
     }
     e.custom(type != 'ores' ? recipe : Object.assign({ byproducts: byproduct }, recipe)).id(`kubejs:melting/${type}/${material}`)
   }
+  function tinkerCreateCompat(material, temperature, time, molten_namespace) {
+    e.custom({
+      type: 'tconstruct:melting',
+      ingredient: { item: `create:crushed_${material}_ore` },
+      result: { fluid: `${molten_namespace}:molten_${material}`, amount: 144 },
+      temperature: temperature,
+      time: time * 29.4
+    }).id(`kubejs:melting/crushed_ore/${material}`)
+  }
   function tinkerAlloys(entries) {
     entries.forEach(([output, outputAmount, temperature, inputs]) => {
       e.remove({ id: `tconstruct:smeltery/alloys/molten_${output}` })
@@ -262,6 +271,8 @@ onEvent('recipes', e => {
       e.replaceOutput(`tconstruct:${material}_block`, `alltheores:${material}_block`)
       e.replaceOutput(`tmechworks:${material}_block`, `alltheores:${material}_block`)
 
+      tinkerCreateCompat(material, temperature, time, 'alltheores');
+
       meltingTypes.forEach(meltingType => {
         e.remove({ id: `tconstruct:smeltery/melting/metal/${material}/${meltingType}` })
         for (let type in meltingTypeValues) if (types.includes(type)) tinkerMelting(material, type, meltingTypeValues[type], temperature, time, byproduct)
@@ -399,6 +410,9 @@ onEvent('recipes', e => {
     ]
   ])
 
+  tinkerCreateCompat('iron', 800, 60, 'tconstruct');
+  tinkerCreateCompat('gold', 700, 57, 'tconstruct');
+
   tinkerAlloys([
     [
       'brass', 288, 605, [