Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
changed tungsten processing, added recipe for dehydrator
Browse files Browse the repository at this point in the history
  • Loading branch information
Trinsdar committed Sep 17, 2023
1 parent 237a3f3 commit 3c0ce9f
Show file tree
Hide file tree
Showing 27 changed files with 40 additions and 26 deletions.
3 changes: 1 addition & 2 deletions common/src/main/java/muramasa/gregtech/GregTech.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ public static void registerCraftingLoaders(CraftingEvent event) {
event.addLoader(Circuitry::loadCraftingRecipes);
event.addLoader(ElectricToolRecipes::loadRecipes);
event.addLoader(MaterialCrafting::loadRecipes);
event.addLoader(FurnaceLoader::loadRecipes);
event.addLoader(WoodCrafting::loadRecipes);
}

Expand Down Expand Up @@ -147,7 +146,7 @@ public static void registerRecipeLoaders(IAntimatterRegistrar registrar, IRecipe
loader.accept("uu_matter", UUMatter::init);
loader.accept("large_boiler", LargeBoilerLoader::init);
loader.accept("roaster", RoastingLoader::init);
//loader.accept("dehydrating", ChemicalDehydrator::init);
loader.accept("dehydrating", Dehydrator::init);
loader.accept("autoclaving", Autoclave::init);
if (AntimatterAPI.isModLoaded(Ref.MOD_AE)){
loader.accept("ae2", AppliedEnergisticsRegistrar::machineRecipes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
event.setMaterial(BlueSchist).asDust(ROCK);
event.setMaterial(BorosilicateGlass).asDust();
event.setMaterial(Brick).asDust();
event.setMaterial(CalciumChloride).asDust();
event.setMaterial(CalciumSulfate).asDust();
event.setMaterial(CobaltOxide).asDust();
event.setMaterial(Concrete).asDust(300);
Expand All @@ -234,6 +235,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
event.setMaterial(Kimberlite).asDust(ROCK);
event.setMaterial(Komatiite).asDust(ROCK);
event.setMaterial(Limestone).asDust(ROCK);
event.setMaterial(LithiumChloride).asDust();
event.setMaterial(Magnesia).asDust();
event.setMaterial(MagnesiumChloride).asDust();
event.setMaterial(Marble).asDust(ROCK);
Expand All @@ -255,6 +257,8 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
event.setMaterial(SodiumHydroxide).asDust();
event.setMaterial(SodiumSulfate).asDust();
event.setMaterial(SodiumSulfide).asDust();
event.setMaterial(TungsticAcid).asDust();
event.setMaterial(TungstenTrioxide).asDust();
//Nuclear

/**
Expand Down Expand Up @@ -635,6 +639,7 @@ private static void processInto(GregTechMaterialEvent event){
event.setMaterial(BlackGranite).mats(of(SiliconDioxide, 4, Biotite, 1));
event.setMaterial(BorosilicateGlass).mats(of(Boron, 1, Silicon, 7, Oxygen,14));
event.setMaterial(Brick).mats(of(Aluminium, 4, Silicon, 3, Oxygen, 12));
event.setMaterial(CalciumChloride).mats(of(Calcium, 1, Chlorine, 2)).elecTicks(1024);
event.setMaterial(CalciumSulfate).mats(of(Calcium, 1, SiliconDioxide, 1, Oxygen, 2)).elecTicks(1460);
event.setMaterial(CobaltOxide).mats(of(Cobalt, 1, Oxygen, 1)).elecTicks(68);
event.setMaterial(Concrete).mats(of(Stone, 1)).asFluid();
Expand All @@ -648,6 +653,7 @@ private static void processInto(GregTechMaterialEvent event){
event.setMaterial(IridiumSodiumOxide).mats(of(Iridium,1,Sodium,1,Oxygen,2));
event.setMaterial(Komatiite).mats(of(Olivine, 1, /* MgCO3, 2, */Flint, 6, DarkAsh, 3));
event.setMaterial(Limestone).mats(of(Calcite, 1));
event.setMaterial(LithiumChloride).mats(of(Lithium, 1, Chlorine, 1)).elecTicks(64);
event.setMaterial(Magnesia).mats(of(Magnesium, 1, Oxygen, 1)).elecTicks(40);
event.setMaterial(MagnesiumChloride).mats(of(Magnesium, 1, Chlorine, 2));
event.setMaterial(Marble).mats(of(Magnesium, 1, Calcite, 7));
Expand All @@ -668,6 +674,8 @@ private static void processInto(GregTechMaterialEvent event){
event.setMaterial(SodiumHydroxide).mats(of(Sodium, 1, Oxygen, 1, Hydrogen, 1)).elecTicks(36);
event.setMaterial(SodiumSulfate).mats(of(Sodium, 2, Sulfur, 1, Oxygen, 4));
event.setMaterial(SodiumSulfide).mats(of(Sodium, 2, Sulfur, 1)).elecTicks(72);
event.setMaterial(TungsticAcid).mats(of(Hydrogen, 2, Tungsten, 1, Oxygen, 4));
event.setMaterial(TungstenTrioxide).mats(of(Tungsten, 1, Oxygen, 3));
//Nuclear

/**
Expand Down Expand Up @@ -1441,7 +1449,7 @@ private static void flags(GregTechMaterialEvent event){
PhosphorousPentoxide, BandedIron, Massicot, ArsenicTrioxide, Sugar, Magnetite, AntimonyTrioxide,
Salt, SodiumBisulfate, HydrochloricAcid, SaltWater, HydrochloricAcid, Diamond, BlueVitriol,
NickelSulfate, Water, DistilledWater, MilkyQuartz);
ELEC60.add(SodiumHydroxide, Propene, Ethylene, Butene, Benzene, Styrene, Ethane, Ammonia, SodiumSulfide, Methane,
ELEC60.add(CalciumChloride, SodiumHydroxide, Propene, Ethylene, Butene, Benzene, Styrene, Ethane, Ammonia, SodiumSulfide, Methane,
Magnesite, HydrofluoricAcid, HydrogenFluoride, Sphalerite, /*NitroCarbon,*/ SodaAsh, Calcite, Saltpeter, Monazite,
/*Wollastonite,*/ NitricOxide, Butane, CarbonMonoxide, Pyrite, RedGranite, Ferrosilite, Butadiene, Amethyst,
Molybdenite, Ruby, /*Kyanite,*/ NitrogenDioxide, NitrousOxide, DinitrogenTetroxide, Propane, Barite, Isoprene,
Expand All @@ -1455,7 +1463,7 @@ private static void flags(GregTechMaterialEvent event){
Emerald, Tetranitromethane, Galena);
ELEC120.add(Clay, /*Trona,*/ BlueTopaz, Topaz, /*Pollucite,*/ CarbonDioxide, SulfurDioxide, Epichlorohydrin, Lepidolite, /*FullersEarth, Alunite,*/ Glauconite,
/*Mica,*/ Lazurite, Tanzanite, Biotite, StainlessSteel, Bentonite, Ultimet, CalciumAcetateSolution, Dimethyldichlorosilane, /*Vermiculate, Zeolite,*/ GlycerylTrinitrate,
LeadZincSolution, Tungstate, Scheelite);
LeadZincSolution);
ELEC.add(ELEC30.all().toArray(new Material[0]));
ELEC.add(ELEC60.all().toArray(new Material[0]));
ELEC.add(ELEC90.all().toArray(new Material[0]));
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/muramasa/gregtech/data/Guis.java
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public static void init(Side side) {
.getGui().getMachineData().setProgressLocation("electromagnetic_separator");
DECAY_CHAMBER.add(IT_IN, 17, 25).add(IT_IN, 35, 25)
.add(IT_OUT, 107, 25).add(FL_IN,53,25).add(FL_OUT,125,25).add(ENERGY,80,63);
CHEMICAL_DEHYDRATOR.add(IT_IN, 35, 25).add(IT_IN, 53, 25)
DEHYDRATOR.add(IT_IN, 35, 25).add(IT_IN, 53, 25)
.add(FL_IN,35,63).add(FL_IN,53,63)
.add(IT_OUT, 107, 7).add(IT_OUT, 125, 7).add(IT_OUT, 143, 7)
.add(IT_OUT, 107, 25).add(IT_OUT, 125, 25).add(IT_OUT, 143, 25)
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/muramasa/gregtech/data/Machines.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class Machines {
public static BasicMachine CANNER = new BasicMachine(GTIRef.ID, "canner").setMap(CANNING).addFlags(GUI, ITEM);
public static BasicMachine CENTRIFUGE = new BasicMachine(GTIRef.ID, "centrifuge").setMap(CENTRIFUGING).addFlags(GUI, ITEM, FLUID);
public static BasicMachine BATH = new BasicMachine(GTIRef.ID, "bath").setMap(BATHING).addFlags(GUI, ITEM, FLUID).setTiers(LV);
public static BasicMachine CHEMICAL_DEHYDRATOR = new BasicMachine(GTIRef.ID, "chemical_dehydrator").setMap(DEHYDRATING).addFlags(GUI, ITEM, FLUID);
public static BasicMachine DEHYDRATOR = new BasicMachine(GTIRef.ID, "dehydrator").setMap(DEHYDRATING).addFlags(GUI, ITEM, FLUID);
public static BasicMachine CHEMICAL_REACTOR = new BasicMachine(GTIRef.ID, "chemical_reactor").setMap(CHEMICAL_REACTING).addFlags(GUI, ITEM, FLUID).renderContainedLiquids().custom();
public static BasicMachine CIRCUIT_ASSEMBLER = new BasicMachine(GTIRef.ID, "circuit_assembler").setMap(CIRCUIT_ASSEMBLING).addFlags(GUI, ITEM, FLUID);
public static BasicMachine COMPRESSOR = new BasicMachine(GTIRef.ID, "compressor").setMap(COMPRESSING).addFlags(GUI, ITEM);
Expand Down
4 changes: 4 additions & 0 deletions common/src/main/java/muramasa/gregtech/data/Materials.java
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ public class Materials {
public static Material BorosilicateGlass = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "borosilicate_glass", 0xfafafa, NONE));
public static Material Brick = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "brick", 0x9b5643, ROUGH));
public static Material Calcite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcite", 0xfae6dc, DULL));
public static Material CalciumChloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium_chloride", 0xebebfa, DULL));
public static Material CalciumSulfate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium_sulfate", 0xf0dcd2, DULL));
public static Material Clay = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "clay", 0xc8c8dc, ROUGH));
public static Material CobaltOxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "cobalt_oxide", 0x668000, DULL));
Expand All @@ -311,6 +312,7 @@ public class Materials {
public static Material Graphene = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "graphene", 0x808080, DULL));
public static Material IndiumGalliumPhosphide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "indium_gallium_phosphide", 0x570b79, NONE));
public static Material IridiumSodiumOxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "iridium_sodium_oxide", 0xffffff, NONE));
public static Material LithiumChloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "lithium_chloride", 0xdedefa, DULL));
public static Material Magnesia = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "magnesia", 0xffffff, DULL));
public static Material MagnesiumChloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "magnesium_chloride", 0xd40d5c, DULL));
public static Material Massicot = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "massicot", 0xffdd55, DULL));
Expand All @@ -333,6 +335,8 @@ public class Materials {
public static Material SodiumHydroxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "sodium_hydroxide", 0x003380, DULL));
public static Material SodiumSulfate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "sodium_sulfate", 0x004455, NONE));
public static Material SodiumSulfide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "sodium_sulfide", 0xffe680, NONE));
public static Material TungsticAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "tungstic_acid", 0xb4c800, SHINY));
public static Material TungstenTrioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "tungsten_trioxide", 0xc7d300, DULL));

/**
** Ores
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,15 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
.put('H', hull)
.put('L', cable).build(), "WRW", "LHL", "WRW"));

add(DEHYDRATOR, tier, (m, item) -> provider.addItemRecipe(output, "machines", "has_robot_arm", provider.hasSafeItem(arm), item,
ImmutableMap.<Character, Object>builder()
.put('W', WIRE_GETTER.apply(PipeSize.SMALL, tier))
.put('C', CABLE_GETTER.apply(PipeSize.SMALL, tier, true))
.put('H', hull)
.put('c', circuit)
.put('P', PLATE.getMaterialTag(material))
.put('R', arm).build(), "WcW", "CHC", "PRP"));

add(PUMP, tier, (m, item) -> provider.addItemRecipe(output, "machines", "has_motor", provider.hasSafeItem(motor), item,
ImmutableMap.<Character, Object>builder()
.put('R', rotor)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
import muramasa.antimatter.datagen.loaders.MaterialRecipes;
import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider;
import muramasa.antimatter.material.MaterialTags;
import muramasa.antimatter.recipe.ingredient.RecipeIngredient;
import muramasa.antimatter.util.TagUtils;
import muramasa.gregtech.GTIRef;
import muramasa.gregtech.data.GregTechData;
import muramasa.gregtech.data.Materials;
import net.minecraft.data.recipes.SimpleCookingRecipeBuilder;
import net.minecraft.data.recipes.FinishedRecipe;
Expand All @@ -19,8 +22,9 @@ public class Smelting {
public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipeProvider provider) {
SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.IRON_NUGGET), NUGGET.get(Materials.WroughtIron), 0.5f, 200).unlockedBy("has_nugget_iron", provider.hasSafeItem(Items.IRON_NUGGET)).save(output, "smelting_nugget_wrought_iron");
SimpleCookingRecipeBuilder.blasting(Ingredient.of(Items.IRON_NUGGET), NUGGET.get(Materials.WroughtIron), 0.5f, 100).unlockedBy("has_nugget_iron", provider.hasSafeItem(Items.IRON_NUGGET)).save(output, "blasting_nugget_wrought_iron");
SimpleCookingRecipeBuilder.smelting(RecipeIngredient.of(GregTechData.CompressedFireClay, 1), GregTechData.FireBrick, 0.5F, 200).unlockedBy("has_compressed_fire_clay", provider.hasSafeItem(GregTechData.CompressedFireClay)).save(output, GTIRef.ID + ":firebrick");
MaterialRecipes.addSmeltingRecipe(output, provider, CRUSHED, NUGGET, 7, Cassiterite, Tin);
MaterialRecipes.addSmeltingRecipe(output, provider, CRUSHED, NUGGET, 7, Garnierite, Nickel);
MaterialRecipes.addSmeltingRecipe(output, provider, DUST, DUST, 1, AluminiumHydroxide, Alumina);
MaterialRecipes.addSmeltingRecipe(output, provider, DUST, DUST_TINY, 3, AluminiumHydroxide, Alumina);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public static void init() {
.fi(Netherite.getLiquid(L/4))
.io(GEM.get(NetherizedDiamond))
.add("netherized_diamond_recipe",144);
BATHING.RB().ii(DUST.getMaterialIngredient(Tungstate, 7)).fi(HydrochloricAcid.getLiquid(4000)).io(DUST.get(LithiumChloride, 4), DUST.get(TungsticAcid, 7)).add("tungstate", 512);
BATHING.RB().ii(DUST.getMaterialIngredient(Scheelite, 6)).fi(HydrochloricAcid.getLiquid(4000)).io(DUST.get(CalciumChloride, 3), DUST.get(TungsticAcid, 7)).add("scheelite", 512);
BATHING.RB().ii(DUST.getMaterialIngredient(SodiumAluminate, 4)).fi(Water.getLiquid(6000)).io(DUST.get(AluminiumHydroxide, 7), DUST.get(SodiumHydroxide, 3)).add("aluminium_hydroxide", 102 * 20);
BATHING.RB().ii(DUST.getMaterialIngredient(SodiumAluminate, 4)).fi(DistilledWater.getLiquid(6000)).io(DUST.get(AluminiumHydroxide, 7), DUST.get(SodiumHydroxide, 3)).add("aluminium_hydroxide_distilled_water", 102 * 20);
mercurybathing();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ private static void addShared(){
CHEMICAL_REACTING.RB().fi(Oxygen.getGas(1000), SulfurDioxide.getGas(3000)).fo(SulfurTrioxide.getGas(4000)).add("sulfur_trioxide", 200, 30);
CHEMICAL_REACTING.RB().fi(Oxygen.getGas(2000)).ii(DUST.getMaterialIngredient(Sulfur, 1)).fo(SulfurDioxide.getGas(3000)).add("sulfur_dioxide", 60, 8);
CHEMICAL_REACTING.RB().fi(Oxygen.getGas(1000), HydrogenSulfide.getGas(1000)).fo(SulfurDioxide.getGas(1000), Water.getLiquid(1000)).add("sulfur_dioxide_1", 40, 30);
//HYDROCHLORIC ACID
CHEMICAL_REACTING.RB().fi(Hydrogen.getGas(1000), Chlorine.getGas(1000)).fo(HydrochloricAcid.getLiquid(2000)).add("hydrochloric_acid", 60, 8);
//Alumina chain
CHEMICAL_REACTING.RB().fi(SulfuricAcid.getLiquid(7000)).ii(DUST.getMaterialIngredient(Fluorite, 3)).fo(HydrogenFluoride.getGas(4000)).io(DUST.get(CalciumSulfate, 6)).add("hydrogen_fluoride", 160, 16);
CHEMICAL_REACTING.RB().fi(Fluorine.getGas(1000), Hydrogen.getGas(1000)).fo(HydrogenFluoride.getGas(2000)).add("hydrogen_fluoride_1", 16, 16);
Expand All @@ -223,6 +225,7 @@ private static void addShared(){
CHEMICAL_REACTING.RB().fi(HexafluorosilicicAcid.getLiquid(9000)).ii(DUST.getMaterialIngredient(Alumina, 5)).io(DUST.get(SiliconDioxide, 3)).fo(AluminiumFluoride.getLiquid(L * 8), Water.getLiquid(3000)).add("aluminium_fluoride", 224, 16);
CHEMICAL_REACTING.RB().fi(Fluorine.getGas(3000)).ii(DUST.getMaterialIngredient(Aluminium, 1)).fo(AluminiumFluoride.getLiquid(L * 4)).add("aluminium_fluoride_pure", 64, 16);
CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(24000)).ii(DUST.getMaterialIngredient(SodiumHydroxide, 18), DUST.getMaterialIngredient(Alumina, 5)).fo(Cryolite.getLiquid(L * 20), Water.getLiquid(27000)).add("cryolite", 752, 16);
CHEMICAL_REACTING.RB().fi(Hydrogen.getGas(6000)).ii(DUST.getMaterialIngredient(TungstenTrioxide, 4)).io(DUST.get(Tungsten)).fo(Water.getLiquid(9000)).add("tungsten", 160, 16);

}

Expand All @@ -236,7 +239,6 @@ private static void addComplicated(){
CHEMICAL_REACTING.RB().fi(Oxygen.getGas(500), Ethylene.getGas(3000), AceticAcid.getLiquid(4000)).fo(VinylAcetate.getLiquid(6000)).add("vinyl_acetate", 90, 30);
addPolymerRecipe(VinylAcetate, PolyvinylAcetate);
//HYDROCHLORIC ACID
CHEMICAL_REACTING.RB().fi(Hydrogen.getGas(1000), Chlorine.getGas(1000)).fo(HydrochloricAcid.getLiquid(2000)).add("hydrochloric_acid", 60, 8);
CHEMICAL_REACTING.RB().fi(Methane.getGas(6000), Chlorine.getGas(5000)).ii(INT_CIRCUITS.get(13)).fo(HydrochloricAcid.getLiquid(6000), Chloroform.getLiquid(5000)).add("hydrochloric_acid_1", 16, 30);
//SODIUM BISULFATE
CHEMICAL_REACTING.RB().fi(SulfuricAcid.getLiquid(7000)).ii(DUST.getMaterialIngredient(Salt, 2)).io(DUST.get(SodiumBisulfate, 7)).fo(HydrochloricAcid.getLiquid(2000)).add("sodium_bisulfate", 60, 30);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
import static muramasa.gregtech.data.Materials.*;
import static muramasa.gregtech.data.RecipeMaps.DEHYDRATING;

public class ChemicalDehydrator {
public class Dehydrator {
public static void init() {
DEHYDRATING.RB().ii(DUST.getMaterialIngredient(TungsticAcid, 7)).io(DUST.get(TungstenTrioxide, 4)).fo(DistilledWater.getLiquid(3000)).add("tungsten_trioxide", 300 * 20, 16);
DEHYDRATING.RB().fi(SaltWater.getFluidTag(1000)).io(DUST_SMALL.get(Salt, 1)).fo(DistilledWater.getLiquid(750)).add("salt_water_drying", 8 * 20, 16);
DEHYDRATING.RB().ii(DUST.getMaterialIngredient(AluminiumHydroxide, 14)).io(DUST.get(Alumina, 5)).fo(DistilledWater.getLiquid(9000)).add("alumina", 900 * 20, 16);
//Waste Processing
DEHYDRATING.RB().ii(of(ThoriumWaste)).fi(SulfuricAcid.getLiquid(100)).io(new ItemStack(NuclearWaste),DUST_SMALL.get(Rhodium,4)).add("thorium_waste_reprocessing",500,8);
DEHYDRATING.RB().ii(of(ProtactiniumWaste)).fi(SulfuricAcid.getLiquid(100)).io(new ItemStack(NuclearWaste),DUST_SMALL.get(Rhodium,2),DUST_SMALL.get(Palladium,2)).add("protactinium_waste_reprocessing",500,8);
Expand Down

This file was deleted.

0 comments on commit 3c0ce9f

Please sign in to comment.