Skip to content

Commit

Permalink
EBF Gas Recipes (#257)
Browse files Browse the repository at this point in the history 
* fix EBF builder not copying blastFurnaceTemp

* add `GasTemp` and other blast property fields

* rework blast recipe autogen

* add gas tiers to materials

* dump Pig Iron, alloy EBF recipes

* buff Helium production

* rename `Ruthenian Iridium` to Ruridit

* fix some missed things, buff Argon

* redo EBF times and EU/ts

* rename all Ruthenian Iridium to ruridit

Co-authored-by: TechLord22 <37029404+TechLord22@users.noreply.github.com>
  • Loading branch information
@serenibyss @TechLord22
serenibyss and TechLord22 authored Nov 22, 2021
1 parent d179c41 commit 1f45171
Show file tree
Hide file tree
Showing 22 changed files with 218 additions and 134 deletions.
3 changes: 2 additions & 1 deletion src/main/java/gregtech/api/recipes/builders/BlastRecipeBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ public BlastRecipeBuilder(Recipe recipe, RecipeMap<BlastRecipeBuilder> recipeMap
this.blastFurnaceTemp = recipe.getProperty(BlastTemperatureProperty.getInstance(), 0);
}

public BlastRecipeBuilder(RecipeBuilder<BlastRecipeBuilder> recipeBuilder) {
public BlastRecipeBuilder(BlastRecipeBuilder recipeBuilder) {
super(recipeBuilder);
this.blastFurnaceTemp = recipeBuilder.blastFurnaceTemp;
}

@Override
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/gregtech/api/unification/material/Material.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,21 @@ public Builder blastTemp(int temp) {
return this;
}

public Builder blastTemp(int temp, BlastProperty.GasTier gasTier) {
properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp, gasTier, -1, -1));
return this;
}

public Builder blastTemp(int temp, BlastProperty.GasTier gasTier, int eutOverride) {
properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp, gasTier, eutOverride, -1));
return this;
}

public Builder blastTemp(int temp, BlastProperty.GasTier gasTier, int eutOverride, int durationOverride) {
properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp, gasTier, eutOverride, durationOverride));
return this;
}

public Builder ore() {
properties.ensureSet(PropertyKey.ORE);
return this;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/gregtech/api/unification/material/Materials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ public static void register() {
public static Material NiobiumTitanium;
public static Material Obsidian;
public static Material Phosphate;
public static Material PigIron;
public static Material SterlingSilver;
public static Material RoseGold;
public static Material BlackBronze;
Expand All @@ -337,7 +336,7 @@ public static void register() {
public static Material Pyrolusite;
public static Material Pyrope;
public static Material RockSalt;
public static Material RuthenianIridium;
public static Material Ruridit;
public static Material Rubber;
public static Material Ruby;
public static Material Salt;
Expand Down
43 changes: 22 additions & 21 deletions src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import gregtech.api.unification.Elements;
import gregtech.api.unification.material.Material;
import gregtech.api.unification.material.Material.FluidType;
import gregtech.api.unification.material.properties.BlastProperty.GasTier;

import static gregtech.api.unification.material.Materials.*;
import static gregtech.api.unification.material.info.MaterialFlags.*;
Expand All @@ -26,7 +27,7 @@ public static void register() {
.toolStats(10.0f, 2.0f, 128, 21)
.cableProperties(GTValues.V[4], 1, 1)
.fluidPipeProperties(1166, 35, true)
.blastTemp(1700)
.blastTemp(1700, GasTier.LOW)
.build();

Americium = new Material.Builder(3, "americium")
Expand Down Expand Up @@ -160,7 +161,7 @@ public static void register() {
.element(Elements.Cr)
.toolStats(12.0f, 3.0f, 512, 33)
.fluidPipeProperties(2725, 40, true)
.blastTemp(1700)
.blastTemp(1700, GasTier.LOW)
.build();

Cobalt = new Material.Builder(23, "cobalt")
Expand Down Expand Up @@ -242,7 +243,7 @@ public static void register() {
.element(Elements.Eu)
.cableProperties(GTValues.V[GTValues.UHV], 2, 32)
.fluidPipeProperties(7780, 1200, true)
.blastTemp(1099)
.blastTemp(6000, GasTier.MID, 7680, 180)
.build();

Fermium = new Material.Builder(34, "fermium")
Expand Down Expand Up @@ -354,7 +355,7 @@ public static void register() {
.element(Elements.Ir)
.toolStats(7.0f, 3.0f, 2560, 21)
.fluidPipeProperties(3398, 140, true)
.blastTemp(2719)
.blastTemp(4500, GasTier.HIGH, 7680, 1100)
.build();

Iron = new Material.Builder(51, "iron")
Expand All @@ -377,7 +378,7 @@ public static void register() {
.ingot().fluid()
.color(0x5D7575).iconSet(METALLIC)
.element(Elements.La)
.blastTemp(1193)
.blastTemp(1193, GasTier.MID)
.build();

Lawrencium = new Material.Builder(54, "lawrencium")
Expand Down Expand Up @@ -468,7 +469,7 @@ public static void register() {
.flags(STD_METAL, GENERATE_ROD, GENERATE_BOLT_SCREW)
.element(Elements.Nd)
.toolStats(7.0f, 2.0f, 512, 21)
.blastTemp(1297)
.blastTemp(1289, GasTier.MID)
.build();

Neon = new Material.Builder(67, "neon")
Expand Down Expand Up @@ -504,7 +505,7 @@ public static void register() {
.color(0xBEB4C8).iconSet(METALLIC)
.flags(STD_METAL)
.element(Elements.Nb)
.blastTemp(2750)
.blastTemp(2750, GasTier.MID, 480, 900)
.build();

Nitrogen = new Material.Builder(72, "nitrogen")
Expand Down Expand Up @@ -534,7 +535,7 @@ public static void register() {
.toolStats(16.0f, 4.0f, 1280, 21)
.cableProperties(GTValues.V[6], 4, 2)
.itemPipeProperties(256, 8.0f)
.blastTemp(3306)
.blastTemp(4500, GasTier.HIGH, 30720, 1000)
.build();

Oxygen = new Material.Builder(76, "oxygen")
Expand All @@ -549,7 +550,7 @@ public static void register() {
.flags(EXT2_METAL)
.element(Elements.Pd)
.toolStats(8.0f, 2.0f, 512, 33)
.blastTemp(1228)
.blastTemp(1828, GasTier.LOW, 480, 900)
.build();

Phosphorus = new Material.Builder(78, "phosphorus")
Expand Down Expand Up @@ -641,7 +642,7 @@ public static void register() {
.color(0xF4F4F4).iconSet(SHINY)
.flags(EXT2_METAL)
.element(Elements.Rh)
.blastTemp(2237)
.blastTemp(2237, GasTier.MID, 1920, 1200)
.build();

Roentgenium = new Material.Builder(91, "roentgenium")
Expand All @@ -662,7 +663,7 @@ public static void register() {
.color(0x9B9B9B).iconSet(SHINY)
.flags(EXT2_METAL)
.element(Elements.Ru)
.blastTemp(2607)
.blastTemp(2607, GasTier.MID, 1920, 900)
.build();

Rutherfordium = new Material.Builder(94, "rutherfordium")
Expand All @@ -677,7 +678,7 @@ public static void register() {
.color(0xFFFFCC).iconSet(METALLIC)
.flags(STD_METAL)
.element(Elements.Sm)
.blastTemp(1345)
.blastTemp(5400, GasTier.HIGH, 1920, 1500)
.build();

Scandium = new Material.Builder(96, "scandium")
Expand Down Expand Up @@ -705,7 +706,7 @@ public static void register() {
.color(0x3C3C50).iconSet(METALLIC)
.flags(STD_METAL, GENERATE_FOIL)
.element(Elements.Si)
.blastTemp(1687)
.blastTemp(1687) // no gas tier for silicon
.build();

Silver = new Material.Builder(100, "silver")
Expand Down Expand Up @@ -802,14 +803,14 @@ public static void register() {
.itemPipeProperties(4096, 0.5f)
.build();

Titanium = new Material.Builder(113, "titanium") // todo Ore?
Titanium = new Material.Builder(113, "titanium") // todo Ore? Look at EBF recipe here if we do Ti ores
.ingot(3).fluid()
.color(0xDCA0F0).iconSet(METALLIC)
.flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_SPRING, GENERATE_FRAME, GENERATE_DENSE)
.element(Elements.Ti)
.toolStats(7.0f, 3.0f, 1600, 21)
.fluidPipeProperties(2426, 80, true)
.blastTemp(1941)
.blastTemp(1941, GasTier.MID, 480, 1500)
.build();

Tritium = new Material.Builder(114, "tritium")
Expand All @@ -826,7 +827,7 @@ public static void register() {
.toolStats(7.0f, 3.0f, 2560, 21)
.cableProperties(GTValues.V[5], 2, 2)
.fluidPipeProperties(4618, 90, true)
.blastTemp(3000)
.blastTemp(3600, GasTier.MID, 1920, 1800)
.build();

Uranium238 = new Material.Builder(116, "uranium")
Expand All @@ -850,7 +851,7 @@ public static void register() {
.color(0x323232).iconSet(METALLIC)
.flags(STD_METAL)
.element(Elements.V)
.blastTemp(2183)
.blastTemp(2183, GasTier.MID)
.build();

Xenon = new Material.Builder(119, "xenon")
Expand Down Expand Up @@ -897,7 +898,7 @@ public static void register() {
.toolStats(6.0f, 4.0f, 1280, 21)
.cableProperties(GTValues.V[7], 2, 2)
.fluidPipeProperties(19200, 1500, true)
.blastTemp(5400)
.blastTemp(5000, GasTier.HIGH, 7680, 600)
.build();

NaquadahEnriched = new Material.Builder(125, "naquadah_enriched")
Expand All @@ -906,15 +907,15 @@ public static void register() {
.flags(EXT_METAL, GENERATE_FOIL)
.element(Elements.Nq1)
.toolStats(6.0f, 4.0f, 1280, 21)
.blastTemp(4500)
.blastTemp(7000, GasTier.HIGH, 7680, 1000)
.build();

Naquadria = new Material.Builder(126, "naquadria")
.ingot(3).fluid()
.color(0x1E1E1E).iconSet(SHINY)
.flags(EXT_METAL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_DENSE, GENERATE_FINE_WIRE)
.element(Elements.Nq2)
.blastTemp(9000)
.blastTemp(9000, GasTier.HIGH, 122880, 1200)
.build();

Neutronium = new Material.Builder(127, "neutronium")
Expand Down Expand Up @@ -949,7 +950,7 @@ public static void register() {
.color(0xC8C8D2).iconSet(SHINY)
.flags(GENERATE_FOIL)
.element(Elements.Ke)
.blastTemp(8600)
.blastTemp(8600, GasTier.HIGH, 30720, 1500)
.build();

Adamantium = new Material.Builder(131, "adamantium")
Expand Down
Loading

0 comments on commit 1f45171

Please sign in to comment.