apply spotless

GregTechCEu · Nov 26, 2023 · ed44209 · ed44209
1 parent 17f9f12
commit ed44209
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 48 deletions.
diff --git a/src/main/java/gregicality/multiblocks/api/fluids/GCYMFluidStorageKeys.java b/src/main/java/gregicality/multiblocks/api/fluids/GCYMFluidStorageKeys.java
@@ -1,10 +1,11 @@
 package gregicality.multiblocks.api.fluids;
 
-import gregicality.multiblocks.api.unification.material.GCYMMaterialIconTypes;
-import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;
+import static gregicality.multiblocks.api.utils.GCYMUtil.gcymId;
+
 import gregtech.api.fluids.store.FluidStorageKey;
 
-import static gregicality.multiblocks.api.utils.GCYMUtil.gcymId;
+import gregicality.multiblocks.api.unification.material.GCYMMaterialIconTypes;
+import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;
 
 public final class GCYMFluidStorageKeys {
 

diff --git a/src/main/java/gregicality/multiblocks/api/fluids/GeneratedFluidHandler.java b/src/main/java/gregicality/multiblocks/api/fluids/GeneratedFluidHandler.java
@@ -1,15 +1,14 @@
 package gregicality.multiblocks.api.fluids;
 
-import gregtech.api.fluids.FluidBuilder;
-import gregtech.api.fluids.store.FluidStorageKeys;
-import gregtech.api.unification.material.properties.FluidProperty;
-
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import gregtech.api.GregTechAPI;
+import gregtech.api.fluids.FluidBuilder;
+import gregtech.api.fluids.store.FluidStorageKeys;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.properties.BlastProperty;
+import gregtech.api.unification.material.properties.FluidProperty;
 import gregtech.api.unification.material.properties.PropertyKey;
 
 import gregicality.multiblocks.api.unification.GCYMMaterialFlags;

diff --git a/...in/java/gregicality/multiblocks/api/metatileentity/GCYMRecipeMapMultiblockController.java b/...in/java/gregicality/multiblocks/api/metatileentity/GCYMRecipeMapMultiblockController.java
@@ -2,16 +2,11 @@
 
 import java.util.List;
 
-import gregtech.api.metatileentity.multiblock.MultiblockDisplayText;
-import gregtech.api.util.GTUtility;
-import gregtech.api.util.TextComponentUtil;
-import gregtech.api.util.TextFormattingUtil;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentTranslation;
-import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 
 import org.jetbrains.annotations.NotNull;
@@ -20,8 +15,10 @@
 import gregtech.api.GTValues;
 import gregtech.api.metatileentity.ITieredMetaTileEntity;
 import gregtech.api.metatileentity.multiblock.MultiMapMultiblockController;
+import gregtech.api.metatileentity.multiblock.MultiblockDisplayText;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.recipes.RecipeMap;
+import gregtech.api.util.GTUtility;
 
 import gregicality.multiblocks.api.capability.IParallelMultiblock;
 import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic;
@@ -62,7 +59,8 @@ protected void addDisplayText(List<ITextComponent> textList) {
                             long maxVoltage = Math.min(GTValues.V[list.get(0).getTier()],
                                     Math.max(energyContainer.getInputVoltage(), energyContainer.getOutputVoltage()));
                             String voltageName = GTValues.VNF[list.get(0).getTier()];
-                            tl.add(new TextComponentTranslation("gcym.multiblock.tiered_hatch.tooltip", maxVoltage, voltageName));
+                            tl.add(new TextComponentTranslation("gcym.multiblock.tiered_hatch.tooltip", maxVoltage,
+                                    voltageName));
                         }
                     }
                 })

diff --git a/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/AlloyBlastRecipeProducer.java b/src/main/java/gregicality/multiblocks/api/recipes/alloyblast/AlloyBlastRecipeProducer.java
@@ -1,13 +1,12 @@
 package gregicality.multiblocks.api.recipes.alloyblast;
 
-import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys;
-import gregtech.api.fluids.store.FluidStorageKeys;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import org.jetbrains.annotations.NotNull;
 
 import gregtech.api.GTValues;
+import gregtech.api.fluids.store.FluidStorageKeys;
 import gregtech.api.recipes.RecipeBuilder;
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.recipes.builders.BlastRecipeBuilder;
@@ -21,6 +20,7 @@
 import gregtech.common.items.MetaItems;
 import gregtech.loaders.recipe.CraftingComponent;
 
+import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys;
 import gregicality.multiblocks.api.recipes.GCYMRecipeMaps;
 import gregicality.multiblocks.api.unification.GCYMMaterialFlags;
 
@@ -31,8 +31,8 @@ public class AlloyBlastRecipeProducer {
     /**
      * Generates alloy blast recipes for a material
      *
-     * @param material           the material to generate for
-     * @param blastProperty      the blast property of the material
+     * @param material      the material to generate for
+     * @param blastProperty the blast property of the material
      */
     public void produce(@NotNull Material material, @NotNull BlastProperty blastProperty) {
         // do not generate for disabled materials

diff --git a/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterialFlagAddition.java b/src/main/java/gregicality/multiblocks/api/unification/GCYMMaterialFlagAddition.java
@@ -1,12 +1,13 @@
 package gregicality.multiblocks.api.unification;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.info.MaterialFlags;
 
 import gregicality.multiblocks.api.recipes.alloyblast.CustomAlloyBlastRecipeProducer;
 import gregicality.multiblocks.api.unification.properties.AlloyBlastProperty;
 import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;
-import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.Internal
 public final class GCYMMaterialFlagAddition {

diff --git a/src/main/java/gregicality/multiblocks/api/unification/properties/AlloyBlastProperty.java b/src/main/java/gregicality/multiblocks/api/unification/properties/AlloyBlastProperty.java
@@ -1,15 +1,14 @@
 package gregicality.multiblocks.api.unification.properties;
 
-import gregtech.api.unification.material.Material;
-import gregtech.api.unification.ore.OrePrefix;
-
 import org.jetbrains.annotations.NotNull;
 
 import com.google.common.base.Preconditions;
 
+import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.properties.IMaterialProperty;
 import gregtech.api.unification.material.properties.MaterialProperties;
 import gregtech.api.unification.material.properties.PropertyKey;
+import gregtech.api.unification.ore.OrePrefix;
 
 import gregicality.multiblocks.api.recipes.alloyblast.AlloyBlastRecipeProducer;
 

diff --git a/src/main/java/gregicality/multiblocks/common/GCYMEventHandlers.java b/src/main/java/gregicality/multiblocks/common/GCYMEventHandlers.java
@@ -1,18 +1,19 @@
 package gregicality.multiblocks.common;
 
-import gregicality.multiblocks.api.fluids.GeneratedFluidHandler;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import gregtech.api.unification.material.event.MaterialEvent;
 import gregtech.api.unification.material.event.PostMaterialEvent;
 
 import gregicality.multiblocks.GregicalityMultiblocks;
+import gregicality.multiblocks.api.fluids.GeneratedFluidHandler;
 import gregicality.multiblocks.api.unification.GCYMMaterialFlagAddition;
 import gregicality.multiblocks.api.unification.GCYMMaterials;
 import gregicality.multiblocks.api.unification.properties.AlloyBlastPropertyAddition;
-import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.Internal
 @Mod.EventBusSubscriber(modid = GregicalityMultiblocks.MODID)

diff --git a/...tiblocks/common/metatileentities/multiblock/standard/MetaTileEntityAlloyBlastSmelter.java b/...tiblocks/common/metatileentities/multiblock/standard/MetaTileEntityAlloyBlastSmelter.java
@@ -4,18 +4,13 @@
 import java.util.Comparator;
 import java.util.List;
 
-import gregtech.api.metatileentity.multiblock.MultiblockDisplayText;
-import gregtech.api.util.TextComponentUtil;
-import gregtech.api.util.TextFormattingUtil;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.Style;
-import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 
@@ -31,6 +26,7 @@
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
+import gregtech.api.metatileentity.multiblock.MultiblockDisplayText;
 import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
@@ -39,6 +35,8 @@
 import gregtech.api.recipes.Recipe;
 import gregtech.api.recipes.recipeproperties.TemperatureProperty;
 import gregtech.api.util.GTUtility;
+import gregtech.api.util.TextComponentUtil;
+import gregtech.api.util.TextFormattingUtil;
 import gregtech.client.renderer.ICubeRenderer;
 import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer;
 import gregtech.common.ConfigHolder;

diff --git a/...multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAssembler.java b/...multiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeAssembler.java
@@ -2,7 +2,8 @@
 
 import static gregtech.api.util.RelativeDirection.*;
 
-import gregtech.api.metatileentity.multiblock.MultiblockAbility;
+import java.util.List;
+
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
@@ -11,10 +12,12 @@
 import net.minecraftforge.fml.common.Loader;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockPart;
+import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
 import gregtech.api.recipes.RecipeMap;
@@ -29,9 +32,6 @@
 import gregicality.multiblocks.api.render.GCYMTextures;
 import gregicality.multiblocks.common.block.GCYMMetaBlocks;
 import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
 
 public class MetaTileEntityLargeAssembler extends GCYMRecipeMapMultiblockController {
 

diff --git a/...ocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCircuitAssembler.java b/...ocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeCircuitAssembler.java
@@ -2,18 +2,21 @@
 
 import static gregtech.api.util.RelativeDirection.*;
 
-import gregtech.api.metatileentity.multiblock.MultiblockAbility;
+import java.util.List;
+
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-
 import net.minecraft.world.World;
+
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockPart;
+import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
 import gregtech.api.recipes.RecipeMaps;
@@ -28,9 +31,6 @@
 import gregicality.multiblocks.api.render.GCYMTextures;
 import gregicality.multiblocks.common.block.GCYMMetaBlocks;
 import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
 
 public class MetaTileEntityLargeCircuitAssembler extends GCYMRecipeMapMultiblockController {
 

diff --git a/...ltiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaBlastFurnace.java b/...ltiblocks/common/metatileentities/multiblock/standard/MetaTileEntityMegaBlastFurnace.java
@@ -4,18 +4,11 @@
 
 import java.util.List;
 
-import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility;
-import gregicality.multiblocks.common.GCYMConfigHolder;
-import gregtech.api.metatileentity.ITieredMetaTileEntity;
-import gregtech.api.metatileentity.multiblock.MultiblockDisplayText;
-import gregtech.api.util.TextComponentUtil;
-import gregtech.api.util.TextFormattingUtil;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
@@ -27,10 +20,12 @@
 import gregtech.api.block.IHeatingCoilBlockStats;
 import gregtech.api.capability.IHeatingCoil;
 import gregtech.api.capability.IMufflerHatch;
+import gregtech.api.metatileentity.ITieredMetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
+import gregtech.api.metatileentity.multiblock.MultiblockDisplayText;
 import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
@@ -42,14 +37,18 @@
 import gregtech.api.recipes.recipeproperties.TemperatureProperty;
 import gregtech.api.unification.material.Materials;
 import gregtech.api.util.GTUtility;
+import gregtech.api.util.TextComponentUtil;
+import gregtech.api.util.TextFormattingUtil;
 import gregtech.client.renderer.ICubeRenderer;
 import gregtech.client.renderer.texture.Textures;
 import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer;
 import gregtech.common.blocks.*;
 
 import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic;
+import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility;
 import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController;
 import gregicality.multiblocks.api.render.GCYMTextures;
+import gregicality.multiblocks.common.GCYMConfigHolder;
 import gregicality.multiblocks.common.block.GCYMMetaBlocks;
 import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing;
 import gregicality.multiblocks.common.block.blocks.BlockUniqueCasing;
@@ -82,7 +81,8 @@ protected void addDisplayText(List<ITextComponent> textList) {
                             long maxVoltage = Math.min(GTValues.V[list.get(0).getTier()],
                                     Math.max(energyContainer.getInputVoltage(), energyContainer.getOutputVoltage()));
                             String voltageName = GTValues.VNF[list.get(0).getTier()];
-                            tl.add(new TextComponentTranslation("gcym.multiblock.tiered_hatch.tooltip", maxVoltage, voltageName));
+                            tl.add(new TextComponentTranslation("gcym.multiblock.tiered_hatch.tooltip", maxVoltage,
+                                    voltageName));
                         }
                     }
                 })

diff --git a/src/test/java/gregicality/multiblocks/Bootstrap.java b/src/test/java/gregicality/multiblocks/Bootstrap.java
@@ -7,9 +7,6 @@
 import java.util.List;
 import java.util.Set;
 
-import gregtech.api.fluids.GTFluidRegistration;
-import gregtech.api.unification.material.registry.MarkerMaterialRegistry;
-import gregtech.modules.ModuleManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.resources.Locale;
 import net.minecraft.network.INetHandler;
@@ -24,11 +21,14 @@
 
 import gregtech.api.GTValues;
 import gregtech.api.GregTechAPI;
+import gregtech.api.fluids.GTFluidRegistration;
 import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.materials.MaterialFlagAddition;
+import gregtech.api.unification.material.registry.MarkerMaterialRegistry;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.common.items.MetaItems;
 import gregtech.core.unification.material.internal.MaterialRegistryManager;
+import gregtech.modules.ModuleManager;
 
 import gregicality.multiblocks.api.fluids.GeneratedFluidHandler;
 import gregicality.multiblocks.api.unification.GCYMMaterialFlagAddition;