Imports

GTNewHorizons · Oct 18, 2023 · 2b0a342 · 2b0a342
1 parent 4fbef99
commit 2b0a342
Show file tree

Hide file tree

Showing 556 changed files with 4,287 additions and 4,867 deletions.
diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -1,18 +1,5 @@
 package gtPlusPlus;
 
-import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.enums.Mods.Names;
-import static gregtech.api.enums.Mods.Thaumcraft;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.HashMap;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.launchwrapper.Launch;
-
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.SidedProxy;
@@ -52,6 +39,18 @@
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells;
 import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.launchwrapper.Launch;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.HashMap;
+
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.Names;
+import static gregtech.api.enums.Mods.Thaumcraft;
+import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
 
 @Mod(
         modid = Names.G_T_PLUS_PLUS,

diff --git a/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java
@@ -1,9 +1,8 @@
 package gtPlusPlus.api.interfaces;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public interface ILazyCoverable extends ICoverable {
 

diff --git a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java
@@ -1,10 +1,9 @@
 package gtPlusPlus.api.interfaces;
 
-import net.minecraft.block.Block;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
+import net.minecraft.block.Block;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public interface ITexturedBlock extends ITexturedTileEntity {
 

diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java
@@ -1,12 +1,11 @@
 package gtPlusPlus.api.objects;
 
-import org.apache.logging.log4j.LogManager;
-
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.preloader.asm.AsmConfig;
+import org.apache.logging.log4j.LogManager;
 
 public class Logger {
 

diff --git a/src/main/java/gtPlusPlus/api/objects/data/Pair.java b/src/main/java/gtPlusPlus/api/objects/data/Pair.java
@@ -1,9 +1,9 @@
 package gtPlusPlus.api.objects.data;
 
-import java.io.Serializable;
-
 import com.google.common.base.Objects;
 
+import java.io.Serializable;
+
 public class Pair<K, V> implements Serializable {
 
     /**

diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java
@@ -1,13 +1,13 @@
 package gtPlusPlus.api.objects.data;
 
+import gtPlusPlus.api.objects.Logger;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
-import gtPlusPlus.api.objects.Logger;
-
 public class TypeCounter<V> implements Set<V> {
 
     private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<>();

diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java
@@ -1,14 +1,14 @@
 package gtPlusPlus.api.objects.data;
 
+import gregtech.api.objects.XSTR;
+
 import java.util.Collection;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeMap;
 
-import gregtech.api.objects.XSTR;
-
 public class WeightedCollection<E> implements Map<Integer, E> {
 
     private NavigableMap<Integer, E> map = new TreeMap<>();

diff --git a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java
@@ -1,9 +1,9 @@
 package gtPlusPlus.api.objects.data.weakref;
 
-import java.util.WeakHashMap;
-
 import gtPlusPlus.api.objects.data.AutoMap;
 
+import java.util.WeakHashMap;
+
 public class WeakAutoMap<T> extends AutoMap<T> {
 
     private static final long serialVersionUID = 8328345351801363386L;

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java b/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java
@@ -1,11 +1,10 @@
 package gtPlusPlus.api.objects.minecraft;
 
+import gtPlusPlus.core.util.minecraft.EntityUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-
 /**
  * Generates an AABB around an entity.
  * 

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java
@@ -1,16 +1,15 @@
 package gtPlusPlus.api.objects.minecraft;
 
-import java.util.ArrayList;
-
+import gregtech.api.util.GT_Utility;
+import gregtech.common.covers.CoverInfo;
+import gtPlusPlus.core.tileentities.base.TileEntityBase;
+import gtPlusPlus.core.util.data.ArrayUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.util.GT_Utility;
-import gregtech.common.covers.CoverInfo;
-import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.data.ArrayUtils;
+import java.util.ArrayList;
 
 public class BTF_Inventory implements ISidedInventory {
 

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -1,16 +1,15 @@
 package gtPlusPlus.api.objects.minecraft;
 
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.api.objects.data.AutoMap;
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gtPlusPlus.api.objects.data.AutoMap;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
 
 public class BlockPos implements Serializable {
 

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java
@@ -1,8 +1,7 @@
 package gtPlusPlus.api.objects.minecraft;
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import gtPlusPlus.api.objects.data.AutoMap;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class CubicObject<T> {
 

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java
@@ -1,10 +1,9 @@
 package gtPlusPlus.api.objects.minecraft;
 
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
+import gregtech.api.GregTech_API;
 import net.minecraftforge.fluids.Fluid;
 
-import gregtech.api.GregTech_API;
+import static gregtech.api.enums.Mods.GTPlusPlus;
 
 public class FluidGT6 extends Fluid implements Runnable {
 

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java
@@ -1,11 +1,10 @@
 package gtPlusPlus.api.objects.minecraft;
 
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
 public class ItemStackData {
 
     protected final Item mItem;

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
@@ -1,13 +1,12 @@
 package gtPlusPlus.api.objects.minecraft;
 
-import java.util.HashMap;
-
-import net.minecraft.util.IIcon;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gtPlusPlus.core.util.Utils;
+import net.minecraft.util.IIcon;
+
+import java.util.HashMap;
 
 /**
  * A Server Side safe object that can hold {@link IIcon}s.

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
@@ -1,13 +1,12 @@
 package gtPlusPlus.api.objects.minecraft;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.ShapedOreRecipe;
 
 public class ShapedRecipe {
 

diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
@@ -1,8 +1,5 @@
 package gtPlusPlus.core.block;
 
-import net.minecraft.block.Block;
-import net.minecraftforge.fluids.Fluid;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.general.BlockCompressedObsidian;
 import gtPlusPlus.core.block.general.FluidTankInfinite;
@@ -19,6 +16,8 @@
 import gtPlusPlus.core.block.machine.Machine_SuperJukebox;
 import gtPlusPlus.core.block.machine.VolumetricFlaskSetter;
 import gtPlusPlus.core.fluids.FluidRegistryHandler;
+import net.minecraft.block.Block;
+import net.minecraftforge.fluids.Fluid;
 
 public final class ModBlocks {
 

diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -1,16 +1,15 @@
 package gtPlusPlus.core.block.base;
 
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.util.Utils;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.util.Utils;
+import static gregtech.api.enums.Mods.GTPlusPlus;
 
 public class BasicBlock extends BlockContainer {
 

diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -1,11 +1,18 @@
 package gtPlusPlus.core.block.base;
 
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
+import appeng.core.CreativeTab;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.api.objects.minecraft.SafeTexture;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -21,19 +28,11 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import appeng.core.CreativeTab;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.CubicObject;
-import gtPlusPlus.api.objects.minecraft.SafeTexture;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import static gregtech.api.enums.Mods.GTPlusPlus;
 
 public abstract class BasicTileBlockWithTooltip extends BlockContainer implements ITileTooltip {
 

diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
@@ -1,19 +1,5 @@
 package gtPlusPlus.core.block.base;
 
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.util.Random;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.BlockFluidClassic;
-import net.minecraftforge.fluids.Fluid;
-
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -24,6 +10,19 @@
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
 import gtPlusPlus.core.util.Utils;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.Fluid;
+
+import java.util.Random;
+
+import static gregtech.api.enums.Mods.GTPlusPlus;
 
 public class BlockBaseFluid extends BlockFluidClassic {