Skip to content

Commit

Permalink
added Fireleaf Material from Steeleaf and Fiery Blood/Tears
Browse files Browse the repository at this point in the history
  • Loading branch information
@GregoriusT
GregoriusT committed Sep 21, 2023
1 parent ed9ee57 commit 25f09e4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/main/java/gregapi/GT_API.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ public void onModPreInit2(FMLPreInitializationEvent aEvent) {
MT.TungstenSteel.setLocal("Wolf Style");
MT.ShadowSteel.setLocal("Shade Style");
MT.Steeleaf.setLocal("Style Leave");
MT.Fireleaf.setLocal("Burn Leave");
MT.Knightmetal.setLocal("Night Metal");
MT.FierySteel.setLocal("Fury Style");
MT.Thaumium.setLocal("Thaumanominum");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregapi/GT_API_Proxy_Client.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public GT_API_Proxy_Client() {
CODE_UNCHECKED = F;

for (int i = 0; i < 4; i++) {
sPosR.addAll(Arrays.asList(MT.ChargedCertusQuartz.mRGBa[i], MT.Enderium.mRGBa[i], MT.Vinteum.mRGBa[i], MT.U_235.mRGBa[i], MT.Am_241.mRGBa[i], MT.Am_242.mRGBa[i], MT.Pu_241.mRGBa[i], MT.Pu_243.mRGBa[i], MT.Nq_528.mRGBa[i], MT.Nq_522.mRGBa[i], MT.InfusedOrder.mRGBa[i], MT.Force.mRGBa[i], MT.Pyrotheum.mRGBa[i], MT.Sunnarium.mRGBa[i], MT.Mcg.mRGBa[i], MT.Thaumium.mRGBa[i], MT.InfusedVis.mRGBa[i], MT.InfusedAir.mRGBa[i], MT.InfusedFire.mRGBa[i], MT.FierySteel.mRGBa[i], MT.Firestone.mRGBa[i], MT.ArcaneAsh.mRGBa[i]));
sPosR.addAll(Arrays.asList(MT.ChargedCertusQuartz.mRGBa[i], MT.Enderium.mRGBa[i], MT.Vinteum.mRGBa[i], MT.U_235.mRGBa[i], MT.Am_241.mRGBa[i], MT.Am_242.mRGBa[i], MT.Pu_241.mRGBa[i], MT.Pu_243.mRGBa[i], MT.Nq_528.mRGBa[i], MT.Nq_522.mRGBa[i], MT.InfusedOrder.mRGBa[i], MT.Force.mRGBa[i], MT.Pyrotheum.mRGBa[i], MT.Sunnarium.mRGBa[i], MT.Mcg.mRGBa[i], MT.Thaumium.mRGBa[i], MT.InfusedVis.mRGBa[i], MT.InfusedAir.mRGBa[i], MT.InfusedFire.mRGBa[i], MT.FierySteel.mRGBa[i], MT.Fireleaf.mRGBa[i], MT.Firestone.mRGBa[i], MT.ArcaneAsh.mRGBa[i]));
sPosG.addAll(Arrays.asList(MT.ChargedCertusQuartz.mRGBa[i], MT.Enderium.mRGBa[i], MT.Vinteum.mRGBa[i], MT.U_235.mRGBa[i], MT.Am_241.mRGBa[i], MT.Am_242.mRGBa[i], MT.Pu_241.mRGBa[i], MT.Pu_243.mRGBa[i], MT.Nq_528.mRGBa[i], MT.Nq_522.mRGBa[i], MT.InfusedOrder.mRGBa[i], MT.Force.mRGBa[i], MT.Pyrotheum.mRGBa[i], MT.Sunnarium.mRGBa[i], MT.InfusedAir.mRGBa[i], MT.InfusedEarth.mRGBa[i]));
sPosB.addAll(Arrays.asList(MT.ChargedCertusQuartz.mRGBa[i], MT.Enderium.mRGBa[i], MT.Vinteum.mRGBa[i], MT.U_235.mRGBa[i], MT.Am_241.mRGBa[i], MT.Am_242.mRGBa[i], MT.Pu_241.mRGBa[i], MT.Pu_243.mRGBa[i], MT.Nq_528.mRGBa[i], MT.Nq_522.mRGBa[i], MT.InfusedOrder.mRGBa[i], MT.Mcg.mRGBa[i], MT.InfusedVis.mRGBa[i], MT.InfusedWater.mRGBa[i], MT.Thaumium.mRGBa[i], MT.Co_60.mRGBa[i], MT.Lumium.mRGBa[i], MT.VinteumPurified.mRGBa[i], MT.ArcaneAsh.mRGBa[i]));
sNegR.addAll(Arrays.asList(MT.InfusedEntropy.mRGBa[i], MT.NetherStar.mRGBa[i]));
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/gregapi/data/MT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1763,9 +1763,10 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) {
BatteryAlloy = alloy ( 8668, "Battery Alloy" , SET_DULL , 156, 124, 160 , MORTAR, MOLTEN, FURNACE, EXTRUDER_SIMPLE) .uumAloy( 0, Pb , 4*U, Sb , 1*U) ,
SolderingAlloy = clloy ( 8669, "Soldering Alloy" , 220, 220, 230 , MORTAR, MOLTEN, BRITTLE, SOLDERING_MATERIAL, SOLDERING_MATERIAL_GOOD, WIRES) .uumAloy( 0, Sn , 9*U, Sb , 1*U) ,
IronWood = alloymachine ( 8672, "Ironwood" , SET_WOOD , 150, 140, 110 , MAGICAL, WOOD, FURNACE, EXTRUDER_SIMPLE, MORTAR, MAGNETIC_PASSIVE, MOLTEN, "IronWood").qual(2, 6.5, 512, 2) .setAloy(18, WroughtIron , 8*U, LiveRoot , 9*U, Angmallen , 2*U) .aspects(TC.METALLUM, 2, TC.ARBOR, 1, TC.PRAECANTIO, 1),
Steeleaf = alloymachine ( 8673, "Steeleaf" , SET_LEAF , 50, 127, 50 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, WOOD, MORTAR).qual(2, 8.0, 144, 3).setSmelting(Steel, U4) .setMcfg( 1, Steel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.HERBA, 1, TC.PRAECANTIO, 1),
Steeleaf = alloymachine ( 8673, "Steeleaf" , SET_LEAF , 50, 127, 50 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, WOOD, MORTAR).qual(2, 8.0, 144, 3).setSmelting(Steel, U4) .setMcfg( 1, Steel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.HERBA, 1, TC.PRAECANTIO, 1),
Knightmetal = alloymachine ( 8674, "Knightmetal" , 210, 240, 200 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, MOLTEN, MORTAR, "KnightMetal").qual(3, 8.0, 512, 3) .setMcfg( 2, Steel , 2*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.TELUM, 1, TC.PRAECANTIO, 1).heat(Steel.mMeltingPoint+100, Steel.mBoilingPoint+100),
FierySteel = alloymachine ( 8675, "Fiery Steel" , SET_FIERY , 64, 0, 0 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING, "Fiery").qual(3, 9.0, 1024, 4) .setMcfg( 1, Steel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1).heat(Steel.mBoilingPoint-200, Steel.mBoilingPoint+500),
Fireleaf = alloymachine ( 8698, "Fireleaf" , SET_LEAF , 127, 50, 50 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, WOOD, MORTAR).qual(2, 12.0, 288, 4).setSmelting(FierySteel, U4) .setMcfg( 1, FierySteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.HERBA, 1),
MeteoflameSteel = alloymachine ( 8693, "Meteoflame Steel" , SET_FIERY , 130, 120, 100 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING).qual(3, 12.0, 1280, 4) .setMcfg( 1, MeteoricSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1).heat(MeteoricSteel.mBoilingPoint-200, MeteoricSteel.mBoilingPoint+500),
MeteoflameBlackSteel = alloymachine ( 8694, "Meteoflame Black Steel", SET_FIERY , 85, 85, 85 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING).qual(3, 12.0, 1280, 4) .setMcfg( 1, MeteoricBlackSteel, 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1).heat(MeteoricBlackSteel.mBoilingPoint-200, MeteoricBlackSteel.mBoilingPoint+500),
MeteoflameBlueSteel = alloymachine ( 8695, "Meteoflame Blue Steel" , SET_FIERY , 95, 95, 135 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING).qual(3, 13.0, 1408, 4) .setMcfg( 1, MeteoricBlueSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1).heat(MeteoricBlueSteel .mBoilingPoint-200, MeteoricBlueSteel .mBoilingPoint+500),
Expand Down Expand Up @@ -2291,6 +2292,7 @@ static void init() {
Steeleaf .put(MD.TF);
Knightmetal .put(MD.TF, MAZEBREAKER).visDefault();
FierySteel .put(MD.TF, MAZEBREAKER).visDefault();
Fireleaf .put(MD.TF, MAZEBREAKER).visDefault(Steeleaf);
MeteoflameSteel .put(MD.TF, MAZEBREAKER).visDefault(FierySteel);
MeteoflameBlackSteel .put(MD.TF, MAZEBREAKER).visDefault(FierySteel);
MeteoflameBlueSteel .put(MD.TF, MAZEBREAKER).visDefault(FierySteel);
Expand Down Expand Up @@ -2735,6 +2737,7 @@ static void init() {
Skyroot .addEnchantmentForTools(Enchantment.fortune, 1).addEnchantmentForWeapons(Enchantment.looting, 1).addEnchantmentForAmmo(Enchantment.looting, 2).addEnchantmentForRanged(Enchantment.infinity, 1).addEnchantmentForFishing(Enchantment.field_151370_z, 1);
IronWood .addEnchantmentForTools(Enchantment.fortune, 1).addEnchantmentForWeapons(Enchantment.looting, 1).addEnchantmentForAmmo(Enchantment.looting, 2).addEnchantmentForRanged(Enchantment.infinity, 1).addEnchantmentForFishing(Enchantment.field_151370_z, 1);
Steeleaf .addEnchantmentForTools(Enchantment.fortune, 2).addEnchantmentForWeapons(Enchantment.looting, 2).addEnchantmentForAmmo(Enchantment.looting, 4).addEnchantmentForRanged(Enchantment.infinity, 2).addEnchantmentForFishing(Enchantment.field_151370_z, 2);
Fireleaf .addEnchantmentForTools(Enchantment.fortune, 3).addEnchantmentForWeapons(Enchantment.looting, 3).addEnchantmentForAmmo(Enchantment.looting, 3).addEnchantmentForRanged(Enchantment.infinity, 3).addEnchantmentForFishing(Enchantment.field_151370_z, 3);
Efrine .addEnchantmentForTools(Enchantment.fortune, 2).addEnchantmentForWeapons(Enchantment.looting, 2).addEnchantmentForAmmo(Enchantment.looting, 4).addEnchantmentForRanged(Enchantment.infinity, 2).addEnchantmentForFishing(Enchantment.field_151370_z, 2);
Soularium .addEnchantmentForTools(Enchantment.fortune, 2).addEnchantmentForWeapons(Enchantment.looting, 2).addEnchantmentForAmmo(Enchantment.looting, 4).addEnchantmentForRanged(Enchantment.infinity, 2).addEnchantmentForFishing(Enchantment.field_151370_z, 2);
Midasium .addEnchantmentForTools(Enchantment.fortune, 2).addEnchantmentForWeapons(Enchantment.looting, 2).addEnchantmentForAmmo(Enchantment.looting, 4).addEnchantmentForRanged(Enchantment.infinity, 2).addEnchantmentForFishing(Enchantment.field_151370_z, 2);
Expand Down Expand Up @@ -2801,6 +2804,7 @@ static void init() {
Octine .addEnchantmentForDamage(Enchantment.fireAspect, 3).addEnchantmentForRanged(Enchantment.flame, 3).addEnchantmentForTools(Enchantment.fireAspect, 3);
Kreknorite .addEnchantmentForDamage(Enchantment.fireAspect, 3).addEnchantmentForRanged(Enchantment.flame, 3).addEnchantmentForTools(Enchantment.fireAspect, 3);
Firestone .addEnchantmentForDamage(Enchantment.fireAspect, 3).addEnchantmentForRanged(Enchantment.flame, 3).addEnchantmentForTools(Enchantment.fireAspect, 3);
Fireleaf .addEnchantmentForDamage(Enchantment.fireAspect, 3).addEnchantmentForRanged(Enchantment.flame, 3).addEnchantmentForTools(Enchantment.fireAspect, 3);
FierySteel .addEnchantmentForDamage(Enchantment.fireAspect, 3).addEnchantmentForRanged(Enchantment.flame, 3).addEnchantmentForTools(Enchantment.fireAspect, 3);
MeteoflameSteel .addEnchantmentForDamage(Enchantment.fireAspect, 3).addEnchantmentForRanged(Enchantment.flame, 3).addEnchantmentForTools(Enchantment.fireAspect, 3);
MeteoflameBlackSteel .addEnchantmentForDamage(Enchantment.fireAspect, 3).addEnchantmentForRanged(Enchantment.flame, 3).addEnchantmentForTools(Enchantment.fireAspect, 3);
Expand Down Expand Up @@ -2883,6 +2887,7 @@ static void init() {
MeteoricSteel .addEnchantmentForDamage(Enchantment.sharpness, 3).addEnchantmentForRanged(Enchantment.power, 3);
MeteoflameSteel .addEnchantmentForDamage(Enchantment.sharpness, 3).addEnchantmentForRanged(Enchantment.power, 3);
Steeleaf .addEnchantmentForDamage(Enchantment.sharpness, 3).addEnchantmentForRanged(Enchantment.power, 3);
Fireleaf .addEnchantmentForDamage(Enchantment.sharpness, 3).addEnchantmentForRanged(Enchantment.power, 3);
VanadiumSteel .addEnchantmentForDamage(Enchantment.sharpness, 3).addEnchantmentForRanged(Enchantment.power, 3);
StainlessSteel .addEnchantmentForDamage(Enchantment.sharpness, 3).addEnchantmentForRanged(Enchantment.power, 3);
Knightmetal .addEnchantmentForDamage(Enchantment.sharpness, 3).addEnchantmentForRanged(Enchantment.power, 3);
Expand Down Expand Up @@ -2927,6 +2932,7 @@ static void init() {
Infinity .addEnchantmentForArmors(Enchantment.featherFalling,10);

Steeleaf .addEnchantmentForArmors(Enchantment.protection, 2);
Fireleaf .addEnchantmentForArmors(Enchantment.protection, 2);
Knightmetal .addEnchantmentForArmors(Enchantment.protection, 1);
Celenegil .addEnchantmentForArmors(Enchantment.protection, 4);
InfusedEarth .addEnchantmentForArmors(Enchantment.protection, 4);
Expand Down Expand Up @@ -3529,7 +3535,7 @@ static void init() {

Mauftrium.mHandleMaterial = Elvorium.mHandleMaterial = MuspelheimPower.mHandleMaterial = NiflheimPower.mHandleMaterial = ElvenElementium.mHandleMaterial = ElvenDragonstone.mHandleMaterial = Manasteel.mHandleMaterial = Terrasteel.mHandleMaterial = ManaDiamond.mHandleMaterial = Thaumium.mHandleMaterial = ANY.WoodMagical;
GaiaSpirit.mHandleMaterial = ElvenElementium;
FierySteel.mHandleMaterial = MeteoflameSteel.mHandleMaterial = MeteoflameBlackSteel.mHandleMaterial = MeteoflameBlueSteel.mHandleMaterial = MeteoflameRedSteel.mHandleMaterial = FlamascusSteel.mHandleMaterial = Firestone.mHandleMaterial = ANY.Blaze;
FierySteel.mHandleMaterial = Fireleaf.mHandleMaterial = MeteoflameSteel.mHandleMaterial = MeteoflameBlackSteel.mHandleMaterial = MeteoflameBlueSteel.mHandleMaterial = MeteoflameRedSteel.mHandleMaterial = FlamascusSteel.mHandleMaterial = Firestone.mHandleMaterial = ANY.Blaze;
Endium.mHandleMaterial = Endstone;
SpectreIron.mHandleMaterial = Obsidian;
EnderAmethyst.mHandleMaterial = Meteorite.mHandleMaterial = Kreknorite.mHandleMaterial = Sugilite.mHandleMaterial = ANY.Iron;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregapi/lang/LanguageHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,8 @@ public static String getLocalName(OreDictPrefix aPrefix, OreDictMaterial aMateri
if (aMaterial == MT.FierySteel) {
if (aPrefix.contains(TD.Prefix.IS_CONTAINER)) return aPrefix.mMaterialPre + "Fiery Blood" + aPrefix.mMaterialPost;
} else
if (aMaterial == MT.Steeleaf) {
if (aPrefix == OP.plantGtBlossom) return "Steeleaf Leaf";
if (aMaterial == MT.Steeleaf || aMaterial == MT.Fireleaf) {
if (aPrefix == OP.plantGtBlossom) return aMaterial.mNameLocal + " Leaf";
if (aPrefix.mNameInternal.startsWith("ingot")) return aPrefix.mMaterialPre + aMaterial.mNameLocal;
} else
if (aMaterial == MT.Bark) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/gregtech/loaders/c/Loader_Recipes_Handlers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,8 @@ public void run() {
RM.Bath .add(new RecipeMapHandlerMaterial(MT.Pb , MT.Midasium .liquid(U4, T) , 0, 144, NF, MT.Au , NI, T, tConditionP));


RM.Bath .add(new RecipeMapHandlerMaterial(MT.Steeleaf , FL.FieryBlood .make( L) , 0, 144, NF, MT.Fireleaf , NI, T, tConditionP));
RM.Bath .add(new RecipeMapHandlerMaterial(MT.Steeleaf , FL.FieryTears .make( L) , 0, 144, NF, MT.Fireleaf , NI, T, tConditionP));
RM.Bath .add(new RecipeMapHandlerMaterial(MT.MeteoricSteel , FL.FieryBlood .make( L) , 0, 144, NF, MT.MeteoflameSteel , NI, T, tConditionP));
RM.Bath .add(new RecipeMapHandlerMaterial(MT.MeteoricSteel , FL.FieryTears .make( L) , 0, 144, NF, MT.MeteoflameSteel , NI, T, tConditionP));
RM.Bath .add(new RecipeMapHandlerMaterial(MT.MeteoricBlackSteel , FL.FieryBlood .make( L) , 0, 144, NF, MT.MeteoflameBlackSteel , NI, T, tConditionP));
Expand Down

0 comments on commit 25f09e4

Please sign in to comment.