Skip to content

Commit

Permalink
Flip Red and Blue Steel composition and usage (#2299)
Browse files Browse the repository at this point in the history
Co-authored-by: Ghostipedia <Ghostipedia@gmail.com>
  • Loading branch information
YoungOnionMC and Ghostipedia authored Nov 12, 2024
1 parent 84520a3 commit 141f1a3
Show file tree
Hide file tree
Showing 25 changed files with 54 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -693,15 +693,15 @@ public Component getItemName(ItemStack stack) {
.register();
public static ItemEntry<Item> 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<Item> BATTERY_HULL_MEDIUM_VANADIUM = REGISTRATE.item("iv_battery_hull", Item::new)
.lang("Medium Vanadium Battery Hull").onRegister(compassNodeExist(GTCompassSections.MISC, "battery_hull"))
.onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.RoseGold, GTValues.M * 6))))
.register();
public static ItemEntry<Item> 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<Item> BATTERY_HULL_MEDIUM_NAQUADRIA = REGISTRATE.item("zpm_battery_hull", Item::new)
.lang("Medium Naquadria Battery Hull").onRegister(compassNodeExist(GTCompassSections.MISC, "battery_hull"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@ 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();

BlueSteel = new Material.Builder(GTCEu.id("blue_steel"))
.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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private static void standardBatteries(Consumer<FinishedRecipe> 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);
Expand All @@ -103,7 +103,7 @@ private static void standardBatteries(Consumer<FinishedRecipe> 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);
Expand Down Expand Up @@ -281,7 +281,7 @@ private static void gemBatteries(Consumer<FinishedRecipe> 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);

Expand All @@ -307,13 +307,13 @@ private static void gemBatteries(Consumer<FinishedRecipe> 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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public static void init(Consumer<FinishedRecipe> 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)
Expand All @@ -101,5 +101,41 @@ public static void init(Consumer<FinishedRecipe> 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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -273,22 +273,22 @@ public static void init(Consumer<FinishedRecipe> 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])
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.
Binary file modified src/main/resources/assets/gtceu/textures/item/luv_battery_hull.png
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.

0 comments on commit 141f1a3

Please sign in to comment.