From d358a982cce39ad6db74e70e5121568269e27061 Mon Sep 17 00:00:00 2001
From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com>
Date: Sun, 12 Feb 2023 20:40:40 +1100
Subject: [PATCH] Change AdvRocketry Upgrade recipes

Moves them from Assembler to Crafting table, fixes script errors, caused by CEu machine recipes now ignoring NBT.
---
 overrides/scripts/AdvRocketry.zs | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/overrides/scripts/AdvRocketry.zs b/overrides/scripts/AdvRocketry.zs
index 7a232e1..ef0f410 100644
--- a/overrides/scripts/AdvRocketry.zs
+++ b/overrides/scripts/AdvRocketry.zs
@@ -823,6 +823,8 @@ makeShaped("ar_advanced_structure",
 
 // Space Suit Upgrades
 // Hover Upgrade
+
+/* Old GT Recipe:
 assembler.recipeBuilder()
 	.inputs([
 		<enderio:item_dark_steel_upgrade:1>
@@ -834,8 +836,14 @@ assembler.recipeBuilder()
 	.duration(400)
 	.EUt(100)
 	.buildAndRegister();
+*/
+recipes.addShaped(<advancedrocketry:itemupgrade>, [
+	[<contenttweaker:radiationlayer>, <enderio:item_dark_steel_upgrade:1>.withTag({"enderio:dsu": "enderio:glide", "enderio:enabled": 1 as byte}), <contenttweaker:pressurelayer>]
+]);
 
 // Bionic Leg upgrade
+
+/* Old GT Recipe:
 assembler.recipeBuilder()
 	.inputs([
 		<enderio:item_dark_steel_upgrade:1>
@@ -847,8 +855,14 @@ assembler.recipeBuilder()
 	.duration(400)
 	.EUt(100)
 	.buildAndRegister();
+*/
+recipes.addShaped(<advancedrocketry:itemupgrade:2>, [
+	[<contenttweaker:radiationlayer>, <enderio:item_dark_steel_upgrade:1>.withTag({"enderio:dsu": "enderio:speedboost3", "enderio:enabled": 1 as byte}), <contenttweaker:pressurelayer>]
+]);
 
 // Flight Speed Control Upgrade
+
+/* Old GT Recipe:
 assembler.recipeBuilder()
 	.inputs([
 		<enderio:item_dark_steel_upgrade:1>
@@ -860,8 +874,14 @@ assembler.recipeBuilder()
 	.duration(400)
 	.EUt(100)
 	.buildAndRegister();
+*/
+recipes.addShaped(<advancedrocketry:itemupgrade:1>, [
+	[<contenttweaker:radiationlayer>, <enderio:item_dark_steel_upgrade:1>.withTag({"enderio:dsu": "enderio:travel", "enderio:enabled": 1 as byte}), <contenttweaker:pressurelayer>]
+]);
 
 // Anti Fog visor
+
+/* Old GT Recipe:
 assembler.recipeBuilder()
 	.inputs([
 		<enderio:item_dark_steel_upgrade:1>
@@ -873,8 +893,14 @@ assembler.recipeBuilder()
 	.duration(400)
 	.EUt(100)
 	.buildAndRegister();
+*/
+recipes.addShaped(<advancedrocketry:itemupgrade:4>, [
+	[<contenttweaker:radiationlayer>, <enderio:item_dark_steel_upgrade:1>.withTag({"enderio:dsu": "enderio:nightvision", "enderio:enabled": 1 as byte}), <contenttweaker:pressurelayer>]
+]);
 
 // Padded Landing Boots
+
+/* Old GT Recipe:
 assembler.recipeBuilder()
 	.inputs([
 		<enderio:item_dark_steel_upgrade:1>
@@ -886,8 +912,13 @@ assembler.recipeBuilder()
 	.duration(400)
 	.EUt(100)
 	.buildAndRegister();
+*/
+recipes.addShaped(<advancedrocketry:itemupgrade:3>, [
+	[<contenttweaker:radiationlayer>, <enderio:item_dark_steel_upgrade:1>.withTag({"enderio:dsu": "enderio:energyupgrade4", "enderio:enabled": 1 as byte}), <contenttweaker:pressurelayer>]
+]);
 
 // Atmospheric sensor
+
 assembler.recipeBuilder()
 	.inputs([
 		<enderio:item_dark_steel_upgrade>,
@@ -898,6 +929,7 @@ assembler.recipeBuilder()
 	.EUt(100)
 	.buildAndRegister();
 
+
 // Orbital Laser Drill
 recipes.removeByRecipeName("advancedrocketry:spacelaser");
 makeExtremeRecipe5(<advancedrocketry:spacelaser>,