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

Commit

Permalink
bunch more work on aluminium processing, should be finished
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Sep 15, 2023
1 parent 51d7c88 commit 567816d
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 31 deletions.
2 changes: 1 addition & 1 deletion AntimatterAPI
Submodule AntimatterAPI updated 2 files
+5 −0 common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterFluidTagProvider.java
+1 −0 common/src/main/java/muramasa/antimatter/material/MaterialTags.java
37 changes: 23 additions & 14 deletions common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
event.setMaterial(Neon).asPlasma();
event.setMaterial(Sodium).asDust(370);
event.setMaterial(Magnesium).asMetal(1383, 0/*1383*/);
event.setMaterial(Aluminium).asMetal(933, 1700, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, FOIL);
event.setMaterial(Aluminium).asMetal(933, 0, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, FOIL);
event.setMaterial(Silicon).asMetal(1683, 1683, PLATE, FOIL);
event.setMaterial(Phosphor).asDust(933);
event.setMaterial(Sulfur).asDust(388).asOre().harvestLevel(2).asPlasma();
Expand Down Expand Up @@ -219,13 +219,15 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
event.setMaterial(BlueSchist).asDust(ROCK);
event.setMaterial(BorosilicateGlass).asDust();
event.setMaterial(Brick).asDust();
event.setMaterial(CalciumSulfate).asDust();
event.setMaterial(CobaltOxide).asDust();
event.setMaterial(Concrete).asDust(300);
event.setMaterial(DialuminiumTrioxide).asDust();
event.setMaterial(Energium).asDust();
event.setMaterial(FerriteMixture).asDust();
event.setMaterial(Ferrosilite).asDust();
event.setMaterial(Fireclay).asDust();
event.setMaterial(Fluorite).asDust();
event.setMaterial(GreenSchist).asDust(ROCK);
event.setMaterial(IndiumGalliumPhosphide).asDust();
event.setMaterial(IridiumSodiumOxide).asDust();
Expand Down Expand Up @@ -433,36 +435,40 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
/**
* Inorganic
**/
event.setMaterial(AluminiumFluoride).asFluid(0,1560).flags(MOLTEN, ACID);
event.setMaterial(Antimatter).asFluid();
event.setMaterial(BlueVitriol).asFluid();
event.setMaterial(CalciumAcetateSolution).asFluid();
event.setMaterial(Coolant).asFluid();
event.setMaterial(Cryolite).asFluid(0, 1285).flags(MOLTEN, ACID);
event.setMaterial(DistilledWater).asFluid();
event.setMaterial(DilutedHydrochloricAcid).asFluid();
event.setMaterial(DilutedSulfuricAcid).asFluid();
event.setMaterial(DilutedHydrochloricAcid).asFluid().flags(ACID);
event.setMaterial(DilutedSulfuricAcid).asFluid().flags(ACID);
event.setMaterial(DrillingFluid).asFluid(); // TODO: Perhaps for a bedrock drill;
event.setMaterial(HexafluorosilicicAcid).asFluid().flags(ACID);
event.setMaterial(HotCoolant).asFluid(0,500);
event.setMaterial(HydrochloricAcid).asFluid();
event.setMaterial(HydrofluoricAcid).asFluid();
event.setMaterial(HydrochloricAcid).asFluid().flags(ACID);
event.setMaterial(HydrofluoricAcid).asFluid().flags(ACID);
event.setMaterial(HydrogenFluoride).asGas().flags(ACID);
event.setMaterial(HydrogenPeroxide).asFluid();
event.setMaterial(HypochlorousAcid).asFluid();
event.setMaterial(HypochlorousAcid).asFluid().flags(ACID);
event.setMaterial(IndiumConcentrate).asFluid();

event.setMaterial(LeadZincSolution).asFluid();
event.setMaterial(LiquidAir).asFluid(0, 79);
event.setMaterial(Lubricant).asFluid();
event.setMaterial(NickelSulfate).asFluid();
event.setMaterial(NitrationMixture).asFluid();
event.setMaterial(NitricAcid).asFluid();
event.setMaterial(PeroxydisulfuricAcid).asFluid();
event.setMaterial(PhosphoricAcid).asFluid();
event.setMaterial(NitricAcid).asFluid().flags(ACID);
event.setMaterial(PeroxydisulfuricAcid).asFluid().flags(ACID);
event.setMaterial(PhosphoricAcid).asFluid().flags(ACID);
event.setMaterial(SaltWater).asFluid();
event.setMaterial(SodiumPersulfate).asFluid();
event.setMaterial(SodiumBicarbonateSolution).asFluid();
event.setMaterial(SodiumCarbonateSolution).asFluid();
event.setMaterial(Steam).asGas(1, 395);
event.setMaterial(SuperheatedSteam).asGas(2, 600);
event.setMaterial(SulfuricAcid).asFluid();
event.setMaterial(SulfuricAcid).asFluid().flags(ACID);
event.setMaterial(SulfurTrioxide).asGas();
event.setMaterial(SulfurDioxide).asGas();
event.setMaterial(Titaniumtetrachloride).asFluid();
Expand Down Expand Up @@ -508,7 +514,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
* Inorganic
**/
event.setMaterial(Air).asGas();
event.setMaterial(Ammonia).asGas();
event.setMaterial(Ammonia).asGas().flags(ACID);
event.setMaterial(DinitrogenTetroxide).asGas();
event.setMaterial(HydrogenSulfide).asGas();
event.setMaterial(NitricOxide).asGas();
Expand Down Expand Up @@ -639,13 +645,15 @@ 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(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();
event.setMaterial(DialuminiumTrioxide).mats(of(Aluminium,2,Oxygen,3));
event.setMaterial(Energium).mats(of(Redstone,5,Ruby,4));
event.setMaterial(FerriteMixture).mats(of(Nickel, 1, Zinc, 1, Iron, 4));
event.setMaterial(Ferrosilite).mats(of(Iron, 1, Silicon, 1, Oxygen, 3)).elecTicks(120);
event.setMaterial(Fireclay).mats(of(Brick, 1));
event.setMaterial(Fluorite).mats(of(Calcium, 1, Fluorine, 2));
event.setMaterial(IndiumGalliumPhosphide).mats(of(Indium, 1, Gallium, 1, Phosphor, 1));
event.setMaterial(IridiumSodiumOxide).mats(of(Iridium,1,Sodium,1,Oxygen,2));
event.setMaterial(Komatiite).mats(of(Olivine, 1, /* MgCO3, 2, */Flint, 6, DarkAsh, 3));
Expand Down Expand Up @@ -841,6 +849,7 @@ private static void processInto(GregTechMaterialEvent event){
event.setMaterial(DilutedSulfuricAcid).mats(of(Hydrogen,2,Sulfur,1,Oxygen,4));
event.setMaterial(HydrochloricAcid).mats(of(Hydrogen, 1, Chlorine, 1)).elecTicks(720);
event.setMaterial(HydrofluoricAcid).mats(of(Hydrogen, 1, Fluorine, 1)).elecTicks(80);
event.setMaterial(HydrogenFluoride).mats(of(Hydrogen, 1, Fluorine, 1)).elecTicks(80);
event.setMaterial(HydrogenPeroxide).mats(of(Hydrogen,2,Oxygen,2));
event.setMaterial(HypochlorousAcid).mats(of(Hydrogen, 1, Chlorine, 1, Oxygen, 1)).elecTicks(192);

Expand Down Expand Up @@ -1462,17 +1471,17 @@ private static void flags(GregTechMaterialEvent event){
Fermium260,Mendelevium259,Mendelevium260
);*/
ELEC30.add(Charcoal, Opal, Coal, Lignite, Magnesia, SteelMagnetic, IronMagnetic, Quicklime, Quartzite,
SiliconDioxide, CobaltOxide, Garnierite, CupricOxide, RockSalt, /*Zincite,*/Pyrolusite, /*ChromiumDioxide,*/
SiliconDioxide, CalciumSulfate, CobaltOxide, Garnierite, CupricOxide, RockSalt, /*Zincite,*/Pyrolusite, /*ChromiumDioxide,*/
Phosphate, Potash, /*NiobiumNitride,*/ GreenSapphire, Sapphire, NeodymiumMagnetic, Cassiterite,
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,
Magnesite, HydrofluoricAcid, Sphalerite, /*NitroCarbon,*/ SodaAsh, Calcite, Saltpeter, Monazite,
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,
Chromite, EnderPearl, SiliconDioxide, Apatite, SulfurTrioxide, /*Pyrochlore, */ Toluene, Phosphate,
Tantalite, PhosphorousPentoxide, Osmiridium, Pentlandite, Steel, Graphite, Alumina);
Tantalite, PhosphorousPentoxide, Osmiridium, Pentlandite, Steel, Graphite);
ELEC90.add(Polydimethylsiloxane, AceticAcid, Olivine, Ethanol, Methanol, VinylAcetate, /*Gypsum,*/ Cobaltite, Ethenone,
/*Dymethylamine,*/ Chalcopyrite, /*Mirabilite,*/ Spodumene, /*Dolomite,*/ HypochlorousAcid, Chloramine, Bastnasite,
Chloromethane, Malachite, /*Borax, */ /*Kaolinite,*/ Obsidian, NitricAcid, VinylChloride, Acetone, /*Asbestos,*/ PotassiumFeldspar,
Expand Down
7 changes: 6 additions & 1 deletion common/src/main/java/muramasa/gregtech/data/Materials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,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 CalciumOxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium_oxide", 0xfae6dc, 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));
public static Material Concrete = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "concrete", 0x646464, ROUGH));
Expand All @@ -361,6 +361,7 @@ public class Materials {
public static Material FerriteMixture = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ferrite_mixture", 0xb4b4b4, METALLIC));
public static Material Ferrosilite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ferrosilite", 0x97632a, DULL));
public static Material Fireclay = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "fireclay", 0xada09b, ROUGH));
public static Material Fluorite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "fluorite", 0xFFB98C, NONE));
public static Material GelledToluene = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "gelled_toluene", 0xeeeeee, NONE));
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));
Expand Down Expand Up @@ -582,18 +583,22 @@ public class Materials {
** Inorganic
**/

public static Material AluminiumFluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "aluminium_fluoride", 0xc8bebe, NONE));
public static Material Antimatter = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "anti_matter", 0x8000c4, NONE));
public static Material BlueVitriol = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "blue_vitriol_water_solution", 0x4242DE, NONE));

public static Material CalciumAcetateSolution = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium_acetate_solution", 0xDCC8B4, NONE));
public static Material Coolant = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "coolant", 0x0506be, NONE));
public static Material Cryolite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "cryolite", 0xc8bebe, NONE));
public static Material DilutedHydrochloricAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "diluted_hydrochloric_acid", 0x99a7a3, NONE));
public static Material DilutedSulfuricAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "diluted_sulfuric_acid", 0xc07820, NONE));
public static Material DistilledWater = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "distilled_water", 0x5C5CFF, NONE));
public static Material DrillingFluid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "drilling_fluid", 0xffffff, NONE)); // TODO: Perhaps for a bedrock drill;
public static Material HexafluorosilicicAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hexafluorosilicic_acid", 0xbec8be, NONE));
public static Material HotCoolant = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hot_coolant", 0x7a111a, NONE));
public static Material HydrochloricAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hydrochloric_acid", 0x6f8a91, NONE));
public static Material HydrofluoricAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hydrofluoric_acid", 0x0088aa, NONE));
public static Material HydrogenFluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hydrogen_fluoride", 0x00f0f0, NONE));
public static Material HydrogenPeroxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hydrogen_peroxide", 0xf8efb4, NONE));
public static Material HypochlorousAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hypochlorous_acid", 0x6f8a91, NONE));
public static Material IndiumConcentrate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "indium_concentrate", 0xffffff, NONE));
Expand Down
Loading

0 comments on commit 567816d

Please sign in to comment.