Merge pull request #1170 from MCTian-mi/jet-wingpack

Jet wingpack

config/betterquesting/DefaultQuests/QuestLines/20.json

@@ -156,6 +156,13 @@
       "sizeY:3": 24,
       "x:3": 228,
       "y:3": -66
+    },
+    "20:10": {
+      "id:3": 1319198702,
+      "sizeX:3": 24,
+      "sizeY:3": 24,
+      "x:3": 132,
+      "y:3": 72
     }
   }
 }

config/betterquesting/DefaultQuests/Quests/20/1319198702.json

@@ -0,0 +1,37 @@
+{
+  "preRequisites:11": [
+    813,
+    827
+  ],
+  "properties:10": {
+    "betterquesting:10": {
+      "desc:8": "susy.quest.db.1319198702.desc",
+      "icon:10": {
+        "Damage:2": 1,
+        "id:8": "susy:susy_armor",
+        "tag:10": {
+          "Fluid:10": {
+            "Amount:3": 32000,
+            "FluidName:8": "kerosene"
+          }
+        }
+      },
+      "name:8": "susy.quest.db.1319198702.title"
+    }
+  },
+  "questID:3": 1319198702,
+  "tasks:9": {
+    "0:10": {
+      "ignoreNBT:1": 1,
+      "requiredItems:9": {
+        "0:10": {
+          "Count:3": 1,
+          "Damage:2": 1,
+          "id:8": "susy:susy_armor",
+          "tag:10": {}
+        }
+      },
+      "taskID:8": "bq_standard:retrieval"
+    }
+  }
+}

config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/638.json

@@ -9,7 +9,12 @@
       "icon:10": {
         "Damage:2": 2,
         "id:8": "gregtech:gt_armor",
-        "tag:10": {}
+        "tag:10": {
+          "Fluid:10": {
+            "Amount:3": 16000,
+            "FluidName:8": "diesel"
+          }
+        }
       },
       "ismain:1": 1,
       "name:8": "susy.quest.db.638.title"

config/betterquesting/resources/supersymmetry/lang/en_us.lang

@@ -1865,6 +1865,8 @@ susy.quest.db.1241306929.title=Chopping Woods
 susy.quest.db.1241306929.desc=If you are short on wood or simply want to extract more value from it, try chopping it on a §6Chopping Block§r, which will give you 25%% extra planks.%n%n§8But why don't you just move to a forest instead tho...§r
 susy.quest.db.1319048907.title=Graduated Cylinders
 susy.quest.db.1319048907.desc=While holding any item which can contain fluids in your main hand (i.e. §7buckets§r, §7fluid cells§r, or §7drums§r, etc.), §a§2punch§r any placed block which can also hold fluids (i.e. §7drums§r, §7fluid hatches§r, or §7GregTech machines§r, etc.) to open the §6transfer GUI§r. Here, you can choose the amount in millibuckets to transfer and the direction.%n%nYou can also transfer fluids §2between two items§r, by right-clicking one on top of the other in an inventory.%n%nThis well help a lot for batch crafting with fluids.%n%n§4§lWARNING: DO NOT use this on Coke Oven Hatches, THIS WILL CRASH YOUR GAME!
+susy.quest.db.1319198702.title=Jet Wingpack
+susy.quest.db.1319198702.desc=The §3Jet Wingpack§r represents an advancement in §6Jetpack§r technology. By integrating a §eWingsuit System§r with four kerosene-powered §4Turbojets§r, this device enables users to achieve flight faster than ever before.%n%nTo begin gliding, simply press §6[Space]§r once you are off the ground. If the §4Turbojets§r are running, you can take off with a single press of the §6[Space]§r key. The §4Turbojets§r themselves can be toggled with a hotkey. They can provide thrust in the direction you are facing. Additionally, you can press §6[Shift]§r to activate the brake.%n%nUnlike the simple liquid-fueled jetpack, tbe §3Jet Wingpack§r has some §crestrictions§r to the fuels it can use. Check JEI for more info.%n%n§7§o§lMind your head during the flight.§r
 susy.quest.db.1365346037.title=Early-game Automation
 susy.quest.db.1365346037.desc=Feeling tried of operating your kilns and ovens manually? Would you like to save time jumping around on your machines? Then be sure to utilize §6Mechanical Hoppers§r. They function like vanilla hoppers but require §6Cogs§r to work. %n%nYou can either craft the cog separately and attach it to the hopper later, or you can use the mechanical hopper recipe with a stone cog.
 susy.quest.db.1402916517.title=High Voltage Regulator

groovy/material/FirstDegreeMaterials.groovy

@@ -3499,7 +3499,7 @@ public class FirstDegreeMaterials {
         ReneN = new Material.Builder(8630, SuSyUtility.susyId("rene"))
                 .ingot().liquid(new FluidBuilder().temperature(1780))
                 .iconSet(SHINY)
-                .flags(GENERATE_PLATE, GENERATE_ROD)
+                .flags(GENERATE_PLATE, GENERATE_ROD, GENERATE_ROTOR)
                 .components(Nickel * 22, Cobalt * 4, Chrome * 3, Aluminium * 3, Tungsten * 2, Hafnium, Rhenium * 2, Tantalum * 3)
                 .colorAverage()
                 .build()

groovy/postInit/mod/GregTech.groovy

@@ -1351,7 +1351,7 @@ mods.gregtech.semi_fluid_generator.recipeBuilder()
 		.duration(21)
 		.EUt(-32)
 		.buildAndRegister();
-                
+
 mods.gregtech.semi_fluid_generator.recipeBuilder()
 		.fluidInputs(fluid('sulfuric_natural_gas') * 16)
 		.duration(4)
@@ -1652,4 +1652,105 @@ mods.gregtech.assembler.recipeBuilder()
         .outputs(metaitem('energy_hatch.output_16a.mv'))
         .duration(200)
         .EUt(30)
-        .buildAndRegister()
+        .buildAndRegister()
+// Jet Wingpack recipes
+// Wing panel
+mods.gregtech.autoclave.recipeBuilder()
+		.notConsumable(metaitem('shape.mold.plate'))
+		.notConsumable(ore('foilPolyethyleneTerephthalate'))
+		.fluidInputs(fluid('reinforced_epoxy_resin') * 288)
+		.outputs(metaitem('wing_panel.fiber_reinforced_epoxy'))
+		.duration(600)
+		.EUt(480)
+		.buildAndRegister()
+
+RecyclingHelper.handleRecycling(metaitem('wing_panel.fiber_reinforced_epoxy'), [
+		ore('ingotReinforcedEpoxyResin') * 2
+])
+
+// Small wing
+mods.gregtech.assembler.recipeBuilder()
+		.inputs(metaitem('wing_panel.fiber_reinforced_epoxy') * 2)
+		.inputs(ore('boltTitanium') * 8)
+		.inputs(ore('plateTitanium') * 2)
+		.circuitMeta(3)
+		.outputs(metaitem('wing.small'))
+		.duration(100)
+		.EUt(480)
+		.buildAndRegister();
+
+RecyclingHelper.handleRecycling(metaitem('wing.small'), [
+		metaitem('wing_panel.fiber_reinforced_epoxy') * 2,
+		ore('boltTitanium') * 8,
+		ore('plateTitanium') * 2
+])
+
+// Small turbojet
+mods.gregtech.assembler.recipeBuilder()
+		.inputs(metaitem('rotorRene') * 4)
+		.inputs(ore('stickLongTitanium'))
+		.inputs(ore('plateTitanium') * 2)
+		.inputs(ore('boltTitanium') * 4)
+		.inputs(metaitem('pipeTinyFluidTitanium') * 8)
+		.circuitMeta(5)
+		.outputs(metaitem('turbojet.small'))
+		.duration(100)
+		.EUt(480)
+		.buildAndRegister();
+
+RecyclingHelper.handleRecycling(metaitem('turbojet.small'), [
+		metaitem('rotorRene') * 4,
+		ore('stickLongTitanium'),
+		ore('plateTitanium') * 2,
+		ore('boltTitanium') * 4,
+		metaitem('pipeTinyFluidTitanium') * 8
+])
+
+// Jet wingpack
+mods.gregtech.assembler.recipeBuilder()
+		.inputs(metaitem('turbojet.small') * 4)
+		.inputs(metaitem('wing.small') * 2)
+		.inputs(metaitem('electric.pump.ev'))
+		.inputs(metaitem('large_fluid_cell.titanium') * 2)
+		.inputs(ore('circuitHv') * 2)
+		.inputs(ore('plateTitanium') * 2)
+		.inputs(ore('boltTitanium') * 8)
+		.outputs(metaitem('susy:jet_wingpack'))
+		.duration(200)
+		.EUt(480)
+		.buildAndRegister();
+
+RecyclingHelper.handleRecycling(metaitem('susy:jet_wingpack'), [
+		metaitem('turbojet.small') * 4,
+		metaitem('wing.small') * 2,
+		metaitem('electric.pump.ev'),
+		metaitem('large_fluid_cell.titanium') * 2,
+		ore('plateTitanium') * 2,
+		ore('boltTitanium') * 8
+])
+
+// Register Jet Wingpack fuels
+JET_WINGPACK = recipemap('jet_wingpack_fuels')
+
+mods.jei.catalyst.add('gregtech:jet_wingpack_fuels', metaitem('susy:jet_wingpack'))
+
+JET_WINGPACK.recipeBuilder()
+		.fluidInputs(fluid('kerosene') * 1)
+		.duration(20)
+		.buildAndRegister()
+
+JET_WINGPACK.recipeBuilder()
+		.fluidInputs(fluid('midgrade_kerosene') * 1)
+		.duration(40)
+		.buildAndRegister()
+
+JET_WINGPACK.recipeBuilder()
+		.fluidInputs(fluid('premium_kerosene') * 1)
+		.duration(60)
+		.buildAndRegister()
+
+JET_WINGPACK.recipeBuilder()
+		.fluidInputs(fluid('supreme_kerosene') * 1)
+		.duration(80)
+		.buildAndRegister()
+

groovy/preInit/RegisterMetaItems.groovy

@@ -100,7 +100,7 @@ eventManager.listen {
         customMetaItems.addItem(201, "vti_rich_pig_iron");
         customMetaItems.addItem(202, "vt_slag");
 
-	customMetaItems.addItem(210, "bound_leather")
+	    customMetaItems.addItem(210, "bound_leather")
 
         customMetaItems.addItem(212, "drone.lv").setMaxStackSize(1).addComponents(ElectricStats.createRechargeableBattery(10000, GTValues.LV)).setModelAmount(8).setCreativeTabs(GregTechAPI.TAB_GREGTECH_TOOLS);
         customMetaItems.addItem(213, "glass_fibers")
@@ -350,5 +350,10 @@ eventManager.listen {
         customMetaItems.addItem(10001, "tunnelbore.engine")
         customMetaItems.addItem(10002, "tunnelbore.drillhead")
 
+        // Misc Crafting Components 10100-10200
+        customMetaItems.addItem(10100, "turbojet.small")
+        customMetaItems.addItem(10101, "wing_panel.fiber_reinforced_epoxy")
+        customMetaItems.addItem(10102, "wing.small")
+
         log.infoMC("Finished adding metaitems")
 }

resources/gregtech/models/item/metaitems/turbojet.small.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+      "layer0": "gregtech:items/metaitems/turbojet.small"
+    }
+  }

resources/gregtech/models/item/metaitems/wing.small.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+      "layer0": "gregtech:items/metaitems/wing.small"
+    }
+  }

resources/gregtech/models/item/metaitems/wing_panel.fiber_reinforced_epoxy.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+      "layer0": "gregtech:items/metaitems/wing_panel.fiber_reinforced_epoxy"
+    }
+  }

resources/langfiles/lang/en_us.lang

@@ -2500,6 +2500,10 @@ metaitem.circuit.good_integrated.name=Advanced Electronic Circuit
 metaitem.circuit.advanced_integrated.name=High-Voltage Electronic Circuit
 
 
+metaitem.turbojet.small.name=Small Turbojet Engine
+metaitem.wing_panel.fiber_reinforced_epoxy.name=Glass Fiber Reinforced Epoxy (GFEP) Wing Panel
+metaitem.wing.small.name=Lightweight Wing
+
 # Vanilla MC
 tile.hellsand.name=Mineral-Rich Sand
 tile.magma.name=Magma-Infused Netherrack