Browse Source

Fixed the Blue Steel, Red Steel swapped Recipes. Now it is actually in line with the TFC Alloy Recipe

Gregorius Techneticies 2 months ago
parent
commit
5747bb03f2
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 1
- 0
CHANGELOG.md View File

@@ -13,6 +13,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
13 13
 [COMPAT] Aroma1997's Mining Dimension is now Compatible with my Worldgen.
14 14
 [FIXED] Chainsaws used WAY too much durability for Treecapitation!
15 15
 [FIXED] Worldgeneration in different Dimensions had the same RNG as on the Overworld. Now the Seed is being XOR-ed with the Dimension ID to prevent that. This has the convenient Side Effect of the Overworld staying the same as before, because it's ID is Zero.
16
+[CHANGED] Blue Steel is Red Steel now and vice versa. This should fix my ages old fuckup of the Recipes. Everything should still be the same as before when it comes to Stats, just the Color of the Material changed. If you used Matter Fabricators to make Blue Steel for some reason, you may need to check the USB Stick with the Recipe.
16 17
 [ADDED] Barbecue Sauce (BBQ Sauce), because why not.
17 18
 [ADDED] Axes, Saws and Chainsaws can now place Saplings too. They will still place Workbenches if Saplings cant be placed.
18 19
 [ADDED] Tooltip for Covers that can be controlled with the Cover Controller Cover. In case of Covers where the Cover Controller Cover is required (such as Shutter Cover), it will be Cyan instead of Dark Gray to make it easier to see.

+ 5
- 5
src/main/java/gregapi/data/MT.java View File

@@ -1551,8 +1551,8 @@ public class MT {
1551 1551
 	
1552 1552
 	Steel                   = alloymachore  ( 8630, "Steel"                                         , 130, 130, 130     , MOLTEN, RAILS, MORTAR, MAGNETIC_PASSIVE).qual(3,  6.0,  512, 2)                                                                           .uumMcfg( 0, WroughtIron    , 1*U)                                                                                                                          .aspects(TC.METALLUM, 2, TC.ORDO, 1).heat(2046, Fe.mBoilingPoint, Fe.mPlasmaPoint).setRGBaLiquid(255, 20, 10, 255),
1553 1553
 	BlackSteel              = alloymachine  ( 8631, "Black Steel"                                   ,  90,  90,  90     , MOLTEN).qual(3,  6.5,  768, 2)                                                                                                            .uumAloy( 0, Ni             , 1*U, BlackBronze      , 1*U, Steel            , 3*U)                                                                          .aspects(TC.METALLUM, 2, TC.ORDO, 1, TC.INSTRUMENTUM, 1),
1554
-	RedSteel                = alloymachine  ( 8632, "Red Steel"                                     , 140, 100, 100     , MOLTEN).qual(3,  7.0,  896, 2)                                                                                                            .setAloy( 0, SterlingSilver , 1*U, BismuthBronze    , 1*U, Steel            , 2*U, BlackSteel       , 4*U)                                                  .aspects(TC.METALLUM, 2, TC.ORDO, 1, TC.INSTRUMENTUM, 1),
1555
-	BlueSteel               = alloymachine  ( 8633, "Blue Steel"                                    , 100, 100, 140     , MOLTEN).qual(3,  7.5, 1024, 2)                                                                                                            .uumAloy( 0, RoseGold       , 1*U, Brass            , 1*U, Steel            , 2*U, BlackSteel       , 4*U)                                                  .aspects(TC.METALLUM, 2, TC.ORDO, 1, TC.INSTRUMENTUM, 1),
1554
+	BlueSteel               = alloymachine  ( 8632, "Blue Steel"                                    , 100, 100, 140     , MOLTEN).qual(3,  7.0,  896, 2)                                                                                                            .setAloy( 0, SterlingSilver , 1*U, BismuthBronze    , 1*U, Steel            , 2*U, BlackSteel       , 4*U)                                                  .aspects(TC.METALLUM, 2, TC.ORDO, 1, TC.INSTRUMENTUM, 1),
1555
+	RedSteel                = alloymachine  ( 8633, "Red Steel"                                     , 140, 100, 100     , MOLTEN).qual(3,  7.5, 1024, 2)                                                                                                            .uumAloy( 0, RoseGold       , 1*U, Brass            , 1*U, Steel            , 2*U, BlackSteel       , 4*U)                                                  .aspects(TC.METALLUM, 2, TC.ORDO, 1, TC.INSTRUMENTUM, 1),
1556 1556
 	DamascusSteel           = alloymachine  ( 8634, "Damascus Steel"                                , 110, 110, 110     , MOLTEN, CENTRIFUGE, MAGNETIC_PASSIVE).qual(3,  8.0, 1280, 2)                                                                              .uumMcfg(50, Steel          ,50*U, V                , 1*U, W                , 1*U)                                                                          .aspects(TC.METALLUM, 2, TC.ORDO, 1, TC.INSTRUMENTUM, 1, TC.TELUM, 1),
1557 1557
 	VanadiumSteel           = alloymachine  ( 8653, "VanadiumSteel"                                 , 100, 100, 100     , MOLTEN, MAGNETIC_PASSIVE).qual(3, 7.0, 512, 3)                                                                                            .uumAloy( 0, Steel          , 4*U, V                , 1*U)                                                                                                  .aspects(TC.METALLUM, 2, TC.ORDO, 1, TC.INSTRUMENTUM, 1).setLocal("Vanadiumsteel"),
1558 1558
 	TungstenSteel           = alloymachine  ( 8635, "Tungstensteel"                                 , 100, 100, 160     , MOLTEN, RAILS, MAGNETIC_PASSIVE, UNBURNABLE, "TungstenSteel", "Wolframsteel", "WolframSteel").qual(3, 10.0, 5120, 4)                      .uumAloy( 0, Steel          , 1*U, W                , 1*U)                                                                                                  .aspects(TC.METALLUM, 2, TC.ORDO, 1, TC.TUTAMEN, 1),
@@ -2450,7 +2450,7 @@ public class MT {
2450 2450
 			
2451 2451
 			Hepatizon               .addEnchantmentForTools(Enchantment.smite, 2);
2452 2452
 			BlackBronze             .addEnchantmentForTools(Enchantment.smite, 2);
2453
-			BlueSteel               .addEnchantmentForTools(Enchantment.smite, 3);
2453
+			RedSteel                .addEnchantmentForTools(Enchantment.smite, 3);
2454 2454
 			Au                      .addEnchantmentForTools(Enchantment.smite, 3);
2455 2455
 			TitaniumGold            .addEnchantmentForTools(Enchantment.smite, 3);
2456 2456
 			Electrum                .addEnchantmentForTools(Enchantment.smite, 3);
@@ -2902,8 +2902,8 @@ public class MT {
2902 2902
 			Lumium                  .addAlloyingRecipe(new OreDictConfigurationComponent( 4, OM.stack(Sn                            , 3*U), OM.stack(Ag                 , 1*U), OM.stack(tMat, 4*U)));
2903 2903
 			}
2904 2904
 			BlackSteel              .addAlloyingRecipe(new OreDictConfigurationComponent( 5, OM.stack(Ni                            , 1*U), OM.stack(BlackBronze        , 1*U), OM.stack(MeteoricSteel, 3*U)));
2905
-			RedSteel                .addAlloyingRecipe(new OreDictConfigurationComponent( 8, OM.stack(SterlingSilver                , 1*U), OM.stack(BismuthBronze      , 1*U), OM.stack(MeteoricSteel, 2*U), OM.stack(BlackSteel , 4*U)));
2906
-			BlueSteel               .addAlloyingRecipe(new OreDictConfigurationComponent( 8, OM.stack(RoseGold                      , 1*U), OM.stack(Brass              , 1*U), OM.stack(MeteoricSteel, 2*U), OM.stack(BlackSteel , 4*U)));
2905
+			BlueSteel               .addAlloyingRecipe(new OreDictConfigurationComponent( 8, OM.stack(SterlingSilver                , 1*U), OM.stack(BismuthBronze      , 1*U), OM.stack(MeteoricSteel, 2*U), OM.stack(BlackSteel , 4*U)));
2906
+			RedSteel                .addAlloyingRecipe(new OreDictConfigurationComponent( 8, OM.stack(RoseGold                      , 1*U), OM.stack(Brass              , 1*U), OM.stack(MeteoricSteel, 2*U), OM.stack(BlackSteel , 4*U)));
2907 2907
 			TungstenSteel           .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(MeteoricSteel                 , 1*U), OM.stack(W                  , 1*U)));
2908 2908
 			TungstenSteel           .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(MeteoricSteel                 , 1*U), OM.stack(TungstenSintered   , 1*U)));
2909 2909
 			TungstenSteel           .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(Steel                         , 1*U), OM.stack(TungstenSintered   , 1*U)));

+ 3
- 3
src/main/java/gregapi/enchants/Enchantment_EnderDamage.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -45,8 +45,8 @@ public class Enchantment_EnderDamage extends EnchantmentDamage {
45 45
 		MT.Electrum         .addEnchantmentForTools(this, 3);
46 46
 		MT.BlackBronze      .addEnchantmentForTools(this, 2);
47 47
 		MT.BlackSteel       .addEnchantmentForTools(this, 2);
48
-		MT.RedSteel         .addEnchantmentForTools(this, 3);
49
-		MT.BlueSteel        .addEnchantmentForTools(this, 1);
48
+		MT.RedSteel         .addEnchantmentForTools(this, 1);
49
+		MT.BlueSteel        .addEnchantmentForTools(this, 3);
50 50
 		MT.ElectrumFlux     .addEnchantmentForTools(this, 3);
51 51
 		MT.Meutoite         .addEnchantmentForTools(this, 3);
52 52
 		MT.SterlingSilver   .addEnchantmentForTools(this, 4);

+ 3
- 3
src/main/java/gregapi/enchants/Enchantment_WerewolfDamage.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -53,8 +53,8 @@ public class Enchantment_WerewolfDamage extends EnchantmentDamage {
53 53
 		MT.Electrum         .addEnchantmentForTools(this, 3);
54 54
 		MT.BlackBronze      .addEnchantmentForTools(this, 2);
55 55
 		MT.BlackSteel       .addEnchantmentForTools(this, 2);
56
-		MT.RedSteel         .addEnchantmentForTools(this, 3);
57
-		MT.BlueSteel        .addEnchantmentForTools(this, 1);
56
+		MT.RedSteel         .addEnchantmentForTools(this, 1);
57
+		MT.BlueSteel        .addEnchantmentForTools(this, 3);
58 58
 		MT.SterlingSilver   .addEnchantmentForTools(this, 4);
59 59
 		MT.AstralSilver     .addEnchantmentForTools(this, 5);
60 60
 		MT.VibraniumSilver  .addEnchantmentForTools(this,10);

+ 2
- 2
src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java View File

@@ -2134,8 +2134,8 @@ public class Loader_MultiTileEntities implements Runnable {
2134 2134
 		aMat = MT.Thaumium;         aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32032, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         25000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2135 2135
 		aMat = MT.Manasteel;        aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32033, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         25000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2136 2136
 		aMat = MT.BlackSteel;       aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32034, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         30000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2137
-		aMat = MT.RedSteel;         aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32035, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         40000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2138
-		aMat = MT.BlueSteel;        aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32036, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         50000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2137
+		aMat = MT.BlueSteel;        aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32035, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         40000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2138
+		aMat = MT.RedSteel;         aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32036, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         50000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2139 2139
 		aMat = MT.VanadiumSteel;    aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32037, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         70000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2140 2140
 		aMat = MT.Octine;           aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32038, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         80000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));
2141 2141
 		aMat = MT.FierySteel;       aRegistry.add(aMat.mNameLocal + " Anvil"                            , "Misc Tool Blocks"                    , 32039, 32720, MultiTileEntityAnvil.class                              ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F                           , NBT_DURABILITY,         90000000L), "III", "hI ", "III", 'I', OP.ingot.dat(aMat));

Loading…
Cancel
Save