diff options
3 files changed, 57 insertions, 14 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index a87d3c8f32..437cae216f 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -553,7 +553,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials BioDiesel = new MaterialBuilder(627, TextureSet.SET_FLUID , "Bio Diesel").addCell().addFluid().setRGB(255, 128, 0).setColor(Dyes.dyeOrange).setFuelType(MaterialBuilder.DIESEL).setFuelPower(320).constructMaterial(); public static Materials NitrationMixture = new MaterialBuilder(628, TextureSet.SET_FLUID , "Nitration Mixture").addCell().setRGB(230, 226, 171).setColor(Dyes.dyeBrown).constructMaterial(); - public static Materials Glycerol = new MaterialBuilder(629, TextureSet.SET_FLUID , "Glycerol").addCell().addFluid().setRGB(135, 222, 135).setColor(Dyes.dyeLime).setFuelType(MaterialBuilder.SEMIFLUID).setFuelType(164).setMaterialList(new MaterialStack(Carbon, 3), new MaterialStack(Hydrogen, 8), new MaterialStack(Oxygen, 3)).addElectrolyzerRecipe().constructMaterial(); + public static Materials Glycerol = new MaterialBuilder(629, TextureSet.SET_FLUID , "Glycerol").addCell().addFluid().setRGB(135, 222, 135).setColor(Dyes.dyeLime).setFuelType(MaterialBuilder.SEMIFLUID).setFuelPower(164).setMaterialList(new MaterialStack(Carbon, 3), new MaterialStack(Hydrogen, 8), new MaterialStack(Oxygen, 3)).addElectrolyzerRecipe().constructMaterial(); public static Materials SodiumBisulfate = new MaterialBuilder(630, TextureSet.SET_FLUID , "Sodium Bisulfate").addDustItems().setRGB(0, 68, 85).setColor(Dyes.dyeBlue).setMaterialList(new MaterialStack(Sodium, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Oxygen, 4)).constructMaterial(); public static Materials PolyphenyleneSulfide = new MaterialBuilder(631, TextureSet.SET_DULL , "Polyphenylene Sulfide").addDustItems().addMetalItems().addToolHeadItems().addGearItems().setToolSpeed(3.0f).setDurability(32).setToolQuality(1).setRGB(170, 136, 0).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Sulfur, 1)).constructMaterial(); public static Materials Dichlorobenzene = new MaterialBuilder(632, TextureSet.SET_FLUID , "Dichlorobenzene").addCell().addFluid().setRGB(0, 68, 85).setColor(Dyes.dyeBlue).setMaterialList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Chlorine, 2)).addElectrolyzerRecipe().constructMaterial(); diff --git a/src/main/java/gregtech/api/enums/MaterialsKevlar.java b/src/main/java/gregtech/api/enums/MaterialsKevlar.java index 7ff50efeb5..be1ef3b0f1 100644 --- a/src/main/java/gregtech/api/enums/MaterialsKevlar.java +++ b/src/main/java/gregtech/api/enums/MaterialsKevlar.java @@ -435,6 +435,8 @@ public class MaterialsKevlar { .addFluid() .setRGB(255, 255, 255) .setColor(Dyes.dyeWhite) + .setFuelType(MaterialBuilder.SEMIFLUID) + .setFuelPower(80) .constructMaterial(); public static Materials CobaltIIHydroxide = new MaterialBuilder(759, TextureSet.SET_POWDER, "Cobalt II Hydroxide") .setName("CobaltIIHydroxide") diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 962ad39ecf..0dbccc6ba7 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -12127,7 +12127,7 @@ public class GT_MachineRecipeLoader implements Runnable { // C8H10 + 6O =CoC22H14O4= C8H6O4 + 2H2O GT_Values.RA.addChemicalRecipe( GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.IVDimethylbenzene, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIINaphthenate, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIINaphthenate, 41L), Materials.Oxygen.getGas(6000L), Materials.Water.getFluid(2000L), GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.TerephthalicAcid, 1L), @@ -12283,13 +12283,13 @@ public class GT_MachineRecipeLoader implements Runnable { 4000, 120); - GT_Values.RA.addChemicalRecipe( + GT_Values.RA.addChemicalRecipeForBasicMachineOnly( MaterialsKevlar.CobaltIIHydroxide.getDust(5), MaterialsKevlar.NaphthenicAcid.getCells(1), GT_Values.NF, GT_Values.NF, - MaterialsKevlar.CobaltIINaphthenate.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), + MaterialsKevlar.CobaltIINaphthenate.getDust(41), + ItemList.Cell_Empty.get(1L), 100, 480); GT_Values.RA.addChemicalRecipe( @@ -12297,27 +12297,68 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.NaphthenicAcid.getFluid(1000L), GT_Values.NF, - MaterialsKevlar.CobaltIINaphthenate.getDust(1), - 100, + MaterialsKevlar.CobaltIINaphthenate.getDust(41), + 200, 480); - GT_Values.RA.addChemicalRecipe( + GT_Values.RA.addChemicalRecipeForBasicMachineOnly( MaterialsKevlar.CobaltIIAcetate.getDust(15), MaterialsKevlar.NaphthenicAcid.getCells(1), GT_Values.NF, - GT_Values.NF, - MaterialsKevlar.CobaltIINaphthenate.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), + Materials.AceticAcid.getFluid(1500L), + MaterialsKevlar.CobaltIINaphthenate.getDust(41), + ItemList.Cell_Empty.get(1L), 100, 480); GT_Values.RA.addChemicalRecipe( MaterialsKevlar.CobaltIIAcetate.getDust(15), GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.NaphthenicAcid.getFluid(1000L), - GT_Values.NF, - MaterialsKevlar.CobaltIINaphthenate.getDust(1), + Materials.AceticAcid.getFluid(1500L), + MaterialsKevlar.CobaltIINaphthenate.getDust(41), 100, 480); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[] { + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIHydroxide, 45L) + }, + new FluidStack[] {MaterialsKevlar.NaphthenicAcid.getFluid(10000L)}, + new FluidStack[] { + GT_Values.NF, + }, + new ItemStack[] { + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(49), + }, + 200, + 1920); + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[] { + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 7L) + }, + new FluidStack[] {MaterialsKevlar.NaphthenicAcid.getFluid(10000L)}, + new FluidStack[] { + Materials.AceticAcid.getFluid(15000L), + }, + new ItemStack[] { + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(49), + }, + 200, + 1920); // Co + 2HNO3 = Co(NO3)2 + 2H GT_Values.RA.addChemicalRecipe( Materials.Cobalt.getDust(1), @@ -12343,7 +12384,7 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.CobaltOxide.getDust(2), Materials.AceticAcid.getCells(2), GT_Values.NF, - Materials.Hydrogen.getGas(2000L), + Materials.Water.getFluid(2000L), MaterialsKevlar.CobaltIIAcetate.getDust(15), ItemList.Cell_Empty.get(2L), 100, |