From dfd3c70132618c16a302cd9b9f433adb9aa8980f Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Sun, 10 Nov 2024 01:14:36 -0500 Subject: [PATCH 1/2] fix colored steel recipes --- .../materials/HigherDegreeMaterials.java | 24 ++++++------ .../materials/SecondDegreeMaterials.java | 2 +- .../java/gregtech/common/items/MetaItem1.java | 4 +- .../loaders/recipe/BatteryRecipes.java | 10 ++--- .../loaders/recipe/CraftingComponent.java | 2 +- .../recipe/chemistry/ChemicalBathRecipes.java | 36 ++++++++++++++++++ .../recipe/chemistry/MixerRecipes.java | 4 +- .../items/metaitems/battery.ev.vanadium/1.png | Bin 325 -> 715 bytes .../items/metaitems/battery.ev.vanadium/2.png | Bin 326 -> 717 bytes .../items/metaitems/battery.ev.vanadium/3.png | Bin 336 -> 717 bytes .../items/metaitems/battery.ev.vanadium/4.png | Bin 334 -> 716 bytes .../items/metaitems/battery.ev.vanadium/5.png | Bin 335 -> 717 bytes .../items/metaitems/battery.ev.vanadium/6.png | Bin 333 -> 715 bytes .../items/metaitems/battery.ev.vanadium/7.png | Bin 333 -> 718 bytes .../items/metaitems/battery.ev.vanadium/8.png | Bin 327 -> 716 bytes .../items/metaitems/battery.hull.ev.png | Bin 326 -> 714 bytes .../items/metaitems/battery.hull.luv.png | Bin 350 -> 738 bytes .../metaitems/battery.luv.vanadium/1.png | Bin 352 -> 739 bytes .../metaitems/battery.luv.vanadium/2.png | Bin 353 -> 739 bytes .../metaitems/battery.luv.vanadium/3.png | Bin 358 -> 743 bytes .../metaitems/battery.luv.vanadium/4.png | Bin 357 -> 742 bytes .../metaitems/battery.luv.vanadium/5.png | Bin 357 -> 742 bytes .../metaitems/battery.luv.vanadium/6.png | Bin 356 -> 741 bytes .../metaitems/battery.luv.vanadium/7.png | Bin 358 -> 743 bytes .../metaitems/battery.luv.vanadium/8.png | Bin 361 -> 743 bytes 25 files changed, 59 insertions(+), 23 deletions(-) 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..4a16db73d46 100644 --- a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java @@ -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")) 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 84cedc4f95c54bae8c2bfb82dd543c036dd55913..457151ffb0441f08b98b4a896eb8b0e532a4026e 100644 GIT binary patch delta 692 zcmV;l0!#hH0?P%EBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn4} z7&VPGJpcdz$Vo&&R5;7sk}(c~KoCVA#Pb*uIlxv_7R1t6aR4gpgu>d2Gf)%a0Z6z2 z*-%+iLw`eIL4y@UWhEH3ajMl= delta 299 zcmV+`0o4A>1;ql8BYyw}VoOIv0ObI)00h|rcYpu@010qNS#tmY3labT3lag+-G2N4 z000McNliru-wF{E84wkIh*SUo0MbcBK~y-)wUIpv!axv4-$n!8#40SrtAr2>6&o*L zqqT*1u(b<;6du467!X0&OIS-l#zIZw6dQj&7#N26-t5l6KYtZPbFp?J9~q-)E_Gdt zb55+CNF2xFZFbHzv05FQT!RD}BuO?+o~AtjvMf^vcD3T+ux2n=0uYA#=gYR7P9r}6 zKvB#9$n!A(=d-~WgVz^c8jkvuI}1Rkqwnwy5Cj*s@pdzQfVOG{5RvZyt(WKp)r!_m xCC?YnGhP8G%OojPRT(e93-UPM5kNKnM0c9@Q89#r$~6E0002ovPDHLkV1j(PaSH$d 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 ac659fcc3d2ba06db5876caf347b108904ba9261..01c22b9cb21dbe2d34de3ba53b022e00ebcce15e 100644 GIT binary patch delta 694 zcmV;n0!jVG0?h@GBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7R zBZx%r`Tzg`%1J~)R5;7sk}(c~KoCVA#Pb*uJ-}8}7R1UJDi1(~olsg?aRw?2!U;^c z03lSyl7AYSEi7oTf~c$nqc%>pyZQfRX8*u1Yi*j1B}6l%nY=OrgmDa~6H90cDM`~* zd)8_ybLcqTJa!0+$!Hg017Dq cl;*G04Nj3mbUA4^(*OVf07*qoM6N<$f*-*w!TAdA?^fS_9DUpPH8)sj7(^ z03b~l03^v2fb&_Ql)~u?FKu>1s*47|_w74;19;xm+IYV!H$Yc)0*J_WfX+*Fg4&8& y&m~D#%^7b1WF^_0q9~LT;01Y}uLQ7~f1(HDrBTTXLMC4T0000zIajq 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 16367774a66e3c83348cecce8419400a91123007..e30fb8a12bd48bbd002a9acb2c45a9ad62bf2d42 100644 GIT binary patch delta 694 zcmV;n0!jVQ0?h@GBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7R zFbw*xBme*a%1J~)R5;7sk}(c~KoCVA#3OhPL!t-Ripqjm8Y&M!g`IE$Z8!rpp*Jz% z0)$Xm6Msu+wy>bV3Zk+SjM_NW?&klOnf(L5thH%2mJrR5X7b7i5XLc_POP9Qq$EvK z?OCg-%%S6S_dLs(83q6g-|s+M!K8YCYhAw;wf^a@{4W7OQ$1QjG?D8*#JGu~ajSd}0Vt#d cP@2C|HwTGBQVjEk^Y7sPWx!f=`Ay1E5yhJvv)+ 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 amAU~nl|yKY0X?Sx0000+&k|v6c z9>B`l!aLYlq!U|fPhcPj!d$}6!hnp0n#L6pA3qEX%l_ZI;D4X;{i#|z)Q^n5Kh-SD zR7BL;p$0*qh0P+8$9$gVxeMaCAidr)&-?ub0AUz93szl^`~8A;dj>$QwtI9Ib2voB z005iK7=ZP90KoBRFvd`5gs0B+7Tw4KP^q|g_yX{}lk?;CYKj5MsuVy~zXOzB;zuK- z>B@9E69AeQVJsV`0Ek2+N%GQyc}KQ(r1$gP0WR}TbOW*WQc+PPIsyOy002ovPDHLk FV1oGUf%O0Y 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 47f697cfbf2b4c99f51bc01018aeda36647d28c8..6339fa1a0d89f03c5a1e07183944c621bbbd726d 100644 GIT binary patch delta 695 zcmV;o0!aPM0?q}HBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7S zCgC+IGynhq%Sl8*R5;7sk}(c~KoCVA#1nWBL!t-RSWsCIOGD)WC=7PO39L8+HQ5uG zZ~;Q7tbd6mG!zyzSV2@)f>9f%+THyBGP8f+m$fm?#uB0#(o9|%0YWL^bYcxnUR5MX zqCIOhl{s{r?w+M7Gs6I2;rl&^uIj)Jg6`a!=bkrygiuOs%L3qB6aXBBU?0ch008Y6 zS(*Y+mZegs5B>0ExnjCI3?|hBTITCTLcEbRgG&Ga002ovPDHLkV1nzBEbagR delta 307 zcmV-30nGl+1Os8p{yC9wm((Nwtyw|G(5Qd?%VAb`w-_K~bCjiuHyGLhh4u^g* z0Kj%T0${Tl0B}4Sj4>1%;i*QmMHE{ADi!w*UjUwWc7D8GO))@Ol>(^hcYxAM{Ah$U zU7Aj348Y|itSsg!03v;oBzbAUydzsX)cg7F0GIhEx&f=-Qc=Z$_oM&-002ovPDHLk FV1nPId#L~b 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 c68a9b70d48e0e7204d7819a3016045e29d14eb4..1988a040f612cd9baa75990302f1cbc08738129b 100644 GIT binary patch delta 693 zcmV;m0!sbI0?Y-FBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7S zFcsmSWdHyG$w@>(R5;7sk}(c~KoCVA#8Y?(L!t-Ribe}!X{bB^6;=u-u;L8VgcFc( z0kWa8rhkTp!h!}Xh{{SZYU5P9oBv;C_7D8BcBa`{LbPL=*()PJ7{`z#Y@sdcnk>t- zXRW3(hmO%4Lck+TpDHppahZ1U-}4?q}()`4AHF-;GQ$6Ek;y-WSF6W8m^ z4FHfND*)nn4nR>Tlu|f-;ibWF#CoRz=ydEmd;@si&DvO1$_>y~tpFnO9ia6RouIa& z)=P=wO?}2Y04C@2k}S)V6W|4To-YTmnt!4Pb(&B!bDtYp00000NkvXXu0mjfZE<<9 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 fb8e5a6d9c4af8a13c8476bfb96bdaa958cce358..9bf5827f41575abe0d8b604a07e431ab572d0137 100644 GIT binary patch delta 691 zcmV;k0!;nJ0?GxDBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iTeYQD9PA*X zkfA!+MMWHI6^c+H)C#RSm|XfHG-*guTpR`0f`cE6RRs_2@d7t}p^eF|C0X~5^!F0nSUMHU3v~M{K$3L;U9ARBDrL8ZGe$u9#yE296$IU{O;B)PENQw3ZuF^Na!67hKqU<$~cYlXEd;9lHtG^#Tr*e_Uz+WE# z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7a zA-9M%p8x;=$4Nv%R5;7sk}(c~KoCXW63=5u^Z;8?Q4mXGYjEPLg95rC>~0kq_= Z#0^MZLJlX1^;-Y{002ovPDHLkV1i1PF=7A! delta 300 zcmV+{0n`4<1;zr9BYyw}VoOIv0ObI)00h|rcYpu@010qNS#tmY3labT3lag+-G2N4 z000McNliru-wF{E6*Ps&BZ&Y20MkiCK~y-)wUIpv!axv4-zEy)B-OGIuOgC0#l{Py z(ISrBuU~NIB*qhw=X+zxy<|k z0LSABfIOcAaJ?#&Qh0sgr6`J2mKg;QhVC7{0fOM>Y-}3k2k5I_01^2P(0hqqP*>5I yrR4d#J>wmK(@h 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 df159727211af5f81b08e2e2c2b3d2837d8c40ca..8e187b4d761555ff9ad455411222f424e87ccb04 100644 GIT binary patch delta 715 zcmV;+0yO>J0^$XbBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iTeYQD9PA*X zkfA!+MMWHI6^c+H)C#RSm|XfHG-*guTpR`0f`cE6RRs_2@d7t}p^eF|C0X~5^!F0nSUMHU3v~M{K$3L;U9ARBDrL8ZGe$u9#yE296$IU{O;B)PENQw3ZuF^Na!67hKqU<$~cYlXEd;9lHtG^#Tr*e_Uz+WE# z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7a z2W5q@VgLXD-$_J4R5;76lCcTGKoo|*L<6po>Z*_;6S#v2S7@+t0V{1SvV*PNAvl5) zK002ovPDHLkV1j?RNZSAa delta 324 zcmV-K0lWU<1>ORXBYyw}VoOIv0ObI)00h|rcYpu@010qNS#tmY3labT3lag+-G2N4 z000McNliru-wF{E78ZMjF|Ggr0P9IaK~y-)t&$-Q!Y~+xzcw6!L!bzP11u9LLZ%6d z10cw_0UE&>(92HH00(HADKwgz2?T;7fM(0a!UE4VFYn9W_kaKJPfbT7HwgmQ#_tr( zU7CVY4D;Oey4?z(=xeP7fbikP0)WgI`h&s8DKlfR*0MSr&{_*wa>KAOT<3ehY`X=e z$c*_6c=_>uU+rL*rp%(~`8XbH^QX%NfK3>(RH_UBc=yose*kMOLWn8=K#s?v31Zf3 zSKC1=Nm&M5Z#}nmfcqWi+z%6g??C=~{=Tp%2wW1!Uu|KYB$Q6M2x$VG^Blm3|Dp%8 Wlw=Zlk8jTa0000EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7R z3d;6(mH+?%;7LS5R5;76k}(RxKoCV=q5-dwDwU-01RlUb5Mc@x8!up`7swrK?H0i! zc!Dg55PwLu7w`arMJ#kff=NW_u-qM z$hFoEfMbgfhZO)y-Iz{$wOv{+B5180w+MaTZ!E6jxnMHcVT?hkTdlxy5qY0M97hZW zn^&9F0?#`E5CnVDbXFDs*g4eye-1#BRBXXUW<^1xWIQ@o&*0a%0Iqv&CurS4n>h9n yhKo$8?T0NqZ{&DfQaa_Lq)E`}TmbUozvKb#AXenqk?A%70000gdZBYyw}VoOIv0ObI)00h|rcYpu@010qNS#tmY3labT3lag+-G2N4 z000McNliru-wF{E932+80IUE20PRUcK~y-)t&$-Q!Y~+xzb+hsL!by^2UsRhgiMnu z4uBxz0tAiV04Vgb6Ewg9nq~@(re*?xpa@{uvazthQ*B<}mw&&nKm1dZ;n0pf&$jV9 zMRS)VASG^=*0Tg|ulmHNUcs2td)tdfb@NvpiYm6~04hNJ{!YR4F-x#j*b3nM+ zfRv*0|4GVG`%0d7=sX^3IK4IqejSf zysGb@l^mxGxIf-*?Ev>X*4iH?fV>0e*Yy|gL*RKfj-s!AVH(GjR=Egi0-Uo9AP@gV Y5A0TB66N)o`~Uy|07*qoM6N<$g7;mA<^TWy 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 caae7e00d5d874b3d1a45f6a394534d9cc1e7ab8..c07354fd053e82fb533a5922ed24d4024d3a9e41 100644 GIT binary patch delta 716 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 eQ2>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7T zCdwFj_W%F@<4Ht8R5;76k}(RxKoCV=qJq~*6&p!mVeK74U<(a4UcgE(;2mu379mHl zw#b48#D7$ay$291Vxb!%CW^*iEj;EiJ2UXlbi32c^TO;K-Ymj6UZAx`h$OpS2QPvm zS4vp`mMLDZCjdx!Aqd))T^cTgKq+O}Md&!r+u|~w3w(cx)*2}){|JD?p=1jt`$&^pDd_a!xZRb{;MdpywtcQAsNF%G zSmxn*VJ7AL!xrv05=CR4PPr&~CulShfV}uGxdCe#Swo^4qm2Ln002ovPDHLkV1mkX BKF0t6 delta 331 zcmV-R0kr<+1?2*eBYyw}VoOIv0ObI)00h|rcYpu@010qNS#tmY3labT3lag+-G2N4 z000McNliru-wF{E95hr4n7{x40P;yhK~y-)t&%OS!ax*-ziG%@0b3wJ5yT6+sX!4@ zO;9WV@ltkxMz97fO;<1hBw{kDLZcZ|@dScF08N|zga(e9$$!cDa_7v2Z)!3e+Og}} zCVnexZlVaJ2r{-n$U0A4-Ry&u3BgAk$!0NDPF zstE(=9GB%CG(?i)oo>)^Yt4TIpVUzmjHy~? d0Z7AN(H&3$V@NLxG8+H@002ovPDHLkV1l_%i8ufN 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 7189dd0b2a617a0f79edc6207acc90533cdd4792..b577c01b1834beb4785c82beec79dbb3aad5cd6f 100644 GIT binary patch delta 719 zcmV;=0xEX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7T zFSEqKQvd(}<4Ht8R5;76k}(RxKoCV=5(Tf3DwU+j1@sCMge^4KcmXTDfOoL9TSSkb z7s!GLfqzuniw6)Q#6njhCW^*iEj;EiJ2UXlwA+*1_oMt9-YCL2o};x!h(n%b-4{WT zE2S&|%M`CxV*sQ))9<$`yEI$~fl|t{i_mr5x5Z`rAqc|-T5F^{R|*UlLcGo(j^_ly z^xkH{}6yADcOR_@kruT3OYU5t@q_K_%$|wZJ+81YIjg4 zmU;MoluJ4Lu!Y-=Y&IjFPPr&~Cvcntz@zvtxdPAsS$4z7HKXykamrY0j4}Kik0_;tQ*u48HC*TC zfW>wTQW9(34EXnh!=c*2E{a(A{@>+vs?A?+Hvl%C$6CrV0N~j}+xr2GF$f{50D$vw z)=U^efB#$GK}07xP8o1d({6w)!&>{s1dw;&yu1G5dGKA=hC%SsFD%25(kd4rZGdZ% d0OaA1=m9T(V>5(9GEM*h002ovPDHLkV1mL~lWYJ0 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 54d31601ddfe3090c81378593a39aa715c59de9d..d6496bb642683d582bf23148ac4f28626e109b75 100644 GIT binary patch delta 718 zcmV;<0x|vM0_6peBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7T zJEk7R5;76k}(RxKoCV=qN3MGl`5q01lG0^*h0m|3s~s|yo0UXBBZkR z1X+-PV1Kn2uoZ+9YoRL%FEj;EiJ2UXlMA6K|@z{LBn`M|~OSIMqk(;9Ey$H%& zDdhopws^Cd0wCpuB*Qp)qoFbIOT#Z~+v7z|cut&#HL6j&~Vc%4C(E$MdW z_cp5qt=0~JFkEvy4xa@8b`I|Uj{rCvDz;#AZbyesL4OF_^}c!rzs3jf{Zl^#dBYyw}VoOIv0ObI)00h|rcYpu@010qNS#tmY3labT3lag+-G2N4 z000McNliru-wF{E9RzF0nJoYS0P#sgK~y-)t&%@(gD@Dyf3|Xj9HK*1G4ue4fvKvP zqf9vfLq%`UxkJvtj5vXnPG|$;Z(eLGa9?XB2B>-PRz`Igi0KmP6srLg|YY{^90RU$6 zI!@StOh1P^m_sEgyMSw5&jZ|UIOi5j08IyS>H3TNA@Y5fCCR^jVV`AmR=EwC0$i#J cpb0-jKSrHnKKaEl7XSbN07*qoM6N<$f(^xrHvj+t 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 4e771428cb007832a8d3112993d028c207373ebe..352d4563fd7ee5b84fa6dd820b04af8203fa4426 100644 GIT binary patch delta 720 zcmV;>0x$jM0_O#gBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7U z2oKdoc>n+afBYyw}VoOIv0ObI)00h|rcYpu@010qNS#tmY3labT3lag+-G2N4 z000McNliru-wF{E9SV$av?>4q0P{&iK~y-)t&%;C!Y~wsKSz6l6^GagQE-6B1r=JQ zMpS!%6exRxttmJIb(9lWzyT~P6*Z!aDN;~SU<#HfQGP@OQ-9eS&8O$_gLi5+nYeG? zcYXYivbjzYP>OM$yRX5Z1}OVlYXKmNa2NuR8pCijYMnAQ25T+9+bvpa;Z-_-MT7(dF0KidB zTLGUEPRqaM4n=y&^QwUJ<KA_En93@bAzgq& eo&yx&x9A3K9b{&F)2YG$00000x$jP0_O#gBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk74t5Z6 z2w0u$;uns!3Pq?;YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT z3N2zhIPS;0dyl(!fY7Kg)$ED^s%9DKL|n|~R>kgD^dg7=rhhRaF;kyQrIPR*U-$6w z^)AY@ywCkP`jouM0G~)4W4d7xZxGLHS~}-_;xH>o3h_DdxIq^re&o9B@*C%(!vfC? z8=3SxahO;vcCg&RtYoOfQ^XNP)hJ)cx~y>C;;dF`taVTR!cbmYS>`&;VI;7KC8Qui zMh#_DU?EDYMt_QlH0{Sd{6mgEMJ}0KWiWCqpb8a|;|KqP-`$#p$q6?p6bAw?w*4^* zbngPqx@~_S+jjE=@IM1rTH9Z30JEQ@*V|g;2@ctJ^&f&DtQAO90FrS%3k+)cYjZ3Z~vZY_4fn1XL7^WD?Ba$ z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rj3kn7U z5o^Bfxc~qF8f5RI^m?Ueo)(Da2mrMUe zP~=J}3&1kPQ8WQS$}?fus_fEmAp}Y(%PvCKb>9}3@rNJ?wrH)9@?0q}TnO&@?NmJ6EAJpi7!<9HlA3joX zbCszFV5sN~(zOF;$c#9FmE-`H#nd@NC%iCp$PjmEfLm#5 zv*+0{{-SQ~vkau-&S@ zF24e7lLVwB*Sa5Y^W(#z-N8P~*oNWX<#g)Ie-#A)pT5tVluZD@y@#Rq0~livLbL$@ z#d^~Vcv!>t$4IWbgHdvvCgA6C83(vtvDQwQ0ICk0sp~K9htTtE8pr?oh1WEtvC4JG h5a3*v09AMv{Q{1^WOtWJ>W%;a002ovPDHLkV1gA}m;C?$ From b2c5f7180ea4f5cc2bdf9410b8b851d7fd2302b4 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+techlord22@users.noreply.github.com> Date: Sun, 10 Nov 2024 03:43:32 -0500 Subject: [PATCH 2/2] better way --- .../materials/HigherDegreeMaterials.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 4a16db73d46..8646df2403f 100644 --- a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java @@ -34,17 +34,7 @@ public static void register() { .components(Flint, 8, BandedIron, 1, Sapphire, 1) .build(); - BlueSteel = new Material.Builder(2510, gregtechId("blue_steel")) - .ingot(3).fluid() - .color(0x64648C).iconSet(METALLIC) - .flags(EXT_METAL, GENERATE_FRAME, GENERATE_GEAR) - .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(1813, GasTier.LOW).blastStats(VA[HV], 1000)) - .build(); - - RedSteel = new Material.Builder(2511, gregtechId("red_steel")) + RedSteel = new Material.Builder(2510, gregtechId("red_steel")) .ingot(3).fluid() .color(0x8C6464).iconSet(METALLIC) .flags(EXT_METAL, GENERATE_GEAR) @@ -54,6 +44,16 @@ public static void register() { .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(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(1813, GasTier.LOW).blastStats(VA[HV], 1000)) + .build(); + Basalt = new Material.Builder(2512, gregtechId("basalt")) .dust(1) .color(0x3C3232).iconSet(ROUGH)