Skip to content

Commit 400f1db

Browse files
TechLord22TechLord22
authored
fix colored steel recipes (#2659)
1 parent 2ec2180 commit 400f1db

File tree

25 files changed

+51
-15
lines changed

25 files changed

+51
-15
lines changed

‎src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ public static void register() {
3838
.ingot(3).fluid()
3939
.color(0x8C6464).iconSet(METALLIC)
4040
.flags(EXT_METAL, GENERATE_GEAR)
41-
.components(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4)
41+
.components(RoseGold, 1, Brass, 1, Steel, 2, BlackSteel, 4)
4242
.toolStats(ToolProperty.Builder.of(7.0F, 6.0F, 2560, 3)
4343
.attackSpeed(0.1F).enchantability(21).build())
44-
.blast(b -> b.temp(1300, GasTier.LOW).blastStats(VA[HV], 1000))
44+
.blast(b -> b.temp(1813, GasTier.LOW).blastStats(VA[HV], 1000))
4545
.build();
4646

4747
BlueSteel = new Material.Builder(2511, gregtechId("blue_steel"))
4848
.ingot(3).fluid()
4949
.color(0x64648C).iconSet(METALLIC)
5050
.flags(EXT_METAL, GENERATE_FRAME, GENERATE_GEAR)
51-
.components(RoseGold, 1, Brass, 1, Steel, 2, BlackSteel, 4)
51+
.components(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4)
5252
.toolStats(ToolProperty.Builder.of(15.0F, 6.0F, 1024, 3)
5353
.attackSpeed(0.1F).enchantability(33).build())
54-
.blast(b -> b.temp(1400, GasTier.LOW).blastStats(VA[HV], 1000))
54+
.blast(b -> b.temp(1813, GasTier.LOW).blastStats(VA[HV], 1000))
5555
.build();
5656

5757
Basalt = new Material.Builder(2512, gregtechId("basalt"))

‎src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static void register() {
9898
.flags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_GEAR, GENERATE_FRAME)
9999
.components(Nickel, 1, BlackBronze, 1, Steel, 3)
100100
.cableProperties(V[EV], 3, 2)
101-
.blast(1200, GasTier.LOW)
101+
.blast(1758, GasTier.LOW)
102102
.build();
103103

104104
DamascusSteel = new Material.Builder(2012, gregtechId("damascus_steel"))

‎src/main/java/gregtech/common/items/MetaItem1.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -997,11 +997,11 @@ public void registerSubItems() {
997997
BATTERY_HULL_HV = addItem(719, "battery.hull.hv")
998998
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, M * 9))); // plate * 9
999999
BATTERY_HULL_SMALL_VANADIUM = addItem(720, "battery.hull.ev")
1000-
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BlueSteel, M * 2)));
1000+
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.RedSteel, M * 2)));
10011001
BATTERY_HULL_MEDIUM_VANADIUM = addItem(721, "battery.hull.iv")
10021002
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.RoseGold, M * 6)));
10031003
BATTERY_HULL_LARGE_VANADIUM = addItem(722, "battery.hull.luv")
1004-
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.RedSteel, M * 18)));
1004+
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BlueSteel, M * 18)));
10051005
BATTERY_HULL_MEDIUM_NAQUADRIA = addItem(723, "battery.hull.zpm")
10061006
.setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Europium, M * 6)));
10071007
BATTERY_HULL_LARGE_NAQUADRIA = addItem(724, "battery.hull.uv")

‎src/main/java/gregtech/loaders/recipe/BatteryRecipes.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private static void standardBatteries() {
8686
// EV
8787
ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(VA[HV])
8888
.input(cableGtSingle, Aluminium, 2)
89-
.input(plate, BlueSteel, 2)
89+
.input(plate, RedSteel, 2)
9090
.fluidInputs(Polytetrafluoroethylene.getFluid(144))
9191
.output(BATTERY_HULL_SMALL_VANADIUM)
9292
.buildAndRegister();
@@ -102,7 +102,7 @@ private static void standardBatteries() {
102102
// LuV
103103
ASSEMBLER_RECIPES.recipeBuilder().duration(300).EUt(VA[IV])
104104
.input(cableGtSingle, NiobiumTitanium, 2)
105-
.input(plate, RedSteel, 18)
105+
.input(plate, BlueSteel, 18)
106106
.fluidInputs(Polybenzimidazole.getFluid(144))
107107
.output(BATTERY_HULL_LARGE_VANADIUM)
108108
.buildAndRegister();
@@ -281,7 +281,7 @@ private static void gemBatteries() {
281281

282282
AUTOCLAVE_RECIPES.recipeBuilder()
283283
.input(ENERGIUM_DUST, 9)
284-
.fluidInputs(BlueSteel.getFluid(L / 2))
284+
.fluidInputs(RedSteel.getFluid(L / 2))
285285
.output(ENERGIUM_CRYSTAL)
286286
.duration(150).EUt(192).buildAndRegister();
287287

@@ -307,13 +307,13 @@ private static void gemBatteries() {
307307

308308
AUTOCLAVE_RECIPES.recipeBuilder()
309309
.input(dust, Lapotron, 15)
310-
.fluidInputs(BlueSteel.getFluid(L * 2))
310+
.fluidInputs(RedSteel.getFluid(L * 2))
311311
.output(gem, Lapotron)
312312
.duration(300).EUt(256).buildAndRegister();
313313

314314
AUTOCLAVE_RECIPES.recipeBuilder()
315315
.input(dust, Lapotron, 15)
316-
.fluidInputs(RedSteel.getFluid(L / 2))
316+
.fluidInputs(BlueSteel.getFluid(L / 2))
317317
.output(gem, Lapotron)
318318
.duration(150).EUt(192).buildAndRegister();
319319

‎src/main/java/gregtech/loaders/recipe/CraftingComponent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ public static void initializeComponents() {
546546
{ 0, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.Bronze) },
547547
{ 1, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.CobaltBrass) },
548548
{ 2, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.VanadiumSteel) },
549-
{ 3, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.BlueSteel) },
549+
{ 3, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.RedSteel) },
550550
{ 4, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.Ultimet) },
551551
{ 5, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.TungstenCarbide) },
552552
{ 6, new UnificationEntry(OrePrefix.toolHeadBuzzSaw, Materials.HSSE) },

‎src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,41 @@ public static void init() {
102102
.fluidInputs(DistilledWater.getFluid(100))
103103
.output(ingot, Silicon)
104104
.duration(125).EUt(VA[MV]).buildAndRegister();
105+
106+
CHEMICAL_BATH_RECIPES.recipeBuilder()
107+
.input(ingotHot, BlackSteel)
108+
.fluidInputs(Water.getFluid(100))
109+
.output(ingot, BlackSteel)
110+
.duration(200).EUt(VA[MV]).buildAndRegister();
111+
112+
CHEMICAL_BATH_RECIPES.recipeBuilder()
113+
.input(ingotHot, BlackSteel)
114+
.fluidInputs(DistilledWater.getFluid(100))
115+
.output(ingot, BlackSteel)
116+
.duration(125).EUt(VA[MV]).buildAndRegister();
117+
118+
CHEMICAL_BATH_RECIPES.recipeBuilder()
119+
.input(ingotHot, RedSteel)
120+
.fluidInputs(Water.getFluid(100))
121+
.output(ingot, RedSteel)
122+
.duration(400).EUt(VA[MV]).buildAndRegister();
123+
124+
CHEMICAL_BATH_RECIPES.recipeBuilder()
125+
.input(ingotHot, RedSteel)
126+
.fluidInputs(DistilledWater.getFluid(100))
127+
.output(ingot, RedSteel)
128+
.duration(250).EUt(VA[MV]).buildAndRegister();
129+
130+
CHEMICAL_BATH_RECIPES.recipeBuilder()
131+
.input(ingotHot, BlueSteel)
132+
.fluidInputs(Water.getFluid(100))
133+
.output(ingot, BlueSteel)
134+
.duration(400).EUt(VA[MV]).buildAndRegister();
135+
136+
CHEMICAL_BATH_RECIPES.recipeBuilder()
137+
.input(ingotHot, BlueSteel)
138+
.fluidInputs(DistilledWater.getFluid(100))
139+
.output(ingot, BlueSteel)
140+
.duration(250).EUt(VA[MV]).buildAndRegister();
105141
}
106142
}

‎src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public static void init() {
288288
.input(dust, BlackSteel, 4)
289289
.input(dust, Steel, 2)
290290
.circuitMeta(1)
291-
.output(dust, BlueSteel, 8)
291+
.output(dust, RedSteel, 8)
292292
.buildAndRegister();
293293

294294
MIXER_RECIPES.recipeBuilder().duration(800).EUt(VA[ULV])
@@ -297,7 +297,7 @@ public static void init() {
297297
.input(dust, BlackSteel, 4)
298298
.input(dust, Steel, 2)
299299
.circuitMeta(1)
300-
.output(dust, RedSteel, 8)
300+
.output(dust, BlueSteel, 8)
301301
.buildAndRegister();
302302

303303
MIXER_RECIPES.recipeBuilder().duration(900).EUt(VA[ULV])

‎src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/1.png‎

390 Bytes
Loading

‎src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/2.png‎

391 Bytes
Loading

‎src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/3.png‎

381 Bytes
Loading

0 commit comments

Comments
 (0)