From a0ed67e62e6e9942180d8d4fe9b1ded595bd45a5 Mon Sep 17 00:00:00 2001 From: tier940 Date: Sun, 19 Jan 2025 19:20:44 +0900 Subject: [PATCH 1/4] Update modGroup --- gradle.properties | 6 ++-- .../github/gtexpert/core}/GTExpertMod.java | 16 ++++----- .../github/gtexpert/core}/api/GTEValues.java | 16 ++++----- .../core}/api/capability/GTEDataCodes.java | 2 +- .../MultiblockRecipeLogicNoCache.java | 4 +-- .../SingleblockRecipeLogicNoCache.java | 2 +- .../core}/api/gui/GTEGuiTextures.java | 2 +- .../gtexpert/core}/api/modules/GTEModule.java | 2 +- .../core}/api/modules/IGTEModule.java | 2 +- .../core}/api/modules/IModuleContainer.java | 2 +- .../core}/api/modules/IModuleManager.java | 4 +-- .../core}/api/modules/ModuleContainer.java | 2 +- .../core}/api/modules/ModuleStage.java | 2 +- .../core}/api/recipes/GTERecipeMaps.java | 4 +-- .../core}/api/unification/GTEElements.java | 2 +- .../material/GTEFirstDegreeMaterials.java | 6 ++-- .../material/GTEMaterialFlags.java | 4 +-- .../unification/material/GTEMaterials.java | 8 ++--- .../material/info/GTEMaterialIconSet.java | 2 +- .../ingredients/AEFirstDegreeMaterials.java | 8 ++--- .../AvaritiaFirstDegreeMaterials.java | 10 +++--- .../ingredients/DEFirstDegreeMaterials.java | 12 +++---- .../ingredients/EIOFirstDegreeMaterials.java | 8 ++--- .../ingredients/TCFirstDegreeMaterials.java | 8 ++--- .../gtexpert/core}/api/util/GTELog.java | 4 +-- .../gtexpert/core}/api/util/GTEUtility.java | 6 ++-- .../api/util/ModIncompatibilityException.java | 2 +- .../github/gtexpert/core}/api/util/Mods.java | 4 +-- .../gtexpert/core}/client/ClientProxy.java | 6 ++-- .../gtexpert/core}/client/GTETextures.java | 4 +-- .../gtexpert/core}/common/CommonProxy.java | 4 +-- .../core}/common/GTEConfigHolder.java | 4 +-- .../core}/common/GTEEventHandlers.java | 8 ++--- .../common/blocks/GTEBlockMetalCasing.java | 2 +- .../core}/common/blocks/GTEBlockWireCoil.java | 4 +-- .../core}/common/blocks/GTEMetaBlocks.java | 2 +- .../core}/common/items/GTEMetaItem1.java | 10 +++--- .../core}/common/items/GTEMetaItems.java | 4 +-- .../common/items/armor/GTEMetaArmor.java | 4 +-- .../core}/common/items/armor/PistonBoots.java | 2 +- .../items/behaviors/GTECoverBehaviors.java | 8 ++--- .../metatileentities/GTEMetaTileEntities.java | 8 ++--- .../GTESimpleMachineMetaTileEntity.java | 4 +-- .../MetaTileEntityAdvancedChemicalPlant.java | 4 +-- .../MetaTileEntityLargeCrackingUnit.java | 6 ++-- .../MetaTileEntityLargeGasCollector.java | 14 ++++---- .../multi/MetaTileEntityVoidOreMiner.java | 14 ++++---- .../gtexpert/core}/core/GTECoreMod.java | 8 ++--- .../gtexpert/core}/core/GTECoreModule.java | 36 +++++++++---------- .../core}/core/deploader/DepLoader.java | 4 +-- .../deploader/DownloadProgressDialog.java | 4 +-- .../core/deploader/LetsEncryptAdder.java | 2 +- .../integration/GTEIntegrationModule.java | 10 +++--- .../integration/GTEIntegrationSubmodule.java | 8 ++--- .../core}/integration/ae/AEConfigHolder.java | 6 ++-- .../core}/integration/ae/AEModule.java | 24 ++++++------- .../gtexpert/core}/integration/ae/AEUtil.java | 2 +- .../ae/loaders/AEMaterialInfoLoader.java | 6 ++-- .../ae/loaders/AEOreDictionaryLoader.java | 6 ++-- .../ae/recipes/AEBlocksRecipe.java | 14 ++++---- .../integration/ae/recipes/AEItemsRecipe.java | 16 ++++----- .../ae/recipes/AEMaterialsRecipe.java | 12 +++---- .../integration/ae/recipes/AEToolsRecipe.java | 6 ++-- .../aeaditions/AEAConfigHolder.java | 6 ++-- .../integration/aeaditions/AEAModule.java | 14 ++++---- .../aeaditions/recipes/AEAItemsRecipe.java | 8 ++--- .../integration/avaritia/AvaritiaModule.java | 14 ++++---- .../recipes/AvaritiaMaterialsRecipe.java | 6 ++-- .../integration/binnies/BinniesModule.java | 14 ++++---- .../binnies/botany/BotanyModule.java | 14 ++++---- .../botany/recipes/BotanyItemsRecipe.java | 10 +++--- .../binnies/extrabees/ExtraBeesModule.java | 14 ++++---- .../recipes/ExtraBeesItemsRecipe.java | 10 +++--- .../binnies/extratrees/ExtraTreesModule.java | 14 ++++---- .../recipes/ExtraTreesItemsRecipe.java | 10 +++--- .../binnies/genetics/GeneticsModule.java | 14 ++++---- .../genetics/recipes/GeneticsItemsRecipe.java | 12 +++---- .../binnies/recipes/BinniesItemsRecipe.java | 8 ++--- .../chisel/ChiselConfigHolder.java | 6 ++-- .../integration/chisel/ChiselModule.java | 20 +++++------ .../integration/chisel/ChiselRecipeMaps.java | 4 +-- .../core}/integration/chisel/ChiselUtil.java | 2 +- .../loaders/ChiselOreDictionaryLoader.java | 6 ++-- .../ChiselMetaTileEntities.java | 8 ++--- .../MetaTileEntityAutoChisel.java | 6 ++-- .../chisel/recipes/ChiselBlocksRecipe.java | 14 ++++---- .../chisel/recipes/ChiselToolsRecipe.java | 8 ++--- .../crafttweaker/CraftTweakerModule.java | 12 +++---- .../provider/CrTI18nProvider.java | 2 +- .../core}/integration/ctm/IFacadeWrapper.java | 2 +- .../integration/deda/DEDAConfigHolder.java | 6 ++-- .../core}/integration/deda/DEDAModule.java | 20 +++++------ .../deda/loaders/DEDAMaterialInfoLoader.java | 12 +++---- .../deda/loaders/DEDAOreDictionaryLoader.java | 4 +-- .../DEDAMetaTileEntities.java | 4 +-- .../MetaTileEntityDraconiumFusion.java | 14 ++++---- .../deda/provider/DEDAJEIProvider.java | 8 ++--- .../recipemaps/GTEDraconicRecipeMaps.java | 6 ++-- .../recipemaps/RecipeMapDraconicFusion.java | 12 +++---- .../recipemaps/RecipeMapDraconicUpgrade.java | 2 +- .../tierup/TierUpRecipeBuilder.java | 4 +-- .../tierup/TierUpRecipeProperty.java | 2 +- .../upgrade/UpgradeRecipeBuilder.java | 4 +-- .../upgrade/UpgradeRecipeProperty.java | 2 +- .../deda/recipes/DraconicBlocksRecipe.java | 20 +++++------ .../deda/recipes/DraconicFluidRecipe.java | 6 ++-- .../DraconicImplosionMaterialsRecipe.java | 4 +-- .../deda/recipes/DraconicItemsRecipe.java | 12 +++---- .../deda/recipes/DraconicMaterialsRecipe.java | 8 ++--- .../deda/recipes/DraconicTierupRecipe.java | 14 ++++---- .../deda/recipes/DraconicToolsRecipe.java | 10 +++--- .../deda/recipes/DraconicUpgradeRecipe.java | 12 +++---- .../integration/eio/EnderIOConfigHolder.java | 6 ++-- .../core}/integration/eio/EnderIOModule.java | 22 ++++++------ .../integration/eio/EnderIORecipeMaps.java | 6 ++-- .../eio/loaders/EIOMaterialInfoLoader.java | 8 ++--- .../eio/loaders/EIOOreDictionaryLoader.java | 4 +-- .../metatileentities/EIOMetaTileEntities.java | 14 ++++---- .../ElectricSpawnerLogic.java | 4 +-- .../MetaTileEntityElectricSpawner.java | 10 +++--- .../eio/recipes/EIOBlocksRecipe.java | 16 ++++----- .../eio/recipes/EIOFluidRecipe.java | 10 +++--- .../eio/recipes/EIOItemsRecipe.java | 14 ++++---- .../eio/recipes/EIOMaterialsRecipe.java | 8 ++--- .../eio/recipes/EIOSliceNSpliceRecipe.java | 6 ++-- .../eio/recipes/EIOSoulBinderRecipe.java | 8 ++--- .../eio/recipes/EIOToolsRecipe.java | 6 ++-- .../eio/recipes/EIOVialExtractorRecipe.java | 6 ++-- .../extracpus/EXCPUSConfigHolder.java | 6 ++-- .../integration/extracpus/EXCPUSModule.java | 16 ++++----- .../extracpus/recipes/EXCPUSBlocksRecipe.java | 6 ++-- .../extracpus/recipes/EXCPUSItemsRecipe.java | 4 +-- .../integration/ffm/FFMConfigHolder.java | 6 ++-- .../core}/integration/ffm/FFMModule.java | 18 +++++----- .../core}/integration/ffm/FFMUtility.java | 4 +-- .../ffm/loaders/FFMOreDictionaryLoader.java | 4 +-- .../ffm/recipes/FFMBlockRecipe.java | 4 +-- .../ffm/recipes/FFMItemRecipe.java | 4 +-- .../ffm/recipes/FFMMaterialsRecipe.java | 4 +-- .../ffm/recipes/FFMToolRecipe.java | 4 +-- .../ffm/recipes/machines/CarpenterLoader.java | 12 +++---- .../recipes/machines/CentrifugeLoader.java | 4 +-- .../recipes/machines/FabricatorLoader.java | 6 ++-- .../gendustry/GendustryConfigHolder.java | 6 ++-- .../gendustry/GendustryModule.java | 18 +++++----- .../gendustry/GendustryRecipeMaps.java | 6 ++-- .../GendustryMetaTileEntities.java | 10 +++--- .../IndustrialApiaryLogic.java | 2 +- .../MetaTileEntityIndustrialApiary.java | 4 +-- .../recipes/GendustryBlocksRecipe.java | 2 +- .../recipes/GendustryItemsRecipe.java | 2 +- .../IndustrialApiaryRecipeBuilder.java | 2 +- .../machines/RecipeMapIndustrialApiary.java | 2 +- .../core}/integration/gtfo/GTFOModule.java | 16 ++++----- .../gtfo/recipes/GTFOChemicalRecipe.java | 2 +- .../gtfo/recipes/GTFOItemsRecipe.java | 4 +-- .../integration/nae2/NAE2ConfigHolder.java | 6 ++-- .../core}/integration/nae2/NAE2Module.java | 16 ++++----- .../nae2/recipes/NAE2BlocksRecipe.java | 6 ++-- .../nae2/recipes/NAE2ItemsRecipe.java | 6 ++-- .../core}/integration/tc/TCConfigHolder.java | 6 ++-- .../core}/integration/tc/TCModule.java | 22 ++++++------ .../tc/loaders/TCOreDictionaryLoader.java | 2 +- .../tc/recipes/TCBlocksRecipe.java | 2 +- .../integration/tc/recipes/TCItemsRecipe.java | 2 +- .../tc/recipes/TCMaterialsRecipe.java | 4 +-- .../integration/tc/recipes/TCToolsRecipe.java | 8 ++--- .../core}/integration/te/TEConfigHolder.java | 6 ++-- .../core}/integration/te/TEModule.java | 12 +++---- .../theoneprobe/TheOneProbeModule.java | 14 ++++---- .../provider/ElectricSpawnerInfoProvider.java | 6 ++-- .../core}/loaders/GTEOreDictionaryLoader.java | 4 +-- .../loaders/recipe/CEUOverrideRecipe.java | 4 +-- .../core}/loaders/recipe/GTERecipe.java | 24 ++++++------- .../recipe/GTEVanillaOverrideRecipes.java | 6 ++-- .../GTEImplosionNoBombRecipeHandler.java | 2 +- .../handlers/GTEImplosionRecipeHandler.java | 4 +-- .../gtexpert/core}/mixins/GTEMixinLoader.java | 8 ++--- .../items/baubles/ShieldNecklaceMixin.java | 2 +- .../tools/PortableWiredChargerMixin.java | 2 +- .../draconicadditions/lib/DARecipesMixin.java | 2 +- .../mixins/gregtech/QuarkTechSuiteMixin.java | 4 +-- .../gtexpert/core}/modules/BaseGTEModule.java | 6 ++-- .../core}/modules/GTEModuleManager.java | 6 ++-- .../gtexpert/core}/modules/GTEModules.java | 6 ++-- .../mixins.gtexpert.draconicadditions.json | 2 +- .../resources/mixins.gtexpert.gregtech.json | 2 +- .../github/gtexpert/core}/.gitkeep | 0 .../github/gtexpert/core}/GTETest.java | 2 +- 189 files changed, 700 insertions(+), 700 deletions(-) rename src/main/java/{gtexpert => com/github/gtexpert/core}/GTExpertMod.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/GTEValues.java (85%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/capability/GTEDataCodes.java (62%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/capability/MultiblockRecipeLogicNoCache.java (85%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/capability/SingleblockRecipeLogicNoCache.java (92%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/gui/GTEGuiTextures.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/modules/GTEModule.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/modules/IGTEModule.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/modules/IModuleContainer.java (81%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/modules/IModuleManager.java (85%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/modules/ModuleContainer.java (88%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/modules/ModuleStage.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/recipes/GTERecipeMaps.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/GTEElements.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/GTEFirstDegreeMaterials.java (90%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/GTEMaterialFlags.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/GTEMaterials.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/info/GTEMaterialIconSet.java (82%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/ingredients/AEFirstDegreeMaterials.java (90%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java (82%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/ingredients/DEFirstDegreeMaterials.java (92%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/ingredients/EIOFirstDegreeMaterials.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/unification/material/ingredients/TCFirstDegreeMaterials.java (86%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/util/GTELog.java (70%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/util/GTEUtility.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/util/ModIncompatibilityException.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/api/util/Mods.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/client/ClientProxy.java (80%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/client/GTETextures.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/CommonProxy.java (74%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/GTEConfigHolder.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/GTEEventHandlers.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/blocks/GTEBlockMetalCasing.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/blocks/GTEBlockWireCoil.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/blocks/GTEMetaBlocks.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/items/GTEMetaItem1.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/items/GTEMetaItems.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/items/armor/GTEMetaArmor.java (81%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/items/armor/PistonBoots.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/items/behaviors/GTECoverBehaviors.java (83%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/metatileentities/GTEMetaTileEntities.java (91%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/metatileentities/GTESimpleMachineMetaTileEntity.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java (91%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java (91%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/core/GTECoreMod.java (89%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/core/GTECoreModule.java (73%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/core/deploader/DepLoader.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/core/deploader/DownloadProgressDialog.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/core/deploader/LetsEncryptAdder.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/GTEIntegrationModule.java (79%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/GTEIntegrationSubmodule.java (79%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/AEConfigHolder.java (88%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/AEModule.java (53%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/AEUtil.java (91%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/loaders/AEMaterialInfoLoader.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/loaders/AEOreDictionaryLoader.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/recipes/AEBlocksRecipe.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/recipes/AEItemsRecipe.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/recipes/AEMaterialsRecipe.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ae/recipes/AEToolsRecipe.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/aeaditions/AEAConfigHolder.java (68%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/aeaditions/AEAModule.java (59%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/aeaditions/recipes/AEAItemsRecipe.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/avaritia/AvaritiaModule.java (59%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/BinniesModule.java (66%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/botany/BotanyModule.java (64%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/botany/recipes/BotanyItemsRecipe.java (82%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/extrabees/ExtraBeesModule.java (64%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java (82%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/extratrees/ExtraTreesModule.java (65%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java (88%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/genetics/GeneticsModule.java (64%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/binnies/recipes/BinniesItemsRecipe.java (82%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/ChiselConfigHolder.java (81%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/ChiselModule.java (57%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/ChiselRecipeMaps.java (89%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/ChiselUtil.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/loaders/ChiselOreDictionaryLoader.java (67%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/metatileentities/ChiselMetaTileEntities.java (82%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java (81%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/recipes/ChiselBlocksRecipe.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/chisel/recipes/ChiselToolsRecipe.java (89%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/crafttweaker/CraftTweakerModule.java (50%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/crafttweaker/provider/CrTI18nProvider.java (90%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ctm/IFacadeWrapper.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/DEDAConfigHolder.java (78%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/DEDAModule.java (71%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/loaders/DEDAMaterialInfoLoader.java (81%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/loaders/DEDAOreDictionaryLoader.java (87%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/metatileentities/DEDAMetaTileEntities.java (82%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java (91%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/provider/DEDAJEIProvider.java (82%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipemaps/GTEDraconicRecipeMaps.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipemaps/RecipeMapDraconicFusion.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipes/DraconicBlocksRecipe.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipes/DraconicFluidRecipe.java (92%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java (80%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipes/DraconicItemsRecipe.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipes/DraconicMaterialsRecipe.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipes/DraconicTierupRecipe.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipes/DraconicToolsRecipe.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/deda/recipes/DraconicUpgradeRecipe.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/EnderIOConfigHolder.java (87%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/EnderIOModule.java (86%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/EnderIORecipeMaps.java (92%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/loaders/EIOMaterialInfoLoader.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/loaders/EIOOreDictionaryLoader.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/metatileentities/EIOMetaTileEntities.java (79%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/metatileentities/ElectricSpawnerLogic.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/recipes/EIOBlocksRecipe.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/recipes/EIOFluidRecipe.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/recipes/EIOItemsRecipe.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/recipes/EIOMaterialsRecipe.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/recipes/EIOSliceNSpliceRecipe.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/recipes/EIOSoulBinderRecipe.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/recipes/EIOToolsRecipe.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/eio/recipes/EIOVialExtractorRecipe.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/extracpus/EXCPUSConfigHolder.java (78%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/extracpus/EXCPUSModule.java (57%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/extracpus/recipes/EXCPUSBlocksRecipe.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/extracpus/recipes/EXCPUSItemsRecipe.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/FFMConfigHolder.java (76%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/FFMModule.java (65%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/FFMUtility.java (93%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/loaders/FFMOreDictionaryLoader.java (78%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/recipes/FFMBlockRecipe.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/recipes/FFMItemRecipe.java (92%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/recipes/FFMMaterialsRecipe.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/recipes/FFMToolRecipe.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/recipes/machines/CarpenterLoader.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/recipes/machines/CentrifugeLoader.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/ffm/recipes/machines/FabricatorLoader.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/GendustryConfigHolder.java (66%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/GendustryModule.java (57%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/GendustryRecipeMaps.java (70%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/metatileentities/GendustryMetaTileEntities.java (73%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/metatileentities/IndustrialApiaryLogic.java (88%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java (87%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/recipes/GendustryBlocksRecipe.java (53%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/recipes/GendustryItemsRecipe.java (53%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java (92%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java (87%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gtfo/GTFOModule.java (56%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gtfo/recipes/GTFOChemicalRecipe.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/gtfo/recipes/GTFOItemsRecipe.java (90%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/nae2/NAE2ConfigHolder.java (79%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/nae2/NAE2Module.java (56%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/nae2/recipes/NAE2BlocksRecipe.java (96%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/nae2/recipes/NAE2ItemsRecipe.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/tc/TCConfigHolder.java (76%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/tc/TCModule.java (54%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/tc/loaders/TCOreDictionaryLoader.java (56%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/tc/recipes/TCBlocksRecipe.java (54%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/tc/recipes/TCItemsRecipe.java (53%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/tc/recipes/TCMaterialsRecipe.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/tc/recipes/TCToolsRecipe.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/te/TEConfigHolder.java (66%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/te/TEModule.java (62%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/theoneprobe/TheOneProbeModule.java (70%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java (86%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/loaders/GTEOreDictionaryLoader.java (79%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/loaders/recipe/CEUOverrideRecipe.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/loaders/recipe/GTERecipe.java (98%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/loaders/recipe/GTEVanillaOverrideRecipes.java (94%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java (95%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/loaders/recipe/handlers/GTEImplosionRecipeHandler.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/mixins/GTEMixinLoader.java (92%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java (97%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java (91%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/mixins/draconicadditions/lib/DARecipesMixin.java (87%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/mixins/gregtech/QuarkTechSuiteMixin.java (86%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/modules/BaseGTEModule.java (71%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/modules/GTEModuleManager.java (99%) rename src/main/java/{gtexpert => com/github/gtexpert/core}/modules/GTEModules.java (92%) rename src/test/java/{gtexpert => com/github/gtexpert/core}/.gitkeep (100%) rename src/test/java/{gtexpert => com/github/gtexpert/core}/GTETest.java (78%) diff --git a/gradle.properties b/gradle.properties index b9c11931..c96f1d25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,11 +3,11 @@ modName = GTExpertCore # This is a case-sensitive string to identify your mod. Convention is to use lower case. modId = gtexpert -modGroup = gtexpert +modGroup = com.github.gtexpert.core # Version of your mod. # This field can be left empty if you want your mod's version to be determined by the latest git tag instead. -modVersion = 2.4.1-beta +modVersion = 2.4.1-beta # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version) includeMCVersionJar = true @@ -62,7 +62,7 @@ enableModernJavaSyntax = true enableJava17RunTasks = false # Generate a class with String fields for the mod id, name and version named with the fields below -generateGradleTokenClass = gtexpert.Tags +generateGradleTokenClass = com.github.gtexpert.core.Tags gradleTokenModId = MODID gradleTokenModName = MODNAME gradleTokenVersion = VERSION diff --git a/src/main/java/gtexpert/GTExpertMod.java b/src/main/java/com/github/gtexpert/core/GTExpertMod.java similarity index 94% rename from src/main/java/gtexpert/GTExpertMod.java rename to src/main/java/com/github/gtexpert/core/GTExpertMod.java index 82effca7..ebc7c7c6 100644 --- a/src/main/java/gtexpert/GTExpertMod.java +++ b/src/main/java/com/github/gtexpert/core/GTExpertMod.java @@ -1,4 +1,4 @@ -package gtexpert; +package com.github.gtexpert.core; import java.util.function.Function; @@ -22,13 +22,13 @@ import gregtech.api.GregTechAPI; import gregtech.api.cover.CoverDefinition; -import gtexpert.api.GTEValues; -import gtexpert.api.util.GTELog; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.items.behaviors.GTECoverBehaviors; -import gtexpert.modules.GTEModuleManager; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.behaviors.GTECoverBehaviors; +import com.github.gtexpert.core.modules.GTEModuleManager; +import com.github.gtexpert.core.modules.GTEModules; @Mod(modid = GTEValues.MODID, name = GTEValues.MODNAME, diff --git a/src/main/java/gtexpert/api/GTEValues.java b/src/main/java/com/github/gtexpert/core/api/GTEValues.java similarity index 85% rename from src/main/java/gtexpert/api/GTEValues.java rename to src/main/java/com/github/gtexpert/core/api/GTEValues.java index 7eb9d878..0ba1d9cd 100644 --- a/src/main/java/gtexpert/api/GTEValues.java +++ b/src/main/java/com/github/gtexpert/core/api/GTEValues.java @@ -1,12 +1,12 @@ -package gtexpert.api; +package com.github.gtexpert.core.api; -import gtexpert.Tags; -import gtexpert.api.util.GTELog; -import gtexpert.api.util.Mods; -import gtexpert.integration.ae.AEConfigHolder; -import gtexpert.integration.deda.DEDAConfigHolder; -import gtexpert.integration.eio.EnderIOConfigHolder; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.Tags; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.integration.deda.DEDAConfigHolder; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; +import com.github.gtexpert.core.modules.GTEModules; public class GTEValues { diff --git a/src/main/java/gtexpert/api/capability/GTEDataCodes.java b/src/main/java/com/github/gtexpert/core/api/capability/GTEDataCodes.java similarity index 62% rename from src/main/java/gtexpert/api/capability/GTEDataCodes.java rename to src/main/java/com/github/gtexpert/core/api/capability/GTEDataCodes.java index 3b62c86e..fdb17697 100644 --- a/src/main/java/gtexpert/api/capability/GTEDataCodes.java +++ b/src/main/java/com/github/gtexpert/core/api/capability/GTEDataCodes.java @@ -1,4 +1,4 @@ -package gtexpert.api.capability; +package com.github.gtexpert.core.api.capability; public class GTEDataCodes { diff --git a/src/main/java/gtexpert/api/capability/MultiblockRecipeLogicNoCache.java b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java similarity index 85% rename from src/main/java/gtexpert/api/capability/MultiblockRecipeLogicNoCache.java rename to src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java index a2ff5644..2c92eab9 100644 --- a/src/main/java/gtexpert/api/capability/MultiblockRecipeLogicNoCache.java +++ b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java @@ -1,9 +1,9 @@ -package gtexpert.api.capability; +package com.github.gtexpert.core.api.capability; import gregtech.api.capability.impl.MultiblockRecipeLogic; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; -import gtexpert.integration.deda.recipemaps.RecipeMapDraconicFusion; +import com.github.gtexpert.core.integration.deda.recipemaps.RecipeMapDraconicFusion; /** * This recipe logic disables cache used for speeding up recipe check. diff --git a/src/main/java/gtexpert/api/capability/SingleblockRecipeLogicNoCache.java b/src/main/java/com/github/gtexpert/core/api/capability/SingleblockRecipeLogicNoCache.java similarity index 92% rename from src/main/java/gtexpert/api/capability/SingleblockRecipeLogicNoCache.java rename to src/main/java/com/github/gtexpert/core/api/capability/SingleblockRecipeLogicNoCache.java index 62c1fcf4..d54f759d 100644 --- a/src/main/java/gtexpert/api/capability/SingleblockRecipeLogicNoCache.java +++ b/src/main/java/com/github/gtexpert/core/api/capability/SingleblockRecipeLogicNoCache.java @@ -1,4 +1,4 @@ -package gtexpert.api.capability; +package com.github.gtexpert.core.api.capability; import java.util.function.Supplier; diff --git a/src/main/java/gtexpert/api/gui/GTEGuiTextures.java b/src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java similarity index 98% rename from src/main/java/gtexpert/api/gui/GTEGuiTextures.java rename to src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java index 3ffc3d06..26ffd5ec 100644 --- a/src/main/java/gtexpert/api/gui/GTEGuiTextures.java +++ b/src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java @@ -1,4 +1,4 @@ -package gtexpert.api.gui; +package com.github.gtexpert.core.api.gui; import gregtech.api.gui.resources.SteamTexture; import gregtech.api.gui.resources.TextureArea; diff --git a/src/main/java/gtexpert/api/modules/GTEModule.java b/src/main/java/com/github/gtexpert/core/api/modules/GTEModule.java similarity index 96% rename from src/main/java/gtexpert/api/modules/GTEModule.java rename to src/main/java/com/github/gtexpert/core/api/modules/GTEModule.java index 585312f8..e1ad0483 100644 --- a/src/main/java/gtexpert/api/modules/GTEModule.java +++ b/src/main/java/com/github/gtexpert/core/api/modules/GTEModule.java @@ -1,4 +1,4 @@ -package gtexpert.api.modules; +package com.github.gtexpert.core.api.modules; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/gtexpert/api/modules/IGTEModule.java b/src/main/java/com/github/gtexpert/core/api/modules/IGTEModule.java similarity index 98% rename from src/main/java/gtexpert/api/modules/IGTEModule.java rename to src/main/java/com/github/gtexpert/core/api/modules/IGTEModule.java index cdce86cb..99b8fdbd 100644 --- a/src/main/java/gtexpert/api/modules/IGTEModule.java +++ b/src/main/java/com/github/gtexpert/core/api/modules/IGTEModule.java @@ -1,4 +1,4 @@ -package gtexpert.api.modules; +package com.github.gtexpert.core.api.modules; import java.util.Collections; import java.util.List; diff --git a/src/main/java/gtexpert/api/modules/IModuleContainer.java b/src/main/java/com/github/gtexpert/core/api/modules/IModuleContainer.java similarity index 81% rename from src/main/java/gtexpert/api/modules/IModuleContainer.java rename to src/main/java/com/github/gtexpert/core/api/modules/IModuleContainer.java index 113a083d..179f9006 100644 --- a/src/main/java/gtexpert/api/modules/IModuleContainer.java +++ b/src/main/java/com/github/gtexpert/core/api/modules/IModuleContainer.java @@ -1,4 +1,4 @@ -package gtexpert.api.modules; +package com.github.gtexpert.core.api.modules; public interface IModuleContainer { diff --git a/src/main/java/gtexpert/api/modules/IModuleManager.java b/src/main/java/com/github/gtexpert/core/api/modules/IModuleManager.java similarity index 85% rename from src/main/java/gtexpert/api/modules/IModuleManager.java rename to src/main/java/com/github/gtexpert/core/api/modules/IModuleManager.java index cea44ae5..1ce2b49f 100644 --- a/src/main/java/gtexpert/api/modules/IModuleManager.java +++ b/src/main/java/com/github/gtexpert/core/api/modules/IModuleManager.java @@ -1,8 +1,8 @@ -package gtexpert.api.modules; +package com.github.gtexpert.core.api.modules; import net.minecraft.util.ResourceLocation; -import gtexpert.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.GTEUtility; public interface IModuleManager { diff --git a/src/main/java/gtexpert/api/modules/ModuleContainer.java b/src/main/java/com/github/gtexpert/core/api/modules/ModuleContainer.java similarity index 88% rename from src/main/java/gtexpert/api/modules/ModuleContainer.java rename to src/main/java/com/github/gtexpert/core/api/modules/ModuleContainer.java index 2375ba86..f79537dd 100644 --- a/src/main/java/gtexpert/api/modules/ModuleContainer.java +++ b/src/main/java/com/github/gtexpert/core/api/modules/ModuleContainer.java @@ -1,4 +1,4 @@ -package gtexpert.api.modules; +package com.github.gtexpert.core.api.modules; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/gtexpert/api/modules/ModuleStage.java b/src/main/java/com/github/gtexpert/core/api/modules/ModuleStage.java similarity index 93% rename from src/main/java/gtexpert/api/modules/ModuleStage.java rename to src/main/java/com/github/gtexpert/core/api/modules/ModuleStage.java index 7ec27da5..bb87ecc4 100644 --- a/src/main/java/gtexpert/api/modules/ModuleStage.java +++ b/src/main/java/com/github/gtexpert/core/api/modules/ModuleStage.java @@ -1,4 +1,4 @@ -package gtexpert.api.modules; +package com.github.gtexpert.core.api.modules; /** * Basically {@link net.minecraftforge.fml.common.LoaderState} but only for launch stages. diff --git a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java similarity index 94% rename from src/main/java/gtexpert/api/recipes/GTERecipeMaps.java rename to src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java index 7046a620..8b1388c6 100644 --- a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java @@ -1,4 +1,4 @@ -package gtexpert.api.recipes; +package com.github.gtexpert.core.api.recipes; import net.minecraft.init.SoundEvents; @@ -8,7 +8,7 @@ import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; -import gtexpert.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; diff --git a/src/main/java/gtexpert/api/unification/GTEElements.java b/src/main/java/com/github/gtexpert/core/api/unification/GTEElements.java similarity index 95% rename from src/main/java/gtexpert/api/unification/GTEElements.java rename to src/main/java/com/github/gtexpert/core/api/unification/GTEElements.java index 841004dd..6486aed8 100644 --- a/src/main/java/gtexpert/api/unification/GTEElements.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/GTEElements.java @@ -1,4 +1,4 @@ -package gtexpert.api.unification; +package com.github.gtexpert.core.api.unification; import java.util.*; diff --git a/src/main/java/gtexpert/api/unification/material/GTEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java similarity index 90% rename from src/main/java/gtexpert/api/unification/material/GTEFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java index 5ebe546d..efeaff99 100644 --- a/src/main/java/gtexpert/api/unification/material/GTEFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java @@ -1,11 +1,11 @@ -package gtexpert.api.unification.material; +package com.github.gtexpert.core.api.unification.material; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; import static gregtech.api.unification.material.info.MaterialIconSet.*; -import static gtexpert.api.unification.material.GTEMaterials.*; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; diff --git a/src/main/java/gtexpert/api/unification/material/GTEMaterialFlags.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java similarity index 96% rename from src/main/java/gtexpert/api/unification/material/GTEMaterialFlags.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java index edfab495..f21cb54f 100644 --- a/src/main/java/gtexpert/api/unification/material/GTEMaterialFlags.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java @@ -1,4 +1,4 @@ -package gtexpert.api.unification.material; +package com.github.gtexpert.core.api.unification.material; import static gregtech.api.unification.material.info.MaterialFlags.*; @@ -8,7 +8,7 @@ import gregtech.api.unification.material.properties.*; import gregtech.api.unification.ore.OrePrefix; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class GTEMaterialFlags { diff --git a/src/main/java/gtexpert/api/unification/material/GTEMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java similarity index 94% rename from src/main/java/gtexpert/api/unification/material/GTEMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java index e963f363..ab4c950e 100644 --- a/src/main/java/gtexpert/api/unification/material/GTEMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java @@ -1,10 +1,10 @@ -package gtexpert.api.unification.material; +package com.github.gtexpert.core.api.unification.material; import gregtech.api.unification.material.Material; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.ingredients.*; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.ingredients.*; +import com.github.gtexpert.core.api.util.Mods; /** * Material Registration. diff --git a/src/main/java/gtexpert/api/unification/material/info/GTEMaterialIconSet.java b/src/main/java/com/github/gtexpert/core/api/unification/material/info/GTEMaterialIconSet.java similarity index 82% rename from src/main/java/gtexpert/api/unification/material/info/GTEMaterialIconSet.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/info/GTEMaterialIconSet.java index c9e4c793..9211591a 100644 --- a/src/main/java/gtexpert/api/unification/material/info/GTEMaterialIconSet.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/info/GTEMaterialIconSet.java @@ -1,4 +1,4 @@ -package gtexpert.api.unification.material.info; +package com.github.gtexpert.core.api.unification.material.info; import gregtech.api.unification.material.info.MaterialIconSet; diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/AEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java similarity index 90% rename from src/main/java/gtexpert/api/unification/material/ingredients/AEFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java index 94e747bb..89bbef09 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/AEFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java @@ -1,11 +1,11 @@ -package gtexpert.api.unification.material.ingredients; +package com.github.gtexpert.core.api.unification.material.ingredients; import static gregicality.multiblocks.api.unification.GCYMMaterialFlags.NO_ALLOY_BLAST_RECIPES; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import static gtexpert.api.unification.material.GTEMaterials.*; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; @@ -14,7 +14,7 @@ import gregtech.api.unification.material.properties.BlastProperty.GasTier; import gregtech.api.unification.ore.OrePrefix; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; public class AEFirstDegreeMaterials { diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java similarity index 82% rename from src/main/java/gtexpert/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java index d256ac30..1071f254 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java @@ -1,17 +1,17 @@ -package gtexpert.api.unification.material.ingredients; +package com.github.gtexpert.core.api.unification.material.ingredients; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import static gtexpert.api.unification.GTEElements.*; -import static gtexpert.api.unification.material.GTEMaterials.*; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.unification.GTEElements.*; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.properties.ToolProperty; -import gtexpert.api.unification.material.info.GTEMaterialIconSet; +import com.github.gtexpert.core.api.unification.material.info.GTEMaterialIconSet; public class AvaritiaFirstDegreeMaterials { diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/DEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java similarity index 92% rename from src/main/java/gtexpert/api/unification/material/ingredients/DEFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java index 22341ace..ec6204a3 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/DEFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java @@ -1,11 +1,11 @@ -package gtexpert.api.unification.material.ingredients; +package com.github.gtexpert.core.api.unification.material.ingredients; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import static gtexpert.api.unification.GTEElements.*; -import static gtexpert.api.unification.material.GTEMaterials.*; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.unification.GTEElements.*; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; @@ -15,8 +15,8 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.Mods; public class DEFirstDegreeMaterials { diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/EIOFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java similarity index 97% rename from src/main/java/gtexpert/api/unification/material/ingredients/EIOFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java index fc25cd76..372ba0e0 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/EIOFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java @@ -1,17 +1,17 @@ -package gtexpert.api.unification.material.ingredients; +package com.github.gtexpert.core.api.unification.material.ingredients; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import static gtexpert.api.unification.material.GTEMaterials.*; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.info.MaterialIconSet; import gregtech.api.unification.material.properties.BlastProperty.GasTier; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; public class EIOFirstDegreeMaterials { diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/TCFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java similarity index 86% rename from src/main/java/gtexpert/api/unification/material/ingredients/TCFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java index f616b5fd..82489ed8 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/TCFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java @@ -1,10 +1,10 @@ -package gtexpert.api.unification.material.ingredients; +package com.github.gtexpert.core.api.unification.material.ingredients; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import static gtexpert.api.unification.GTEElements.*; -import static gtexpert.api.unification.material.GTEMaterials.*; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.unification.GTEElements.*; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; diff --git a/src/main/java/gtexpert/api/util/GTELog.java b/src/main/java/com/github/gtexpert/core/api/util/GTELog.java similarity index 70% rename from src/main/java/gtexpert/api/util/GTELog.java rename to src/main/java/com/github/gtexpert/core/api/util/GTELog.java index 337deaf9..4b4b6453 100644 --- a/src/main/java/gtexpert/api/util/GTELog.java +++ b/src/main/java/com/github/gtexpert/core/api/util/GTELog.java @@ -1,9 +1,9 @@ -package gtexpert.api.util; +package com.github.gtexpert.core.api.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; public class GTELog { diff --git a/src/main/java/gtexpert/api/util/GTEUtility.java b/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java similarity index 98% rename from src/main/java/gtexpert/api/util/GTEUtility.java rename to src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java index 2708b808..323bc9f7 100644 --- a/src/main/java/gtexpert/api/util/GTEUtility.java +++ b/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java @@ -1,4 +1,4 @@ -package gtexpert.api.util; +package com.github.gtexpert.core.api.util; import java.util.Objects; import java.util.Random; @@ -21,8 +21,8 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.items.MetaItems; -import gtexpert.api.GTEValues; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class GTEUtility { diff --git a/src/main/java/gtexpert/api/util/ModIncompatibilityException.java b/src/main/java/com/github/gtexpert/core/api/util/ModIncompatibilityException.java similarity index 96% rename from src/main/java/gtexpert/api/util/ModIncompatibilityException.java rename to src/main/java/com/github/gtexpert/core/api/util/ModIncompatibilityException.java index 6e4396bd..d4f1a7de 100644 --- a/src/main/java/gtexpert/api/util/ModIncompatibilityException.java +++ b/src/main/java/com/github/gtexpert/core/api/util/ModIncompatibilityException.java @@ -1,4 +1,4 @@ -package gtexpert.api.util; +package com.github.gtexpert.core.api.util; import java.util.List; diff --git a/src/main/java/gtexpert/api/util/Mods.java b/src/main/java/com/github/gtexpert/core/api/util/Mods.java similarity index 99% rename from src/main/java/gtexpert/api/util/Mods.java rename to src/main/java/com/github/gtexpert/core/api/util/Mods.java index 554046d4..40793965 100644 --- a/src/main/java/gtexpert/api/util/Mods.java +++ b/src/main/java/com/github/gtexpert/core/api/util/Mods.java @@ -1,4 +1,4 @@ -package gtexpert.api.util; +package com.github.gtexpert.core.api.util; import java.lang.reflect.Field; import java.util.ArrayList; @@ -21,7 +21,7 @@ import gregtech.api.GTValues; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; public enum Mods { diff --git a/src/main/java/gtexpert/client/ClientProxy.java b/src/main/java/com/github/gtexpert/core/client/ClientProxy.java similarity index 80% rename from src/main/java/gtexpert/client/ClientProxy.java rename to src/main/java/com/github/gtexpert/core/client/ClientProxy.java index ccd10eb3..fa3d73a8 100644 --- a/src/main/java/gtexpert/client/ClientProxy.java +++ b/src/main/java/com/github/gtexpert/core/client/ClientProxy.java @@ -1,4 +1,4 @@ -package gtexpert.client; +package com.github.gtexpert.core.client; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.fml.common.Mod; @@ -6,8 +6,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; -import gtexpert.common.CommonProxy; -import gtexpert.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.common.CommonProxy; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; @Mod.EventBusSubscriber(Side.CLIENT) public class ClientProxy extends CommonProxy { diff --git a/src/main/java/gtexpert/client/GTETextures.java b/src/main/java/com/github/gtexpert/core/client/GTETextures.java similarity index 94% rename from src/main/java/gtexpert/client/GTETextures.java rename to src/main/java/com/github/gtexpert/core/client/GTETextures.java index 5478421c..6bee8c4b 100644 --- a/src/main/java/gtexpert/client/GTETextures.java +++ b/src/main/java/com/github/gtexpert/core/client/GTETextures.java @@ -1,11 +1,11 @@ -package gtexpert.client; +package com.github.gtexpert.core.client; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; import gregtech.client.renderer.texture.cube.*; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; @Mod.EventBusSubscriber(modid = GTEValues.MODID, value = Side.CLIENT) public class GTETextures { diff --git a/src/main/java/gtexpert/common/CommonProxy.java b/src/main/java/com/github/gtexpert/core/common/CommonProxy.java similarity index 74% rename from src/main/java/gtexpert/common/CommonProxy.java rename to src/main/java/com/github/gtexpert/core/common/CommonProxy.java index b08b956e..5b94493e 100644 --- a/src/main/java/gtexpert/common/CommonProxy.java +++ b/src/main/java/com/github/gtexpert/core/common/CommonProxy.java @@ -1,9 +1,9 @@ -package gtexpert.common; +package com.github.gtexpert.core.common; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; @Mod.EventBusSubscriber(modid = GTEValues.MODID) public class CommonProxy { diff --git a/src/main/java/gtexpert/common/GTEConfigHolder.java b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java similarity index 96% rename from src/main/java/gtexpert/common/GTEConfigHolder.java rename to src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java index d16e4f6a..7ee99cbf 100644 --- a/src/main/java/gtexpert/common/GTEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java @@ -1,8 +1,8 @@ -package gtexpert.common; +package com.github.gtexpert.core.common; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; @Config(modid = GTEValues.MODID, name = GTEValues.MODID + "/" + GTEValues.MODID, diff --git a/src/main/java/gtexpert/common/GTEEventHandlers.java b/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java similarity index 94% rename from src/main/java/gtexpert/common/GTEEventHandlers.java rename to src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java index 6e0a25a7..80ffa7c4 100644 --- a/src/main/java/gtexpert/common/GTEEventHandlers.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java @@ -1,4 +1,4 @@ -package gtexpert.common; +package com.github.gtexpert.core.common; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -23,9 +23,9 @@ import gregtech.api.items.armor.ArmorMetaItem; import gregtech.api.unification.material.event.MaterialEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.common.items.GTEMetaItems; @Mod.EventBusSubscriber(modid = GTEValues.MODID) public class GTEEventHandlers { diff --git a/src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockMetalCasing.java similarity index 96% rename from src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java rename to src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockMetalCasing.java index 798f2427..7fb48b94 100644 --- a/src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java +++ b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockMetalCasing.java @@ -1,4 +1,4 @@ -package gtexpert.common.blocks; +package com.github.gtexpert.core.common.blocks; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/gtexpert/common/blocks/GTEBlockWireCoil.java b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java similarity index 97% rename from src/main/java/gtexpert/common/blocks/GTEBlockWireCoil.java rename to src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java index 033344f1..0d10e0e9 100644 --- a/src/main/java/gtexpert/common/blocks/GTEBlockWireCoil.java +++ b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java @@ -1,4 +1,4 @@ -package gtexpert.common.blocks; +package com.github.gtexpert.core.common.blocks; import java.util.List; @@ -28,7 +28,7 @@ import gregtech.common.ConfigHolder; import gregtech.common.metatileentities.multi.electric.MetaTileEntityMultiSmelter; -import gtexpert.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; public class GTEBlockWireCoil extends VariantActiveBlock { diff --git a/src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java b/src/main/java/com/github/gtexpert/core/common/blocks/GTEMetaBlocks.java similarity index 96% rename from src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java rename to src/main/java/com/github/gtexpert/core/common/blocks/GTEMetaBlocks.java index 377d7804..1843a153 100644 --- a/src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java +++ b/src/main/java/com/github/gtexpert/core/common/blocks/GTEMetaBlocks.java @@ -1,4 +1,4 @@ -package gtexpert.common.blocks; +package com.github.gtexpert.core.common.blocks; import static gregtech.common.blocks.MetaBlocks.statePropertiesToString; diff --git a/src/main/java/gtexpert/common/items/GTEMetaItem1.java b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java similarity index 94% rename from src/main/java/gtexpert/common/items/GTEMetaItem1.java rename to src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java index 68efc45e..ca08c46b 100644 --- a/src/main/java/gtexpert/common/items/GTEMetaItem1.java +++ b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java @@ -1,6 +1,6 @@ -package gtexpert.common.items; +package com.github.gtexpert.core.common.items; -import static gtexpert.common.items.GTEMetaItems.*; +import static com.github.gtexpert.core.common.items.GTEMetaItems.*; import net.minecraft.client.resources.I18n; @@ -11,9 +11,9 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.items.behaviors.TooltipBehavior; -import gtexpert.api.util.GTELog; -import gtexpert.common.GTEConfigHolder; -import gtexpert.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; public class GTEMetaItem1 extends StandardMetaItem { diff --git a/src/main/java/gtexpert/common/items/GTEMetaItems.java b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java similarity index 94% rename from src/main/java/gtexpert/common/items/GTEMetaItems.java rename to src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java index f797aa92..62dd8118 100644 --- a/src/main/java/gtexpert/common/items/GTEMetaItems.java +++ b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java @@ -1,9 +1,9 @@ -package gtexpert.common.items; +package com.github.gtexpert.core.common.items; import gregtech.api.items.armor.ArmorMetaItem; import gregtech.api.items.metaitem.MetaItem; -import gtexpert.common.items.armor.GTEMetaArmor; +import com.github.gtexpert.core.common.items.armor.GTEMetaArmor; public final class GTEMetaItems { diff --git a/src/main/java/gtexpert/common/items/armor/GTEMetaArmor.java b/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java similarity index 81% rename from src/main/java/gtexpert/common/items/armor/GTEMetaArmor.java rename to src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java index 213e2564..7dacf79f 100644 --- a/src/main/java/gtexpert/common/items/armor/GTEMetaArmor.java +++ b/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java @@ -1,11 +1,11 @@ -package gtexpert.common.items.armor; +package com.github.gtexpert.core.common.items.armor; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumRarity; import gregtech.api.items.armor.ArmorMetaItem; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class GTEMetaArmor extends ArmorMetaItem.ArmorMetaValueItem> { diff --git a/src/main/java/gtexpert/common/items/armor/PistonBoots.java b/src/main/java/com/github/gtexpert/core/common/items/armor/PistonBoots.java similarity index 99% rename from src/main/java/gtexpert/common/items/armor/PistonBoots.java rename to src/main/java/com/github/gtexpert/core/common/items/armor/PistonBoots.java index 6c70713d..53df27a6 100644 --- a/src/main/java/gtexpert/common/items/armor/PistonBoots.java +++ b/src/main/java/com/github/gtexpert/core/common/items/armor/PistonBoots.java @@ -1,4 +1,4 @@ -package gtexpert.common.items.armor; +package com.github.gtexpert.core.common.items.armor; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java b/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java similarity index 83% rename from src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java rename to src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java index 8b8817ed..74fefbc1 100644 --- a/src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java +++ b/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java @@ -1,7 +1,7 @@ -package gtexpert.common.items.behaviors; +package com.github.gtexpert.core.common.items.behaviors; import static gregtech.common.covers.CoverBehaviors.registerBehavior; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.GTValues; import gregtech.common.covers.CoverConveyor; @@ -9,8 +9,8 @@ import gregtech.common.covers.CoverPump; import gregtech.common.covers.CoverRoboticArm; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class GTECoverBehaviors { diff --git a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java similarity index 91% rename from src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java index b8ad3416..b3abb5fb 100644 --- a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java @@ -1,7 +1,7 @@ -package gtexpert.common.metatileentities; +package com.github.gtexpert.core.common.metatileentities; import static gregtech.common.metatileentities.MetaTileEntities.*; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import java.util.function.Function; @@ -11,8 +11,8 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.metatileentities.multi.*; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.metatileentities.multi.*; public class GTEMetaTileEntities { diff --git a/src/main/java/gtexpert/common/metatileentities/GTESimpleMachineMetaTileEntity.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java similarity index 97% rename from src/main/java/gtexpert/common/metatileentities/GTESimpleMachineMetaTileEntity.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java index bb6e265c..15acc9a2 100644 --- a/src/main/java/gtexpert/common/metatileentities/GTESimpleMachineMetaTileEntity.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities; +package com.github.gtexpert.core.common.metatileentities; import java.util.function.Function; @@ -15,7 +15,7 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; public class GTESimpleMachineMetaTileEntity extends SimpleMachineMetaTileEntity { diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java similarity index 97% rename from src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java index e6c815e4..85d8f85f 100644 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities.multi; +package com.github.gtexpert.core.common.metatileentities.multi; import java.util.List; @@ -31,7 +31,7 @@ import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gtexpert.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; public class MetaTileEntityAdvancedChemicalPlant extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java similarity index 97% rename from src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java index 7d100313..05f622b8 100644 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities.multi; +package com.github.gtexpert.core.common.metatileentities.multi; import java.util.List; @@ -40,8 +40,8 @@ import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic; import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.common.GTEConfigHolder; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.common.GTEConfigHolder; public class MetaTileEntityLargeCrackingUnit extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java similarity index 91% rename from src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java index d5d7729c..d3d293e9 100644 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities.multi; +package com.github.gtexpert.core.common.metatileentities.multi; import java.util.List; @@ -30,12 +30,12 @@ import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.recipes.GTERecipeMaps; -import gtexpert.client.GTETextures; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; public class MetaTileEntityLargeGasCollector extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java similarity index 91% rename from src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java index 899c155f..b9b76cd4 100644 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities.multi; +package com.github.gtexpert.core.common.metatileentities.multi; import java.util.List; @@ -27,12 +27,12 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.core.sound.GTSoundEvents; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.recipes.GTERecipeMaps; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.client.GTETextures; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; public class MetaTileEntityVoidOreMiner extends RecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/core/GTECoreMod.java b/src/main/java/com/github/gtexpert/core/core/GTECoreMod.java similarity index 89% rename from src/main/java/gtexpert/core/GTECoreMod.java rename to src/main/java/com/github/gtexpert/core/core/GTECoreMod.java index 47bf99eb..3118c09c 100644 --- a/src/main/java/gtexpert/core/GTECoreMod.java +++ b/src/main/java/com/github/gtexpert/core/core/GTECoreMod.java @@ -1,4 +1,4 @@ -package gtexpert.core; +package com.github.gtexpert.core.core; import java.io.*; import java.util.Map; @@ -8,8 +8,8 @@ import org.jetbrains.annotations.Nullable; -import gtexpert.api.GTEValues; -import gtexpert.api.util.GTELog; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.GTELog; public class GTECoreMod implements IFMLLoadingPlugin { @@ -29,7 +29,7 @@ public String getModContainerClass() { @Nullable @Override public String getSetupClass() { - return "gtexpert.core.deploader.DepLoader"; + return "com.github.gtexpert.core.core.deploader.DepLoader"; } @Override diff --git a/src/main/java/gtexpert/core/GTECoreModule.java b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java similarity index 73% rename from src/main/java/gtexpert/core/GTECoreModule.java rename to src/main/java/com/github/gtexpert/core/core/GTECoreModule.java index 3cc9e6d0..a506caf1 100644 --- a/src/main/java/gtexpert/core/GTECoreModule.java +++ b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java @@ -1,8 +1,8 @@ -package gtexpert.core; +package com.github.gtexpert.core.core; import static gregtech.api.GregTechAPI.HEATING_COILS; -import static gtexpert.GTExpertMod.createItemBlock; -import static gtexpert.common.blocks.GTEMetaBlocks.*; +import static com.github.gtexpert.core.GTExpertMod.createItemBlock; +import static com.github.gtexpert.core.common.blocks.GTEMetaBlocks.*; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -23,19 +23,19 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.loaders.recipe.RecyclingRecipes; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.modules.IGTEModule; -import gtexpert.common.CommonProxy; -import gtexpert.common.blocks.GTEBlockWireCoil; -import gtexpert.common.blocks.GTEMetaBlocks; -import gtexpert.common.items.GTEMetaItems; -import gtexpert.common.metatileentities.GTEMetaTileEntities; -import gtexpert.loaders.GTEOreDictionaryLoader; -import gtexpert.loaders.recipe.CEUOverrideRecipe; -import gtexpert.loaders.recipe.GTERecipe; -import gtexpert.loaders.recipe.GTEVanillaOverrideRecipes; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.modules.IGTEModule; +import com.github.gtexpert.core.common.CommonProxy; +import com.github.gtexpert.core.common.blocks.GTEBlockWireCoil; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities; +import com.github.gtexpert.core.loaders.GTEOreDictionaryLoader; +import com.github.gtexpert.core.loaders.recipe.CEUOverrideRecipe; +import com.github.gtexpert.core.loaders.recipe.GTERecipe; +import com.github.gtexpert.core.loaders.recipe.GTEVanillaOverrideRecipes; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_CORE, @@ -48,8 +48,8 @@ public class GTECoreModule implements IGTEModule { public static final Logger logger = LogManager.getLogger("GTExpert Core"); @SidedProxy(modId = GTEValues.MODID, - clientSide = "gtexpert.client.ClientProxy", - serverSide = "gtexpert.common.CommonProxy") + clientSide = "com.github.gtexpert.core.client.ClientProxy", + serverSide = "com.github.gtexpert.core.common.CommonProxy") public static CommonProxy proxy; @Override diff --git a/src/main/java/gtexpert/core/deploader/DepLoader.java b/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java similarity index 98% rename from src/main/java/gtexpert/core/deploader/DepLoader.java rename to src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java index 40c17dbe..cca68007 100644 --- a/src/main/java/gtexpert/core/deploader/DepLoader.java +++ b/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java @@ -1,4 +1,4 @@ -package gtexpert.core.deploader; +package com.github.gtexpert.core.core.deploader; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -27,7 +27,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import gtexpert.core.GTECoreMod; +import com.github.gtexpert.core.core.GTECoreMod; public class DepLoader implements IFMLCallHook { diff --git a/src/main/java/gtexpert/core/deploader/DownloadProgressDialog.java b/src/main/java/com/github/gtexpert/core/core/deploader/DownloadProgressDialog.java similarity index 96% rename from src/main/java/gtexpert/core/deploader/DownloadProgressDialog.java rename to src/main/java/com/github/gtexpert/core/core/deploader/DownloadProgressDialog.java index fd3ca2d2..66f5040c 100644 --- a/src/main/java/gtexpert/core/deploader/DownloadProgressDialog.java +++ b/src/main/java/com/github/gtexpert/core/core/deploader/DownloadProgressDialog.java @@ -1,4 +1,4 @@ -package gtexpert.core.deploader; +package com.github.gtexpert.core.core.deploader; import java.awt.*; import java.awt.event.WindowEvent; @@ -6,7 +6,7 @@ import javax.swing.*; import javax.swing.border.EmptyBorder; -import gtexpert.Tags; +import com.github.gtexpert.core.Tags; class DownloadProgressDialog extends JDialog { diff --git a/src/main/java/gtexpert/core/deploader/LetsEncryptAdder.java b/src/main/java/com/github/gtexpert/core/core/deploader/LetsEncryptAdder.java similarity index 99% rename from src/main/java/gtexpert/core/deploader/LetsEncryptAdder.java rename to src/main/java/com/github/gtexpert/core/core/deploader/LetsEncryptAdder.java index 4da32bd0..bac2792d 100644 --- a/src/main/java/gtexpert/core/deploader/LetsEncryptAdder.java +++ b/src/main/java/com/github/gtexpert/core/core/deploader/LetsEncryptAdder.java @@ -1,4 +1,4 @@ -package gtexpert.core.deploader; +package com.github.gtexpert.core.core.deploader; import java.io.BufferedInputStream; import java.io.InputStream; diff --git a/src/main/java/gtexpert/integration/GTEIntegrationModule.java b/src/main/java/com/github/gtexpert/core/integration/GTEIntegrationModule.java similarity index 79% rename from src/main/java/gtexpert/integration/GTEIntegrationModule.java rename to src/main/java/com/github/gtexpert/core/integration/GTEIntegrationModule.java index 82fc271a..0e1f357b 100644 --- a/src/main/java/gtexpert/integration/GTEIntegrationModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/GTEIntegrationModule.java @@ -1,4 +1,4 @@ -package gtexpert.integration; +package com.github.gtexpert.core.integration; import java.util.Collections; import java.util.List; @@ -9,10 +9,10 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.modules.BaseGTEModule; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.modules.BaseGTEModule; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_INTEGRATION, diff --git a/src/main/java/gtexpert/integration/GTEIntegrationSubmodule.java b/src/main/java/com/github/gtexpert/core/integration/GTEIntegrationSubmodule.java similarity index 79% rename from src/main/java/gtexpert/integration/GTEIntegrationSubmodule.java rename to src/main/java/com/github/gtexpert/core/integration/GTEIntegrationSubmodule.java index bf1de70c..517a9c13 100644 --- a/src/main/java/gtexpert/integration/GTEIntegrationSubmodule.java +++ b/src/main/java/com/github/gtexpert/core/integration/GTEIntegrationSubmodule.java @@ -1,4 +1,4 @@ -package gtexpert.integration; +package com.github.gtexpert.core.integration; import java.util.Collections; import java.util.Set; @@ -8,9 +8,9 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import gtexpert.api.util.GTEUtility; -import gtexpert.modules.BaseGTEModule; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.modules.BaseGTEModule; +import com.github.gtexpert.core.modules.GTEModules; /** * Abstract class meant to be used by mod-specific compatibility modules. diff --git a/src/main/java/gtexpert/integration/ae/AEConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java similarity index 88% rename from src/main/java/gtexpert/integration/ae/AEConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java index e0476b4b..02572bde 100644 --- a/src/main/java/gtexpert/integration/ae/AEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java @@ -1,10 +1,10 @@ -package gtexpert.integration.ae; +package com.github.gtexpert.core.integration.ae; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config.LangKey; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @LangKey(GTEValues.MODID + ".config.integration.ae") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/ae/AEModule.java b/src/main/java/com/github/gtexpert/core/integration/ae/AEModule.java similarity index 53% rename from src/main/java/gtexpert/integration/ae/AEModule.java rename to src/main/java/com/github/gtexpert/core/integration/ae/AEModule.java index 8569fb59..2121398c 100644 --- a/src/main/java/gtexpert/integration/ae/AEModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/AEModule.java @@ -1,19 +1,19 @@ -package gtexpert.integration.ae; +package com.github.gtexpert.core.integration.ae; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.ae.loaders.AEMaterialInfoLoader; -import gtexpert.integration.ae.loaders.AEOreDictionaryLoader; -import gtexpert.integration.ae.recipes.AEBlocksRecipe; -import gtexpert.integration.ae.recipes.AEItemsRecipe; -import gtexpert.integration.ae.recipes.AEMaterialsRecipe; -import gtexpert.integration.ae.recipes.AEToolsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.ae.loaders.AEMaterialInfoLoader; +import com.github.gtexpert.core.integration.ae.loaders.AEOreDictionaryLoader; +import com.github.gtexpert.core.integration.ae.recipes.AEBlocksRecipe; +import com.github.gtexpert.core.integration.ae.recipes.AEItemsRecipe; +import com.github.gtexpert.core.integration.ae.recipes.AEMaterialsRecipe; +import com.github.gtexpert.core.integration.ae.recipes.AEToolsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_AE, diff --git a/src/main/java/gtexpert/integration/ae/AEUtil.java b/src/main/java/com/github/gtexpert/core/integration/ae/AEUtil.java similarity index 91% rename from src/main/java/gtexpert/integration/ae/AEUtil.java rename to src/main/java/com/github/gtexpert/core/integration/ae/AEUtil.java index 60d41c92..0603ceed 100644 --- a/src/main/java/gtexpert/integration/ae/AEUtil.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/AEUtil.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ae; +package com.github.gtexpert.core.integration.ae; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.Materials; diff --git a/src/main/java/gtexpert/integration/ae/loaders/AEMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java similarity index 93% rename from src/main/java/gtexpert/integration/ae/loaders/AEMaterialInfoLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java index ac3eee5d..071f6570 100644 --- a/src/main/java/gtexpert/integration/ae/loaders/AEMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ae.loaders; +package com.github.gtexpert.core.integration.ae.loaders; import gregtech.api.GTValues; import gregtech.api.unification.OreDictUnifier; @@ -6,8 +6,8 @@ import gregtech.api.unification.stack.ItemMaterialInfo; import gregtech.api.unification.stack.MaterialStack; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; public class AEMaterialInfoLoader { diff --git a/src/main/java/gtexpert/integration/ae/loaders/AEOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java similarity index 95% rename from src/main/java/gtexpert/integration/ae/loaders/AEOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java index 02d91227..8ae92ef5 100644 --- a/src/main/java/gtexpert/integration/ae/loaders/AEOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ae.loaders; +package com.github.gtexpert.core.integration.ae.loaders; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -8,8 +8,8 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; public class AEOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java similarity index 99% rename from src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java index a8289b2d..9ec5b2b7 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ae.recipes; +package com.github.gtexpert.core.integration.ae.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.integration.ae.AEUtil.tierMaterials; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import java.util.Map; import java.util.stream.IntStream; @@ -18,11 +18,11 @@ import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java similarity index 99% rename from src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java index da602827..ef381328 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ae.recipes; +package com.github.gtexpert.core.integration.ae.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.integration.ae.AEUtil.tierMaterials; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import java.util.Arrays; import java.util.Objects; @@ -16,12 +16,12 @@ import gregtech.api.unification.material.Materials; import gregtech.common.items.MetaItems; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.items.GTEMetaItems; -import gtexpert.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; public class AEItemsRecipe { diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java index 25174752..5afe268a 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ae.recipes; +package com.github.gtexpert.core.integration.ae.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier; +import static com.github.gtexpert.core.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier; import net.minecraftforge.fluids.FluidStack; @@ -23,10 +23,10 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.loaders.recipe.handlers.GTEImplosionRecipeHandler; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; public class AEMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/ae/recipes/AEToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java index 2f9cce47..bf91d2c3 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ae.recipes; +package com.github.gtexpert.core.integration.ae.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,8 +7,8 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import gtexpert.api.util.Mods; -import gtexpert.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; public class AEToolsRecipe { diff --git a/src/main/java/gtexpert/integration/aeaditions/AEAConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAConfigHolder.java similarity index 68% rename from src/main/java/gtexpert/integration/aeaditions/AEAConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAConfigHolder.java index 31a4e7b8..1c89546d 100644 --- a/src/main/java/gtexpert/integration/aeaditions/AEAConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAConfigHolder.java @@ -1,10 +1,10 @@ -package gtexpert.integration.aeaditions; +package com.github.gtexpert.core.integration.aeaditions; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config.LangKey; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @LangKey(GTEValues.MODID + ".config.integration.aeadditions") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/aeaditions/AEAModule.java b/src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAModule.java similarity index 59% rename from src/main/java/gtexpert/integration/aeaditions/AEAModule.java rename to src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAModule.java index 1557efdd..170fa604 100644 --- a/src/main/java/gtexpert/integration/aeaditions/AEAModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAModule.java @@ -1,14 +1,14 @@ -package gtexpert.integration.aeaditions; +package com.github.gtexpert.core.integration.aeaditions; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.aeaditions.recipes.AEAItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.aeaditions.recipes.AEAItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_AEA, diff --git a/src/main/java/gtexpert/integration/aeaditions/recipes/AEAItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/aeaditions/recipes/AEAItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java index 288701bf..202072f8 100644 --- a/src/main/java/gtexpert/integration/aeaditions/recipes/AEAItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java @@ -1,15 +1,15 @@ -package gtexpert.integration.aeaditions.recipes; +package com.github.gtexpert.core.integration.aeaditions.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.integration.ae.AEUtil.tierMaterials; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; -import gtexpert.api.GTEValues; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.Mods; public class AEAItemsRecipe { diff --git a/src/main/java/gtexpert/integration/avaritia/AvaritiaModule.java b/src/main/java/com/github/gtexpert/core/integration/avaritia/AvaritiaModule.java similarity index 59% rename from src/main/java/gtexpert/integration/avaritia/AvaritiaModule.java rename to src/main/java/com/github/gtexpert/core/integration/avaritia/AvaritiaModule.java index 86d27d9a..1a21ecef 100644 --- a/src/main/java/gtexpert/integration/avaritia/AvaritiaModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/avaritia/AvaritiaModule.java @@ -1,14 +1,14 @@ -package gtexpert.integration.avaritia; +package com.github.gtexpert.core.integration.avaritia; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.avaritia.recipes.AvaritiaMaterialsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.avaritia.recipes.AvaritiaMaterialsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_AVARITIA, diff --git a/src/main/java/gtexpert/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java index cd4a74eb..a5aaa9e8 100644 --- a/src/main/java/gtexpert/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.avaritia.recipes; +package com.github.gtexpert.core.integration.avaritia.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -9,8 +9,8 @@ import gregtech.common.ConfigHolder; import gregtech.common.items.MetaItems; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; public class AvaritiaMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/binnies/BinniesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java similarity index 66% rename from src/main/java/gtexpert/integration/binnies/BinniesModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java index d54006dc..91318a2f 100644 --- a/src/main/java/gtexpert/integration/binnies/BinniesModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies; +package com.github.gtexpert.core.integration.binnies; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.recipes.BinniesItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.recipes.BinniesItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_BINNIES, diff --git a/src/main/java/gtexpert/integration/binnies/botany/BotanyModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java similarity index 64% rename from src/main/java/gtexpert/integration/binnies/botany/BotanyModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java index a2bd8d9e..40e91830 100644 --- a/src/main/java/gtexpert/integration/binnies/botany/BotanyModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies.botany; +package com.github.gtexpert.core.integration.binnies.botany; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.botany.recipes.BotanyItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.botany.recipes.BotanyItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_BOTANY, diff --git a/src/main/java/gtexpert/integration/binnies/botany/recipes/BotanyItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java similarity index 82% rename from src/main/java/gtexpert/integration/binnies/botany/recipes/BotanyItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java index d230b812..e3be2b08 100644 --- a/src/main/java/gtexpert/integration/binnies/botany/recipes/BotanyItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.binnies.botany.recipes; +package com.github.gtexpert.core.integration.binnies.botany.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,10 +7,10 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; -import gtexpert.integration.ffm.recipes.machines.CarpenterLoader; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/binnies/extrabees/ExtraBeesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java similarity index 64% rename from src/main/java/gtexpert/integration/binnies/extrabees/ExtraBeesModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java index 8e9057e2..1ad77955 100644 --- a/src/main/java/gtexpert/integration/binnies/extrabees/ExtraBeesModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies.extrabees; +package com.github.gtexpert.core.integration.binnies.extrabees; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.extrabees.recipes.ExtraBeesItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.extrabees.recipes.ExtraBeesItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_EXBEES, diff --git a/src/main/java/gtexpert/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java similarity index 82% rename from src/main/java/gtexpert/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java index 606becd5..fb402170 100644 --- a/src/main/java/gtexpert/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.binnies.extrabees.recipes; +package com.github.gtexpert.core.integration.binnies.extrabees.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,10 +7,10 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; -import gtexpert.integration.ffm.recipes.machines.CarpenterLoader; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java similarity index 65% rename from src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java index ffb06910..69b4dcfc 100644 --- a/src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies.extratrees; +package com.github.gtexpert.core.integration.binnies.extratrees; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.extratrees.recipes.*; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.extratrees.recipes.*; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_EXTREES, diff --git a/src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java similarity index 88% rename from src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java index 45d7c219..72bbea70 100644 --- a/src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.binnies.extratrees.recipes; +package com.github.gtexpert.core.integration.binnies.extratrees.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,10 +7,10 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; -import gtexpert.integration.ffm.recipes.machines.CarpenterLoader; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/binnies/genetics/GeneticsModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java similarity index 64% rename from src/main/java/gtexpert/integration/binnies/genetics/GeneticsModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java index fa9c4262..01575677 100644 --- a/src/main/java/gtexpert/integration/binnies/genetics/GeneticsModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies.genetics; +package com.github.gtexpert.core.integration.binnies.genetics; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.genetics.recipes.GeneticsItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.genetics.recipes.GeneticsItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_GENETICS, diff --git a/src/main/java/gtexpert/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java index 3db1ce1b..ebb5cca9 100644 --- a/src/main/java/gtexpert/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.binnies.genetics.recipes; +package com.github.gtexpert.core.integration.binnies.genetics.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -14,11 +14,11 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; -import gtexpert.integration.ffm.recipes.machines.CarpenterLoader; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/binnies/recipes/BinniesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java similarity index 82% rename from src/main/java/gtexpert/integration/binnies/recipes/BinniesItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java index 7ce1c7e9..c1b6c545 100644 --- a/src/main/java/gtexpert/integration/binnies/recipes/BinniesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java @@ -1,11 +1,11 @@ -package gtexpert.integration.binnies.recipes; +package com.github.gtexpert.core.integration.binnies.recipes; import gregtech.api.recipes.ModHandler; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/chisel/ChiselConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java similarity index 81% rename from src/main/java/gtexpert/integration/chisel/ChiselConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java index 6f40d8f4..87271fc0 100644 --- a/src/main/java/gtexpert/integration/chisel/ChiselConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.chisel; +package com.github.gtexpert.core.integration.chisel; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.chisel") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/chisel/ChiselModule.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java similarity index 57% rename from src/main/java/gtexpert/integration/chisel/ChiselModule.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java index 98038696..a7f0696f 100644 --- a/src/main/java/gtexpert/integration/chisel/ChiselModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java @@ -1,18 +1,18 @@ -package gtexpert.integration.chisel; +package com.github.gtexpert.core.integration.chisel; import net.minecraft.block.Block; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.chisel.loaders.ChiselOreDictionaryLoader; -import gtexpert.integration.chisel.metatileentities.ChiselMetaTileEntities; -import gtexpert.integration.chisel.recipes.ChiselBlocksRecipe; -import gtexpert.integration.chisel.recipes.ChiselToolsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.chisel.loaders.ChiselOreDictionaryLoader; +import com.github.gtexpert.core.integration.chisel.metatileentities.ChiselMetaTileEntities; +import com.github.gtexpert.core.integration.chisel.recipes.ChiselBlocksRecipe; +import com.github.gtexpert.core.integration.chisel.recipes.ChiselToolsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_CHISEL, diff --git a/src/main/java/gtexpert/integration/chisel/ChiselRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java similarity index 89% rename from src/main/java/gtexpert/integration/chisel/ChiselRecipeMaps.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java index 3a6a8ef6..b1bb387b 100644 --- a/src/main/java/gtexpert/integration/chisel/ChiselRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java @@ -1,4 +1,4 @@ -package gtexpert.integration.chisel; +package com.github.gtexpert.core.integration.chisel; import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; @@ -6,7 +6,7 @@ import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; -import gtexpert.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; diff --git a/src/main/java/gtexpert/integration/chisel/ChiselUtil.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java similarity index 93% rename from src/main/java/gtexpert/integration/chisel/ChiselUtil.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java index bb53545f..24582254 100644 --- a/src/main/java/gtexpert/integration/chisel/ChiselUtil.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java @@ -1,4 +1,4 @@ -package gtexpert.integration.chisel; +package com.github.gtexpert.core.integration.chisel; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/gtexpert/integration/chisel/loaders/ChiselOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java similarity index 67% rename from src/main/java/gtexpert/integration/chisel/loaders/ChiselOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java index a341bc55..d7544907 100644 --- a/src/main/java/gtexpert/integration/chisel/loaders/ChiselOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java @@ -1,7 +1,7 @@ -package gtexpert.integration.chisel.loaders; +package com.github.gtexpert.core.integration.chisel.loaders; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; public class ChiselOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/chisel/metatileentities/ChiselMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java similarity index 82% rename from src/main/java/gtexpert/integration/chisel/metatileentities/ChiselMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java index 23c37ff1..94ae2456 100644 --- a/src/main/java/gtexpert/integration/chisel/metatileentities/ChiselMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java @@ -1,13 +1,13 @@ -package gtexpert.integration.chisel.metatileentities; +package com.github.gtexpert.core.integration.chisel.metatileentities; import static gregtech.api.GTValues.*; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.util.GTUtility; -import gtexpert.client.GTETextures; -import gtexpert.integration.chisel.ChiselRecipeMaps; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; public class ChiselMetaTileEntities { diff --git a/src/main/java/gtexpert/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java similarity index 81% rename from src/main/java/gtexpert/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java index c521b26a..666fd3fd 100644 --- a/src/main/java/gtexpert/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java @@ -1,4 +1,4 @@ -package gtexpert.integration.chisel.metatileentities; +package com.github.gtexpert.core.integration.chisel.metatileentities; import java.util.function.Function; @@ -9,8 +9,8 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.api.capability.SingleblockRecipeLogicNoCache; -import gtexpert.common.metatileentities.GTESimpleMachineMetaTileEntity; +import com.github.gtexpert.core.api.capability.SingleblockRecipeLogicNoCache; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; public class MetaTileEntityAutoChisel extends GTESimpleMachineMetaTileEntity { diff --git a/src/main/java/gtexpert/integration/chisel/recipes/ChiselBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/chisel/recipes/ChiselBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java index fa88a59e..d89ff5b4 100644 --- a/src/main/java/gtexpert/integration/chisel/recipes/ChiselBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java @@ -1,9 +1,9 @@ -package gtexpert.integration.chisel.recipes; +package com.github.gtexpert.core.integration.chisel.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; import static gregtech.loaders.recipe.CraftingComponent.*; -import static gtexpert.integration.chisel.metatileentities.ChiselMetaTileEntities.AUTO_CHISEL; +import static com.github.gtexpert.core.integration.chisel.metatileentities.ChiselMetaTileEntities.AUTO_CHISEL; import java.util.Arrays; import java.util.List; @@ -26,11 +26,11 @@ import gregtech.common.blocks.*; import gregtech.loaders.recipe.MetaTileEntityLoader; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.chisel.ChiselConfigHolder; -import gtexpert.integration.chisel.ChiselRecipeMaps; -import gtexpert.integration.chisel.ChiselUtil; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; +import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; +import com.github.gtexpert.core.integration.chisel.ChiselUtil; public class ChiselBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/chisel/recipes/ChiselToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java similarity index 89% rename from src/main/java/gtexpert/integration/chisel/recipes/ChiselToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java index 4a2b59b3..fb968370 100644 --- a/src/main/java/gtexpert/integration/chisel/recipes/ChiselToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.chisel.recipes; +package com.github.gtexpert.core.integration.chisel.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,9 +7,9 @@ import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.chisel.ChiselConfigHolder; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; public class ChiselToolsRecipe { diff --git a/src/main/java/gtexpert/integration/crafttweaker/CraftTweakerModule.java b/src/main/java/com/github/gtexpert/core/integration/crafttweaker/CraftTweakerModule.java similarity index 50% rename from src/main/java/gtexpert/integration/crafttweaker/CraftTweakerModule.java rename to src/main/java/com/github/gtexpert/core/integration/crafttweaker/CraftTweakerModule.java index 9ed245ef..edc32015 100644 --- a/src/main/java/gtexpert/integration/crafttweaker/CraftTweakerModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/crafttweaker/CraftTweakerModule.java @@ -1,10 +1,10 @@ -package gtexpert.integration.crafttweaker; +package com.github.gtexpert.core.integration.crafttweaker; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_CT, diff --git a/src/main/java/gtexpert/integration/crafttweaker/provider/CrTI18nProvider.java b/src/main/java/com/github/gtexpert/core/integration/crafttweaker/provider/CrTI18nProvider.java similarity index 90% rename from src/main/java/gtexpert/integration/crafttweaker/provider/CrTI18nProvider.java rename to src/main/java/com/github/gtexpert/core/integration/crafttweaker/provider/CrTI18nProvider.java index 3f46b006..abfd7fe5 100644 --- a/src/main/java/gtexpert/integration/crafttweaker/provider/CrTI18nProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/crafttweaker/provider/CrTI18nProvider.java @@ -1,4 +1,4 @@ -package gtexpert.integration.crafttweaker.provider; +package com.github.gtexpert.core.integration.crafttweaker.provider; import net.minecraft.util.text.translation.I18n; diff --git a/src/main/java/gtexpert/integration/ctm/IFacadeWrapper.java b/src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java similarity index 93% rename from src/main/java/gtexpert/integration/ctm/IFacadeWrapper.java rename to src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java index 2397ba73..ed7f5b41 100644 --- a/src/main/java/gtexpert/integration/ctm/IFacadeWrapper.java +++ b/src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ctm; +package com.github.gtexpert.core.integration.ctm; import javax.annotation.Nonnull; diff --git a/src/main/java/gtexpert/integration/deda/DEDAConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAConfigHolder.java similarity index 78% rename from src/main/java/gtexpert/integration/deda/DEDAConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/deda/DEDAConfigHolder.java index 44218ddd..d056415a 100644 --- a/src/main/java/gtexpert/integration/deda/DEDAConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.deda; +package com.github.gtexpert.core.integration.deda; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.deda") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/deda/DEDAModule.java b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java similarity index 71% rename from src/main/java/gtexpert/integration/deda/DEDAModule.java rename to src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java index d6e791db..9fee098c 100644 --- a/src/main/java/gtexpert/integration/deda/DEDAModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java @@ -1,19 +1,19 @@ -package gtexpert.integration.deda; +package com.github.gtexpert.core.integration.deda; import net.minecraft.block.Block; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.deda.loaders.DEDAMaterialInfoLoader; -import gtexpert.integration.deda.loaders.DEDAOreDictionaryLoader; -import gtexpert.integration.deda.metatileentities.DEDAMetaTileEntities; -import gtexpert.integration.deda.recipes.*; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.deda.loaders.DEDAMaterialInfoLoader; +import com.github.gtexpert.core.integration.deda.loaders.DEDAOreDictionaryLoader; +import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; +import com.github.gtexpert.core.integration.deda.recipes.*; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_DEDA, diff --git a/src/main/java/gtexpert/integration/deda/loaders/DEDAMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java similarity index 81% rename from src/main/java/gtexpert/integration/deda/loaders/DEDAMaterialInfoLoader.java rename to src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java index a51b987e..737df53c 100644 --- a/src/main/java/gtexpert/integration/deda/loaders/DEDAMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.loaders; +package com.github.gtexpert.core.integration.deda.loaders; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -9,11 +9,11 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.ConfigHolder; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; public class DEDAMaterialInfoLoader { diff --git a/src/main/java/gtexpert/integration/deda/loaders/DEDAOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java similarity index 87% rename from src/main/java/gtexpert/integration/deda/loaders/DEDAOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java index d63701a0..f0af4d9d 100644 --- a/src/main/java/gtexpert/integration/deda/loaders/DEDAOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java @@ -1,8 +1,8 @@ -package gtexpert.integration.deda.loaders; +package com.github.gtexpert.core.integration.deda.loaders; import net.minecraftforge.oredict.OreDictionary; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class DEDAOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/deda/metatileentities/DEDAMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java similarity index 82% rename from src/main/java/gtexpert/integration/deda/metatileentities/DEDAMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java index 399f1a7a..819b3e7f 100644 --- a/src/main/java/gtexpert/integration/deda/metatileentities/DEDAMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java @@ -1,7 +1,7 @@ -package gtexpert.integration.deda.metatileentities; +package com.github.gtexpert.core.integration.deda.metatileentities; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; public class DEDAMetaTileEntities { diff --git a/src/main/java/gtexpert/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java similarity index 91% rename from src/main/java/gtexpert/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java rename to src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java index 8a65149e..27dcd58f 100644 --- a/src/main/java/gtexpert/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.metatileentities; +package com.github.gtexpert.core.integration.deda.metatileentities; import java.util.List; @@ -26,12 +26,12 @@ import gregtech.client.renderer.ICubeRenderer; import gregtech.core.sound.GTSoundEvents; -import gtexpert.api.capability.MultiblockRecipeLogicNoCache; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.client.GTETextures; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.capability.MultiblockRecipeLogicNoCache; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; public abstract class MetaTileEntityDraconiumFusion extends RecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/integration/deda/provider/DEDAJEIProvider.java b/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java similarity index 82% rename from src/main/java/gtexpert/integration/deda/provider/DEDAJEIProvider.java rename to src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java index 8c3cdfa8..81735de4 100644 --- a/src/main/java/gtexpert/integration/deda/provider/DEDAJEIProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java @@ -1,12 +1,12 @@ -package gtexpert.integration.deda.provider; +package com.github.gtexpert.core.integration.deda.provider; import org.jetbrains.annotations.NotNull; import gregtech.api.GTValues; -import gtexpert.api.GTEValues; -import gtexpert.integration.deda.metatileentities.DEDAMetaTileEntities; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/GTEDraconicRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java similarity index 96% rename from src/main/java/gtexpert/integration/deda/recipemaps/GTEDraconicRecipeMaps.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java index 25edb4dd..6a8c0ec1 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/GTEDraconicRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps; +package com.github.gtexpert.core.integration.deda.recipemaps; import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; @@ -7,8 +7,8 @@ import gregtech.api.recipes.ingredients.GTRecipeInput; import gregtech.core.sound.GTSoundEvents; -import gtexpert.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; -import gtexpert.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java similarity index 94% rename from src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicFusion.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java index 439eb8bd..455f0075 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps; +package com.github.gtexpert.core.integration.deda.recipemaps; import java.util.List; @@ -25,11 +25,11 @@ import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; -import gtexpert.api.util.GTELog; -import gtexpert.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; -import gtexpert.integration.deda.recipemaps.tierup.TierUpRecipeProperty; -import gtexpert.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; -import gtexpert.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeProperty; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; import cofh.redstoneflux.api.IEnergyContainerItem; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java similarity index 93% rename from src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java index c4b3eb96..f437f39a 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps; +package com.github.gtexpert.core.integration.deda.recipemaps; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java similarity index 97% rename from src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java index a47a7dd3..e97a6fae 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps.tierup; +package com.github.gtexpert.core.integration.deda.recipemaps.tierup; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -19,7 +19,7 @@ import gregtech.api.util.EnumValidationResult; import gregtech.api.util.ValidationResult; -import gtexpert.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTELog; public class TierUpRecipeBuilder extends RecipeBuilder { diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java similarity index 93% rename from src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java index c944db8d..9f2d7daa 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps.tierup; +package com.github.gtexpert.core.integration.deda.recipemaps.tierup; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java similarity index 98% rename from src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java index 69870746..dcecb6eb 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps.upgrade; +package com.github.gtexpert.core.integration.deda.recipemaps.upgrade; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ import gregtech.api.util.EnumValidationResult; import gregtech.api.util.ValidationResult; -import gtexpert.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTELog; public class UpgradeRecipeBuilder extends RecipeBuilder { diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java similarity index 93% rename from src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java index 701f2d14..fcd25e69 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps.upgrade; +package com.github.gtexpert.core.integration.deda.recipemaps.upgrade; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java index c4911fe3..3eebb4b6 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -24,15 +24,15 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEBlockWireCoil; -import gtexpert.common.blocks.GTEMetaBlocks; -import gtexpert.integration.deda.metatileentities.DEDAMetaTileEntities; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEBlockWireCoil; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; public class DraconicBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicFluidRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java similarity index 92% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicFluidRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java index 41fbbdaf..08606459 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicFluidRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.dust; @@ -9,8 +9,8 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; public class DraconicFluidRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java similarity index 80% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java index 6a00909a..a8df24d5 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java @@ -1,11 +1,11 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.unification.ore.OrePrefix.block; import com.brandon3055.draconicevolution.DEFeatures; import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; -import gtexpert.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; public class DraconicImplosionMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java index a4828a29..69420d5a 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -22,11 +22,11 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; public class DraconicItemsRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java index 8292990b..35f9f7e8 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.info.MaterialFlags.*; @@ -40,9 +40,9 @@ import gregicality.multiblocks.api.unification.GCYMMaterialFlags; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; public class DraconicMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicTierupRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicTierupRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java index 10d6b606..f1c506ce 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicTierupRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.plate; @@ -22,12 +22,12 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import gtexpert.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; public class DraconicTierupRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java index a332bb95..668cdf12 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -18,10 +18,10 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; public class DraconicToolsRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicUpgradeRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicUpgradeRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java index d8839090..d2c0c9e2 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicUpgradeRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.VA; @@ -17,11 +17,11 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTELog; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import gtexpert.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; public class DraconicUpgradeRecipe { diff --git a/src/main/java/gtexpert/integration/eio/EnderIOConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOConfigHolder.java similarity index 87% rename from src/main/java/gtexpert/integration/eio/EnderIOConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/eio/EnderIOConfigHolder.java index b60b9a09..c85fb05e 100644 --- a/src/main/java/gtexpert/integration/eio/EnderIOConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.eio; +package com.github.gtexpert.core.integration.eio; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.eio") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/eio/EnderIOModule.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java similarity index 86% rename from src/main/java/gtexpert/integration/eio/EnderIOModule.java rename to src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java index ca2b8b54..e552de6b 100644 --- a/src/main/java/gtexpert/integration/eio/EnderIOModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio; +package com.github.gtexpert.core.integration.eio; import static gregtech.api.GTValues.*; @@ -22,16 +22,16 @@ import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.eio.loaders.EIOMaterialInfoLoader; -import gtexpert.integration.eio.loaders.EIOOreDictionaryLoader; -import gtexpert.integration.eio.metatileentities.EIOMetaTileEntities; -import gtexpert.integration.eio.recipes.*; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.eio.loaders.EIOMaterialInfoLoader; +import com.github.gtexpert.core.integration.eio.loaders.EIOOreDictionaryLoader; +import com.github.gtexpert.core.integration.eio.metatileentities.EIOMetaTileEntities; +import com.github.gtexpert.core.integration.eio.recipes.*; +import com.github.gtexpert.core.modules.GTEModules; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/eio/EnderIORecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java similarity index 92% rename from src/main/java/gtexpert/integration/eio/EnderIORecipeMaps.java rename to src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java index 99fd2b22..9e45d9d9 100644 --- a/src/main/java/gtexpert/integration/eio/EnderIORecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio; +package com.github.gtexpert.core.integration.eio; import net.minecraft.util.SoundEvent; @@ -8,8 +8,8 @@ import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.util.Mods; import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; diff --git a/src/main/java/gtexpert/integration/eio/loaders/EIOMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java similarity index 93% rename from src/main/java/gtexpert/integration/eio/loaders/EIOMaterialInfoLoader.java rename to src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java index af60fcdb..edb009f9 100644 --- a/src/main/java/gtexpert/integration/eio/loaders/EIOMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.loaders; +package com.github.gtexpert.core.integration.eio.loaders; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -10,9 +10,9 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.ConfigHolder; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; public class EIOMaterialInfoLoader { diff --git a/src/main/java/gtexpert/integration/eio/loaders/EIOOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOOreDictionaryLoader.java similarity index 93% rename from src/main/java/gtexpert/integration/eio/loaders/EIOOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOOreDictionaryLoader.java index 32d16269..03e13811 100644 --- a/src/main/java/gtexpert/integration/eio/loaders/EIOOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOOreDictionaryLoader.java @@ -1,10 +1,10 @@ -package gtexpert.integration.eio.loaders; +package com.github.gtexpert.core.integration.eio.loaders; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gtexpert.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.GTEUtility; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.base.material.material.Material; diff --git a/src/main/java/gtexpert/integration/eio/metatileentities/EIOMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java similarity index 79% rename from src/main/java/gtexpert/integration/eio/metatileentities/EIOMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java index 188c8ab4..a4739811 100644 --- a/src/main/java/gtexpert/integration/eio/metatileentities/EIOMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java @@ -1,16 +1,16 @@ -package gtexpert.integration.eio.metatileentities; +package com.github.gtexpert.core.integration.eio.metatileentities; import static gregtech.api.GTValues.*; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; -import static gtexpert.api.util.GTEUtility.gteId; -import static gtexpert.common.metatileentities.GTEMetaTileEntities.registerGTESimpleMetaTileEntity; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities.registerGTESimpleMetaTileEntity; import gregtech.api.util.GTUtility; -import gtexpert.api.util.GTEUtility; -import gtexpert.client.GTETextures; -import gtexpert.common.metatileentities.GTESimpleMachineMetaTileEntity; -import gtexpert.integration.eio.EnderIORecipeMaps; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; public class EIOMetaTileEntities { diff --git a/src/main/java/gtexpert/integration/eio/metatileentities/ElectricSpawnerLogic.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java similarity index 99% rename from src/main/java/gtexpert/integration/eio/metatileentities/ElectricSpawnerLogic.java rename to src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java index 1ab5312d..0cf027ba 100644 --- a/src/main/java/gtexpert/integration/eio/metatileentities/ElectricSpawnerLogic.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.metatileentities; +package com.github.gtexpert.core.integration.eio.metatileentities; import java.util.Collections; import java.util.function.Supplier; @@ -29,7 +29,7 @@ import gregtech.api.util.GTTransferUtils; import gregtech.api.util.GTUtility; -import gtexpert.api.capability.GTEDataCodes; +import com.github.gtexpert.core.api.capability.GTEDataCodes; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.base.item.soulvial.ItemSoulVial; diff --git a/src/main/java/gtexpert/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java similarity index 97% rename from src/main/java/gtexpert/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java rename to src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java index 67cc94bb..82683ceb 100644 --- a/src/main/java/gtexpert/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.metatileentities; +package com.github.gtexpert.core.integration.eio.metatileentities; import java.util.Arrays; import java.util.List; @@ -36,10 +36,10 @@ import gregtech.api.util.Size; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.metatileentities.GTESimpleMachineMetaTileEntity; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; public class MetaTileEntityElectricSpawner extends GTESimpleMachineMetaTileEntity { diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java index 20a8e564..da215a81 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -18,13 +18,13 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.loaders.recipe.MetaTileEntityLoader; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.integration.eio.EnderIOConfigHolder; -import gtexpert.integration.eio.metatileentities.EIOMetaTileEntities; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; +import com.github.gtexpert.core.integration.eio.metatileentities.EIOMetaTileEntities; import crazypants.enderio.conduits.init.ConduitObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOFluidRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/eio/recipes/EIOFluidRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java index 0aa30675..9772cdb8 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOFluidRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.dust; @@ -9,10 +9,10 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/eio/recipes/EIOItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java index ac0761cd..9f9b6306 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.dust; @@ -11,12 +11,12 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/eio/recipes/EIOMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java index d4a73d30..a35f338c 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.*; @@ -14,9 +14,9 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.loaders.recipe.handlers.GTEImplosionRecipeHandler; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOSliceNSpliceRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/eio/recipes/EIOSliceNSpliceRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java index 6fd7ff59..6151c257 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOSliceNSpliceRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -8,8 +8,8 @@ import gregtech.api.unification.material.Materials; import gregtech.common.items.MetaItems; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.integration.eio.EnderIORecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOSoulBinderRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/eio/recipes/EIOSoulBinderRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java index 6f255f18..7ae7f14b 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOSoulBinderRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.gem; @@ -16,9 +16,9 @@ import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.GTEUtility; -import gtexpert.integration.eio.EnderIOModule; -import gtexpert.integration.eio.EnderIORecipeMaps; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.integration.eio.EnderIOModule; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/eio/recipes/EIOToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java index b09226d0..760502bf 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -9,8 +9,8 @@ import gregtech.api.unification.OreDictUnifier; import gregtech.common.ConfigHolder; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.integration.eio.EnderIOConfigHolder; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOVialExtractorRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/eio/recipes/EIOVialExtractorRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java index 3283211d..2cac9802 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOVialExtractorRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.unification.ore.OrePrefix.ingot; @@ -10,8 +10,8 @@ import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; -import gtexpert.integration.eio.EnderIOModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.eio.EnderIOModule; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/extracpus/EXCPUSConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSConfigHolder.java similarity index 78% rename from src/main/java/gtexpert/integration/extracpus/EXCPUSConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSConfigHolder.java index 8112365a..19530140 100644 --- a/src/main/java/gtexpert/integration/extracpus/EXCPUSConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSConfigHolder.java @@ -1,10 +1,10 @@ -package gtexpert.integration.extracpus; +package com.github.gtexpert.core.integration.extracpus; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config.LangKey; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @LangKey(GTEValues.MODID + ".config.integration.extracpus") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/extracpus/EXCPUSModule.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSModule.java similarity index 57% rename from src/main/java/gtexpert/integration/extracpus/EXCPUSModule.java rename to src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSModule.java index d14be857..11fafbbc 100644 --- a/src/main/java/gtexpert/integration/extracpus/EXCPUSModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.extracpus; +package com.github.gtexpert.core.integration.extracpus; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.extracpus.recipes.EXCPUSBlocksRecipe; -import gtexpert.integration.extracpus.recipes.EXCPUSItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.extracpus.recipes.EXCPUSBlocksRecipe; +import com.github.gtexpert.core.integration.extracpus.recipes.EXCPUSItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_EXCPUS, diff --git a/src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java index 506ec80e..e7d591e2 100644 --- a/src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.extracpus.recipes; +package com.github.gtexpert.core.integration.extracpus.recipes; import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; @@ -6,8 +6,8 @@ import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; -import gtexpert.api.util.Mods; -import gtexpert.integration.extracpus.EXCPUSConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.extracpus.EXCPUSConfigHolder; public class EXCPUSBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java index 25363dc4..7c82f83f 100644 --- a/src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java @@ -1,11 +1,11 @@ -package gtexpert.integration.extracpus.recipes; +package com.github.gtexpert.core.integration.extracpus.recipes; import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; import gregtech.api.recipes.RecipeMaps; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class EXCPUSItemsRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/FFMConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java similarity index 76% rename from src/main/java/gtexpert/integration/ffm/FFMConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java index e1a5a616..efaee201 100644 --- a/src/main/java/gtexpert/integration/ffm/FFMConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.ffm; +package com.github.gtexpert.core.integration.ffm; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.ffm") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/ffm/FFMModule.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java similarity index 65% rename from src/main/java/gtexpert/integration/ffm/FFMModule.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java index ac0735b5..3c642dc7 100644 --- a/src/main/java/gtexpert/integration/ffm/FFMModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java @@ -1,17 +1,17 @@ -package gtexpert.integration.ffm; +package com.github.gtexpert.core.integration.ffm; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.ffm.loaders.FFMOreDictionaryLoader; -import gtexpert.integration.ffm.recipes.*; -import gtexpert.integration.ffm.recipes.machines.*; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.ffm.loaders.FFMOreDictionaryLoader; +import com.github.gtexpert.core.integration.ffm.recipes.*; +import com.github.gtexpert.core.integration.ffm.recipes.machines.*; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_FFM, diff --git a/src/main/java/gtexpert/integration/ffm/FFMUtility.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java similarity index 93% rename from src/main/java/gtexpert/integration/ffm/FFMUtility.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java index 63612a2f..0cd209ad 100644 --- a/src/main/java/gtexpert/integration/ffm/FFMUtility.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java @@ -1,10 +1,10 @@ -package gtexpert.integration.ffm; +package com.github.gtexpert.core.integration.ffm; import org.jetbrains.annotations.NotNull; import gregtech.common.ConfigHolder; -import gtexpert.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTELog; import forestry.api.core.ForestryAPI; diff --git a/src/main/java/gtexpert/integration/ffm/loaders/FFMOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java similarity index 78% rename from src/main/java/gtexpert/integration/ffm/loaders/FFMOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java index b8aa1104..c2246980 100644 --- a/src/main/java/gtexpert/integration/ffm/loaders/FFMOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ffm.loaders; +package com.github.gtexpert.core.integration.ffm.loaders; import net.minecraftforge.oredict.OreDictionary; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMBlockRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/ffm/recipes/FFMBlockRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java index 5cb0c8bd..7367f1ff 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMBlockRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes; +package com.github.gtexpert.core.integration.ffm.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -11,7 +11,7 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMBlockRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMItemRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java similarity index 92% rename from src/main/java/gtexpert/integration/ffm/recipes/FFMItemRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java index 7f66983c..8872bd63 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMItemRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes; +package com.github.gtexpert.core.integration.ffm.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,7 +7,7 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMItemRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/ffm/recipes/FFMMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java index e1467f15..7d502cca 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ffm.recipes; +package com.github.gtexpert.core.integration.ffm.recipes; import gregtech.api.recipes.ModHandler; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMToolRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/ffm/recipes/FFMToolRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java index 0a6bb308..d7a76c5c 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMToolRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes; +package com.github.gtexpert.core.integration.ffm.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -13,7 +13,7 @@ import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMToolRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/machines/CarpenterLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java similarity index 99% rename from src/main/java/gtexpert/integration/ffm/recipes/machines/CarpenterLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java index 89128060..e5f6c8b2 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/machines/CarpenterLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes.machines; +package com.github.gtexpert.core.integration.ffm.recipes.machines; import static gregtech.api.unification.ore.OrePrefix.*; @@ -19,11 +19,11 @@ import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; -import gtexpert.api.util.GTELog; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; import forestry.api.circuits.ICircuit; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/ffm/recipes/machines/CentrifugeLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java similarity index 99% rename from src/main/java/gtexpert/integration/ffm/recipes/machines/CentrifugeLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java index b376ba9d..a7b3acf7 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/machines/CentrifugeLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes.machines; +package com.github.gtexpert.core.integration.ffm.recipes.machines; import static gregtech.api.unification.ore.OrePrefix.*; @@ -11,7 +11,7 @@ import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; import forestry.factory.MachineUIDs; import forestry.factory.ModuleFactory; diff --git a/src/main/java/gtexpert/integration/ffm/recipes/machines/FabricatorLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java similarity index 94% rename from src/main/java/gtexpert/integration/ffm/recipes/machines/FabricatorLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java index 34aeb30d..8308c208 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/machines/FabricatorLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes.machines; +package com.github.gtexpert.core.integration.ffm.recipes.machines; import java.util.ArrayList; import java.util.Collections; @@ -10,8 +10,8 @@ import gregtech.api.unification.material.Materials; import gregtech.api.util.GTUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMUtility; import binnie.extratrees.wood.EnumETLog; import forestry.api.arboriculture.*; diff --git a/src/main/java/gtexpert/integration/gendustry/GendustryConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java similarity index 66% rename from src/main/java/gtexpert/integration/gendustry/GendustryConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java index 4380df04..b2375add 100644 --- a/src/main/java/gtexpert/integration/gendustry/GendustryConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.gendustry; +package com.github.gtexpert.core.integration.gendustry; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.gendustry") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/gendustry/GendustryModule.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java similarity index 57% rename from src/main/java/gtexpert/integration/gendustry/GendustryModule.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java index eb7003c3..7b3ad1a1 100644 --- a/src/main/java/gtexpert/integration/gendustry/GendustryModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java @@ -1,17 +1,17 @@ -package gtexpert.integration.gendustry; +package com.github.gtexpert.core.integration.gendustry; import net.minecraft.block.Block; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.gendustry.metatileentities.GendustryMetaTileEntities; -import gtexpert.integration.gendustry.recipes.GendustryBlocksRecipe; -import gtexpert.integration.gendustry.recipes.GendustryItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.gendustry.metatileentities.GendustryMetaTileEntities; +import com.github.gtexpert.core.integration.gendustry.recipes.GendustryBlocksRecipe; +import com.github.gtexpert.core.integration.gendustry.recipes.GendustryItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_GENDUSTRY, diff --git a/src/main/java/gtexpert/integration/gendustry/GendustryRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java similarity index 70% rename from src/main/java/gtexpert/integration/gendustry/GendustryRecipeMaps.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java index d28f3861..88fa2b0c 100644 --- a/src/main/java/gtexpert/integration/gendustry/GendustryRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java @@ -1,10 +1,10 @@ -package gtexpert.integration.gendustry; +package com.github.gtexpert.core.integration.gendustry; import gregtech.api.recipes.RecipeMap; import gregtech.core.sound.GTSoundEvents; -import gtexpert.integration.gendustry.recipes.builders.IndustrialApiaryRecipeBuilder; -import gtexpert.integration.gendustry.recipes.machines.RecipeMapIndustrialApiary; +import com.github.gtexpert.core.integration.gendustry.recipes.builders.IndustrialApiaryRecipeBuilder; +import com.github.gtexpert.core.integration.gendustry.recipes.machines.RecipeMapIndustrialApiary; import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; diff --git a/src/main/java/gtexpert/integration/gendustry/metatileentities/GendustryMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java similarity index 73% rename from src/main/java/gtexpert/integration/gendustry/metatileentities/GendustryMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java index 91ac902e..a2d7cf34 100644 --- a/src/main/java/gtexpert/integration/gendustry/metatileentities/GendustryMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java @@ -1,12 +1,12 @@ -package gtexpert.integration.gendustry.metatileentities; +package com.github.gtexpert.core.integration.gendustry.metatileentities; import static gregtech.api.GTValues.V; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; -import static gtexpert.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; -import gtexpert.client.GTETextures; -import gtexpert.common.GTEConfigHolder; -import gtexpert.integration.gendustry.GendustryRecipeMaps; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.gendustry.GendustryRecipeMaps; public class GendustryMetaTileEntities { diff --git a/src/main/java/gtexpert/integration/gendustry/metatileentities/IndustrialApiaryLogic.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java similarity index 88% rename from src/main/java/gtexpert/integration/gendustry/metatileentities/IndustrialApiaryLogic.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java index c5cf411b..71104052 100644 --- a/src/main/java/gtexpert/integration/gendustry/metatileentities/IndustrialApiaryLogic.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.metatileentities; +package com.github.gtexpert.core.integration.gendustry.metatileentities; import java.util.function.Supplier; diff --git a/src/main/java/gtexpert/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java similarity index 87% rename from src/main/java/gtexpert/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java index 0133a6c7..e7a4944a 100644 --- a/src/main/java/gtexpert/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.metatileentities; +package com.github.gtexpert.core.integration.gendustry.metatileentities; import java.util.function.Function; @@ -9,7 +9,7 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.common.metatileentities.GTESimpleMachineMetaTileEntity; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; public class MetaTileEntityIndustrialApiary extends GTESimpleMachineMetaTileEntity { diff --git a/src/main/java/gtexpert/integration/gendustry/recipes/GendustryBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java similarity index 53% rename from src/main/java/gtexpert/integration/gendustry/recipes/GendustryBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java index 1209f666..39521c41 100644 --- a/src/main/java/gtexpert/integration/gendustry/recipes/GendustryBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.recipes; +package com.github.gtexpert.core.integration.gendustry.recipes; public class GendustryBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/gendustry/recipes/GendustryItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java similarity index 53% rename from src/main/java/gtexpert/integration/gendustry/recipes/GendustryItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java index 4d9550ef..ab0c124c 100644 --- a/src/main/java/gtexpert/integration/gendustry/recipes/GendustryItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.recipes; +package com.github.gtexpert.core.integration.gendustry.recipes; public class GendustryItemsRecipe { diff --git a/src/main/java/gtexpert/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java similarity index 92% rename from src/main/java/gtexpert/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java index 76c3b0ff..64361200 100644 --- a/src/main/java/gtexpert/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.recipes.builders; +package com.github.gtexpert.core.integration.gendustry.recipes.builders; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/gtexpert/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java similarity index 87% rename from src/main/java/gtexpert/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java index 7d060dd6..e52e11d2 100644 --- a/src/main/java/gtexpert/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.recipes.machines; +package com.github.gtexpert.core.integration.gendustry.recipes.machines; import gregtech.api.recipes.RecipeBuilder; import gregtech.api.recipes.RecipeMap; diff --git a/src/main/java/gtexpert/integration/gtfo/GTFOModule.java b/src/main/java/com/github/gtexpert/core/integration/gtfo/GTFOModule.java similarity index 56% rename from src/main/java/gtexpert/integration/gtfo/GTFOModule.java rename to src/main/java/com/github/gtexpert/core/integration/gtfo/GTFOModule.java index b8156c47..aff9d7ad 100644 --- a/src/main/java/gtexpert/integration/gtfo/GTFOModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/gtfo/GTFOModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.gtfo; +package com.github.gtexpert.core.integration.gtfo; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.gtfo.recipes.GTFOChemicalRecipe; -import gtexpert.integration.gtfo.recipes.GTFOItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.gtfo.recipes.GTFOChemicalRecipe; +import com.github.gtexpert.core.integration.gtfo.recipes.GTFOItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_GTFO, diff --git a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOChemicalRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOChemicalRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/gtfo/recipes/GTFOChemicalRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOChemicalRecipe.java index 87f65d30..f20dd74e 100644 --- a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOChemicalRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOChemicalRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gtfo.recipes; +package com.github.gtexpert.core.integration.gtfo.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.dust; diff --git a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java similarity index 90% rename from src/main/java/gtexpert/integration/gtfo/recipes/GTFOItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java index 7c74d4a8..0a62eda7 100644 --- a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gtfo.recipes; +package com.github.gtexpert.core.integration.gtfo.recipes; import net.minecraft.init.Items; @@ -6,7 +6,7 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class GTFOItemsRecipe { diff --git a/src/main/java/gtexpert/integration/nae2/NAE2ConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/nae2/NAE2ConfigHolder.java similarity index 79% rename from src/main/java/gtexpert/integration/nae2/NAE2ConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/nae2/NAE2ConfigHolder.java index ca147f64..8ae9bf6f 100644 --- a/src/main/java/gtexpert/integration/nae2/NAE2ConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/NAE2ConfigHolder.java @@ -1,10 +1,10 @@ -package gtexpert.integration.nae2; +package com.github.gtexpert.core.integration.nae2; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config.LangKey; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @LangKey(GTEValues.MODID + ".config.integration.nae2") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/nae2/NAE2Module.java b/src/main/java/com/github/gtexpert/core/integration/nae2/NAE2Module.java similarity index 56% rename from src/main/java/gtexpert/integration/nae2/NAE2Module.java rename to src/main/java/com/github/gtexpert/core/integration/nae2/NAE2Module.java index 7bf308de..09dbcb9a 100644 --- a/src/main/java/gtexpert/integration/nae2/NAE2Module.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/NAE2Module.java @@ -1,15 +1,15 @@ -package gtexpert.integration.nae2; +package com.github.gtexpert.core.integration.nae2; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.nae2.recipes.NAE2BlocksRecipe; -import gtexpert.integration.nae2.recipes.NAE2ItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.nae2.recipes.NAE2BlocksRecipe; +import com.github.gtexpert.core.integration.nae2.recipes.NAE2ItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_NAE2, diff --git a/src/main/java/gtexpert/integration/nae2/recipes/NAE2BlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/nae2/recipes/NAE2BlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java index 1014ffd3..12be6052 100644 --- a/src/main/java/gtexpert/integration/nae2/recipes/NAE2BlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.nae2.recipes; +package com.github.gtexpert.core.integration.nae2.recipes; import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; @@ -6,8 +6,8 @@ import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; -import gtexpert.api.util.Mods; -import gtexpert.integration.nae2.NAE2ConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; public class NAE2BlocksRecipe { diff --git a/src/main/java/gtexpert/integration/nae2/recipes/NAE2ItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/nae2/recipes/NAE2ItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java index f57c275e..aef5d907 100644 --- a/src/main/java/gtexpert/integration/nae2/recipes/NAE2ItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java @@ -1,12 +1,12 @@ -package gtexpert.integration.nae2.recipes; +package com.github.gtexpert.core.integration.nae2.recipes; import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; import gregtech.api.recipes.RecipeMaps; -import gtexpert.api.util.Mods; -import gtexpert.integration.nae2.NAE2ConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; public class NAE2ItemsRecipe { diff --git a/src/main/java/gtexpert/integration/tc/TCConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/tc/TCConfigHolder.java similarity index 76% rename from src/main/java/gtexpert/integration/tc/TCConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/tc/TCConfigHolder.java index f6bb40eb..3a8ddbd5 100644 --- a/src/main/java/gtexpert/integration/tc/TCConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/TCConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.tc; +package com.github.gtexpert.core.integration.tc; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.tc") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/tc/TCModule.java b/src/main/java/com/github/gtexpert/core/integration/tc/TCModule.java similarity index 54% rename from src/main/java/gtexpert/integration/tc/TCModule.java rename to src/main/java/com/github/gtexpert/core/integration/tc/TCModule.java index 29bf1aa7..a8bd8c26 100644 --- a/src/main/java/gtexpert/integration/tc/TCModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/TCModule.java @@ -1,18 +1,18 @@ -package gtexpert.integration.tc; +package com.github.gtexpert.core.integration.tc; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.tc.loaders.TCOreDictionaryLoader; -import gtexpert.integration.tc.recipes.TCBlocksRecipe; -import gtexpert.integration.tc.recipes.TCItemsRecipe; -import gtexpert.integration.tc.recipes.TCMaterialsRecipe; -import gtexpert.integration.tc.recipes.TCToolsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.tc.loaders.TCOreDictionaryLoader; +import com.github.gtexpert.core.integration.tc.recipes.TCBlocksRecipe; +import com.github.gtexpert.core.integration.tc.recipes.TCItemsRecipe; +import com.github.gtexpert.core.integration.tc.recipes.TCMaterialsRecipe; +import com.github.gtexpert.core.integration.tc.recipes.TCToolsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_TC, diff --git a/src/main/java/gtexpert/integration/tc/loaders/TCOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/tc/loaders/TCOreDictionaryLoader.java similarity index 56% rename from src/main/java/gtexpert/integration/tc/loaders/TCOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/tc/loaders/TCOreDictionaryLoader.java index 5c5453f9..921eb137 100644 --- a/src/main/java/gtexpert/integration/tc/loaders/TCOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/loaders/TCOreDictionaryLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.tc.loaders; +package com.github.gtexpert.core.integration.tc.loaders; public class TCOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/tc/recipes/TCBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCBlocksRecipe.java similarity index 54% rename from src/main/java/gtexpert/integration/tc/recipes/TCBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCBlocksRecipe.java index 2cd5f4ad..ddcb4955 100644 --- a/src/main/java/gtexpert/integration/tc/recipes/TCBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.tc.recipes; +package com.github.gtexpert.core.integration.tc.recipes; public class TCBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/tc/recipes/TCItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCItemsRecipe.java similarity index 53% rename from src/main/java/gtexpert/integration/tc/recipes/TCItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCItemsRecipe.java index 458d51b2..4190da0e 100644 --- a/src/main/java/gtexpert/integration/tc/recipes/TCItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.tc.recipes; +package com.github.gtexpert.core.integration.tc.recipes; public class TCItemsRecipe { diff --git a/src/main/java/gtexpert/integration/tc/recipes/TCMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/tc/recipes/TCMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java index b9f834f2..1f2b229c 100644 --- a/src/main/java/gtexpert/integration/tc/recipes/TCMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java @@ -1,9 +1,9 @@ -package gtexpert.integration.tc.recipes; +package com.github.gtexpert.core.integration.tc.recipes; import gregtech.api.recipes.ModHandler; import gregtech.common.ConfigHolder; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class TCMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/tc/recipes/TCToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/tc/recipes/TCToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java index a88f64d4..e04a9d56 100644 --- a/src/main/java/gtexpert/integration/tc/recipes/TCToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.tc.recipes; +package com.github.gtexpert.core.integration.tc.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,9 +7,9 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.integration.tc.TCConfigHolder; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.tc.TCConfigHolder; public class TCToolsRecipe { diff --git a/src/main/java/gtexpert/integration/te/TEConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/te/TEConfigHolder.java similarity index 66% rename from src/main/java/gtexpert/integration/te/TEConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/te/TEConfigHolder.java index 13879d60..133fcaf7 100644 --- a/src/main/java/gtexpert/integration/te/TEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/te/TEConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.te; +package com.github.gtexpert.core.integration.te; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.te") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/te/TEModule.java b/src/main/java/com/github/gtexpert/core/integration/te/TEModule.java similarity index 62% rename from src/main/java/gtexpert/integration/te/TEModule.java rename to src/main/java/com/github/gtexpert/core/integration/te/TEModule.java index 583a0e29..86131483 100644 --- a/src/main/java/gtexpert/integration/te/TEModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/te/TEModule.java @@ -1,13 +1,13 @@ -package gtexpert.integration.te; +package com.github.gtexpert.core.integration.te; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_TE, diff --git a/src/main/java/gtexpert/integration/theoneprobe/TheOneProbeModule.java b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java similarity index 70% rename from src/main/java/gtexpert/integration/theoneprobe/TheOneProbeModule.java rename to src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java index 4eb96343..c328d89a 100644 --- a/src/main/java/gtexpert/integration/theoneprobe/TheOneProbeModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java @@ -1,4 +1,4 @@ -package gtexpert.integration.theoneprobe; +package com.github.gtexpert.core.integration.theoneprobe; import java.util.List; @@ -8,12 +8,12 @@ import com.google.common.collect.ImmutableList; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.theoneprobe.provider.ElectricSpawnerInfoProvider; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.theoneprobe.provider.ElectricSpawnerInfoProvider; +import com.github.gtexpert.core.modules.GTEModules; import mcjty.theoneprobe.TheOneProbe; import mcjty.theoneprobe.api.ITheOneProbe; diff --git a/src/main/java/gtexpert/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java similarity index 86% rename from src/main/java/gtexpert/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java rename to src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java index 76f02f57..8ab94f1c 100644 --- a/src/main/java/gtexpert/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java @@ -1,4 +1,4 @@ -package gtexpert.integration.theoneprobe.provider; +package com.github.gtexpert.core.integration.theoneprobe.provider; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -10,8 +10,8 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntityHolder; -import gtexpert.api.GTEValues; -import gtexpert.integration.eio.metatileentities.MetaTileEntityElectricSpawner; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.integration.eio.metatileentities.MetaTileEntityElectricSpawner; import mcjty.theoneprobe.api.*; diff --git a/src/main/java/gtexpert/loaders/GTEOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/loaders/GTEOreDictionaryLoader.java similarity index 79% rename from src/main/java/gtexpert/loaders/GTEOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/loaders/GTEOreDictionaryLoader.java index 24b9ea6d..d195b3ec 100644 --- a/src/main/java/gtexpert/loaders/GTEOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/loaders/GTEOreDictionaryLoader.java @@ -1,10 +1,10 @@ -package gtexpert.loaders; +package com.github.gtexpert.core.loaders; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class GTEOreDictionaryLoader { diff --git a/src/main/java/gtexpert/loaders/recipe/CEUOverrideRecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java similarity index 99% rename from src/main/java/gtexpert/loaders/recipe/CEUOverrideRecipe.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java index e51ed2a4..c6f087f8 100644 --- a/src/main/java/gtexpert/loaders/recipe/CEUOverrideRecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.loaders.recipe; +package com.github.gtexpert.core.loaders.recipe; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.info.MaterialFlags.*; @@ -38,7 +38,7 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class CEUOverrideRecipe { diff --git a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java similarity index 98% rename from src/main/java/gtexpert/loaders/recipe/GTERecipe.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java index 7a1176dc..8c20a7fd 100644 --- a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java @@ -1,4 +1,4 @@ -package gtexpert.loaders.recipe; +package com.github.gtexpert.core.loaders.recipe; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -37,17 +37,17 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.recipes.GTERecipeMaps; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTELog; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; -import gtexpert.common.items.GTEMetaItems; -import gtexpert.common.metatileentities.GTEMetaTileEntities; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities; public class GTERecipe { diff --git a/src/main/java/gtexpert/loaders/recipe/GTEVanillaOverrideRecipes.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java similarity index 94% rename from src/main/java/gtexpert/loaders/recipe/GTEVanillaOverrideRecipes.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java index ab6e77cf..a9c95a21 100644 --- a/src/main/java/gtexpert/loaders/recipe/GTEVanillaOverrideRecipes.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java @@ -1,9 +1,9 @@ -package gtexpert.loaders.recipe; +package com.github.gtexpert.core.loaders.recipe; import static gregtech.api.GTValues.MV; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.common.GTEConfigHolder.ceuOverride; +import static com.github.gtexpert.core.common.GTEConfigHolder.ceuOverride; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -15,7 +15,7 @@ import gregtech.api.recipes.category.RecipeCategories; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class GTEVanillaOverrideRecipes { diff --git a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java similarity index 95% rename from src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java index 8d7e898c..9d22911e 100644 --- a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java @@ -1,4 +1,4 @@ -package gtexpert.loaders.recipe.handlers; +package com.github.gtexpert.core.loaders.recipe.handlers; import static gregtech.api.unification.ore.OrePrefix.block; diff --git a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionRecipeHandler.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java similarity index 97% rename from src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionRecipeHandler.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java index 3fd75fac..db0bc82d 100644 --- a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionRecipeHandler.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java @@ -1,4 +1,4 @@ -package gtexpert.loaders.recipe.handlers; +package com.github.gtexpert.core.loaders.recipe.handlers; import static gregtech.api.unification.ore.OrePrefix.*; @@ -10,7 +10,7 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.common.items.MetaItems; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class GTEImplosionRecipeHandler { diff --git a/src/main/java/gtexpert/mixins/GTEMixinLoader.java b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java similarity index 92% rename from src/main/java/gtexpert/mixins/GTEMixinLoader.java rename to src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java index 1b8d9892..36df49d3 100644 --- a/src/main/java/gtexpert/mixins/GTEMixinLoader.java +++ b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java @@ -1,4 +1,4 @@ -package gtexpert.mixins; +package com.github.gtexpert.core.mixins; import java.util.AbstractMap; import java.util.List; @@ -9,9 +9,9 @@ import net.minecraftforge.fml.common.Loader; -import gtexpert.api.GTEValues; -import gtexpert.api.util.GTELog; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.Mods; import zone.rong.mixinbooter.ILateMixinLoader; diff --git a/src/main/java/gtexpert/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java similarity index 97% rename from src/main/java/gtexpert/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java rename to src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java index 16183cff..e7345c9f 100644 --- a/src/main/java/gtexpert/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java @@ -1,4 +1,4 @@ -package gtexpert.mixins.draconicadditions.items.baubles; +package com.github.gtexpert.core.mixins.draconicadditions.items.baubles; import net.foxmcloud.draconicadditions.items.baubles.BaubleStats; import net.foxmcloud.draconicadditions.items.baubles.ShieldNecklace; diff --git a/src/main/java/gtexpert/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java similarity index 91% rename from src/main/java/gtexpert/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java rename to src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java index c8d2b673..c99b1685 100644 --- a/src/main/java/gtexpert/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java @@ -1,4 +1,4 @@ -package gtexpert.mixins.draconicadditions.items.tools; +package com.github.gtexpert.core.mixins.draconicadditions.items.tools; import net.foxmcloud.draconicadditions.items.tools.PortableWiredCharger; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gtexpert/mixins/draconicadditions/lib/DARecipesMixin.java b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/lib/DARecipesMixin.java similarity index 87% rename from src/main/java/gtexpert/mixins/draconicadditions/lib/DARecipesMixin.java rename to src/main/java/com/github/gtexpert/core/mixins/draconicadditions/lib/DARecipesMixin.java index 3c1328f0..cc682b03 100644 --- a/src/main/java/gtexpert/mixins/draconicadditions/lib/DARecipesMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/lib/DARecipesMixin.java @@ -1,4 +1,4 @@ -package gtexpert.mixins.draconicadditions.lib; +package com.github.gtexpert.core.mixins.draconicadditions.lib; import net.foxmcloud.draconicadditions.lib.DARecipes; diff --git a/src/main/java/gtexpert/mixins/gregtech/QuarkTechSuiteMixin.java b/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java similarity index 86% rename from src/main/java/gtexpert/mixins/gregtech/QuarkTechSuiteMixin.java rename to src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java index 0bd8c2a5..ddf54d85 100644 --- a/src/main/java/gtexpert/mixins/gregtech/QuarkTechSuiteMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java @@ -1,4 +1,4 @@ -package gtexpert.mixins.gregtech; +package com.github.gtexpert.core.mixins.gregtech; import net.minecraft.util.FoodStats; @@ -8,7 +8,7 @@ import gregtech.common.items.armor.QuarkTechSuite; -import gtexpert.common.GTEConfigHolder; +import com.github.gtexpert.core.common.GTEConfigHolder; @Mixin(value = QuarkTechSuite.class, remap = false) public class QuarkTechSuiteMixin { diff --git a/src/main/java/gtexpert/modules/BaseGTEModule.java b/src/main/java/com/github/gtexpert/core/modules/BaseGTEModule.java similarity index 71% rename from src/main/java/gtexpert/modules/BaseGTEModule.java rename to src/main/java/com/github/gtexpert/core/modules/BaseGTEModule.java index 6956ee43..c22d6bfb 100644 --- a/src/main/java/gtexpert/modules/BaseGTEModule.java +++ b/src/main/java/com/github/gtexpert/core/modules/BaseGTEModule.java @@ -1,4 +1,4 @@ -package gtexpert.modules; +package com.github.gtexpert.core.modules; import java.util.Collections; import java.util.Set; @@ -7,8 +7,8 @@ import org.jetbrains.annotations.NotNull; -import gtexpert.api.modules.IGTEModule; -import gtexpert.api.util.GTEUtility; +import com.github.gtexpert.core.api.modules.IGTEModule; +import com.github.gtexpert.core.api.util.GTEUtility; public abstract class BaseGTEModule implements IGTEModule { diff --git a/src/main/java/gtexpert/modules/GTEModuleManager.java b/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java similarity index 99% rename from src/main/java/gtexpert/modules/GTEModuleManager.java rename to src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java index 035a4eba..d5814881 100644 --- a/src/main/java/gtexpert/modules/GTEModuleManager.java +++ b/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java @@ -1,4 +1,4 @@ -package gtexpert.modules; +package com.github.gtexpert.core.modules; import java.io.File; import java.util.*; @@ -22,8 +22,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.*; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.*; public class GTEModuleManager implements IModuleManager { diff --git a/src/main/java/gtexpert/modules/GTEModules.java b/src/main/java/com/github/gtexpert/core/modules/GTEModules.java similarity index 92% rename from src/main/java/gtexpert/modules/GTEModules.java rename to src/main/java/com/github/gtexpert/core/modules/GTEModules.java index 99422742..2671bf16 100644 --- a/src/main/java/gtexpert/modules/GTEModules.java +++ b/src/main/java/com/github/gtexpert/core/modules/GTEModules.java @@ -1,7 +1,7 @@ -package gtexpert.modules; +package com.github.gtexpert.core.modules; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.IModuleContainer; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.IModuleContainer; public class GTEModules implements IModuleContainer { diff --git a/src/main/resources/mixins.gtexpert.draconicadditions.json b/src/main/resources/mixins.gtexpert.draconicadditions.json index 7914c47b..f305c9f6 100644 --- a/src/main/resources/mixins.gtexpert.draconicadditions.json +++ b/src/main/resources/mixins.gtexpert.draconicadditions.json @@ -1,5 +1,5 @@ { - "package": "gtexpert.mixins.draconicadditions", + "package": "com.github.gtexpert.core.mixins.draconicadditions", "refmap": "mixins.gtexpert.refmap.json", "target": "@env(DEFAULT)", "minVersion": "0.8", diff --git a/src/main/resources/mixins.gtexpert.gregtech.json b/src/main/resources/mixins.gtexpert.gregtech.json index 23329464..8b2955bc 100644 --- a/src/main/resources/mixins.gtexpert.gregtech.json +++ b/src/main/resources/mixins.gtexpert.gregtech.json @@ -1,5 +1,5 @@ { - "package": "gtexpert.mixins.gregtech", + "package": "com.github.gtexpert.core.mixins.gregtech", "refmap": "mixins.gtexpert.refmap.json", "target": "@env(DEFAULT)", "minVersion": "0.8", diff --git a/src/test/java/gtexpert/.gitkeep b/src/test/java/com/github/gtexpert/core/.gitkeep similarity index 100% rename from src/test/java/gtexpert/.gitkeep rename to src/test/java/com/github/gtexpert/core/.gitkeep diff --git a/src/test/java/gtexpert/GTETest.java b/src/test/java/com/github/gtexpert/core/GTETest.java similarity index 78% rename from src/test/java/gtexpert/GTETest.java rename to src/test/java/com/github/gtexpert/core/GTETest.java index 56f2ea8c..3150c8b4 100644 --- a/src/test/java/gtexpert/GTETest.java +++ b/src/test/java/com/github/gtexpert/core/GTETest.java @@ -1,4 +1,4 @@ -package gtexpert; +package com.github.gtexpert.core; import org.junit.jupiter.api.BeforeAll; From bb068892b167413dd6a2dc1fb7dd6a0699431a65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 20:03:08 +0900 Subject: [PATCH 2/4] spotlessApply (#312) Co-authored-by: GitHub Actions <> --- .../com/github/gtexpert/core/GTExpertMod.java | 8 +++---- .../MultiblockRecipeLogicNoCache.java | 4 ++-- .../core/api/recipes/GTERecipeMaps.java | 4 ++-- .../material/GTEFirstDegreeMaterials.java | 4 ++-- .../material/GTEMaterialFlags.java | 4 ++-- .../unification/material/GTEMaterials.java | 4 ++-- .../ingredients/AEFirstDegreeMaterials.java | 8 +++---- .../AvaritiaFirstDegreeMaterials.java | 10 ++++---- .../ingredients/DEFirstDegreeMaterials.java | 12 +++++----- .../ingredients/EIOFirstDegreeMaterials.java | 8 +++---- .../ingredients/TCFirstDegreeMaterials.java | 4 ++-- .../gtexpert/core/api/util/GTEUtility.java | 6 ++--- .../github/gtexpert/core/api/util/Mods.java | 4 ++-- .../gtexpert/core/client/GTETextures.java | 4 ++-- .../core/common/GTEEventHandlers.java | 6 ++--- .../core/common/blocks/GTEBlockWireCoil.java | 4 ++-- .../core/common/items/GTEMetaItem1.java | 8 +++---- .../core/common/items/GTEMetaItems.java | 4 ++-- .../core/common/items/armor/GTEMetaArmor.java | 4 ++-- .../items/behaviors/GTECoverBehaviors.java | 8 +++---- .../metatileentities/GTEMetaTileEntities.java | 8 +++---- .../GTESimpleMachineMetaTileEntity.java | 4 ++-- .../MetaTileEntityAdvancedChemicalPlant.java | 4 ++-- .../MetaTileEntityLargeCrackingUnit.java | 6 ++--- .../MetaTileEntityLargeGasCollector.java | 14 +++++------ .../multi/MetaTileEntityVoidOreMiner.java | 14 +++++------ .../gtexpert/core/core/GTECoreModule.java | 10 ++++---- .../core/core/deploader/DepLoader.java | 3 +-- .../ae/loaders/AEMaterialInfoLoader.java | 6 ++--- .../ae/loaders/AEOreDictionaryLoader.java | 6 ++--- .../ae/recipes/AEBlocksRecipe.java | 14 +++++------ .../integration/ae/recipes/AEItemsRecipe.java | 16 ++++++------- .../ae/recipes/AEMaterialsRecipe.java | 12 +++++----- .../integration/ae/recipes/AEToolsRecipe.java | 6 ++--- .../aeaditions/recipes/AEAItemsRecipe.java | 8 +++---- .../recipes/AvaritiaMaterialsRecipe.java | 6 ++--- .../botany/recipes/BotanyItemsRecipe.java | 10 ++++---- .../recipes/ExtraBeesItemsRecipe.java | 10 ++++---- .../recipes/ExtraTreesItemsRecipe.java | 10 ++++---- .../genetics/recipes/GeneticsItemsRecipe.java | 12 +++++----- .../binnies/recipes/BinniesItemsRecipe.java | 6 ++--- .../integration/chisel/ChiselRecipeMaps.java | 4 ++-- .../ChiselMetaTileEntities.java | 6 ++--- .../MetaTileEntityAutoChisel.java | 6 ++--- .../chisel/recipes/ChiselBlocksRecipe.java | 13 +++++----- .../chisel/recipes/ChiselToolsRecipe.java | 8 +++---- .../deda/loaders/DEDAMaterialInfoLoader.java | 12 +++++----- .../DEDAMetaTileEntities.java | 2 +- .../MetaTileEntityDraconiumFusion.java | 14 +++++------ .../deda/provider/DEDAJEIProvider.java | 4 ++-- .../recipemaps/GTEDraconicRecipeMaps.java | 6 ++--- .../recipemaps/RecipeMapDraconicFusion.java | 11 ++++----- .../tierup/TierUpRecipeBuilder.java | 3 +-- .../upgrade/UpgradeRecipeBuilder.java | 3 +-- .../deda/recipes/DraconicBlocksRecipe.java | 19 +++++++-------- .../deda/recipes/DraconicFluidRecipe.java | 6 ++--- .../DraconicImplosionMaterialsRecipe.java | 3 +-- .../deda/recipes/DraconicItemsRecipe.java | 11 ++++----- .../deda/recipes/DraconicMaterialsRecipe.java | 7 +++--- .../deda/recipes/DraconicTierupRecipe.java | 13 +++++----- .../deda/recipes/DraconicToolsRecipe.java | 9 ++++--- .../deda/recipes/DraconicUpgradeRecipe.java | 11 ++++----- .../core/integration/eio/EnderIOModule.java | 15 ++++++------ .../integration/eio/EnderIORecipeMaps.java | 6 ++--- .../eio/loaders/EIOMaterialInfoLoader.java | 8 +++---- .../metatileentities/EIOMetaTileEntities.java | 8 +++---- .../ElectricSpawnerLogic.java | 3 +-- .../MetaTileEntityElectricSpawner.java | 10 ++++---- .../eio/recipes/EIOBlocksRecipe.java | 16 ++++++------- .../eio/recipes/EIOFluidRecipe.java | 6 ++--- .../eio/recipes/EIOItemsRecipe.java | 10 ++++---- .../eio/recipes/EIOMaterialsRecipe.java | 8 +++---- .../eio/recipes/EIOSliceNSpliceRecipe.java | 6 ++--- .../eio/recipes/EIOSoulBinderRecipe.java | 8 +++---- .../eio/recipes/EIOToolsRecipe.java | 6 ++--- .../eio/recipes/EIOVialExtractorRecipe.java | 4 ++-- .../extracpus/recipes/EXCPUSBlocksRecipe.java | 6 ++--- .../extracpus/recipes/EXCPUSItemsRecipe.java | 4 ++-- .../core/integration/ffm/FFMUtility.java | 4 ++-- .../ffm/recipes/FFMBlockRecipe.java | 4 ++-- .../ffm/recipes/FFMItemRecipe.java | 4 ++-- .../ffm/recipes/FFMMaterialsRecipe.java | 4 ++-- .../ffm/recipes/FFMToolRecipe.java | 4 ++-- .../ffm/recipes/machines/CarpenterLoader.java | 12 +++++----- .../recipes/machines/CentrifugeLoader.java | 4 ++-- .../recipes/machines/FabricatorLoader.java | 6 ++--- .../gendustry/GendustryRecipeMaps.java | 6 ++--- .../GendustryMetaTileEntities.java | 2 +- .../MetaTileEntityIndustrialApiary.java | 4 ++-- .../gtfo/recipes/GTFOItemsRecipe.java | 4 ++-- .../nae2/recipes/NAE2BlocksRecipe.java | 6 ++--- .../nae2/recipes/NAE2ItemsRecipe.java | 4 ++-- .../tc/recipes/TCMaterialsRecipe.java | 4 ++-- .../integration/tc/recipes/TCToolsRecipe.java | 8 +++---- .../theoneprobe/TheOneProbeModule.java | 3 +-- .../provider/ElectricSpawnerInfoProvider.java | 6 ++--- .../loaders/recipe/CEUOverrideRecipe.java | 4 ++-- .../core/loaders/recipe/GTERecipe.java | 24 +++++++++---------- .../recipe/GTEVanillaOverrideRecipes.java | 6 ++--- .../handlers/GTEImplosionRecipeHandler.java | 4 ++-- .../mixins/gregtech/QuarkTechSuiteMixin.java | 4 ++-- .../core/modules/GTEModuleManager.java | 5 ++-- 102 files changed, 359 insertions(+), 375 deletions(-) diff --git a/src/main/java/com/github/gtexpert/core/GTExpertMod.java b/src/main/java/com/github/gtexpert/core/GTExpertMod.java index ebc7c7c6..737dced0 100644 --- a/src/main/java/com/github/gtexpert/core/GTExpertMod.java +++ b/src/main/java/com/github/gtexpert/core/GTExpertMod.java @@ -18,10 +18,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import gregtech.GTInternalTags; -import gregtech.api.GregTechAPI; -import gregtech.api.cover.CoverDefinition; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.util.GTELog; import com.github.gtexpert.core.api.util.Mods; @@ -30,6 +26,10 @@ import com.github.gtexpert.core.modules.GTEModuleManager; import com.github.gtexpert.core.modules.GTEModules; +import gregtech.GTInternalTags; +import gregtech.api.GregTechAPI; +import gregtech.api.cover.CoverDefinition; + @Mod(modid = GTEValues.MODID, name = GTEValues.MODNAME, acceptedMinecraftVersions = "[1.12.2,1.13)", diff --git a/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java index 2c92eab9..803d6e66 100644 --- a/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java +++ b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java @@ -1,10 +1,10 @@ package com.github.gtexpert.core.api.capability; +import com.github.gtexpert.core.integration.deda.recipemaps.RecipeMapDraconicFusion; + import gregtech.api.capability.impl.MultiblockRecipeLogic; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; -import com.github.gtexpert.core.integration.deda.recipemaps.RecipeMapDraconicFusion; - /** * This recipe logic disables cache used for speeding up recipe check. * The reason is we do some special things inside {@link RecipeMapDraconicFusion}, diff --git a/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java index 8b1388c6..38e13e13 100644 --- a/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java @@ -2,14 +2,14 @@ import net.minecraft.init.SoundEvents; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java index efeaff99..b1365731 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java @@ -1,11 +1,11 @@ package com.github.gtexpert.core.api.unification.material; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; import static gregtech.api.unification.material.info.MaterialIconSet.*; -import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; -import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java index f21cb54f..fb6d01da 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java @@ -2,14 +2,14 @@ import static gregtech.api.unification.material.info.MaterialFlags.*; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.fluids.FluidBuilder; import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.properties.*; import gregtech.api.unification.ore.OrePrefix; -import com.github.gtexpert.core.api.util.Mods; - public class GTEMaterialFlags { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java index ab4c950e..0e31cd56 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java @@ -1,11 +1,11 @@ package com.github.gtexpert.core.api.unification.material; -import gregtech.api.unification.material.Material; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.ingredients.*; import com.github.gtexpert.core.api.util.Mods; +import gregtech.api.unification.material.Material; + /** * Material Registration. *

diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java index 89bbef09..931722f5 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java @@ -1,11 +1,13 @@ package com.github.gtexpert.core.api.unification.material.ingredients; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregicality.multiblocks.api.unification.GCYMMaterialFlags.NO_ALLOY_BLAST_RECIPES; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; -import static com.github.gtexpert.core.api.util.GTEUtility.gteId; + +import com.github.gtexpert.core.api.GTEValues; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; @@ -14,8 +16,6 @@ import gregtech.api.unification.material.properties.BlastProperty.GasTier; import gregtech.api.unification.ore.OrePrefix; -import com.github.gtexpert.core.api.GTEValues; - public class AEFirstDegreeMaterials { /** diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java index 1071f254..acc92fcf 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java @@ -1,18 +1,18 @@ package com.github.gtexpert.core.api.unification.material.ingredients; -import static gregtech.api.GTValues.*; -import static gregtech.api.unification.material.Materials.*; -import static gregtech.api.unification.material.info.MaterialFlags.*; import static com.github.gtexpert.core.api.unification.GTEElements.*; import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; import static com.github.gtexpert.core.api.util.GTEUtility.gteId; +import static gregtech.api.GTValues.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.material.info.MaterialFlags.*; + +import com.github.gtexpert.core.api.unification.material.info.GTEMaterialIconSet; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.properties.ToolProperty; -import com.github.gtexpert.core.api.unification.material.info.GTEMaterialIconSet; - public class AvaritiaFirstDegreeMaterials { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java index ec6204a3..db8e059c 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java @@ -1,11 +1,14 @@ package com.github.gtexpert.core.api.unification.material.ingredients; -import static gregtech.api.GTValues.*; -import static gregtech.api.unification.material.Materials.*; -import static gregtech.api.unification.material.info.MaterialFlags.*; import static com.github.gtexpert.core.api.unification.GTEElements.*; import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; import static com.github.gtexpert.core.api.util.GTEUtility.gteId; +import static gregtech.api.GTValues.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.material.info.MaterialFlags.*; + +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.Mods; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; @@ -15,9 +18,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.util.Mods; - public class DEFirstDegreeMaterials { /** diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java index 372ba0e0..b26f0d3d 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java @@ -1,18 +1,18 @@ package com.github.gtexpert.core.api.unification.material.ingredients; +import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; -import static com.github.gtexpert.core.api.util.GTEUtility.gteId; + +import com.github.gtexpert.core.api.GTEValues; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.info.MaterialIconSet; import gregtech.api.unification.material.properties.BlastProperty.GasTier; -import com.github.gtexpert.core.api.GTEValues; - public class EIOFirstDegreeMaterials { /** diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java index 82489ed8..a7a62ce8 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java @@ -1,10 +1,10 @@ package com.github.gtexpert.core.api.unification.material.ingredients; -import static gregtech.api.unification.material.Materials.*; -import static gregtech.api.unification.material.info.MaterialFlags.*; import static com.github.gtexpert.core.api.unification.GTEElements.*; import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*; import static com.github.gtexpert.core.api.util.GTEUtility.gteId; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.material.info.MaterialFlags.*; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; diff --git a/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java b/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java index 323bc9f7..bff605ed 100644 --- a/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java +++ b/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java @@ -13,6 +13,9 @@ import org.jetbrains.annotations.NotNull; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.common.items.GTEMetaItems; + import gregtech.api.GTValues; import gregtech.api.items.metaitem.MetaItem; import gregtech.api.unification.OreDictUnifier; @@ -21,9 +24,6 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.items.MetaItems; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.common.items.GTEMetaItems; - public class GTEUtility { public static @NotNull ItemStack getModItem(String modID, String itemName) { diff --git a/src/main/java/com/github/gtexpert/core/api/util/Mods.java b/src/main/java/com/github/gtexpert/core/api/util/Mods.java index 40793965..622d8ca1 100644 --- a/src/main/java/com/github/gtexpert/core/api/util/Mods.java +++ b/src/main/java/com/github/gtexpert/core/api/util/Mods.java @@ -19,10 +19,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import gregtech.api.GTValues; - import com.github.gtexpert.core.api.GTEValues; +import gregtech.api.GTValues; + public enum Mods { AEAdditions(Names.AE_ADDITIONS), diff --git a/src/main/java/com/github/gtexpert/core/client/GTETextures.java b/src/main/java/com/github/gtexpert/core/client/GTETextures.java index 6bee8c4b..0590fb8f 100644 --- a/src/main/java/com/github/gtexpert/core/client/GTETextures.java +++ b/src/main/java/com/github/gtexpert/core/client/GTETextures.java @@ -3,10 +3,10 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; -import gregtech.client.renderer.texture.cube.*; - import com.github.gtexpert.core.api.GTEValues; +import gregtech.client.renderer.texture.cube.*; + @Mod.EventBusSubscriber(modid = GTEValues.MODID, value = Side.CLIENT) public class GTETextures { diff --git a/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java b/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java index 80ffa7c4..860e0bc5 100644 --- a/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java @@ -20,13 +20,13 @@ import org.jetbrains.annotations.NotNull; -import gregtech.api.items.armor.ArmorMetaItem; -import gregtech.api.unification.material.event.MaterialEvent; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.common.items.GTEMetaItems; +import gregtech.api.items.armor.ArmorMetaItem; +import gregtech.api.unification.material.event.MaterialEvent; + @Mod.EventBusSubscriber(modid = GTEValues.MODID) public class GTEEventHandlers { diff --git a/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java index 0d10e0e9..1ba0b650 100644 --- a/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java +++ b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java @@ -19,6 +19,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; + import gregtech.api.block.IHeatingCoilBlockStats; import gregtech.api.block.VariantActiveBlock; import gregtech.api.block.VariantItemBlock; @@ -28,8 +30,6 @@ import gregtech.common.ConfigHolder; import gregtech.common.metatileentities.multi.electric.MetaTileEntityMultiSmelter; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; - public class GTEBlockWireCoil extends VariantActiveBlock { public GTEBlockWireCoil() { diff --git a/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java index ca08c46b..772dbc17 100644 --- a/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java +++ b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java @@ -4,6 +4,10 @@ import net.minecraft.client.resources.I18n; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; + import gregtech.api.GTValues; import gregtech.api.items.metaitem.StandardMetaItem; import gregtech.api.unification.material.Materials; @@ -11,10 +15,6 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.items.behaviors.TooltipBehavior; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; - public class GTEMetaItem1 extends StandardMetaItem { public GTEMetaItem1() { diff --git a/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java index 62dd8118..00e5a22a 100644 --- a/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java +++ b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java @@ -1,10 +1,10 @@ package com.github.gtexpert.core.common.items; +import com.github.gtexpert.core.common.items.armor.GTEMetaArmor; + import gregtech.api.items.armor.ArmorMetaItem; import gregtech.api.items.metaitem.MetaItem; -import com.github.gtexpert.core.common.items.armor.GTEMetaArmor; - public final class GTEMetaItems { private GTEMetaItems() {} diff --git a/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java b/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java index 7dacf79f..9e191f9c 100644 --- a/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java +++ b/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java @@ -3,10 +3,10 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumRarity; -import gregtech.api.items.armor.ArmorMetaItem; - import com.github.gtexpert.core.common.items.GTEMetaItems; +import gregtech.api.items.armor.ArmorMetaItem; + public class GTEMetaArmor extends ArmorMetaItem.ArmorMetaValueItem> { @Override diff --git a/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java b/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java index 74fefbc1..5e9030ff 100644 --- a/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java +++ b/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java @@ -1,7 +1,10 @@ package com.github.gtexpert.core.common.items.behaviors; -import static gregtech.common.covers.CoverBehaviors.registerBehavior; import static com.github.gtexpert.core.api.util.GTEUtility.gteId; +import static gregtech.common.covers.CoverBehaviors.registerBehavior; + +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; import gregtech.api.GTValues; import gregtech.common.covers.CoverConveyor; @@ -9,9 +12,6 @@ import gregtech.common.covers.CoverPump; import gregtech.common.covers.CoverRoboticArm; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.items.GTEMetaItems; - public class GTECoverBehaviors { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java index b3abb5fb..240121a8 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java @@ -1,19 +1,19 @@ package com.github.gtexpert.core.common.metatileentities; -import static gregtech.common.metatileentities.MetaTileEntities.*; import static com.github.gtexpert.core.api.util.GTEUtility.gteId; +import static gregtech.common.metatileentities.MetaTileEntities.*; import java.util.function.Function; import net.minecraft.util.ResourceLocation; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.metatileentities.multi.*; + import gregtech.api.GTValues; import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.metatileentities.multi.*; - public class GTEMetaTileEntities { // Single Machine diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java index 15acc9a2..a0d519b2 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java @@ -5,6 +5,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + import gregtech.api.GTValues; import gregtech.api.gui.GuiTextures; import gregtech.api.gui.ModularUI; @@ -15,8 +17,6 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - public class GTESimpleMachineMetaTileEntity extends SimpleMachineMetaTileEntity { private static final int FONT_HEIGHT = 9; // Minecraft's FontRenderer FONT_HEIGHT value diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java index 85d8f85f..3da575ba 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java @@ -14,6 +14,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -31,8 +33,6 @@ import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - public class MetaTileEntityAdvancedChemicalPlant extends GCYMRecipeMapMultiblockController { public MetaTileEntityAdvancedChemicalPlant(ResourceLocation metaTileEntityId) { diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java index 05f622b8..93d920ad 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java @@ -16,6 +16,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.common.GTEConfigHolder; + import gregtech.api.block.IHeatingCoilBlockStats; import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; @@ -40,9 +43,6 @@ import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic; import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.common.GTEConfigHolder; - public class MetaTileEntityLargeCrackingUnit extends GCYMRecipeMapMultiblockController { private int coilTier; diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java index d3d293e9..742f5d66 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java @@ -14,6 +14,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; + import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -30,13 +37,6 @@ import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.api.recipes.GTERecipeMaps; -import com.github.gtexpert.core.client.GTETextures; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; - public class MetaTileEntityLargeGasCollector extends GCYMRecipeMapMultiblockController { public MetaTileEntityLargeGasCollector(ResourceLocation metaTileEntityId) { diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java index b9b76cd4..eb04af1b 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java @@ -14,6 +14,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; + import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -27,13 +34,6 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.core.sound.GTSoundEvents; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.api.recipes.GTERecipeMaps; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.client.GTETextures; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; - public class MetaTileEntityVoidOreMiner extends RecipeMapMultiblockController { public MetaTileEntityVoidOreMiner(ResourceLocation metaTileEntityId) { diff --git a/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java index a506caf1..a79333fe 100644 --- a/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java +++ b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java @@ -1,8 +1,8 @@ package com.github.gtexpert.core.core; -import static gregtech.api.GregTechAPI.HEATING_COILS; import static com.github.gtexpert.core.GTExpertMod.createItemBlock; import static com.github.gtexpert.core.common.blocks.GTEMetaBlocks.*; +import static gregtech.api.GregTechAPI.HEATING_COILS; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -19,10 +19,6 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import gregtech.api.block.VariantItemBlock; -import gregtech.api.recipes.RecipeMaps; -import gregtech.loaders.recipe.RecyclingRecipes; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.modules.GTEModule; import com.github.gtexpert.core.api.modules.IGTEModule; @@ -37,6 +33,10 @@ import com.github.gtexpert.core.loaders.recipe.GTEVanillaOverrideRecipes; import com.github.gtexpert.core.modules.GTEModules; +import gregtech.api.block.VariantItemBlock; +import gregtech.api.recipes.RecipeMaps; +import gregtech.loaders.recipe.RecyclingRecipes; + @GTEModule( moduleID = GTEModules.MODULE_CORE, containerID = GTEValues.MODID, diff --git a/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java b/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java index cca68007..f9fc4427 100644 --- a/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java +++ b/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java @@ -23,12 +23,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import com.github.gtexpert.core.core.GTECoreMod; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import com.github.gtexpert.core.core.GTECoreMod; - public class DepLoader implements IFMLCallHook { private File mcLocation; diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java index 071f6570..a843bc57 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java @@ -1,14 +1,14 @@ package com.github.gtexpert.core.integration.ae.loaders; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.GTValues; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.ItemMaterialInfo; import gregtech.api.unification.stack.MaterialStack; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; - public class AEMaterialInfoLoader { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java index 8ae92ef5..1c2cfac4 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java @@ -3,14 +3,14 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; - public class AEOreDictionaryLoader { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java index 9ec5b2b7..397674e7 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java @@ -1,12 +1,18 @@ package com.github.gtexpert.core.integration.ae.recipes; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import java.util.Map; import java.util.stream.IntStream; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; + import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; @@ -18,12 +24,6 @@ import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; - import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; public class AEBlocksRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java index ef381328..c45d0fbc 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java @@ -1,12 +1,19 @@ package com.github.gtexpert.core.integration.ae.recipes; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import java.util.Arrays; import java.util.Objects; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; + import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.builders.AssemblyLineRecipeBuilder; @@ -16,13 +23,6 @@ import gregtech.api.unification.material.Materials; import gregtech.common.items.MetaItems; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.items.GTEMetaItems; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; - public class AEItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java index 5afe268a..50e39c21 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java @@ -1,11 +1,16 @@ package com.github.gtexpert.core.integration.ae.recipes; +import static com.github.gtexpert.core.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static com.github.gtexpert.core.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier; import net.minecraftforge.fluids.FluidStack; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; + import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -23,11 +28,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; - public class AEMaterialsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java index bf91d2c3..fde11148 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java @@ -2,14 +2,14 @@ import static gregtech.api.unification.ore.OrePrefix.*; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; + import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; - public class AEToolsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java index 202072f8..2b58463f 100644 --- a/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java @@ -1,16 +1,16 @@ package com.github.gtexpert.core.integration.aeaditions.recipes; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; + +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.Mods; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.util.Mods; - public class AEAItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java index a5aaa9e8..478faee4 100644 --- a/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java @@ -2,6 +2,9 @@ import static gregtech.api.unification.ore.OrePrefix.*; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; @@ -9,9 +12,6 @@ import gregtech.common.ConfigHolder; import gregtech.common.items.MetaItems; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; - public class AvaritiaMaterialsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java index e3be2b08..28bbf20e 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java @@ -2,16 +2,16 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.MarkerMaterials; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; import com.github.gtexpert.core.integration.ffm.FFMUtility; import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; +import gregtech.api.recipes.ModHandler; +import gregtech.api.unification.material.MarkerMaterials; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.stack.UnificationEntry; + import forestry.api.recipes.RecipeManagers; public class BotanyItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java index fb402170..29707a14 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java @@ -2,16 +2,16 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.MarkerMaterials; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; import com.github.gtexpert.core.integration.ffm.FFMUtility; import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; +import gregtech.api.recipes.ModHandler; +import gregtech.api.unification.material.MarkerMaterials; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.stack.UnificationEntry; + import forestry.api.recipes.RecipeManagers; public class ExtraBeesItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java index 72bbea70..2589bc02 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java @@ -2,16 +2,16 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.MarkerMaterials; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; import com.github.gtexpert.core.integration.ffm.FFMUtility; import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; +import gregtech.api.recipes.ModHandler; +import gregtech.api.unification.material.MarkerMaterials; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.stack.UnificationEntry; + import forestry.api.recipes.RecipeManagers; public class ExtraTreesItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java index ebb5cca9..374721d2 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java @@ -6,6 +6,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; + import gregtech.api.recipes.GTRecipeHandler; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -14,12 +20,6 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - import forestry.api.recipes.RecipeManagers; public class GeneticsItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java index c1b6c545..6f09f860 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java @@ -1,12 +1,12 @@ package com.github.gtexpert.core.integration.binnies.recipes; -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.Materials; - import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; import com.github.gtexpert.core.integration.ffm.FFMUtility; +import gregtech.api.recipes.ModHandler; +import gregtech.api.unification.material.Materials; + import forestry.api.recipes.RecipeManagers; public class BinniesItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java index b1bb387b..5ee21a0b 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java @@ -1,13 +1,13 @@ package com.github.gtexpert.core.integration.chisel; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java index 94ae2456..fe94753b 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java @@ -1,14 +1,14 @@ package com.github.gtexpert.core.integration.chisel.metatileentities; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.api.GTValues.*; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; -import static com.github.gtexpert.core.api.util.GTEUtility.gteId; - -import gregtech.api.util.GTUtility; import com.github.gtexpert.core.client.GTETextures; import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; +import gregtech.api.util.GTUtility; + public class ChiselMetaTileEntities { public static MetaTileEntityAutoChisel[] AUTO_CHISEL = new MetaTileEntityAutoChisel[3]; diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java index 666fd3fd..abdf0bb0 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java @@ -4,14 +4,14 @@ import net.minecraft.util.ResourceLocation; +import com.github.gtexpert.core.api.capability.SingleblockRecipeLogicNoCache; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import com.github.gtexpert.core.api.capability.SingleblockRecipeLogicNoCache; -import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; - public class MetaTileEntityAutoChisel extends GTESimpleMachineMetaTileEntity { public MetaTileEntityAutoChisel(ResourceLocation metaTileEntityId, RecipeMap recipeMap, ICubeRenderer renderer, diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java index d89ff5b4..ae4901b7 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java @@ -1,9 +1,9 @@ package com.github.gtexpert.core.integration.chisel.recipes; +import static com.github.gtexpert.core.integration.chisel.metatileentities.ChiselMetaTileEntities.AUTO_CHISEL; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; import static gregtech.loaders.recipe.CraftingComponent.*; -import static com.github.gtexpert.core.integration.chisel.metatileentities.ChiselMetaTileEntities.AUTO_CHISEL; import java.util.Arrays; import java.util.List; @@ -15,6 +15,11 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; +import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; +import com.github.gtexpert.core.integration.chisel.ChiselUtil; import com.google.common.base.CaseFormat; import gregtech.api.recipes.GTRecipeHandler; @@ -26,12 +31,6 @@ import gregtech.common.blocks.*; import gregtech.loaders.recipe.MetaTileEntityLoader; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; -import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; -import com.github.gtexpert.core.integration.chisel.ChiselUtil; - public class ChiselBlocksRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java index fb968370..24d6fcd5 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java @@ -2,15 +2,15 @@ import static gregtech.api.unification.ore.OrePrefix.*; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; + import gregtech.api.recipes.ModHandler; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; - public class ChiselToolsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java index 737df53c..1b59c83f 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java @@ -3,18 +3,18 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import gregtech.api.GTValues; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.ItemMaterialInfo; -import gregtech.api.unification.stack.MaterialStack; -import gregtech.common.ConfigHolder; - import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.api.util.GTEUtility; import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import gregtech.api.GTValues; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.stack.ItemMaterialInfo; +import gregtech.api.unification.stack.MaterialStack; +import gregtech.common.ConfigHolder; + public class DEDAMaterialInfoLoader { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java index 819b3e7f..b9f74a13 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java @@ -1,7 +1,7 @@ package com.github.gtexpert.core.integration.deda.metatileentities; -import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; import static com.github.gtexpert.core.api.util.GTEUtility.gteId; +import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; public class DEDAMetaTileEntities { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java index 27dcd58f..65933078 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java @@ -14,6 +14,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.github.gtexpert.core.api.capability.MultiblockRecipeLogicNoCache; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; + import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -26,13 +33,6 @@ import gregtech.client.renderer.ICubeRenderer; import gregtech.core.sound.GTSoundEvents; -import com.github.gtexpert.core.api.capability.MultiblockRecipeLogicNoCache; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.client.GTETextures; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; - public abstract class MetaTileEntityDraconiumFusion extends RecipeMapMultiblockController { public MetaTileEntityDraconiumFusion(ResourceLocation metaTileEntityId, RecipeMap recipeMap) { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java b/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java index 81735de4..135d1eb2 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java @@ -2,12 +2,12 @@ import org.jetbrains.annotations.NotNull; -import gregtech.api.GTValues; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import gregtech.api.GTValues; + import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java index 6a8c0ec1..734cc2f7 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java @@ -1,5 +1,8 @@ package com.github.gtexpert.core.integration.deda.recipemaps; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; + import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; @@ -7,9 +10,6 @@ import gregtech.api.recipes.ingredients.GTRecipeInput; import gregtech.core.sound.GTSoundEvents; -import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; -import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; - import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java index 455f0075..520deb91 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java @@ -17,6 +17,11 @@ import com.brandon3055.draconicevolution.api.itemupgrade.IUpgradableItem; import com.brandon3055.draconicevolution.api.itemupgrade.UpgradeHelper; import com.brandon3055.draconicevolution.items.ToolUpgrade; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeProperty; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; import gregtech.api.capability.FeCompat; import gregtech.api.capability.GregtechCapabilities; @@ -25,12 +30,6 @@ import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; -import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeProperty; -import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; -import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; - import cofh.redstoneflux.api.IEnergyContainerItem; public class RecipeMapDraconicFusion extends RecipeMap { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java index e97a6fae..19a84d04 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java @@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable; import com.brandon3055.draconicevolution.lib.ToolUpgradeRecipe; +import com.github.gtexpert.core.api.util.GTELog; import gregtech.api.recipes.Recipe; import gregtech.api.recipes.RecipeBuilder; @@ -19,8 +20,6 @@ import gregtech.api.util.EnumValidationResult; import gregtech.api.util.ValidationResult; -import com.github.gtexpert.core.api.util.GTELog; - public class TierUpRecipeBuilder extends RecipeBuilder { private GTRecipeInput catalyst; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java index dcecb6eb..1829bcc4 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java @@ -11,6 +11,7 @@ import com.brandon3055.draconicevolution.api.itemupgrade.IUpgradableItem; import com.brandon3055.draconicevolution.api.itemupgrade.UpgradeHelper; import com.brandon3055.draconicevolution.items.ToolUpgrade; +import com.github.gtexpert.core.api.util.GTELog; import gregtech.api.recipes.Recipe; import gregtech.api.recipes.RecipeBuilder; @@ -22,8 +23,6 @@ import gregtech.api.util.EnumValidationResult; import gregtech.api.util.ValidationResult; -import com.github.gtexpert.core.api.util.GTELog; - public class UpgradeRecipeBuilder extends RecipeBuilder { private ItemStack catalyst; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java index 3eebb4b6..b9900ff6 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java @@ -9,6 +9,15 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.DEFeatures; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEBlockWireCoil; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeBuilder; @@ -24,16 +33,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEBlockWireCoil; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; -import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; - public class DraconicBlocksRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java index 08606459..ce5b4c37 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java @@ -3,15 +3,15 @@ import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.dust; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; + import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; - public class DraconicFluidRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java index a8df24d5..94a75974 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java @@ -3,9 +3,8 @@ import static gregtech.api.unification.ore.OrePrefix.block; import com.brandon3055.draconicevolution.DEFeatures; -import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; - import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; public class DraconicImplosionMaterialsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java index 69420d5a..39b752b7 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java @@ -9,6 +9,11 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.DEFeatures; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import gregtech.api.metatileentity.multiblock.CleanroomType; import gregtech.api.recipes.ModHandler; @@ -22,12 +27,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; - public class DraconicItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java index 35f9f7e8..d3faa408 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java @@ -15,6 +15,9 @@ import org.jetbrains.annotations.NotNull; import com.brandon3055.draconicevolution.DEFeatures; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; import gregtech.api.GTValues; import gregtech.api.GregTechAPI; @@ -40,10 +43,6 @@ import gregicality.multiblocks.api.unification.GCYMMaterialFlags; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; - public class DraconicMaterialsRecipe { public static final int ABFPyrotheumAmount = 200; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java index f1c506ce..9a6d3364 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java @@ -7,6 +7,12 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.DEFeatures; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; import gregtech.api.GTValues; import gregtech.api.items.toolitem.ToolHelper; @@ -22,13 +28,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; - public class DraconicTierupRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java index 668cdf12..7d65286e 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java @@ -8,6 +8,10 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.DEFeatures; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -18,11 +22,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; - public class DraconicToolsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java index d2c0c9e2..93cbd407 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java @@ -10,6 +10,11 @@ import com.brandon3055.draconicevolution.DEFeatures; import com.brandon3055.draconicevolution.api.itemupgrade.IUpgradableItem; import com.brandon3055.draconicevolution.items.ToolUpgrade; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; import gregtech.api.recipes.RecipeMap; import gregtech.api.unification.material.Materials; @@ -17,12 +22,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; - public class DraconicUpgradeRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java index e552de6b..3f646102 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java @@ -14,14 +14,6 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import com.enderio.core.common.util.EntityUtil; - -import gregtech.api.recipes.RecipeBuilder; -import gregtech.api.recipes.builders.SimpleRecipeBuilder; -import gregtech.api.recipes.ingredients.GTRecipeItemInput; -import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition; -import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; -import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.modules.GTEModule; import com.github.gtexpert.core.api.util.GTEUtility; @@ -33,6 +25,13 @@ import com.github.gtexpert.core.integration.eio.recipes.*; import com.github.gtexpert.core.modules.GTEModules; +import gregtech.api.recipes.RecipeBuilder; +import gregtech.api.recipes.builders.SimpleRecipeBuilder; +import gregtech.api.recipes.ingredients.GTRecipeItemInput; +import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition; +import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; +import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; + import crazypants.enderio.base.init.ModObject; @GTEModule( diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java index 9e45d9d9..853f1ecc 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java @@ -2,15 +2,15 @@ import net.minecraft.util.SoundEvent; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.api.util.Mods; - import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java index edb009f9..1bd8b634 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java @@ -3,6 +3,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.GTValues; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; @@ -10,10 +14,6 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; - public class EIOMaterialInfoLoader { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java index a4739811..05079a59 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java @@ -1,17 +1,17 @@ package com.github.gtexpert.core.integration.eio.metatileentities; -import static gregtech.api.GTValues.*; -import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities.registerGTESimpleMetaTileEntity; - -import gregtech.api.util.GTUtility; +import static gregtech.api.GTValues.*; +import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; import com.github.gtexpert.core.api.util.GTEUtility; import com.github.gtexpert.core.client.GTETextures; import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; +import gregtech.api.util.GTUtility; + public class EIOMetaTileEntities { public static GTESimpleMachineMetaTileEntity[] VIAL_EXTRACTOR = new GTESimpleMachineMetaTileEntity[V.length - 1]; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java index 0cf027ba..a585ce7b 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java @@ -21,6 +21,7 @@ import org.jetbrains.annotations.Nullable; import com.enderio.core.client.render.BoundingBox; +import com.github.gtexpert.core.api.capability.GTEDataCodes; import gregtech.api.capability.IEnergyContainer; import gregtech.api.capability.impl.RecipeLogicEnergy; @@ -29,8 +30,6 @@ import gregtech.api.util.GTTransferUtils; import gregtech.api.util.GTUtility; -import com.github.gtexpert.core.api.capability.GTEDataCodes; - import crazypants.enderio.base.init.ModObject; import crazypants.enderio.base.item.soulvial.ItemSoulVial; import crazypants.enderio.machines.config.config.SpawnerConfig; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java index 82683ceb..f64fdc22 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java @@ -17,6 +17,11 @@ import org.jetbrains.annotations.Nullable; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; + import gregtech.api.GTValues; import gregtech.api.capability.impl.FluidTankList; import gregtech.api.capability.impl.NotifiableItemStackHandler; @@ -36,11 +41,6 @@ import gregtech.api.util.Size; import gregtech.client.renderer.ICubeRenderer; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; - public class MetaTileEntityElectricSpawner extends GTESimpleMachineMetaTileEntity { private static IGuiTexture spawnEggTexture; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java index da215a81..caf43614 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java @@ -7,6 +7,14 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; +import com.github.gtexpert.core.integration.eio.metatileentities.EIOMetaTileEntities; + import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; @@ -18,14 +26,6 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.loaders.recipe.MetaTileEntityLoader; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; -import com.github.gtexpert.core.integration.eio.metatileentities.EIOMetaTileEntities; - import crazypants.enderio.conduits.init.ConduitObject; import crazypants.enderio.endergy.init.EndergyObject; import crazypants.enderio.machines.init.MachineObject; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java index 9772cdb8..0b7a2851 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java @@ -6,14 +6,14 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.api.util.GTEUtility; import com.github.gtexpert.core.api.util.Mods; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.unification.material.Materials; + import crazypants.enderio.base.init.ModObject; public class EIOFluidRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java index 9f9b6306..15050876 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java @@ -6,11 +6,6 @@ import net.minecraft.init.Items; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.api.util.GTEUtility; @@ -18,6 +13,11 @@ import com.github.gtexpert.core.common.GTEConfigHolder; import com.github.gtexpert.core.common.items.GTEMetaItems; +import gregtech.api.recipes.ModHandler; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.stack.UnificationEntry; + import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java index a35f338c..4346be37 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java @@ -7,6 +7,10 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; + import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.category.RecipeCategories; @@ -14,10 +18,6 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; - import crazypants.enderio.base.init.ModObject; public class EIOMaterialsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java index 6151c257..7adc569f 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java @@ -5,12 +5,12 @@ import net.minecraft.init.Items; -import gregtech.api.unification.material.Materials; -import gregtech.common.items.MetaItems; - import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; +import gregtech.api.unification.material.Materials; +import gregtech.common.items.MetaItems; + import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java index 7ae7f14b..35a27e1c 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java @@ -10,16 +10,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.integration.eio.EnderIOModule; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; + import gregtech.api.recipes.ingredients.GTRecipeItemInput; import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition; import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; import gregtech.api.unification.material.Materials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.integration.eio.EnderIOModule; -import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; - import crazypants.enderio.base.init.ModObject; public class EIOSoulBinderRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java index 760502bf..4e8e36e3 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java @@ -5,13 +5,13 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; + import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; - import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java index 2cac9802..7be4e06b 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java @@ -8,11 +8,11 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.api.unification.material.Materials; - import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.eio.EnderIOModule; +import gregtech.api.unification.material.Materials; + import crazypants.enderio.base.init.ModObject; public class EIOVialExtractorRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java index e7d591e2..27bc8eed 100644 --- a/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java @@ -3,12 +3,12 @@ import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; - import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.extracpus.EXCPUSConfigHolder; +import gregtech.api.recipes.ModHandler; +import gregtech.api.recipes.RecipeMaps; + public class EXCPUSBlocksRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java index 7c82f83f..f69562a9 100644 --- a/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java @@ -3,10 +3,10 @@ import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; -import gregtech.api.recipes.RecipeMaps; - import com.github.gtexpert.core.api.util.Mods; +import gregtech.api.recipes.RecipeMaps; + public class EXCPUSItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java index 0cd209ad..11759afe 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java @@ -2,10 +2,10 @@ import org.jetbrains.annotations.NotNull; -import gregtech.common.ConfigHolder; - import com.github.gtexpert.core.api.util.GTELog; +import gregtech.common.ConfigHolder; + import forestry.api.core.ForestryAPI; public class FFMUtility { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java index 7367f1ff..93e07909 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java @@ -6,13 +6,13 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.util.Mods; - public class FFMBlockRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java index 8872bd63..750a8c37 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java @@ -2,13 +2,13 @@ import static gregtech.api.unification.ore.OrePrefix.*; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import com.github.gtexpert.core.api.util.Mods; - public class FFMItemRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java index 7d502cca..3351b9cc 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java @@ -1,9 +1,9 @@ package com.github.gtexpert.core.integration.ffm.recipes; -import gregtech.api.recipes.ModHandler; - import com.github.gtexpert.core.api.util.Mods; +import gregtech.api.recipes.ModHandler; + public class FFMMaterialsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java index d7a76c5c..eb0d74bf 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java @@ -6,6 +6,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.GTValues; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -13,8 +15,6 @@ import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.util.Mods; - public class FFMToolRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java index e5f6c8b2..84df747a 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java @@ -6,6 +6,12 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; + import gregtech.api.GTValues; import gregtech.api.items.metaitem.MetaItem; import gregtech.api.recipes.ModHandler; @@ -19,12 +25,6 @@ import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; - import forestry.api.circuits.ICircuit; import forestry.api.recipes.RecipeManagers; import forestry.arboriculture.ModuleArboriculture; diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java index a7b3acf7..35b8bf26 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java @@ -6,13 +6,13 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.RecipeBuilder; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; -import com.github.gtexpert.core.api.util.Mods; - import forestry.factory.MachineUIDs; import forestry.factory.ModuleFactory; diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java index 8308c208..76d461c0 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java @@ -6,13 +6,13 @@ import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMUtility; + import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; import gregtech.api.util.GTUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMUtility; - import binnie.extratrees.wood.EnumETLog; import forestry.api.arboriculture.*; diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java index 88fa2b0c..cec72140 100644 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java @@ -1,11 +1,11 @@ package com.github.gtexpert.core.integration.gendustry; -import gregtech.api.recipes.RecipeMap; -import gregtech.core.sound.GTSoundEvents; - import com.github.gtexpert.core.integration.gendustry.recipes.builders.IndustrialApiaryRecipeBuilder; import com.github.gtexpert.core.integration.gendustry.recipes.machines.RecipeMapIndustrialApiary; +import gregtech.api.recipes.RecipeMap; +import gregtech.core.sound.GTSoundEvents; + import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java index a2d7cf34..3004dfc6 100644 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java @@ -1,8 +1,8 @@ package com.github.gtexpert.core.integration.gendustry.metatileentities; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.api.GTValues.V; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; -import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import com.github.gtexpert.core.client.GTETextures; import com.github.gtexpert.core.common.GTEConfigHolder; diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java index e7a4944a..1c3ec8a9 100644 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java @@ -4,13 +4,13 @@ import net.minecraft.util.ResourceLocation; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; + import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; - public class MetaTileEntityIndustrialApiary extends GTESimpleMachineMetaTileEntity { public MetaTileEntityIndustrialApiary(ResourceLocation metaTileEntityId, RecipeMap recipeMap, diff --git a/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java index 0a62eda7..f3bb0473 100644 --- a/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java @@ -2,12 +2,12 @@ import net.minecraft.init.Items; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; -import com.github.gtexpert.core.api.util.Mods; - public class GTFOItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java index 12be6052..d13aa97d 100644 --- a/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java @@ -3,12 +3,12 @@ import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; - import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; +import gregtech.api.recipes.ModHandler; +import gregtech.api.recipes.RecipeMaps; + public class NAE2BlocksRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java index aef5d907..68afdfac 100644 --- a/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java @@ -3,11 +3,11 @@ import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; -import gregtech.api.recipes.RecipeMaps; - import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; +import gregtech.api.recipes.RecipeMaps; + public class NAE2ItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java index 1f2b229c..6a135875 100644 --- a/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java @@ -1,10 +1,10 @@ package com.github.gtexpert.core.integration.tc.recipes; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.ModHandler; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.util.Mods; - public class TCMaterialsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java index e04a9d56..0b23f521 100644 --- a/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java @@ -2,15 +2,15 @@ import static gregtech.api.unification.ore.OrePrefix.*; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.tc.TCConfigHolder; + import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.tc.TCConfigHolder; - public class TCToolsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java index c328d89a..68b0e3c4 100644 --- a/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java @@ -6,14 +6,13 @@ import org.jetbrains.annotations.NotNull; -import com.google.common.collect.ImmutableList; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.modules.GTEModule; import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; import com.github.gtexpert.core.integration.theoneprobe.provider.ElectricSpawnerInfoProvider; import com.github.gtexpert.core.modules.GTEModules; +import com.google.common.collect.ImmutableList; import mcjty.theoneprobe.TheOneProbe; import mcjty.theoneprobe.api.ITheOneProbe; diff --git a/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java index 8ab94f1c..38047079 100644 --- a/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java @@ -7,12 +7,12 @@ import org.jetbrains.annotations.NotNull; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.MetaTileEntityHolder; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.integration.eio.metatileentities.MetaTileEntityElectricSpawner; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.MetaTileEntityHolder; + import mcjty.theoneprobe.api.*; public class ElectricSpawnerInfoProvider implements IProbeInfoProvider { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java index c6f087f8..230fe2c6 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java @@ -16,6 +16,8 @@ import org.jetbrains.annotations.NotNull; +import com.github.gtexpert.core.common.items.GTEMetaItems; + import gregtech.api.GregTechAPI; import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.items.OreDictNames; @@ -38,8 +40,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import com.github.gtexpert.core.common.items.GTEMetaItems; - public class CEUOverrideRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java index 8c20a7fd..d79cbc2f 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java @@ -12,6 +12,18 @@ import org.jetbrains.annotations.NotNull; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities; + import gregtech.api.GTValues; import gregtech.api.GregTechAPI; import gregtech.api.fluids.store.FluidStorageKeys; @@ -37,18 +49,6 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.recipes.GTERecipeMaps; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; -import com.github.gtexpert.core.common.items.GTEMetaItems; -import com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities; - public class GTERecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java index a9c95a21..f4db1f4b 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java @@ -1,22 +1,22 @@ package com.github.gtexpert.core.loaders.recipe; +import static com.github.gtexpert.core.common.GTEConfigHolder.ceuOverride; import static gregtech.api.GTValues.MV; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.*; -import static com.github.gtexpert.core.common.GTEConfigHolder.ceuOverride; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.GTRecipeHandler; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.category.RecipeCategories; import gregtech.api.unification.material.Materials; -import com.github.gtexpert.core.api.util.Mods; - public class GTEVanillaOverrideRecipes { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java index db0bc82d..9a4c6798 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java @@ -4,14 +4,14 @@ import net.minecraft.item.ItemStack; +import com.github.gtexpert.core.api.util.Mods; + import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Material; import gregtech.api.util.GTUtility; import gregtech.common.blocks.MetaBlocks; import gregtech.common.items.MetaItems; -import com.github.gtexpert.core.api.util.Mods; - public class GTEImplosionRecipeHandler { public static void add(Material inputMaterial, Material outputMaterial) { diff --git a/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java b/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java index ddf54d85..054690d7 100644 --- a/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java @@ -6,10 +6,10 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import gregtech.common.items.armor.QuarkTechSuite; - import com.github.gtexpert.core.common.GTEConfigHolder; +import gregtech.common.items.armor.QuarkTechSuite; + @Mixin(value = QuarkTechSuite.class, remap = false) public class QuarkTechSuiteMixin { diff --git a/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java b/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java index d5814881..79561881 100644 --- a/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java +++ b/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java @@ -19,11 +19,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; - import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.modules.*; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; public class GTEModuleManager implements IModuleManager { From 1b68efb9235a65349e108cd5e4d0598df8655573 Mon Sep 17 00:00:00 2001 From: tier940 Date: Sun, 19 Jan 2025 20:06:05 +0900 Subject: [PATCH 3/4] Fix spotless.importorder --- spotless.importorder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spotless.importorder b/spotless.importorder index e503714d..41019cc1 100644 --- a/spotless.importorder +++ b/spotless.importorder @@ -6,4 +6,4 @@ 4=com 5=gregtech 6=gregicality -7=gtexpert +7=com.github.gtexpert From 56e2407fd6d66113f7caf29c85c3a3b1485fb0cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 20:08:32 +0900 Subject: [PATCH 4/4] spotlessApply (#313) Co-authored-by: GitHub Actions <> --- .../com/github/gtexpert/core/GTExpertMod.java | 8 +++---- .../MultiblockRecipeLogicNoCache.java | 4 ++-- .../core/api/recipes/GTERecipeMaps.java | 4 ++-- .../material/GTEMaterialFlags.java | 4 ++-- .../unification/material/GTEMaterials.java | 4 ++-- .../ingredients/AEFirstDegreeMaterials.java | 4 ++-- .../AvaritiaFirstDegreeMaterials.java | 4 ++-- .../ingredients/DEFirstDegreeMaterials.java | 6 ++--- .../ingredients/EIOFirstDegreeMaterials.java | 4 ++-- .../gtexpert/core/api/util/GTEUtility.java | 6 ++--- .../github/gtexpert/core/api/util/Mods.java | 4 ++-- .../gtexpert/core/client/GTETextures.java | 4 ++-- .../core/common/GTEEventHandlers.java | 6 ++--- .../core/common/blocks/GTEBlockWireCoil.java | 4 ++-- .../core/common/items/GTEMetaItem1.java | 8 +++---- .../core/common/items/GTEMetaItems.java | 4 ++-- .../core/common/items/armor/GTEMetaArmor.java | 4 ++-- .../items/behaviors/GTECoverBehaviors.java | 6 ++--- .../metatileentities/GTEMetaTileEntities.java | 6 ++--- .../GTESimpleMachineMetaTileEntity.java | 4 ++-- .../MetaTileEntityAdvancedChemicalPlant.java | 4 ++-- .../MetaTileEntityLargeCrackingUnit.java | 6 ++--- .../MetaTileEntityLargeGasCollector.java | 14 +++++------ .../multi/MetaTileEntityVoidOreMiner.java | 14 +++++------ .../gtexpert/core/core/GTECoreModule.java | 8 +++---- .../core/core/deploader/DepLoader.java | 3 ++- .../ae/loaders/AEMaterialInfoLoader.java | 6 ++--- .../ae/loaders/AEOreDictionaryLoader.java | 6 ++--- .../ae/recipes/AEBlocksRecipe.java | 12 +++++----- .../integration/ae/recipes/AEItemsRecipe.java | 14 +++++------ .../ae/recipes/AEMaterialsRecipe.java | 10 ++++---- .../integration/ae/recipes/AEToolsRecipe.java | 6 ++--- .../aeaditions/recipes/AEAItemsRecipe.java | 6 ++--- .../recipes/AvaritiaMaterialsRecipe.java | 6 ++--- .../botany/recipes/BotanyItemsRecipe.java | 10 ++++---- .../recipes/ExtraBeesItemsRecipe.java | 10 ++++---- .../recipes/ExtraTreesItemsRecipe.java | 10 ++++---- .../genetics/recipes/GeneticsItemsRecipe.java | 12 +++++----- .../binnies/recipes/BinniesItemsRecipe.java | 6 ++--- .../integration/chisel/ChiselRecipeMaps.java | 4 ++-- .../ChiselMetaTileEntities.java | 4 ++-- .../MetaTileEntityAutoChisel.java | 6 ++--- .../chisel/recipes/ChiselBlocksRecipe.java | 11 +++++---- .../chisel/recipes/ChiselToolsRecipe.java | 8 +++---- .../deda/loaders/DEDAMaterialInfoLoader.java | 12 +++++----- .../MetaTileEntityDraconiumFusion.java | 14 +++++------ .../deda/provider/DEDAJEIProvider.java | 4 ++-- .../recipemaps/GTEDraconicRecipeMaps.java | 6 ++--- .../recipemaps/RecipeMapDraconicFusion.java | 11 +++++---- .../tierup/TierUpRecipeBuilder.java | 3 ++- .../upgrade/UpgradeRecipeBuilder.java | 3 ++- .../deda/recipes/DraconicBlocksRecipe.java | 19 ++++++++------- .../deda/recipes/DraconicFluidRecipe.java | 6 ++--- .../DraconicImplosionMaterialsRecipe.java | 1 + .../deda/recipes/DraconicItemsRecipe.java | 11 +++++---- .../deda/recipes/DraconicMaterialsRecipe.java | 7 +++--- .../deda/recipes/DraconicTierupRecipe.java | 13 +++++----- .../deda/recipes/DraconicToolsRecipe.java | 9 +++---- .../deda/recipes/DraconicUpgradeRecipe.java | 11 +++++---- .../core/integration/eio/EnderIOModule.java | 15 ++++++------ .../integration/eio/EnderIORecipeMaps.java | 6 ++--- .../eio/loaders/EIOMaterialInfoLoader.java | 8 +++---- .../metatileentities/EIOMetaTileEntities.java | 4 ++-- .../ElectricSpawnerLogic.java | 3 ++- .../MetaTileEntityElectricSpawner.java | 10 ++++---- .../eio/recipes/EIOBlocksRecipe.java | 16 ++++++------- .../eio/recipes/EIOFluidRecipe.java | 6 ++--- .../eio/recipes/EIOItemsRecipe.java | 10 ++++---- .../eio/recipes/EIOMaterialsRecipe.java | 8 +++---- .../eio/recipes/EIOSliceNSpliceRecipe.java | 6 ++--- .../eio/recipes/EIOSoulBinderRecipe.java | 8 +++---- .../eio/recipes/EIOToolsRecipe.java | 6 ++--- .../eio/recipes/EIOVialExtractorRecipe.java | 4 ++-- .../extracpus/recipes/EXCPUSBlocksRecipe.java | 6 ++--- .../extracpus/recipes/EXCPUSItemsRecipe.java | 4 ++-- .../core/integration/ffm/FFMUtility.java | 4 ++-- .../ffm/recipes/FFMBlockRecipe.java | 4 ++-- .../ffm/recipes/FFMItemRecipe.java | 4 ++-- .../ffm/recipes/FFMMaterialsRecipe.java | 4 ++-- .../ffm/recipes/FFMToolRecipe.java | 4 ++-- .../ffm/recipes/machines/CarpenterLoader.java | 12 +++++----- .../recipes/machines/CentrifugeLoader.java | 4 ++-- .../recipes/machines/FabricatorLoader.java | 6 ++--- .../gendustry/GendustryRecipeMaps.java | 6 ++--- .../MetaTileEntityIndustrialApiary.java | 4 ++-- .../gtfo/recipes/GTFOItemsRecipe.java | 4 ++-- .../nae2/recipes/NAE2BlocksRecipe.java | 6 ++--- .../nae2/recipes/NAE2ItemsRecipe.java | 4 ++-- .../tc/recipes/TCMaterialsRecipe.java | 4 ++-- .../integration/tc/recipes/TCToolsRecipe.java | 8 +++---- .../theoneprobe/TheOneProbeModule.java | 3 ++- .../provider/ElectricSpawnerInfoProvider.java | 6 ++--- .../loaders/recipe/CEUOverrideRecipe.java | 4 ++-- .../core/loaders/recipe/GTERecipe.java | 24 +++++++++---------- .../recipe/GTEVanillaOverrideRecipes.java | 4 ++-- .../GTEImplosionNoBombRecipeHandler.java | 4 ++-- .../handlers/GTEImplosionRecipeHandler.java | 4 ++-- .../mixins/gregtech/QuarkTechSuiteMixin.java | 4 ++-- .../core/modules/GTEModuleManager.java | 5 ++-- 99 files changed, 348 insertions(+), 332 deletions(-) diff --git a/src/main/java/com/github/gtexpert/core/GTExpertMod.java b/src/main/java/com/github/gtexpert/core/GTExpertMod.java index 737dced0..ebc7c7c6 100644 --- a/src/main/java/com/github/gtexpert/core/GTExpertMod.java +++ b/src/main/java/com/github/gtexpert/core/GTExpertMod.java @@ -18,6 +18,10 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import gregtech.GTInternalTags; +import gregtech.api.GregTechAPI; +import gregtech.api.cover.CoverDefinition; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.util.GTELog; import com.github.gtexpert.core.api.util.Mods; @@ -26,10 +30,6 @@ import com.github.gtexpert.core.modules.GTEModuleManager; import com.github.gtexpert.core.modules.GTEModules; -import gregtech.GTInternalTags; -import gregtech.api.GregTechAPI; -import gregtech.api.cover.CoverDefinition; - @Mod(modid = GTEValues.MODID, name = GTEValues.MODNAME, acceptedMinecraftVersions = "[1.12.2,1.13)", diff --git a/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java index 803d6e66..2c92eab9 100644 --- a/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java +++ b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java @@ -1,10 +1,10 @@ package com.github.gtexpert.core.api.capability; -import com.github.gtexpert.core.integration.deda.recipemaps.RecipeMapDraconicFusion; - import gregtech.api.capability.impl.MultiblockRecipeLogic; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; +import com.github.gtexpert.core.integration.deda.recipemaps.RecipeMapDraconicFusion; + /** * This recipe logic disables cache used for speeding up recipe check. * The reason is we do some special things inside {@link RecipeMapDraconicFusion}, diff --git a/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java index 38e13e13..8b1388c6 100644 --- a/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java @@ -2,14 +2,14 @@ import net.minecraft.init.SoundEvents; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java index fb6d01da..f21cb54f 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java @@ -2,14 +2,14 @@ import static gregtech.api.unification.material.info.MaterialFlags.*; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.fluids.FluidBuilder; import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.properties.*; import gregtech.api.unification.ore.OrePrefix; +import com.github.gtexpert.core.api.util.Mods; + public class GTEMaterialFlags { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java index 0e31cd56..ab4c950e 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java @@ -1,11 +1,11 @@ package com.github.gtexpert.core.api.unification.material; +import gregtech.api.unification.material.Material; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.ingredients.*; import com.github.gtexpert.core.api.util.Mods; -import gregtech.api.unification.material.Material; - /** * Material Registration. *

diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java index 931722f5..7ac4427c 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java @@ -7,8 +7,6 @@ import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import com.github.gtexpert.core.api.GTEValues; - import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.Materials; @@ -16,6 +14,8 @@ import gregtech.api.unification.material.properties.BlastProperty.GasTier; import gregtech.api.unification.ore.OrePrefix; +import com.github.gtexpert.core.api.GTEValues; + public class AEFirstDegreeMaterials { /** diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java index acc92fcf..94faf3d7 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java @@ -7,12 +7,12 @@ import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import com.github.gtexpert.core.api.unification.material.info.GTEMaterialIconSet; - import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.properties.ToolProperty; +import com.github.gtexpert.core.api.unification.material.info.GTEMaterialIconSet; + public class AvaritiaFirstDegreeMaterials { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java index db8e059c..d6e4533b 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java @@ -7,9 +7,6 @@ import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.info.MaterialIconSet; @@ -18,6 +15,9 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.Mods; + public class DEFirstDegreeMaterials { /** diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java index b26f0d3d..68cefbc3 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java @@ -6,13 +6,13 @@ import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.info.MaterialFlags.*; -import com.github.gtexpert.core.api.GTEValues; - import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.info.MaterialIconSet; import gregtech.api.unification.material.properties.BlastProperty.GasTier; +import com.github.gtexpert.core.api.GTEValues; + public class EIOFirstDegreeMaterials { /** diff --git a/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java b/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java index bff605ed..323bc9f7 100644 --- a/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java +++ b/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java @@ -13,9 +13,6 @@ import org.jetbrains.annotations.NotNull; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.common.items.GTEMetaItems; - import gregtech.api.GTValues; import gregtech.api.items.metaitem.MetaItem; import gregtech.api.unification.OreDictUnifier; @@ -24,6 +21,9 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.items.MetaItems; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.common.items.GTEMetaItems; + public class GTEUtility { public static @NotNull ItemStack getModItem(String modID, String itemName) { diff --git a/src/main/java/com/github/gtexpert/core/api/util/Mods.java b/src/main/java/com/github/gtexpert/core/api/util/Mods.java index 622d8ca1..40793965 100644 --- a/src/main/java/com/github/gtexpert/core/api/util/Mods.java +++ b/src/main/java/com/github/gtexpert/core/api/util/Mods.java @@ -19,10 +19,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.github.gtexpert.core.api.GTEValues; - import gregtech.api.GTValues; +import com.github.gtexpert.core.api.GTEValues; + public enum Mods { AEAdditions(Names.AE_ADDITIONS), diff --git a/src/main/java/com/github/gtexpert/core/client/GTETextures.java b/src/main/java/com/github/gtexpert/core/client/GTETextures.java index 0590fb8f..6bee8c4b 100644 --- a/src/main/java/com/github/gtexpert/core/client/GTETextures.java +++ b/src/main/java/com/github/gtexpert/core/client/GTETextures.java @@ -3,10 +3,10 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; -import com.github.gtexpert.core.api.GTEValues; - import gregtech.client.renderer.texture.cube.*; +import com.github.gtexpert.core.api.GTEValues; + @Mod.EventBusSubscriber(modid = GTEValues.MODID, value = Side.CLIENT) public class GTETextures { diff --git a/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java b/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java index 860e0bc5..80ffa7c4 100644 --- a/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java @@ -20,13 +20,13 @@ import org.jetbrains.annotations.NotNull; +import gregtech.api.items.armor.ArmorMetaItem; +import gregtech.api.unification.material.event.MaterialEvent; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.common.items.GTEMetaItems; -import gregtech.api.items.armor.ArmorMetaItem; -import gregtech.api.unification.material.event.MaterialEvent; - @Mod.EventBusSubscriber(modid = GTEValues.MODID) public class GTEEventHandlers { diff --git a/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java index 1ba0b650..0d10e0e9 100644 --- a/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java +++ b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java @@ -19,8 +19,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; - import gregtech.api.block.IHeatingCoilBlockStats; import gregtech.api.block.VariantActiveBlock; import gregtech.api.block.VariantItemBlock; @@ -30,6 +28,8 @@ import gregtech.common.ConfigHolder; import gregtech.common.metatileentities.multi.electric.MetaTileEntityMultiSmelter; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; + public class GTEBlockWireCoil extends VariantActiveBlock { public GTEBlockWireCoil() { diff --git a/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java index 772dbc17..ca08c46b 100644 --- a/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java +++ b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java @@ -4,10 +4,6 @@ import net.minecraft.client.resources.I18n; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; - import gregtech.api.GTValues; import gregtech.api.items.metaitem.StandardMetaItem; import gregtech.api.unification.material.Materials; @@ -15,6 +11,10 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.items.behaviors.TooltipBehavior; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; + public class GTEMetaItem1 extends StandardMetaItem { public GTEMetaItem1() { diff --git a/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java index 00e5a22a..62dd8118 100644 --- a/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java +++ b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java @@ -1,10 +1,10 @@ package com.github.gtexpert.core.common.items; -import com.github.gtexpert.core.common.items.armor.GTEMetaArmor; - import gregtech.api.items.armor.ArmorMetaItem; import gregtech.api.items.metaitem.MetaItem; +import com.github.gtexpert.core.common.items.armor.GTEMetaArmor; + public final class GTEMetaItems { private GTEMetaItems() {} diff --git a/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java b/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java index 9e191f9c..7dacf79f 100644 --- a/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java +++ b/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java @@ -3,10 +3,10 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumRarity; -import com.github.gtexpert.core.common.items.GTEMetaItems; - import gregtech.api.items.armor.ArmorMetaItem; +import com.github.gtexpert.core.common.items.GTEMetaItems; + public class GTEMetaArmor extends ArmorMetaItem.ArmorMetaValueItem> { @Override diff --git a/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java b/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java index 5e9030ff..6a675505 100644 --- a/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java +++ b/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java @@ -3,15 +3,15 @@ import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.common.covers.CoverBehaviors.registerBehavior; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.items.GTEMetaItems; - import gregtech.api.GTValues; import gregtech.common.covers.CoverConveyor; import gregtech.common.covers.CoverFluidRegulator; import gregtech.common.covers.CoverPump; import gregtech.common.covers.CoverRoboticArm; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; + public class GTECoverBehaviors { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java index 240121a8..45526f06 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java @@ -7,13 +7,13 @@ import net.minecraft.util.ResourceLocation; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.metatileentities.multi.*; - import gregtech.api.GTValues; import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.metatileentities.multi.*; + public class GTEMetaTileEntities { // Single Machine diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java index a0d519b2..15acc9a2 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java @@ -5,8 +5,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - import gregtech.api.GTValues; import gregtech.api.gui.GuiTextures; import gregtech.api.gui.ModularUI; @@ -17,6 +15,8 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + public class GTESimpleMachineMetaTileEntity extends SimpleMachineMetaTileEntity { private static final int FONT_HEIGHT = 9; // Minecraft's FontRenderer FONT_HEIGHT value diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java index 3da575ba..85d8f85f 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java @@ -14,8 +14,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -33,6 +31,8 @@ import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + public class MetaTileEntityAdvancedChemicalPlant extends GCYMRecipeMapMultiblockController { public MetaTileEntityAdvancedChemicalPlant(ResourceLocation metaTileEntityId) { diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java index 93d920ad..05f622b8 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java @@ -16,9 +16,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.common.GTEConfigHolder; - import gregtech.api.block.IHeatingCoilBlockStats; import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; @@ -43,6 +40,9 @@ import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic; import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.common.GTEConfigHolder; + public class MetaTileEntityLargeCrackingUnit extends GCYMRecipeMapMultiblockController { private int coilTier; diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java index 742f5d66..d3d293e9 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java @@ -14,13 +14,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.api.recipes.GTERecipeMaps; -import com.github.gtexpert.core.client.GTETextures; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; - import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -37,6 +30,13 @@ import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; + public class MetaTileEntityLargeGasCollector extends GCYMRecipeMapMultiblockController { public MetaTileEntityLargeGasCollector(ResourceLocation metaTileEntityId) { diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java index eb04af1b..b9b76cd4 100644 --- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java @@ -14,13 +14,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.api.recipes.GTERecipeMaps; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.client.GTETextures; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; - import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -34,6 +27,13 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.core.sound.GTSoundEvents; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; + public class MetaTileEntityVoidOreMiner extends RecipeMapMultiblockController { public MetaTileEntityVoidOreMiner(ResourceLocation metaTileEntityId) { diff --git a/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java index a79333fe..5a095a5f 100644 --- a/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java +++ b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java @@ -19,6 +19,10 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; +import gregtech.api.block.VariantItemBlock; +import gregtech.api.recipes.RecipeMaps; +import gregtech.loaders.recipe.RecyclingRecipes; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.modules.GTEModule; import com.github.gtexpert.core.api.modules.IGTEModule; @@ -33,10 +37,6 @@ import com.github.gtexpert.core.loaders.recipe.GTEVanillaOverrideRecipes; import com.github.gtexpert.core.modules.GTEModules; -import gregtech.api.block.VariantItemBlock; -import gregtech.api.recipes.RecipeMaps; -import gregtech.loaders.recipe.RecyclingRecipes; - @GTEModule( moduleID = GTEModules.MODULE_CORE, containerID = GTEValues.MODID, diff --git a/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java b/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java index f9fc4427..cca68007 100644 --- a/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java +++ b/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java @@ -23,11 +23,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.github.gtexpert.core.core.GTECoreMod; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; +import com.github.gtexpert.core.core.GTECoreMod; + public class DepLoader implements IFMLCallHook { private File mcLocation; diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java index a843bc57..071f6570 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java @@ -1,14 +1,14 @@ package com.github.gtexpert.core.integration.ae.loaders; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.GTValues; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.ItemMaterialInfo; import gregtech.api.unification.stack.MaterialStack; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; + public class AEMaterialInfoLoader { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java index 1c2cfac4..8ae92ef5 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java @@ -3,14 +3,14 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; + public class AEOreDictionaryLoader { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java index 397674e7..eedab8e3 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java @@ -7,12 +7,6 @@ import java.util.Map; import java.util.stream.IntStream; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; @@ -24,6 +18,12 @@ import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; + import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; public class AEBlocksRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java index c45d0fbc..f35548ef 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java @@ -7,13 +7,6 @@ import java.util.Arrays; import java.util.Objects; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.items.GTEMetaItems; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.builders.AssemblyLineRecipeBuilder; @@ -23,6 +16,13 @@ import gregtech.api.unification.material.Materials; import gregtech.common.items.MetaItems; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; + public class AEItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java index 50e39c21..9588f21a 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java @@ -6,11 +6,6 @@ import net.minecraftforge.fluids.FluidStack; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; - import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -28,6 +23,11 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; + public class AEMaterialsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java index fde11148..bf91d2c3 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java @@ -2,14 +2,14 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; - import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; + public class AEToolsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java index 2b58463f..358c0923 100644 --- a/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java @@ -4,13 +4,13 @@ import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.Mods; + public class AEAItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java index 478faee4..a5aaa9e8 100644 --- a/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java @@ -2,9 +2,6 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; @@ -12,6 +9,9 @@ import gregtech.common.ConfigHolder; import gregtech.common.items.MetaItems; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; + public class AvaritiaMaterialsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java index 28bbf20e..e3be2b08 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java @@ -2,16 +2,16 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - import gregtech.api.recipes.ModHandler; import gregtech.api.unification.material.MarkerMaterials; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; + import forestry.api.recipes.RecipeManagers; public class BotanyItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java index 29707a14..fb402170 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java @@ -2,16 +2,16 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - import gregtech.api.recipes.ModHandler; import gregtech.api.unification.material.MarkerMaterials; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; + import forestry.api.recipes.RecipeManagers; public class ExtraBeesItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java index 2589bc02..72bbea70 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java @@ -2,16 +2,16 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - import gregtech.api.recipes.ModHandler; import gregtech.api.unification.material.MarkerMaterials; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; + import forestry.api.recipes.RecipeManagers; public class ExtraTreesItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java index 374721d2..ebb5cca9 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java @@ -6,12 +6,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - import gregtech.api.recipes.GTRecipeHandler; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -20,6 +14,12 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; + import forestry.api.recipes.RecipeManagers; public class GeneticsItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java index 6f09f860..c1b6c545 100644 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java @@ -1,12 +1,12 @@ package com.github.gtexpert.core.integration.binnies.recipes; +import gregtech.api.recipes.ModHandler; +import gregtech.api.unification.material.Materials; + import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; import com.github.gtexpert.core.integration.ffm.FFMUtility; -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.Materials; - import forestry.api.recipes.RecipeManagers; public class BinniesItemsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java index 5ee21a0b..b1bb387b 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java @@ -1,13 +1,13 @@ package com.github.gtexpert.core.integration.chisel; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java index fe94753b..24feb158 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java @@ -4,11 +4,11 @@ import static gregtech.api.GTValues.*; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; +import gregtech.api.util.GTUtility; + import com.github.gtexpert.core.client.GTETextures; import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; -import gregtech.api.util.GTUtility; - public class ChiselMetaTileEntities { public static MetaTileEntityAutoChisel[] AUTO_CHISEL = new MetaTileEntityAutoChisel[3]; diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java index abdf0bb0..666fd3fd 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java @@ -4,14 +4,14 @@ import net.minecraft.util.ResourceLocation; -import com.github.gtexpert.core.api.capability.SingleblockRecipeLogicNoCache; -import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; - import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; +import com.github.gtexpert.core.api.capability.SingleblockRecipeLogicNoCache; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; + public class MetaTileEntityAutoChisel extends GTESimpleMachineMetaTileEntity { public MetaTileEntityAutoChisel(ResourceLocation metaTileEntityId, RecipeMap recipeMap, ICubeRenderer renderer, diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java index ae4901b7..d1b8e63a 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java @@ -15,11 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; -import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; -import com.github.gtexpert.core.integration.chisel.ChiselUtil; import com.google.common.base.CaseFormat; import gregtech.api.recipes.GTRecipeHandler; @@ -31,6 +26,12 @@ import gregtech.common.blocks.*; import gregtech.loaders.recipe.MetaTileEntityLoader; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; +import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; +import com.github.gtexpert.core.integration.chisel.ChiselUtil; + public class ChiselBlocksRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java index 24d6fcd5..fb968370 100644 --- a/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java @@ -2,15 +2,15 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; - import gregtech.api.recipes.ModHandler; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; + public class ChiselToolsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java index 1b59c83f..737df53c 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java @@ -3,18 +3,18 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; - import gregtech.api.GTValues; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.ItemMaterialInfo; import gregtech.api.unification.stack.MaterialStack; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; + public class DEDAMaterialInfoLoader { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java index 65933078..27dcd58f 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java @@ -14,13 +14,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.github.gtexpert.core.api.capability.MultiblockRecipeLogicNoCache; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.client.GTETextures; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; - import gregtech.api.gui.resources.TextureArea; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; @@ -33,6 +26,13 @@ import gregtech.client.renderer.ICubeRenderer; import gregtech.core.sound.GTSoundEvents; +import com.github.gtexpert.core.api.capability.MultiblockRecipeLogicNoCache; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; + public abstract class MetaTileEntityDraconiumFusion extends RecipeMapMultiblockController { public MetaTileEntityDraconiumFusion(ResourceLocation metaTileEntityId, RecipeMap recipeMap) { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java b/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java index 135d1eb2..81735de4 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java @@ -2,12 +2,12 @@ import org.jetbrains.annotations.NotNull; +import gregtech.api.GTValues; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import gregtech.api.GTValues; - import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java index 734cc2f7..6a8c0ec1 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java @@ -1,8 +1,5 @@ package com.github.gtexpert.core.integration.deda.recipemaps; -import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; -import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; - import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; @@ -10,6 +7,9 @@ import gregtech.api.recipes.ingredients.GTRecipeInput; import gregtech.core.sound.GTSoundEvents; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; + import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java index 520deb91..455f0075 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java @@ -17,11 +17,6 @@ import com.brandon3055.draconicevolution.api.itemupgrade.IUpgradableItem; import com.brandon3055.draconicevolution.api.itemupgrade.UpgradeHelper; import com.brandon3055.draconicevolution.items.ToolUpgrade; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; -import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeProperty; -import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; -import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; import gregtech.api.capability.FeCompat; import gregtech.api.capability.GregtechCapabilities; @@ -30,6 +25,12 @@ import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeProperty; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; + import cofh.redstoneflux.api.IEnergyContainerItem; public class RecipeMapDraconicFusion extends RecipeMap { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java index 19a84d04..e97a6fae 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java @@ -8,7 +8,6 @@ import org.jetbrains.annotations.Nullable; import com.brandon3055.draconicevolution.lib.ToolUpgradeRecipe; -import com.github.gtexpert.core.api.util.GTELog; import gregtech.api.recipes.Recipe; import gregtech.api.recipes.RecipeBuilder; @@ -20,6 +19,8 @@ import gregtech.api.util.EnumValidationResult; import gregtech.api.util.ValidationResult; +import com.github.gtexpert.core.api.util.GTELog; + public class TierUpRecipeBuilder extends RecipeBuilder { private GTRecipeInput catalyst; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java index 1829bcc4..dcecb6eb 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java @@ -11,7 +11,6 @@ import com.brandon3055.draconicevolution.api.itemupgrade.IUpgradableItem; import com.brandon3055.draconicevolution.api.itemupgrade.UpgradeHelper; import com.brandon3055.draconicevolution.items.ToolUpgrade; -import com.github.gtexpert.core.api.util.GTELog; import gregtech.api.recipes.Recipe; import gregtech.api.recipes.RecipeBuilder; @@ -23,6 +22,8 @@ import gregtech.api.util.EnumValidationResult; import gregtech.api.util.ValidationResult; +import com.github.gtexpert.core.api.util.GTELog; + public class UpgradeRecipeBuilder extends RecipeBuilder { private ItemStack catalyst; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java index b9900ff6..3eebb4b6 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java @@ -9,15 +9,6 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.DEFeatures; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEBlockWireCoil; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; -import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeBuilder; @@ -33,6 +24,16 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEBlockWireCoil; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; + public class DraconicBlocksRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java index ce5b4c37..08606459 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java @@ -3,15 +3,15 @@ import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.dust; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; - import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; + public class DraconicFluidRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java index 94a75974..4f1d0e1a 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java @@ -3,6 +3,7 @@ import static gregtech.api.unification.ore.OrePrefix.block; import com.brandon3055.draconicevolution.DEFeatures; + import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java index 39b752b7..69420d5a 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java @@ -9,11 +9,6 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.DEFeatures; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import gregtech.api.metatileentity.multiblock.CleanroomType; import gregtech.api.recipes.ModHandler; @@ -27,6 +22,12 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; + public class DraconicItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java index d3faa408..35f9f7e8 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java @@ -15,9 +15,6 @@ import org.jetbrains.annotations.NotNull; import com.brandon3055.draconicevolution.DEFeatures; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; import gregtech.api.GTValues; import gregtech.api.GregTechAPI; @@ -43,6 +40,10 @@ import gregicality.multiblocks.api.unification.GCYMMaterialFlags; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; + public class DraconicMaterialsRecipe { public static final int ABFPyrotheumAmount = 200; diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java index 9a6d3364..f1c506ce 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java @@ -7,12 +7,6 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.DEFeatures; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; import gregtech.api.GTValues; import gregtech.api.items.toolitem.ToolHelper; @@ -28,6 +22,13 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; + public class DraconicTierupRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java index 7d65286e..668cdf12 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java @@ -8,10 +8,6 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.DEFeatures; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -22,6 +18,11 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; + public class DraconicToolsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java index 93cbd407..d2c0c9e2 100644 --- a/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java @@ -10,11 +10,6 @@ import com.brandon3055.draconicevolution.DEFeatures; import com.brandon3055.draconicevolution.api.itemupgrade.IUpgradableItem; import com.brandon3055.draconicevolution.items.ToolUpgrade; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; import gregtech.api.recipes.RecipeMap; import gregtech.api.unification.material.Materials; @@ -22,6 +17,12 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; + public class DraconicUpgradeRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java index 3f646102..e552de6b 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java @@ -14,6 +14,14 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import com.enderio.core.common.util.EntityUtil; + +import gregtech.api.recipes.RecipeBuilder; +import gregtech.api.recipes.builders.SimpleRecipeBuilder; +import gregtech.api.recipes.ingredients.GTRecipeItemInput; +import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition; +import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; +import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.modules.GTEModule; import com.github.gtexpert.core.api.util.GTEUtility; @@ -25,13 +33,6 @@ import com.github.gtexpert.core.integration.eio.recipes.*; import com.github.gtexpert.core.modules.GTEModules; -import gregtech.api.recipes.RecipeBuilder; -import gregtech.api.recipes.builders.SimpleRecipeBuilder; -import gregtech.api.recipes.ingredients.GTRecipeItemInput; -import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition; -import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; -import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; - import crazypants.enderio.base.init.ModObject; @GTEModule( diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java index 853f1ecc..9e45d9d9 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java @@ -2,15 +2,15 @@ import net.minecraft.util.SoundEvent; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.util.Mods; + import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java index 1bd8b634..edb009f9 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java @@ -3,10 +3,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.GTValues; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; @@ -14,6 +10,10 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; + public class EIOMaterialInfoLoader { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java index 05079a59..b3449696 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java @@ -5,13 +5,13 @@ import static gregtech.api.GTValues.*; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; +import gregtech.api.util.GTUtility; + import com.github.gtexpert.core.api.util.GTEUtility; import com.github.gtexpert.core.client.GTETextures; import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; -import gregtech.api.util.GTUtility; - public class EIOMetaTileEntities { public static GTESimpleMachineMetaTileEntity[] VIAL_EXTRACTOR = new GTESimpleMachineMetaTileEntity[V.length - 1]; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java index a585ce7b..0cf027ba 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java @@ -21,7 +21,6 @@ import org.jetbrains.annotations.Nullable; import com.enderio.core.client.render.BoundingBox; -import com.github.gtexpert.core.api.capability.GTEDataCodes; import gregtech.api.capability.IEnergyContainer; import gregtech.api.capability.impl.RecipeLogicEnergy; @@ -30,6 +29,8 @@ import gregtech.api.util.GTTransferUtils; import gregtech.api.util.GTUtility; +import com.github.gtexpert.core.api.capability.GTEDataCodes; + import crazypants.enderio.base.init.ModObject; import crazypants.enderio.base.item.soulvial.ItemSoulVial; import crazypants.enderio.machines.config.config.SpawnerConfig; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java index f64fdc22..82683ceb 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java @@ -17,11 +17,6 @@ import org.jetbrains.annotations.Nullable; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; - import gregtech.api.GTValues; import gregtech.api.capability.impl.FluidTankList; import gregtech.api.capability.impl.NotifiableItemStackHandler; @@ -41,6 +36,11 @@ import gregtech.api.util.Size; import gregtech.client.renderer.ICubeRenderer; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; + public class MetaTileEntityElectricSpawner extends GTESimpleMachineMetaTileEntity { private static IGuiTexture spawnEggTexture; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java index caf43614..da215a81 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java @@ -7,14 +7,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; -import com.github.gtexpert.core.integration.eio.metatileentities.EIOMetaTileEntities; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; @@ -26,6 +18,14 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.loaders.recipe.MetaTileEntityLoader; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; +import com.github.gtexpert.core.integration.eio.metatileentities.EIOMetaTileEntities; + import crazypants.enderio.conduits.init.ConduitObject; import crazypants.enderio.endergy.init.EndergyObject; import crazypants.enderio.machines.init.MachineObject; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java index 0b7a2851..9772cdb8 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java @@ -6,14 +6,14 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.unification.material.Materials; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.api.util.GTEUtility; import com.github.gtexpert.core.api.util.Mods; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; - import crazypants.enderio.base.init.ModObject; public class EIOFluidRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java index 15050876..9f9b6306 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java @@ -6,6 +6,11 @@ import net.minecraft.init.Items; +import gregtech.api.recipes.ModHandler; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.stack.UnificationEntry; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.api.util.GTEUtility; @@ -13,11 +18,6 @@ import com.github.gtexpert.core.common.GTEConfigHolder; import com.github.gtexpert.core.common.items.GTEMetaItems; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java index 4346be37..a35f338c 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java @@ -7,10 +7,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.category.RecipeCategories; @@ -18,6 +14,10 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; + import crazypants.enderio.base.init.ModObject; public class EIOMaterialsRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java index 7adc569f..6151c257 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java @@ -5,12 +5,12 @@ import net.minecraft.init.Items; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; - import gregtech.api.unification.material.Materials; import gregtech.common.items.MetaItems; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; + import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java index 35a27e1c..7ae7f14b 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java @@ -10,16 +10,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.integration.eio.EnderIOModule; -import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; - import gregtech.api.recipes.ingredients.GTRecipeItemInput; import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition; import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; import gregtech.api.unification.material.Materials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.integration.eio.EnderIOModule; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; + import crazypants.enderio.base.init.ModObject; public class EIOSoulBinderRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java index 4e8e36e3..760502bf 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java @@ -5,13 +5,13 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; - import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; + import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java index 7be4e06b..2cac9802 100644 --- a/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java @@ -8,11 +8,11 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import gregtech.api.unification.material.Materials; + import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.eio.EnderIOModule; -import gregtech.api.unification.material.Materials; - import crazypants.enderio.base.init.ModObject; public class EIOVialExtractorRecipe { diff --git a/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java index 27bc8eed..e7d591e2 100644 --- a/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java @@ -3,12 +3,12 @@ import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.extracpus.EXCPUSConfigHolder; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.extracpus.EXCPUSConfigHolder; + public class EXCPUSBlocksRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java index f69562a9..7c82f83f 100644 --- a/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java @@ -3,10 +3,10 @@ import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.RecipeMaps; +import com.github.gtexpert.core.api.util.Mods; + public class EXCPUSItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java index 11759afe..0cd209ad 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java @@ -2,10 +2,10 @@ import org.jetbrains.annotations.NotNull; -import com.github.gtexpert.core.api.util.GTELog; - import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.util.GTELog; + import forestry.api.core.ForestryAPI; public class FFMUtility { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java index 93e07909..7367f1ff 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java @@ -6,13 +6,13 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.util.Mods; + public class FFMBlockRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java index 750a8c37..8872bd63 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java @@ -2,13 +2,13 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; +import com.github.gtexpert.core.api.util.Mods; + public class FFMItemRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java index 3351b9cc..7d502cca 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java @@ -1,9 +1,9 @@ package com.github.gtexpert.core.integration.ffm.recipes; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.ModHandler; +import com.github.gtexpert.core.api.util.Mods; + public class FFMMaterialsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java index eb0d74bf..d7a76c5c 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java @@ -6,8 +6,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.GTValues; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -15,6 +13,8 @@ import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.util.Mods; + public class FFMToolRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java index 84df747a..e5f6c8b2 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java @@ -6,12 +6,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; - import gregtech.api.GTValues; import gregtech.api.items.metaitem.MetaItem; import gregtech.api.recipes.ModHandler; @@ -25,6 +19,12 @@ import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; + import forestry.api.circuits.ICircuit; import forestry.api.recipes.RecipeManagers; import forestry.arboriculture.ModuleArboriculture; diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java index 35b8bf26..a7b3acf7 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java @@ -6,13 +6,13 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.RecipeBuilder; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; +import com.github.gtexpert.core.api.util.Mods; + import forestry.factory.MachineUIDs; import forestry.factory.ModuleFactory; diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java index 76d461c0..8308c208 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java @@ -6,13 +6,13 @@ import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMUtility; - import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; import gregtech.api.util.GTUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMUtility; + import binnie.extratrees.wood.EnumETLog; import forestry.api.arboriculture.*; diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java index cec72140..88fa2b0c 100644 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java @@ -1,11 +1,11 @@ package com.github.gtexpert.core.integration.gendustry; -import com.github.gtexpert.core.integration.gendustry.recipes.builders.IndustrialApiaryRecipeBuilder; -import com.github.gtexpert.core.integration.gendustry.recipes.machines.RecipeMapIndustrialApiary; - import gregtech.api.recipes.RecipeMap; import gregtech.core.sound.GTSoundEvents; +import com.github.gtexpert.core.integration.gendustry.recipes.builders.IndustrialApiaryRecipeBuilder; +import com.github.gtexpert.core.integration.gendustry.recipes.machines.RecipeMapIndustrialApiary; + import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java index 1c3ec8a9..e7a4944a 100644 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java @@ -4,13 +4,13 @@ import net.minecraft.util.ResourceLocation; -import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; - import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; + public class MetaTileEntityIndustrialApiary extends GTESimpleMachineMetaTileEntity { public MetaTileEntityIndustrialApiary(ResourceLocation metaTileEntityId, RecipeMap recipeMap, diff --git a/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java index f3bb0473..0a62eda7 100644 --- a/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java @@ -2,12 +2,12 @@ import net.minecraft.init.Items; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; +import com.github.gtexpert.core.api.util.Mods; + public class GTFOItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java index d13aa97d..12be6052 100644 --- a/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java @@ -3,12 +3,12 @@ import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; - import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; + public class NAE2BlocksRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java index 68afdfac..aef5d907 100644 --- a/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java @@ -3,11 +3,11 @@ import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; +import gregtech.api.recipes.RecipeMaps; + import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; -import gregtech.api.recipes.RecipeMaps; - public class NAE2ItemsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java index 6a135875..1f2b229c 100644 --- a/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java @@ -1,10 +1,10 @@ package com.github.gtexpert.core.integration.tc.recipes; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.ModHandler; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.util.Mods; + public class TCMaterialsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java index 0b23f521..e04a9d56 100644 --- a/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java @@ -2,15 +2,15 @@ import static gregtech.api.unification.ore.OrePrefix.*; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.tc.TCConfigHolder; - import gregtech.api.recipes.ModHandler; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.tc.TCConfigHolder; + public class TCToolsRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java index 68b0e3c4..c328d89a 100644 --- a/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java @@ -6,13 +6,14 @@ import org.jetbrains.annotations.NotNull; +import com.google.common.collect.ImmutableList; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.modules.GTEModule; import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; import com.github.gtexpert.core.integration.theoneprobe.provider.ElectricSpawnerInfoProvider; import com.github.gtexpert.core.modules.GTEModules; -import com.google.common.collect.ImmutableList; import mcjty.theoneprobe.TheOneProbe; import mcjty.theoneprobe.api.ITheOneProbe; diff --git a/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java index 38047079..8ab94f1c 100644 --- a/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java @@ -7,12 +7,12 @@ import org.jetbrains.annotations.NotNull; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.integration.eio.metatileentities.MetaTileEntityElectricSpawner; - import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntityHolder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.integration.eio.metatileentities.MetaTileEntityElectricSpawner; + import mcjty.theoneprobe.api.*; public class ElectricSpawnerInfoProvider implements IProbeInfoProvider { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java index 230fe2c6..c6f087f8 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java @@ -16,8 +16,6 @@ import org.jetbrains.annotations.NotNull; -import com.github.gtexpert.core.common.items.GTEMetaItems; - import gregtech.api.GregTechAPI; import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.items.OreDictNames; @@ -40,6 +38,8 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; +import com.github.gtexpert.core.common.items.GTEMetaItems; + public class CEUOverrideRecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java index d79cbc2f..8c20a7fd 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java @@ -12,18 +12,6 @@ import org.jetbrains.annotations.NotNull; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.recipes.GTERecipeMaps; -import com.github.gtexpert.core.api.unification.material.GTEMaterials; -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; -import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; -import com.github.gtexpert.core.common.items.GTEMetaItems; -import com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities; - import gregtech.api.GTValues; import gregtech.api.GregTechAPI; import gregtech.api.fluids.store.FluidStorageKeys; @@ -49,6 +37,18 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities; + public class GTERecipe { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java index f4db1f4b..b4213488 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java @@ -9,14 +9,14 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.GTRecipeHandler; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.category.RecipeCategories; import gregtech.api.unification.material.Materials; +import com.github.gtexpert.core.api.util.Mods; + public class GTEVanillaOverrideRecipes { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java index 9d22911e..3c9ea81d 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java @@ -4,11 +4,11 @@ import net.minecraft.item.ItemStack; -import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; - import gregtech.api.unification.material.Material; import gregtech.api.util.GTUtility; +import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; + public class GTEImplosionNoBombRecipeHandler { public static void add(Material inputMaterial, Material outputMaterial) { diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java index 9a4c6798..db0bc82d 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java @@ -4,14 +4,14 @@ import net.minecraft.item.ItemStack; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Material; import gregtech.api.util.GTUtility; import gregtech.common.blocks.MetaBlocks; import gregtech.common.items.MetaItems; +import com.github.gtexpert.core.api.util.Mods; + public class GTEImplosionRecipeHandler { public static void add(Material inputMaterial, Material outputMaterial) { diff --git a/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java b/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java index 054690d7..ddf54d85 100644 --- a/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java @@ -6,10 +6,10 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import com.github.gtexpert.core.common.GTEConfigHolder; - import gregtech.common.items.armor.QuarkTechSuite; +import com.github.gtexpert.core.common.GTEConfigHolder; + @Mixin(value = QuarkTechSuite.class, remap = false) public class QuarkTechSuiteMixin { diff --git a/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java b/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java index 79561881..d5814881 100644 --- a/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java +++ b/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java @@ -19,11 +19,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.*; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.*; + public class GTEModuleManager implements IModuleManager { private static final GTEModuleManager INSTANCE = new GTEModuleManager();