Merge branch 'master' of https://github.com/Technus/TecTech

2 files changed, 20 insertions, 11 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index bab6c6d092..d473da6b07 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -153,9 +153,14 @@ public final class MainLoader {
         registerExtraHazmats();
         TecTech.LOGGER.info("Hazmat additions done");
 
-        progressBarPostLoad.step("Nerf blocks blast resistance");
-        fixBlocks();
-        TecTech.LOGGER.info("Blocks nerf done");
+        if (!configTecTech.DISABLE_BLOCK_HARDNESS_NERF) {
+            progressBarPostLoad.step("Nerf blocks blast resistance");
+            fixBlocks();
+            TecTech.LOGGER.info("Blocks nerf done");
+        } else {
+            progressBarPostLoad.step("Do not nerf blocks blast resistance");
+            TecTech.LOGGER.info("Blocks were not nerfed");
+        }
 
         progressBarPostLoad.step("Constructable stuff");
         new ConstructableLoader().run();
diff --git a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
index e16580befe..0c2920e585 100644
--- a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
+++ b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java
@@ -18,6 +18,7 @@ public class TecTechConfig extends ConfigManager {
     public boolean NERF_FUSION;
     public boolean ENABLE_TURRET_EXPLOSIONS;
     public boolean DISABLE_MATERIAL_LOADING_FFS;
+    public boolean DISABLE_BLOCK_HARDNESS_NERF;
     public float TURRET_DAMAGE_FACTOR;
     public float TURRET_EXPLOSION_FACTOR;
     public float TESLA_MULTI_MIN_EFFICIENCY;
@@ -38,8 +39,9 @@ public class TecTechConfig extends ConfigManager {
         EASY_SCAN = false;
         BOOM_ENABLE = true;
         NERF_FUSION = false;
+        DISABLE_BLOCK_HARDNESS_NERF = false;
         ENABLE_TURRET_EXPLOSIONS = true;
-        DISABLE_MATERIAL_LOADING_FFS=false;
+        DISABLE_MATERIAL_LOADING_FFS = false;
         TURRET_DAMAGE_FACTOR = 10;
         TURRET_EXPLOSION_FACTOR = 1;
         TESLA_MULTI_MIN_EFFICIENCY = 0.955F;
@@ -72,19 +74,21 @@ public class TecTechConfig extends ConfigManager {
                 "Damage is multiplied by this number");
         TURRET_EXPLOSION_FACTOR = _mainConfig.getFloat("TurretExplosionFactor", "Features", TURRET_EXPLOSION_FACTOR, 0, Short.MAX_VALUE,
                 "Explosion strength is multiplied by this number");
-        DISABLE_MATERIAL_LOADING_FFS =  _mainConfig.getBoolean("DisableMaterialLoading", "Debug", DISABLE_MATERIAL_LOADING_FFS,
+        DISABLE_BLOCK_HARDNESS_NERF = _mainConfig.getBoolean("DisableBlockHardnessNerf", "Features", DISABLE_BLOCK_HARDNESS_NERF,
+                "Set to true to disable the block hardness nerf");
+        DISABLE_MATERIAL_LOADING_FFS = _mainConfig.getBoolean("DisableMaterialLoading", "Debug", DISABLE_MATERIAL_LOADING_FFS,
                 "Set to true to disable gregtech material processing");
-        TESLA_MULTI_MIN_EFFICIENCY =  _mainConfig.getFloat("teslaMultiMinEfficency", "Features", TESLA_MULTI_MIN_EFFICIENCY, 0, 1,
+        TESLA_MULTI_MIN_EFFICIENCY = _mainConfig.getFloat("teslaMultiMinEfficency", "Features", TESLA_MULTI_MIN_EFFICIENCY, 0, 1,
                 "Worst possible power loss per block for the multi block tesla");
-        TESLA_MULTI_MAX_EFFICIENCY =  _mainConfig.getFloat("teslaMultiMaxEfficency", "Features", TESLA_MULTI_MAX_EFFICIENCY, 0, 1,
+        TESLA_MULTI_MAX_EFFICIENCY = _mainConfig.getFloat("teslaMultiMaxEfficency", "Features", TESLA_MULTI_MAX_EFFICIENCY, 0, 1,
                 "Best possible power loss per block for the multi block tesla");
-        TESLA_MULTI_OVERDRIVE_LOSS =  _mainConfig.getFloat("teslaMultiOverdriveLoss", "Features", TESLA_MULTI_OVERDRIVE_LOSS, 0, 1,
+        TESLA_MULTI_OVERDRIVE_LOSS = _mainConfig.getFloat("teslaMultiOverdriveLoss", "Features", TESLA_MULTI_OVERDRIVE_LOSS, 0, 1,
                 "Additional losses for overdrive use on the multi block tesla");
-        TESLA_SINGLE_MIN_EFFICIENCY =  _mainConfig.getFloat("teslaSingleMinEfficency", "Features", TESLA_SINGLE_MIN_EFFICIENCY, 0, 1,
+        TESLA_SINGLE_MIN_EFFICIENCY = _mainConfig.getFloat("teslaSingleMinEfficency", "Features", TESLA_SINGLE_MIN_EFFICIENCY, 0, 1,
                 "Worst possible power loss per block for the single block tesla");
-        TESLA_SINGLE_MAX_EFFICIENCY =  _mainConfig.getFloat("teslaSingleMaxEfficency", "Features", TESLA_SINGLE_MAX_EFFICIENCY, 0, 1,
+        TESLA_SINGLE_MAX_EFFICIENCY = _mainConfig.getFloat("teslaSingleMaxEfficency", "Features", TESLA_SINGLE_MAX_EFFICIENCY, 0, 1,
                 "Best possible power loss per block for the single block tesla");
-        TESLA_SINGLE_OVERDRIVE_LOSS =  _mainConfig.getFloat("teslaSingleOverdriveLoss", "Features", TESLA_SINGLE_OVERDRIVE_LOSS, 0, 1,
+        TESLA_SINGLE_OVERDRIVE_LOSS = _mainConfig.getFloat("teslaSingleOverdriveLoss", "Features", TESLA_SINGLE_OVERDRIVE_LOSS, 0, 1,
                 "Additional losses for overdrive use on the single block tesla");
     }