From 57157a91559f353f46b69249ff8e295081195fbb Mon Sep 17 00:00:00 2001 From: boubou19 Date: Wed, 18 Sep 2024 00:25:00 +0200 Subject: [PATCH] remove tf resistance nerfs --- .../java/tectech/loader/ConfigHandler.java | 8 ------ src/main/java/tectech/loader/MainLoader.java | 26 +------------------ 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/main/java/tectech/loader/ConfigHandler.java b/src/main/java/tectech/loader/ConfigHandler.java index cea8752c59a..b303db38cb8 100644 --- a/src/main/java/tectech/loader/ConfigHandler.java +++ b/src/main/java/tectech/loader/ConfigHandler.java @@ -8,7 +8,6 @@ @Config.RequiresMcRestart public class ConfigHandler { public static Debug debug = new Debug(); - public static Features features = new Features(); public static TeslaTweaks teslaTweaks = new TeslaTweaks(); @Config.Comment("Debug section") @@ -18,13 +17,6 @@ public static class Debug{ public boolean DEBUG_MODE; } - @Config.Comment("Features section") - public static class Features{ - @Config.Comment("Set to true to disable the block hardness nerf") - @Config.DefaultBoolean(false) - public boolean DISABLE_BLOCK_HARDNESS_NERF; - } - @Config.Comment("Tesla tweaks section") public static class TeslaTweaks{ @Config.Ignore() diff --git a/src/main/java/tectech/loader/MainLoader.java b/src/main/java/tectech/loader/MainLoader.java index 4490dfd8388..25aae818fad 100644 --- a/src/main/java/tectech/loader/MainLoader.java +++ b/src/main/java/tectech/loader/MainLoader.java @@ -78,7 +78,7 @@ public static void load() { } public static void postLoad() { - ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 4); + ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 2); progressBarPostLoad.step("Dreamcraft Compatibility"); if (NewHorizonsCoreMod.isModLoaded()) { @@ -98,30 +98,6 @@ public static void postLoad() { progressBarPostLoad.step("Recipes"); new BaseRecipeLoader().run(); TecTech.LOGGER.info("Recipe Init Done"); - - if (!ConfigHandler.features.DISABLE_BLOCK_HARDNESS_NERF) { - progressBarPostLoad.step("Nerf blocks blast resistance"); - adjustTwilightBlockResistance(); - TecTech.LOGGER.info("Blocks nerf done"); - } else { - progressBarPostLoad.step("Do not nerf blocks blast resistance"); - TecTech.LOGGER.info("Blocks were not nerfed"); - } - } - - private static void safeSetResistance(Block block, float resistance) { - if (block != null) { - block.setResistance(resistance); - } - } - - private static void adjustTwilightBlockResistance() { - if (TwilightForest.isModLoaded()) { - safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFShield"), 30); - safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFThorns"), 10); - safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFTowerTranslucent"), 30); - safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFDeadrock"), 5); - } } public static void onLoadCompleted() {