diff options
author | Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> | 2022-03-12 17:36:37 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-12 10:36:37 +0100 |
commit | 3a35d97cc7b21bc972071b166217dd82c37761f2 (patch) | |
tree | bba2b70e4b157ba62252b75076794d437896a76f | |
parent | b287defc65deaf49d9bbd81a5e5363002ded5012 (diff) | |
download | GT5-Unofficial-3a35d97cc7b21bc972071b166217dd82c37761f2.tar.gz GT5-Unofficial-3a35d97cc7b21bc972071b166217dd82c37761f2.tar.bz2 GT5-Unofficial-3a35d97cc7b21bc972071b166217dd82c37761f2.zip |
artificial mica line (#105)
* new artifical mica line
* fix
* the same radio from NaAlO2
* remove direct al2o3 recipe
* remove the same recipe
* comment dismatch
Former-commit-id: b625dcc2a54eefc60ef656861cdecb83ec28970c
4 files changed, 127 insertions, 6 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index 94c91ccb94..3404faf290 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -162,7 +162,7 @@ public final class MainMod { GT_OreDictUnificator.registerOre("blockGlass" + VN[pair.getValue()], new ItemStack(pair.getKey().getBlock(), 1, pair.getKey().getaByte())); } } - + ArtificialMicaLine.runArtificialMicaRecipe(); BioObjectAdder.regenerateBioFluids(); if (ConfigHandler.newStuff) { WerkstoffLoader.run(); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java new file mode 100644 index 0000000000..0063abf7c1 --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java @@ -0,0 +1,50 @@ +package com.github.bartimaeusnek.bartworks.common.loaders; + +import com.github.bartimaeusnek.bartworks.API.LoaderReference; +import com.github.bartimaeusnek.bartworks.system.material.BW_GT_MaterialReference; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +public class ArtificialMicaLine { + + public static void runArtificialMicaRecipe() { + //Mg + O = 2MgO + GT_Values.RA.addChemicalRecipe(Materials.Magnesium.getDust(1), null, Materials.Oxygen.getGas(1000), null, Materials.Magnesia.getDust(2), 40, 8); + //Si + 6HF = 7H2SiF6 + GT_Values.RA.addChemicalRecipe(Materials.Silicon.getDust(1), null, Materials.HydrofluoricAcid.getFluid(6000), WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(7000), null, 400, 120); + //K + Cl = 2KCl + GT_Values.RA.addChemicalRecipe(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2), Materials.Chlorine.getGas(1000), null, Materials.RockSalt.getDust(2), 20, 8); + //2KCl + H2SiF6 = 2HCl + K2SiF6 + GT_Values.RA.addMixerRecipe(Materials.RockSalt.getDust(2), null, null, null, WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000), Materials.HydrochloricAcid.getGas(2000), WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 1), 20, 8); + //2K + CO2 + O = 6K2CO3 + GT_Values.RA.addChemicalRecipe(Materials.Potassium.getDust(2), Materials.CarbonDioxide.getCells(1), Materials.Oxygen.getGas(1000), null, WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), 40, 8); + //K2O + CO2 = 6K2CO3 + GT_Values.RA.addChemicalRecipe(Materials.Potash.getDust(1), Materials.CarbonDioxide.getCells(1), null, null, WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), 40, 8); + //55Quartz Dust + 20K2SiF6 + 12Al2O3 + 4K2CO3 = 91Raw Fluorophlogopite Dust + GT_Values.RA.addMixerRecipe(Materials.QuartzSand.getDust(55), WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), null, GT_Utility.getIntegratedCircuit(4), null, null, null, null, null, WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27), null, null, 400, 120); + //55Quartzite/Nether Quartz Dust + 20K2SiF6 + 12Al2O3 + 4K2CO3 = 136Raw Fluorophlogopite Dust + GT_Values.RA.addMixerRecipe(Materials.Quartzite.getDust(55), WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), null, GT_Utility.getIntegratedCircuit(4), null, null, null, null, null, WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8), null, 600, 120); + GT_Values.RA.addMixerRecipe(Materials.NetherQuartz.getDust(55), WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), null, GT_Utility.getIntegratedCircuit(4), null, null, null, null, null, WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8), null, 600, 120); + //62Certus Quartz Dust + 10K2SiF6 + 12Al2O3 + 4K2CO3 = 91Raw Fluorophlogopite Dust + GT_Values.RA.addMixerRecipe(Materials.CertusQuartz.getDust(62), WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 10), WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), null, GT_Utility.getIntegratedCircuit(4), null, null, null, null, null, WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27), null, null, 600, 120); + //MgO(s) = MgO(l) + GT_Values.RA.addFluidExtractionRecipe(Materials.Magnesia.getDust(1), null, Materials.Magnesia.getMolten(144), 0, 20, 120); + //27Raw Fluorophlogopite Dust + 432MgO(l) = 4608Fluorophlogopite(l) + GT_Values.RA.addBlastRecipe(WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27), null, BW_GT_MaterialReference.Magnesia.getMolten(432), WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(4608), Materials.Glass.getDust(1), null, 600, 480, 1700); + //144Fluorophlogopite(l) = Fluorophlogopite + GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe(new GT_Recipe(false, new ItemStack[]{ItemList.Shape_Mold_Plate.get(0)}, new ItemStack[]{WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1)}, null, null, new FluidStack[]{WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(144)}, null, 10, 120, 0)); + //Fluorophlogopite = 4Insulator Foil + if (LoaderReference.dreamcraft) + GT_Values.RA.addBenderRecipe(WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 4), 10, 600); + } + +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java index 6d1463bdfd..2d77a0efc8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java @@ -146,13 +146,14 @@ public class BW_GT_MaterialReference { public static Werkstoff Polytetrafluoroethylene = new Werkstoff(Materials.Polytetrafluoroethylene, ADD_CASINGS_ONLY, COMPOUND,31_766+473); public static Werkstoff Plastic = new Werkstoff(Materials.Plastic, ADD_CASINGS_ONLY, COMPOUND,31_766+874); public static Werkstoff Epoxid = new Werkstoff(Materials.Epoxid, ADD_CASINGS_ONLY, COMPOUND,31_766+470); - + public static Werkstoff Magnesia = new Werkstoff(Materials.Magnesia, new Werkstoff.GenerationFeatures().disable().addMetalItems().addMolten(), COMPOUND,31_766+471); + public static void init() { MainMod.LOGGER.info("Load Elements from GT"); } // TODO: GT++ only? - + // public static Werkstoff Flerovium = new Werkstoff(Materials.Flerovium, <GenerationFeatures>, <TypeRef>,31_766+984); // public static Werkstoff HeeEndium = new Werkstoff(Materials.HeeEndium, <GenerationFeatures>, <TypeRef>,31_766+770); @@ -346,7 +347,7 @@ public class BW_GT_MaterialReference { // public static Werkstoff Obsidian = new Werkstoff(Materials.Obsidian, <GenerationFeatures>, <TypeRef>,31_766+804); // public static Werkstoff Phosphate = new Werkstoff(Materials.Phosphate, <GenerationFeatures>, <TypeRef>,31_766+833); // public static Werkstoff PigIron = new Werkstoff(Materials.PigIron, <GenerationFeatures>, <TypeRef>,31_766+307); - + // public static Polydimethylsiloxane = new MaterialBuilder // public static Werkstoff Silicone = new Werkstoff(Materials.Silicone, <GenerationFeatures>, <TypeRef>,31_766+471); // public static Werkstoff Polycaprolactam = new Werkstoff(Materials.Polycaprolactam, <GenerationFeatures>, <TypeRef>,31_766+472); @@ -517,7 +518,7 @@ public class BW_GT_MaterialReference { // public static Werkstoff Manyullyn = new Werkstoff(Materials.Manyullyn, <GenerationFeatures>, <TypeRef>,31_766+386); // public static Werkstoff Steeleaf = new Werkstoff(Materials.Steeleaf, <GenerationFeatures>, <TypeRef>,31_766+339); // public static Werkstoff Knightmetal = new Werkstoff(Materials.Knightmetal, <GenerationFeatures>, <TypeRef>,31_766+362); - + // public static Werkstoff NitroFuel = new Werkstoff(Materials.NitroFuel, <GenerationFeatures>, <TypeRef>,31_766+709); // public static Werkstoff RedAlloy = new Werkstoff(Materials.RedAlloy, <GenerationFeatures>, <TypeRef>,31_766+308); // public static Werkstoff CobaltBrass = new Werkstoff(Materials.CobaltBrass, <GenerationFeatures>, <TypeRef>,31_766+343); @@ -641,4 +642,4 @@ public class BW_GT_MaterialReference { // public static Werkstoff Tetranaquadahdiindiumhexaplatiumosminid = new Werkstoff(Materials.Tetranaquadahdiindiumhexaplatiumosminid, <GenerationFeatures>, <TypeRef>, 31_766 + 992); // public static Werkstoff Longasssuperconductornameforuvwire = new Werkstoff(Materials.Longasssuperconductornameforuvwire, <GenerationFeatures>, <TypeRef>, 31_766 + 986); // public static Werkstoff Longasssuperconductornameforuhvwire = new Werkstoff(Materials.Longasssuperconductornameforuhvwire, <GenerationFeatures>, <TypeRef>, 31_766 + 985); -}
\ No newline at end of file +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 1f2f53f18f..c004668c33 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -1407,6 +1407,76 @@ public class WerkstoffLoader { new Pair<>(Materials.VanadiumSteel, 1), new Pair<>(Materials.DamascusSteel, 1) ); + public static final Werkstoff HexafluorosilicicAcid = new Werkstoff( + new short[]{0x2c, 0x70, 0xb5}, + "Hexafluorosilicic Acid", + subscriptNumbers("H2SiF6"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + 98, + TextureSet.SET_FLUID + ); + public static final Werkstoff Potassiumfluorosilicate = new Werkstoff( + new short[]{0x2e, 0x97, 0xb2}, + "Potassiumfluorosilicate", + subscriptNumbers("K2SiF6"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + 99, + TextureSet.SET_SHINY + ); + public static final Werkstoff Alumina = new Werkstoff( + new short[]{0xa0, 0xad, 0xb1}, + "Alumina", + subscriptNumbers("Al2O3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + 100, + TextureSet.SET_DULL + ); + public static final Werkstoff PotassiumCarbonate = new Werkstoff( + new short[]{0x7b, 0x96, 0x4f}, + "Potassium Carbonate", + subscriptNumbers("K2CO3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + 101, + TextureSet.SET_DULL, + new Pair<>(Materials.Potassium, 2), + new Pair<>(Materials.Carbon, 1), + new Pair<>(Materials.Oxygen, 3) + ); + public static final Werkstoff RawFluorophlogopite = new Werkstoff( + new short[]{0x36, 0x51, 0x0b}, + "Raw Fluorophlogopite", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + 102, + TextureSet.SET_DULL + ); + public static final Werkstoff HotFluorophlogopite = new Werkstoff( + new short[]{0xbf, 0xd3, 0x55}, + "Unformed Fluorophlogopite", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + 103, + TextureSet.SET_FLUID + ); + public static final Werkstoff Fluorophlogopite = new Werkstoff( + new short[]{0xbf, 0xd3, 0x55}, + "Fluorophlogopite", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems(), + 104, + TextureSet.SET_SHINY + ); public static HashMap<OrePrefixes, BW_MetaGenerated_Items> items = new HashMap<>(); public static HashBiMap<Werkstoff, Fluid> fluids = HashBiMap.create(); |