diff options
Diffstat (limited to 'src')
45 files changed, 114 insertions, 134 deletions
diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java index 18def75a9e..58a30cd14d 100644 --- a/src/main/java/client/ClientProxy.java +++ b/src/main/java/client/ClientProxy.java @@ -1,14 +1,13 @@ package client; -import client.renderer.TESR_BeamTransmitter; -import client.renderer.TESR_SECapacitor; -import client.renderer.TESR_SETether; - import common.CommonProxy; import common.tileentities.TE_BeamTransmitter; import common.tileentities.TE_SpaceElevatorCapacitor; import common.tileentities.TE_SpaceElevatorTether; +import client.renderer.TESR_BeamTransmitter; +import client.renderer.TESR_SECapacitor; +import client.renderer.TESR_SETether; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java index 2a673f16db..d98417f686 100644 --- a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java +++ b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java @@ -1,7 +1,5 @@ package client.gui; -import kekztech.KekzCore; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -15,6 +13,8 @@ import org.lwjgl.opengl.GL11; import common.container.Container_ItemProxyEndpoint; +import kekztech.KekzCore; + public class Gui_ItemProxyEndpoint extends GuiContainer { private final ResourceLocation texture = new ResourceLocation( diff --git a/src/main/java/client/gui/Gui_ItemProxySource.java b/src/main/java/client/gui/Gui_ItemProxySource.java index 1c1b0171e6..8618ff828f 100644 --- a/src/main/java/client/gui/Gui_ItemProxySource.java +++ b/src/main/java/client/gui/Gui_ItemProxySource.java @@ -1,7 +1,5 @@ package client.gui; -import kekztech.KekzCore; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -15,6 +13,8 @@ import org.lwjgl.opengl.GL11; import common.container.Container_ItemProxySource; +import kekztech.KekzCore; + public class Gui_ItemProxySource extends GuiContainer { private final ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTech4by4.png"); diff --git a/src/main/java/client/gui/KT_UITextures.java b/src/main/java/client/gui/KT_UITextures.java index ffca0b6813..5e7cf2981a 100644 --- a/src/main/java/client/gui/KT_UITextures.java +++ b/src/main/java/client/gui/KT_UITextures.java @@ -1,9 +1,9 @@ package client.gui; -import kekztech.KekzCore; - import com.gtnewhorizons.modularui.api.drawable.UITexture; +import kekztech.KekzCore; + public class KT_UITextures { public static final UITexture OVERLAY_BUTTON_WIRELESS_ON = UITexture diff --git a/src/main/java/client/renderer/TESR_BeamTransmitter.java b/src/main/java/client/renderer/TESR_BeamTransmitter.java index 0028c53476..e6e31f80d5 100644 --- a/src/main/java/client/renderer/TESR_BeamTransmitter.java +++ b/src/main/java/client/renderer/TESR_BeamTransmitter.java @@ -1,7 +1,5 @@ package client.renderer; -import kekztech.KekzCore; - import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -13,6 +11,8 @@ import org.lwjgl.opengl.GL11; import common.tileentities.TE_BeamTransmitter; +import kekztech.KekzCore; + public class TESR_BeamTransmitter extends TileEntitySpecialRenderer { private static final ResourceLocation beamTexture = new ResourceLocation( diff --git a/src/main/java/client/renderer/TESR_SECapacitor.java b/src/main/java/client/renderer/TESR_SECapacitor.java index c4aed65e3d..0da33dee66 100644 --- a/src/main/java/client/renderer/TESR_SECapacitor.java +++ b/src/main/java/client/renderer/TESR_SECapacitor.java @@ -1,7 +1,5 @@ package client.renderer; -import kekztech.KekzCore; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -9,6 +7,8 @@ import net.minecraft.util.ResourceLocation; import common.tileentities.TE_SpaceElevatorCapacitor; +import kekztech.KekzCore; + public class TESR_SECapacitor extends TileEntitySpecialRenderer { private static final ResourceLocation capSide = new ResourceLocation( diff --git a/src/main/java/client/renderer/TESR_SETether.java b/src/main/java/client/renderer/TESR_SETether.java index 18672b21c9..5d5c0581c1 100644 --- a/src/main/java/client/renderer/TESR_SETether.java +++ b/src/main/java/client/renderer/TESR_SETether.java @@ -1,7 +1,5 @@ package client.renderer; -import kekztech.KekzCore; - import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -10,6 +8,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import kekztech.KekzCore; + public class TESR_SETether extends TileEntitySpecialRenderer { private static final ResourceLocation tetherBeamTexture = new ResourceLocation( diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index 3fccd0604c..f43482b909 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -1,7 +1,5 @@ package common; -import kekztech.KekzCore; - import net.minecraft.block.Block; import common.blocks.Block_GDCUnit; @@ -12,6 +10,8 @@ import common.blocks.Block_TFFTStorageField; import common.blocks.Block_ThaumiumReinforcedJar; import common.blocks.Block_YSZUnit; +import kekztech.KekzCore; + public class Blocks { public static Block yszUnit; diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java index f04e7052c5..3af1fd1671 100644 --- a/src/main/java/common/CommonProxy.java +++ b/src/main/java/common/CommonProxy.java @@ -1,9 +1,5 @@ package common; -import kekztech.GuiHandler; -import kekztech.Items; -import kekztech.KekzCore; - import common.items.ErrorItem; import common.items.MetaItem_CraftingComponent; import common.items.MetaItem_ReactorComponent; @@ -14,6 +10,9 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import gregtech.api.GregTech_API; +import kekztech.GuiHandler; +import kekztech.Items; +import kekztech.KekzCore; public class CommonProxy { diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 21149e1406..97a053f938 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -4,16 +4,8 @@ import static gregtech.api.enums.Mods.ThaumicTinkerer; import java.util.HashMap; -import kekztech.KekzCore; - import net.minecraft.item.ItemStack; -import thaumcraft.api.ItemApi; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.InfusionRecipe; - import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer; import common.recipeLoaders.AlloySmelter; import common.recipeLoaders.Assembler; @@ -30,6 +22,12 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; +import kekztech.KekzCore; +import thaumcraft.api.ItemApi; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.InfusionRecipe; public class Recipes { diff --git a/src/main/java/common/Researches.java b/src/main/java/common/Researches.java index 76f47bdd9d..853b9dba6b 100644 --- a/src/main/java/common/Researches.java +++ b/src/main/java/common/Researches.java @@ -1,9 +1,8 @@ package common; -import kekztech.KekzCore; - import net.minecraft.item.ItemStack; +import kekztech.KekzCore; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java index 9925e7aa27..9ad4fdb99f 100644 --- a/src/main/java/common/TileEntities.java +++ b/src/main/java/common/TileEntities.java @@ -10,6 +10,7 @@ import common.tileentities.TE_IchorJar; import common.tileentities.TE_IchorVoidJar; import common.tileentities.TE_ThaumiumReinforcedJar; import common.tileentities.TE_ThaumiumReinforcedVoidJar; + import cpw.mods.fml.common.registry.GameRegistry; public class TileEntities { diff --git a/src/main/java/common/blocks/Block_BeamTransmitter.java b/src/main/java/common/blocks/Block_BeamTransmitter.java index 9ed0233322..48bedd3b7f 100644 --- a/src/main/java/common/blocks/Block_BeamTransmitter.java +++ b/src/main/java/common/blocks/Block_BeamTransmitter.java @@ -1,7 +1,5 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -9,7 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import common.tileentities.TE_BeamTransmitter; + import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; public class Block_BeamTransmitter extends Block { diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java index 3cbd544d50..7c86c9910f 100644 --- a/src/main/java/common/blocks/Block_ControlRod.java +++ b/src/main/java/common/blocks/Block_ControlRod.java @@ -1,12 +1,11 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; public class Block_ControlRod extends BaseGTUpdateableBlock { diff --git a/src/main/java/common/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java index ebf2714d61..27bc95759d 100644 --- a/src/main/java/common/blocks/Block_GDCUnit.java +++ b/src/main/java/common/blocks/Block_GDCUnit.java @@ -1,12 +1,11 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; public class Block_GDCUnit extends BaseGTUpdateableBlock { diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java index 2328458d2d..7a8596eb0d 100644 --- a/src/main/java/common/blocks/Block_IchorJar.java +++ b/src/main/java/common/blocks/Block_IchorJar.java @@ -15,14 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.blocks.BlockJar; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; -import thaumcraft.common.items.ItemEssence; -import thaumcraft.common.tiles.TileJarFillable; - import common.itemBlocks.IB_IchorJar; import common.tileentities.TE_IchorJar; import common.tileentities.TE_IchorVoidJar; @@ -30,6 +22,13 @@ import common.tileentities.TE_IchorVoidJar; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.blocks.BlockJar; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; +import thaumcraft.common.items.ItemEssence; +import thaumcraft.common.tiles.TileJarFillable; public class Block_IchorJar extends BlockJar { diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java index bd8511d41e..cf9307dde0 100644 --- a/src/main/java/common/blocks/Block_ItemProxyCable.java +++ b/src/main/java/common/blocks/Block_ItemProxyCable.java @@ -1,21 +1,19 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import client.renderer.ConduitRenderer; - import common.itemBlocks.IB_ItemProxyCable; import common.tileentities.TE_ItemProxyCable; +import client.renderer.ConduitRenderer; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import kekztech.KekzCore; public class Block_ItemProxyCable extends Block { diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java index 41ae802b8e..5f60eba040 100644 --- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java +++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java @@ -1,8 +1,5 @@ package common.blocks; -import kekztech.GuiHandler; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -12,7 +9,10 @@ import net.minecraft.world.World; import common.itemBlocks.IB_ItemProxyEndpoint; import common.tileentities.TE_ItemProxyEndpoint; + import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.GuiHandler; +import kekztech.KekzCore; public class Block_ItemProxyEndpoint extends Block { diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java index 65e9d6b0ef..7ab34ade52 100644 --- a/src/main/java/common/blocks/Block_ItemProxySource.java +++ b/src/main/java/common/blocks/Block_ItemProxySource.java @@ -1,8 +1,5 @@ package common.blocks; -import kekztech.GuiHandler; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -12,7 +9,10 @@ import net.minecraft.world.World; import common.itemBlocks.IB_ItemProxySource; import common.tileentities.TE_ItemProxySource; + import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.GuiHandler; +import kekztech.KekzCore; public class Block_ItemProxySource extends Block { diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java index 937483eec2..3c8b29c3cc 100644 --- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java +++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java @@ -1,12 +1,11 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock { diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java index a140c1f1d7..7a894561ae 100644 --- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java +++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java @@ -1,12 +1,11 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock { diff --git a/src/main/java/common/blocks/Block_SpaceElevator.java b/src/main/java/common/blocks/Block_SpaceElevator.java index 286735767a..2f491db0a4 100644 --- a/src/main/java/common/blocks/Block_SpaceElevator.java +++ b/src/main/java/common/blocks/Block_SpaceElevator.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import common.itemBlocks.IB_SpaceElevator; + import cpw.mods.fml.common.registry.GameRegistry; public class Block_SpaceElevator extends BaseGTUpdateableBlock { diff --git a/src/main/java/common/blocks/Block_SpaceElevatorTether.java b/src/main/java/common/blocks/Block_SpaceElevatorTether.java index e7d8a2e6c1..c6ed0f54b0 100644 --- a/src/main/java/common/blocks/Block_SpaceElevatorTether.java +++ b/src/main/java/common/blocks/Block_SpaceElevatorTether.java @@ -9,6 +9,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import common.tileentities.TE_SpaceElevatorTether; + import cpw.mods.fml.common.registry.GameRegistry; public class Block_SpaceElevatorTether extends BaseGTUpdateableBlock { diff --git a/src/main/java/common/blocks/Block_TFFTStorageField.java b/src/main/java/common/blocks/Block_TFFTStorageField.java index e36f15b4c6..46ecd8ee62 100644 --- a/src/main/java/common/blocks/Block_TFFTStorageField.java +++ b/src/main/java/common/blocks/Block_TFFTStorageField.java @@ -2,8 +2,6 @@ package common.blocks; import java.util.List; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,6 +20,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Utility; +import kekztech.KekzCore; public class Block_TFFTStorageField extends BaseGTUpdateableBlock { diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java index 53026e1ac3..e089e2a1c2 100644 --- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java +++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java @@ -15,14 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.blocks.BlockJar; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; -import thaumcraft.common.items.ItemEssence; -import thaumcraft.common.tiles.TileJarFillable; - import common.itemBlocks.IB_ThaumiumReinforcedJar; import common.tileentities.TE_ThaumiumReinforcedJar; import common.tileentities.TE_ThaumiumReinforcedVoidJar; @@ -30,6 +22,13 @@ import common.tileentities.TE_ThaumiumReinforcedVoidJar; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.blocks.BlockJar; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; +import thaumcraft.common.items.ItemEssence; +import thaumcraft.common.tiles.TileJarFillable; public class Block_ThaumiumReinforcedJar extends BlockJar { diff --git a/src/main/java/common/blocks/Block_YSZUnit.java b/src/main/java/common/blocks/Block_YSZUnit.java index b94c9c53d7..312d3250a4 100644 --- a/src/main/java/common/blocks/Block_YSZUnit.java +++ b/src/main/java/common/blocks/Block_YSZUnit.java @@ -1,12 +1,11 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; public class Block_YSZUnit extends BaseGTUpdateableBlock { diff --git a/src/main/java/common/container/Container_ModularNuclearReactor.java b/src/main/java/common/container/Container_ModularNuclearReactor.java index 5596e88261..d3a06a2f61 100644 --- a/src/main/java/common/container/Container_ModularNuclearReactor.java +++ b/src/main/java/common/container/Container_ModularNuclearReactor.java @@ -5,8 +5,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import reactor.ButtonSlot; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import reactor.ButtonSlot; public class Container_ModularNuclearReactor extends Container { diff --git a/src/main/java/common/items/ErrorItem.java b/src/main/java/common/items/ErrorItem.java index 6558ababb4..997686a114 100644 --- a/ |