From 2406121f91316d275f6dd3e8e9c1d3e65e3c1643 Mon Sep 17 00:00:00 2001 From: Mikhail <68438915+mikhailkfv@users.noreply.github.com> Date: Thu, 13 Jul 2023 12:29:23 -0500 Subject: [PATCH] Work on #4, #8, fixed build script (Again!!) --- .gitignore | 8 +--- build.gradle | 38 +++++++++++------- build.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/gregtech/api/enums/ItemList.java | 3 +- .../java/gregtech/api/enums/Materials.java | 9 +++-- .../api/interfaces/internal/GasesCompat.java | 12 ++++++ .../interfaces/internal/IGT_RecipeAdder.java | 2 +- .../java/gregtech/common/GT_GasesCompat.java | 27 +++++++++++++ .../GT_MetaTileEntity_DieselGenerator.java | 2 +- .../GT_MetaTileEntity_JetTurbine.java | 2 +- .../gregtech/loaders/load/GT_FuelLoader.java | 4 +- .../postload/GT_MachineRecipeLoader.java | 25 ++++++++---- .../GT_Loader_Item_Block_And_Fluid.java | 7 +++- .../preload/GT_Loader_MetaTileEntities.java | 10 +++-- ...liquid_kerosene.png => fluid.kerosene.png} | Bin ...e.png.mcmeta => fluid.kerosene.png.mcmeta} | 0 .../fluids/fluid.liquid_residualoil.png | Bin 0 -> 5797 bytes .../fluid.liquid_residualoil.png.mcmeta | 5 +++ .../fluids/fluid.liquid_sulfurickerosene.png | Bin 0 -> 12665 bytes .../fluid.liquid_sulfurickerosene.png.mcmeta | 5 +++ .../fluids/fluid.liquid_sulfuricresid.png | Bin 0 -> 5797 bytes .../fluid.liquid_sulfuricresid.png.mcmeta | 5 +++ 23 files changed, 123 insertions(+), 45 deletions(-) create mode 100644 src/main/java/gregtech/api/interfaces/internal/GasesCompat.java create mode 100644 src/main/java/gregtech/common/GT_GasesCompat.java rename src/main/resources/assets/gregtech/textures/blocks/fluids/{fluid.liquid_kerosene.png => fluid.kerosene.png} (100%) rename src/main/resources/assets/gregtech/textures/blocks/fluids/{fluid.liquid_kerosene.png.mcmeta => fluid.kerosene.png.mcmeta} (100%) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_residualoil.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_residualoil.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfurickerosene.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfurickerosene.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricresid.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricresid.png.mcmeta diff --git a/.gitignore b/.gitignore index 351f3323..34791ae9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + ### Windows ### thumbs.db @@ -73,13 +74,8 @@ local.properties classes/ /out/ -gradle/wrapper/gradle-wrapper.properties -gradlew -gradlew.bat # Linux *~ -maven/IC2Classic-1.7.10.zip -maven/GT5-Unofficial-5.09.33.02.zip -.gitignore +maven/* \ No newline at end of file diff --git a/build.gradle b/build.gradle index b6f13792..46db0f19 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,10 @@ buildscript { repositories { mavenCentral() jcenter() - //maven { - // name = "forge" - // url = "http://files.minecraftforge.net/maven" - //} + maven { + name = "forge" + url = "https://maven.minecraftforge.net" + } maven { name = "gt" url = "https://gregtech.overminddl1.com/" @@ -16,7 +16,9 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') { + changing = true + } } } @@ -78,27 +80,33 @@ configurations { repositories { maven { name = "gt" - url = "http://gregtech.overminddl1.com/" + url = "https://gregtech.overminddl1.com/" } maven { name = "ic2" - url = "http://maven.ic2.player.to/" + url = "https://maven.ic2.player.to/" } + maven { + name = "k4u" + url = "https://maven.k-4u.nl/" + } + maven { + name = "local" + url = "file:///C:/Users/michael/Documents/GT5-Unofficial/maven/" + } } dependencies { // compile fileTree(dir: 'libs', include: '*.jar') - // Mostly Used for compileOnly, if you prefer normal IC2, uncomment it instead. provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" - compile "mcp.mobius.waila:Waila:1.5.11-RC2-NONEI_1.7.10:dev" - compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev" - compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev" - compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev" + compileOnly "mcp.mobius.waila:Waila:1.5.11-RC2-NONEI_1.7.10" + //compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev" + //compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev" + //compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev" compileOnly "com.enderio.core:EnderCore:1.7.10-0.2.0.39_beta:dev" - // "com.enderio:EnderIO:1.7.10-2.3.0.429_beta:dev" compileOnly "com.enderio:EnderIO:1.7.10-2.3.0.430_beta:dev" compileOnly "cofh:CoFHCore:1.7.10R3.0.4:dev" @@ -110,11 +118,13 @@ dependencies { compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev" compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev" - compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev" + compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev" compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf" compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev" compileOnly "applecore:AppleCore:1.7.10-3.1.1:deobf" compileOnly "com.shedar.IC2NuclearControl:IC2NuclearControl:2.4.3a:dev" + + compileOnly "pneumaticCraft:PneumaticCraft-1.7.10:1.12.7-152:userdev" } diff --git a/build.properties b/build.properties index f297c215..6aeaf7f3 100644 --- a/build.properties +++ b/build.properties @@ -16,7 +16,7 @@ enderio.cf=2219/296 enderio.version=1.7.10-2.3.0.417_beta enderiocore.version=1.7.10-0.1.0.25_beta forestry.version=4.2.10.58 -ic2.version=2.2.790-experimental +ic2.version=2.2.817-experimental nei.version=1.0.3.57 railcraft.cf=2219/321 railcraft.version=1.7.10-9.4.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d60634ff..8115810e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip \ No newline at end of file diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index ccb735a3..9974c0b5 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -508,9 +508,10 @@ public enum ItemList implements IItemContainer { Generator_Gas_Turbine_LV, Generator_Gas_Turbine_MV, Generator_Gas_Turbine_HV, + Generator_Jet_Turbine_MV, Generator_Jet_Turbine_HV, Generator_Jet_Turbine_EV, - Generator_Jet_Turbine_IV, + //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/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index a15c7dd0..f56d88b5 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -537,7 +537,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { 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 SulfuricKerosene = new Materials(744, TextureSet.SET_FLUID, 1.0F, 0, 0, 16, 0, 255, 255, 0, "SulfuricKerosene", "Sulfuric Kerosene", 0, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlue); + public static Materials ResidualOil = new Materials(745, TextureSet.SET_FLUID, 1.0F, 0, 0, 16, 10, 10, 10, 0, "ResidualOil", "Residual Oil", 3, 48, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack); + public static Materials SulfuricResid = new Materials(746, TextureSet.SET_FLUID, 1.0F, 0, 0, 16, 10, 10, 10, 0, "SulfuricResid", "Sulfuric Residual Oil", 3, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack); + 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(); public static Materials Pyrochlore = new MaterialBuilder(607, TextureSet.SET_METALLIC, "Pyrochlore").addDustItems().addOreItems().setRGB(43, 17, 0).setColor(Dyes.dyeBlack).setMaterialList(new MaterialStack(Calcium, 2), new MaterialStack(Niobium, 2), new MaterialStack(Oxygen, 7)).addElectrolyzerRecipe().constructMaterial(); @@ -754,8 +757,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { 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(); + public static Materials JetFuel = new MaterialBuilder(747, 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(748, 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/interfaces/internal/GasesCompat.java b/src/main/java/gregtech/api/interfaces/internal/GasesCompat.java new file mode 100644 index 00000000..86c61c89 --- /dev/null +++ b/src/main/java/gregtech/api/interfaces/internal/GasesCompat.java @@ -0,0 +1,12 @@ +package gregtech.api.interfaces.internal; + +import net.minecraftforge.fluids.Fluid; + +public interface GasesCompat { + + public boolean registerGregGas(Fluid gas); + + public boolean registerOtherGasesAsFluids(); + + public boolean registerFluidCannerRecipes(); +} diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index 863a7631..92727067 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -622,7 +622,7 @@ public interface IGT_RecipeAdder { * Every Fluid also gets separate distillation recipes * * @param aInput1 must be != null - * @param aOutputs must be != null 1-5 Fluids + * @param aOutputs must be != null 1-11 Fluids * @param aOutput2 can be null */ public boolean addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt); diff --git a/src/main/java/gregtech/common/GT_GasesCompat.java b/src/main/java/gregtech/common/GT_GasesCompat.java new file mode 100644 index 00000000..c01a32ef --- /dev/null +++ b/src/main/java/gregtech/common/GT_GasesCompat.java @@ -0,0 +1,27 @@ +package gregtech.common; + +import gregtech.api.interfaces.internal.GasesCompat; +import net.minecraftforge.fluids.Fluid; +//import glenn.gasesframework.api.gastype.GasType; + +public class GT_GasesCompat implements GasesCompat { + + @Override + public boolean registerGregGas(Fluid gas) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean registerOtherGasesAsFluids() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean registerFluidCannerRecipes() { + // TODO Auto-generated method stub + return false; + } + +} 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 4d1fb100..503a1f7e 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, (90 - this.mTier * 5)); + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, (100 - 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 index b73f3bc5..7d0d1372 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_JetTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_JetTurbine.java @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_JetTurbine } 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 + this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, (90 - this.mTier * 5)); //TODO Unique config for jet fuels } public int getEfficiency() { diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 188a6590..e93bf7a3 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -44,10 +44,10 @@ public class GT_FuelLoader GT_Values.RA.addFuel(GT_ModHandler.getModItem("ImmersiveEngineering", "fluidContainers", 1, 7), null, 128, 0); } if(Loader.isModLoaded("PneumaticCraft")){ - GT_Values.RA.addFuel(GT_ModHandler.getModItem("PneumaticCraft", "pgBucket", 1), null, 512, 1); + //GT_Values.RA.addFuel(GT_ModHandler.getModItem("PneumaticCraft", "pgBucket", 1), null, 512, 1); GT_Values.RA.addFuel(GT_ModHandler.getModItem("PneumaticCraft", "fuelBucket", 1), null, 400, 0); GT_Values.RA.addFuel(GT_ModHandler.getModItem("PneumaticCraft", "fuelBucket", 1, 1), null, 400, 0); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("PneumaticCraft", "keroseneBucket", 1), null, 256, 0); + //GT_Values.RA.addFuel(GT_ModHandler.getModItem("PneumaticCraft", "keroseneBucket", 1), null, 256, 0); GT_Values.RA.addFuel(GT_ModHandler.getModItem("PneumaticCraft", "dieselBucket", 1), null, 200, 0); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 3a25a8ec..826ec4fc 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -726,10 +726,11 @@ 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.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); + GT_Values.RA.addUniversalDistillationRecipe(Materials.OilLight.getFluid(150), new FluidStack[]{ Materials.SulfuricResid.getFluid(5), Materials.SulfuricHeavyFuel.getFluid(10), Materials.SulfuricLightFuel.getFluid(20), Materials.SulfuricKerosene.getFluid(30), Materials.SulfuricNaphtha.getFluid(30), Materials.SulfuricGas.getGas(240)}, null, 20, 96); + GT_Values.RA.addUniversalDistillationRecipe(Materials.OilMedium.getFluid(100), new FluidStack[]{Materials.SulfuricResid.getFluid(8), Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricKerosene.getFluid(25), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60)}, null, 20, 96); + GT_Values.RA.addUniversalDistillationRecipe(Materials.Oil.getFluid(50L), new FluidStack[]{ Materials.SulfuricResid.getFluid(8), Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricKerosene.getFluid(25), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60)}, null, 20, 96); + GT_Values.RA.addUniversalDistillationRecipe(Materials.OilHeavy.getFluid(100), new FluidStack[]{ Materials.SulfuricResid.getFluid(125), Materials.SulfuricHeavyFuel.getFluid(250), Materials.SulfuricLightFuel.getFluid(45), Materials.SulfuricKerosene.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); @@ -756,6 +757,14 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 12L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(1000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 12L), 160); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), GT_Utility.getIntegratedCircuit(4), Materials.SulfuricHeavyFuel.getFluid(8000), Materials.HeavyFuel.getFluid(8000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), 160); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 8L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(1000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 8L), 160); + + //new recipes + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricKerosene, 12L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(1000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Kerosene, 12L), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), GT_Utility.getIntegratedCircuit(4), Materials.SulfuricKerosene.getFluid(12000), Materials.Kerosene.getFluid(12000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricResid, 8L), GT_Utility.getIntegratedCircuit(4), Materials.Hydrogen.getGas(1000), Materials.HydricSulfide.getGas(1000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ResidualOil, 8L), 160); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), GT_Utility.getIntegratedCircuit(4), Materials.SulfuricResid.getFluid(8000), Materials.ResidualOil.getFluid(8000), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), 160); + + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L), null, Materials.Naphtha.getFluid(576), Materials.Polycaprolactam.getMolten(1296), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Potassium, 1), 640); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Polycaprolactam, 1L), new ItemStack(Items.string, 32), 80, 48); @@ -2796,11 +2805,11 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Chlorine.getCells(1), Materials.Empty.getCells(5), Materials.Ethylene.getGas(5000), GT_Values.NF, Materials.VinylChloride.getCells(6), GT_Values.NI, 240, 30); GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Ethylene.getCells(5), Materials.Chlorine.getCells(1), GT_Values.NF, GT_Values.NF, Materials.VinylChloride.getCells(6), GT_Values.NI, 240, 30); - GT_Values.RA.addChemicalRecipe(Materials.LightFuel.getCells(1), GT_Values.NI, Materials.NitricAcid.getFluid(250), Materials.NitroFuel.getFluid(1000), Materials.Empty.getCells(1), 80, 8); - GT_Values.RA.addChemicalRecipe(Materials.Fuel.getCells(2), GT_Values.NI, Materials.NitricAcid.getFluid(250), Materials.NitroFuel.getFluid(1000), Materials.Empty.getCells(2), 80, 8); + //GT_Values.RA.addChemicalRecipe(Materials.LightFuel.getCells(1), GT_Values.NI, Materials.NitricAcid.getFluid(250), Materials.NitroFuel.getFluid(1000), Materials.Empty.getCells(1), 80, 8); + GT_Values.RA.addChemicalRecipe(Materials.Fuel.getCells(1), GT_Values.NI, Materials.NitricAcid.getFluid(250), Materials.NitroFuel.getFluid(1000), Materials.Empty.getCells(2), 80, 8); GT_Values.RA.addChemicalRecipe(Materials.BioDiesel.getCells(4), GT_Values.NI, Materials.NitricAcid.getFluid(1000), Materials.NitroFuel.getFluid(3000), Materials.Empty.getCells(4), 320, 8); - GT_Values.RA.addChemicalRecipe(Materials.NitricAcid.getCells(1), GT_Values.NI, Materials.LightFuel.getFluid(4000), Materials.NitroFuel.getFluid(4000), Materials.Empty.getCells(1), 320, 8); - GT_Values.RA.addChemicalRecipe(Materials.NitricAcid.getCells(1), GT_Values.NI, Materials.Fuel.getFluid(8000), Materials.NitroFuel.getFluid(4000), Materials.Empty.getCells(1), 320, 8); + //GT_Values.RA.addChemicalRecipe(Materials.NitricAcid.getCells(1), GT_Values.NI, Materials.LightFuel.getFluid(4000), Materials.NitroFuel.getFluid(4000), Materials.Empty.getCells(1), 320, 8); + GT_Values.RA.addChemicalRecipe(Materials.NitricAcid.getCells(1), GT_Values.NI, Materials.Fuel.getFluid(4000), Materials.NitroFuel.getFluid(4000), Materials.Empty.getCells(1), 320, 8); GT_Values.RA.addChemicalRecipe(Materials.NitricAcid.getCells(1), GT_Values.NI, Materials.BioDiesel.getFluid(4000), Materials.NitroFuel.getFluid(3000), Materials.Empty.getCells(1), 320, 8); GT_Values.RA.addChemicalRecipe( Materials.Sulfur.getDust(1), GT_Utility.getIntegratedCircuit(1), Materials.Benzene.getFluid(1000), Materials.PolyphenyleneSulfide.getMolten(2000), GT_Values.NI, 320, 30); 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 69032070..e6246166 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 @@ -429,8 +429,11 @@ public class GT_Loader_Item_Block_And_Fluid GT_Mod.gregtechproxy.addFluid("liquid_naphtha", "Naphtha", Materials.Naphtha, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); 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("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_sulfurickerosene", "Sulfuric Kerosene", Materials.SulfuricKerosene, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricKerosene, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + GT_Mod.gregtechproxy.addFluid("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("liquid_sulfuricresid", "Sulfuric Residual Oil", Materials.SulfuricResid, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricResid, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + GT_Mod.gregtechproxy.addFluid("liquid_residualoil", "Residual Oil", Materials.ResidualOil, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ResidualOil, 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 058a06a5..fa7df1f0 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1144,13 +1144,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { 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)); + ItemList.Generator_Jet_Turbine_MV.set(new GT_MetaTileEntity_JetTurbine(1254, "basicgenerator.jetturbine.tier.02", "Advanced Jet Turbine", 2).getStackForm(1L)); + ItemList.Generator_Jet_Turbine_HV.set(new GT_MetaTileEntity_JetTurbine(1255, "basicgenerator.jetturbine.tier.03", "Modern Jet Turbine", 3).getStackForm(1L)); + ItemList.Generator_Jet_Turbine_EV.set(new GT_MetaTileEntity_JetTurbine(1256, "basicgenerator.jetturbine.tier.04", "Improved Jet Turbine", 4).getStackForm(1L)); + //ItemList.Generator_Jet_Turbine_IV.set(new GT_MetaTileEntity_JetTurbine(1257, "basicgenerator.jetturbine.tier.05", "Hi-Bypass Jet Turbine", 5).getStackForm(1L)); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Jet_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.Steel), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Copper)}); 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)}); + //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)); 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.kerosene.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png rename to src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.kerosene.png 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.kerosene.png.mcmeta similarity index 100% rename from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_kerosene.png.mcmeta rename to src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.kerosene.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_residualoil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_residualoil.png new file mode 100644 index 0000000000000000000000000000000000000000..6a653f3ddc9b55558130672d86f1894e4df1b737 GIT binary patch literal 5797 zcmWkyc{tSF7yr&;#@J@i*vAYel$MFeQf3A*3aMXNUSXsxuRVJ)W>8F_F>RDBDtRs0 zmyjWE$TTQrU(#Z1QPzy%=Y8&TpL0LwkNceGx#x2~=NzWJot31Rk{AF0lGYT9bGsG= z0AN5AwtKq$YX0M{0fnBkG6TwZDl@wP>P@yK13<+c@huOLU5p5(IEMm&RQrD$bYDkG zdDjWMblS=S*!geeH5cC9^}xfdZBN3-;mSyr!w=QBC;%XbwzeRjk8-QYW)VS?G-ZQ3g z+bZNFdYyZma5Yr(dq24iKUi@jzRsQY=et=igKZ>F+**2LWP%W7qyGpNTdD$enI#q_ z2LZ%$*;me)w4fH@+Q^Zezf`FwdKmg3+noKo*G`WpQVf|D!qoxyOwX?e#?#_r9$-Yi zmVxy={RAT(PUy+RC*1)ud6M7Cr$fsjiWPcx7X!bbJ0)!JzM_|Nox=jT`zsaie;m9f zf?u}Y_JtvkA4yUvI$;5$jo!HQJI5Fu%30BYOgIAm@_F`hUe+@ievRAy4GIy!_+02) zmkVptJ}bMXLj1g#!*G_QHmyK-oP&VMt9jVwnn*Dij4AvGHQjuMeX-~Ar4#E}z?$o( z|Cf9PvP|*xtxxWojAo!U*)!hKiCe3>t3GHk zQepkuS_1=};4r%(VPJjpnf+X7)*08A^67gS5#<(EQd}CK;wX|g9SdQRI2#?w;Y!h=VCTm4hP}a(}hs>x(CX^S*p&=z|tiTjF^DHu7e@!lIR?p)E8LZ=c=8}nS z2dFvokwS^sJe=(VlgV0u;I> z6#0E{5eY4|tA7x@8#|v%=>pt^eb{Bc=_}(O6f+}<$#+^(KK2!Z*^f^kc@1vRwFGBG z#$~$x)U@4e*^r}yIIJAw1W3cW>}9o2h1L%FCSR;5<50LL7t?${~JrJWkn2EitC_F8nl z8$|XSLr`ziebaQ7@UKxZP+N9@Ker8P=seUwho4W5Jllw5JkuA^(L%@r^w zFTOqb{QaGjXA`RlHyQM~P+rEHp9EyzA3{*F>*8Nvrk z+pR7hkND2}8*H`W5Yaxa$2gQ}L=&SGYyDKcB606l)sRw|d9Mq<*#%)oQcv#lI76Ha zxAe$cDvv;;QrZm!AlMIRqsV8{9>z4{3>FD6u0Yhc6cXxow^Bbi?AdJ05CHLj? zLh`$=Cf}Pn7)B5667>h=)^|tWP*U6*vOS2TXC_+krQOwk=yW}~=wiPwX0}&jg9SL( z{)x?Fl9a4}(lM(OYmj1+;ccmm z-t{X)PFH1Vo4Ms~avK6VOZRhdgU}*6!11x1h=w*BSYow`PpIVIz5{ko zO!P}&X)l%{!jxy=KW#xNDtLn@l7{ZWyefU`o|?JafvX9M68)eb=RXQ@7BruHpR;h4 zvAQ|D>AfMdiP9xy!08#{&;&da!=Xl_p112Iha|1yr$}-DGnAgK+zNMbeC$F{PJ2ns zw_CC{NKw#y6*j$b6}I8dBT)&bgPwW(dq)TqfVpW%H}d?|I@{5;6G5uXN_ z%%zMW=>_E0o0My01d$Qj|;g zQy$WK(R|L@CP5^k%=1j{8B?9 zU@n&=8sB8v8xcTl76-iCWhesb8WuOy7Nb1EXQ<`LmR6bEo9IX4+vS8MoI7F^0dP_aH0StLL6p=v z-kL4_7_El{!S``Vy|Ol}iUbhjOl#>x4ud{);QZ60jQehG-tkTQ8EGWzPXGHxw}+4< zcsSaDKBn_}1wx%M$;jripMfOCwG!K zW&?@TwFI8_HRY5IHSX?rK)2!6P$qpxUh^b%D!^)8$JQZ;Y;kkv4RPF7QF;6odVp zzSm*_tK@!-UHzHR(?_UF_&cdZ&BJe{a>YRwcI87>f?Pe4DO?!bLl#*KeEl zc1g%K;_nDKHp?LfT}lFpVGzOiVV3mOt%~mg>UtiKAWDjYZLG`V-?y%Z(m$5u2|yrM zUrPZfKOIQu(`Oij9~OWvX@CrxQ&a`5cz`eQ`N3b2 zncA6s0O^KX<0sQK29(y3 zY(`D%@CWkLJRF8=q!RAZKOqOrg5G>|m>$Gie-83gKB#Y3I4+H$#-ie4%ampE*Pl$C ztim2Rr+Otpf8`ZcC8rI|?;PoDKLvnbr#lDl8<#!oI`O~f7TIS8 zCgm)8_NMmC!@bNij$Kri_^o@yBj}QspMrMRf?Pzok_h4XxlM-Dg5j@wxFpKHtb`;) z>pYyAgRWmm@a3u^T^&DL_quP#dOwl!ro6bBj&n0$wk8QcZMLfhoM%`=rOD#=Dx}Hi zBEb(D&`)NINod;pQj;=B>p|#_t%DPA*t0k0(M=^~FLtj!+4ak2KiV*Z94o7T zj)8r|;aJ{PGksDvu>hy&Vmu+&W6~fOvCeuf=E@pogidViz*G}+EMVnPgEg@qY2gSm zBkVNct{pmFT>Bk$mXrr^nWa&~hm{WtTFY*&S$`;zs;;u*%(d}+h^P_TZrjsdifZrD zNIhdXcr^b-Y<{FIZkcDt{f7i8a9JwT>UI9^NhH|+{t4%ls=PWZ1io@9!Ecs*gxxgY zIHc}DWe+~3j+W;MRee(Zm77JXRdqRQT*G(j+o+kRhr&DxBz7!{q=!0w9Z@=k` zj?%m%q)+lb+!sYkR<6C5v*!~$_EN20?^b!DcFjMr|M)+dkS|xod&niu-?JfH>t46X zXxXI$ByIR)PJ8I>TU0gTu(T4HP*gKV9oYVa-&*}3+EV8=LVd7htnHAWNdOH z2Ra|bh{twzj^A1P2L-;L>RbjFRSfOX-f7QFfvt9)_98GdBHO}Yx^p&!&}6ll#e}zw z!b$eR0he5EBR0y3UV%g@X#4&+6L;x|GF4|+%e1vb;}g$~L-yX5P;B@N`~c1#aqW=roWZ^Uu^GJF8Nt`!&f;T6thf zCB(8b(7^vh((%x;KJz#9bL_zU_;A5@vU(Ke-H|n=@}D%iBx2}@bIX}|+-Hsri|~;1 zXTd1>w?rWKVEp;3Jb5oKtJBYiY4ulOhdR}>T+*S!iceHb3v(e=Ale$Fz9*F{+EAZq=N6gU{qaJzn`@%k`NwIZ5CwKvRg>vuH>|)jL_(2a4NxXH^z>e z>aV_OW}un7smh{0#DD#H1q=fPl*$^N8cGaZv7LV<4C(=KC=FRrcANNLvw*4EvQqfp z88`Z(A#DLfpG+a$sQgj4oP>;w;rc$PL-S_qXl|=lpvh#)l5=jfu^#;H9!kWoWowHf z$UKJoh(=HQb45p3)U9p(t~mPkweng(<*?LA@Cy=a>G$1zx2hg#p2WA&hT3*Ukz3}D z#L5!sDtawQCa-Z7qW3t2tv<_HP(tg0reP+}#afV>j{sC}FRejj+KV)JD)*!Yt;xn! zuAnWcwq?JF%*?~+x@rSMFhV+pzC8m^UM~hLrEc}P{Cbe#opo@534C!TTd)PX&ImrK z*TCc7A`Xz{We>NLVMVs$&L~#CHm)2BE_Zc%zTLl&hX8}RUa?o*pOHu3Nev>Jpt9b7 zfE$IQiXyF=o;iOP_-HBg{qd+9Pr3{J3!u zU5^Y!WmPw=(<%P2IniG6`D9~Rw{v#tL3u}*S7Dhdw|L`wmFc6Kpn=YOaSie#IgUZr9S5-#0?FQ1-HT!+GJNqsWGa}zg+P;6k!Z?U-1)9 zwsXkm;mQ}_hT(pC#d8P*Ni=v5EYe{fMrr!dh%J*((u=Zciz+^2Zen5_^Z`YXHU_Pj z^u3L!a{*8xQ&|w6*F926&Wk5HDE?;fNvT&5$)5*cV&e$vmANZ2Tm;zA*K@@=1jGIb zr+Ud_k~b{M%(+v+x;`?xQy)X$qEPq#ohj)vGP8sTIwoh|!4v^JXx0TD*aP}R+DNox zRb9Wv8hyaS?d=hJ^{l4q`>D$pu(NQ5v0E0Jpy7g~$$l#a2p<1_n1xDw+5?!Ih=!%E zH9YO*461jEE`_MZ^RyAv`RJgoW#;oLKyUd+v}Rf=>#ui-ilqRtj8)Mkl{;sx3}npt z0~d}AEdG9T!K(ObZoZDL*D3_{?+k#4Y68uv3*Au7OrQJ>66$%X9_Qw6@9x6n9=-sf z+d0&nUU3z2j@)mWh08khQ+7vP1SfURo|?OT(}1&(4*9K&YUMlNsfVf)w)Wa;TEUEQaFJ9=u*=LeEm6ML@2 z5PuBKO)Yqoh6Pqcjg=9hJ9|7w7X*M6G%0%BRLgZWX_H|*pb2{D&J))`osj37@#M~n zrgChu6K}1aSttdzu2?+W$Nq&MphdF?xEvM8E^ub*7g@%zF>YY%_|nbaI1dX@#@u|J29B`z;l#+uNZhu#{tS37S$-vc QcV-M&pR}_mGo!};AMWRdlK=n! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_residualoil.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_residualoil.png.mcmeta new file mode 100644 index 00000000..0df7234a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_residualoil.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfurickerosene.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfurickerosene.png new file mode 100644 index 0000000000000000000000000000000000000000..6a068fa5b7144f0e627fb834ef1779a795006a99 GIT binary patch literal 12665 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfurickerosene.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfurickerosene.png.mcmeta new file mode 100644 index 00000000..0df7234a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfurickerosene.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricresid.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricresid.png new file mode 100644 index 0000000000000000000000000000000000000000..6a653f3ddc9b55558130672d86f1894e4df1b737 GIT binary patch literal 5797 zcmWkyc{tSF7yr&;#@J@i*vAYel$MFeQf3A*3aMXNUSXsxuRVJ)W>8F_F>RDBDtRs0 zmyjWE$TTQrU(#Z1QPzy%=Y8&TpL0LwkNceGx#x2~=NzWJot31Rk{AF0lGYT9bGsG= z0AN5AwtKq$YX0M{0fnBkG6TwZDl@wP>P@yK13<+c@huOLU5p5(IEMm&RQrD$bYDkG zdDjWMblS=S*!geeH5cC9^}xfdZBN3-;mSyr!w=QBC;%XbwzeRjk8-QYW)VS?G-ZQ3g z+bZNFdYyZma5Yr(dq24iKUi@jzRsQY=et=igKZ>F+**2LWP%W7qyGpNTdD$enI#q_ z2LZ%$*;me)w4fH@+Q^Zezf`FwdKmg3+noKo*G`WpQVf|D!qoxyOwX?e#?#_r9$-Yi zmVxy={RAT(PUy+RC*1)ud6M7Cr$fsjiWPcx7X!bbJ0)!JzM_|Nox=jT`zsaie;m9f zf?u}Y_JtvkA4yUvI$;5$jo!HQJI5Fu%30BYOgIAm@_F`hUe+@ievRAy4GIy!_+02) zmkVptJ}bMXLj1g#!*G_QHmyK-oP&VMt9jVwnn*Dij4AvGHQjuMeX-~Ar4#E}z?$o( z|Cf9PvP|*xtxxWojAo!U*)!hKiCe3>t3GHk zQepkuS_1=};4r%(VPJjpnf+X7)*08A^67gS5#<(EQd}CK;wX|g9SdQRI2#?w;Y!h=VCTm4hP}a(}hs>x(CX^S*p&=z|tiTjF^DHu7e@!lIR?p)E8LZ=c=8}nS z2dFvokwS^sJe=(VlgV0u;I> z6#0E{5eY4|tA7x@8#|v%=>pt^eb{Bc=_}(O6f+}<$#+^(KK2!Z*^f^kc@1vRwFGBG z#$~$x)U@4e*^r}yIIJAw1W3cW>}9o2h1L%FCSR;5<50LL7t?${~JrJWkn2EitC_F8nl z8$|XSLr`ziebaQ7@UKxZP+N9@Ker8P=seUwho4W5Jllw5JkuA^(L%@r^w zFTOqb{QaGjXA`RlHyQM~P+rEHp9EyzA3{*F>*8Nvrk z+pR7hkND2}8*H`W5Yaxa$2gQ}L=&SGYyDKcB606l)sRw|d9Mq<*#%)oQcv#lI76Ha zxAe$cDvv;;QrZm!AlMIRqsV8{9>z4{3>FD6u0Yhc6cXxow^Bbi?AdJ05CHLj? zLh`$=Cf}Pn7)B5667>h=)^|tWP*U6*vOS2TXC_+krQOwk=yW}~=wiPwX0}&jg9SL( z{)x?Fl9a4}(lM(OYmj1+;ccmm z-t{X)PFH1Vo4Ms~avK6VOZRhdgU}*6!11x1h=w*BSYow`PpIVIz5{ko zO!P}&X)l%{!jxy=KW#xNDtLn@l7{ZWyefU`o|?JafvX9M68)eb=RXQ@7BruHpR;h4 zvAQ|D>AfMdiP9xy!08#{&;&da!=Xl_p112Iha|1yr$}-DGnAgK+zNMbeC$F{PJ2ns zw_CC{NKw#y6*j$b6}I8dBT)&bgPwW(dq)TqfVpW%H}d?|I@{5;6G5uXN_ z%%zMW=>_E0o0My01d$Qj|;g zQy$WK(R|L@CP5^k%=1j{8B?9 zU@n&=8sB8v8xcTl76-iCWhesb8WuOy7Nb1EXQ<`LmR6bEo9IX4+vS8MoI7F^0dP_aH0StLL6p=v z-kL4_7_El{!S``Vy|Ol}iUbhjOl#>x4ud{);QZ60jQehG-tkTQ8EGWzPXGHxw}+4< zcsSaDKBn_}1wx%M$;jripMfOCwG!K zW&?@TwFI8_HRY5IHSX?rK)2!6P$qpxUh^b%D!^)8$JQZ;Y;kkv4RPF7QF;6odVp zzSm*_tK@!-UHzHR(?_UF_&cdZ&BJe{a>YRwcI87>f?Pe4DO?!bLl#*KeEl zc1g%K;_nDKHp?LfT}lFpVGzOiVV3mOt%~mg>UtiKAWDjYZLG`V-?y%Z(m$5u2|yrM zUrPZfKOIQu(`Oij9~OWvX@CrxQ&a`5cz`eQ`N3b2 zncA6s0O^KX<0sQK29(y3 zY(`D%@CWkLJRF8=q!RAZKOqOrg5G>|m>$Gie-83gKB#Y3I4+H$#-ie4%ampE*Pl$C ztim2Rr+Otpf8`ZcC8rI|?;PoDKLvnbr#lDl8<#!oI`O~f7TIS8 zCgm)8_NMmC!@bNij$Kri_^o@yBj}QspMrMRf?Pzok_h4XxlM-Dg5j@wxFpKHtb`;) z>pYyAgRWmm@a3u^T^&DL_quP#dOwl!ro6bBj&n0$wk8QcZMLfhoM%`=rOD#=Dx}Hi zBEb(D&`)NINod;pQj;=B>p|#_t%DPA*t0k0(M=^~FLtj!+4ak2KiV*Z94o7T zj)8r|;aJ{PGksDvu>hy&Vmu+&W6~fOvCeuf=E@pogidViz*G}+EMVnPgEg@qY2gSm zBkVNct{pmFT>Bk$mXrr^nWa&~hm{WtTFY*&S$`;zs;;u*%(d}+h^P_TZrjsdifZrD zNIhdXcr^b-Y<{FIZkcDt{f7i8a9JwT>UI9^NhH|+{t4%ls=PWZ1io@9!Ecs*gxxgY zIHc}DWe+~3j+W;MRee(Zm77JXRdqRQT*G(j+o+kRhr&DxBz7!{q=!0w9Z@=k` zj?%m%q)+lb+!sYkR<6C5v*!~$_EN20?^b!DcFjMr|M)+dkS|xod&niu-?JfH>t46X zXxXI$ByIR)PJ8I>TU0gTu(T4HP*gKV9oYVa-&*}3+EV8=LVd7htnHAWNdOH z2Ra|bh{twzj^A1P2L-;L>RbjFRSfOX-f7QFfvt9)_98GdBHO}Yx^p&!&}6ll#e}zw z!b$eR0he5EBR0y3UV%g@X#4&+6L;x|GF4|+%e1vb;}g$~L-yX5P;B@N`~c1#aqW=roWZ^Uu^GJF8Nt`!&f;T6thf zCB(8b(7^vh((%x;KJz#9bL_zU_;A5@vU(Ke-H|n=@}D%iBx2}@bIX}|+-Hsri|~;1 zXTd1>w?rWKVEp;3Jb5oKtJBYiY4ulOhdR}>T+*S!iceHb3v(e=Ale$Fz9*F{+EAZq=N6gU{qaJzn`@%k`NwIZ5CwKvRg>vuH>|)jL_(2a4NxXH^z>e z>aV_OW}un7smh{0#DD#H1q=fPl*$^N8cGaZv7LV<4C(=KC=FRrcANNLvw*4EvQqfp z88`Z(A#DLfpG+a$sQgj4oP>;w;rc$PL-S_qXl|=lpvh#)l5=jfu^#;H9!kWoWowHf z$UKJoh(=HQb45p3)U9p(t~mPkweng(<*?LA@Cy=a>G$1zx2hg#p2WA&hT3*Ukz3}D z#L5!sDtawQCa-Z7qW3t2tv<_HP(tg0reP+}#afV>j{sC}FRejj+KV)JD)*!Yt;xn! zuAnWcwq?JF%*?~+x@rSMFhV+pzC8m^UM~hLrEc}P{Cbe#opo@534C!TTd)PX&ImrK z*TCc7A`Xz{We>NLVMVs$&L~#CHm)2BE_Zc%zTLl&hX8}RUa?o*pOHu3Nev>Jpt9b7 zfE$IQiXyF=o;iOP_-HBg{qd+9Pr3{J3!u zU5^Y!WmPw=(<%P2IniG6`D9~Rw{v#tL3u}*S7Dhdw|L`wmFc6Kpn=YOaSie#IgUZr9S5-#0?FQ1-HT!+GJNqsWGa}zg+P;6k!Z?U-1)9 zwsXkm;mQ}_hT(pC#d8P*Ni=v5EYe{fMrr!dh%J*((u=Zciz+^2Zen5_^Z`YXHU_Pj z^u3L!a{*8xQ&|w6*F926&Wk5HDE?;fNvT&5$)5*cV&e$vmANZ2Tm;zA*K@@=1jGIb zr+Ud_k~b{M%(+v+x;`?xQy)X$qEPq#ohj)vGP8sTIwoh|!4v^JXx0TD*aP}R+DNox zRb9Wv8hyaS?d=hJ^{l4q`>D$pu(NQ5v0E0Jpy7g~$$l#a2p<1_n1xDw+5?!Ih=!%E zH9YO*461jEE`_MZ^RyAv`RJgoW#;oLKyUd+v}Rf=>#ui-ilqRtj8)Mkl{;sx3}npt z0~d}AEdG9T!K(ObZoZDL*D3_{?+k#4Y68uv3*Au7OrQJ>66$%X9_Qw6@9x6n9=-sf z+d0&nUU3z2j@)mWh08khQ+7vP1SfURo|?OT(}1&(4*9K&YUMlNsfVf)w)Wa;TEUEQaFJ9=u*=LeEm6ML@2 z5PuBKO)Yqoh6Pqcjg=9hJ9|7w7X*M6G%0%BRLgZWX_H|*pb2{D&J))`osj37@#M~n zrgChu6K}1aSttdzu2?+W$Nq&MphdF?xEvM8E^ub*7g@%zF>YY%_|nbaI1dX@#@u|J29B`z;l#+uNZhu#{tS37S$-vc QcV-M&pR}_mGo!};AMWRdlK=n! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricresid.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricresid.png.mcmeta new file mode 100644 index 00000000..0df7234a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricresid.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file