diff options
Diffstat (limited to 'src/main/java')
19 files changed, 181 insertions, 246 deletions
diff --git a/src/main/java/detrav/DetravScannerMod.java b/src/main/java/detrav/DetravScannerMod.java index d9efd632a0..d79ed76010 100644 --- a/src/main/java/detrav/DetravScannerMod.java +++ b/src/main/java/detrav/DetravScannerMod.java @@ -3,7 +3,6 @@ package detrav; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.config.Configuration; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; @@ -28,9 +27,6 @@ public class DetravScannerMod { public static final String MODID = "detravscannermod"; public static final boolean DEBUG_ENABLED = Boolean.parseBoolean(System.getProperty("com.detrav.debug", "false")); public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab(); - public static boolean isDreamcraftLoaded = false; - public static boolean isBartWorksLoaded = false; - public static boolean isGTppLoaded = false; @SidedProxy(clientSide = "detrav.proxies.ClientProxy", serverSide = "detrav.proxies.ServerProxy") public static CommonProxy proxy; @@ -40,10 +36,6 @@ public class DetravScannerMod { public DetravScannerMod() { GregTechAPI.sAfterGTPreload.add(new DetravLoaderAfterGTPreload()); - isDreamcraftLoaded = Loader.isModLoaded("dreamcraft"); - isBartWorksLoaded = Loader.isModLoaded("bartworks"); - isGTppLoaded = Loader.isModLoaded("miscutils"); - new DetravNetwork(); } @@ -68,7 +60,7 @@ public class DetravScannerMod { @EventHandler public void onPostLoad(FMLPostInitializationEvent aEvent) { proxy.onPostLoad(); - if (isGTppLoaded) GTppHelper.generate_OreIDs(); + GTppHelper.generate_OreIDs(); FluidColors.makeColors(); } } diff --git a/src/main/java/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/detrav/items/DetravMetaGeneratedTool01.java index e704631467..c171f56561 100644 --- a/src/main/java/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/detrav/items/DetravMetaGeneratedTool01.java @@ -16,6 +16,7 @@ import detrav.items.tools.DetravProspector; import detrav.items.tools.DetravToolElectricProspector; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.TCAspects; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.MetaGeneratedTool; @@ -280,7 +281,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool { public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) { ItemStack dStack; - if (DetravScannerMod.isDreamcraftLoaded) { + if (Mods.NewHorizonsCoreMod.isModLoaded()) { // Materials at tiers list.add(getToolWithStats(0, 1, Materials.Polycaprolactam, Materials.Polycaprolactam, null)); list.add(getToolWithStats(2, 1, Materials.Steel, Materials.Steel, null)); @@ -327,7 +328,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool { setCharge(dStack, 409600000L); list.add(dStack); - if (DetravScannerMod.isDreamcraftLoaded) { + if (Mods.NewHorizonsCoreMod.isModLoaded()) { dStack = getToolWithStats( 104, 1, diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java index 25da8b6277..56f97ea862 100644 --- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java +++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java @@ -17,13 +17,12 @@ import net.minecraftforge.fluids.FluidStack; import com.sinthoras.visualprospecting.VisualProspecting_API; -import cpw.mods.fml.common.Loader; -import detrav.DetravScannerMod; import detrav.items.DetravMetaGeneratedTool01; import detrav.net.DetravNetwork; import detrav.net.ProspectingPacket; import detrav.utils.BartWorksHelper; import detrav.utils.GTppHelper; +import gregtech.api.enums.Mods; import gregtech.api.items.MetaBaseItem; import gregtech.api.objects.ItemData; import gregtech.api.util.GTLanguageManager; @@ -119,13 +118,13 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID); } } - } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) { + } else if (GTppHelper.isGTppBlock(tBlock)) { packet.addBlock( c.xPosition * 16 + x, y, c.zPosition * 16 + z, GTppHelper.getGTppMeta(tBlock)); - } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) { + } else if (BartWorksHelper.isOre(tBlock)) { if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue; packet.addBlock( c.xPosition * 16 + x, @@ -182,7 +181,7 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer); if (!aPlayer.capabilities.isCreativeMode) tool.doDamage(aStack, this.mCosts * chunks.size()); - if (Loader.isModLoaded("visualprospecting")) { + if (Mods.VisualProspecting.isModLoaded()) { if (data == 0 || data == 1) { VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( (EntityPlayerMP) aPlayer, diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java index c914640573..45b4c7fb29 100644 --- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -23,7 +23,6 @@ import net.minecraftforge.fluids.FluidStack; import com.sinthoras.visualprospecting.VisualProspecting_API; import bartworks.system.material.Werkstoff; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.LanguageRegistry; import detrav.DetravScannerMod; import detrav.items.DetravMetaGeneratedTool01; @@ -31,6 +30,7 @@ import detrav.utils.BartWorksHelper; import detrav.utils.GTppHelper; import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.items.MetaBaseItem; import gregtech.api.objects.ItemData; import gregtech.api.util.GTLanguageManager; @@ -82,7 +82,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { if (!aPlayer.capabilities.isCreativeMode) ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts); - if (Loader.isModLoaded("visualprospecting")) { + if (Mods.VisualProspecting.isModLoaded()) { VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( (EntityPlayerMP) aPlayer, new ArrayList<>(), @@ -213,7 +213,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { aPlayer.addChatMessage(msg); } - if (Loader.isModLoaded("visualprospecting")) { + if (Mods.VisualProspecting.isModLoaded()) { VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( (EntityPlayerMP) aPlayer, VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius( @@ -249,7 +249,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { addChatMassageByValue(aPlayer, value, key); } - if (Loader.isModLoaded("visualprospecting")) { + if (Mods.VisualProspecting.isModLoaded()) { VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( (EntityPlayerMP) aPlayer, VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius( @@ -311,10 +311,10 @@ public class BehaviourDetravToolProspector extends BehaviourNone { addOreToHashMap(name, aPlayer); } } - } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) { + } else if (GTppHelper.isGTppBlock(tBlock)) { String name = GTppHelper.getGTppVeinName(tBlock); if (!name.isEmpty()) addOreToHashMap(name, aPlayer); - } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) { + } else if (BartWorksHelper.isOre(tBlock)) { if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue; final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault( (short) ((BartWorksHelper.getMetaFromBlock(aChunk, x, y, z, tBlock)) * -1), diff --git a/src/main/java/galacticgreg/WorldgenOreLayerSpace.java b/src/main/java/galacticgreg/WorldgenOreLayerSpace.java index c28eb7a392..3cd0a8baa4 100644 --- a/src/main/java/galacticgreg/WorldgenOreLayerSpace.java +++ b/src/main/java/galacticgreg/WorldgenOreLayerSpace.java @@ -54,7 +54,7 @@ public class WorldgenOreLayerSpace extends GTWorldgen { allowedDims = new HashMap<>(); for (ModContainer mc : GalacticGregRegistry.getModContainers()) { - if (!mc.getEnabled()) continue; + if (!mc.isModLoaded()) continue; for (ModDimensionDef mdd : mc.getDimensionList()) { String tDimIdentifier = mdd.getDimIdentifier(); diff --git a/src/main/java/galacticgreg/WorldgenOreSmallSpace.java b/src/main/java/galacticgreg/WorldgenOreSmallSpace.java index 18dd338ec3..95b40c69eb 100644 --- a/src/main/java/galacticgreg/WorldgenOreSmallSpace.java +++ b/src/main/java/galacticgreg/WorldgenOreSmallSpace.java @@ -34,7 +34,7 @@ public class WorldgenOreSmallSpace extends GTWorldgen { allowedDims = new HashMap<>(); for (ModContainer mc : GalacticGregRegistry.getModContainers()) { - if (!mc.getEnabled()) continue; + if (!mc.isModLoaded()) continue; for (ModDimensionDef mdd : mc.getDimensionList()) { String tDimIdentifier = mdd.getDimIdentifier(); diff --git a/src/main/java/galacticgreg/api/ModContainer.java b/src/main/java/galacticgreg/api/ModContainer.java index 37721cd38c..fa5a33f4c6 100644 --- a/src/main/java/galacticgreg/api/ModContainer.java +++ b/src/main/java/galacticgreg/api/ModContainer.java @@ -3,6 +3,8 @@ package galacticgreg.api; import java.util.ArrayList; import java.util.List; +import gregtech.api.enums.Mods; + /** * Defines a Mod where this Generator shall be active. Note: This will only work (obviously) for Dimensions where * either: - Gregtech has a hook in the OreGen or - For mods which are addons to GalactiCraft @@ -10,47 +12,30 @@ import java.util.List; */ public class ModContainer { - private String _mModName; - private List<ModDimensionDef> _mDimensionLookup; - private boolean _mEnabled = false; - - /** - * Internal function - * - * @return The state if the Registry could find the mod or not - */ - public boolean getEnabled() { - return _mEnabled; - } - - /** - * Internal function - * - * Never set this to true. This is an internal marker which is set by the registry if the mod could be found or not - * - * @param pEnabled - */ - public void setEnabled(boolean pEnabled) { - _mEnabled = pEnabled; - } + private final List<ModDimensionDef> _mDimensionLookup; + private final Mods mod; /** * Define a new Mod where GT OreGen shall be enabled * - * @param pModName The modID. Make sure to use the proper mod-id, or it won't load correctly + * @param mod The Mods enum value. */ - public ModContainer(String pModName) { - _mModName = pModName; + public ModContainer(Mods mod) { + this.mod = mod; _mDimensionLookup = new ArrayList<>(); } + public boolean isModLoaded() { + return this.mod.isModLoaded(); + } + /** * Internal function * * @return The mods name */ public String getModName() { - return _mModName; + return mod.ID; } /** @@ -78,7 +63,7 @@ public class ModContainer { } // Set the parent modName of this dimension. This will finalize it - pDimDef.setParentModName(_mModName); + pDimDef.setParentModName(mod.ID); _mDimensionLookup.add(pDimDef); return true; } diff --git a/src/main/java/galacticgreg/api/enums/ModContainers.java b/src/main/java/galacticgreg/api/enums/ModContainers.java index 7352e5a75c..ddac1e14d5 100644 --- a/src/main/java/galacticgreg/api/enums/ModContainers.java +++ b/src/main/java/galacticgreg/api/enums/ModContainers.java @@ -5,11 +5,11 @@ import gregtech.api.enums.Mods; public enum ModContainers { - GalactiCraftCore(new ModContainer(Mods.GalacticraftCore.ID)), - GalacticraftMars(new ModContainer(Mods.GalacticraftMars.ID)), - GalaxySpace(new ModContainer(Mods.GalaxySpace.ID)), - AmunRa(new ModContainer("GalacticraftAmunRa")), - Vanilla(new ModContainer("Vanilla")); + GalactiCraftCore(new ModContainer(Mods.GalacticraftCore)), + GalacticraftMars(new ModContainer(Mods.GalacticraftMars)), + GalaxySpace(new ModContainer(Mods.GalaxySpace)), + AmunRa(new ModContainer(Mods.GalacticraftAmunRa)), + Vanilla(new ModContainer(Mods.Minecraft)); public final ModContainer modContainer; diff --git a/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java b/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java index 87dad97f35..33e1f6a750 100644 --- a/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java +++ b/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java @@ -40,7 +40,7 @@ public class DynamicDimensionConfig { public static boolean InitDynamicConfig() { try { for (ModContainer mc : GalacticGregRegistry.getModContainers()) { - if (!mc.getEnabled()) continue; + if (!mc.isModLoaded()) continue; for (ModDimensionDef mdd : mc.getDimensionList()) { DimensionType dt = mdd.getDimensionType(); diff --git a/src/main/java/galacticgreg/registry/GalacticGregRegistry.java b/src/main/java/galacticgreg/registry/GalacticGregRegistry.java index 9dc5d0fa04..ee12baeb17 100644 --- a/src/main/java/galacticgreg/registry/GalacticGregRegistry.java +++ b/src/main/java/galacticgreg/registry/GalacticGregRegistry.java @@ -1,14 +1,11 @@ package galacticgreg.registry; -import static galacticgreg.api.enums.ModContainers.Vanilla; - import java.util.Collection; import java.util.HashMap; import java.util.Map; import net.minecraft.world.chunk.IChunkProvider; -import cpw.mods.fml.common.Loader; import galacticgreg.GalacticGreg; import galacticgreg.api.Enums.DimensionType; import galacticgreg.api.ModContainer; @@ -22,54 +19,46 @@ import galacticgreg.generators.GenEllipsoid; */ public class GalacticGregRegistry { - private static final Map<String, ModContainer> _mModContainers = new HashMap<>(); - public static final String DIM_UNKNOWN = "GGREG_DIMENSION_UNKNOWN"; - private static boolean _mInitializationDone = false; + private static final Map<String, ModContainer> modContainers = new HashMap<>(); + private static boolean initializationDone = false; /** * Register new ModContainer in the registry. Call this after you've populated it with Dimensions and Blocks Must be * called from your own PreInit or Init event - * - * @param pModContainer - * @return */ - public static boolean registerModContainer(ModContainer pModContainer) { - if (_mInitializationDone) { + public static void registerModContainer(ModContainer modContainer) { + if (initializationDone) { GalacticGreg.Logger.warn("Initialization is already done, you can't add more ModContainers!"); - return false; + return; } - if (_mModContainers.containsKey(pModContainer.getModName())) { + if (modContainers.containsKey(modContainer.getModName())) { GalacticGreg.Logger - .warn("There is already a mod registered with that name: [%s]", pModContainer.getModName()); - return false; - } else { - GalacticGreg.Logger.info( - "Registered new mod to generate ores: [%s] Dimensions provided: [%d]", - pModContainer.getModName(), - pModContainer.getDimensionList() - .size()); - _mModContainers.put(pModContainer.getModName(), pModContainer); - return true; + .warn("There is already a mod registered with that name: [%s]", modContainer.getModName()); + return; } + + GalacticGreg.Logger.info( + "Registered new mod to generate ores: [%s] Dimensions provided: [%d]", + modContainer.getModName(), + modContainer.getDimensionList() + .size()); + modContainers.put(modContainer.getModName(), modContainer); } /** * Lookup the registered dimensions and try to find the DimensionDefinition that has the ChunkProvider that we have * here - * - * @param pChunkProvider - * @return */ - public static ModDimensionDef getDimensionTypeByChunkGenerator(IChunkProvider pChunkProvider) { + public static ModDimensionDef getDimensionTypeByChunkGenerator(IChunkProvider chunkProvider) { try { - if (!_mInitializationDone) return null; + if (!initializationDone) return null; - String tFQCPN = pChunkProvider.toString() + String tFQCPN = chunkProvider.toString() .split("@")[0]; ModDimensionDef tReturnMDD = null; - for (ModContainer mc : _mModContainers.values()) { + for (ModContainer mc : modContainers.values()) { for (ModDimensionDef mdd : mc.getDimensionList()) { if (mdd.getChunkProviderName() .equals(tFQCPN)) { @@ -88,20 +77,18 @@ public class GalacticGregRegistry { /** * Get all registered modcontainers. Can only be done after the initialization process is done - * - * @return */ public static Collection<ModContainer> getModContainers() { - if (!_mInitializationDone) return null; + if (!initializationDone) return null; - return _mModContainers.values(); + return modContainers.values(); } /** * Initializes the Registry. Never do this in your code, GalacticGreg will crash if you do so */ public static boolean InitRegistry() { - if (_mInitializationDone) // never run init twice! + if (initializationDone) // never run init twice! return false; InitModContainers(); @@ -114,70 +101,44 @@ public class GalacticGregRegistry { * Parse modcontainers and search for loaded mods. Enable found mods for generation */ private static void InitModContainers() { - for (ModContainer mc : _mModContainers.values()) { + for (ModContainer mc : modContainers.values()) { // todo: rename Vanilla mod container name from "Vanilla" to "minecraft" - if (!Loader.isModLoaded(mc.getModName()) && !mc.getModName() - .equals(Vanilla.modContainer.getModName())) { + if (!mc.isModLoaded()) { GalacticGreg.Logger.warn( "Ignoring ModRegistration for OreGen: [%s], because mod is not loaded. Did you misspell the name?", mc.getModName()); - mc.setEnabled(false); - } else { - GalacticGreg.Logger.info("Mod [%s] is now enabled for OreGen by GalacticGreg", mc.getModName()); - mc.setEnabled(true); - for (ModDimensionDef md : mc.getDimensionList()) { + continue; + } + + GalacticGreg.Logger.info("Mod [%s] is now enabled for OreGen by GalacticGreg", mc.getModName()); + + for (ModDimensionDef md : mc.getDimensionList()) { + GalacticGreg.Logger.info( + "ModID: [%s] DimName: [%s] ValidBlocks: [%d] Identifier: [%s] Generators: [%d]", + mc.getModName(), + md.getDimensionName(), + md.getReplaceableBlocks() + .size(), + md.getDimIdentifier(), + md.getSpaceObjectGenerators() + .size()); + + // Register default generator if dimension is asteroid and no generator was added + if (md.getDimensionType() == DimensionType.Asteroid) { + if (md.getSpaceObjectGenerators() + .isEmpty()) { + GalacticGreg.Logger.debug("No generators found, adding built-in ellipsoid generator"); + md.registerSpaceObjectGenerator(new GenEllipsoid()); + } GalacticGreg.Logger.info( - "ModID: [%s] DimName: [%s] ValidBlocks: [%d] Identifier: [%s] Generators: [%d]", - mc.getModName(), - md.getDimensionName(), - md.getReplaceableBlocks() - .size(), - md.getDimIdentifier(), + "Asteroid-Enabled dimension. Registered Generators: [%d]", md.getSpaceObjectGenerators() .size()); - - // Register default generator if dimension is asteroid and no generator was added - if (md.getDimensionType() == DimensionType.Asteroid) { - if (md.getSpaceObjectGenerators() - .size() == 0) { - GalacticGreg.Logger.debug("No generators found, adding build-in ellipsoid generator"); - md.registerSpaceObjectGenerator(new GenEllipsoid()); - } - GalacticGreg.Logger.info( - "Asteroid-Enabled dimension. Registered Generators: [%d]", - md.getSpaceObjectGenerators() - .size()); - } - - md.finalizeReplaceableBlocks(mc.getModName()); } - } - } - _mInitializationDone = true; - } - - /** - * Returns ModContainer for given DimensionDefinition - * - * @param pDimensionDefinition - * @return - */ - public static ModContainer getModContainerForDimension(ModDimensionDef pDimensionDefinition) { - if (!_mInitializationDone) return null; - try { - for (ModContainer mc : _mModContainers.values()) { - for (ModDimensionDef md : mc.getDimensionList()) { - if (pDimensionDefinition.getDimIdentifier() - .equals(md.getDimIdentifier())) { - return mc; - } - } + md.finalizeReplaceableBlocks(mc.getModName()); } - return null; - } catch (Exception e) { - e.printStackTrace(); - return null; } + initializationDone = true; } } diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index adc636ae34..ac58e86d3b 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.blocks.myFluids.FluidsBuilder; import goodgenerator.blocks.regularBlock.BlockCasing; @@ -54,6 +53,7 @@ import goodgenerator.util.MaterialFix; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; import gregtech.api.enums.MetaTileEntityIDs; +import gregtech.api.enums.Mods; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; @@ -410,41 +410,40 @@ public class Loaders { } public static void compactMod() { - if (Loader.isModLoaded("Thaumcraft")) { - LargeEssentiaEnergyData.processEssentiaData(); - GameRegistry.registerItem(upgradeEssentia, "upgradeEssentia", GoodGenerator.MOD_ID); - GameRegistry.registerTileEntity(MTEEssentiaHatch.class, "EssentiaHatch"); - GameRegistry.registerTileEntity(MTEEssentiaOutputHatch.class, "EssentiaOutputHatch"); - GameRegistry.registerTileEntity(MTEEssentiaOutputHatchME.class, "EssentiaOutputHatch_ME"); - Loaders.LEG = new MTELargeEssentiaGenerator( - MetaTileEntityIDs.LargeEssentiaGenerator.ID, - "LargeEssentiaGenerator", - "Large Essentia Generator - Marked for Deprecation").getStackForm(1L); - Loaders.LES = new MTELargeEssentiaSmeltery( - MetaTileEntityIDs.LargeEssentiaSmeltery.ID, - "LargeEssentiaSmeltery", - "Large Essentia Smeltery").getStackForm(1L); - essentiaHatch = new BlockTEContainer( - "essentiaHatch", - new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" }, - 1); - essentiaOutputHatch = new BlockTEContainer( - "essentiaOutputHatch", - new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch" }, - 2); - essentiaOutputHatch_ME = new BlockTEContainer( - "essentiaOutputHatch_ME", - new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch_ME" }, - 3); - GameRegistry.registerBlock(magicCasing, GGItemBlocks.class, "magicCasing"); - GameRegistry.registerBlock(essentiaCell, GGItemBlocks.class, "essentiaCell"); - GameRegistry.registerBlock(essentiaHatch, GGItemBlocks.class, "essentiaHatch"); - GameRegistry.registerBlock(essentiaOutputHatch, GGItemBlocks.class, "essentiaOutputHatch"); - GameRegistry.registerBlock(essentiaFilterCasing, GGItemBlocks.class, "essentiaFilterCasing"); - GameRegistry.registerBlock(essentiaOutputHatch_ME, GGItemBlocks.class, "essentiaOutputHatch_ME"); + if (!Mods.Thaumcraft.isModLoaded()) return; + LargeEssentiaEnergyData.processEssentiaData(); + GameRegistry.registerItem(upgradeEssentia, "upgradeEssentia", GoodGenerator.MOD_ID); + GameRegistry.registerTileEntity(MTEEssentiaHatch.class, "EssentiaHatch"); + GameRegistry.registerTileEntity(MTEEssentiaOutputHatch.class, "EssentiaOutputHatch"); + GameRegistry.registerTileEntity(MTEEssentiaOutputHatchME.class, "EssentiaOutputHatch_ME"); + Loaders.LEG = new MTELargeEssentiaGenerator( + MetaTileEntityIDs.LargeEssentiaGenerator.ID, + "LargeEssentiaGenerator", + "Large Essentia Generator - Marked for Deprecation").getStackForm(1L); + Loaders.LES = new MTELargeEssentiaSmeltery( + MetaTileEntityIDs.LargeEssentiaSmeltery.ID, + "LargeEssentiaSmeltery", + "Large Essentia Smeltery").getStackForm(1L); + essentiaHatch = new BlockTEContainer( + "essentiaHatch", + new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" }, + 1); + essentiaOutputHatch = new BlockTEContainer( + "essentiaOutputHatch", + new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch" }, + 2); + essentiaOutputHatch_ME = new BlockTEContainer( + "essentiaOutputHatch_ME", + new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch_ME" }, + 3); + GameRegistry.registerBlock(magicCasing, GGItemBlocks.class, "magicCasing"); + GameRegistry.registerBlock(essentiaCell, GGItemBlocks.class, "essentiaCell"); + GameRegistry.registerBlock(essentiaHatch, GGItemBlocks.class, "essentiaHatch"); + GameRegistry.registerBlock(essentiaOutputHatch, GGItemBlocks.class, "essentiaOutputHatch"); + GameRegistry.registerBlock(essentiaFilterCasing, GGItemBlocks.class, "essentiaFilterCasing"); + GameRegistry.registerBlock(essentiaOutputHatch_ME, GGItemBlocks.class, "essentiaOutputHatch_ME"); - Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][0] = TextureFactory.of(magicCasing); - } + Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][0] = TextureFactory.of(magicCasing); } public static void addOreDic() { diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java index efbc5b63a4..d4a12f2c5c 100644 --- a/src/main/java/goodgenerator/main/GoodGenerator.java +++ b/src/main/java/goodgenerator/main/GoodGenerator.java @@ -3,7 +3,6 @@ package goodgenerator.main; import net.minecraft.creativetab.CreativeTabs; import bartworks.API.WerkstoffAdderRegistry; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -19,6 +18,7 @@ import goodgenerator.loader.Loaders; import goodgenerator.loader.NaquadahReworkRecipeLoader; import goodgenerator.tabs.MyTabs; import gregtech.GT_Version; +import gregtech.api.enums.Mods; @SuppressWarnings("ALL") @Mod( @@ -78,7 +78,7 @@ public final class GoodGenerator { } public static void crossMod() { - if (Loader.isModLoaded("Thaumcraft")) { + if (Mods.Thaumcraft.isModLoaded()) { Research.addResearch(); } } diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java index 856817d972..366ee45eb0 100644 --- a/src/main/java/gregtech/api/enums/Mods.java +++ b/src/main/java/gregtech/api/enums/Mods.java @@ -34,6 +34,7 @@ public enum Mods { BiblioWoodsNaturaEdition(Names.BIBLIO_WOODS_NATURA_EDITION), BinnieCore(Names.BINNIE_CORE), BiomesOPlenty(Names.BIOMES_O_PLENTY), + BlockRenderer6343(Names.BLOCK_RENDERER_6343), BloodArsenal(Names.BLOOD_ARSENAL), BloodMagic(Names.BLOOD_MAGIC), Botania(Names.BOTANIA), @@ -213,6 +214,7 @@ public enum Mods { public static final String BIBLIO_WOODS_NATURA_EDITION = "BiblioWoodsNatura"; public static final String BINNIE_CORE = "BinnieCore"; public static final String BIOMES_O_PLENTY = "BiomesOPlenty"; + public static |