diff options
7 files changed, 34 insertions, 32 deletions
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 cb27933eb7..9db2692037 100644 --- a/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java +++ b/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java @@ -2,6 +2,8 @@ package com.github.technus.tectech.loader; import java.io.File; +import net.minecraft.launchwrapper.Launch; + import eu.usrv.yamcore.config.ConfigManager; public class TecTechConfig extends ConfigManager { @@ -13,6 +15,11 @@ public class TecTechConfig extends ConfigManager { // final static to allow compiler to remove the debug code when this is false public static boolean DEBUG_MODE = false; public static boolean POWERLESS_MODE = false; + /** + * Not complete; enabled by default only in dev env + */ + public boolean ENABLE_GOD_FORGE; + public boolean BOOM_ENABLE; public boolean DISABLE_BLOCK_HARDNESS_NERF; public boolean EASY_SCAN; @@ -74,6 +81,8 @@ 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"); } /** @@ -85,6 +94,11 @@ 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/com/github/technus/tectech/loader/recipe/Godforge.java b/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java index 80f10fc44f..2a0cbf9e8e 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java @@ -51,7 +51,7 @@ public class Godforge implements Runnable { @Override public void run() { - + if (!com.github.technus.tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) return; // Solid to plasma recipes { // Fusion tier 1-3 diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index f9377143c4..0934ed87f2 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -5,23 +5,7 @@ import static com.google.common.math.LongMath.pow; import static common.Blocks.lscLapotronicEnergyUnit; import static goodgenerator.loader.Loaders.compactFusionCoil; import static goodgenerator.loader.Loaders.yottaFluidTankCell; -import static gregtech.api.enums.Mods.Avaritia; -import static gregtech.api.enums.Mods.AvaritiaAddons; -import static gregtech.api.enums.Mods.BloodMagic; -import static gregtech.api.enums.Mods.DraconicEvolution; -import static gregtech.api.enums.Mods.EternalSingularity; -import static gregtech.api.enums.Mods.ExtraUtilities; -import static gregtech.api.enums.Mods.GTNHIntergalactic; -import static gregtech.api.enums.Mods.GTPlusPlusEverglades; -import static gregtech.api.enums.Mods.GalacticraftAmunRa; -import static gregtech.api.enums.Mods.GalaxySpace; -import static gregtech.api.enums.Mods.GraviSuite; -import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; -import static gregtech.api.enums.Mods.SGCraft; -import static gregtech.api.enums.Mods.SuperSolarPanels; -import static gregtech.api.enums.Mods.Thaumcraft; -import static gregtech.api.enums.Mods.TinkersGregworks; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.INGOTS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -2981,6 +2965,8 @@ public class ResearchStationAssemblyLine implements Runnable { } private void addGodforgeRecipes() { + if (!com.github.technus.tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) return; + if (EternalSingularity.isModLoaded()) { // Controller TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -3675,7 +3661,7 @@ public class ResearchStationAssemblyLine implements Runnable { } public void runLateRecipes() { - if (EternalSingularity.isModLoaded()) { + if (com.github.technus.tectech.TecTech.configTecTech.ENABLE_GOD_FORGE && EternalSingularity.isModLoaded()) { // Shielding Casing TT_recipeAdder.addResearchableAssemblylineRecipe( GT_OreDictUnificator.get(OrePrefixes.block, MaterialsUEVplus.TranscendentMetal, 1), diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 5c5005503b..5e77d208d3 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -609,7 +609,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.ZPM64AWirelessEnergyHatch; import static gregtech.api.enums.MetaTileEntityIDs.ZPM65536AtLaserSourceHatch; import static gregtech.api.enums.MetaTileEntityIDs.ZPM65536AtLaserTargetHatch; import static gregtech.api.enums.MetaTileEntityIDs.ZPMVoltageBuckConverter; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -2478,7 +2477,8 @@ public class MachineLoader implements Runnable { Machine_Multi_EyeOfHarmony.set( new GT_MetaTileEntity_EM_EyeOfHarmony(EyeofHarmony.ID, "multimachine.em.eye_of_harmony", "Eye of Harmony") .getStackForm(1L)); - if (!NewHorizonsCoreMod.isModLoaded()) { + + if (com.github.technus.tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) { Machine_Multi_ForgeOfGods.set( new GT_MetaTileEntity_EM_ForgeOfGods( ForgeoftheGods.ID, diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index 11e4415080..6dfa49eec2 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -2,7 +2,6 @@ package com.github.technus.tectech.loader.thing; import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.TecTech.tectechTexturePage1; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.block.GodforgeGlassBlock; @@ -65,14 +64,12 @@ public class ThingsLoader implements Runnable { TT_Container_Casings.StabilisationFieldGenerators = new StabilisationFieldCasing(); - if (!NewHorizonsCoreMod.isModLoaded()) { - + if (com.github.technus.tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) { TT_Container_Casings.GodforgeCasings = new GodforgeCasings(); TecTech.LOGGER.info("Godforge blocks registered."); GodforgeGlassBlock.run(); TecTech.LOGGER.info("Godforge Glass registered"); - } QuantumGlassBlock.run(); diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java index da5f46e002..289f01d359 100644 --- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java @@ -39,16 +39,19 @@ public class ClientProxy extends CommonProxy { public void registerRenderInfo() { QuantumGlassBlock.renderID = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(QuantumGlassBlock.renderID, new QuantumGlassRender()); - GodforgeGlassBlock.renderID = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(GodforgeGlassBlock.renderID, new GodforgeGlassRender()); MinecraftForgeClient .registerItemRenderer(Item.getItemFromBlock(eyeOfHarmonyRenderBlock), new EOH_ItemRenderer()); - MinecraftForgeClient - .registerItemRenderer(Item.getItemFromBlock(forgeOfGodsRenderBlock), new RenderForgeOfGodsItem()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEyeOfHarmony.class, new EOH_TESR()); - ClientRegistry.bindTileEntitySpecialRenderer(TileForgeOfGods.class, new RenderForgeOfGods()); + + if (com.github.technus.tectech.TecTech.configTecTech.ENABLE_GOD_FORGE) { + GodforgeGlassBlock.renderID = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(GodforgeGlassBlock.renderID, new GodforgeGlassRender()); + + MinecraftForgeClient + .registerItemRenderer(Item.getItemFromBlock(forgeOfGodsRenderBlock), new RenderForgeOfGodsItem()); + ClientRegistry.bindTileEntitySpecialRenderer(TileForgeOfGods.class, new RenderForgeOfGods()); + } } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/block/ForgeOfGodsBlock.java b/src/main/java/com/github/technus/tectech/thing/block/ForgeOfGodsBlock.java index 02be399bb0..38e4b4c5b6 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/ForgeOfGodsBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/ForgeOfGodsBlock.java @@ -24,7 +24,9 @@ public class ForgeOfGodsBlock extends Block { this.setCreativeTab(TecTech.creativeTabTecTech); this.setBlockName("Forge of the Gods Renderer"); this.setLightLevel(100.0f); - registerOther(this); + if (TecTech.configTecTech.ENABLE_GOD_FORGE) { + registerOther(this); + } } @Override |