diff options
27 files changed, 308 insertions, 236 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index c5ee97930e..ceb2252897 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -45,16 +45,16 @@ dependencies { api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-426-GTNH:dev") api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.21-gtnh:dev") api('com.github.GTNewHorizons:Yamcl:0.6.0:dev') - api('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev') - api("com.github.GTNewHorizons:Mobs-Info:0.3.2-GTNH:dev") - api("com.github.GTNewHorizons:Navigator:1.0.6:dev") + + compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev') + compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.3.2-GTNH:dev") + compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.6:dev") devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.8.1-GTNH:dev") - runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.3.6-GTNH:dev") // needed? implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false } - implementation("com.github.GTNewHorizons:Avaritia:1.51:dev") - implementation("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.51:dev") + compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false } compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta4:api') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false } @@ -66,8 +66,10 @@ dependencies { compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") {transitive = false} compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false } - implementation("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev") { transitive = false } + + compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev") { transitive = false } implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.6-GTNH:dev") + compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751") @@ -80,7 +82,7 @@ dependencies { compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150') compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.19-GTNH:dev") {transitive = false} // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels - implementation rfg.deobf('curse.maven:advsolar-362768:2885953') + compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953') compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.22-GTNH:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.2:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.1:dev") { transitive = false } @@ -111,5 +113,10 @@ dependencies { functionalTestImplementation('org.junit.platform:junit-platform-reporting') runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.2:dev") - runtimeOnly('com.github.GTNewHorizons:TCNEIAdditions:1.4.0:dev') + + // For testing + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TCNEIAdditions:1.4.0:dev') + + // Speeds up mod identification and loading in dev + runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2")) } diff --git a/repositories.gradle b/repositories.gradle index 40118b1677..05c0791731 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,6 +1,23 @@ // Add any additional repositories for your dependencies here repositories { + exclusiveContent { + forRepository { + ivy { + name = 'CoreTweaks releases' + url = 'https://github.com/makamys/CoreTweaks/releases/download/' + patternLayout { + artifact '[revision]/[module]-1.7.10-[revision]+nomixin(-[classifier])(.[ext])' + } + metadataSources { + artifact() + } + } + } + filter { + includeGroup('CoreTweaks') + } + } ivy { url 'https://files.vexatos.com/' patternLayout { diff --git a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java index d48a65c79d..7afda35483 100644 --- a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java +++ b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java @@ -28,7 +28,7 @@ import gregtech.api.world.GT_Worldgen; modid = GalacticGreg.MODID, name = GalacticGreg.MODNAME, version = GalacticGreg.VERSION, - dependencies = "required-after:GalacticraftCore; required-after:gregtech@5.09.32.30;", + dependencies = "after:GalacticraftCore; required-after:gregtech@5.09.32.30;", acceptableRemoteVersions = "*") public class GalacticGreg { diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 3889a8ffad..19c258d429 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -3666,13 +3666,9 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if ((OreDictionary.getOreName(oreDictID) - .startsWith("ore") - || OreDictionary.getOreName(oreDictID) - .startsWith("rawOre") - || OreDictionary.getOreName(oreDictID) - .startsWith("crushed"))) { - GT_Log.out.print(OreDictionary.getOreName(oreDictID)); + final String oreName = OreDictionary.getOreName(oreDictID); + if ((oreName.startsWith("ore") || oreName.startsWith("rawOre") || oreName.startsWith("crushed"))) { + GT_Log.out.print(oreName); GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -3814,17 +3810,15 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("dust") - && (!OreDictionary.getOreName(oreDictID) - .contains( - "Dephosphated")) /* - * OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") - * || OreDictionary.getOreName(oreDictID).startsWith( - * "dustImpureCerium") || - * OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || - * OreDictionary.getOreName(oreDictID).startsWith("dustCerium") - */) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") + && (!oreName.contains("Dephosphated")) /* + * oreName.startsWith("dustPureCerium") + * || oreName.startsWith( + * "dustImpureCerium") || + * oreName.startsWith("dustSpace") || + * oreName.startsWith("dustCerium") + */) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -3899,10 +3893,8 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("dust") - && (!OreDictionary.getOreName(oreDictID) - .contains("Dephosphated"))) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") && (!oreName.contains("Dephosphated"))) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -3967,8 +3959,8 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("crushed") /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("crushed") /* && oreName.contains("Cerium") */) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -4014,13 +4006,14 @@ public class RecipeLoader { GT_Log.out.print(input.getDisplayName() + "\n"); int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") - || oreName.equals("dustZirconolite") - || oreName.equals("dustYttrocerite") - || oreName.equals("dustXenotime") - || oreName.equals("dustBastnasite") - || oreName.equals("dustFlorencite")) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") + && (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") + || oreName.equals("dustZirconolite") + || oreName.equals("dustYttrocerite") + || oreName.equals("dustXenotime") + || oreName.equals("dustBastnasite") + || oreName.equals("dustFlorencite"))) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -4068,13 +4061,14 @@ public class RecipeLoader { GT_Log.out.print(input.getDisplayName() + "\n"); int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") - || oreName.equals("dustZirconolite") - || oreName.equals("dustYttrocerite") - || oreName.equals("dustXenotime") - || oreName.equals("dustBastnasite") - || oreName.equals("dustFlorencite")) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") + && (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") + || oreName.equals("dustZirconolite") + || oreName.equals("dustYttrocerite") + || oreName.equals("dustXenotime") + || oreName.equals("dustBastnasite") + || oreName.equals("dustFlorencite"))) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -4121,14 +4115,10 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("dustImpureCerium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustImpureSamarium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustPureSamarium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustPureCerium")) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dustImpureCerium") || oreName.startsWith("dustImpureSamarium") + || oreName.startsWith("dustPureSamarium") + || oreName.startsWith("dustPureCerium")) { GT_Recipe tRecipe = recipe.copy(); for (int i = 0; i < tRecipe.mOutputs.length; i++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; @@ -4174,13 +4164,14 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite") - || oreName.equals("dustZirkelite") - || oreName.equals("dustGadoliniteCe") - || oreName.equals("dustGadoliniteY") - || oreName.equals("dustPolycrase") - || oreName.equals("dustBastnasite")) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") + && (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite") + || oreName.equals("dustZirkelite") + || oreName.equals("dustGadoliniteCe") + || oreName.equals("dustGadoliniteY") + || oreName.equals("dustPolycrase") + || oreName.equals("dustBastnasite"))) { GT_Recipe tRecipe = recipe.copy(); for (int i = 0; i < tRecipe.mOutputs.length; i++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java index bf57b641e4..841066a893 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java @@ -71,6 +71,7 @@ import fox.spiteful.avaritia.blocks.LudicrousBlocks; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import ic2.api.item.IKineticRotor; @@ -274,9 +275,11 @@ public class ItemRegistry { bitmask = GregTech_API.sMachineIDs.getOrDefault(GregTech_API.sBlockMetal9, 0) | 1 << 3 | 1 << 4 | 1 << 8; GregTech_API.registerMachineBlock(GregTech_API.sBlockMetal9, bitmask); - // Also infinity - bitmask = GregTech_API.sMachineIDs.getOrDefault(LudicrousBlocks.resource_block, 0) | 1 << 1; - GregTech_API.registerMachineBlock(LudicrousBlocks.resource_block, bitmask); + if (Mods.Avaritia.isModLoaded()) { + // Also infinity + bitmask = GregTech_API.sMachineIDs.getOrDefault(LudicrousBlocks.resource_block, 0) | 1 << 1; + GregTech_API.registerMachineBlock(LudicrousBlocks.resource_block, bitmask); + } ItemRegistry.THTR = new GT_TileEntity_THTR( ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java index fd88673208..14b6b5e172 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java @@ -74,6 +74,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import gregtech.api.GregTech_API; +import gregtech.api.enums.Mods; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -206,7 +207,9 @@ public class GT_TileEntity_ElectricImplosionCompressor { this.add(Pair.of(GregTech_API.sBlockMetal5, 2)); - this.add(Pair.of(LudicrousBlocks.resource_block, 1)); + if (Mods.Avaritia.isModLoaded()) { + this.add(Pair.of(LudicrousBlocks.resource_block, 1)); + } this.add(Pair.of(GregTech_API.sBlockMetal9, 4)); this.add(Pair.of(GregTech_API.sBlockMetal9, 3)); this.add(Pair.of(GregTech_API.sBlockMetal9, 8)); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java index 50a38869b8..d7937dbfcb 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java @@ -49,6 +49,7 @@ import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; import gregtech.api.enums.FluidState; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TC_Aspects; @@ -733,10 +734,12 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.rawOre, 0b1000); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.cell, 0b10000); - Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsule, 0b10000); + if (Mods.Forestry.isModLoaded()) { + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsule, 0b10000); + Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsuleMolten, 0b1000000); + } // Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.bottle,0b10000); - Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsuleMolten, 0b1000000); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.cellMolten, 0b1000000); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plate, 0b10000000); diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index 4003e8e9e4..ffab6a0716 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -10,6 +10,7 @@ import common.blocks.Block_TFFTStorageField; import common.blocks.Block_ThaumiumReinforcedJar; import common.blocks.Block_YSZUnit; +import gregtech.api.enums.Mods; import kekztech.KekzCore; public class Blocks { @@ -28,7 +29,9 @@ public class Blocks { registerBlocks_SOFC(); registerBlocks_TFFT(); - registerBlocks_Jars(); + if (Mods.Thaumcraft.isModLoaded()) { + registerBlocks_Jars(); + } registerBlocks_LSC(); registerBlocks_Cosmetics(); diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java index 777a8af268..0687f109be 100644 --- a/src/main/java/common/CommonProxy.java +++ b/src/main/java/common/CommonProxy.java @@ -7,6 +7,7 @@ import common.tileentities.GTMTE_TFFTHatch; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import gregtech.api.enums.Mods; import kekztech.Items; public class CommonProxy { @@ -22,8 +23,10 @@ public class CommonProxy { Blocks.preInit(); // TileEntities TileEntities.preInit(); - // TC Research - Researches.preInit(); + if (Mods.Thaumcraft.isModLoaded() && Mods.ThaumicTinkerer.isModLoaded()) { + // TC Research + Researches.preInit(); + } } public void init(final FMLInitializationEvent e) { @@ -34,8 +37,10 @@ public class CommonProxy { public void postInit(final FMLPostInitializationEvent e) { // Recipes Recipes.postInit(); - // Research - Researches.postInit(); + if (Mods.Thaumcraft.isModLoaded() && Mods.ThaumicTinkerer.isModLoaded()) { + // Research + Researches.postInit(); + } GTMTE_TFFTHatch.registerAEIntegration(); } diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 2560e8dc37..ba8876ff2e 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -18,6 +18,7 @@ import common.recipeLoaders.Unpackager; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -45,7 +46,9 @@ public class Recipes { new ResearchableAssemblyLine().run(); new Unpackager().run(); - registerRecipes_Jars(); + if (Mods.Thaumcraft.isModLoaded()) { + registerRecipes_Jars(); + } KekzCore.LOGGER.info("Finished registering recipes"); } diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java index 3a7026d429..8d1b288c7c 100644 --- a/src/main/java/common/TileEntities.java +++ b/src/main/java/common/TileEntities.java @@ -12,6 +12,7 @@ import common.tileentities.TE_ThaumiumReinforcedVoidJar; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.MetaTileEntityIDs; +import gregtech.api.enums.Mods; public class TileEntities { @@ -25,10 +26,12 @@ public class TileEntities { public static GTMTE_TFFTHatch tfftHatch; public static void preInit() { - GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar"); - GameRegistry.registerTileEntity(TE_ThaumiumReinforcedVoidJar.class, "kekztech_thaumiumreinforcedvoidjar"); - GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar"); - GameRegistry.registerTileEntity(TE_IchorVoidJar.class, "kekztech_ichorvoidjar"); + if (Mods.Thaumcraft.isModLoaded()) { + GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar"); + GameRegistry.registerTileEntity(TE_ThaumiumReinforcedVoidJar.class, "kekztech_thaumiumreinforcedvoidjar"); + GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar"); + GameRegistry.registerTileEntity(TE_IchorVoidJar.class, "kekztech_ichorvoidjar"); + } } public static void init() { diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 292c972edf..56e2a10df2 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -73,6 +73,7 @@ import goodgenerator.util.ItemRefer; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IRecipeMutableAccess; @@ -811,14 +812,14 @@ public class NaquadahReworkRecipeLoader { reAdd.clear(); GT_Log.out.print("Thermal Centrifuge done!\n"); - + final boolean checkCombs = Mods.Forestry.isModLoaded(); // For Centrifuge for (GT_Recipe recipe : RecipeMaps.centrifugeRecipes.getAllRecipes()) { ItemStack input = null; if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); - if (input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { + if (checkCombs && input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -922,7 +923,7 @@ public class NaquadahReworkRecipeLoader { if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); - if (input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { + if (checkCombs && input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java index f0cc3b2541..05d5da27ae 100644 --- a/src/main/java/gregtech/api/enums/Mods.java +++ b/src/main/java/gregtech/api/enums/Mods.java @@ -110,6 +110,7 @@ public enum Mods { MineAndBladeBattleGear2(Names.MINE_AND_BLADE_BATTLE_GEAR2), Minecraft(Names.MINECRAFT), MineTweaker(Names.MINE_TWEAKER), + MobsInfo(Names.MOBS_INFO), NEICustomDiagrams(Names.N_E_I_CUSTOM_DIAGRAMS), NEIOrePlugin(Names.N_E_I_ORE_PLUGIN), Natura(Names.NATURA), @@ -293,6 +294,7 @@ public enum Mods { public static final String MINE_AND_BLADE_BATTLE_GEAR2 = "battlegear2"; public static final String MINECRAFT = "minecraft"; public static final String MINE_TWEAKER = "MineTweaker3"; + public static final String MOBS_INFO = "mobsinfo"; public static final String N_E_I_CUSTOM_DIAGRAMS = "neicustomdiagram"; public static final String N_E_I_ORE_PLUGIN = "gtneioreplugin"; public static final String NATURA = "Natura"; diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 9de59e8661..95b19e756c 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -62,6 +62,7 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.SoundResource; import gregtech.api.gui.GT_GUIColorOverride; import gregtech.api.gui.modularui.FallbackableSteamTexture; @@ -624,8 +625,10 @@ public class GT_Client extends GT_Proxy implements Runnable { GT_Renderer_Block.register(); new GT_MultiTile_Renderer(); new GT_RenderDrone(); - new GT_LaserRenderer(); - new GT_WormholeRenderer(); + if (Mods.GalacticraftCore.isModLoaded()) { + new GT_LaserRenderer(); + new GT_WormholeRenderer(); + } metaGeneratedItemRenderer = new GT_MetaGenerated_Item_Renderer(); for (GT_MetaGenerated_Item item : GT_MetaGenerated_Item.sInstances.values()) { metaGeneratedItemRenderer.registerItem(item); diff --git a/src/main/java/gregtech/common/tileentities/render/TileLaser.java b/src/main/java/gregtech/common/tileentities/render/TileLaser.java index 5cc9020cd4..b7457353f4 100644 --- a/src/main/java/gregtech/common/tileentities/render/TileLaser.java +++ b/src/main/java/gregtech/common/tileentities/render/TileLaser.java @@ -11,6 +11,7 @@ import cpw.mods.fml.relauncher.Side; import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; import micdoodle8.mods.galacticraft.core.util.Annotations; +// This should either move to gt5u tiles, or get moved to GTNH-Intergalactic public class TileLaser extends TileEntityAdvanced { @Annotations.NetworkedField(targetSide = Side.CLIENT) diff --git a/src/main/java/gregtech/common/tileentities/render/TileWormhole.java b/src/main/java/gregtech/common/tileentities/render/TileWormhole.java index f219cfe989..1bb012aaf6 100644 --- a/src/main/java/gregtech/com |