diff --git a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java index eae825e44d3..8646df2403f 100644 --- a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java @@ -38,20 +38,20 @@ public static void register() { .ingot(3).fluid() .color(0x8C6464).iconSet(METALLIC) .flags(EXT_METAL, GENERATE_GEAR) - .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).blastStats(VA[HV], 1000)) + .blast(b -> b.temp(1813, GasTier.LOW).blastStats(VA[HV], 1000)) .build(); BlueSteel = new Material.Builder(2511, gregtechId("blue_steel")) .ingot(3).fluid() .color(0x64648C).iconSet(METALLIC) .flags(EXT_METAL, GENERATE_FRAME, GENERATE_GEAR) - .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).blastStats(VA[HV], 1000)) + .blast(b -> b.temp(1813, GasTier.LOW).blastStats(VA[HV], 1000)) .build(); Basalt = new Material.Builder(2512, gregtechId("basalt")) diff --git a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java index aff4da9ac1f..218e3d043d4 100644 --- a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java @@ -98,7 +98,7 @@ public static void register() { .flags(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) .build(); DamascusSteel = new Material.Builder(2012, gregtechId("damascus_steel")) diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index cdf8d42deda..3cf94c8a5b5 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -997,11 +997,11 @@ public void registerSubItems() { BATTERY_HULL_HV = addItem(719, "battery.hull.hv") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, M * 9))); // plate * 9 BATTERY_HULL_SMALL_VANADIUM = addItem(720, "battery.hull.ev") - .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BlueSteel, M * 2))); + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.RedSteel, M * 2))); BATTERY_HULL_MEDIUM_VANADIUM = addItem(721, "battery.hull.iv") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.RoseGold, M * 6))); BATTERY_HULL_LARGE_VANADIUM = addItem(722, "battery.hull.luv") - .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.RedSteel, M * 18))); + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BlueSteel, M * 18))); BATTERY_HULL_MEDIUM_NAQUADRIA = addItem(723, "battery.hull.zpm") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Europium, M * 6))); BATTERY_HULL_LARGE_NAQUADRIA = addItem(724, "battery.hull.uv") diff --git a/src/main/java/gregtech/loaders/recipe/BatteryRecipes.java b/src/main/java/gregtech/loaders/recipe/BatteryRecipes.java index c23ec372712..41f43499d7f 100644 --- a/src/main/java/gregtech/loaders/recipe/BatteryRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/BatteryRecipes.java @@ -86,7 +86,7 @@ private static void standardBatteries() { // EV ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(VA[HV]) .input(cableGtSingle, Aluminium, 2) - .input(plate, BlueSteel, 2) + .input(plate, RedSteel, 2) .fluidInputs(Polytetrafluoroethylene.getFluid(144)) .output(BATTERY_HULL_SMALL_VANADIUM) .buildAndRegister(); @@ -102,7 +102,7 @@ private static void standardBatteries() { // LuV ASSEMBLER_RECIPES.recipeBuilder().duration(300).EUt(VA[IV]) .input(cableGtSingle, NiobiumTitanium, 2) - .input(plate, RedSteel, 18) + .input(plate, BlueSteel, 18) .fluidInputs(Polybenzimidazole.getFluid(144)) .output(BATTERY_HULL_LARGE_VANADIUM) .buildAndRegister(); @@ -281,7 +281,7 @@ private static void gemBatteries() { AUTOCLAVE_RECIPES.recipeBuilder() .input(ENERGIUM_DUST, 9) - .fluidInputs(BlueSteel.getFluid(L / 2)) + .fluidInputs(RedSteel.getFluid(L / 2)) .output(ENERGIUM_CRYSTAL) .duration(150).EUt(192).buildAndRegister(); @@ -307,13 +307,13 @@ private static void gemBatteries() { AUTOCLAVE_RECIPES.recipeBuilder() .input(dust, Lapotron, 15) - .fluidInputs(BlueSteel.getFluid(L * 2)) + .fluidInputs(RedSteel.getFluid(L * 2)) .output(gem, Lapotron) .duration(300).EUt(256).buildAndRegister(); AUTOCLAVE_RECIPES.recipeBuilder() .input(dust, Lapotron, 15) - .fluidInputs(RedSteel.getFluid(L / 2)) + .fluidInputs(BlueSteel.getFluid(L / 2)) .output(gem, Lapotron) .duration(150).EUt(192).buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/CraftingComponent.java b/src/main/java/gregtech/loaders/recipe/CraftingComponent.java index 1d1debf9b6f..e207b77fdad 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingComponent.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingComponent.java @@ -546,7 +546,7 @@ public static void initializeComponents() { { 0, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.Bronze) }, { 1, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.CobaltBrass) }, { 2, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.VanadiumSteel) }, - { 3, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.BlueSteel) }, + { 3, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.RedSteel) }, { 4, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.Ultimet) }, { 5, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.TungstenCarbide) }, { 6, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.HSSE) }, diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java index 56904e7dd4f..bcc82139fd2 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java @@ -102,5 +102,41 @@ public static void init() { .fluidInputs(DistilledWater.getFluid(100)) .output(ingot, Silicon) .duration(125).EUt(VA[MV]).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(ingotHot, BlackSteel) + .fluidInputs(Water.getFluid(100)) + .output(ingot, BlackSteel) + .duration(200).EUt(VA[MV]).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(ingotHot, BlackSteel) + .fluidInputs(DistilledWater.getFluid(100)) + .output(ingot, BlackSteel) + .duration(125).EUt(VA[MV]).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(ingotHot, RedSteel) + .fluidInputs(Water.getFluid(100)) + .output(ingot, RedSteel) + .duration(400).EUt(VA[MV]).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(ingotHot, RedSteel) + .fluidInputs(DistilledWater.getFluid(100)) + .output(ingot, RedSteel) + .duration(250).EUt(VA[MV]).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(ingotHot, BlueSteel) + .fluidInputs(Water.getFluid(100)) + .output(ingot, BlueSteel) + .duration(400).EUt(VA[MV]).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(ingotHot, BlueSteel) + .fluidInputs(DistilledWater.getFluid(100)) + .output(ingot, BlueSteel) + .duration(250).EUt(VA[MV]).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java index c0edbab21b7..95bc9ced2df 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java @@ -288,7 +288,7 @@ public static void init() { .input(dust, BlackSteel, 4) .input(dust, Steel, 2) .circuitMeta(1) - .output(dust, BlueSteel, 8) + .output(dust, RedSteel, 8) .buildAndRegister(); MIXER_RECIPES.recipeBuilder().duration(800).EUt(VA[ULV]) @@ -297,7 +297,7 @@ public static void init() { .input(dust, BlackSteel, 4) .input(dust, Steel, 2) .circuitMeta(1) - .output(dust, RedSteel, 8) + .output(dust, BlueSteel, 8) .buildAndRegister(); MIXER_RECIPES.recipeBuilder().duration(900).EUt(VA[ULV]) diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/1.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/1.png index 84cedc4f95c..457151ffb04 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/1.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/2.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/2.png index ac659fcc3d2..01c22b9cb21 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/2.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/3.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/3.png index 16367774a66..e30fb8a12bd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/3.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/4.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/4.png index b1a09beb290..238b5cfe2db 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/4.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/5.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/5.png index 331db0c53db..90b27417a47 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/5.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/6.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/6.png index 3e7b32cc48a..fc9be24e090 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/6.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/7.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/7.png index 47f697cfbf2..6339fa1a0d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/7.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/8.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/8.png index c68a9b70d48..1988a040f61 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/8.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.ev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.ev.png index fb8e5a6d9c4..9bf5827f415 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.ev.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.ev.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.luv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.luv.png index df159727211..8e187b4d761 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.luv.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.luv.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/1.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/1.png index b9e35673290..c2d478be819 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/1.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/2.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/2.png index caae7e00d5d..c07354fd053 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/2.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/3.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/3.png index 90180530ae2..6e022fb922e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/3.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/4.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/4.png index 114823c5bad..dfde328e7b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/4.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/5.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/5.png index 7189dd0b2a6..b577c01b183 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/5.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/6.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/6.png index 54d31601ddf..d6496bb6426 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/6.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/7.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/7.png index 4e771428cb0..352d4563fd7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/7.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/8.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/8.png index 33778625078..208f924fc3d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/8.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/8.png differ