Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix colored steel recipes #2659

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@ public static void register() {
.components(Flint, 8, BandedIron, 1, Sapphire, 1)
.build();

RedSteel = new Material.Builder(2510, gregtechId("red_steel"))
BlueSteel = new Material.Builder(2510, gregtechId("blue_steel"))
.ingot(3).fluid()
.color(0x8C6464).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_GEAR)
.color(0x64648C).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_FRAME, GENERATE_GEAR)
.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())
.blast(b -> b.temp(1300, GasTier.LOW).blastStats(VA[HV], 1000))
.toolStats(ToolProperty.Builder.of(15.0F, 6.0F, 1024, 3)
.attackSpeed(0.1F).enchantability(33).build())
.blast(b -> b.temp(1813, GasTier.LOW).blastStats(VA[HV], 1000))
.build();

BlueSteel = new Material.Builder(2511, gregtechId("blue_steel"))
RedSteel = new Material.Builder(2511, gregtechId("red_steel"))
.ingot(3).fluid()
.color(0x64648C).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_FRAME, GENERATE_GEAR)
.color(0x8C6464).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_GEAR)
.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())
.blast(b -> b.temp(1400, GasTier.LOW).blastStats(VA[HV], 1000))
.toolStats(ToolProperty.Builder.of(7.0F, 6.0F, 2560, 3)
.attackSpeed(0.1F).enchantability(21).build())
.blast(b -> b.temp(1813, GasTier.LOW).blastStats(VA[HV], 1000))
.build();

Basalt = new Material.Builder(2512, gregtechId("basalt"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/common/items/MetaItem1.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/gregtech/loaders/recipe/BatteryRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down Expand Up @@ -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();

Expand All @@ -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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -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])
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading