From 09c4bb3349be4e4e99f6ec3b780c71e5ae14ecd1 Mon Sep 17 00:00:00 2001 From: Mikhail <68438915+mikhailkfv@users.noreply.github.com> Date: Sat, 27 Aug 2022 09:52:52 -0500 Subject: [PATCH] Kerosene & Jet fuel Also added 1-block jet generators similar to GTNH. Subject to further changes. --- .../java/gregtech/api/enums/ItemList.java | 3 + .../gregtech/api/enums/MaterialBuilder.java | 2 +- .../java/gregtech/api/enums/Materials.java | 5 + .../java/gregtech/api/util/GT_Recipe.java | 4 + .../GT_MetaTileEntity_DieselGenerator.java | 2 +- .../GT_MetaTileEntity_JetTurbine.java | 119 ++++++++++++++++++ .../postload/GT_MachineRecipeLoader.java | 21 +++- .../GT_Loader_Item_Block_And_Fluid.java | 3 +- .../preload/GT_Loader_MetaTileEntities.java | 9 ++ .../blocks/fluids/fluid.liquid_kerosene.png | Bin 0 -> 12441 bytes .../fluids/fluid.liquid_kerosene.png.mcmeta | 5 + 11 files changed, 165 insertions(+), 8 deletions(-) create mode 100644 src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_JetTurbine.java create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png.mcmeta diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index ccedbbaa..ccb735a3 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -508,6 +508,9 @@ public enum ItemList implements IItemContainer { Generator_Gas_Turbine_LV, Generator_Gas_Turbine_MV, Generator_Gas_Turbine_HV, + Generator_Jet_Turbine_HV, + Generator_Jet_Turbine_EV, + Generator_Jet_Turbine_IV, Generator_Steam_Turbine_LV, Generator_Steam_Turbine_MV, Generator_Steam_Turbine_HV, diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java index 1aa9a8ae..e4650a82 100644 --- a/src/main/java/gregtech/api/enums/MaterialBuilder.java +++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java @@ -7,7 +7,7 @@ import java.util.List; import gregtech.api.objects.MaterialStack; public class MaterialBuilder { - public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5; + public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5, JET = 6; private int metaItemSubID; private TextureSet iconSet; diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 800a7cfc..a15c7dd0 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -536,6 +536,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials LightFuel = new Materials(740, TextureSet.SET_FLUID, 1.0F, 0, 0, 16, 255, 255, 0, 0, "LightFuel", "Light Fuel", 0, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow).setCanBeCracked(true); public static Materials HeavyFuel = new Materials(741, TextureSet.SET_FLUID, 1.0F, 0, 0, 16, 255, 255, 0, 0, "HeavyFuel", "Heavy Fuel", 3, 192, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack).setCanBeCracked(true); public static Materials LPG = new Materials(742, TextureSet.SET_FLUID, 1.0F, 0, 0, 16, 255, 255, 0, 0, "LPG", "LPG", 1, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow); + public static Materials Kerosene = new Materials(743, TextureSet.SET_FLUID, 1.0F, 0, 0, 16, 0, 255, 255, 0, "Kerosene", "Kerosene", 0, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlue).setCanBeCracked(true); public static Materials Chlorobenzene = new MaterialBuilder(605, TextureSet.SET_FLUID, "Chlorobenzene").addCell().addFluid().setRGB(0, 50, 65).setColor(Dyes.dyeGray).setMaterialList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 5), new MaterialStack(Chlorine, 1)).addElectrolyzerRecipe().constructMaterial(); public static Materials DilutedHydrochloricAcid = new MaterialBuilder(606, TextureSet.SET_FLUID, "Diluted Hydrochloric Acid").setName("DilutedHydrochloricAcid_GT5U").addCell().addFluid().setRGB(153, 167, 163).setColor(Dyes.dyeLightGray).setMaterialList(new MaterialStack(Hydrogen, 1), new MaterialStack(Chlorine, 1)).constructMaterial(); @@ -751,6 +752,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials AntiKnock = new MaterialBuilder(994, TextureSet.SET_FLUID, "Ethyl Tert-Butyl Ether").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).constructMaterial(); public static Materials GasolineRegular = new MaterialBuilder(997, TextureSet.SET_FLUID, "Gasoline").addCell().addFluid().setRGB(255,165,0).setColor(Dyes.dyeOrange).setFuelType(MaterialBuilder.DIESEL).setFuelPower(384).constructMaterial(); public static Materials GasolinePremium = new MaterialBuilder(998, TextureSet.SET_FLUID, "High Octane Gasoline").addCell().addFluid().setRGB(255,165,0).setColor(Dyes.dyeOrange).setFuelType(MaterialBuilder.DIESEL).setFuelPower(768).constructMaterial(); + //new materials + //public static Materials Kerosene = new MaterialBuilder(743, TextureSet.SET_FLUID, "Kerosene").addCell().addFluid().setRGB(0,255,255).setColor(Dyes.dyeBlue).setFuelType(MaterialBuilder.DIESEL).setFuelPower(256).constructMaterial(); + public static Materials JetFuel = new MaterialBuilder(744, TextureSet.SET_FLUID, "Jet Kerosene").addCell().addFluid().setRGB(70, 200, 255).setColor(Dyes.dyeYellow).setFuelType(MaterialBuilder.JET).setFuelPower(512).constructMaterial(); + public static Materials Jet8 = new MaterialBuilder(745, TextureSet.SET_FLUID, "JP-8").addCell().addFluid().setRGB(235, 235, 200).setColor(Dyes.dyeYellow).setFuelType(MaterialBuilder.JET).setFuelPower(640).constructMaterial(); /** * Materials which are renamed automatically diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index d743dd3f..b99d0034 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -197,6 +197,9 @@ public class GT_Recipe implements Comparable { case 5: GT_Recipe_Map.sMagicFuels.addRecipe(this); break; + case 6: + GT_Recipe_Map.sJetFuels.addRecipe(this); + break; // Fluid Generator. Usually 3. Every wrong Type ends up in the Semifluid Generator default: GT_Recipe_Map.sDenseLiquidFuels.addRecipe(this); @@ -564,6 +567,7 @@ public class GT_Recipe implements Comparable { public static final GT_Recipe_Map sMassFabFakeRecipes = new GT_Recipe_Map(new HashSet(10), "gt.recipe.massfab", "Mass Fabrication", null, RES_PATH_GUI + "basicmachines/Massfabricator", 1, 0, 1, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map_Fuel sDieselFuels = new GT_Recipe_Map_Fuel(new HashSet(10), "gt.recipe.dieselgeneratorfuel", "Diesel Generator Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); public static final GT_Recipe_Map_Fuel sTurbineFuels = new GT_Recipe_Map_Fuel(new HashSet(10), "gt.recipe.gasturbinefuel", "Gas Turbine Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); + public static final GT_Recipe_Map_Fuel sJetFuels = new GT_Recipe_Map_Fuel(new HashSet(10), "gt.recipe.jetfuel", "Jet Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); public static final GT_Recipe_Map_Fuel sHotFuels = new GT_Recipe_Map_Fuel(new HashSet(10), "gt.recipe.thermalgeneratorfuel", "Thermal Generator Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, false); public static final GT_Recipe_Map_Fuel sDenseLiquidFuels = new GT_Recipe_Map_Fuel(new HashSet(10), "gt.recipe.semifluidboilerfuels", "Semifluid Boiler Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); public static final GT_Recipe_Map_Fuel sPlasmaFuels = new GT_Recipe_Map_Fuel(new HashSet(10), "gt.recipe.plasmageneratorfuels", "Plasma generator Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java index 503a1f7e..4d1fb100 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_DieselGenerator } public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, (100 - this.mTier * 5)); + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, (90 - this.mTier * 5)); } public int getEfficiency() { diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_JetTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_JetTurbine.java new file mode 100644 index 00000000..b73f3bc5 --- /dev/null +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_JetTurbine.java @@ -0,0 +1,119 @@ +package gregtech.common.tileentities.generators; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.GregTech_API; +import gregtech.api.enums.ConfigCategories; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import net.minecraft.item.ItemStack; + +public class GT_MetaTileEntity_JetTurbine + extends GT_MetaTileEntity_BasicGenerator { + + public static final int BASE_POLLUTION = 3; + + public int mEfficiency; + + public GT_MetaTileEntity_JetTurbine(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier, new String[]{ + "Requires jet Fuel", + "Causes " + (int) (15 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"}); + onConfigLoad(); + } + + public GT_MetaTileEntity_JetTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + onConfigLoad(); + } + + public GT_MetaTileEntity_JetTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + onConfigLoad(); + } + + public boolean isOutputFacing(byte aSide) { + return aSide == getBaseMetaTileEntity().getFrontFacing(); + } + + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_JetTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + } + + public GT_Recipe.GT_Recipe_Map getRecipes() { + return GT_Recipe.GT_Recipe_Map.sJetFuels; + } + + public int getCapacity() { + return 16000; + } + + public void onConfigLoad() { + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, (100 - this.mTier * 5)); //TODO Unique config for jet fuels + } + + public int getEfficiency() { + return this.mEfficiency; + } + + public int getFuelValue(ItemStack aStack) { + if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0; + int rValue = Math.max(GT_ModHandler.getFuelCanValue(aStack) * 6 / 5, super.getFuelValue(aStack)); + if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { + rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3); + } + return rValue; + } + + public ITexture[] getFront(byte aColor) { + return new ITexture[]{super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_FRONT), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]}; + } + + public ITexture[] getBack(byte aColor) { + return new ITexture[]{super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BACK)}; + } + + public ITexture[] getBottom(byte aColor) { + return new ITexture[]{super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BOTTOM)}; + } + + public ITexture[] getTop(byte aColor) { + return new ITexture[]{super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_TOP)}; + } + + public ITexture[] getSides(byte aColor) { + return new ITexture[]{super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_SIDE)}; + } + + public ITexture[] getFrontActive(byte aColor) { + return new ITexture[]{super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_FRONT_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]}; + } + + public ITexture[] getBackActive(byte aColor) { + return new ITexture[]{super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BACK_ACTIVE)}; + } + + public ITexture[] getBottomActive(byte aColor) { + return new ITexture[]{super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_BOTTOM_ACTIVE)}; + } + + public ITexture[] getTopActive(byte aColor) { + return new ITexture[]{super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_TOP_ACTIVE)}; + } + + public ITexture[] getSidesActive(byte aColor) { + return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_SIDE_ACTIVE)}; + } + + @Override + public int getPollution() { + return (int) (GT_MetaTileEntity_JetTurbine.BASE_POLLUTION * Math.pow(2, mTier - 1)); + } +} diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index d4348230..3a25a8ec 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -726,10 +726,10 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Electric_Motor_IV.get(1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Silicone, 2), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1)}, GT_Values.NF, ItemList.Electric_Pump_IV.get(1L), 20, 480); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Electric_Motor_IV.get(1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.StyreneButadieneRubber, 2), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1)}, GT_Values.NF, ItemList.Electric_Pump_IV.get(1L), 20, 480); - GT_Values.RA.addUniversalDistillationRecipe(Materials.OilLight.getFluid(150), new FluidStack[]{ Materials.SulfuricHeavyFuel.getFluid(10), Materials.SulfuricLightFuel.getFluid(20), Materials.SulfuricNaphtha.getFluid(30), Materials.SulfuricGas.getGas(240)}, null, 20, 96); - GT_Values.RA.addUniversalDistillationRecipe(Materials.OilMedium.getFluid(100), new FluidStack[]{Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60)}, null, 20, 96); - GT_Values.RA.addUniversalDistillationRecipe(Materials.Oil.getFluid(50L), new FluidStack[]{ Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60)}, null, 20, 96); - GT_Values.RA.addUniversalDistillationRecipe(Materials.OilHeavy.getFluid(100), new FluidStack[]{ Materials.SulfuricHeavyFuel.getFluid(250), Materials.SulfuricLightFuel.getFluid(45), Materials.SulfuricNaphtha.getFluid(15), Materials.SulfuricGas.getGas(60)}, null, 20, 288); + GT_Values.RA.addUniversalDistillationRecipe(Materials.OilLight.getFluid(150), new FluidStack[]{ Materials.SulfuricHeavyFuel.getFluid(10), Materials.SulfuricLightFuel.getFluid(20), Materials.Kerosene.getFluid(30), Materials.SulfuricNaphtha.getFluid(30), Materials.SulfuricGas.getGas(240)}, null, 20, 96); + GT_Values.RA.addUniversalDistillationRecipe(Materials.OilMedium.getFluid(100), new FluidStack[]{Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), Materials.Kerosene.getFluid(25), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60)}, null, 20, 96); + GT_Values.RA.addUniversalDistillationRecipe(Materials.Oil.getFluid(50L), new FluidStack[]{ Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), Materials.Kerosene.getFluid(25), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60)}, null, 20, 96); + GT_Values.RA.addUniversalDistillationRecipe(Materials.OilHeavy.getFluid(100), new FluidStack[]{ Materials.SulfuricHeavyFuel.getFluid(250), Materials.SulfuricLightFuel.getFluid(45), Materials.Kerosene.getFluid(10), Materials.SulfuricNaphtha.getFluid(15), Materials.SulfuricGas.getGas(60)}, null, 20, 288); if (GregTech_API.sSpecialFile.get("general", "EnableLagencyOilGalactiCraft", false) && FluidRegistry.getFluid("oilgc") != null) { GT_Values.RA.addUniversalDistillationRecipe(new FluidStack(FluidRegistry.getFluid("oilgc"), 50), new FluidStack[]{Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60)}, null, 20, 96); @@ -3427,7 +3427,15 @@ public class GT_MachineRecipeLoader implements Runnable { new FluidStack[]{Materials.HeavyFuel.getFluid(100), Materials.Naphtha.getFluid(100), Materials.Toluene.getFluid(150), Materials.Benzene.getFluid(300), Materials.Butadiene.getGas(300), Materials.Propene.getGas(450), Materials.Ethylene.getGas(450), Materials.Methane.getGas(450)}, Materials.Carbon.getDustSmall(1), 120, 120); - + + GT_Values.RA.addDistillationTowerRecipe(Materials.Kerosene.getSteamCracked(1000), + new FluidStack[] {Materials.Ethylene.getGas(200), Materials.Propene.getGas(100), Materials.Hydrogen.getGas(200), Materials.Methane.getGas(300), + Materials.CarbonMonoxide.getGas(200)}, + Materials.Carbon.getDustSmall(1), 120, 120); + GT_Values.RA.addDistillationTowerRecipe(Materials.Kerosene.getHydroCracked(1000), + new FluidStack[] {Materials.JetFuel.getFluid(700), Materials.Methane.getGas(200), Materials.CarbonMonoxide.getGas(100)}, + Materials.Carbon.getDustSmall(1), 120, 120); + GT_Values.RA.addDistillationTowerRecipe(Materials.HeavyFuel.getHydroCracked(1000), new FluidStack[]{Materials.LightFuel.getFluid(800), Materials.Naphtha.getFluid(400), Materials.Butane.getGas(100), Materials.Propane.getGas(100), Materials.Ethane.getGas(75), Materials.Methane.getGas(75)}, @@ -3446,6 +3454,9 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalRecipe(Materials.Ethanol.getCells(1), Materials.Butene.getCells(1), GT_Values.NF, GT_Values.NF, Materials.AntiKnock.getCells(2), 400, 480); GT_Values.RA.addMixerRecipe(Materials.Naphtha.getCells(16), Materials.Toluene.getCells(2), Materials.Methanol.getCells(1), (GT_Mod.gregtechproxy.mMoreComplicatedChemicalRecipes ? Materials.Acetone : Materials.AceticAcid).getCells(1), GT_Values.NF, GT_Values.NF, Materials.GasolineRegular.getCells(20), 200, 120); GT_Values.RA.addMixerRecipe(Materials.GasolineRegular.getCells(20), Materials.AntiKnock.getCells(3), Materials.NitrousOxide.getCells(6), Materials.Toluene.getCells(1), GT_Values.NF, GT_Values.NF, Materials.GasolinePremium.getCells(30), 200, 120); + + //JP-8 + GT_Values.RA.addMixerRecipe(Materials.JetFuel.getCells(6), Materials.Naphtha.getCells(2), Materials.Ethane.getCells(1), GT_Values.NI, GT_Values.NF, GT_Values.NF, Materials.Jet8.getCells(9), 200, 512); } public void addPotionRecipes(String aName,ItemStack aItem){ diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 4816b2d8..69032070 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -430,7 +430,8 @@ public class GT_Loader_Item_Block_And_Fluid GT_Mod.gregtechproxy.addFluid("liquid_light_fuel", "Light Fuel", Materials.LightFuel, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("liquid_heavy_fuel", "Heavy Fuel", Materials.HeavyFuel, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("liquid_lpg", "LPG", Materials.LPG, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); - + GT_Mod.gregtechproxy.addFluid("liquid_kerosene", "Kerosene", Materials.Kerosene, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Kerosene, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + GT_Mod.gregtechproxy.addFluid("charcoal_byproducts", "molten.autogenerated", "Charcoal Byproducts", Materials.CharcoalByproducts, Materials.CharcoalByproducts.mRGBa, 2, 775, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CharcoalByproducts, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("molten.bisphenol_a", "molten.autogenerated", "Molten Bisphenol A", Materials.BisphenolA, Materials.BisphenolA.mRGBa, 1, 432, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.BisphenolA, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); 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 2822b511..058a06a5 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1143,6 +1143,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_LV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_MV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R', OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Copper)}); GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_HV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R', OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); + + ItemList.Generator_Jet_Turbine_HV.set(new GT_MetaTileEntity_JetTurbine(1254, "basicgenerator.jetturbine.tier.03", "Modern Jet Turbine", 3).getStackForm(1L)); + ItemList.Generator_Jet_Turbine_EV.set(new GT_MetaTileEntity_JetTurbine(1255, "basicgenerator.jetturbine.tier.04", "Improved Jet Turbine", 4).getStackForm(1L)); + ItemList.Generator_Jet_Turbine_IV.set(new GT_MetaTileEntity_JetTurbine(1256, "basicgenerator.jetturbine.tier.05", "Hi-Bypass Jet Turbine", 5).getStackForm(1L)); + + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Jet_Turbine_HV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R', OrePrefixes.rotor.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Jet_Turbine_EV.get(1L, new Object[0]), 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_Jet_Turbine_IV.get(1L, new Object[0]), 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.Platinum)}); + ItemList.Generator_Steam_Turbine_LV.set(new GT_MetaTileEntity_SteamTurbine(1120, "basicgenerator.steamturbine.tier.01", "Basic Steam Turbine", 1).getStackForm(1L)); ItemList.Generator_Steam_Turbine_MV.set(new GT_MetaTileEntity_SteamTurbine(1121, "basicgenerator.steamturbine.tier.02", "Advanced Steam Turbine", 2).getStackForm(1L)); diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png new file mode 100644 index 0000000000000000000000000000000000000000..adf34d2ba1716eaa573192fa7e82bcedb51c838a GIT binary patch literal 12441 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 afEjLNz67SB_i-N%;%TcJsJ&FNi})`|YLdMG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png.mcmeta new file mode 100644 index 00000000..0df7234a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file