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 {