New day, new gt breakage. (GTNewHorizons#3177)

evgengoldwar · Sep 13, 2024 · 862278c · 862278c
1 parent 9e0e16d
commit 862278c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 55 deletions.
diff --git a/src/main/java/tectech/loader/TecTechConfig.java b/src/main/java/tectech/loader/TecTechConfig.java
@@ -2,8 +2,6 @@
 
 import java.io.File;
 
-import net.minecraft.launchwrapper.Launch;
-
 import eu.usrv.yamcore.config.ConfigManager;
 
 public class TecTechConfig extends ConfigManager {
@@ -81,8 +79,6 @@ protected void PreInit() {
         TESLA_SINGLE_LOSS_PER_BLOCK = 1;
         TESLA_SINGLE_RANGE = 20;
         TESLA_VISUAL_EFFECT = true;
-
-        ENABLE_GOD_FORGE = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
     }
 
     /**
@@ -94,11 +90,6 @@ protected void Init() {
             .getBoolean("DebugMode", "debug", DEBUG_MODE, "Enables logging and other purely debug features");
         POWERLESS_MODE = _mainConfig
             .getBoolean("PowerlessMode", "debug", POWERLESS_MODE, "Enables 0EU/t multi block machinery");
-        ENABLE_GOD_FORGE = _mainConfig.getBoolean(
-            "EnableGodForge",
-            "debug",
-            ENABLE_GOD_FORGE,
-            "Enables the in progress God Forge; enabled automatically in dev env");
 
         BOOM_ENABLE = _mainConfig.getBoolean(
             "BoomEnable",

diff --git a/src/main/java/tectech/loader/recipe/Godforge.java b/src/main/java/tectech/loader/recipe/Godforge.java
@@ -50,7 +50,6 @@ public class Godforge implements Runnable {
 
     @Override
     public void run() {
-        if (!tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) return;
         // Solid to plasma recipes
         {
             // Fusion tier 1-3

diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
@@ -2983,8 +2983,6 @@ private void addEOHRecipes() {
     }
 
     private void addGodforgeRecipes() {
-        if (!tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) return;
-
         if (EternalSingularity.isModLoaded()) {
             // Controller
             TTRecipeAdder.addResearchableAssemblylineRecipe(
@@ -3682,7 +3680,7 @@ private void addWirelessEnergyRecipes() {
     }
 
     public void runLateRecipes() {
-        if (tectech.TecTech.configTecTech.ENABLE_GOD_FORGE && EternalSingularity.isModLoaded()) {
+        if (EternalSingularity.isModLoaded()) {
             // Shielding Casing
             TTRecipeAdder.addResearchableAssemblylineRecipe(
                 GTOreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.TranscendentMetal, 1),

diff --git a/src/main/java/tectech/loader/thing/MachineLoader.java b/src/main/java/tectech/loader/thing/MachineLoader.java
@@ -2228,32 +2228,29 @@ public void run() {
             .set(new MTEEnergyInfuser(EnergyInfuser.ID, "multimachine.em.infuser", "Energy Infuser").getStackForm(1));
         Machine_Multi_EyeOfHarmony.set(
             new MTEEyeOfHarmony(EyeofHarmony.ID, "multimachine.em.eye_of_harmony", "Eye of Harmony").getStackForm(1L));
-        if (tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) {
-            Machine_Multi_ForgeOfGods.set(
-                new MTEForgeOfGods(ForgeoftheGods.ID, "multimachine.em.forge_of_gods", "Forge of the Gods")
-                    .getStackForm(1L));
-            addItemTooltip(Machine_Multi_ForgeOfGods.get(1), GTValues.AuthorCloud);
-            Machine_Multi_SmeltingModule.set(
-                new MTESmeltingModule(
-                    HelioflarePowerForge.ID,
-                    "multimachine.em.smelting_module",
-                    "Helioflare Power Forge").getStackForm(1L));
-            addItemTooltip(Machine_Multi_SmeltingModule.get(1), GTValues.AuthorCloud);
-            Machine_Multi_MoltenModule.set(
-                new MTEMoltenModule(HeliofluxMeltingCore.ID, "multimachine.em.molten_module", "Helioflux Melting Core")
-                    .getStackForm(1L));
-            addItemTooltip(Machine_Multi_MoltenModule.get(1), GTValues.AuthorCloud);
-            Machine_Multi_PlasmaModule.set(
-                new MTEPlasmaModule(
-                    HeliothermalPlasmaFabricator.ID,
-                    "multimachine.em.plasma_module",
-                    "Heliothermal Plasma Fabricator").getStackForm(1L));
-            addItemTooltip(Machine_Multi_PlasmaModule.get(1), GTValues.AuthorCloud);
-            Machine_Multi_QuarkGluonPlasmaModule.set(
-                new MTEExoticModule(HeliofusionExoticizer.ID, "multimachine.em.exotic_module", "Heliofusion Exoticizer")
-                    .getStackForm(1L));
-            addItemTooltip(Machine_Multi_QuarkGluonPlasmaModule.get(1), GTValues.AuthorCloud);
-        }
+
+        Machine_Multi_ForgeOfGods.set(
+            new MTEForgeOfGods(ForgeoftheGods.ID, "multimachine.em.forge_of_gods", "Forge of the Gods")
+                .getStackForm(1L));
+        addItemTooltip(Machine_Multi_ForgeOfGods.get(1), GTValues.AuthorCloud);
+        Machine_Multi_SmeltingModule.set(
+            new MTESmeltingModule(HelioflarePowerForge.ID, "multimachine.em.smelting_module", "Helioflare Power Forge")
+                .getStackForm(1L));
+        addItemTooltip(Machine_Multi_SmeltingModule.get(1), GTValues.AuthorCloud);
+        Machine_Multi_MoltenModule.set(
+            new MTEMoltenModule(HeliofluxMeltingCore.ID, "multimachine.em.molten_module", "Helioflux Melting Core")
+                .getStackForm(1L));
+        addItemTooltip(Machine_Multi_MoltenModule.get(1), GTValues.AuthorCloud);
+        Machine_Multi_PlasmaModule.set(
+            new MTEPlasmaModule(
+                HeliothermalPlasmaFabricator.ID,
+                "multimachine.em.plasma_module",
+                "Heliothermal Plasma Fabricator").getStackForm(1L));
+        addItemTooltip(Machine_Multi_PlasmaModule.get(1), GTValues.AuthorCloud);
+        Machine_Multi_QuarkGluonPlasmaModule.set(
+            new MTEExoticModule(HeliofusionExoticizer.ID, "multimachine.em.exotic_module", "Heliofusion Exoticizer")
+                .getStackForm(1L));
+        addItemTooltip(Machine_Multi_QuarkGluonPlasmaModule.get(1), GTValues.AuthorCloud);
 
         // ===================================================================================================
         // Hatches

diff --git a/src/main/java/tectech/loader/thing/ThingsLoader.java b/src/main/java/tectech/loader/thing/ThingsLoader.java
@@ -61,13 +61,11 @@ public void run() {
 
         TTCasingsContainer.StabilisationFieldGenerators = new StabilisationFieldCasing();
 
-        if (tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) {
-            TTCasingsContainer.GodforgeCasings = new BlockGodforgeCasings();
-            TecTech.LOGGER.info("Godforge blocks registered.");
+        TTCasingsContainer.GodforgeCasings = new BlockGodforgeCasings();
+        TecTech.LOGGER.info("Godforge blocks registered.");
 
-            BlockGodforgeGlass.run();
-            TecTech.LOGGER.info("Godforge Glass registered");
-        }
+        BlockGodforgeGlass.run();
+        TecTech.LOGGER.info("Godforge Glass registered");
 
         BlockQuantumGlass.run();
         TecTech.LOGGER.info("Quantum Glass registered");

diff --git a/src/main/java/tectech/proxy/ClientProxy.java b/src/main/java/tectech/proxy/ClientProxy.java
@@ -44,14 +44,12 @@ public void registerRenderInfo() {
             .registerItemRenderer(Item.getItemFromBlock(eyeOfHarmonyRenderBlock), new EOHItemRenderer());
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEyeOfHarmony.class, new EOHTileEntitySR());
 
-        if (tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) {
-            BlockGodforgeGlass.renderID = RenderingRegistry.getNextAvailableRenderId();
-            RenderingRegistry.registerBlockHandler(BlockGodforgeGlass.renderID, new RenderGodforgeGlass());
+        BlockGodforgeGlass.renderID = RenderingRegistry.getNextAvailableRenderId();
+        RenderingRegistry.registerBlockHandler(BlockGodforgeGlass.renderID, new RenderGodforgeGlass());
 
-            MinecraftForgeClient
-                .registerItemRenderer(Item.getItemFromBlock(forgeOfGodsRenderBlock), new ItemRenderForgeOfGods());
-            ClientRegistry.bindTileEntitySpecialRenderer(TileEntityForgeOfGods.class, new RenderForgeOfGods());
-        }
+        MinecraftForgeClient
+            .registerItemRenderer(Item.getItemFromBlock(forgeOfGodsRenderBlock), new ItemRenderForgeOfGods());
+        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityForgeOfGods.class, new RenderForgeOfGods());
     }
 
     @Override

diff --git a/src/main/java/tectech/thing/block/BlockForgeOfGods.java b/src/main/java/tectech/thing/block/BlockForgeOfGods.java
@@ -23,9 +23,7 @@ public BlockForgeOfGods() {
         this.setCreativeTab(TecTech.creativeTabTecTech);
         this.setBlockName("Forge of the Gods Renderer");
         this.setLightLevel(100.0f);
-        if (TecTech.configTecTech.ENABLE_GOD_FORGE) {
-            registerOther(this);
-        }
+        registerOther(this);
     }
 
     @Override