diff options
Diffstat (limited to 'src/main/java/kubatech')
10 files changed, 103 insertions, 132 deletions
diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java index 39d6b224d5..674b87f95d 100644 --- a/src/main/java/kubatech/CommonProxy.java +++ b/src/main/java/kubatech/CommonProxy.java @@ -20,6 +20,8 @@ package kubatech; +import static gregtech.api.enums.Mods.MineTweaker; +import static gregtech.api.enums.Mods.Thaumcraft; import static kubatech.loaders.BlockLoader.registerBlocks; import static kubatech.loaders.ItemLoader.registerItems; @@ -35,7 +37,6 @@ import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; -import kubatech.api.LoaderReference; import kubatech.commands.CommandHandler; import kubatech.config.Config; import kubatech.loaders.MTLoader; @@ -61,12 +62,12 @@ public class CommonProxy { } public void init(FMLInitializationEvent event) { - if (LoaderReference.MineTweaker) MTLoader.init(); + if (MineTweaker.isModLoaded()) MTLoader.init(); } public void postInit(FMLPostInitializationEvent event) { RecipeLoader.addRecipes(); - if (LoaderReference.Thaumcraft) TCLoader.init(); + if (Thaumcraft.isModLoaded()) TCLoader.init(); } public void serverAboutToStart(FMLServerAboutToStartEvent event) {} diff --git a/src/main/java/kubatech/api/LoaderReference.java b/src/main/java/kubatech/api/LoaderReference.java deleted file mode 100644 index 57a7077d26..0000000000 --- a/src/main/java/kubatech/api/LoaderReference.java +++ /dev/null @@ -1,23 +0,0 @@ -package kubatech.api; - -import cpw.mods.fml.common.Loader; - -public class LoaderReference { - - public static final boolean BloodMagic = Loader.isModLoaded("AWWayofTime"); - public static final boolean EnderIO = Loader.isModLoaded("EnderIO"); - public static final boolean ExtraUtilities = Loader.isModLoaded("ExtraUtilities"); - public static final boolean InfernalMobs = Loader.isModLoaded("InfernalMobs"); - public static final boolean Thaumcraft = Loader.isModLoaded("Thaumcraft"); - public static final boolean MineTweaker = Loader.isModLoaded("MineTweaker3"); - public static final boolean Bartworks = Loader.isModLoaded("bartworks"); - public static final boolean GTNHCoreMod = Loader.isModLoaded("dreamcraft"); - public static final boolean GTPlusPlus = Loader.isModLoaded("miscutils"); - public static final boolean HarvestCraft = Loader.isModLoaded("harvestcraft"); - public static final boolean Forestry = Loader.isModLoaded("Forestry"); - public static final boolean DraconicEvolution = Loader.isModLoaded("DraconicEvolution"); - public static final boolean Avaritia = Loader.isModLoaded("Avaritia"); - public static final boolean ProjRedIllumination = Loader.isModLoaded("ProjRed|Illumination"); - public static final boolean RandomThings = Loader.isModLoaded("RandomThings"); - public static final boolean ElectroMagicTools = Loader.isModLoaded("EMT"); -} diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java index f7805ec84f..d23637d7d2 100644 --- a/src/main/java/kubatech/loaders/DEFCRecipes.java +++ b/src/main/java/kubatech/loaders/DEFCRecipes.java @@ -1,5 +1,6 @@ package kubatech.loaders; +import static gregtech.api.enums.Mods.ElectroMagicTools; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; @@ -30,7 +31,6 @@ import gregtech.api.util.GT_Utility; import gregtech.nei.formatter.SimpleSpecialValueFormatter; import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; import kubatech.Tags; -import kubatech.api.LoaderReference; public class DEFCRecipes { @@ -47,19 +47,17 @@ public class DEFCRecipes { public static void addRecipes() { // Dragonblood recipe for magics haters - if (LoaderReference.GTPlusPlus) { - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dragon_egg, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)) - .fluidInputs(Materials.Radon.getPlasma(144)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) - .eut(1_966_080) - .duration(14_000) - .addTo(mixerRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dragon_egg, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)) + .fluidInputs(Materials.Radon.getPlasma(144)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) + .eut(1_966_080) + .duration(14_000) + .addTo(mixerRecipes); // Casings @@ -129,7 +127,7 @@ public class DEFCRecipes { private static final Item EMTItems = GameRegistry.findItem("EMT", "EMTItems"); private static void addOldHiddenRecipe(GT_Recipe recipe) { - if (!LoaderReference.ElectroMagicTools) return; + if (!ElectroMagicTools.isModLoaded()) return; recipe = recipe.copy(); recipe.mInputs = Arrays.stream(recipe.mInputs) .map(i -> { @@ -147,7 +145,7 @@ public class DEFCRecipes { } private static void conversionRecipes() { - if (!LoaderReference.ElectroMagicTools) return; + if (!ElectroMagicTools.isModLoaded()) return; GameRegistry.addShapelessRecipe( kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(1), new ItemStack(EMTItems, 1, 16)); @@ -271,59 +269,56 @@ public class DEFCRecipes { .forEach(DEFCRecipes::addOldHiddenRecipe); // Dragon Blood - if (LoaderReference.GTPlusPlus) { - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(Materials.Radon.getPlasma(144)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) - .eut(1_966_080) - .duration(4200) - .specialValue(3) - .noOptimize() - .addTo(fusionCraftingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dragon_egg, 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(Materials.Radon.getPlasma(144)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) + .eut(1_966_080) + .duration(4200) + .specialValue(3) + .noOptimize() + .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem("witchery", "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(Materials.Radon.getPlasma(72)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) - .eut(1_966_080) - .duration(3600) - .specialValue(3) - .noOptimize() - .addTo(fusionCraftingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("witchery", "infinityegg", 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(Materials.Radon.getPlasma(72)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) + .eut(1_966_080) + .duration(3600) + .specialValue(3) + .noOptimize() + .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GTPP_CombType.DRAGONBLOOD.getStackForType(1)) - .fluidInputs(Materials.Radon.getPlasma(216)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) - .eut(1_966_080) - .duration(2800) - .specialValue(3) - .noOptimize() - .addTo(fusionCraftingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dragon_egg, 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTPP_CombType.DRAGONBLOOD.getStackForType(1)) + .fluidInputs(Materials.Radon.getPlasma(216)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) + .eut(1_966_080) + .duration(2800) + .specialValue(3) + .noOptimize() + .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem("witchery", "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GTPP_CombType.DRAGONBLOOD.getStackForType(1)) - .fluidInputs(Materials.Radon.getPlasma(108)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648)) - .eut(1_966_080) - .duration(2400) - .specialValue(3) - .noOptimize() - .addTo(fusionCraftingRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("witchery", "infinityegg", 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTPP_CombType.DRAGONBLOOD.getStackForType(1)) + .fluidInputs(Materials.Radon.getPlasma(108)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648)) + .eut(1_966_080) + .duration(2400) + .specialValue(3) + .noOptimize() + .addTo(fusionCraftingRecipes); } } diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java index e7e4ff1736..261cad087c 100644 --- a/src/main/java/kubatech/loaders/MobHandlerLoader.java +++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java @@ -20,6 +20,8 @@ package kubatech.loaders; +import static gregtech.api.enums.Mods.InfernalMobs; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE; import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.MOB_SPAWN_INTERVAL; @@ -59,7 +61,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_Utility; import kubatech.Tags; -import kubatech.api.LoaderReference; import kubatech.api.helpers.ReflectionHelper; import kubatech.config.Config; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher; @@ -161,7 +162,7 @@ public class MobHandlerLoader { } } - if (LoaderReference.InfernalMobs) { + if (InfernalMobs.isModLoaded()) { InfernalMobsCore infernalMobsCore = InfernalMobsCore.instance(); if (recipe.infernalityAllowed && mEUt * 8 <= MTE.getMaxInputEu() && !infernalMobsCore.getDimensionBlackList() @@ -229,7 +230,7 @@ public class MobHandlerLoader { @SubscribeEvent public void onPostOverridesConfigLoad(PostMobsOverridesLoadEvent event) { - if (LoaderReference.GTNHCoreMod) { + if (NewHorizonsCoreMod.isModLoaded()) { LOG.info("Detected GTNH Core Mod, parsing custom drops from there."); CustomDrops coredrops = ReflectionHelper.getField(MainRegistry.Module_CustomDrops, "_mCustomDrops", null); if (coredrops != null) { diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index c2103b7f69..7d609021b6 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -21,8 +21,12 @@ package kubatech.loaders; import static gregtech.api.enums.Mods.Avaritia; +import static gregtech.api.enums.Mods.DraconicEvolution; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; @@ -79,7 +83,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; -import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher; @@ -101,7 +104,7 @@ public class RecipeLoader { GT_MetaTileEntity_ExtremeEntityCrusher.class, "multimachine.entitycrusher", "Extreme Entity Crusher", - LoaderReference.EnderIO)) { + EnderIO.isModLoaded())) { GT_ModHandler.addCraftingRecipe( ItemList.ExtremeEntityCrusher.get(1), bitsd, @@ -114,7 +117,7 @@ public class RecipeLoader { GT_MetaTileEntity_MegaIndustrialApiary.class, "multimachine.extremeapiary", "Industrial Apicultural Acclimatiser and Drone Domestication Station", - LoaderReference.Forestry)) { + Forestry.isModLoaded())) { GT_Values.RA.stdBuilder() .metadata(RESEARCH_ITEM, gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(1)) .metadata(RESEARCH_TIME, 8 * MINUTES + 20 * SECONDS) @@ -158,7 +161,7 @@ public class RecipeLoader { GT_MetaTileEntity_DEFusionCrafter.class, "multimachine.defusioncrafter", "Draconic Evolution Fusion Crafter", - LoaderReference.DraconicEvolution)) { + DraconicEvolution.isModLoaded())) { // Controller recipe added in TecTech DEFCRecipes.addRecipes(); } @@ -212,7 +215,7 @@ public class RecipeLoader { private static void RegisterTeaLine() { // TEA LINE // - if (LoaderReference.GTPlusPlus && LoaderReference.HarvestCraft) { + if (PamsHarvestCraft.isModLoaded()) { CORE.RA.addDehydratorRecipe( new ItemStack[] { GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1) }, null, diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java index 7d6abe5132..f6ff1cac9f 100644 --- a/src/main/java/kubatech/loaders/TCLoader.java +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -20,6 +20,9 @@ package kubatech.loaders; +import static gregtech.api.enums.Mods.DraconicEvolution; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -32,7 +35,6 @@ import net.minecraft.world.World; import com.kuba6000.mobsinfo.api.utils.ItemID; import cpw.mods.fml.common.registry.GameRegistry; -import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.loaders.item.items.TeaUltimate; import thaumcraft.api.ThaumcraftApi; @@ -55,7 +57,7 @@ public class TCLoader { * new ResourceLocation(Tags.MODID, "textures/gui/green_tea.png"), * new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")); */ - if (!LoaderReference.GTNHCoreMod || !LoaderReference.DraconicEvolution) return; + if (!NewHorizonsCoreMod.isModLoaded() || !DraconicEvolution.isModLoaded()) return; registerRecipe(); registerResearch(); } diff --git a/src/main/java/kubatech/nei/IMCForNEI.java b/src/main/java/kubatech/nei/IMCForNEI.java index 4360aa344e..fe1eb64ebb 100644 --- a/src/main/java/kubatech/nei/IMCForNEI.java +++ b/src/main/java/kubatech/nei/IMCForNEI.java @@ -20,15 +20,16 @@ package kubatech.nei; +import static gregtech.api.enums.Mods.EnderIO; + import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.event.FMLInterModComms; -import kubatech.api.LoaderReference; public class IMCForNEI { public static void IMCSender() { - if (LoaderReference.EnderIO) sendCatalyst("mobsinfo.mobhandler", "gregtech:gt.blockmachines:14201"); + if (EnderIO.isModLoaded()) sendCatalyst("mobsinfo.mobhandler", "gregtech:gt.blockmachines:14201"); } private static void sendCatalyst(String aName, String aStack, int aPriority) { diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java index be0c628066..25038b70be 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java @@ -29,6 +29,9 @@ import static gregtech.api.enums.GT_HatchElement.InputBus; import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.Mods.BloodMagic; +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.InfernalMobs; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; @@ -54,7 +57,6 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -119,7 +121,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; import kubatech.Tags; -import kubatech.api.LoaderReference; import kubatech.api.helpers.ReflectionHelper; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.api.tileentity.CustomTileEntityPacketHandler; @@ -147,12 +148,12 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher public GT_MetaTileEntity_ExtremeEntityCrusher(String aName) { super(aName); weaponCache = new WeaponCache(mInventory); - if (LoaderReference.BloodMagic) MinecraftForge.EVENT_BUS.register(this); + if (BloodMagic.isModLoaded()) MinecraftForge.EVENT_BUS.register(this); } @Override public void onRemoval() { - if (LoaderReference.BloodMagic) MinecraftForge.EVENT_BUS.unregister(this); + if (BloodMagic.isModLoaded()) MinecraftForge.EVENT_BUS.unregister(this); if (getBaseMetaTileEntity().isClientSide() && entityRenderer != null) { entityRenderer.setDead(); } @@ -160,7 +161,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher @Override public void onUnload() { - if (LoaderReference.BloodMagic) MinecraftForge.EVENT_BUS.unregister(this); + if (BloodMagic.isModLoaded()) MinecraftForge.EVENT_BUS.unregister(this); } private static final String WellOfSufferingRitualName = "AW013Suffering"; @@ -190,15 +191,11 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher .casingIndex(CASING_INDEX) .dot(1) .buildAndChain(onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings2, 0)))) - .addElement( - 'g', - LoaderReference.Bartworks - ? BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier) - : onElementPass(t -> t.mGlassTier = 100, ofBlock(Blocks.glass, 0))) + .addElement('g', BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier)) .addElement('f', ofFrame(Materials.Steel)) .addElement( 's', - LoaderReference.ExtraUtilities ? ofBlock(Block.getBlockFromName("ExtraUtilities:spike_base_diamond"), 0) + ExtraUtilities.isModLoaded() ? ofBlock(Block.getBlockFromName("ExtraUtilities:spike_base_diamond"), 0) : isAir()) .build(); @@ -400,13 +397,13 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher return; } if (aPlayer.isSneaking()) { - if (!LoaderReference.InfernalMobs) return; + if (!InfernalMobs.isModLoaded()) return; mIsProducingInfernalDrops = !mIsProducingInfernalDrops; if (!mIsProducingInfernalDrops) GT_Utility.sendChatToPlayer(aPlayer, "Mobs will now be prevented from spawning infernal"); else GT_Utility.sendChatToPlayer(aPlayer, "Mobs can spawn infernal now"); } else { - if (!LoaderReference.BloodMagic) return; + if (!BloodMagic.isModLoaded()) return; isInRitualMode = !isInRitualMode; if (!isInRitualMode) { GT_Utility.sendChatToPlayer(aPlayer, "Ritual mode disabled"); @@ -633,7 +630,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher } private boolean connectToRitual() { - if (!LoaderReference.BloodMagic) return false; + if (!BloodMagic.isModLoaded()) return false; ChunkCoordinates coords = this.getBaseMetaTileEntity() .getCoords(); int[] abc = new int[] { 0, -8, 2 }; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java index 4548e1adca..cdab236542 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java @@ -24,6 +24,8 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.Mods.ProjectRedIllumination; +import static gregtech.api.enums.Mods.RandomThings; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; @@ -132,7 +134,6 @@ import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import kubatech.Tags; import kubatech.api.DynamicInventory; -import kubatech.api.LoaderReference; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.client.effect.CropRenderer; @@ -218,19 +219,17 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .addElement('C', onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings4, 1))) .addElement( 'l', - LoaderReference.ProjRedIllumination + ProjectRedIllumination.isModLoaded() ? ofBlock(Block.getBlockFromName("ProjRed|Illumination:projectred.illumination.lamp"), 10) : ofChain(ofBlock(Blocks.redstone_lamp, 0), ofBlock(Blocks.lit_redstone_lamp, 0))) .addElement( 'g', - LoaderReference.Bartworks - ? BorosilicateGlass - .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glasTier = t, te -> te.glasTier) - : onElementPass(t -> t.glasTier = 100, ofBlock(Blocks.glass, 0))) + BorosilicateGlass + .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glasTier = t, te -> te.glasTier)) .addElement( 'd', ofBlock( - LoaderReference.RandomThings ? Block.getBlockFromName("RandomThings:fertilizedDirt_tilled") + RandomThings.isModLoaded() ? Block.getBlockFromName("RandomThings:fertilizedDirt_tilled") : Blocks.farmland, 0)) .addElement( diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java index 8a8dd6d4fc..10558187af 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java @@ -126,7 +126,6 @@ import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import kubatech.Tags; import kubatech.api.DynamicInventory; -import kubatech.api.LoaderReference; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.client.effect.MegaApiaryBeesRenderer; @@ -181,11 +180,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .replaceAll("F", " ")) .toArray(String[]::new)) .toArray(String[][]::new)) - .addElement( - 'A', - LoaderReference.Bartworks - ? BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier) - : onElementPass(t -> t.mGlassTier = 100, ofBlock(Blocks.glass, 0))) + .addElement('A', BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier)) .addElement('B', ofChain(ofBlockAnyMeta(Blocks.dirt, 0), ofBlock(Blocks.grass, 0))) .addElement( 'G', |