diff options
Diffstat (limited to 'src/Java/gtPlusPlus/api')
11 files changed, 32 insertions, 30 deletions
diff --git a/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java b/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java index ecde9fe930..f35c9cbc6b 100644 --- a/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java +++ b/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java @@ -1,11 +1,12 @@ package gtPlusPlus.api.damage; -import gtPlusPlus.core.world.damage.BaseCustomDamageSource; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IChatComponent; +import gtPlusPlus.core.world.damage.BaseCustomDamageSource; + public class DamageTeslaTower extends BaseCustomDamageSource{ public DamageTeslaTower(Entity transmitter) { diff --git a/src/Java/gtPlusPlus/api/enums/Quality.java b/src/Java/gtPlusPlus/api/enums/Quality.java index 0c59cd58fb..050f335b5e 100644 --- a/src/Java/gtPlusPlus/api/enums/Quality.java +++ b/src/Java/gtPlusPlus/api/enums/Quality.java @@ -1,8 +1,9 @@ package gtPlusPlus.api.enums; -import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.util.EnumChatFormatting; +import gtPlusPlus.core.util.math.MathUtils; + public enum Quality { // Magic Blue diff --git a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java index b1398f1367..0acee40a0f 100644 --- a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java +++ b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java @@ -1,10 +1,12 @@ package gtPlusPlus.api.helpers; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; + import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; public class MaterialHelper { diff --git a/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java b/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java index 12813e1dd0..5ab90d47ce 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java +++ b/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java @@ -1,10 +1,11 @@ package gtPlusPlus.api.interfaces; -import gtPlusPlus.api.objects.minecraft.BlockPos; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import gtPlusPlus.api.objects.minecraft.BlockPos; + public interface IEntityCatcher { public boolean hasEntity(ItemStack aStack); diff --git a/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java index de639c6bae..5f624e7a8c 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ b/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java @@ -1,17 +1,15 @@ package gtPlusPlus.api.interfaces; -import gregtech.api.interfaces.IDescribable; -import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; -import gregtech.api.interfaces.tileentity.IGearEnergyTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.interfaces.tileentity.ITurnable; -import gtPlusPlus.core.tileentities.base.TilePoweredGT; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import gregtech.api.interfaces.IDescribable; +import gregtech.api.interfaces.tileentity.*; + +import gtPlusPlus.core.tileentities.base.TilePoweredGT; + public abstract interface IGregtechPower extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer { @Override diff --git a/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java b/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java index 3a4b8f188c..47e692bffb 100644 --- a/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java +++ b/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java @@ -1,8 +1,9 @@ package gtPlusPlus.api.interfaces; +import net.minecraft.block.Block; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; -import net.minecraft.block.Block; public interface ITexturedBlock extends ITexturedTileEntity{ diff --git a/src/Java/gtPlusPlus/api/objects/Logger.java b/src/Java/gtPlusPlus/api/objects/Logger.java index 1ecdaa9e86..2c50f0c15e 100644 --- a/src/Java/gtPlusPlus/api/objects/Logger.java +++ b/src/Java/gtPlusPlus/api/objects/Logger.java @@ -4,6 +4,7 @@ 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.core.proxy.ClientProxy; diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java index d38acdd8cd..7ee71e7c9f 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -4,9 +4,10 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import gtPlusPlus.api.objects.data.AutoMap; import net.minecraft.block.Block; import net.minecraft.world.World; + +import gtPlusPlus.api.objects.data.AutoMap; import net.minecraftforge.common.DimensionManager; public class BlockPos implements Serializable{ diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java b/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java index b411e8875a..82f3adfc9e 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java +++ b/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java @@ -8,31 +8,25 @@ */ package gtPlusPlus.api.objects.minecraft; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Triplet; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.ConcurrentHashMap; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.entity.Entity; +import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.Triplet; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.LoadingCallback; -import net.minecraftforge.common.ForgeChunkManager.OrderedLoadingCallback; -import net.minecraftforge.common.ForgeChunkManager.Ticket; -import net.minecraftforge.common.ForgeChunkManager.Type; +import net.minecraftforge.common.ForgeChunkManager.*; import net.minecraftforge.event.entity.EntityEvent; /** diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index d5922242f4..2535046792 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -1,6 +1,7 @@ package gtPlusPlus.api.objects.minecraft; import gregtech.api.GregTech_API; + import gtPlusPlus.core.lib.CORE; import net.minecraftforge.fluids.Fluid; diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java b/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java index f5db1d9e3a..9c1b231961 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java +++ b/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java @@ -1,6 +1,7 @@ package gtPlusPlus.api.objects.minecraft; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidStack; public class GenericStack { |