diff --git a/src/main/java/com/github/gtexpert/core/GTExpertMod.java b/src/main/java/com/github/gtexpert/core/GTExpertMod.java index 737dced0..ebc7c7c6 100644 --- a/src/main/java/com/github/gtexpert/core/GTExpertMod.java +++ b/src/main/java/com/github/gtexpert/core/GTExpertMod.java @@ -18,6 +18,10 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import gregtech.GTInternalTags; +import gregtech.api.GregTechAPI; +import gregtech.api.cover.CoverDefinition; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.util.GTELog; import com.github.gtexpert.core.api.util.Mods; @@ -26,10 +30,6 @@ import com.github.gtexpert.core.modules.GTEModuleManager; import com.github.gtexpert.core.modules.GTEModules; -import gregtech.GTInternalTags; -import gregtech.api.GregTechAPI; -import gregtech.api.cover.CoverDefinition; - @Mod(modid = GTEValues.MODID, name = GTEValues.MODNAME, acceptedMinecraftVersions = "[1.12.2,1.13)", diff --git a/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java index 803d6e66..2c92eab9 100644 --- a/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java +++ b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java @@ -1,10 +1,10 @@ package com.github.gtexpert.core.api.capability; -import com.github.gtexpert.core.integration.deda.recipemaps.RecipeMapDraconicFusion; - import gregtech.api.capability.impl.MultiblockRecipeLogic; import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; +import com.github.gtexpert.core.integration.deda.recipemaps.RecipeMapDraconicFusion; + /** * This recipe logic disables cache used for speeding up recipe check. * The reason is we do some special things inside {@link RecipeMapDraconicFusion}, diff --git a/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java index 38e13e13..8b1388c6 100644 --- a/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java @@ -2,14 +2,14 @@ import net.minecraft.init.SoundEvents; -import com.github.gtexpert.core.api.gui.GTEGuiTextures; - import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; + import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenProperty; diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java index fb6d01da..f21cb54f 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java @@ -2,14 +2,14 @@ import static gregtech.api.unification.material.info.MaterialFlags.*; -import com.github.gtexpert.core.api.util.Mods; - import gregtech.api.fluids.FluidBuilder; import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.properties.*; import gregtech.api.unification.ore.OrePrefix; +import com.github.gtexpert.core.api.util.Mods; + public class GTEMaterialFlags { public static void init() { diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java index 0e31cd56..ab4c950e 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java @@ -1,11 +1,11 @@ package com.github.gtexpert.core.api.unification.material; +import gregtech.api.unification.material.Material; + import com.github.gtexpert.core.api.GTEValues; import com.github.gtexpert.core.api.unification.material.ingredients.*; import com.github.gtexpert.core.api.util.Mods; -import gregtech.api.unification.material.Material; - /** * Material Registration. *

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