Spotless apply for branch tier-move-modGroup for #311

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)",

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},

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;

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() {

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.
  * <p>

src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java

@@ -7,15 +7,15 @@
 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;
 import gregtech.api.unification.material.info.MaterialIconSet;
 import gregtech.api.unification.material.properties.BlastProperty.GasTier;
 import gregtech.api.unification.ore.OrePrefix;
 
+import com.github.gtexpert.core.api.GTEValues;
+
 public class AEFirstDegreeMaterials {
 
     /**

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() {

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 {
 
     /**

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 {
 
     /**

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) {

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),

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 {
 

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 {
 

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<GTEBlockWireCoil.GTECoilType> {
 
     public GTEBlockWireCoil() {

src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java

@@ -4,17 +4,17 @@
 
 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;
 import gregtech.api.unification.stack.ItemMaterialInfo;
 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() {

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() {}

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<ArmorMetaItem<?>.ArmorMetaValueItem> {
 
     @Override

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() {

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

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

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) {

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;