diff options
Diffstat (limited to 'src/main/java/tectech')
7 files changed, 34 insertions, 55 deletions
diff --git a/src/main/java/tectech/loader/TecTechConfig.java b/src/main/java/tectech/loader/TecTechConfig.java index 06ded34e01..7bf7eef72b 100644 --- a/src/main/java/tectech/loader/TecTechConfig.java +++ b/src/main/java/tectech/loader/TecTechConfig.java @@ -2,8 +2,6 @@ package tectech.loader; import java.io.File; -import net.minecraft.launchwrapper.Launch; - import eu.usrv.yamcore.config.ConfigManager; public class TecTechConfig extends ConfigManager { @@ -81,8 +79,6 @@ public class TecTechConfig extends ConfigManager { 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 @@ public class TecTechConfig extends ConfigManager { .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 index c7e778e49c..7bd94d2c77 100644 --- 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 index 162640e2a9..f20177950f 100644 --- a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -2983,8 +2983,6 @@ public class ResearchStationAssemblyLine implements Runnable { } private void addGodforgeRecipes() { - if (!tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) return; - if (EternalSingularity.isModLoaded()) { // Controller TTRecipeAdder.addResearchableAssemblylineRecipe( @@ -3682,7 +3680,7 @@ public class ResearchStationAssemblyLine implements Runnable { } 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 index 237ab8a849..36b8b03c12 100644 --- a/src/main/java/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/tectech/loader/thing/MachineLoader.java @@ -2228,32 +2228,29 @@ public class MachineLoader implements Runnable { .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 index 35f3454ce2..7844a6865e 100644 --- a/src/main/java/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/tectech/loader/thing/ThingsLoader.java @@ -61,13 +61,11 @@ public class ThingsLoader implements Runnable { 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 index 145ff7c5b3..4d08681720 100644 --- a/src/main/java/tectech/proxy/ClientProxy.java +++ b/src/main/java/tectech/proxy/ClientProxy.java @@ -44,14 +44,12 @@ public class ClientProxy extends CommonProxy { .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 index a53299f229..3667ebfd1d 100644 --- a/src/main/java/tectech/thing/block/BlockForgeOfGods.java +++ b/src/main/java/tectech/thing/block/BlockForgeOfGods.java @@ -23,9 +23,7 @@ public class BlockForgeOfGods extends Block { 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 |