From 55feab237e03430b53ba5269456b4f2fe1227c4a Mon Sep 17 00:00:00 2001 From: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Date: Sun, 10 Nov 2024 00:41:07 -0700 Subject: [PATCH 1/3] blast builder with vacuum overrides --- .../api/data/chemical/material/Material.java | 26 +++- .../material/properties/BlastProperty.java | 120 +++++++++++----- .../data/materials/ElementMaterials.java | 102 ++++++++----- .../data/materials/FirstDegreeMaterials.java | 136 +++++++++++------- .../common/data/materials/GCYMMaterials.java | 37 +++-- .../data/materials/HigherDegreeMaterials.java | 21 ++- .../data/materials/SecondDegreeMaterials.java | 26 ++-- .../generated/MaterialRecipeHandler.java | 9 +- 8 files changed, 322 insertions(+), 155 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java index a1ee566a56..424dae9541 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java @@ -42,6 +42,7 @@ import org.jetbrains.annotations.Nullable; import java.util.*; +import java.util.function.UnaryOperator; import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.HAZARD; @@ -1032,22 +1033,33 @@ public Builder rotorStats(int power, int efficiency, float damage, int durabilit } public Builder blastTemp(int temp) { - properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp)); - return this; + return blast(temp); } public Builder blastTemp(int temp, BlastProperty.GasTier gasTier) { - properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp, gasTier, -1, -1)); - return this; + return blast(temp, gasTier); } public Builder blastTemp(int temp, BlastProperty.GasTier gasTier, int eutOverride) { - properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp, gasTier, eutOverride, -1)); - return this; + return blast(b -> b.temp(temp, gasTier).blastStats(eutOverride)); } public Builder blastTemp(int temp, BlastProperty.GasTier gasTier, int eutOverride, int durationOverride) { - properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp, gasTier, eutOverride, durationOverride)); + return blast(b -> b.temp(temp, gasTier).blastStats(eutOverride, durationOverride)); + } + + public Builder blast(int temp) { + properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp)); + return this; + } + + public Builder blast(int temp, BlastProperty.GasTier gasTier) { + properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp, gasTier)); + return this; + } + + public Builder blast(UnaryOperator b) { + properties.setProperty(PropertyKey.BLAST, b.apply(new BlastProperty.Builder()).build()); return this; } diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/BlastProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/BlastProperty.java index 0bfefaa5f0..00fd13d5d2 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/BlastProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/BlastProperty.java @@ -1,6 +1,7 @@ package com.gregtechceu.gtceu.api.data.chemical.material.properties; -import org.jetbrains.annotations.NotNull; +import lombok.Getter; +import lombok.Setter; public class BlastProperty implements IMaterialProperty { @@ -12,6 +13,7 @@ public class BlastProperty implements IMaterialProperty { * If a Material with this Property has a Fluid, its temperature * will be set to this if it is the default Fluid temperature. */ + @Getter private int blastTemperature; /** @@ -19,6 +21,8 @@ public class BlastProperty implements IMaterialProperty { *

* Default: null, meaning no Gas EBF recipes. */ + @Setter + @Getter private GasTier gasTier = null; /** @@ -26,6 +30,8 @@ public class BlastProperty implements IMaterialProperty { *

* Default: -1, meaning the duration will be: material.getAverageMass() * blastTemperature / 50 */ + @Setter + @Getter private int durationOverride = -1; /** @@ -33,17 +39,45 @@ public class BlastProperty implements IMaterialProperty { *

* Default: -1, meaning the EU/t will be 120. */ - private int eutOverride = -1; + @Setter + @Getter + private int EUtOverride = -1; + + /** + * The duration of the EBF recipe, overriding the stock behavior. + *

+ * Default: -1, meaning the duration will be: material.getMass() * 3 + */ + @Setter + @Getter + private int vacuumDurationOverride = -1; + + /** + * The EU/t of the Vacuum Freezer recipe (if needed), overriding the stock behavior. + *

+ * Default: -1, meaning the EU/t will be 120 EU/t. + */ + @Setter + @Getter + private int vacuumEUtOverride = -1; public BlastProperty(int blastTemperature) { this.blastTemperature = blastTemperature; } - public BlastProperty(int blastTemperature, GasTier gasTier, int eutOverride, int durationOverride) { + public BlastProperty(int blastTemperature, GasTier gasTier) { this.blastTemperature = blastTemperature; this.gasTier = gasTier; - this.eutOverride = eutOverride; + } + + public BlastProperty(int blastTemperature, GasTier gasTier, int eutOverride, int durationOverride, + int vacuumEUtOverride, int vacuumDurationOverride) { + this.blastTemperature = blastTemperature; + this.gasTier = gasTier; + this.EUtOverride = eutOverride; this.durationOverride = durationOverride; + this.vacuumEUtOverride = vacuumEUtOverride; + this.vacuumDurationOverride = vacuumDurationOverride; } /** @@ -53,39 +87,11 @@ public BlastProperty() { this(0); } - public int getBlastTemperature() { - return blastTemperature; - } - public void setBlastTemperature(int blastTemp) { if (blastTemp <= 0) throw new IllegalArgumentException("Blast Temperature must be greater than zero!"); this.blastTemperature = blastTemp; } - public GasTier getGasTier() { - return gasTier; - } - - public void setGasTier(@NotNull GasTier tier) { - this.gasTier = tier; - } - - public int getDurationOverride() { - return durationOverride; - } - - public void setDurationOverride(int duration) { - this.durationOverride = duration; - } - - public int getEUtOverride() { - return eutOverride; - } - - public void setEutOverride(int eut) { - this.eutOverride = eut; - } - @Override public void verifyProperty(MaterialProperties properties) { properties.ensureSet(PropertyKey.INGOT, true); @@ -118,4 +124,54 @@ public enum GasTier { public static final GasTier[] VALUES = values(); } + + public static class Builder { + + private int temp; + private GasTier gasTier; + private int eutOverride = -1; + private int durationOverride = -1; + private int vacuumEUtOverride = -1; + private int vacuumDurationOverride = -1; + + public Builder() {} + + public Builder temp(int tempurature) { + this.temp = tempurature; + return this; + } + + public Builder temp(int tempurature, GasTier gasTier) { + this.temp = tempurature; + this.gasTier = gasTier; + return this; + } + + public Builder blastStats(int eutOverride) { + this.eutOverride = eutOverride; + return this; + } + + public Builder blastStats(int eutOverride, int durationOverride) { + this.eutOverride = eutOverride; + this.durationOverride = durationOverride; + return this; + } + + public Builder vacuumStats(int eutOverride) { + this.vacuumEUtOverride = eutOverride; + return this; + } + + public Builder vacuumStats(int eutOverride, int durationOverride) { + this.vacuumEUtOverride = eutOverride; + this.vacuumDurationOverride = durationOverride; + return this; + } + + public BlastProperty build() { + return new BlastProperty(temp, gasTier, eutOverride, durationOverride, vacuumEUtOverride, + vacuumDurationOverride); + } + } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java index 19a7d779b4..9ab08ac735 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java @@ -1,7 +1,6 @@ package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; @@ -15,7 +14,7 @@ import com.gregtechceu.gtceu.common.data.GTElements; import com.gregtechceu.gtceu.common.data.GTMedicalConditions; -import static com.gregtechceu.gtceu.api.GTValues.LV; +import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; import static com.gregtechceu.gtceu.common.data.GTMaterials.*; @@ -39,9 +38,9 @@ public static void register() { .toolStats(ToolProperty.Builder.of(6.0F, 7.5F, 768, 2) .enchantability(14).build()) .rotorStats(100, 140, 2.0f, 128) - .cableProperties(GTValues.V[4], 1, 1) + .cableProperties(V[EV], 1, 1) .fluidPipeProperties(1166, 100, true) - .blastTemp(1700, GasTier.LOW) + .blast(1700, GasTier.LOW) .buildAndRegister(); Americium = new Material.Builder(GTCEu.id("americium")) @@ -179,7 +178,7 @@ public static void register() { .element(GTElements.Cr) .rotorStats(130, 155, 3.0f, 512) .fluidPipeProperties(2180, 35, true, true, false, false) - .blastTemp(1700, GasTier.LOW) + .blast(1700, GasTier.LOW) .hazard(HazardProperty.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.CARCINOGEN) .buildAndRegister(); @@ -190,7 +189,7 @@ public static void register() { .color(0x5050FA).secondaryColor(0x2d2d7a).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FINE_WIRE) .element(GTElements.Co) - .cableProperties(GTValues.V[LV], 2, 2) + .cableProperties(V[LV], 2, 2) .itemPipeProperties(2560, 2.0f) .buildAndRegister(); @@ -208,7 +207,7 @@ public static void register() { .appendFlags(EXT_METAL, MORTAR_GRINDABLE, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_RING, GENERATE_FINE_WIRE, GENERATE_ROTOR) .element(GTElements.Cu) - .cableProperties(GTValues.V[2], 1, 2) + .cableProperties(V[MV], 1, 2) .fluidPipeProperties(1696, 6, true) .buildAndRegister(); @@ -259,9 +258,11 @@ public static void register() { .appendFlags(STD_METAL, GENERATE_LONG_ROD, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_FOIL, GENERATE_FRAME) .element(GTElements.Eu) - .cableProperties(GTValues.V[GTValues.UHV], 2, 32) + .cableProperties(V[UHV], 2, 32) .fluidPipeProperties(7750, 300, true) - .blastTemp(6000, GasTier.MID, GTValues.VA[GTValues.IV], 180) + .blast(b -> b.temp(6000, GasTier.MID) + .blastStats(VA[IV], 180) + .vacuumStats(VA[HV])) .buildAndRegister(); Fermium = new Material.Builder(GTCEu.id("fermium")) @@ -313,7 +314,7 @@ public static void register() { .appendFlags(EXT2_METAL, GENERATE_RING, MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE, GENERATE_FOIL) .element(GTElements.Au) - .cableProperties(GTValues.V[3], 3, 2) + .cableProperties(V[HV], 3, 2) .fluidPipeProperties(1671, 25, true, true, false, false) .buildAndRegister(); @@ -380,7 +381,9 @@ public static void register() { .element(GTElements.Ir) .rotorStats(130, 115, 3.0f, 2560) .fluidPipeProperties(3398, 250, true, false, true, false) - .blastTemp(4500, GasTier.HIGH, GTValues.VA[GTValues.IV], 1100) + .blast(b -> b.temp(4500, GasTier.HIGH) + .blastStats(VA[IV], 1100) + .vacuumStats(VA[EV], 250)) .buildAndRegister(); Iron = new Material.Builder(GTCEu.id("iron")) @@ -396,7 +399,7 @@ public static void register() { .toolStats(ToolProperty.Builder.of(2.0F, 2.0F, 256, 2) .enchantability(14).addTypes(GTToolType.MORTAR).build()) .rotorStats(115, 115, 2.5f, 256) - .cableProperties(GTValues.V[2], 2, 3) + .cableProperties(V[MV], 2, 3) .buildAndRegister(); Krypton = new Material.Builder(GTCEu.id("krypton")) @@ -428,7 +431,7 @@ public static void register() { .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE) .element(GTElements.Pb) - .cableProperties(GTValues.V[0], 2, 2) + .cableProperties(V[ULV], 2, 2) .fluidPipeProperties(1200, 32, true) .hazard(HazardProperty.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON) .buildAndRegister(); @@ -507,7 +510,7 @@ public static void register() { .appendFlags(STD_METAL, GENERATE_ROD, GENERATE_BOLT_SCREW) .element(GTElements.Nd) .rotorStats(100, 115, 2.0f, 512) - .blastTemp(1297, GasTier.MID) + .blast(1297, GasTier.MID) .buildAndRegister(); Neon = new Material.Builder(GTCEu.id("neon")) @@ -530,7 +533,7 @@ public static void register() { .color(0xccdff5).secondaryColor(0x59563a).iconSet(METALLIC) .appendFlags(STD_METAL, MORTAR_GRINDABLE) .element(GTElements.Ni) - .cableProperties(GTValues.V[LV], 3, 3) + .cableProperties(V[LV], 3, 3) .itemPipeProperties(2048, 1.0f) .buildAndRegister(); @@ -543,7 +546,8 @@ public static void register() { .ingot().fluid() .color(0xb494b4).secondaryColor(0x4b3f4d).iconSet(BRIGHT) .element(GTElements.Nb) - .blastTemp(2750, GasTier.MID, GTValues.VA[GTValues.HV], 900) + .blast(b -> b.temp(2750, GasTier.MID) + .blastStats(VA[HV], 900)) .buildAndRegister(); Nitrogen = new Material.Builder(GTCEu.id("nitrogen")) @@ -570,9 +574,11 @@ public static void register() { .appendFlags(EXT2_METAL, GENERATE_FOIL) .element(GTElements.Os) .rotorStats(160, 185, 4.0f, 1280) - .cableProperties(GTValues.V[6], 4, 2) + .cableProperties(V[LuV], 4, 2) .itemPipeProperties(256, 8.0f) - .blastTemp(4500, GasTier.HIGH, GTValues.VA[GTValues.LuV], 1000) + .blast(b -> b.temp(4500, GasTier.HIGH) + .blastStats(VA[LuV], 1000) + .vacuumStats(VA[EV], 300)) .buildAndRegister(); Oxygen = new Material.Builder(GTCEu.id("oxygen")) @@ -593,7 +599,9 @@ public static void register() { .color(0xbd92b5).secondaryColor(0x535b14).iconSet(SHINY) .appendFlags(EXT_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE) .element(GTElements.Pd) - .blastTemp(1828, GasTier.LOW, GTValues.VA[GTValues.HV], 900) + .blast(b -> b.temp(1828, GasTier.LOW) + .blastStats(VA[HV], 900) + .vacuumStats(VA[HV], 150)) .buildAndRegister(); Phosphorus = new Material.Builder(GTCEu.id("phosphorus")) @@ -616,7 +624,7 @@ public static void register() { .color(0xfff4ba).secondaryColor(0x8d8d71).iconSet(SHINY) .appendFlags(EXT2_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE, GENERATE_RING, GENERATE_SPRING_SMALL) .element(GTElements.Pt) - .cableProperties(GTValues.V[5], 2, 1) + .cableProperties(V[IV], 2, 1) .itemPipeProperties(512, 4.0f) .buildAndRegister(); @@ -686,7 +694,9 @@ public static void register() { .color(0xfd46b1).secondaryColor(0xDC0C58).iconSet(BRIGHT) .appendFlags(EXT2_METAL, GENERATE_GEAR, GENERATE_FINE_WIRE) .element(GTElements.Rh) - .blastTemp(2237, GasTier.MID, GTValues.VA[GTValues.EV], 1200) + .blast(b -> b.temp(2237, GasTier.MID) + .blastStats(VA[EV], 1200) + .vacuumStats(VA[HV])) .buildAndRegister(); Roentgenium = new Material.Builder(GTCEu.id("roentgenium")) @@ -704,7 +714,9 @@ public static void register() { .color(0xa2cde0).secondaryColor(0x3c7285).iconSet(SHINY) .flags(GENERATE_FOIL, GENERATE_GEAR) .element(GTElements.Ru) - .blastTemp(2607, GasTier.MID, GTValues.VA[GTValues.EV], 900) + .blast(b -> b.temp(2607, GasTier.MID) + .blastStats(VA[EV], 900) + .vacuumStats(VA[HV], 200)) .buildAndRegister(); Rutherfordium = new Material.Builder(GTCEu.id("rutherfordium")) @@ -718,7 +730,9 @@ public static void register() { .color(0xc2c289).secondaryColor(0x235254).iconSet(METALLIC) .flags(GENERATE_LONG_ROD) .element(GTElements.Sm) - .blastTemp(5400, GasTier.HIGH, GTValues.VA[GTValues.EV], 1500) + .blast(b -> b.temp(5400, GasTier.HIGH) + .blastStats(VA[EV], 1500) + .vacuumStats(VA[HV], 200)) .buildAndRegister(); Scandium = new Material.Builder(GTCEu.id("scandium")) @@ -742,7 +756,7 @@ public static void register() { .color(0x707078).secondaryColor(0x10293b).iconSet(METALLIC) .flags(GENERATE_FOIL) .element(GTElements.Si) - .blastTemp(2273) // no gas tier for silicon + .blast(2273) // no gas tier for silicon .buildAndRegister(); Silver = new Material.Builder(GTCEu.id("silver")) @@ -752,7 +766,7 @@ public static void register() { .color(0xDCDCFF).secondaryColor(0x5a4705).iconSet(SHINY) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_FINE_WIRE, GENERATE_RING) .element(GTElements.Ag) - .cableProperties(GTValues.V[3], 1, 1) + .cableProperties(V[HV], 1, 1) .buildAndRegister(); Sodium = new Material.Builder(GTCEu.id("sodium")) @@ -833,7 +847,7 @@ public static void register() { .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE) .element(GTElements.Sn) - .cableProperties(GTValues.V[1], 1, 1) + .cableProperties(V[LV], 1, 1) .itemPipeProperties(4096, 0.5f) .buildAndRegister(); @@ -846,7 +860,9 @@ public static void register() { .enchantability(14).build()) .rotorStats(130, 115, 3.0f, 1600) .fluidPipeProperties(2426, 150, true) - .blastTemp(1941, GasTier.MID, GTValues.VA[GTValues.HV], 1500) + .blast(b -> b.temp(1941, GasTier.MID) + .blastStats(VA[HV], 1500) + .vacuumStats(VA[HV])) .buildAndRegister(); Tritium = new Material.Builder(GTCEu.id("tritium")) @@ -865,9 +881,11 @@ public static void register() { GENERATE_FRAME) .element(GTElements.W) .rotorStats(130, 115, 3.0f, 2560) - .cableProperties(GTValues.V[5], 2, 2) + .cableProperties(V[IV], 2, 2) .fluidPipeProperties(4618, 50, true, true, false, true) - .blastTemp(3600, GasTier.MID, GTValues.VA[GTValues.EV], 1800) + .blast(b -> b.temp(3600, GasTier.MID) + .blastStats(VA[EV], 1800) + .vacuumStats(VA[HV], 300)) .buildAndRegister(); Uranium238 = new Material.Builder(GTCEu.id("uranium")) @@ -892,7 +910,7 @@ public static void register() { .ingot().fluid() .color(0x696d76).secondaryColor(0x240808).iconSet(METALLIC) .element(GTElements.V) - .blastTemp(2183, GasTier.MID) + .blast(2183, GasTier.MID) .buildAndRegister(); Xenon = new Material.Builder(GTCEu.id("xenon")) @@ -910,7 +928,7 @@ public static void register() { .ingot().fluid() .color(0x7d8072).secondaryColor(0x15161a).iconSet(METALLIC) .element(GTElements.Y) - .blastTemp(1799) + .blast(1799) .buildAndRegister(); Zinc = new Material.Builder(GTCEu.id("zinc")) @@ -934,9 +952,11 @@ public static void register() { .appendFlags(EXT_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW) .element(GTElements.Nq) .rotorStats(160, 105, 4.0f, 1280) - .cableProperties(GTValues.V[7], 2, 2) + .cableProperties(V[ZPM], 2, 2) .fluidPipeProperties(3776, 200, true, false, true, true) - .blastTemp(5000, GasTier.HIGH, GTValues.VA[GTValues.IV], 600) + .blast(b -> b.temp(5000, GasTier.HIGH) + .blastStats(VA[IV], 600) + .vacuumStats(VA[EV], 150)) .buildAndRegister(); NaquadahEnriched = new Material.Builder(GTCEu.id("enriched_naquadah")) @@ -945,7 +965,9 @@ public static void register() { .color(0x3C3C3C, false).secondaryColor(0x122f06).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FOIL) .element(GTElements.Nq1) - .blastTemp(7000, GasTier.HIGH, GTValues.VA[GTValues.IV], 1000) + .blast(b -> b.temp(7000, GasTier.HIGH) + .blastStats(VA[IV], 1000) + .vacuumStats(VA[EV], 150)) .buildAndRegister(); Naquadria = new Material.Builder(GTCEu.id("naquadria")) @@ -954,7 +976,9 @@ public static void register() { .color(0x1E1E1E, false).secondaryColor(0x59b3ff).iconSet(RADIOACTIVE) .appendFlags(EXT_METAL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW) .element(GTElements.Nq2) - .blastTemp(9000, GasTier.HIGH, GTValues.VA[GTValues.ZPM], 1200) + .blast(b -> b.temp(9000, GasTier.HIGH) + .blastStats(VA[ZPM], 1200) + .vacuumStats(VA[LuV], 200)) .radioactiveHazard(3) .buildAndRegister(); @@ -978,7 +1002,7 @@ public static void register() { .appendFlags(EXT2_METAL, GENERATE_FRAME, GENERATE_RING, GENERATE_SMALL_GEAR, GENERATE_ROUND, GENERATE_FOIL, GENERATE_FINE_WIRE, GENERATE_GEAR) .element(GTElements.Tr) - .cableProperties(GTValues.V[8], 1, 8) + .cableProperties(V[UV], 1, 8) .rotorStats(220, 220, 6.0f, 10240) .buildAndRegister(); @@ -998,8 +1022,10 @@ public static void register() { .color(0x81808a).secondaryColor(0x351d4b).iconSet(SHINY) .flags(GENERATE_FOIL, GENERATE_BOLT_SCREW, GENERATE_GEAR) .element(GTElements.Ke) - .cableProperties(GTValues.V[7], 6, 4) - .blastTemp(7200, GasTier.HIGH, GTValues.VA[GTValues.LuV], 1500) + .cableProperties(V[ZPM], 6, 4) + .blast(b -> b.temp(7200, GasTier.HIGH) + .blastStats(VA[LuV], 1500) + .vacuumStats(VA[IV], 300)) .buildAndRegister(); } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java index 109ccc809f..dabbf1391c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java @@ -1,7 +1,6 @@ package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; @@ -41,7 +40,7 @@ public static void register() { .color(0xf2c079).secondaryColor(0xe45534).iconSet(BRIGHT) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_FINE_WIRE) .components(Copper, 1) - .cableProperties(GTValues.V[2], 1, 1) + .cableProperties(V[MV], 1, 1) .buildAndRegister(); Copper.getProperty(PropertyKey.INGOT).setArcSmeltingInto(AnnealedCopper); @@ -195,7 +194,7 @@ public static void register() { .appendFlags(EXT_METAL, GENERATE_SPRING, GENERATE_FINE_WIRE) .components(Copper, 1, Nickel, 1) .itemPipeProperties(2048, 1) - .cableProperties(GTValues.V[MV], 1, 1) + .cableProperties(V[MV], 1, 1) .buildAndRegister(); DarkAsh = new Material.Builder(GTCEu.id("dark_ash")) @@ -223,7 +222,7 @@ public static void register() { .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_FINE_WIRE, GENERATE_RING) .components(Silver, 1, Gold, 1) .itemPipeProperties(1024, 2) - .cableProperties(GTValues.V[3], 2, 2) + .cableProperties(V[HV], 2, 2) .buildAndRegister(); Emerald = new Material.Builder(GTCEu.id("emerald")) @@ -311,8 +310,9 @@ public static void register() { .color(0xC2D2DF).secondaryColor(0x4c4238).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_SPRING) .components(Iron, 1, Aluminium, 1, Chromium, 1) - .cableProperties(GTValues.V[3], 4, 3) - .blastTemp(1800, GasTier.LOW, GTValues.VA[HV], 900) + .cableProperties(V[HV], 4, 3) + .blast(b -> b.temp(1800, GasTier.LOW) + .blastStats(VA[HV], 900)) .buildAndRegister(); Lazurite = new Material.Builder(GTCEu.id("lazurite")) @@ -357,8 +357,10 @@ public static void register() { .color(0xaf94b2).secondaryColor(0x5b4c6a).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_SPRING) .components(Nickel, 4, Chromium, 1) - .cableProperties(GTValues.V[EV], 4, 4) - .blastTemp(2700, GasTier.LOW, GTValues.VA[HV], 1300) + .cableProperties(V[EV], 4, 4) + .blast(b -> b.temp(2700, GasTier.LOW) + .blastStats(VA[EV], 1300) + .vacuumStats(VA[HV])) .buildAndRegister(); NiobiumNitride = new Material.Builder(GTCEu.id("niobium_nitride")) @@ -366,8 +368,8 @@ public static void register() { .color(0x574457).secondaryColor(0x332e3c).iconSet(BRIGHT) .appendFlags(EXT_METAL, GENERATE_FOIL) .components(Niobium, 1, Nitrogen, 1) - .cableProperties(GTValues.V[6], 1, 1) - .blastTemp(2846, GasTier.MID) + .cableProperties(V[LuV], 1, 1) + .blast(2846, GasTier.MID) .buildAndRegister(); NiobiumTitanium = new Material.Builder(GTCEu.id("niobium_titanium")) @@ -377,8 +379,10 @@ public static void register() { .appendFlags(EXT2_METAL, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FOIL, GENERATE_FINE_WIRE) .components(Niobium, 1, Titanium, 1) .fluidPipeProperties(5900, 175, true) - .cableProperties(GTValues.V[LuV], 4, 2) - .blastTemp(4500, GasTier.HIGH, GTValues.VA[HV], 1500) + .cableProperties(V[LuV], 4, 2) + .blast(b -> b.temp(4500, GasTier.HIGH) + .blastStats(VA[HV], 1500) + .vacuumStats(VA[HV], 200)) .buildAndRegister(); Obsidian = new Material.Builder(GTCEu.id("obsidian")) @@ -413,7 +417,8 @@ public static void register() { .enchantment(Enchantments.SMITE, 3).build()) .rotorStats(100, 160, 2.0f, 196) .itemPipeProperties(1024, 2) - .blastTemp(1700, GasTier.LOW, GTValues.VA[MV], 1000) + .blast(b -> b.temp(1700, GasTier.LOW) + .blastStats(VA[MV], 1000)) .buildAndRegister(); RoseGold = new Material.Builder(GTCEu.id("rose_gold")) @@ -427,7 +432,8 @@ public static void register() { .enchantment(Enchantments.BLOCK_FORTUNE, 2).build()) .rotorStats(100, 170, 2.0f, 152) .itemPipeProperties(1024, 2) - .blastTemp(1600, GasTier.LOW, GTValues.VA[MV], 1000) + .blast(b -> b.temp(1600, GasTier.LOW) + .blastStats(VA[MV], 1000)) .buildAndRegister(); BlackBronze = new Material.Builder(GTCEu.id("black_bronze")) @@ -438,7 +444,8 @@ public static void register() { .components(Gold, 1, Silver, 1, Copper, 3) .rotorStats(100, 155, 2.0f, 256) .itemPipeProperties(1024, 2) - .blastTemp(2000, GasTier.LOW, GTValues.VA[MV], 1000) + .blast(b -> b.temp(2000, GasTier.LOW) + .blastStats(VA[MV], 1000)) .buildAndRegister(); BismuthBronze = new Material.Builder(GTCEu.id("bismuth_bronze")) @@ -448,7 +455,8 @@ public static void register() { .appendFlags(EXT2_METAL) .components(Bismuth, 1, Zinc, 1, Copper, 3) .rotorStats(130, 120, 3.0f, 256) - .blastTemp(1100, GasTier.LOW, GTValues.VA[MV], 1000) + .blast(b -> b.temp(1100, GasTier.LOW) + .blastStats(VA[MV], 1000)) .buildAndRegister(); Biotite = new Material.Builder(GTCEu.id("biotite")) @@ -495,7 +503,9 @@ public static void register() { .components(Ruthenium, 4, Tungsten, 2, Molybdenum, 1) .flags(GENERATE_SPRING) .cableProperties(V[EV], 6, 2) - .blastTemp(3000, GasTier.MID, GTValues.VA[GTValues.EV], 1400) + .blast(b -> b.temp(3000, GasTier.MID) + .blastStats(VA[EV], 1400) + .vacuumStats(VA[HV], 250)) .buildAndRegister(); Ruridit = new Material.Builder(GTCEu.id("ruridit")) @@ -503,7 +513,9 @@ public static void register() { .color(0x88b5b9).secondaryColor(0x4e885c).iconSet(BRIGHT) .flags(GENERATE_FINE_WIRE, GENERATE_GEAR, GENERATE_LONG_ROD, GENERATE_FRAME, GENERATE_BOLT_SCREW) .components(Ruthenium, 2, Iridium, 1) - .blastTemp(4500, GasTier.HIGH, GTValues.VA[GTValues.EV], 1600) + .blast(b -> b.temp(4500, GasTier.HIGH) + .blastStats(VA[EV], 1600) + .vacuumStats(VA[HV], 300)) .buildAndRegister(); Ruby = new Material.Builder(GTCEu.id("ruby")) @@ -600,7 +612,8 @@ public static void register() { .enchantability(14).build()) .rotorStats(160, 115, 4.0f, 480) .fluidPipeProperties(2428, 75, true, true, true, false) - .blastTemp(1700, GasTier.LOW, GTValues.VA[HV], 1100) + .blast(b -> b.temp(1700, GasTier.LOW) + .blastStats(VA[HV], 1100)) .buildAndRegister(); Steel = new Material.Builder(GTCEu.id("steel")) @@ -616,8 +629,9 @@ public static void register() { .enchantability(14).build()) .rotorStats(130, 105, 3.0f, 512) .fluidPipeProperties(1855, 50, true) - .cableProperties(GTValues.V[EV], 2, 2) - .blastTemp(1000, null, GTValues.VA[MV], 800) // no gas tier for steel + .cableProperties(V[EV], 2, 2) + .blast(b -> b.temp(1000) + .blastStats(VA[MV], 800)) // no gas tier for steel .buildAndRegister(); Stibnite = new Material.Builder(GTCEu.id("stibnite")) @@ -667,7 +681,8 @@ public static void register() { .attackSpeed(0.1F).enchantability(21).build()) .rotorStats(160, 130, 4.0f, 2048) .itemPipeProperties(128, 16) - .blastTemp(2700, GasTier.MID, GTValues.VA[HV], 1300) + .blast(b -> b.temp(2700, GasTier.MID) + .blastStats(VA[HV], 1300)) .buildAndRegister(); Uraninite = new Material.Builder(GTCEu.id("uraninite")) @@ -690,8 +705,10 @@ public static void register() { .color(0x89aeec).secondaryColor(0x00379d).iconSet(SHINY) .appendFlags(STD_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_SPRING_SMALL) .components(Vanadium, 3, Gallium, 1) - .cableProperties(GTValues.V[7], 4, 2) - .blastTemp(4500, GasTier.HIGH, GTValues.VA[GTValues.EV], 1200) + .cableProperties(V[ZPM], 4, 2) + .blast(b -> b.temp(4500, GasTier.HIGH) + .blastStats(VA[EV], 1200) + .vacuumStats(VA[HV])) .buildAndRegister(); WroughtIron = new Material.Builder(GTCEu.id("wrought_iron")) @@ -729,8 +746,10 @@ public static void register() { .appendFlags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FOIL, GENERATE_BOLT_SCREW) .components(Yttrium, 1, Barium, 2, Copper, 3, Oxygen, 7) - .cableProperties(GTValues.V[8], 4, 4) - .blastTemp(4500, GasTier.HIGH) // todo redo this EBF process + .cableProperties(V[UV], 4, 4) + .blast(b -> b.temp(4500, GasTier.HIGH) + .blastStats(VA[IV], 1000) + .vacuumStats(VA[EV], 150)) .buildAndRegister(); NetherQuartz = new Material.Builder(GTCEu.id("nether_quartz")) @@ -767,7 +786,7 @@ public static void register() { .color(0x808080).secondaryColor(0x3d3838).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION, GENERATE_FOIL) .components(Carbon, 1) - .cableProperties(GTValues.V[5], 1, 1) + .cableProperties(V[IV], 1, 1) .buildAndRegister(); TungsticAcid = new Material.Builder(GTCEu.id("tungstic_acid")) @@ -786,7 +805,9 @@ public static void register() { .components(Iridium, 3, Osmium, 1) .rotorStats(130, 130, 3.0f, 3152) .itemPipeProperties(64, 32) - .blastTemp(4500, GasTier.HIGH, GTValues.VA[GTValues.LuV], 900) + .blast(b -> b.temp(4500, GasTier.HIGH) + .blastStats(VA[LuV], 900) + .vacuumStats(VA[EV], 200)) .buildAndRegister(); LithiumChloride = new Material.Builder(GTCEu.id("lithium_chloride")) @@ -819,7 +840,8 @@ public static void register() { .color(0x938fff).secondaryColor(0x8c548c) .appendFlags(STD_METAL, DECOMPOSITION_BY_CENTRIFUGING) .components(Arsenic, 1, Gallium, 1) - .blastTemp(1200, GasTier.LOW, GTValues.VA[MV], 1200) + .blast(b -> b.temp(1200, GasTier.LOW) + .blastStats(VA[MV], 1200)) .buildAndRegister(); Potash = new Material.Builder(GTCEu.id("potash")) @@ -1091,7 +1113,9 @@ public static void register() { .enchantability(21).build()) .rotorStats(160, 155, 4.0f, 1280) .fluidPipeProperties(3837, 200, true) - .blastTemp(3058, GasTier.MID, GTValues.VA[HV], 1500) + .blast(b -> b.temp(3058, GasTier.MID) + .blastStats(VA[EV], 1500) + .vacuumStats(VA[HV])) .buildAndRegister(); CarbonDioxide = new Material.Builder(GTCEu.id("carbon_dioxide")) @@ -1299,8 +1323,8 @@ public static void register() { .color(0xE1B454).secondaryColor(0x223033).iconSet(METALLIC) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Manganese, 1, Phosphorus, 1) - .cableProperties(GTValues.V[GTValues.LV], 2, 0, true, 78) - .blastTemp(1200, GasTier.LOW) + .cableProperties(V[LV], 2, 0, true, 78) + .blast(1200, GasTier.LOW) .buildAndRegister(); MagnesiumDiboride = new Material.Builder(GTCEu.id("magnesium_diboride")) @@ -1309,8 +1333,10 @@ public static void register() { .color(0x603c1a).secondaryColor(0x423e39).iconSet(METALLIC) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Magnesium, 1, Boron, 2) - .cableProperties(GTValues.V[MV], 4, 0, true, 78) - .blastTemp(2500, GasTier.LOW, GTValues.VA[HV], 1000) + .cableProperties(V[MV], 4, 0, true, 78) + .blast(b -> b.temp(2500, GasTier.LOW) + .blastStats(VA[HV], 1000) + .vacuumStats(VA[MV], 200)) .buildAndRegister(); MercuryBariumCalciumCuprate = new Material.Builder(GTCEu.id("mercury_barium_calcium_cuprate")) @@ -1319,8 +1345,10 @@ public static void register() { .color(0x928547).secondaryColor(0x3f2e2e).iconSet(SHINY) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Mercury, 1, Barium, 2, Calcium, 2, Copper, 3, Oxygen, 8) - .cableProperties(GTValues.V[HV], 4, 0, true, 78) - .blastTemp(3300, GasTier.LOW, GTValues.VA[HV], 1500) + .cableProperties(V[HV], 4, 0, true, 78) + .blast(b -> b.temp(3300, GasTier.LOW) + .blastStats(VA[HV], 1500) + .vacuumStats(VA[HV])) .buildAndRegister(); UraniumTriplatinum = new Material.Builder(GTCEu.id("uranium_triplatinum")) @@ -1329,8 +1357,10 @@ public static void register() { .color(0x457045).secondaryColor(0x66ff00).iconSet(RADIOACTIVE) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Uranium238, 1, Platinum, 3) - .cableProperties(GTValues.V[GTValues.EV], 6, 0, true, 30) - .blastTemp(4400, GasTier.MID, GTValues.VA[GTValues.EV], 1000) + .cableProperties(V[EV], 6, 0, true, 30) + .blast(b -> b.temp(4400, GasTier.MID) + .blastStats(VA[EV], 1000) + .vacuumStats(VA[EV], 200)) .buildAndRegister() .setFormula("UPt3", true); @@ -1340,8 +1370,10 @@ public static void register() { .color(0x850e85).secondaryColor(0x332f33).iconSet(SHINY) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Samarium, 1, Iron, 1, Arsenic, 1, Oxygen, 1) - .cableProperties(GTValues.V[GTValues.IV], 6, 0, true, 30) - .blastTemp(5200, GasTier.MID, GTValues.VA[GTValues.EV], 1500) + .cableProperties(V[IV], 6, 0, true, 30) + .blast(b -> b.temp(5200, GasTier.MID) + .blastStats(VA[EV], 1500) + .vacuumStats(VA[IV], 200)) .buildAndRegister(); IndiumTinBariumTitaniumCuprate = new Material.Builder(GTCEu.id("indium_tin_barium_titanium_cuprate")) @@ -1350,8 +1382,10 @@ public static void register() { .color(0x686760).secondaryColor(0x673300).iconSet(METALLIC) .flags(DECOMPOSITION_BY_ELECTROLYZING, GENERATE_FINE_WIRE) .components(Indium, 4, Tin, 2, Barium, 2, Titanium, 1, Copper, 7, Oxygen, 14) - .cableProperties(GTValues.V[GTValues.LuV], 8, 0, true, 5) - .blastTemp(6000, GasTier.HIGH, GTValues.VA[GTValues.IV], 1000) + .cableProperties(V[LuV], 8, 0, true, 5) + .blast(b -> b.temp(6000, GasTier.HIGH) + .blastStats(VA[IV], 1000) + .vacuumStats(VA[LuV])) .buildAndRegister(); UraniumRhodiumDinaquadide = new Material.Builder(GTCEu.id("uranium_rhodium_dinaquadide")) @@ -1360,8 +1394,10 @@ public static void register() { .color(0x232020).secondaryColor(0xff009c).iconSet(RADIOACTIVE) .flags(DECOMPOSITION_BY_CENTRIFUGING, GENERATE_FINE_WIRE) .components(Uranium238, 1, Rhodium, 1, Naquadah, 2) - .cableProperties(GTValues.V[GTValues.ZPM], 8, 0, true, 5) - .blastTemp(9000, GasTier.HIGH, GTValues.VA[GTValues.IV], 1500) + .cableProperties(V[ZPM], 8, 0, true, 5) + .blast(b -> b.temp(9000, GasTier.HIGH) + .blastStats(VA[IV], 1500) + .vacuumStats(VA[ZPM], 200)) .buildAndRegister() .setFormula("URhNq2", true); @@ -1372,8 +1408,10 @@ public static void register() { .color(0xc6b083).secondaryColor(0x45063d).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING, GENERATE_FINE_WIRE) .components(NaquadahEnriched, 4, Trinium, 3, Europium, 2, Duranium, 1) - .cableProperties(GTValues.V[GTValues.UV], 16, 0, true, 3) - .blastTemp(9900, GasTier.HIGH, GTValues.VA[GTValues.LuV], 1000) + .cableProperties(V[UV], 16, 0, true, 3) + .blast(b -> b.temp(9900, GasTier.HIGH) + .blastStats(VA[LuV], 1200) + .vacuumStats(VA[UV], 200)) .buildAndRegister(); RutheniumTriniumAmericiumNeutronate = new Material.Builder(GTCEu.id("ruthenium_trinium_americium_neutronate")) @@ -1382,8 +1420,10 @@ public static void register() { .color(0x897b76).secondaryColor(0x00c0ff).iconSet(RADIOACTIVE) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Ruthenium, 1, Trinium, 2, Americium, 1, Neutronium, 2, Oxygen, 8) - .cableProperties(GTValues.V[GTValues.UHV], 24, 0, true, 3) - .blastTemp(10800, GasTier.HIGHER) + .cableProperties(V[UHV], 24, 0, true, 3) + .blast(b -> b.temp(10800, GasTier.HIGHER) + .blastStats(VA[ZPM], 1000) + .vacuumStats(VA[UHV], 200)) .buildAndRegister(); InertMetalMixture = new Material.Builder(GTCEu.id("inert_metal_mixture")) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java index 55e2bb851d..9507979967 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java @@ -5,6 +5,7 @@ import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; +import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; import static com.gregtechceu.gtceu.common.data.GTMaterials.*; @@ -17,7 +18,8 @@ public static void register() { .color(0x999900).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE) .components(Tantalum, 1, Carbon, 1) - .blastTemp(4120, GasTier.MID, GTValues.VA[GTValues.EV], 1200) + .blast(b -> b.temp(4120, GasTier.MID) + .blastStats(VA[EV], 1200)) .buildAndRegister(); HSLASteel = new Material.Builder(GTCEu.id("hsla_steel")) @@ -25,7 +27,8 @@ public static void register() { .color(0x686868).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE, GENERATE_ROD, GENERATE_FRAME, GENERATE_SPRING) .components(Invar, 2, Vanadium, 1, Titanium, 1, Molybdenum, 1) - .blastTemp(1711, GasTier.LOW, GTValues.VA[GTValues.HV], 1000) + .blast(b -> b.temp(1711, GasTier.LOW) + .blastStats(VA[GTValues.HV], 1000)) .buildAndRegister(); MolybdenumDisilicide = new Material.Builder(GTCEu.id("molybdenum_disilicide")) @@ -33,7 +36,8 @@ public static void register() { .color(0x564A84).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_SPRING, GENERATE_RING, GENERATE_PLATE, GENERATE_LONG_ROD) .components(Molybdenum, 1, Silicon, 2) - .blastTemp(2300, GasTier.MID, GTValues.VA[GTValues.EV], 800) + .blast(b -> b.temp(2300, GasTier.MID) + .blastStats(VA[EV], 800)) .buildAndRegister(); Zeron100 = new Material.Builder(GTCEu.id("zeron_100")) @@ -41,7 +45,8 @@ public static void register() { .color(0x294972).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE) .components(Iron, 10, Nickel, 2, Tungsten, 2, Niobium, 1, Cobalt, 1) - .blastTemp(3693, GasTier.MID, GTValues.VA[GTValues.EV], 1000) + .blast(b -> b.temp(3693, GasTier.MID) + .blastStats(VA[EV], 1000)) .buildAndRegister(); WatertightSteel = new Material.Builder(GTCEu.id("watertight_steel")) @@ -49,7 +54,8 @@ public static void register() { .color(0x2B4B56).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE, GENERATE_ROD, GENERATE_FRAME) .components(Iron, 7, Aluminium, 4, Nickel, 2, Chromium, 1, Sulfur, 1) - .blastTemp(3850, GasTier.MID, GTValues.VA[GTValues.EV], 800) + .blast(b -> b.temp(3850, GasTier.MID) + .blastStats(VA[EV], 800)) .buildAndRegister(); IncoloyMA956 = new Material.Builder(GTCEu.id("incoloy_ma_956")) @@ -57,7 +63,8 @@ public static void register() { .color(0x2D9B66).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE, GENERATE_ROD, GENERATE_FRAME) .components(VanadiumSteel, 4, Manganese, 2, Aluminium, 5, Yttrium, 2) - .blastTemp(3652, GasTier.MID, GTValues.VA[GTValues.EV], 800) + .blast(b -> b.temp(3652, GasTier.MID) + .blastStats(VA[EV], 800)) .buildAndRegister(); MaragingSteel300 = new Material.Builder(GTCEu.id("maraging_steel_300")) @@ -65,7 +72,8 @@ public static void register() { .color(0x505B6E).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_ROD, GENERATE_FRAME) .components(Iron, 16, Titanium, 1, Aluminium, 1, Nickel, 4, Cobalt, 2) - .blastTemp(4000, GasTier.HIGH, GTValues.VA[GTValues.EV], 1000) + .blast(b -> b.temp(4000, GasTier.HIGH) + .blastStats(VA[EV], 1000)) .buildAndRegister(); HastelloyX = new Material.Builder(GTCEu.id("hastelloy_x")) @@ -73,7 +81,8 @@ public static void register() { .color(0x5784B8).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE, GENERATE_FRAME) .components(Nickel, 8, Iron, 3, Tungsten, 4, Molybdenum, 2, Chromium, 1, Niobium, 1) - .blastTemp(4200, GasTier.HIGH, GTValues.VA[GTValues.EV], 900) + .blast(b -> b.temp(4200, GasTier.HIGH) + .blastStats(VA[EV], 900)) .buildAndRegister(); Stellite100 = new Material.Builder(GTCEu.id("stellite_100")) @@ -81,7 +90,8 @@ public static void register() { .color(0xCFCFEE).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE) .components(Iron, 4, Chromium, 3, Tungsten, 2, Molybdenum, 1) - .blastTemp(3790, GasTier.HIGH, GTValues.VA[GTValues.EV], 1000) + .blast(b -> b.temp(3790, GasTier.HIGH) + .blastStats(VA[EV], 1000)) .buildAndRegister(); TitaniumCarbide = new Material.Builder(GTCEu.id("titanium_carbide")) @@ -89,7 +99,8 @@ public static void register() { .color(0x90092F).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE) .components(Titanium, 1, Carbon, 1) - .blastTemp(3430, GasTier.MID, GTValues.VA[GTValues.EV], 1000) + .blast(b -> b.temp(3430, GasTier.MID) + .blastStats(VA[EV], 1000)) .buildAndRegister(); TitaniumTungstenCarbide = new Material.Builder(GTCEu.id("titanium_tungsten_carbide")) @@ -97,7 +108,8 @@ public static void register() { .color(0x680B0B).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE) .components(TitaniumCarbide, 2, TungstenCarbide, 1) - .blastTemp(3800, GasTier.HIGH, GTValues.VA[GTValues.EV], 1000) + .blast(b -> b.temp(3800, GasTier.HIGH) + .blastStats(VA[EV], 1000)) .buildAndRegister(); HastelloyC276 = new Material.Builder(GTCEu.id("hastelloy_c_276")) @@ -105,7 +117,8 @@ public static void register() { .color(0xAB2F2F).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_PLATE, GENERATE_FRAME) .components(Nickel, 12, Molybdenum, 8, Chromium, 7, Tungsten, 1, Cobalt, 1, Copper, 1) - .blastTemp(3800, GasTier.HIGH, GTValues.VA[GTValues.EV], 1000) + .blast(b -> b.temp(3800, GasTier.HIGH) + .blastStats(VA[EV], 1000)) .buildAndRegister(); } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java index 25fd9ca98e..ae44385536 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java @@ -7,6 +7,7 @@ import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty; import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; import static com.gregtechceu.gtceu.common.data.GTMaterials.*; @@ -41,7 +42,8 @@ public static void register() { .components(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4) .toolStats(ToolProperty.Builder.of(7.0F, 6.0F, 2560, 3) .attackSpeed(0.1F).enchantability(21).build()) - .blastTemp(1300, GasTier.LOW, GTValues.VA[GTValues.HV], 1000) + .blast(b -> b.temp(1300, GasTier.LOW) + .blastStats(VA[HV], 1000)) .buildAndRegister(); BlueSteel = new Material.Builder(GTCEu.id("blue_steel")) @@ -51,7 +53,8 @@ public static void register() { .components(RoseGold, 1, Brass, 1, Steel, 2, BlackSteel, 4) .toolStats(ToolProperty.Builder.of(15.0F, 6.0F, 1024, 3) .attackSpeed(0.1F).enchantability(33).build()) - .blastTemp(1400, GasTier.LOW, GTValues.VA[GTValues.HV], 1000) + .blast(b -> b.temp(1400, GasTier.LOW) + .blastStats(VA[HV], 1000)) .buildAndRegister(); Basalt = new Material.Builder(GTCEu.id("basalt")) @@ -90,7 +93,9 @@ public static void register() { .components(TungstenSteel, 5, Chromium, 1, Molybdenum, 2, Vanadium, 1) .rotorStats(205, 140, 5.5f, 4000) .cableProperties(GTValues.V[6], 4, 2) - .blastTemp(4200, GasTier.MID, GTValues.VA[GTValues.EV], 1300) + .blast(b -> b.temp(4200, GasTier.MID) + .blastStats(VA[GTValues.EV], 1300) + .vacuumStats(VA[HV])) .buildAndRegister(); RedAlloy = new Material.Builder(GTCEu.id("red_alloy")) @@ -117,7 +122,9 @@ public static void register() { .toolStats(ToolProperty.Builder.of(5.0F, 10.0F, 3072, 4) .attackSpeed(0.3F).enchantability(33).build()) .rotorStats(280, 140, 8.0f, 5120) - .blastTemp(5000, GasTier.HIGH, GTValues.VA[GTValues.EV], 1400) + .blast(b -> b.temp(5000, GasTier.HIGH) + .blastStats(VA[GTValues.EV], 1400) + .vacuumStats(VA[HV])) .buildAndRegister(); HSSS = new Material.Builder(GTCEu.id("hsss")) @@ -127,7 +134,9 @@ public static void register() { GENERATE_ROUND, GENERATE_FOIL, GENERATE_GEAR) .components(HSSG, 6, Iridium, 2, Osmium, 1) .rotorStats(250, 180, 7.0f, 3000) - .blastTemp(5000, GasTier.HIGH, GTValues.VA[GTValues.EV], 1500) + .blast(b -> b.temp(5000, GasTier.HIGH) + .blastStats(VA[GTValues.EV], 1500) + .vacuumStats(VA[EV], 200)) .buildAndRegister(); IridiumMetalResidue = new Material.Builder(GTCEu.id("iridium_metal_residue")) @@ -196,7 +205,7 @@ public static void register() { .color(0x64B4FF).secondaryColor(0x3c7dba).iconSet(METALLIC) .flags(GENERATE_PLATE, GENERATE_BOLT_SCREW, DISABLE_DECOMPOSITION) .components(Electrotine, 4, Silver, 1) - .cableProperties(GTValues.V[GTValues.HV], 2, 1) + .cableProperties(GTValues.V[HV], 2, 1) .buildAndRegister(); RadAway = new Material.Builder(GTCEu.id("rad_away")) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java index e84809d2b4..f582a1cb8e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java @@ -1,7 +1,6 @@ package com.gregtechceu.gtceu.common.data.materials; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty.GasTier; import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; @@ -14,6 +13,7 @@ import net.minecraft.world.item.enchantment.Enchantments; +import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*; import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*; import static com.gregtechceu.gtceu.common.data.GTMaterials.*; @@ -116,8 +116,8 @@ public static void register() { .color(0x666666).secondaryColor(0x1a120e).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_GEAR, GENERATE_FRAME) .components(Nickel, 1, BlackBronze, 1, Steel, 3) - .cableProperties(GTValues.V[4], 3, 2) - .blastTemp(1200, GasTier.LOW) + .cableProperties(V[EV], 3, 2) + .blast(1200, GasTier.LOW) .buildAndRegister(); DamascusSteel = new Material.Builder(GTCEu.id("damascus_steel")) @@ -130,7 +130,7 @@ public static void register() { .attackSpeed(0.3F).enchantability(33) .enchantment(Enchantments.MOB_LOOTING, 3) .enchantment(Enchantments.BLOCK_FORTUNE, 3).build()) - .blastTemp(1500, GasTier.LOW) + .blast(1500, GasTier.LOW) .buildAndRegister(); TungstenSteel = new Material.Builder(GTCEu.id("tungsten_steel")) @@ -143,8 +143,10 @@ public static void register() { .enchantability(14).build()) .rotorStats(160, 120, 4.0f, 2560) .fluidPipeProperties(3587, 225, true) - .cableProperties(GTValues.V[5], 3, 2) - .blastTemp(3000, GasTier.MID, GTValues.VA[GTValues.EV], 1000) + .cableProperties(V[IV], 3, 2) + .blast(b -> b.temp(3000, GasTier.MID) + .blastStats(VA[EV], 1000) + .vacuumStats(VA[HV])) .buildAndRegister(); CobaltBrass = new Material.Builder(GTCEu.id("cobalt_brass")) @@ -305,7 +307,7 @@ public static void register() { .attackSpeed(-0.2F).enchantability(5).build()) .rotorStats(130, 115, 3.0f, 1920) .fluidPipeProperties(2073, 50, true, true, false, false) - .blastTemp(1453, GasTier.LOW) + .blast(1453, GasTier.LOW) .buildAndRegister(); Potin = new Material.Builder(GTCEu.id("potin")) @@ -342,8 +344,10 @@ public static void register() { .toolStats(ToolProperty.Builder.of(40.0F, 12.0F, 3072, 5) .attackSpeed(0.3F).enchantability(33).magnetic().build()) .rotorStats(190, 120, 5.0f, 5120) - .cableProperties(GTValues.V[8], 2, 4) - .blastTemp(7200, GasTier.HIGH, GTValues.VA[GTValues.LuV], 1000) + .cableProperties(V[UV], 2, 4) + .blast(b -> b.temp(7200, GasTier.HIGH) + .blastStats(VA[LuV], 1000) + .vacuumStats(VA[IV], 300)) .buildAndRegister(); SulfuricNickelSolution = new Material.Builder(GTCEu.id("sulfuric_nickel_solution")) @@ -490,7 +494,9 @@ public static void register() { .appendFlags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE, GENERATE_SMALL_GEAR) .components(Palladium, 3, Rhodium, 1) .rotorStats(130, 155, 3.0f, 1024) - .blastTemp(4500, GasTier.HIGH, GTValues.VA[GTValues.IV], 1200) + .blast(b -> b.temp(4500, GasTier.HIGH) + .blastStats(VA[IV], 1200) + .vacuumStats(VA[EV], 300)) .buildAndRegister(); Clay = new Material.Builder(GTCEu.id("clay")) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java index 7aaf0d2050..3cf0052345 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/MaterialRecipeHandler.java @@ -218,11 +218,15 @@ private static void processEBFRecipe(Material material, BlastProperty property, // Add Vacuum Freezer recipe if required. if (ingotHot.doGenerateItem(material)) { + int vacuumEUt = property.getVacuumEUtOverride() != -1 ? property.getVacuumEUtOverride() : VA[MV]; + int vacuumDuration = property.getVacuumDurationOverride() != -1 ? property.getVacuumDurationOverride() : + (int) material.getMass() * 3; if (blastTemp < 5000) { VACUUM_RECIPES.recipeBuilder("cool_hot_" + material.getName() + "_ingot") .inputItems(ingotHot, material) .outputItems(ingot, material) - .duration((int) material.getMass() * 3) + .duration(vacuumDuration) + .EUt(vacuumEUt) .save(provider); } else { VACUUM_RECIPES.recipeBuilder("cool_hot_" + material.getName() + "_ingot") @@ -230,7 +234,8 @@ private static void processEBFRecipe(Material material, BlastProperty property, .inputFluids(Helium.getFluid(FluidStorageKeys.LIQUID, 500)) .outputItems(ingot, material) .outputFluids(Helium.getFluid(250)) - .duration((int) material.getMass() * 3) + .duration(vacuumDuration) + .EUt(vacuumEUt) .save(provider); } } From 4c58612e313c3df3936f11adc4a7c8a4187df376 Mon Sep 17 00:00:00 2001 From: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Date: Sun, 10 Nov 2024 01:05:01 -0700 Subject: [PATCH 2/3] flip red and blue steel usage --- .../gtceu/common/data/GTItems.java | 4 +- .../data/materials/HigherDegreeMaterials.java | 8 ++-- .../data/materials/SecondDegreeMaterials.java | 2 +- .../gtceu/data/recipe/CraftingComponent.java | 2 +- .../data/recipe/misc/BatteryRecipes.java | 10 ++--- .../chemistry/ChemicalBathRecipes.java | 38 ++++++++++++++++++- .../serialized/chemistry/MixerRecipes.java | 8 ++-- 7 files changed, 54 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java index 4ef256d5a4..b8ada3ab0e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -693,7 +693,7 @@ public Component getItemName(ItemStack stack) { .register(); public static ItemEntry BATTERY_HULL_SMALL_VANADIUM = REGISTRATE.item("ev_battery_hull", Item::new) .lang("Small Vanadium Battery Hull").onRegister(compassNodeExist(GTCompassSections.MISC, "battery_hull")) - .onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.BlueSteel, GTValues.M * 2)))) + .onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.RedSteel, GTValues.M * 2)))) .register(); public static ItemEntry BATTERY_HULL_MEDIUM_VANADIUM = REGISTRATE.item("iv_battery_hull", Item::new) .lang("Medium Vanadium Battery Hull").onRegister(compassNodeExist(GTCompassSections.MISC, "battery_hull")) @@ -701,7 +701,7 @@ public Component getItemName(ItemStack stack) { .register(); public static ItemEntry BATTERY_HULL_LARGE_VANADIUM = REGISTRATE.item("luv_battery_hull", Item::new) .lang("Large Vanadium Battery Hull").onRegister(compassNodeExist(GTCompassSections.MISC, "battery_hull")) - .onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.RedSteel, GTValues.M * 18)))) + .onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.BlueSteel, GTValues.M * 18)))) .register(); public static ItemEntry BATTERY_HULL_MEDIUM_NAQUADRIA = REGISTRATE.item("zpm_battery_hull", Item::new) .lang("Medium Naquadria Battery Hull").onRegister(compassNodeExist(GTCompassSections.MISC, "battery_hull")) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java index ae44385536..bac1301218 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java @@ -39,10 +39,10 @@ public static void register() { .ingot(3).fluid() .color(0xa09191).secondaryColor(0x500404).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_GEAR, GENERATE_BOLT_SCREW, GENERATE_LONG_ROD) - .components(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4) + .components(RoseGold, 1, Brass, 1, Steel, 2, BlackSteel, 4) .toolStats(ToolProperty.Builder.of(7.0F, 6.0F, 2560, 3) .attackSpeed(0.1F).enchantability(21).build()) - .blast(b -> b.temp(1300, GasTier.LOW) + .blast(b -> b.temp(1813, GasTier.LOW) .blastStats(VA[HV], 1000)) .buildAndRegister(); @@ -50,10 +50,10 @@ public static void register() { .ingot(3).fluid() .color(0x779ac6).secondaryColor(0x191948).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FRAME, GENERATE_GEAR, GENERATE_BOLT_SCREW, GENERATE_LONG_ROD) - .components(RoseGold, 1, Brass, 1, Steel, 2, BlackSteel, 4) + .components(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4) .toolStats(ToolProperty.Builder.of(15.0F, 6.0F, 1024, 3) .attackSpeed(0.1F).enchantability(33).build()) - .blast(b -> b.temp(1400, GasTier.LOW) + .blast(b -> b.temp(1813, GasTier.LOW) .blastStats(VA[HV], 1000)) .buildAndRegister(); diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java index f582a1cb8e..378d370c77 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java @@ -117,7 +117,7 @@ public static void register() { .appendFlags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_GEAR, GENERATE_FRAME) .components(Nickel, 1, BlackBronze, 1, Steel, 3) .cableProperties(V[EV], 3, 2) - .blast(1200, GasTier.LOW) + .blast(1758, GasTier.LOW) .buildAndRegister(); DamascusSteel = new Material.Builder(GTCEu.id("damascus_steel")) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/CraftingComponent.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/CraftingComponent.java index 07cc025a52..a7ee478e39 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/CraftingComponent.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/CraftingComponent.java @@ -599,7 +599,7 @@ public static void initializeComponents() { { 0, new UnificationEntry(TagPrefix.toolHeadBuzzSaw, GTMaterials.Bronze) }, { 1, new UnificationEntry(TagPrefix.toolHeadBuzzSaw, GTMaterials.CobaltBrass) }, { 2, new UnificationEntry(TagPrefix.toolHeadBuzzSaw, GTMaterials.VanadiumSteel) }, - { 3, new UnificationEntry(TagPrefix.toolHeadBuzzSaw, GTMaterials.BlueSteel) }, + { 3, new UnificationEntry(TagPrefix.toolHeadBuzzSaw, GTMaterials.RedSteel) }, { 4, new UnificationEntry(TagPrefix.toolHeadBuzzSaw, GTMaterials.Ultimet) }, { 5, new UnificationEntry(TagPrefix.toolHeadBuzzSaw, GTMaterials.TungstenCarbide) }, { 6, new UnificationEntry(TagPrefix.toolHeadBuzzSaw, GTMaterials.HSSE) }, diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java index 0f2c7da8d3..5b97f2e25e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java @@ -87,7 +87,7 @@ private static void standardBatteries(Consumer provider) { // EV ASSEMBLER_RECIPES.recipeBuilder("battery_hull_ev") .inputItems(cableGtSingle, Aluminium, 2) - .inputItems(plate, BlueSteel, 2) + .inputItems(plate, RedSteel, 2) .inputFluids(Polytetrafluoroethylene.getFluid(L)) .outputItems(BATTERY_HULL_SMALL_VANADIUM) .duration(100).EUt(VA[HV]).save(provider); @@ -103,7 +103,7 @@ private static void standardBatteries(Consumer provider) { // LuV ASSEMBLER_RECIPES.recipeBuilder("battery_hull_luv") .inputItems(cableGtSingle, NiobiumTitanium, 2) - .inputItems(plate, RedSteel, 18) + .inputItems(plate, BlueSteel, 18) .inputFluids(Polybenzimidazole.getFluid(L)) .outputItems(BATTERY_HULL_LARGE_VANADIUM) .duration(300).EUt(VA[IV]).save(provider); @@ -281,7 +281,7 @@ private static void gemBatteries(Consumer provider) { AUTOCLAVE_RECIPES.recipeBuilder("energy_crystal_blue_steel") .inputItems(ENERGIUM_DUST, 9) - .inputFluids(BlueSteel.getFluid(L / 2)) + .inputFluids(RedSteel.getFluid(L / 2)) .outputItems(ENERGIUM_CRYSTAL) .duration(150).EUt(192).save(provider); @@ -307,13 +307,13 @@ private static void gemBatteries(Consumer provider) { AUTOCLAVE_RECIPES.recipeBuilder("lapotron_gem_blue_steel") .inputItems(dust, Lapotron, 15) - .inputFluids(BlueSteel.getFluid(L * 2)) + .inputFluids(RedSteel.getFluid(L * 2)) .outputItems(gem, Lapotron) .duration(300).EUt(256).save(provider); AUTOCLAVE_RECIPES.recipeBuilder("lapotron_gem_red_steel") .inputItems(dust, Lapotron, 15) - .inputFluids(RedSteel.getFluid(L / 2)) + .inputFluids(BlueSteel.getFluid(L / 2)) .outputItems(gem, Lapotron) .duration(150).EUt(192).save(provider); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemicalBathRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemicalBathRecipes.java index 5dd5fdd34a..0fd7a92938 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemicalBathRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemicalBathRecipes.java @@ -90,7 +90,7 @@ public static void init(Consumer provider) { .outputItems(ingot, Kanthal) .duration(250).EUt(VA[MV]).save(provider); - CHEMICAL_BATH_RECIPES.recipeBuilder("silion_cool_down") + CHEMICAL_BATH_RECIPES.recipeBuilder("silicon_cool_down") .inputItems(ingotHot, Silicon) .inputFluids(Water.getFluid(100)) .outputItems(ingot, Silicon) @@ -101,5 +101,41 @@ public static void init(Consumer provider) { .inputFluids(DistilledWater.getFluid(100)) .outputItems(ingot, Silicon) .duration(250).EUt(VA[MV]).save(provider); + + CHEMICAL_BATH_RECIPES.recipeBuilder("black_steel_cool_down") + .inputItems(ingotHot, BlackSteel) + .inputFluids(Water.getFluid(100)) + .outputItems(ingot, BlackSteel) + .duration(200).EUt(VA[MV]).save(provider); + + CHEMICAL_BATH_RECIPES.recipeBuilder("black_steel_cool_down_distilled_water") + .inputItems(ingotHot, BlackSteel) + .inputFluids(DistilledWater.getFluid(100)) + .outputItems(ingot, BlackSteel) + .duration(125).EUt(VA[MV]).save(provider); + + CHEMICAL_BATH_RECIPES.recipeBuilder("red_steel_cool_down") + .inputItems(ingotHot, RedSteel) + .inputFluids(Water.getFluid(100)) + .outputItems(ingot, RedSteel) + .duration(400).EUt(VA[MV]).save(provider); + + CHEMICAL_BATH_RECIPES.recipeBuilder("red_steel_cool_down_distilled_water") + .inputItems(ingotHot, RedSteel) + .inputFluids(DistilledWater.getFluid(100)) + .outputItems(ingot, RedSteel) + .duration(250).EUt(VA[MV]).save(provider); + + CHEMICAL_BATH_RECIPES.recipeBuilder("blue_steel_cool_down") + .inputItems(ingotHot, BlueSteel) + .inputFluids(Water.getFluid(100)) + .outputItems(ingot, BlueSteel) + .duration(400).EUt(VA[MV]).save(provider); + + CHEMICAL_BATH_RECIPES.recipeBuilder("blue_steel_cool_down_distilled_water") + .inputItems(ingotHot, BlueSteel) + .inputFluids(DistilledWater.getFluid(100)) + .outputItems(ingot, BlueSteel) + .duration(250).EUt(VA[MV]).save(provider); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java index 6ff6e3b735..c8cf542275 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java @@ -273,22 +273,22 @@ public static void init(Consumer provider) { .outputItems(dust, Gunpowder, 6) .save(provider); - MIXER_RECIPES.recipeBuilder("blue_steel").duration(800).EUt(VA[ULV]) + MIXER_RECIPES.recipeBuilder("red_steel").duration(800).EUt(VA[ULV]) .inputItems(dust, RoseGold) .inputItems(dust, Brass) .inputItems(dust, BlackSteel, 4) .inputItems(dust, Steel, 2) .circuitMeta(1) - .outputItems(dust, BlueSteel, 8) + .outputItems(dust, RedSteel, 8) .save(provider); - MIXER_RECIPES.recipeBuilder("red_steel").duration(800).EUt(VA[ULV]) + MIXER_RECIPES.recipeBuilder("blue_steel").duration(800).EUt(VA[ULV]) .inputItems(dust, SterlingSilver) .inputItems(dust, BismuthBronze) .inputItems(dust, BlackSteel, 4) .inputItems(dust, Steel, 2) .circuitMeta(1) - .outputItems(dust, RedSteel, 8) + .outputItems(dust, BlueSteel, 8) .save(provider); MIXER_RECIPES.recipeBuilder("cobalt_brass").duration(900).EUt(VA[ULV]) From 8003fb3e54438d10817249b5f7d14ac5252ebea2 Mon Sep 17 00:00:00 2001 From: Ghostipedia Date: Tue, 12 Nov 2024 01:17:55 -0500 Subject: [PATCH 3/3] Textures --- .../gtceu/textures/item/ev_battery_hull.png | Bin 2675 -> 353 bytes .../textures/item/ev_vanadium_battery/1.png | Bin 2675 -> 341 bytes .../textures/item/ev_vanadium_battery/2.png | Bin 2679 -> 345 bytes .../textures/item/ev_vanadium_battery/3.png | Bin 2691 -> 359 bytes .../textures/item/ev_vanadium_battery/4.png | Bin 2695 -> 358 bytes .../textures/item/ev_vanadium_battery/5.png | Bin 2712 -> 380 bytes .../textures/item/ev_vanadium_battery/6.png | Bin 2713 -> 380 bytes .../textures/item/ev_vanadium_battery/7.png | Bin 2692 -> 363 bytes .../textures/item/ev_vanadium_battery/8.png | Bin 2678 -> 358 bytes .../gtceu/textures/item/luv_battery_hull.png | Bin 834 -> 443 bytes .../textures/item/luv_vanadium_battery/1.png | Bin 2987 -> 445 bytes .../textures/item/luv_vanadium_battery/2.png | Bin 3008 -> 468 bytes .../textures/item/luv_vanadium_battery/3.png | Bin 3012 -> 464 bytes .../textures/item/luv_vanadium_battery/4.png | Bin 3018 -> 454 bytes .../textures/item/luv_vanadium_battery/5.png | Bin 3012 -> 477 bytes .../textures/item/luv_vanadium_battery/6.png | Bin 3016 -> 464 bytes .../textures/item/luv_vanadium_battery/7.png | Bin 3017 -> 459 bytes .../textures/item/luv_vanadium_battery/8.png | Bin 3009 -> 468 bytes 18 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/gtceu/textures/item/ev_battery_hull.png b/src/main/resources/assets/gtceu/textures/item/ev_battery_hull.png index 5ac554746db64476e007fa3be4a44dfd38c5248a..cce1a69d1a6d4e5bfe9b676fca7e2914bf55c16d 100644 GIT binary patch delta 310 zcmV-60m=UJ6yXApBa^WK6@LK}NklJ@g|F>) z1Oq(I=K$=x4i~~Gh1n36Qu2N{+=PeKo9LYD4Z9bPda$f2c5Tb&DK7S1$H(y~goyHE z56ZF(bzS#yX{~#=e=85T@ZhIGa5@qIj4^+{998h2n*1BT0cXUB^k}~twEzGB07*qo IM6N<$f_im~1ONa4 literal 2675 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 literal 2675 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 AU;qFB literal 2679 zcmcIm4R93Y8Qvp~#{5WxfKe%~8>s=iw?DV{v&)_2xC^;c4vugo0j-n0-ES{j?rx9W zP3}Tu2nUH0q@xl69n7>!TRQ~`11fEqfvC08kRa94;Eb(|NQO#@fKggh`tAK0rg7?Y z+MC(C+xL6lXP@W&`M%v4TvT6Paz_b*Amx6aw*mfE7+3L)@cXXI*LVamrDcyN==XTg zpsGl66d*{=@n@c5eMRo7u6ZAB^m-TG9p2ZqV)o-bO+Tzm|G46X`OcE0{cPv?JKCyk zThp;4uf2G2PITAHFYldpLx0g5LqiXoSRj5GslKQ9))`f2KO8*t`(t+&&kzFxyU!I3 z49(r=Yua>taOK$Xcb9ld|Gq(gXK?d^7q^6F-1Tbc7h^wb1Q!pV=xu5Xy!6Kn^~ZK> zx$TiDGgl0ZRE`!ucI-f3#r@MRtU8l^?ehohJzu=w_(-b--8-Hg-k$I^J^0MNC2vaa z?b~ou*W9UF@qesKJvFuG&(j_{_5I5ueShof2OVuI&e3xpC;KaxFlEb*J~?aguXeps zW2R0`Zv5oct6#lzuxu3|e@6|KO#jVj{g?ft@%PWvuBB#Ib-#D-@s5wv|HQA%N&RKy zCnIaV;~uMiczD*eKbXo6Z+fIge*Ws)hfI-evj&H|F9%vW-a7ZA3lIK@E;@S8p}x25 zgYJ*5jJdMo>Zy?{w@5pGdGx;F_t#(O6^Ui3q^Dh3+jsG5^%v#UrRrnB>D!Dl-JI|( z*AS$1s&Sc+=XO*f$W2{xs7Y@MEaU_wX68jD49uxm0(v8eb6zUJ3oC(+hCxJ*yRgyU z9>!2vbYYFw02xSlK#S~Kt%9Yi7lnk?D+N}>=G|Xj;!JT6AqI3FO~s;djZ3+(3@``( z8)gDSGcNi{7uFOAq8>#BC}U>KBwm-2+h`1epr}(7C9c7{AO`~PTv&^)CpdygCX?o* z#jL0if?`>gAZdc8ap-|-?Qxw?;c=}x3zCEJ0!>imgf1&_)PUu~N~`X|Adf7;SRxQ8 zpvSdb9$-d@6rUg{GfBi^2J4Ksrq{K>;2f6;y|qw#0uT*AQ(9F4)U|=QUY!rG_XmQ7 zXhTUvjwLc$VAcu`5ru+JqE(G%)|w3)=v%xy5r>yo0zT-ZW6-kQo;Lvjo()p;W|l#QkxG;5(5 znq+LWCFijWs2XfI1BxQeG=rg{z%774JnSAh#zz2=h(|EAP#?~tL=`olh`@zGkgx4< z2hDAuE=+5vpO5DJrp+>VX3mNiW*Xss0%Y>qXz5jS^&EvZgC)d%>KW+ofRDI8)9TmC?)ya=egLD`aGfSk5d@&_&;_3$w7A zBI!w91?~t;s0(u&dm(3nbFP+eQ8xwAI6HHPggsO=fQYtxhzBlQx`WjCrtH zIhw&qduATSYjG0Bc`?2Zoy0^foAn!a&SYwxwZcOT-od#1xoF%K&Q=hI1yaisXC7t;q09Jm(z?(4gj?+<=Ty5$|n&gBgaPxlWGS3R-j(MLb% zUWb(SzF87__xWo@R?@lls~J0Q{oZHiPgyF))(&jNo40+Sn|%9wUb$s`Z*S%H$@C2y zPMA)To$^TwWx5>GuiQS==PH%fmzjP&>FgwFZ_Sk2lg{0{yH9_5dQBNIZ@*>x?Q^J4 zE?r8Or{x<>mA7?HI)CEMMF*v-V90{J^SSba<|~&zy1QrQ!P462+@`TDb=zA8QDn0B z$-~ViTgPY9$$-yN-2BF*nj_Qq^m%%viq4MHCwD)zxwet%oU-W&$Gz*H-8kp1ZOQEk1`#E#w?U}ne*O`!wf7MJkw+(Q{%ZR^jk$2Dh=JdY+V$6?b diff --git a/src/main/resources/assets/gtceu/textures/item/ev_vanadium_battery/3.png b/src/main/resources/assets/gtceu/textures/item/ev_vanadium_battery/3.png index d58391c43343343d2e7fb49dab70adaa43fb8a8e..dc94dd85bc6db2eb69f9a6c36d72289427970272 100644 GIT binary patch delta 316 zcmV-C0mJ@-73TtwBa^WK6@LL4Nkl1pw6ox;Qt{w}uNv9GDjW#VgKt~ym z-9wSC&MO4O~ur zAcVje6E(}S6acOHq=7Leq-ly$3Z)cU>)y_z1~N&)>t=)Z9<4P1&VM<80EkfonIz$U zu^`Jb0KE5j?~hj;YN3VaQUb6n3Yw;ggPe0zRV4;j=)&*oH2`0`9S^G&08P_S*R>cl zu-1m(?Y0L4+|FhIeDC+T5QbZ@)&{LLb1AvLdmM$ki36N-@nBasDbH`8lkngTmPNtG z%M(9`x<=un8{~N&j4?5>uBxhf2kWNgqJad$&Kgcel%(5bi<}<-!rJ$w6D2z1?pwD|ffY z?k0Bu8So%cqwOe0zz$|C(vF=%l@gV<%s{BMAS6gZ8l17CgOZ_8ex*QB>9_aSFpX2E z)85Q?ci;QH@3YVQ_r3d6psBv1^zKpwK`I&>e9iE8vaw1g!0-Dm-QW?#l$O2TK%>`- z22@3oqX0pw554dl+fZCFH(sB5%V6=_!^009o+o}0u{=<6dzJa*iJ@J8Ja|t@mFPdP?NsrB z;aS@oLQfwWT6+1=(S_c!zpd4e4E<={E6)e3?t3fvi_1T61s8T7?hAGLU;WeC`h%OE zzw?nh?p<r-tG=-Kq*$i_rN=;0T(FMLP( zVEfvM-Ls~w$FDt}dTvVZpQnEB_;)Xj_W!ke5Ul82a*CSuBr#aI&|coM|JmsaUfcR+ zwUs=6TkH9^u7COJ&hlk|_yajyI_c1E~7ys~+IjhJS=AI9}eQ3q$^gr;cHL1Uh z{&aNZH)}6jzCSYk#=EBS-A_MKEx&aAyLh8)FZa(J`EbqIKGD{aN_xALRs9#PTRyL_l&Mbyrfo3NbZeqv zv4$XJQ;cOoezM7oAQQXgU`P-7=W~J*v+|-62G&$80ksjtJv)`)g{448!yqEZJ=nS5 z?Z!}9^kA)wpYSKVpj~cQu7X9&n}Wjfr2;ErvmdM|b*DIp5Cb}oree{!#-%)12AG5Y z4Y3VFGb;L04;JzVP_Lo_)NZv~3A`>PcTyMxK~c9VN?fyVUJeBAJXpJ~CpeoenM_)f zv{g|fHj-so8$sD93WplF))m+J6duoM8peY@y0O~qHT({)S>l^)n zg01O{5CP8AtLo zbXodWKyT7FPHs|#yv9e)2gksK5#)S|&|%PP^m#BSv5KRL2PxqsV|U`b zi;{4Pl^9AQD3YPrynSO_)A_gn^7b;cmuNw7xWX=662c5_7YGVxSrEouPMRbbf)*G7 z~lEc*o8a)_gB``Fz4McfeQq-6Sn=i*ZQaNc*j)6rwZ-j<)P?U>e zY07CQXp*+)G+KbF!GbfONWw}%u_$o!AP^6$M~?9kU`xa!7+S~==T)ML>Q_YI!RWDa zc!TCHP!Fax*Uv>8>%0z3*^K}2t;y}lOx%&K#;yH zb^RyROoyZJp?tK)3@8op?JCn$I# zwDa)@fcGtI^(?pXd}Bq5r|k{_rwJ!)ldwIEvv!HXMaB_!Fp|XD1y|nwf8pD>ssBIu z=5V^0FllFSK@tFNcM2lThZz=U9E6j0x>%Z&U|)@!w|aQ3W{McC&h+iS<%uG3!hsWZ zqaPRsRx(aFGyO2u7q`ur7h~(tZ5yv-vwCCZOeWV^DI8*O2kr86(byGcD~Q7ct8j9n z%`GAL&NQvjR~vLK5X^}^B|p269vB$75%|{cw=Uih_>8EPHz8XVH#e^v92qe`v+}XW zKI(ZKDeHTuGC zx2!#EI!3IPkI|&*QcS;k*Koh5Oj=WJ`c2WvBI)(&JLVj7Z`;=M@n;{eEVs?xL2taP zhCF}qV!9$NPcT*9xw`1g;d`2PO6EY2Mvh!je$aOH;-~lb-kUP7wy!BF-Lkl+uBxW@ zhjhuF3glYZw6@K^URNIL*m3Kl6HL#9kZ+9aeP1(6uWc+ndE!WU(fK*MI!?D(-kVzS z^4pkYcz>I;`Q7suuT}KSY;8Jmw7kf?Zr_Xwc3|Snwl)O0(yR7>nn^p27n8=iCf~2- Hwx$0GE8dgr diff --git a/src/main/resources/assets/gtceu/textures/item/ev_vanadium_battery/4.png b/src/main/resources/assets/gtceu/textures/item/ev_vanadium_battery/4.png index 28b08b33a97895656b6d9f2c92957295f769cb38..a00b5fbc3d48698c5c5781f9e529b6464e60e095 100644 GIT binary patch delta 315 zcmV-B0mS}?73KnvBa^WK6@LL3NklIgfI^>5D`<=Ze3+r4g%||<2RV!ij7ap<>&wa N002ovPDHLkV1k{jkC*@e literal 2695 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 literal 2713 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 IOV+pj9inQQoB#j- diff --git a/src/main/resources/assets/gtceu/textures/item/ev_vanadium_battery/8.png b/src/main/resources/assets/gtceu/textures/item/ev_vanadium_battery/8.png index d46c2da622b42ee4338b8c0b9aa0db0369e4f6c7..3672d714149be0c2bf6afed7b07db0f5c291173f 100644 GIT binary patch delta 315 zcmV-B0mT0H6y^euBa^WK6@LL3NklUp+wyc%9FglFvEFN+Iw#sJX1eF<3tb|6PC~vd$f7biovqcDjF*+MX1CvvR zwARsPS(XBzasH4_k(a-F+}HF4D9?WJqhm3U|tk# zH!D7W>KcSQ83-XzN-%}>dL8RB#&iN}>nH=D84kbBgX(<;|Iz5*_ze@#k*X!eQ(XW6 N002ovPDHLkV1faOjza(d literal 2678 zcmcIm4R93Y8QwFXAqk2SG{Lm48>j)?yWPFr`&n|paTk(P4vuibK|2h4yWd_G?rxXe zP3}T;i1|aYcKiuHIx*8CDo)c@#t4=&15rxB{7_n}iBnpqiW!O}W@s!eD*g8U4AXS# zblRKS+xy<{eV={azwh101FNcM7R)U`5M-vW##;;Tvy3bMX83#0mFpaWm|7%{C*bpV z(10q7QWPLa#o66YJ8SaXCGAT;dfe+>d2jeo`^E*2?FwxvZu#M?{mUy0682A;Kb_l9 zZrjrmJMq?w;|rrbZ@lr^oN0Y|Cx?a}IJZLhGEzP-|Ms$yPd*wv_N#%r^UDN(|4%OF z^$#sRR1|LAg`1Z#B(c-cEoddnyvzE-cyzS$bxBm8keb*QJ9T&7^prh-#;eAR?=)v8G)|?VQ zIMjAa`{LPq@V`Hre0uh-_vd_f7+E)kPEZPQ$Uy?%wcOD(9{<3c@e*WWSJIDnk9Ut6xw&_yKKk%yylYbcf z(dZ-Ja!-_hZ+QOocT7dcpV(9(y>RW<$4rsE^9P4JuK4SkPG9`NdwHOdyO>BP--@4 z2vRuPxJ=0NT_p%|OS=>d=^_70mX~8@PLRXEoQx?@8$l|UCKZm~3Uo9KB2wIijs4;{ zhDw49ThI6jzv2OPQq6W1tlhpU$Zy}uI|Xd%l9>gSNfsi+fX<=GSTwG&Nf(v^X5oKB zY{Af!ioVr_h5P~3BdY+V&9s@otCCU!g+UM$tyBe(t@W1h(0El+bV-h*1}qnr>vb0fd87%(6u&=* z9@jE)fDy4IImJSn2}>+yuuf@fdQ}57&TyGhTMITSz)}k|xnAW#RRf6YeXm!U*Ihu3StmUgPh2mu2LuKvQ{T6Ig=Ym<+f9fWNGM< z_;o;U&^LB&P=&mvM$QJuz=RQGy)s{K(DQj+7?hX=NnmXhpcs*-ao$FXILXj~lEb0tRt7p} zCmq&|#yX&Cu;2_Rk}y+{rNFZ*AP@(uM~ZO~U{T@`49(?-^~h0K^~(ZqVG!hNIXpo# z2dE3vYO9x{zABH6blPk-3%<_N>6^++-j-PC_7(rR*%}oD2l%OJd`H zQcZO@3O|+U%BhhwT~-@&;!NMJ1=}WxGQy~Yrdp8Y__Vit%1r^wh^48j=o?jG8dj4< zJ;ABK9f1LLVQ%A0L<89#L*X=%jf^*8YFt+mxyQKl#QB zqQl`JI9wpDG)_}?9uGTg49*CGlL3Gv9bs6cQ|7H29;>M$Mk`W%`!9K-NSv_Y1a0&K z!@w_2*i-#5*_TR-F)t?9VWnlNl1=MPnlq_fr=@U+!44rkdAx9lo`-v$J^LZPc{3 zbEfx*X6ZdEX}S{Aua*vVy9&kDBGb=rdZq9w=I(`ao5y>nH}#oKoG^$s|LLYcvupd? zGv4oc<-Sv|B`#HUj4XP&<-*t>kDmDKLcgcjH4vEFQ(7EYx}mL92%RjwKel_umYYp) z-nDF1>-2pGd*-cq-i?$OEi)ZfCd&5Ht;p{SkHpV!nRax)sWT*;be0aR43=(Ma=cHu q@Q&04bv<`DU%Gea=bNV&6(K!sjjx`jjkiVw@l~zz{&e}~mVW|hK95=e diff --git a/src/main/resources/assets/gtceu/textures/item/luv_battery_hull.png b/src/main/resources/assets/gtceu/textures/item/luv_battery_hull.png index 1d451a72c679e4318b1fd224c7d10fde4f4c9bd7..6675f5d3c18854c666eae3f1370472974c38bbf3 100644 GIT binary patch delta 418 zcmV;T0bTyW2D<~0BYyx1a7bBm000XU000XU0RWnu7ytkPZAnByR5*=|lf6m*M zY8s2h!a{Zs8zU-;&8AEji6FDV$|9B31Vo>}#)lBmfG9|MVHX6!M(oT;P%E1xg;`tC z#%gTbF`KMEw;PyqX1>e4jxmO;avTQ$rIfu;uh*TSd%p>kQh&ztJcJMcXsw4NBbhXi zpDP(DB|->Fs})MC6+F*FN||~wmj%zxubBMe5<&>#IHvpZ24H^zm?(;zOhE!K7YYFQ zzE2o7EIcSl^uvy(%#*55tIg72G64oKk8}WafXWPds$O98st3>Hq)$ M07*qoM6N<$f)sYO4Tx04UFuk-ba9Kp4iKwo3h|6x2aP zF+&xH7K(y6Y8|>1DYb%Cm*kqXLXw6{iWFDD#i8IJy7)EtALuH$DhPrih&cHN__auh z?=^)M(ZM?|?~mv5yxctp_)|JF?6x>ym=4b*6Vg&{Sqi=&gnwalq8B4Fv#r^5I)y*S z=N){a-o`{P{BLyURht364&o_haff(@IJNFrg13qLSy9dt9}-779gz4+=!(bBf(stM z3+CC(9NkUylnO1Zv@k1jgLs@cV(4YoIFGnVNHrH1s1DK^f{hH4NI-&uGS;BOL5!+N znf>mI*M0LSk$;EL*FpuH90e4~8zr?&T~(?Y=_*Yf6_NYTJZ)`q!s{MN0PRn%`!)&$ zcYs>eb-#{Ww{{E!9)Sz9=`T@E(;uW)n_A=m2yX&smrYIC1n2QA z*q)G<%Y}wv5WKg4Knu-(qBBtuYM}wbTbd@`Je+*c!d%z&8IvsAg*dDh3b0u!5p;cd z0pFkR^jwl8zK%W5JDD+v!>Gq@7uNE5GKnq|h^-X2ci`>SClk@aJdEo1dT`ckQjDeh zzAxJ0q6%=@(sY`DZ#x}$8IK_t44_!4P$hRaS1^2f5LIOn#%X_l1pz~UVXlp+jr(>R z)>T!^pw()D<2adBynt?8^YCuDO#37%|Gd$l_<1w}KMd)A5HmQe)ly-uIE2f3sYeLfFEB_ WyI?p7P(=U$002n`MNUMnLSTXjvub+) diff --git a/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/1.png b/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/1.png index 4b0fc092d80ae6f0eb9ff4fbfc0e38737a803103..c944a17eb9f916742485784066b195c7adc50e29 100644 GIT binary patch delta 420 zcmV;V0bBm77rg_JBYyx1a7bBm000XU000XU0RWnu7ytkPZ%IT!R5*=|lDkR+K@^6+ zH31QvLM&uQvCx2u;)TS{ZXszV!OFr1n9e7#@gYPoAlTRoyN!a4SO^*rFCalN5zGZ` zBsOBP7CKAZ-6Wps%;ozy^D`DbN^9+#zE~_;;q%Bw7`AO2DSssZrBW#(>FWfirW{`> zg_IH}SHQ^?ux%Tql;3_Y*$Ga~&LO3wUawPav;cxh0N?XGD^_6O`Ai0YbUKae9t3b$ zlIRBCJ-#tC@P(9;a=DBU0w-5sVJX9FvxX32tFIFbaD92n&i+X-Nv&3++Gqt&0!YA5 z+KIu@2z+*Y$ba+WJ%Zn38DLFqqqWW+XOqI}D`${Q3lfx0%)cE8y7gtY=jSL`! zKnQ{Bx_F*vC4*pY-(%sG>?!~+l?vOt6#$;fSA2X_Eol1(YuTBuu&H(!et)7;%GX*0 zu)e>Fo O00008cy+0NK1c)pQDJwb^)m^o9u2j$?lR++N3`jn-cm%%e9Vdb~o*oBpZ`$ zla`;hNS&6SmY3bu9>>7a!wDq;uDQbkWeK-yzKrGkv-bq+Xz!IRP6w@H&Lb7gd# zGc%jyd-r*t?|t6yeZTK(w&i6{QO;5-6pAU99CJSSjhCNE4}&r(-W%tBK>Si2>Rh>RcA5pF!ifcNsX-DU#KL?)9uSiGeWZQPi(CeKj0?AiX-vf{Ptu9n>_8QPtYy0>j^OZ=wB8Ouv|O-J?y zwv+q5d-z&(V!QTq>7G0JjoKf-QOA6{`P%&M&u3*!h%VU>laP{fVaep!D~BI_`9jXw zch7&A_V<7D-mY&hD(0Rv{PoOBfps_2elV6UO2e)%Xq?}1>w~Ja=NitaYzL2CzuPlB zxU_yqZ!PMaa6Z=>%Na#kAZcW?8#Z- zQz)XR%1@M{ZO=@FV$w39utX}c=F+U_QZbxp=T!lh2cQ)SLt4PYu&a0pvh(GF+X&xy z?>GzzoDnY8T2ZUV#8(J8wO+oUHm{JaUByxyoVIw1(h#5lgNv6KDByCseRRMG2Z?F$ zUpA{@C=nJC+Gn(96@<1L`n2jh@J@azMvwn zgF?b#NP^?P3B3<5zqtM#d_ zX$d{TkhlZEDTfw!pg5+*sj$Dr?UNWc%ZL31;7_0wO5qgn#|Z`@bhs9=b6OojY6y&Q zFgjpB!~RRX0;p5Q`P<{*SUOAex)`v&f{Q8V)gE^_49Uwtr`s$>7*~PGfGTAN5?Z~EA}I zQ3$FED)083(;6X&vJ~!go$tsjbb#emx*u+ zaHXQa5(bN$;Hdc}Xt2W}@G*ocCr9u}qPHeu9_`x#{+ThRQKM6Uf-OihY)CB|l*z%P zW?`Hv`gK(pqVq*R1NINy1GHs> ztuk1|P;#(C|7V?W3_*1WO2}G3Cuj%+)d$P?chZ7u2|G&YIYh$~EJAQBiclEnNKQwh zJjRj^R{NlJ`eiK|1jUeXT5_xwgIYfO#`cs!Jzo2TaAVHQVBLnS;6Mf=;1@pQO%;|;X(k=)s(^vMlJBd3MUTP#?o1r|kA|*juTN8D;{l@LG?emVc7(ZLI8*4hT|D^km zgWuQS&8n$QuTOi&KlIOm1yj%V88-jpZmnm~nZNm!d&krlzwT6eE}oOx>cvHm1rl46 zX2x`sblK+n^~LC#+V~E5z`%f0GH2aAe6?HH(RxJvFW>aBN|-MZ<1 zH}~GWl#$-E9Y53%6VhV7tBco=uMOlg-Q?y@#qm|=m5$U@)L}5dqjFKpX^tGtTy zJkP`TKUjF$B((_s)&9#`?gl9(VHhHWpiru?|02)ju#XU;wlWU}IBhgIdjHub>G%8e zE+YFRfE3)doqt;0NWfn|edMhDn_-mY<@0T%lzjVgLhsKHn<}NXj+Iher`Hp((dMJa zd~bDl_#lT60wDyx?-K-pleWeDyqXEWDjooE-tF@CxC=lhY%v=39GLhAuZw#NVWUYH z{{KX!RIIfIU_9QUT2)KIw!|9r002ovPDHLkV1l_#%0K`B literal 3008 zcmcIm4Nw&48D6ju1q2<%0o!Re>m&hm@4o%HyWRCp#N+QKq9;%>Av5jX{%{+(+soYo z2a5a&HJTBUHW~bj=)_oKL=%!3Lun175?eJ$Od5ZpRAthRjxjY>>x|NG5AK3fGR2nFWQYIXDwV``H^$`g7q7i=VxzlK7KZCKiARwO`dzG z{f$FRTvyCv^>g+m8cz3chvJ%slh*Is_}g6@e;52!p?hXV@NZu)I=%W!-{ran=X~Oe zn<-PY{&xzeIZlctM+fIeugBIc%1)NIcE7tV`@;R6Jr|0rUwFM`^p|a~b*Ijl@nTtr z!XCYTv}o(56E!=SBO5m4u32V%ens=qw&zOf)?R(?)~eynGv{yLGH=t2jV*IlmUblL z+k>w#Z~h~8BtCVA>2&F~JB2N#``3&KU%oW*MAs*Cmqf>}T9+_0BjfYM(-N<|_tQ5% z&p-3Q+2fgi|F`7dd+j_jZ@~KJ!JWaiw=(b9N*87lH=k;GqVx8#%FNcrL4)%^&&|8< zT>or&!!YHO=m#Tn!2?I_`+JXVYPjSXzS6UI@9Gan62UDo5kH?KiiYEc#HgMZ&YGpNS+s|uEKg6c8wqUw?iL5~lj5yYAq^zlNuq@gaUO!3;V zul{ftLlx16m6!@ZfzK|vmHb-2R8+gHSg0)*SP{!yG(FB5F11p#VK9!d z06o5ff(W}eFrEjP5o3_|83_Y0dOUj6A#^~?se;bqu}q2%6xaA9W1$pKEB%6$Qzdz| zd0}@^i1_*{{S_esys)5GlJGtmnj}!$OC3Lg7UdlO%1qJUj+I{ zP?6UmA>lAIMgBISkKpw;k3ivElQV~tqjSOxa@nd-sf%!A+c0P`h>FOWNr^Pc0*wo1 zLdFRbZNYhllyQ=kO{5G+!bGxRe}^}q@m@g+`zz3&78u4w2^1~>$%WGlZ^jvkCUKT# zSTijUqKPHK{>%LetW&+GhOz)au~1})W~Jm0z%taS2wZ0ux2w3NibAjFb-;mndkKqhjWKA!rA>2uSwbP zfzttk#eoS2R51ZK%FLO-e86x3>VZo&237sVs#;;g^gvNPzOi=&uxCYHekrRACe(&y>3bsT4EGoc4>UcOXj+Nl71ioMdU)Py zx1=xYcjwvoJ+uV)Dk-8waP!_W3GTPB)yHC+OdBhbJVl!YoB|dGmtC|AHit~&qRH$s zn`D`VEfn_ue`vGd1gs&w062mT*U*ooP3B#IF^MAXA{iQ|fk5I6OS3p@=4pvyfr|$G zcWBFlTV<$-(X>#9{?|H@1P;tNpmi;<6DS4;mQWf0NLpa@7Rtl}I3*$BG)0(kmb930 z+GOEnz>6|Nn18Sq3I_!KZA((&mYk@?YShoZi9KaCPS$>7xCv)wsBXus@IZzm=odcY z^-<)WAbDZ2`r$3$#HssB;1zJ4BRi{@SuThuGBh;w(7rjLTRwHf+4fhYU3NGevFYjQ zVD!eh?vz%Lr6hEo>c4$?VBoR0&z<`s>7}gJsAI#1=%}}28|ZSSyx+6--W4jP`QGv4 z$J1JYU11uOm7kvB2WeAG`T0LqPVfIpRr~(g+uI8+`mTSrKX>+&c2o0*cc`+Id%Jh{ zwIa#Qrl#Iqs{6>T`y+Iuyl5Bdk! zd~-Ivbzu1pviERxTh`^%i8o%E^_wcv+8ao{nIX5!PIrC%=+ECu-kBPEt>Mxk?H*|E zcq_x2U{)`kJShETPVSuc=ynA(be%hYGGXaqgsXQv9p6!R_r$E$veD7zPo`KCnnG<(PVDzvc;p#sYC~#gFs3$U!L2*{u>R`QBSToh*<8{ z?J_kZ8<2OO?&T+1%LJ7=>s>eNU1d SO^5U=og-&icGr?$H~j}qX9`CE diff --git a/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/3.png b/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/3.png index 64f2de9dbfb19cef8798d8df60c1d846518ca2d2..d76ce44d85134c4ad3b1f8ec91d67e7a16d3ce80 100644 GIT binary patch delta 439 zcmV;o0Z9JD7tjNcBYyx1a7bBm000XU000XU0RWnu7ytkPf=NU{R5*=|lQByiK^TUg z(QAS%78YR#5keFcCCyr-usiYKGApU9t#(2D2R8nQAaOwq1bbmu1;IuvgxrL~Sf#l; z#9P5i^a`u7xgGDkUG?o|_?~ax_v0I3jG;(E2!bH61yK}i$iPl0(DfnHeJoDnf_rtfQ83>AL6U}Cu)og}s z9!U^uc?in*$ICC83I}aV+DgiHAt|{lI_gf?wm;g@X?SKyr)}BU__yhvz*hy;qusCX zH^leNeW)q*tt8d(0eXLY%Xo6fTbq9K+NR(7e^pw&D9iuPFIEn({ltBFU9&A4|M*7Q z9C`4a()retT*c9m?AQ+E`IVLwVe7yjwplLTJ+S*?x$oKEw@p9U^~yl{!i5_hJtB4V z+R?JDo8NEfH5}>e%zv)f_{G^nJ+kB0vAUf04I?UB|A8BK-nn+J zqhQ(uNmf`TqABd==Nm?gy@%N*+z7`aIoloap*1$jf|p;m^Gg zv|zFF#6VlNr9sfVC&cnfxw2?A%}P!c!%22t<#)P)HUt@S{BDM=;bqv)J4BZW`TWlZ z5m@9*NQJftD{`CpYO%1Rpc5IQdwk!&60$}nui23!!BH?l1Zj)J)+r>c783#_Do*5R9l;Y?fhAE^hYKjK zCG{v{AOw`41T7(81g<5hh`rV2l^GYyN9;vlueBRU9mm>H#%|Z6BxUDNJ7wolLXY7Z zUW;*h${w*V@ra;KncDB}2glO+lE=w_{EAM-!K>Xa2LdZ;pmS|j6GEu4@X}Vx$O2F` zA*)4Koj)us7oB{W%qRiFb$Zf(ky;AF^%@NhNCsin@E$KHLj?-QR2l+-qxqrDQmy1E zk~rRkXlBa65Dm{z6XGo`SOr`2%sQOX=}-WIz)Hesz#T-MQA!-_9gGNV_VA3%TfhUh z!*B}4v?!)2$1z%?qqSHzW}q>^2c#;bDtXE!sn&!jj>3w6p?5`~XE{b@B0z+O#&DX@ zD?kKAlTkl6c*NsaIghwh7GZ0 zgEToLEEZ>}qHkA)Ay}^@$Uery=Q=<@O-QaX6JcAV$6#=vDY1kzDnu72`MjBteSOuu zlGbmIv-(?b@iO&%lnGnSxEwr~x1iNSzRkvs;s{1V>R42R=?$o0C+#Rj3Ixh&b#|Rr z5Gay0MC|_`-1I08YDg&n8V9Kl)zJ6EjRaGJVGIV8!wn2dl9Yhj37kYpf#NVi$LTOF z`3>9(z^DusF`N>_8pvWnglco!&E54Z*Ncli#2D`1D!l3Q*lVL2EY9UZ-Iel=l0ICaF<^&!+PSgqE$ z%*;$|`uh2Sw0104OxSU1@Ydy_p@;UKKmT#^3%Ttv$HrB$F?-{h$r`a{(7AqULX*}y zb^Q48jCRZ{8k)s5ADm`JNbTI33xBCg9Q<684u2U41h6spwR3OhFPYP=Z9Q~b<4Bv@ zwd-&@l+vng3A`p%AGvvVQnPQFTfL(uZo|cjKI~DKbM8QHanrx9r;n|`p!%4McN?bf z4URnb)!EGUp^{!AaM0J4dwDqN`b&#{T~8PT-t-$;LbqV6ZfctT>68c6W9rGF-RVC#q=LSl z+haK#J2rM_sIBAFW{_uqOlU^YX Ze4whD!R%fx|4HRqXU!|N^sRcj<=;CG4*dWC diff --git a/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/4.png b/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/4.png index d6ad3dd3c885f5bdf00a11bf82f3bb4b25fe1512..497eb6a681fc4d823e7d0d746be3bef4325d931e 100644 GIT binary patch delta 429 zcmV;e0aE_T7sdmSBYyx1a7bBm000XU000XU0RWnu7ytkPcu7P-R5*=|lFusyVH}5_ zVK36;AZgxELXpj7930$M6z|B%*=gVMFDN~6B7oP>kZ zxR}@On%(uD-e1r2em~z{D~@BD4W*R1;QPK+e{MAsD5YY@aeoj(0HC%0BWY^{kBrX5 zQc8pn7=C`D=Xr5Hp9kRcbCB1k zh|}wnmawTH2m;IZeE>Q;i~oiJYBr>lrjoUd{g&__K_(*cJkP9?Zl}Sif<%(co529z XyMDvi3*?N800000NkvXXu0mjfln~0k literal 3018 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 aOM@nUK3t#B)HSAj)>-q5E&WSZt@}6EuL~gn diff --git a/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/6.png b/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/6.png index 4870158b0e9828ed4d3d964a2d80d7e183cbdabf..c4d0a6c56ca1cecc585c98fd41f6387348b6806d 100644 GIT binary patch delta 439 zcmV;o0Z9JH7tjNcBYyx1a7bBm000XU000XU0RWnu7ytkPf=NU{R5*=|lD%u&Kp2Og zE7>x1YCs1a3N7RdEecJCY%Vdh=a3A^nhr$={TI6Qk0_-TlopEjg3c`jyp#+Xe2|z- zS!@$x8#)!+v$8~Q{h>H{Cmp)y(eL*nm1P<8##$>Ek|a^n?|;=ifweXZf&i^G0N(o< z$%EVAXUi`$V+>krO646&}#f978r)%qIt?Bi8bov7TNdjcfIaMgg;c#OE zfGCPc)2hJJl8GHm!vI_B52b%z2jIuI&v@_u@1O{7HX3~TUY8`@ZkJAfAeE$owYCsG zKKd!=cW+8WQGdjr-&LvNy+_4yoEc*{KL0lXAMU>;442s4e9qSPE&zMwRk@RW+Y34GOV^YKd?fY!w+!(m6k*ne=ay&~|V#{u=)8NW_y0_QUh z11JDvOcuv60He_p{$BR(1xo_woJx`efW^huy}Nu^SebH42& hxKNNw^5=Olz%>hgS0a5TO9rUj4x>iNGO?EfCn`BKuASme>h=4%FPTA}aSxvHGvp~R~ zQz{PPZ}oJne^kcmQLZ?idgCb;t@zW^^9Ma^rKeQNcjnZf|BWxMgZ15YaKEsB9?^ho^V>FtGYB4R%VM|Mc z9I_;cZeF8FxUlgZOU4Pu=<2MT_u;sdsWqi%9NT|YQ)`?zy4Er7O4Nt+=H_o^xZ2k3 zI%JG$8a(tjFEx(To9W18-%!MokHP@i6K9g4@2Ei~Vom^i2gUY2By6SnUE!!~Ps_u)P5x#cB0s-MkXyJ`QJ*w_`tn?+OW zz1EzqYd)!{Gk#oKJAGlMdETtITi4FbU$nS$?t_AkcSj{|-!gtp?8@qw@(MS{A=?A% zjl1s*=^8$!jyzwu?c3~XvinP2^zBt$6PhlMO&v76U|IC2DO0XZiyV3Dz%O=P%eeHX zE2onG{x4o``0~1D{Au%_FYXL1evtf6OX1XH?Ea+c3GY2RS(?0j=|!z$@8SE8_uadi zwWLGuwJ%7YCj*DSf=>9}>cp<%(Xu94^iZpx-xwv;)kNiofJmkj*Ur-kn= z_-kEZ=P&ofOxq%CY>pT?a_KvR_`L@!%Jc7i{bASd69$sOffXD6i(*X+{B&NZC z)vSY|AVisOfeY*oC{2=ih|m&R6iE+=WjG8-Ajm9p0-bH0-bVsP7TBdIK3b$Q?xtiwzulMcmoIF0}W;;-;3OaSrv$M=%-(O7vuD~mowl)R8i%Q&S{#R7vkdIR+M z?DjCb*WZ^1kP%&g@#!!vs`Gf%sDo&~l3oU!`(hao?a!_7@w#l@FO|wHpI*j$mGL2W zjt%?zN@aIY1;^@mH}3&3KbQ>*Pc_44cZAWZ>SEF33wnSIhfzM4q)2|3d-?dI6#I438O1 zDC#80kbjmef;wf~KRynQrKd}>hXLy=dYEEf=kpfBkh%N^&nUbVJYYH$ zGa)F6p!!@4rS%j|qKT-HMu8r%RJ~A1&Xpv$1y%!v)cAVe*+I{8jKYM7a6OG;G;RnI zp)^V*qQDXYOPnZF{4Z#*!y)i7_f}4Z=vO4UB5dyK+Z?{6pQ+F27NKAZ(hS?HmJQ0} z;6AfBKo$M4D(t28OM+6)$b3pMNT>x)QTIg15$Z7r9B67Tp@e+V%Sq+_$)S16UA(%i z-=AmQ576Rg%J{Gn*2Q>>d9dGtR_~2%AZ;cNXY>TcB6`$dLY|vu!y0AV2A$KI^h_CQV2?@T0kd|pf?P`GX9CQphm%HWJwIcc$QUnG7fRFD2uS9 z(S+$K%0RKykJh3`Pz)KMCHreJ>(sNae@~fp1GQf-uHTs%tlM5IIFP{z_=V1RbrilQ z@Lo`?GPng~O+j+N6>yc!nv!eGTD>0ob?U76<;fq~b@sveqRW+#9(j3!EV?cY>4~X2 z^v%#JczgHIwmjB;H?}Q%*f`pnTEy2>?j3h2_K!cialfbJ>o4w-kE&0YZclw&v8bi9 z13&-#+ODTZKAu=#T@qi}^ywY*)-JL>u@=6Los9IgxA|OepWPUB z@W`9pZfbJ;YI%K6`}}!F&9%9i#}0i}Vl44Zf4}m=?_wv-n!Pb))xxB#>eS=d+O*L# zBW~PC-Z`ykg|{~5K->!7(LJYI&TxSz*YB*W7r%R@_2t*HCr9YCXQOYv`SL%;6y@Z_ z-x~Zh|7e^xdPw3GsZoDCcG5Im_lsRsXTPQN(W^)Q-j;b;+_AHz=uF-+oB0((*=yeR kYuAZ~$GWfXIc~MKuy374&+gBAre5uA>6zB1)S{|?10S{(`2YX_ diff --git a/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/7.png b/src/main/resources/assets/gtceu/textures/item/luv_vanadium_battery/7.png index bcc95beda9e2c6c50e37999815760800b3c4679c..976c4f8d61bf426e43c5326b16c64cfd77b13d9d 100644 GIT binary patch delta 434 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 literal 3009 zcmcIm32+nF8J3+wz#KLO!VzXzmbe%@t39+@No&i-NInFy5w@{SoHSnTKG_SFR_v}V z*#ws(PHY^GKmcRo7)S!8Oq?Nv8450867IGHNC>1HF^3Bb9iSzFh7P!Ibp@vGG?QsG zvy$Gw-~YY;```b+_nMsfIYZ*c#_4prA&y*o0sKwSo&o*g_xQWLoK6?hAlhtBhs}mK zWyvj80i7=C^EGc-b3b#AXqZv>J~}cpwXyn$v;FzTrRF&!mO3YV8TSF(()Ddl<*AkL z?Ka1C_Ivs_&uky6KfZ_E9k;kUzHxi=>dnn>2VNk+m;`#?J$43bZPdh`Dt@zE;+E`rIH2pS6;eP+P!{QN_*?X`CnWV(iq|L8Y$^9+sSZcFMq^mp^{?y|cL| zfB)s7jO*V6dE3>$=q4UcJ9c7Ip#DzAKdoh{8RV@=4T&4?9<0uIebEWM^TR#2?(ewy z)r^JR1|Ogw_KYPSI_h?9JGgw|MNjwTJ=?a;-`_KoxFaO5z3j+*acX*eSI0>cSoElD z+ji1u$Uegsbbm*eDV!?;IYW*cQ&p+zA^5^(d@s>_`<(4BW_Q7=-=*yk0 z=yZdIYfp@>b;D?#Zoo{js8lV@dx7O8kDe1G7tjYhK8V)o(lP=*j-Lxu#04ruuNA$$ z_Y)Km1uI%&%p>xAHc%<%*2$o-F29Jco6B1SG$VaTTv~vI3?86zNWfF&RoH+P4HC2P zzh=f!BnVOGTG7%xCt{OifY5qcPheRAv4%n+34)}_f}1U{XNO7P$ck2~s*lBSzu&L- z8}yP~fs+=C1t%z+qA-ZSlv=OK1u(BNF+>uku>*ydMV~54UPPniTvD}aMPVGF06o6E zyePX@3FiT31P^dNoYWJz$D>6ZL@R1m4Rj92(kEIes`UZ904P$m%!8~N;8iC^+yy@B z>#LTlf+_?a2UWlWVG5j$j82u~$a6-~n(7MC;|qGg3`bGEN=cQJO34?6J`q&(bx=qo z3{`ahkkBXa+M6e!aIU_YBgxS?VFp>d#8+z~9Cj-TEqXx|ScU?W(aqBs&ya46G}0!F zGgEGivbc?uo1jP|Wr_GZyo$MU{e_sfZ)X#*h|#FB$wiV>Wkt0>5iP#ZyFA#l0;h5jBFexLBuklsL*-kYyTHC*x?BLq=hOcS5#C-ikfcq_M^-yemX|o6vXP_A#GY}>-=62C8%tE^_MV7XTzi8%YLpnJKsrKxsTratz>MWA&*m2X2+Y zB1V#e9r_>ZM3ET5U<9pcAuO<@F~Srq1@D_kix^Yaq0y^xOMdlgHR*|`}+=#;+UvD|}wr`qkiEVOr3twn!zE-Z3jcc5~ z_ZM00E_!;|veTRMhYjhxSUzq*u|09!gi8ruo$y`gop*oUz4hO}vEufE+k3z1y*S^W z{vfAy%k2EzHPf={>Nm%fXU$CdWz(J6XR411hrUicxFj=W^--d0$NHXrhSW*Piw}*} z{d)P~gKZsk?R=QORUus64V!9q zI+T-1ZD->Rjm5>qXMWr3{-~+)l4KAlYYG+_`%e{@KS9PDiHSqAd z!>J#?{Ji`o9<%9pb9POu-`{fYO!@v%D+f(l%~7rQzdgTi)4A*=pYCXBiRpgvgTJ=* z>&|~RwrgMYkvr9Y$XeEHJ%0ah|M+}b;_~r(UZ$|-?V}7wdhW))^NRDivuj4ZZr<OO%@8QRqrgYDnGkUBekYY(55qRU#;t7)n4xcrveRz|Yn&aT{ huHFaFwKQIT`ud@RBi5^*Bx-j$M^?VQb87kGe*