Skip to content

Commit

Permalink
add tiered superconductors
Browse files Browse the repository at this point in the history
  • Loading branch information
TechLord22 committed Aug 20, 2021
1 parent 4eb9133 commit 78e37f7
Show file tree
Hide file tree
Showing 11 changed files with 208 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/unification/Elements.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private Elements() {
public static final Element Kr = add(36, 48, -1, null, "Krypton", "Kr", false);
public static final Element Rb = add(37, 48, -1, null, "Rubidium", "Rb", false);
public static final Element Sr = add(38, 49, -1, null, "Strontium", "Sr", false);
public static final Element Yt = add(39, 50, -1, null, "Yttrium", "Yt", false);
public static final Element Y = add(39, 50, -1, null, "Yttrium", "Y", false);
public static final Element Zr = add(40, 51, -1, null, "Zirconium", "Zr", false);
public static final Element Nb = add(41, 53, -1, null, "Niobium", "Nb", false);
public static final Element Mo = add(42, 53, -1, null, "Molybdenum", "Mo", false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ public static class Tier {
public static final Material Master = new MarkerMaterial("master");
public static final Material Ultimate = new MarkerMaterial("ultimate");
public static final Material Superconductor = new MarkerMaterial("superconductor");
//new Material(387, "superconductor", 0xFFFFFF, MaterialIconSet.NONE, of(), 0L, null) {};
public static final Material Infinite = new MarkerMaterial("infinite");

public static Material Ultra = new MarkerMaterial("ultra");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,15 @@ public static void register() {
public static Material DistilledWater;
public static Material SodiumPotassium;
public static Material SamariumMagnetic;
public static Material ManganesePhosphide;
public static Material MagnesiumDiboride;
public static Material MercuryBariumCalciumCuprate;
public static Material UraniumTriplatinum;
public static Material SamariumIronArsenicOxide;
public static Material IndiumTinBariumTitaniumCuprate;
public static Material UraniumRhodiumDinaquadide;
public static Material EnrichedNaquadahTriniumEuropiumDuranide;
public static Material RutheniumTriniumAmericiumNeutronate;

/**
* Organic chemistry
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ public static void register() {
.ingot().fluid()
.color(0xDCFADC).iconSet(METALLIC)
.flags(STD_METAL)
.element(Elements.Yt)
.element(Elements.Y)
.blastTemp(1799)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ public static void register() {
.color(0x1D291D)
.flags(EXT_METAL)
.components(Niobium, 1, Nitrogen, 1)
.cableProperties(GTValues.V[6], 1, 1)
.blastTemp(2573)
.build();

Expand Down Expand Up @@ -643,7 +644,7 @@ public static void register() {
.color(0x80808C).iconSet(SHINY)
.flags(STD_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.components(Vanadium, 3, Gallium, 1)
.cableProperties(GTValues.V[6], 4, 2)
.cableProperties(GTValues.V[7], 4, 2)
.blastTemp(4500)
.build();

Expand All @@ -656,6 +657,7 @@ public static void register() {
.fluidPipeProperties(2387, 30, true)
.build();
Iron.getProperty(PropertyKey.INGOT).setSmeltingInto(WroughtIron);
Iron.getProperty(PropertyKey.INGOT).setArcSmeltingInto(WroughtIron);

Wulfenite = new Material.Builder(336, "wulfenite")
.dust(3).ore()
Expand All @@ -675,7 +677,7 @@ public static void register() {
.color(0x504046).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.components(Yttrium, 1, Barium, 2, Copper, 3, Oxygen, 7)
.cableProperties(GTValues.V[6], 4, 4)
.cableProperties(GTValues.V[8], 4, 4)
.build();

NetherQuartz = new Material.Builder(339, "nether_quartz")
Expand Down Expand Up @@ -1242,5 +1244,88 @@ public static void register() {
.blastTemp(1345)
.build();
Samarium.getProperty(PropertyKey.INGOT).setMagneticMaterial(SamariumMagnetic);

ManganesePhosphide = new Material.Builder(424, "manganese_phosphide")
.ingot()
.color(0xE1B454).iconSet(METALLIC)
.flags(DECOMPOSITION_BY_ELECTROLYZING)
.components(Manganese, 1, Phosphorus, 1)
.cableProperties(GTValues.V[GTValues.LV], 2, 0, true)
.blastTemp(1200)
.build();

MagnesiumDiboride = new Material.Builder(425, "magnesium_diboride")
.ingot()
.color(0x331900).iconSet(METALLIC)
.flags(DECOMPOSITION_BY_ELECTROLYZING)
.components(Magnesium, 1, Boron, 2)
.cableProperties(GTValues.V[GTValues.MV], 4, 0, true)
.blastTemp(2500)
.build();

MercuryBariumCalciumCuprate = new Material.Builder(426, "mercury_barium_calcium_cuprate")
.ingot()
.color(0x555555).iconSet(SHINY)
.flags(DECOMPOSITION_BY_ELECTROLYZING)
.components(Mercury, 1, Barium, 2, Calcium, 2, Copper, 3, Oxygen, 8)
.cableProperties(GTValues.V[GTValues.HV], 4, 0, true)
.blastTemp(3300)
.build();

UraniumTriplatinum = new Material.Builder(427, "uranium_triplatinum")
.ingot()
.color(0x008700).iconSet(SHINY)
.flags(DECOMPOSITION_BY_CENTRIFUGING)
.components(Uranium238, 1, Platinum, 3)
.cableProperties(GTValues.V[GTValues.EV], 6, 0, true)
.blastTemp(4400)
.build()
.setFormula("UPt3", true);

SamariumIronArsenicOxide = new Material.Builder(428, "samarium_iron_arsenic_oxide")
.ingot()
.color(0x330033).iconSet(SHINY)
.flags(DECOMPOSITION_BY_CENTRIFUGING)
.components(Samarium, 1, Iron, 1, Arsenic, 1, Oxygen, 1)
.cableProperties(GTValues.V[GTValues.IV], 6, 0, true)
.blastTemp(5200)
.build();

IndiumTinBariumTitaniumCuprate = new Material.Builder(429, "indium_tin_barium_titanium_cuprate")
.ingot()
.color(0x994C00).iconSet(METALLIC)
.flags(DECOMPOSITION_BY_ELECTROLYZING)
.components(Indium, 4, Tin, 2, Barium, 2, Titanium, 1, Copper, 7, Oxygen, 14)
.cableProperties(GTValues.V[GTValues.LuV], 8, 0, true)
.blastTemp(6000)
.build();

UraniumRhodiumDinaquadide = new Material.Builder(430, "uranium_rhodium_dinaquadide")
.ingot()
.color(0x0A0A0A)
.flags(DECOMPOSITION_BY_CENTRIFUGING)
.components(Uranium238, 1, Rhodium, 1, Naquadah, 2)
.cableProperties(GTValues.V[GTValues.ZPM], 8, 0, true)
.blastTemp(9000)
.build()
.setFormula("URhNq2", true);

EnrichedNaquadahTriniumEuropiumDuranide = new Material.Builder(431, "enriched_naquadah_trinium_europium_duranide")
.ingot()
.color(0x7D9673).iconSet(METALLIC)
.flags(DECOMPOSITION_BY_CENTRIFUGING)
.components(NaquadahEnriched, 4, Trinium, 3, Europium, 2, Duranium, 1)
.cableProperties(GTValues.V[GTValues.UV], 16, 0, true)
.blastTemp(9900)
.build();

RutheniumTriniumAmericiumNeutronate = new Material.Builder(432, "ruthenium_trinium_americium_neutronate")
.ingot()
.color(0xFFFFFF).iconSet(BRIGHT)
.flags(DECOMPOSITION_BY_ELECTROLYZING)
.components(Ruthenium, 1, Trinium, 2, Americium, 1, Neutronium, 2, Oxygen, 8)
.cableProperties(GTValues.V[GTValues.MAX], 24, 0, true)
.blastTemp(10800)
.build();
}
}
Loading

0 comments on commit 78e37f7

Please sign in to comment.