From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 9 Apr 2023 01:08:26 +0200 Subject: clean up GT++ code (#589) * yeet big reactor support * yeet IC2 classic support * yeet pneumaticraft support * yeet More Planets support * yeet Immersive Engineering support * yeet Psychedilicraft support * yeet Beyond Reality Core support * sort mods to see what must be purged * yeet simply jetpacks * yeet RFTools * yeet xReliquary * yeet RedTech * yeet Mekanism * yeet GrowthCraft * yeet ihl * leftover cleaning * yeet thermal fondation support * yeet compact windmills support * spotless * remove constants from LoadedMods (part 1 / 2) * spotless * remove constants from LoadedMods (part 2 / 2) * use mod id enum instead of strings + optimize imports * Loaded.isModLoaded -> enum * restore RA init * missing ! * start organizing recipes stuff * fix crash on world load in dev * remove unused class * remove HazmatUtils.java * move all the removals * remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack) * move some pyrolyse oven recipes to its own file * sa * bump GT version * bump GT5U version * spotless apply * use Everglades entry from the mod enum --------- Co-authored-by: miozune Co-authored-by: Martin Robertz --- .../gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java | 15 - .../xmod/bartcrops/HANDLER_CropsPlusPlus.java | 5 - .../xmod/bartcrops/abstracts/BaseCrop.java | 6 +- .../gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java | 10 +- .../xmod/bop/blocks/base/LeavesBase.java | 5 +- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 7 +- .../xmod/bop/blocks/base/SaplingBase.java | 5 +- .../java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java | 5 +- .../xmod/computronics/HANDLER_Computronics.java | 68 ---- .../xmod/eio/handler/HandlerTooltip_EIO.java | 4 +- .../gtPlusPlus/xmod/eio/material/MaterialEIO.java | 6 +- .../java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 25 +- .../forestry/bees/custom/GTPP_Bee_Definition.java | 14 +- .../xmod/forestry/bees/custom/GTPP_Bees.java | 27 +- .../xmod/forestry/bees/custom/ItemCustomComb.java | 10 +- .../bees/inventory/InventoryDenseBeeHouse.java | 6 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 13 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 11 +- .../xmod/forestry/bees/items/output/GTPP_Comb.java | 9 +- .../xmod/forestry/bees/items/output/GTPP_Drop.java | 5 +- .../forestry/bees/items/output/GTPP_Pollen.java | 5 +- .../forestry/bees/items/output/GTPP_Propolis.java | 4 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 56 +-- .../forestry/bees/registry/GTPP_BeeDefinition.java | 26 +- .../forestry/bees/registry/GTPP_Bee_Mutation.java | 6 +- .../xmod/forestry/bees/registry/GTPP_Bees.java | 15 +- .../bees/registry/GTPP_BranchDefinition.java | 21 +- .../bees/tileentities/TileDenseBeeHouse.java | 11 +- .../xmod/galacticraft/HANDLER_GalactiCraft.java | 31 -- .../galacticraft/handler/HandlerTooltip_GC.java | 5 +- .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 333 +---------------- .../gregtech/api/enums/GregtechOrePrefixes.java | 32 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 17 +- .../xmod/gregtech/api/gui/GTPP_UITextures.java | 192 +++++----- .../gregtech/api/items/Gregtech_Generic_Item.java | 12 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 12 +- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 13 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 8 +- .../gregtech/api/items/tools/GT_MetaGenTool.java | 5 +- .../api/items/types/ToolType_HardHammer.java | 5 +- .../GT_MetaTileEntity_Hatch_ControlCore.java | 1 - .../GregtechMetaPipeEntity_Cable.java | 5 +- .../base/GregtechMeta_MultiBlockBase.java | 34 +- .../base/GregtechMeta_SteamMultiBase.java | 11 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 5 +- .../gregtech/api/objects/GregtechItemData.java | 6 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 21 +- .../common/blocks/fluid/GregtechFluidHandler.java | 114 ++---- .../common/blocks/textures/TexturesGtBlock.java | 7 +- .../blocks/textures/TexturesGtCutomCovers.java | 4 +- .../common/blocks/textures/TexturesGtTools.java | 7 +- .../turbine/LargeTurbineTextureHandler.java | 19 +- .../common/computer/GT_ComputerCube_Setup.java | 7 +- .../xmod/gregtech/common/covers/CoverManager.java | 6 +- .../gregtech/common/helpers/ChargingHelper.java | 4 +- .../gregtech/common/helpers/TreeFarmHelper.java | 7 +- .../helpers/autocrafter/AC_Helper_Container.java | 7 +- .../helpers/autocrafter/AC_Helper_Utils.java | 5 +- .../common/helpers/tesseract/TesseractHelper.java | 9 +- .../gregtech/common/items/MetaCustomCoverItem.java | 5 +- .../common/items/covers/MetaItemCoverCasings.java | 7 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 5 +- .../GT_MetaTileEntity_TesseractGenerator.java | 8 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 19 +- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 3 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 13 +- .../basic/GregtechMetaWirelessCharger.java | 4 +- .../machines/multi/misc/GMTE_AmazonPackager.java | 6 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 6 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 8 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 8 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 6 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 8 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 7 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 8 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 8 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 6 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 8 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 37 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 6 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 8 +- ...aTileEntity_IndustrialMolecularTransformer.java | 6 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 15 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 6 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 8 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 6 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 8 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 15 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 6 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 8 +- .../GregtechMetaTileEntity_SpargeTower.java | 19 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 14 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 8 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 14 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 15 +- .../GregtechMetaTileEntity_SteamMacerator.java | 5 +- .../multi/production/GT4Entity_AutoCrafter.java | 7 +- .../multi/production/GT4Entity_ThermalBoiler.java | 14 +- .../GregtechMTE_ElementalDuplicator.java | 7 +- .../production/GregtechMTE_FrothFlotationCell.java | 6 +- .../production/GregtechMTE_NuclearReactor.java | 12 +- .../GregtechMetaTileEntityGeneratorArray.java | 15 +- .../production/GregtechMetaTileEntityTreeFarm.java | 166 +++++---- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 8 +- .../GregtechMetaTileEntity_Cyclotron.java | 14 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 15 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 15 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 6 +- .../GregtechMetaTileEntity_MassFabricator.java | 17 +- ...techMetaTileEntity_QuantumForceTransformer.java | 25 +- .../GregtechMetaTileEntity_Refinery.java | 7 +- ...chMetaTileEntity_BedrockMiningPlatformBase.java | 8 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 22 +- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 27 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 7 +- ...chMetaTileEntity_PowerSubStationController.java | 18 +- .../misc/GT_TileEntity_ComputerCube.java | 15 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 11 +- .../storage/shelving/GT4Entity_Shelf.java | 1 - .../xmod/gregtech/loaders/Gregtech_Blocks.java | 11 +- .../loaders/ProcessingToolHeadChoocher.java | 5 +- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 207 ----------- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 2 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 26 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 32 +- .../recipe/RecipeLoader_MolecularTransformer.java | 30 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 6 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 7 +- .../xmod/gregtech/recipes/RecipesToRemove.java | 49 --- .../registration/gregtech/Gregtech4Content.java | 18 +- .../gregtech/GregtechComponentAssembler.java | 5 +- .../registration/gregtech/GregtechConduits.java | 18 +- .../gregtech/GregtechCustomHatches.java | 11 +- .../gregtech/GregtechEnergyBuffer.java | 7 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 11 +- .../registration/gregtech/GregtechSafeBlock.java | 5 +- .../gregtech/GregtechThaumcraftDevices.java | 5 +- .../gtPlusPlus/xmod/growthcraft/HANDLER_GC.java | 21 -- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 203 ----------- .../xmod/growthcraft/fishtrap/Growthcraft_New.java | 83 ----- .../xmod/growthcraft/fishtrap/Growthcraft_Old.java | 83 ----- src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java | 2 - .../tileentity/TileEntityKineticWindGenerator.java | 5 +- .../xmod/ic2/item/CustomKineticRotor.java | 15 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 7 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 5 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 12 +- .../gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java | 393 --------------------- .../gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java | 11 +- .../java/gtPlusPlus/xmod/ob/SprinklerHandler.java | 5 +- .../xmod/railcraft/HANDLER_Railcraft.java | 26 +- .../xmod/reliquary/HANDLER_Reliquary.java | 21 -- .../xmod/reliquary/item/ReliquaryItems.java | 160 --------- .../xmod/reliquary/util/AlkahestRecipeWrapper.java | 51 --- .../reliquary/util/ReliquaryRecipeHandler.java | 67 ---- src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java | 9 +- .../xmod/sc2/modules/ModuleExoticSeeds.java | 51 +-- .../gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java | 13 +- .../xmod/thaumcraft/HANDLER_Thaumcraft.java | 29 +- .../xmod/thaumcraft/aspect/GTPP_AspectCompat.java | 13 +- .../objects/wrapper/aspect/TC_Aspect_Wrapper.java | 5 +- .../xmod/thermalfoundation/HANDLER_TF.java | 9 +- .../block/TF_Block_Fluid_Cryotheum.java | 10 +- .../block/TF_Block_Fluid_Ender.java | 5 +- .../block/TF_Block_Fluid_Pyrotheum.java | 5 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 75 ++-- .../gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java | 13 +- .../xmod/tinkers/material/BaseTinkersMaterial.java | 7 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 5 +- .../gtPlusPlus/xmod/tinkers/util/TinkersUtils.java | 35 +- .../java/gtPlusPlus/xmod/witchery/WitchUtils.java | 7 +- 171 files changed, 1384 insertions(+), 2666 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java delete mode 100644 src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java delete mode 100644 src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java delete mode 100644 src/main/java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java delete mode 100644 src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java delete mode 100644 src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java delete mode 100644 src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java delete mode 100644 src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java delete mode 100644 src/main/java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java delete mode 100644 src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java delete mode 100644 src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java delete mode 100644 src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java b/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java deleted file mode 100644 index 72c6025323..0000000000 --- a/src/main/java/gtPlusPlus/xmod/advsolar/HANDLER_AdvSolar.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.xmod.advsolar; - -import advsolar.common.AdvancedSolarPanel; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; - -public class HANDLER_AdvSolar { - - public static void postInit() { - if (LoadedMods.AdvancedSolarPanel) { - RecipeUtils.removeRecipeByOutput(ItemUtils.getSimpleStack(AdvancedSolarPanel.blockMolecularTransformer)); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java b/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java index 9207749655..9ca5488280 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java @@ -1,6 +1,5 @@ package gtPlusPlus.xmod.bartcrops; -import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -10,10 +9,6 @@ public class HANDLER_CropsPlusPlus { LoaderOfTheCrops.load(preinit); } - public static void init(FMLInitializationEvent init) { - // registerItems(); - } - public static void postInit(FMLPostInitializationEvent postinit) { LoaderOfTheCrops.register(); LoaderOfTheCrops.registerBaseSeed(); diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java index 279300487f..e2951c8394 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bartcrops.abstracts; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -11,7 +13,6 @@ import net.minecraft.util.IIcon; import speiger.src.crops.api.ICropCardInfo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import ic2.api.crops.CropCard; import ic2.api.crops.ICropTile; @@ -22,7 +23,8 @@ public abstract class BaseCrop extends CropCard implements ICropCardInfo { public void registerSprites(IIconRegister iconRegister) { this.textures = new IIcon[this.maxSize()]; for (int i = 1; i <= this.textures.length; ++i) { - this.textures[i - 1] = iconRegister.registerIcon(CORE.MODID + ":crop/blockCrop." + this.name() + "." + i); + this.textures[i - 1] = iconRegister + .registerIcon(GTPlusPlus.ID + ":crop/blockCrop." + this.name() + "." + i); } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java index 39aee4681f..918ec9621d 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java +++ b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.bop; +import static gregtech.api.enums.Mods.BiomesOPlenty; + import java.lang.reflect.Field; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; @@ -33,19 +34,14 @@ public class HANDLER_BiomesOPlenty { public static void preInit() { BOP_Block_Registrator.run(); - if (LoadedMods.BiomesOPlenty) { + if (BiomesOPlenty.isModLoaded()) { setFields(); registerPineconeToOreDict(); } } - public static void init() { - if (LoadedMods.BiomesOPlenty) {} - } - public static void postInit() { BOP_Block_Registrator.recipes(); - if (LoadedMods.BiomesOPlenty) {} } private static void registerPineconeToOreDict() { diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 8c8b712c07..22732d647a 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.Random; @@ -18,7 +20,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -93,7 +94,7 @@ public class LeavesBase extends BlockLeaves { this.leafTextures[i] = new IIcon[leafType[i].length]; for (int j = 0; j < leafType[i].length; ++j) { this.leafTextures[i][j] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); } } setVanillaVariable(this.field_150129_M, this.leafTextures); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 10f217a42d..3547c8b5bf 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.BlockLog; @@ -15,7 +17,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -74,9 +75,9 @@ public abstract class LogBase extends BlockLog { this.textureTop = new IIcon[treeType.length]; for (int i = 0; i < this.textureSide.length; ++i) { - this.textureSide[i] = iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i]); + this.textureSide[i] = iIcon.registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i]); this.textureTop[i] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); } setVanillaVariable(this.field_150167_a, this.textureSide); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index 6a8e1f9cc7..75c0d5bd59 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.Random; @@ -23,7 +25,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -180,7 +181,7 @@ public class SaplingBase extends BlockSapling { public void registerBlockIcons(IIconRegister iIcon) { for (int i = 0; i < saplingTextures.length; ++i) { saplingTextures[i] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]); } } } diff --git a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java index c652a427ab..1c13f16a4b 100644 --- a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java +++ b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java @@ -1,13 +1,14 @@ package gtPlusPlus.xmod.cofh; +import static gregtech.api.enums.Mods.COFHCore; + import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.general.RF2EU_Battery; -import gtPlusPlus.core.lib.LoadedMods; public class HANDLER_COFH { public static void initItems() { - if (LoadedMods.CoFHCore) { + if (COFHCore.isModLoaded()) { ModItems.RfEuBattery = new RF2EU_Battery(); } } diff --git a/src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java b/src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java deleted file mode 100644 index 446f232beb..0000000000 --- a/src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java +++ /dev/null @@ -1,68 +0,0 @@ -package gtPlusPlus.xmod.computronics; - -import gregtech.GT_Mod; -import gregtech.api.enums.*; -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.lib.LoadedMods; - -public class HANDLER_Computronics { - - public static void preInit() { - if (LoadedMods.Computronics) {} - } - - public static void init() { - if (LoadedMods.Computronics) { - - } else { - GT_Mod.gregtechproxy.addFluid( - "Argon", - "Argon", - Materials.Argon, - 2, - 295, - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - 1000); - GT_Values.RA.addDistilleryRecipe( - ItemList.Circuit_Integrated.getWithDamage(0L, 1L), - Materials.Air.getGas(1000L), - Materials.Nitrogen.getGas(780L), - 1600, - 32, - false); - GT_Values.RA.addDistilleryRecipe( - ItemList.Circuit_Integrated.getWithDamage(0L, 2L), - Materials.Air.getGas(1000L), - Materials.Oxygen.getGas(210L), - 1600, - 128, - false); - GT_Values.RA.addDistilleryRecipe( - ItemList.Circuit_Integrated.getWithDamage(0L, 3L), - Materials.Air.getGas(1000L), - Materials.Argon.getGas(5L), - 6000, - 512, - false); - GT_Values.RA.addElectrolyzerRecipe( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Air, 1L), - null, - null, - Materials.Air.getGas(2000L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), - null, - null, - null, - null, - null, - null, - 800, - 30); - } - } - - public static void postInit() { - if (LoadedMods.Computronics) {} - } -} diff --git a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index e586bbc0c4..caa49973d7 100644 --- a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.eio.handler; +import static gregtech.api.enums.Mods.EnderIO; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; import java.lang.reflect.Field; @@ -9,7 +10,6 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gregtech.api.enums.Materials; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.eio.material.MaterialEIO; @@ -22,7 +22,7 @@ public class HandlerTooltip_EIO { @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event) { // Is EIO loaded? - if (!disableEnderIOIngotTooltips && LoadedMods.EnderIO) { + if (!disableEnderIOIngotTooltips && EnderIO.isModLoaded()) { // Is the EIO Ingot Item null? // If it is, reflect in. diff --git a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java index 4bf3b3a840..0d07901310 100644 --- a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java +++ b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java @@ -1,6 +1,10 @@ package gtPlusPlus.xmod.eio.material; -import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialStack; +import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.material.state.MaterialState; public class MaterialEIO { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index 1ad9fbad13..0b9702acb1 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.forestry; +import static gregtech.api.enums.Mods.ExtraTrees; +import static gregtech.api.enums.Mods.Forestry; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -13,7 +16,7 @@ import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; import forestry.arboriculture.genetics.TreeDefinition; -import gtPlusPlus.core.lib.LoadedMods; +import gregtech.api.enums.Mods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; @@ -23,39 +26,35 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr public class HANDLER_FR { public static void preInit() { - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { FR_ItemRegistry.Register(); } } - public static void Init() { - if (LoadedMods.Forestry) {} - } - public static void postInit() { - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { FR_Gregtech_Recipes.registerItems(); new GTPP_Bees(); mapForestrySaplingToLog(); } - if (LoadedMods.ExtraTrees) { + if (ExtraTrees.isModLoaded()) { mapExtraTreesSaplingToLog(); } } public static boolean createBlockBreakParticles(final World world, final int x, final int y, final int z, final Block block) { - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { createBlockBreakParticles_INTERNAL(world, x, y, z, block); } return false; } - @Optional.Method(modid = "Forestry") + @Optional.Method(modid = Mods.Names.FORESTRY) private static void createBlockBreakParticles_INTERNAL(final World world, final int x, final int y, final int z, final Block block) { - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { Class oClass; try { oClass = ReflectionUtils.getClass("forestry.core.proxy.ProxyCommon"); @@ -77,7 +76,7 @@ public class HANDLER_FR { } } - @Optional.Method(modid = "Forestry") + @Optional.Method(modid = Mods.Names.FORESTRY) private static void mapForestrySaplingToLog() { for (TreeDefinition value : TreeDefinition.values()) { ItemStack aSaplingStack = value.getMemberStack(EnumGermlingType.SAPLING); @@ -100,7 +99,7 @@ public class HANDLER_FR { } } - @Optional.Method(modid = "ExtraTrees") + @Optional.Method(modid = Mods.Names.EXTRA_TREES) private static void mapExtraTreesSaplingToLog() { for (ExtraTreeSpecies value : ExtraTreeSpecies.values()) { ItemStack aSaplingStack = TreeManager.treeRoot diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java index 00799a1030..4c8912b21e 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java @@ -10,12 +10,22 @@ import net.minecraftforge.common.BiomeDictionary.Type; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.text.WordUtils; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IAlleleBeeSpeciesCustom; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.apiculture.genetics.*; +import forestry.apiculture.genetics.Bee; +import forestry.apiculture.genetics.BeeDefinition; +import forestry.apiculture.genetics.BeeVariation; +import forestry.apiculture.genetics.IBeeDefinition; import forestry.core.genetics.alleles.AlleleHelper; import gregtech.loaders.misc.GT_BeeDefinition; import gtPlusPlus.api.objects.Logger; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java index f5d37817ff..d27f478169 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.custom; +import static gregtech.api.enums.Mods.Forestry; + import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -10,9 +12,6 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.reflect.FieldUtils; -import cpw.mods.fml.common.Loader; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; import gregtech.GT_Mod; import gregtech.api.enums.Materials; import gtPlusPlus.api.objects.Logger; @@ -48,15 +47,7 @@ public class GTPP_Bees { // public static GTPP_Branch_Definition definition; public GTPP_Bees() { - if (Loader.isModLoaded("Forestry") /* && tryGetBeesBoolean() */) { - - for (IAllele o : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { - // Utils.LOG_DEBUG_BEES(" =================================================="); - // Utils.LOG_DEBUG_BEES(" Name: "+o.getName()); - // Utils.LOG_DEBUG_BEES(" Name: "+o.getUnlocalizedName()); - // Utils.LOG_DEBUG_BEES(" getUID: "+o.getUID()); - // Utils.LOG_DEBUG_BEES(" isDominant: "+o.isDominant()); - } + if (Forestry.isModLoaded()) { // Set Materials and Comb stacks from GT via Reflection setMaterials(); @@ -75,20 +66,13 @@ public class GTPP_Bees { private void setCustomItems() { dropForceGem = new BaseItemMisc("Force", new short[] { 250, 250, 20 }, 64, MiscTypes.GEM, null); - // MaterialUtils.tryEnableMaterial(Materials.Force); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Force); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Force); dropBiomassBlob = new BaseItemMisc("Biomass", new short[] { 33, 225, 24 }, 64, MiscTypes.DROP, null); dropEthanolBlob = new BaseItemMisc("Ethanol", new short[] { 255, 128, 0 }, 64, MiscTypes.DROP, null); // Nikolite may not exist, so lets make it. dropNikoliteDust = ItemUtils .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2]; - // MaterialUtils.tryEnableMaterial(Materials.Nikolite); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Nikolite); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Nikolite); - // MaterialUtils.tryEnableMaterialPart(OrePrefixes.plate, Materials.Nikolite); - // MaterialUtils.tryEnableMaterial(Materials.BlueAlloy); + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null) { new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0); } @@ -160,9 +144,6 @@ public class GTPP_Bees { if (Comb_Stone == null) { Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone); } - /* - * } else { Utils.LOG_BEES("oCombObject was not an instance of gregtech.common.items.ItemComb"); } - */ } catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException | NoSuchMethodException | SecurityException | InvocationTargetException e) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java index 43ab2fb191..a7896ab662 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.custom; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,10 +15,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import gregtech.GT_Mod; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemCustomComb extends Item { @@ -29,7 +33,7 @@ public class ItemCustomComb extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.comb"); - GameRegistry.registerItem(this, "gtpp.comb", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID); } public ItemStack getStackForType(CustomCombs type) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java index eac0e5f7b6..31671afaa1 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java @@ -14,7 +14,11 @@ import java.util.Collection; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeekeepingMode; +import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.InventoryBeeHousing; import forestry.apiculture.inventory.IApiaryInventory; import forestry.core.access.IAccessHandler; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index fb77c4c2e0..8af5b97b00 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -17,7 +17,7 @@ import net.minecraftforge.common.ChestGenHooks; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.utils.StringUtil; -import gtPlusPlus.core.lib.LoadedMods; +import gregtech.api.enums.Mods; public class FR_ItemRegistry { @@ -45,7 +45,7 @@ public class FR_ItemRegistry { public static MB_ItemFrame hiveFrameStalilize; public static MB_ItemFrame hiveFrameArborist; - @Optional.Method(modid = "Forestry") + @Optional.Method(modid = Mods.Names.FORESTRY) public static void Register() { // Forestry Frames @@ -93,15 +93,6 @@ public class FR_ItemRegistry { ChestGenHooks.DUNGEON_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12)); - // Extra Bee like Frames - if (!LoadedMods.ExtraBees) { - hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common, ""); - hiveFrameCaged = new MB_ItemFrame(MB_FrameType.CAGE, EnumRarity.common, ""); - hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common, ""); - hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, ""); - hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame."); - } - // Frame Items added by bartimaeusnek hiveFrameDecay = new MB_ItemFrame( MB_FrameType.DECAYING, diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java index d2f3747cc3..70856235dd 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.items; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,9 +14,12 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.*; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class MB_ItemFrame extends Item implements IHiveFrame { @@ -49,7 +54,7 @@ public class MB_ItemFrame extends Item implements IHiveFrame { @Override @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + this.type.getName()); + this.itemIcon = par1IconRegister.registerIcon(GTPlusPlus.ID + ":frame" + this.type.getName()); } // --------- IHiveFrame functions ----------------------------------------- diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java index 9ca749e599..6b075c2b60 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.forestry.bees.items.output; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -31,7 +34,7 @@ public class GTPP_Comb extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.comb"); - GameRegistry.registerItem(this, "gtpp.comb", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID); } public ItemStack getStackForType(GTPP_CombType type) { @@ -96,13 +99,13 @@ public class GTPP_Comb extends Item { addChemicalRecipe( GTPP_CombType.DRAGONBLOOD, - new ItemStack[] { GT_ModHandler.getModItem("Forestry", "refractoryWax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0), GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD), GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD) }, new int[] { 3000, 1500, 500 }); addChemicalRecipe( GTPP_CombType.FORCE, - new ItemStack[] { GT_ModHandler.getModItem("Forestry", "beeswax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0), GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE), GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE) }, new int[] { 5000, 3000, 1000 }); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java index 873c2859c8..f9fef391e8 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,7 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import gregtech.api.enums.GT_Values; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; @@ -29,7 +30,7 @@ public class GTPP_Drop extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.drop"); - GameRegistry.registerItem(this, "gtpp.drop", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.drop", GTPlusPlus.ID); } public ItemStack getStackForType(GTPP_DropType type) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java index ffd1ec7cbb..f8f403ed38 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,7 +14,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType; public class GTPP_Pollen extends Item { @@ -25,7 +26,7 @@ public class GTPP_Pollen extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.pollen"); - GameRegistry.registerItem(this, "gtpp.pollen", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.pollen", GTPlusPlus.ID); } public ItemStack getStackForType(GTPP_PollenType type) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java index 78425a96d0..d2ce94ce54 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -27,7 +29,7 @@ public class GTPP_Propolis extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gtpp.propolis"); - GameRegistry.registerItem(this, "gtpp.propolis", CORE.MODID); + GameRegistry.registerItem(this, "gtpp.propolis", GTPlusPlus.ID); } public ItemStack getStackForType(GTPP_PropolisType type) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java index 3ba28fd98c..f16abb573d 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.forestry.bees.recipe; +import static gregtech.api.enums.Mods.MagicBees; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; @@ -64,7 +65,7 @@ public class FR_Gregtech_Recipes { rod_Uranium, rod_Uranium, hiveFrameMutagenic); - if (LoadedMods.MagicBees) { + if (MagicBees.isModLoaded()) { RecipeUtils.addShapelessGregtechRecipe( new ItemStack[] { hiveFrameVoid }, ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1)); @@ -81,57 +82,6 @@ public class FR_Gregtech_Recipes { "stickBlueSteel", hiveFrameBusy); - if (!LoadedMods.ExtraBees) { - // Extra Bee Like Frames - RecipeUtils.addShapedRecipe( - null, - itemCocoaBeans, - null, - itemCocoaBeans, - hiveFrameImpregnated, - itemCocoaBeans, - null, - itemCocoaBeans, - null, - hiveFrameCocoa); - - RecipeUtils.addShapedRecipe( - hiveFrameImpregnated, - blockIronBars, - null, - null, - null, - null, - null, - null, - null, - hiveFrameCaged); - - RecipeUtils.addShapedRecipe( - hiveFrameImpregnated, - blockSoulSand, - null, - null, - null, - null, - null, - null, - null, - hiveFrameSoul); - - RecipeUtils.addShapedRecipe( - null, - itemClayDust, - null, - itemClayDust, - hiveFrameImpregnated, - itemClayDust, - null, - itemClayDust, - null, - hiveFrameClay); - } - // Frame Items added by bartimaeusnek RecipeUtils.addShapedGregtechRecipe( ItemUtils.getItemStackOfAmountFromOreDict("stickLongTumbaga", 1), diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java index fef7d1fe7e..ee3d8d05ef 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java @@ -1,7 +1,12 @@ package gtPlusPlus.xmod.forestry.bees.registry; -import static forestry.api.apiculture.EnumBeeChromosome.*; +import static forestry.api.apiculture.EnumBeeChromosome.EFFECT; +import static forestry.api.apiculture.EnumBeeChromosome.HUMIDITY_TOLERANCE; +import static forestry.api.apiculture.EnumBeeChromosome.LIFESPAN; +import static forestry.api.apiculture.EnumBeeChromosome.SPECIES; +import static forestry.api.apiculture.EnumBeeChromosome.TEMPERATURE_TOLERANCE; import static forestry.api.core.EnumHumidity.ARID; +import static gregtech.api.enums.Mods.Forestry; import java.lang.reflect.Field; import java.util.Arrays; @@ -13,16 +18,25 @@ import net.minecraftforge.common.BiomeDictionary.Type; import org.apache.commons.lang3.text.WordUtils; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.*; -import forestry.apiculture.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleFlowers; +import forestry.apiculture.genetics.Bee; +import forestry.apiculture.genetics.BeeVariation; +import forestry.apiculture.genetics.IBeeDefinition; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele.Lifespan; import forestry.core.genetics.alleles.EnumAllele.Tolerance; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; @@ -39,7 +53,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { DRAGONBLOOD(GTPP_BranchDefinition.LEGENDARY, "Dragon Blood", STANDALONE.DRAGON_METAL, true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.DRAGONBLOOD), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java index 75b43ff8f1..a5d351ea09 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java @@ -8,7 +8,11 @@ import net.minecraft.world.World; import org.apache.commons.lang3.reflect.FieldUtils; -import forestry.api.apiculture.*; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java index 56383192c0..69d9319884 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java @@ -1,16 +1,21 @@ package gtPlusPlus.xmod.forestry.bees.registry; -import static gregtech.api.enums.GT_Values.MOD_ID_FR; +import static gregtech.api.enums.Mods.Forestry; import java.util.HashMap; -import cpw.mods.fml.common.Loader; import gregtech.GT_Mod; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.forestry.bees.handler.*; -import gtPlusPlus.xmod.forestry.bees.items.output.*; +import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Comb; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Drop; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Pollen; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Propolis; public class GTPP_Bees { @@ -32,7 +37,7 @@ public class GTPP_Bees { public static HashMap sCombMappings = new HashMap(); public GTPP_Bees() { - if (Loader.isModLoaded(MOD_ID_FR) && GT_Mod.gregtechproxy.mGTBees) { + if (Forestry.isModLoaded() && GT_Mod.gregtechproxy.mGTBees) { Logger.BEES("Creating required items."); propolis = new GTPP_Propolis(); pollen = new GTPP_Pollen(); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java index a55330b5df..4c367e25d4 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java @@ -1,6 +1,17 @@ package gtPlusPlus.xmod.forestry.bees.registry; -import static forestry.api.apiculture.EnumBeeChromosome.*; +import static forestry.api.apiculture.EnumBeeChromosome.CAVE_DWELLING; +import static forestry.api.apiculture.EnumBeeChromosome.EFFECT; +import static forestry.api.apiculture.EnumBeeChromosome.FERTILITY; +import static forestry.api.apiculture.EnumBeeChromosome.FLOWERING; +import static forestry.api.apiculture.EnumBeeChromosome.FLOWER_PROVIDER; +import static forestry.api.apiculture.EnumBeeChromosome.HUMIDITY_TOLERANCE; +import static forestry.api.apiculture.EnumBeeChromosome.LIFESPAN; +import static forestry.api.apiculture.EnumBeeChromosome.NOCTURNAL; +import static forestry.api.apiculture.EnumBeeChromosome.SPEED; +import static forestry.api.apiculture.EnumBeeChromosome.TEMPERATURE_TOLERANCE; +import static forestry.api.apiculture.EnumBeeChromosome.TERRITORY; +import static forestry.api.apiculture.EnumBeeChromosome.TOLERANT_FLYER; import java.util.Arrays; import java.util.function.Consumer; @@ -11,7 +22,13 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.alleles.AlleleHelper; -import forestry.core.genetics.alleles.EnumAllele.*; +import forestry.core.genetics.alleles.EnumAllele.Fertility; +import forestry.core.genetics.alleles.EnumAllele.Flowering; +import forestry.core.genetics.alleles.EnumAllele.Flowers; +import forestry.core.genetics.alleles.EnumAllele.Lifespan; +import forestry.core.genetics.alleles.EnumAllele.Speed; +import forestry.core.genetics.alleles.EnumAllele.Territory; +import forestry.core.genetics.alleles.EnumAllele.Tolerance; public enum GTPP_BranchDefinition { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java index 5a2263fdac..56df184fc1 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java @@ -8,7 +8,11 @@ ******************************************************************************/ package gtPlusPlus.xmod.forestry.bees.tileentities; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -16,7 +20,10 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; -import forestry.api.apiculture.*; +import forestry.api.apiculture.IBeeHousingInventory; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.ApiaryBeeListener; import forestry.apiculture.ApiaryBeeModifier; import forestry.apiculture.IApiary; diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java deleted file mode 100644 index 1cbf4a4787..0000000000 --- a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java +++ /dev/null @@ -1,31 +0,0 @@ -package gtPlusPlus.xmod.galacticraft; - -import gtPlusPlus.core.lib.LoadedMods; - -public class HANDLER_GalactiCraft { - - // private static final HashMap mSystemsCache = new HashMap(); - - public static void preInit() { - if (LoadedMods.GalacticraftCore) { - // mSystemsCache.put("HD10180", new SystemHD10180()); - /* - * for (BaseSolarSystem solar : mSystemsCache.values()) { - * Logger.SPACE("Running 'pre-init' for "+solar.mSystemName); solar.preInit(); } - */ - } - } - - public static void init() { - if (LoadedMods.GalacticraftCore) { - /* - * for (BaseSolarSystem solar : mSystemsCache.values()) { - * Logger.SPACE("Running 'init' for "+solar.mSystemName); solar.init(); } - */ - } - } - - public static void postInit() { - if (LoadedMods.GalacticraftCore) {} - } -} diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java index 103699e228..54cde6194c 100644 --- a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java +++ b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.galacticraft.handler; +import static gregtech.api.enums.Mods.GalacticraftCore; + import java.lang.reflect.Field; import java.util.HashMap; import java.util.LinkedHashMap; @@ -11,7 +13,6 @@ import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gtPlusPlus.core.item.chemistry.RocketFuels; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.asm.AsmConfig; @@ -29,7 +30,7 @@ public class HandlerTooltip_GC { @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event) { - if (LoadedMods.GalacticraftCore && AsmConfig.enableGcFuelChanges) { + if (GalacticraftCore.isModLoaded() && AsmConfig.enableGcFuelChanges) { if (mBlock == null) { try { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 0d83b88b8c..3828a66353 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -1,53 +1,38 @@ package gtPlusPlus.xmod.gregtech; -import static gtPlusPlus.core.recipe.common.CI.bits; -import static gtPlusPlus.core.util.minecraft.MaterialUtils.getMaterialName; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.Element; -import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_ModHandler.RecipeBits; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.behaviors.Behaviour_DataOrb; import gtPlusPlus.api.helpers.GregtechPlusPlus_API.Multiblock_API; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.minecraft.multi.NoEUBonusMultiBehaviour; import gtPlusPlus.api.objects.minecraft.multi.NoOutputBonusMultiBehaviour; import gtPlusPlus.api.objects.minecraft.multi.NoSpeedBonusMultiBehaviour; import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.core.util.reflect.AddGregtechRecipe; import gtPlusPlus.everglades.gen.gt.WorldGen_GT; +import gtPlusPlus.recipes.CokeAndPyrolyseOven; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; @@ -67,7 +52,6 @@ import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher; import gtPlusPlus.xmod.gregtech.loaders.misc.AddCustomMachineToPA; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_MolecularTransformer; -import gtPlusPlus.xmod.gregtech.recipes.RecipesToRemove; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; public class H