From 8127d1ecb3664aed1ddf320953f33f1c5b9c62e3 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 13 Nov 2022 22:26:49 +0100 Subject: Gas turbine singleblock (#1511) * Added EV and IV single Block Gas Turbine * BS+SA * derp (cherry picked from commit c8ebc2f5a8decb8e28c76e9ceb2eca0e04618c22) * add pollution level (cherry picked from commit ffcddc7547fa9f8f3d3235b596ead812291ff4cb) * Set efficiency * Texture Co-authored-by: kuba6000 --- .../preload/GT_Loader_MetaTileEntities.java | 46 +++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 75829f0014..9f73e3cb28 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -11226,14 +11226,20 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC }); ItemList.Generator_Gas_Turbine_LV.set( - new GT_MetaTileEntity_GasTurbine(1115, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1) - .getStackForm(1L)); - ItemList.Generator_Gas_Turbine_MV.set( - new GT_MetaTileEntity_GasTurbine(1116, "basicgenerator.gasturbine.tier.02", "Advanced Gas Turbine", 2) + new GT_MetaTileEntity_GasTurbine(1115, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1, 95) .getStackForm(1L)); + ItemList.Generator_Gas_Turbine_MV.set(new GT_MetaTileEntity_GasTurbine( + 1116, "basicgenerator.gasturbine.tier.02", "Advanced Gas Turbine", 2, 90) + .getStackForm(1L)); ItemList.Generator_Gas_Turbine_HV.set( - new GT_MetaTileEntity_GasTurbine(1117, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3) + new GT_MetaTileEntity_GasTurbine(1117, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3, 85) .getStackForm(1L)); + ItemList.Generator_Gas_Turbine_EV.set(new GT_MetaTileEntity_GasTurbine( + 1118, "basicgenerator.gasturbine.tier.04", "Turbo Gas Turbine II", 4, 60) + .getStackForm(1L)); + ItemList.Generator_Gas_Turbine_IV.set(new GT_MetaTileEntity_GasTurbine( + 1119, "basicgenerator.gasturbine.tier.05", "Turbo Gas Turbine III", 5, 50) + .getStackForm(1L)); GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_LV.get(1L), bitsd, new Object[] { "CRC", @@ -11280,6 +11286,36 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_EV.get(1L), bitsd, new Object[] { + "CRC", + "RMR", + aTextMotorWire, + 'M', + ItemList.Hull_EV, + 'E', + ItemList.Electric_Motor_EV, + 'R', + OrePrefixes.rotor.get(Materials.Titanium), + 'C', + OrePrefixes.circuit.get(Materials.Data), + 'W', + OrePrefixes.cableGt01.get(Materials.Aluminium) + }); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_IV.get(1L), bitsd, new Object[] { + "CRC", + "RMR", + aTextMotorWire, + 'M', + ItemList.Hull_IV, + 'E', + ItemList.Electric_Motor_IV, + 'R', + OrePrefixes.rotor.get(Materials.TungstenSteel), + 'C', + OrePrefixes.circuit.get(Materials.Elite), + 'W', + OrePrefixes.cableGt01.get(Materials.Tungsten) + }); ItemList.Generator_Steam_Turbine_LV.set(new GT_MetaTileEntity_SteamTurbine( 1120, "basicgenerator.steamturbine.tier.01", "Basic Steam Turbine", 1) -- cgit