From 4ae129353506e574465b5a4eb3910e19d9044886 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 2 Jul 2015 19:51:24 +0100 Subject: [PATCH] Optimised all imports --- src/main/java/techreborn/Core.java | 32 ++++--- .../achievement/AchievementMod.java | 6 +- .../achievement/AchievementTriggerer.java | 4 +- .../achievement/TRAchievements.java | 2 +- src/main/java/techreborn/api/IpdaItem.java | 6 +- .../techreborn/api/RollingMachineRecipe.java | 8 +- .../java/techreborn/api/TechRebornAPI.java | 3 - .../IndustrialElectrolyzerRecipe.java | 2 - .../techreborn/blocks/BlockChunkLoader.java | 4 +- .../techreborn/blocks/BlockComputerCube.java | 4 +- .../techreborn/blocks/BlockDigitalChest.java | 4 +- .../blocks/BlockElectricCraftingTable.java | 4 +- .../techreborn/blocks/BlockFusionCoil.java | 4 +- .../blocks/BlockFusionControlComputer.java | 4 +- .../blocks/BlockHighlyAdvancedMachine.java | 4 +- .../techreborn/blocks/BlockMachineBase.java | 10 ++- .../techreborn/blocks/BlockMachineCasing.java | 12 +-- .../techreborn/blocks/BlockMachineFrame.java | 6 +- .../techreborn/blocks/BlockMetalShelf.java | 4 +- src/main/java/techreborn/blocks/BlockOre.java | 10 +-- .../techreborn/blocks/BlockQuantumChest.java | 4 +- .../techreborn/blocks/BlockQuantumTank.java | 4 +- .../java/techreborn/blocks/BlockStorage.java | 10 +-- .../java/techreborn/blocks/BlockStorage2.java | 12 +-- .../blocks/BlockSupercondensator.java | 4 +- .../techreborn/blocks/BlockWoodenshelf.java | 4 +- .../blocks/fluid/BlockFluidBase.java | 4 +- .../generator/BlockDieselGenerator.java | 9 +- .../generator/BlockDragonEggSiphoner.java | 9 +- .../blocks/generator/BlockGasTurbine.java | 9 +- .../blocks/generator/BlockHeatGenerator.java | 9 +- .../blocks/generator/BlockLightningRod.java | 9 +- .../generator/BlockMagicEnergyAbsorber.java | 9 +- .../generator/BlockMagicEnergyConverter.java | 9 +- .../generator/BlockPlasmaGenerator.java | 9 +- .../generator/BlockSemiFluidGenerator.java | 9 +- .../generator/BlockThermalGenerator.java | 9 +- .../blocks/machine/BlockAlloyFurnace.java | 4 +- .../blocks/machine/BlockAlloySmelter.java | 9 +- .../machine/BlockAssemblingMachine.java | 9 +- .../blocks/machine/BlockBlastFurnace.java | 9 +- .../blocks/machine/BlockCentrifuge.java | 9 +- .../blocks/machine/BlockChargeBench.java | 5 +- .../blocks/machine/BlockChemicalReactor.java | 9 +- .../machine/BlockDistillationTower.java | 9 +- .../blocks/machine/BlockGrinder.java | 9 +- .../machine/BlockImplosionCompressor.java | 9 +- .../machine/BlockIndustrialElectrolyzer.java | 9 +- .../machine/BlockIndustrialSawmill.java | 9 +- .../techreborn/blocks/machine/BlockLathe.java | 9 +- .../blocks/machine/BlockMatterFabricator.java | 9 +- .../machine/BlockPlateCuttingMachine.java | 9 +- .../blocks/machine/BlockRollingMachine.java | 9 +- .../blocks/machine/BlockVacuumFreezer.java | 9 +- .../techreborn/blocks/storage/BlockAesu.java | 4 +- .../techreborn/blocks/storage/BlockIDSU.java | 4 +- .../techreborn/blocks/storage/BlockLesu.java | 4 +- .../blocks/storage/BlockLesuStorage.java | 12 +-- .../blocks/storage/EUStorageTile.java | 3 - .../java/techreborn/client/GuiHandler.java | 84 ++++++++++++++++++- .../java/techreborn/client/IconSupplier.java | 2 +- .../techreborn/client/SlotFilteredVoid.java | 6 +- .../client/container/ContainerCentrifuge.java | 1 - .../container/ContainerChargeBench.java | 2 - .../client/container/ContainerPda.java | 4 - .../client/container/TechRebornContainer.java | 1 - .../java/techreborn/client/gui/GuiAesu.java | 1 - .../client/gui/GuiAlloyFurnace.java | 1 - .../client/gui/GuiAlloySmelter.java | 1 - .../client/gui/GuiAssemblingMachine.java | 1 - .../client/gui/GuiBlastFurnace.java | 1 - .../techreborn/client/gui/GuiCentrifuge.java | 1 - .../techreborn/client/gui/GuiChargeBench.java | 3 - .../client/gui/GuiChemicalReactor.java | 1 - .../client/gui/GuiDestructoPack.java | 5 -- .../techreborn/client/gui/GuiGasTurbine.java | 1 - .../client/gui/GuiImplosionCompressor.java | 2 - .../client/gui/GuiIndustrialElectrolyzer.java | 3 - .../client/gui/GuiIndustrialSawmill.java | 1 - .../java/techreborn/client/gui/GuiLathe.java | 1 - .../java/techreborn/client/gui/GuiLesu.java | 5 -- .../client/gui/GuiPlateCuttingMachine.java | 1 - .../client/gui/GuiSemifluidGenerator.java | 1 - .../java/techreborn/client/hud/ChargeHud.java | 16 ++-- .../client/keybindings/KeyBindings.java | 2 - .../keybindings/KeyInputEventHandler.java | 4 +- .../java/techreborn/cofhLib/gui/GuiBase.java | 12 +-- .../cofhLib/gui/element/ElementBase.java | 2 +- .../cofhLib/gui/element/ElementButton.java | 2 +- .../gui/element/ElementButtonManaged.java | 2 +- .../cofhLib/gui/element/ElementListBox.java | 5 +- .../cofhLib/gui/element/ElementSlider.java | 4 +- .../cofhLib/gui/element/ElementTextField.java | 12 ++- .../cofhLib/gui/element/TabBase.java | 2 +- .../element/listbox/ListBoxElementText.java | 2 +- .../java/techreborn/compat/CompatManager.java | 8 +- .../java/techreborn/compat/ee3/EmcValues.java | 1 - .../recipes/AlloySmelterRecipeHandler.java | 2 +- .../AssemblingMachineRecipeHandler.java | 2 +- .../recipes/BlastFurnaceRecipeHandler.java | 3 +- .../nei/recipes/CentrifugeRecipeHandler.java | 2 +- .../recipes/ChemicalReactorRecipeHandler.java | 2 +- .../nei/recipes/GrinderRecipeHandler.java | 4 +- .../ImplosionCompressorRecipeHandler.java | 2 +- .../IndustrialElectrolyzerRecipeHandler.java | 5 +- .../IndustrialSawmillRecipeHandler.java | 6 +- .../nei/recipes/LatheRecipeHandler.java | 2 +- .../PlateCuttingMachineRecipeHandler.java | 2 +- .../compat/recipes/RecipesForestry.java | 3 - .../techreborn/compat/recipes/RecipesIC2.java | 4 +- .../techreborn/config/ConfigTechReborn.java | 4 +- .../config/TechRebornConfigGui.java | 14 ++-- .../config/TechRebornGUIFactory.java | 6 +- src/main/java/techreborn/init/ModBlocks.java | 61 ++++++++++++-- src/main/java/techreborn/init/ModFluids.java | 2 +- src/main/java/techreborn/init/ModItems.java | 6 +- src/main/java/techreborn/init/ModParts.java | 1 - src/main/java/techreborn/init/ModRecipes.java | 25 +++++- .../techreborn/itemblocks/ItemBlockAesu.java | 2 - .../itemblocks/ItemBlockDigitalChest.java | 8 +- .../itemblocks/ItemBlockQuantumChest.java | 8 +- .../itemblocks/ItemBlockStorage.java | 1 - .../itemblocks/ItemBlockStorage2.java | 1 - src/main/java/techreborn/items/ItemCells.java | 4 +- .../java/techreborn/items/ItemCrushedOre.java | 6 +- src/main/java/techreborn/items/ItemDusts.java | 6 +- .../java/techreborn/items/ItemDustsSmall.java | 6 +- .../java/techreborn/items/ItemDustsTiny.java | 6 +- src/main/java/techreborn/items/ItemGems.java | 6 +- .../java/techreborn/items/ItemIngots.java | 6 +- .../techreborn/items/ItemLapotronicOrb.java | 11 +-- .../java/techreborn/items/ItemNuggets.java | 6 +- src/main/java/techreborn/items/ItemParts.java | 6 +- .../java/techreborn/items/ItemPlates.java | 6 +- .../items/ItemPurifiedCrushedOre.java | 6 +- src/main/java/techreborn/items/ItemRods.java | 6 +- .../java/techreborn/items/ItemUUmatter.java | 4 +- .../items/armor/ItemLapotronPack.java | 9 +- .../items/armor/ItemLithiumBatpack.java | 9 +- .../items/tools/ItemAdvancedDrill.java | 9 +- .../items/tools/ItemFluidbucket.java | 4 +- .../techreborn/items/tools/ItemHammer.java | 4 +- .../techreborn/items/tools/ItemOmniTool.java | 9 +- .../items/tools/ItemRockCutter.java | 12 +-- .../java/techreborn/lib/vecmath/Vecs3d.java | 10 +-- .../techreborn/lib/vecmath/Vecs3dCube.java | 4 +- .../multiblocks/MultiBlockCasing.java | 12 +-- .../techreborn/packets/PacketHandler.java | 21 +++-- .../java/techreborn/packets/SimplePacket.java | 6 +- .../pda/GuiButtonCustomTexture.java | 4 +- src/main/java/techreborn/pda/GuiPda.java | 7 +- .../java/techreborn/proxies/ClientProxy.java | 1 - src/main/java/techreborn/tiles/TileAesu.java | 3 - .../techreborn/tiles/TileAlloySmelter.java | 2 - .../tiles/TileAssemblingMachine.java | 2 - .../techreborn/tiles/TileBlastFurnace.java | 3 - .../techreborn/tiles/TileChargeBench.java | 8 -- .../techreborn/tiles/TileChemicalReactor.java | 2 - .../techreborn/tiles/TileDieselGenerator.java | 7 +- .../java/techreborn/tiles/TileGasTurbine.java | 13 ++- .../java/techreborn/tiles/TileGrinder.java | 7 +- .../techreborn/tiles/TileHeatGenerator.java | 2 - .../tiles/TileImplosionCompressor.java | 2 - .../tiles/TileIndustrialElectrolyzer.java | 2 - .../tiles/TileIndustrialSawmill.java | 6 +- src/main/java/techreborn/tiles/TileLathe.java | 3 - .../tiles/TilePlateCuttingMachine.java | 2 - .../tiles/TileSemifluidGenerator.java | 13 ++- .../tiles/TileThermalGenerator.java | 7 +- .../java/techreborn/tiles/lesu/TileLesu.java | 2 - .../java/techreborn/util/BucketHandler.java | 10 +-- src/main/java/techreborn/util/ItemUtils.java | 6 +- src/main/java/techreborn/util/LogHelper.java | 5 +- src/main/java/techreborn/util/OreDrop.java | 3 +- src/main/java/techreborn/util/OreDropSet.java | 3 +- .../java/techreborn/util/RecipeRemover.java | 4 +- .../java/techreborn/world/DungeonLoot.java | 3 +- src/main/java/techreborn/world/TROreGen.java | 6 +- 178 files changed, 585 insertions(+), 565 deletions(-) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 50e8ebbd8..3c1e6ae0e 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -1,11 +1,20 @@ package techreborn; -import java.io.File; - +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import erogenousbeef.coreTR.multiblock.MultiblockEventHandler; +import erogenousbeef.coreTR.multiblock.MultiblockServerTickHandler; import net.minecraftforge.common.MinecraftForge; - import org.apache.commons.lang3.time.StopWatch; - import techreborn.achievement.TRAchievements; import techreborn.api.recipe.RecipeHandler; import techreborn.client.GuiHandler; @@ -24,19 +33,8 @@ import techreborn.proxies.CommonProxy; import techreborn.tiles.idsu.IDSUManager; import techreborn.util.LogHelper; import techreborn.world.TROreGen; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import erogenousbeef.coreTR.multiblock.MultiblockEventHandler; -import erogenousbeef.coreTR.multiblock.MultiblockServerTickHandler; + +import java.io.File; @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS) public class Core { diff --git a/src/main/java/techreborn/achievement/AchievementMod.java b/src/main/java/techreborn/achievement/AchievementMod.java index ac9a99a7a..4d6d9e353 100644 --- a/src/main/java/techreborn/achievement/AchievementMod.java +++ b/src/main/java/techreborn/achievement/AchievementMod.java @@ -1,13 +1,13 @@ package techreborn.achievement; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import java.util.ArrayList; +import java.util.List; + public class AchievementMod extends Achievement { public static List achievements = new ArrayList(); diff --git a/src/main/java/techreborn/achievement/AchievementTriggerer.java b/src/main/java/techreborn/achievement/AchievementTriggerer.java index d69d93ad6..63c73ddaf 100644 --- a/src/main/java/techreborn/achievement/AchievementTriggerer.java +++ b/src/main/java/techreborn/achievement/AchievementTriggerer.java @@ -1,10 +1,10 @@ package techreborn.achievement; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; public class AchievementTriggerer { diff --git a/src/main/java/techreborn/achievement/TRAchievements.java b/src/main/java/techreborn/achievement/TRAchievements.java index 6368c2181..cb4d79fc1 100644 --- a/src/main/java/techreborn/achievement/TRAchievements.java +++ b/src/main/java/techreborn/achievement/TRAchievements.java @@ -1,11 +1,11 @@ package techreborn.achievement; +import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraftforge.common.AchievementPage; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; -import cpw.mods.fml.common.FMLCommonHandler; public class TRAchievements { diff --git a/src/main/java/techreborn/api/IpdaItem.java b/src/main/java/techreborn/api/IpdaItem.java index 9a1aa93d6..822f7e717 100644 --- a/src/main/java/techreborn/api/IpdaItem.java +++ b/src/main/java/techreborn/api/IpdaItem.java @@ -1,10 +1,6 @@ package techreborn.api; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public interface IpdaItem +public interface IpdaItem { //TODO } diff --git a/src/main/java/techreborn/api/RollingMachineRecipe.java b/src/main/java/techreborn/api/RollingMachineRecipe.java index bba9a1b7c..951437df5 100644 --- a/src/main/java/techreborn/api/RollingMachineRecipe.java +++ b/src/main/java/techreborn/api/RollingMachineRecipe.java @@ -1,9 +1,5 @@ package techreborn.api; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -13,6 +9,10 @@ import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.world.World; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class RollingMachineRecipe { private final List recipes = new ArrayList(); diff --git a/src/main/java/techreborn/api/TechRebornAPI.java b/src/main/java/techreborn/api/TechRebornAPI.java index 42f31b5bd..8caf1bf0c 100644 --- a/src/main/java/techreborn/api/TechRebornAPI.java +++ b/src/main/java/techreborn/api/TechRebornAPI.java @@ -1,9 +1,6 @@ package techreborn.api; -import java.util.ArrayList; - import net.minecraft.item.ItemStack; -import techreborn.util.ItemUtils; public final class TechRebornAPI { diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java index 3b741e98f..18475fc96 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java @@ -1,11 +1,9 @@ package techreborn.api.recipe.machines; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import techreborn.api.recipe.BaseRecipe; -import techreborn.tiles.TileGrinder; import techreborn.tiles.TileIndustrialElectrolyzer; public class IndustrialElectrolyzerRecipe extends BaseRecipe { diff --git a/src/main/java/techreborn/blocks/BlockChunkLoader.java b/src/main/java/techreborn/blocks/BlockChunkLoader.java index 3778e1aac..7f6841ef0 100644 --- a/src/main/java/techreborn/blocks/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/BlockChunkLoader.java @@ -1,5 +1,7 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +11,6 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileChunkLoader; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockChunkLoader extends BlockMachineBase{ diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index 45bfd753a..ebdcd2c7f 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -1,10 +1,10 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockComputerCube extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index 9e1453b19..0b72c9815 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -1,5 +1,7 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +11,6 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileDigitalChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockDigitalChest extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java index 79b05f879..9d3de6a62 100644 --- a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java +++ b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java @@ -1,10 +1,10 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockElectricCraftingTable extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index 0a9f4f407..73b7a97ac 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -1,10 +1,10 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockFusionCoil extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 80b6af897..5622bd4e5 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -1,10 +1,10 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockFusionControlComputer extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java index 7b6b336ff..1a084e83a 100644 --- a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java +++ b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java @@ -1,10 +1,10 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockHighlyAdvancedMachine extends BlockMachineBase{ diff --git a/src/main/java/techreborn/blocks/BlockMachineBase.java b/src/main/java/techreborn/blocks/BlockMachineBase.java index 44d4f2c64..768f67416 100644 --- a/src/main/java/techreborn/blocks/BlockMachineBase.java +++ b/src/main/java/techreborn/blocks/BlockMachineBase.java @@ -1,8 +1,10 @@ package techreborn.blocks; -import java.util.Random; - -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.BlockDynamicLiquid; +import net.minecraft.block.BlockLiquid; +import net.minecraft.block.BlockStaticLiquid; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureType; @@ -16,6 +18,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTab; +import java.util.Random; + public class BlockMachineBase extends BlockContainer { public BlockMachineBase(Material material) diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 1ed50e92d..9575122e1 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -1,8 +1,8 @@ package techreborn.blocks; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import erogenousbeef.coreTR.multiblock.BlockMultiblockBase; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -15,9 +15,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileMachineCasing; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import erogenousbeef.coreTR.multiblock.BlockMultiblockBase; + +import java.util.List; +import java.util.Random; public class BlockMachineCasing extends BlockMultiblockBase { diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index a4951ace1..daa7a5237 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -1,5 +1,7 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -7,15 +9,11 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import techreborn.client.TechRebornCreativeTab; -import techreborn.client.TechRebornCreativeTabMisc; import java.util.List; -import java.util.Random; public class BlockMachineFrame extends Block { diff --git a/src/main/java/techreborn/blocks/BlockMetalShelf.java b/src/main/java/techreborn/blocks/BlockMetalShelf.java index 397251afb..c3907f662 100644 --- a/src/main/java/techreborn/blocks/BlockMetalShelf.java +++ b/src/main/java/techreborn/blocks/BlockMetalShelf.java @@ -1,10 +1,10 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockMetalShelf extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 3c00c2d8f..e2412f47b 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -1,8 +1,7 @@ package techreborn.blocks; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,14 +14,15 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.client.TechRebornCreativeTabMisc; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import techreborn.init.ModBlocks; import techreborn.items.ItemDusts; import techreborn.items.ItemGems; import techreborn.util.OreDrop; import techreborn.util.OreDropSet; +import java.util.ArrayList; +import java.util.List; + public class BlockOre extends Block { public static ItemStack getOreByName(String name, int count) diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 20c5d6fe2..635c4f9ab 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -1,5 +1,7 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -15,8 +17,6 @@ import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileQuantumChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockQuantumChest extends BlockContainer { diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index f8ad7c4c0..f077c7221 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -1,5 +1,7 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +11,6 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileQuantumTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockQuantumTank extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index 12327f244..1ba37ce0b 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -1,8 +1,7 @@ package techreborn.blocks; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,10 +12,11 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import techreborn.client.TechRebornCreativeTabMisc; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import techreborn.init.ModBlocks; +import java.util.List; +import java.util.Random; + public class BlockStorage extends Block { public static ItemStack getStorageBlockByName(String name, int count) diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index b4ea24dd6..aa0d1e2c7 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -1,9 +1,7 @@ package techreborn.blocks; -import java.security.InvalidParameterException; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,10 +12,12 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import techreborn.client.TechRebornCreativeTabMisc; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import techreborn.init.ModBlocks; +import java.security.InvalidParameterException; +import java.util.List; +import java.util.Random; + public class BlockStorage2 extends Block { public static ItemStack getStorageBlockByName(String name, int count) diff --git a/src/main/java/techreborn/blocks/BlockSupercondensator.java b/src/main/java/techreborn/blocks/BlockSupercondensator.java index 820b5869b..e0bb4146a 100644 --- a/src/main/java/techreborn/blocks/BlockSupercondensator.java +++ b/src/main/java/techreborn/blocks/BlockSupercondensator.java @@ -1,10 +1,10 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockSupercondensator extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/BlockWoodenshelf.java b/src/main/java/techreborn/blocks/BlockWoodenshelf.java index 9ae96fbbb..59bbbb107 100644 --- a/src/main/java/techreborn/blocks/BlockWoodenshelf.java +++ b/src/main/java/techreborn/blocks/BlockWoodenshelf.java @@ -1,10 +1,10 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockWoodenshelf extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/fluid/BlockFluidBase.java b/src/main/java/techreborn/blocks/fluid/BlockFluidBase.java index 65a28a924..1799d365f 100644 --- a/src/main/java/techreborn/blocks/fluid/BlockFluidBase.java +++ b/src/main/java/techreborn/blocks/fluid/BlockFluidBase.java @@ -1,5 +1,7 @@ package techreborn.blocks.fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -9,8 +11,6 @@ import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.lib.ModInfo; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockFluidBase extends BlockFluidClassic{ @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 4a93f4ee0..b99295f52 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -1,9 +1,8 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +14,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileDieselGenerator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockDieselGenerator extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java index b4319bb35..3fe89cd28 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java @@ -1,9 +1,8 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; @@ -12,8 +11,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import techreborn.blocks.BlockMachineBase; import techreborn.tiles.TileDragonEggSiphoner; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockDragonEggSiphoner extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index b1d62c4b4..19a2f907d 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -1,9 +1,8 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +14,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileGasTurbine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockGasTurbine extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index e1260cc36..b4c466c0d 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -1,9 +1,8 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; @@ -12,8 +11,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import techreborn.blocks.BlockMachineBase; import techreborn.tiles.TileHeatGenerator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockHeatGenerator extends BlockMachineBase{ diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index 55b2b1555..0b4fb7059 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -1,16 +1,15 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockLightningRod extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index 48bab066e..f89d9cdb1 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -1,16 +1,15 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockMagicEnergyAbsorber extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 684bd63f7..47bd20e9e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -1,16 +1,15 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockMagicEnergyConverter extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 3ec26b3e8..2435fb9e3 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -1,16 +1,15 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockPlasmaGenerator extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index 83f563b9d..aeb42016c 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -1,9 +1,8 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +14,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileSemifluidGenerator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockSemiFluidGenerator extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 99bb127fa..f9bac1eb8 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -1,9 +1,8 @@ package techreborn.blocks.generator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +14,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileThermalGenerator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockThermalGenerator extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java index 8e920f10b..80ca45131 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java @@ -1,5 +1,7 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -10,8 +12,6 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileAlloyFurnace; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockAlloyFurnace extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java index 6476a795d..511dac699 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileAlloySmelter; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockAlloySmelter extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 4ac54fcd3..8334bd346 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileAssemblingMachine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockAssemblingMachine extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java index 8ce67e705..36a183efc 100644 --- a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +14,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileBlastFurnace; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockBlastFurnace extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index 8eec64c38..47fa4b405 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileCentrifuge; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockCentrifuge extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java index d67dbd77d..99e93d9d5 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java +++ b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java @@ -1,5 +1,7 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -9,10 +11,7 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; -import techreborn.tiles.TileAlloyFurnace; import techreborn.tiles.TileChargeBench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockChargeBench extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index 9b37e8b8e..bc5d799ff 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileChemicalReactor; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockChemicalReactor extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java b/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java index 239b7336f..a268ec0a1 100644 --- a/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java @@ -1,16 +1,15 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockDistillationTower extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockGrinder.java b/src/main/java/techreborn/blocks/machine/BlockGrinder.java index 53667aa7b..14e9924e6 100644 --- a/src/main/java/techreborn/blocks/machine/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockGrinder.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileGrinder; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockGrinder extends BlockMachineBase{ diff --git a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java index efb1f264d..d3944ab28 100644 --- a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileImplosionCompressor; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockImplosionCompressor extends BlockMachineBase{ diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java index d88e905a5..71696b2cf 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileIndustrialElectrolyzer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockIndustrialElectrolyzer extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java index b68257dad..6ba64fe55 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileIndustrialSawmill; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockIndustrialSawmill extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockLathe.java b/src/main/java/techreborn/blocks/machine/BlockLathe.java index 2360a43f7..53b98c139 100644 --- a/src/main/java/techreborn/blocks/machine/BlockLathe.java +++ b/src/main/java/techreborn/blocks/machine/BlockLathe.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileLathe; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockLathe extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index c082111a9..bd55ab94a 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +14,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileMatterFabricator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockMatterFabricator extends BlockMachineBase{ diff --git a/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java index c75ac6bbc..fc3a3fa9f 100644 --- a/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,8 +15,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TilePlateCuttingMachine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockPlateCuttingMachine extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index 6668d25cf..cf3eb9979 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -1,9 +1,8 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +14,8 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileRollingMachine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockRollingMachine extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index b9f702801..1895a5c45 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -1,16 +1,15 @@ package techreborn.blocks.machine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IC2Items; - -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.Random; public class BlockVacuumFreezer extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java index 4a477f0ac..dde48db60 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAesu.java @@ -1,5 +1,7 @@ package techreborn.blocks.storage; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -12,8 +14,6 @@ import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileAesu; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockAesu extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java index 781869283..910bb868a 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -1,6 +1,8 @@ package techreborn.blocks.storage; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -11,8 +13,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import techreborn.client.GuiHandler; import techreborn.packets.PacketHandler; import techreborn.tiles.idsu.IDSUManager; diff --git a/src/main/java/techreborn/blocks/storage/BlockLesu.java b/src/main/java/techreborn/blocks/storage/BlockLesu.java index 143fb3bb2..ceccf7151 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesu.java @@ -1,5 +1,7 @@ package techreborn.blocks.storage; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -8,8 +10,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import techreborn.client.GuiHandler; import techreborn.tiles.lesu.TileLesu; diff --git a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java index 7965bfde5..ee33bd9b2 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java @@ -1,5 +1,7 @@ package techreborn.blocks.storage; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,18 +11,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import techreborn.blocks.BlockMachineBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import techreborn.init.ModBlocks; -import techreborn.lib.Location; -import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesuStorage; -import java.util.ArrayList; -import java.util.List; -import java.util.PriorityQueue; -import java.util.Queue; - public class BlockLesuStorage extends BlockMachineBase { @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/blocks/storage/EUStorageTile.java b/src/main/java/techreborn/blocks/storage/EUStorageTile.java index 3353b9e1d..ae6e6d26b 100644 --- a/src/main/java/techreborn/blocks/storage/EUStorageTile.java +++ b/src/main/java/techreborn/blocks/storage/EUStorageTile.java @@ -9,9 +9,6 @@ import ic2.api.network.INetworkClientTileEntityEventListener; import ic2.api.tile.IEnergyStorage; import ic2.core.IC2; import ic2.core.block.TileEntityInventory; -import ic2.core.block.invslot.InvSlot; -import ic2.core.block.invslot.InvSlotCharge; -import ic2.core.block.invslot.InvSlotDischarge; import ic2.core.init.MainConfig; import ic2.core.util.ConfigUtil; import ic2.core.util.StackUtil; diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 9e27afd3d..5d823dd2c 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -1,12 +1,88 @@ package techreborn.client; +import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import techreborn.client.container.*; -import techreborn.client.gui.*; +import techreborn.client.container.ContainerAesu; +import techreborn.client.container.ContainerAlloyFurnace; +import techreborn.client.container.ContainerAlloySmelter; +import techreborn.client.container.ContainerAssemblingMachine; +import techreborn.client.container.ContainerBlastFurnace; +import techreborn.client.container.ContainerCentrifuge; +import techreborn.client.container.ContainerChargeBench; +import techreborn.client.container.ContainerChemicalReactor; +import techreborn.client.container.ContainerChunkloader; +import techreborn.client.container.ContainerDestructoPack; +import techreborn.client.container.ContainerDieselGenerator; +import techreborn.client.container.ContainerDigitalChest; +import techreborn.client.container.ContainerGasTurbine; +import techreborn.client.container.ContainerGrinder; +import techreborn.client.container.ContainerIDSU; +import techreborn.client.container.ContainerImplosionCompressor; +import techreborn.client.container.ContainerIndustrialElectrolyzer; +import techreborn.client.container.ContainerIndustrialSawmill; +import techreborn.client.container.ContainerLathe; +import techreborn.client.container.ContainerLesu; +import techreborn.client.container.ContainerMatterFabricator; +import techreborn.client.container.ContainerPda; +import techreborn.client.container.ContainerPlateCuttingMachine; +import techreborn.client.container.ContainerQuantumChest; +import techreborn.client.container.ContainerQuantumTank; +import techreborn.client.container.ContainerRollingMachine; +import techreborn.client.container.ContainerSemifluidGenerator; +import techreborn.client.container.ContainerThermalGenerator; +import techreborn.client.gui.GuiAesu; +import techreborn.client.gui.GuiAlloyFurnace; +import techreborn.client.gui.GuiAlloySmelter; +import techreborn.client.gui.GuiAssemblingMachine; +import techreborn.client.gui.GuiBlastFurnace; +import techreborn.client.gui.GuiCentrifuge; +import techreborn.client.gui.GuiChargeBench; +import techreborn.client.gui.GuiChemicalReactor; +import techreborn.client.gui.GuiChunkLoader; +import techreborn.client.gui.GuiDestructoPack; +import techreborn.client.gui.GuiDieselGenerator; +import techreborn.client.gui.GuiDigitalChest; +import techreborn.client.gui.GuiGasTurbine; +import techreborn.client.gui.GuiGrinder; +import techreborn.client.gui.GuiIDSU; +import techreborn.client.gui.GuiImplosionCompressor; +import techreborn.client.gui.GuiIndustrialElectrolyzer; +import techreborn.client.gui.GuiIndustrialSawmill; +import techreborn.client.gui.GuiLathe; +import techreborn.client.gui.GuiLesu; +import techreborn.client.gui.GuiMatterFabricator; +import techreborn.client.gui.GuiPlateCuttingMachine; +import techreborn.client.gui.GuiQuantumChest; +import techreborn.client.gui.GuiQuantumTank; +import techreborn.client.gui.GuiRollingMachine; +import techreborn.client.gui.GuiSemifluidGenerator; +import techreborn.client.gui.GuiThermalGenerator; import techreborn.pda.GuiPda; -import techreborn.tiles.*; -import cpw.mods.fml.common.network.IGuiHandler; +import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAlloyFurnace; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileAssemblingMachine; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileCentrifuge; +import techreborn.tiles.TileChargeBench; +import techreborn.tiles.TileChemicalReactor; +import techreborn.tiles.TileChunkLoader; +import techreborn.tiles.TileDieselGenerator; +import techreborn.tiles.TileDigitalChest; +import techreborn.tiles.TileGasTurbine; +import techreborn.tiles.TileGrinder; +import techreborn.tiles.TileImplosionCompressor; +import techreborn.tiles.TileIndustrialElectrolyzer; +import techreborn.tiles.TileIndustrialSawmill; +import techreborn.tiles.TileLathe; +import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.TilePlateCuttingMachine; +import techreborn.tiles.TileQuantumChest; +import techreborn.tiles.TileQuantumTank; +import techreborn.tiles.TileRollingMachine; +import techreborn.tiles.TileSemifluidGenerator; +import techreborn.tiles.TileThermalGenerator; import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.lesu.TileLesu; diff --git a/src/main/java/techreborn/client/IconSupplier.java b/src/main/java/techreborn/client/IconSupplier.java index e805ae07f..c3908e919 100644 --- a/src/main/java/techreborn/client/IconSupplier.java +++ b/src/main/java/techreborn/client/IconSupplier.java @@ -1,9 +1,9 @@ package techreborn.client; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class IconSupplier { public static IIcon insulatedCopperCable; diff --git a/src/main/java/techreborn/client/SlotFilteredVoid.java b/src/main/java/techreborn/client/SlotFilteredVoid.java index 508cf7ded..d389c49ec 100644 --- a/src/main/java/techreborn/client/SlotFilteredVoid.java +++ b/src/main/java/techreborn/client/SlotFilteredVoid.java @@ -1,13 +1,13 @@ package techreborn.client; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import java.util.ArrayList; +import java.util.List; + public class SlotFilteredVoid extends Slot { private List filter = new ArrayList(); diff --git a/src/main/java/techreborn/client/container/ContainerCentrifuge.java b/src/main/java/techreborn/client/container/ContainerCentrifuge.java index cb9073dab..71d2ae6a5 100644 --- a/src/main/java/techreborn/client/container/ContainerCentrifuge.java +++ b/src/main/java/techreborn/client/container/ContainerCentrifuge.java @@ -1,7 +1,6 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import techreborn.client.SlotOutput; import techreborn.tiles.TileCentrifuge; diff --git a/src/main/java/techreborn/client/container/ContainerChargeBench.java b/src/main/java/techreborn/client/container/ContainerChargeBench.java index 91a0cc1a2..5294620a5 100644 --- a/src/main/java/techreborn/client/container/ContainerChargeBench.java +++ b/src/main/java/techreborn/client/container/ContainerChargeBench.java @@ -2,8 +2,6 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; -import techreborn.client.SlotOutput; -import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileChargeBench; public class ContainerChargeBench extends TechRebornContainer { diff --git a/src/main/java/techreborn/client/container/ContainerPda.java b/src/main/java/techreborn/client/container/ContainerPda.java index a256000f4..6e91c4791 100644 --- a/src/main/java/techreborn/client/container/ContainerPda.java +++ b/src/main/java/techreborn/client/container/ContainerPda.java @@ -1,10 +1,6 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import techreborn.api.recipe.RecipeCrafter; -import techreborn.client.SlotOutput; -import techreborn.tiles.TileAlloySmelter; public class ContainerPda extends TechRebornContainer { diff --git a/src/main/java/techreborn/client/container/TechRebornContainer.java b/src/main/java/techreborn/client/container/TechRebornContainer.java index 1fb2e41ba..55f9ba09d 100644 --- a/src/main/java/techreborn/client/container/TechRebornContainer.java +++ b/src/main/java/techreborn/client/container/TechRebornContainer.java @@ -5,7 +5,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import techreborn.client.SlotFake; -import techreborn.util.ItemUtils; public abstract class TechRebornContainer extends Container { diff --git a/src/main/java/techreborn/client/gui/GuiAesu.java b/src/main/java/techreborn/client/gui/GuiAesu.java index 2ff97f892..768988b2c 100644 --- a/src/main/java/techreborn/client/gui/GuiAesu.java +++ b/src/main/java/techreborn/client/gui/GuiAesu.java @@ -6,7 +6,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import techreborn.client.container.ContainerAesu; -import techreborn.client.gui.componets.GuiHiddenButton; import techreborn.packets.PacketAesu; import techreborn.packets.PacketHandler; import techreborn.tiles.TileAesu; diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index 80c397743..28fc54b02 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -1,6 +1,5 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index f2b7e63b6..9d2aeda13 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -1,6 +1,5 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index 1c078f3bf..b15932f4a 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -1,6 +1,5 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 4fc49466b..66113778b 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -1,7 +1,6 @@ package techreborn.client.gui; import codechicken.lib.gui.GuiDraw; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/client/gui/GuiCentrifuge.java b/src/main/java/techreborn/client/gui/GuiCentrifuge.java index d1cc6fabc..67adafdc5 100644 --- a/src/main/java/techreborn/client/gui/GuiCentrifuge.java +++ b/src/main/java/techreborn/client/gui/GuiCentrifuge.java @@ -1,6 +1,5 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/client/gui/GuiChargeBench.java b/src/main/java/techreborn/client/gui/GuiChargeBench.java index 8aebd94fd..c55bb931d 100644 --- a/src/main/java/techreborn/client/gui/GuiChargeBench.java +++ b/src/main/java/techreborn/client/gui/GuiChargeBench.java @@ -1,14 +1,11 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import techreborn.client.container.ContainerAlloySmelter; import techreborn.client.container.ContainerChargeBench; -import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileChargeBench; public class GuiChargeBench extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java index 8ced2f0bd..2e0909b43 100644 --- a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java @@ -1,6 +1,5 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/client/gui/GuiDestructoPack.java b/src/main/java/techreborn/client/gui/GuiDestructoPack.java index 825738af3..1cd60b8fb 100644 --- a/src/main/java/techreborn/client/gui/GuiDestructoPack.java +++ b/src/main/java/techreborn/client/gui/GuiDestructoPack.java @@ -1,14 +1,9 @@ package techreborn.client.gui; -import techreborn.init.ModItems; - -import com.mojang.realmsclient.gui.ChatFormatting; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; diff --git a/src/main/java/techreborn/client/gui/GuiGasTurbine.java b/src/main/java/techreborn/client/gui/GuiGasTurbine.java index e5784359c..40562698b 100644 --- a/src/main/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/main/java/techreborn/client/gui/GuiGasTurbine.java @@ -4,7 +4,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; import techreborn.client.container.ContainerGasTurbine; import techreborn.tiles.TileGasTurbine; diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 2a5b442d3..8f5c6487d 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -1,13 +1,11 @@ package techreborn.client.gui; import codechicken.lib.gui.GuiDraw; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import techreborn.client.container.ContainerCrafting; import techreborn.client.container.ContainerImplosionCompressor; import techreborn.lib.ModInfo; import techreborn.tiles.TileImplosionCompressor; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index 11beb945e..741da7c25 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -1,8 +1,6 @@ package techreborn.client.gui; import ic2.core.util.DrawUtil; -import codechicken.lib.gui.GuiDraw; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.I18n; @@ -11,7 +9,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import techreborn.client.container.ContainerIndustrialElectrolyzer; -import techreborn.lib.ModInfo; import techreborn.tiles.TileIndustrialElectrolyzer; public class GuiIndustrialElectrolyzer extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 88191344f..f2dc0841b 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -2,7 +2,6 @@ package techreborn.client.gui; import codechicken.lib.gui.GuiDraw; import ic2.core.util.DrawUtil; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/techreborn/client/gui/GuiLathe.java b/src/main/java/techreborn/client/gui/GuiLathe.java index 0b6f28cc1..6a4c17df0 100644 --- a/src/main/java/techreborn/client/gui/GuiLathe.java +++ b/src/main/java/techreborn/client/gui/GuiLathe.java @@ -1,6 +1,5 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/client/gui/GuiLesu.java b/src/main/java/techreborn/client/gui/GuiLesu.java index 379087c4f..385048bc2 100644 --- a/src/main/java/techreborn/client/gui/GuiLesu.java +++ b/src/main/java/techreborn/client/gui/GuiLesu.java @@ -1,15 +1,10 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import techreborn.client.container.ContainerAesu; import techreborn.client.container.ContainerLesu; -import techreborn.packets.PacketAesu; -import techreborn.packets.PacketHandler; -import techreborn.tiles.TileAesu; import techreborn.tiles.lesu.TileLesu; import java.awt.*; diff --git a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java index 877b5b4df..79480c083 100644 --- a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java @@ -1,6 +1,5 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index e330cd15b..c86d4ed86 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -4,7 +4,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; import techreborn.client.container.ContainerSemifluidGenerator; import techreborn.tiles.TileSemifluidGenerator; diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index 149229293..375b55785 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -1,27 +1,23 @@ package techreborn.client.hud; -import org.lwjgl.opengl.GL11; - -import techreborn.client.keybindings.KeyBindings; -import techreborn.config.ConfigTechReborn; -import techreborn.util.Color; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import ic2.api.item.IElectricItemManager; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import org.lwjgl.opengl.GL11; +import techreborn.client.keybindings.KeyBindings; +import techreborn.config.ConfigTechReborn; +import techreborn.util.Color; public class ChargeHud { diff --git a/src/main/java/techreborn/client/keybindings/KeyBindings.java b/src/main/java/techreborn/client/keybindings/KeyBindings.java index ea8affb42..ed4ecc3e4 100644 --- a/src/main/java/techreborn/client/keybindings/KeyBindings.java +++ b/src/main/java/techreborn/client/keybindings/KeyBindings.java @@ -1,9 +1,7 @@ package techreborn.client.keybindings; import net.minecraft.client.settings.KeyBinding; - import org.lwjgl.input.Keyboard; - import techreborn.lib.ModInfo; public class KeyBindings { diff --git a/src/main/java/techreborn/client/keybindings/KeyInputEventHandler.java b/src/main/java/techreborn/client/keybindings/KeyInputEventHandler.java index 666df63d2..e7540d356 100644 --- a/src/main/java/techreborn/client/keybindings/KeyInputEventHandler.java +++ b/src/main/java/techreborn/client/keybindings/KeyInputEventHandler.java @@ -1,9 +1,9 @@ package techreborn.client.keybindings; -import techreborn.lib.Key; -import techreborn.util.LogHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; +import techreborn.lib.Key; +import techreborn.util.LogHelper; public class KeyInputEventHandler { diff --git a/src/main/java/techreborn/cofhLib/gui/GuiBase.java b/src/main/java/techreborn/cofhLib/gui/GuiBase.java index 7a38965e2..a294adbb3 100755 --- a/src/main/java/techreborn/cofhLib/gui/GuiBase.java +++ b/src/main/java/techreborn/cofhLib/gui/GuiBase.java @@ -1,11 +1,5 @@ package techreborn.cofhLib.gui; -import techreborn.cofhLib.audio.SoundBase; -import techreborn.cofhLib.gui.element.ElementBase; -import techreborn.cofhLib.gui.element.TabBase; -import techreborn.cofhLib.gui.slot.SlotFalseCopy; -import techreborn.cofhLib.render.RenderHelper; -import techreborn.cofhLib.util.helpers.StringHelper; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.gui.FontRenderer; @@ -21,6 +15,12 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import techreborn.cofhLib.audio.SoundBase; +import techreborn.cofhLib.gui.element.ElementBase; +import techreborn.cofhLib.gui.element.TabBase; +import techreborn.cofhLib.gui.slot.SlotFalseCopy; +import techreborn.cofhLib.render.RenderHelper; +import techreborn.cofhLib.util.helpers.StringHelper; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/techreborn/cofhLib/gui/element/ElementBase.java b/src/main/java/techreborn/cofhLib/gui/element/ElementBase.java index d3e1fef9e..6623b6f8d 100755 --- a/src/main/java/techreborn/cofhLib/gui/element/ElementBase.java +++ b/src/main/java/techreborn/cofhLib/gui/element/ElementBase.java @@ -1,10 +1,10 @@ package techreborn.cofhLib.gui.element; -import techreborn.cofhLib.gui.GuiBase; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import techreborn.cofhLib.gui.GuiBase; import java.util.List; diff --git a/src/main/java/techreborn/cofhLib/gui/element/ElementButton.java b/src/main/java/techreborn/cofhLib/gui/element/ElementButton.java index ee1f3831d..da88d8dce 100755 --- a/src/main/java/techreborn/cofhLib/gui/element/ElementButton.java +++ b/src/main/java/techreborn/cofhLib/gui/element/ElementButton.java @@ -1,9 +1,9 @@ package techreborn.cofhLib.gui.element; import com.pahimar.ee3.util.ResourceLocationHelper; +import net.minecraft.util.ResourceLocation; import techreborn.cofhLib.render.RenderHelper; import techreborn.cofhLib.util.helpers.StringHelper; -import net.minecraft.util.ResourceLocation; import java.util.List; diff --git a/src/main/java/techreborn/cofhLib/gui/element/ElementButtonManaged.java b/src/main/java/techreborn/cofhLib/gui/element/ElementButtonManaged.java index 74e361eb6..79e9d0ca5 100755 --- a/src/main/java/techreborn/cofhLib/gui/element/ElementButtonManaged.java +++ b/src/main/java/techreborn/cofhLib/gui/element/ElementButtonManaged.java @@ -1,8 +1,8 @@ package techreborn.cofhLib.gui.element; -import techreborn.cofhLib.gui.GuiProps; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import techreborn.cofhLib.gui.GuiProps; public abstract class ElementButtonManaged extends ElementBase { diff --git a/src/main/java/techreborn/cofhLib/gui/element/ElementListBox.java b/src/main/java/techreborn/cofhLib/gui/element/ElementListBox.java index 4d8c3d0f2..8b2ef7bcc 100755 --- a/src/main/java/techreborn/cofhLib/gui/element/ElementListBox.java +++ b/src/main/java/techreborn/cofhLib/gui/element/ElementListBox.java @@ -4,12 +4,15 @@ import techreborn.cofhLib.gui.GuiBase; import techreborn.cofhLib.gui.GuiColor; import techreborn.cofhLib.gui.element.listbox.IListBoxElement; import techreborn.cofhLib.util.helpers.StringHelper; -import static org.lwjgl.opengl.GL11.*; import java.util.Collection; import java.util.LinkedList; import java.util.List; +import static org.lwjgl.opengl.GL11.glPopMatrix; +import static org.lwjgl.opengl.GL11.glPushMatrix; +import static org.lwjgl.opengl.GL11.glTranslated; + public class ElementListBox extends ElementBase { public int borderColor = new GuiColor(120, 120, 120, 255).getColor(); diff --git a/src/main/java/techreborn/cofhLib/gui/element/ElementSlider.java b/src/main/java/techreborn/cofhLib/gui/element/ElementSlider.java index 1de8cb1c2..7a7d15f2e 100755 --- a/src/main/java/techreborn/cofhLib/gui/element/ElementSlider.java +++ b/src/main/java/techreborn/cofhLib/gui/element/ElementSlider.java @@ -1,10 +1,10 @@ package techreborn.cofhLib.gui.element; import com.pahimar.ee3.reference.Textures; -import techreborn.cofhLib.gui.GuiBase; -import techreborn.cofhLib.gui.GuiColor; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import techreborn.cofhLib.gui.GuiBase; +import techreborn.cofhLib.gui.GuiColor; public abstract class ElementSlider extends ElementBase { diff --git a/src/main/java/techreborn/cofhLib/gui/element/ElementTextField.java b/src/main/java/techreborn/cofhLib/gui/element/ElementTextField.java index 30340767f..df5dc1b6b 100755 --- a/src/main/java/techreborn/cofhLib/gui/element/ElementTextField.java +++ b/src/main/java/techreborn/cofhLib/gui/element/ElementTextField.java @@ -1,15 +1,19 @@ package techreborn.cofhLib.gui.element; -import techreborn.cofhLib.gui.GuiBase; -import techreborn.cofhLib.gui.GuiColor; -import techreborn.cofhLib.util.helpers.MathHelper; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ChatAllowedCharacters; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import techreborn.cofhLib.gui.GuiBase; +import techreborn.cofhLib.gui.GuiColor; +import techreborn.cofhLib.util.helpers.MathHelper; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_STENCIL_BUFFER_BIT; +import static org.lwjgl.opengl.GL11.GL_STENCIL_TEST; +import static org.lwjgl.opengl.GL11.glClear; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; public class ElementTextField extends ElementBase diff --git a/src/main/java/techreborn/cofhLib/gui/element/TabBase.java b/src/main/java/techreborn/cofhLib/gui/element/TabBase.java index e492cff06..587f4d98b 100755 --- a/src/main/java/techreborn/cofhLib/gui/element/TabBase.java +++ b/src/main/java/techreborn/cofhLib/gui/element/TabBase.java @@ -1,8 +1,8 @@ package techreborn.cofhLib.gui.element; -import techreborn.cofhLib.render.RenderHelper; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import techreborn.cofhLib.render.RenderHelper; /** * Base class for a tab element. Has self-contained rendering methods and a link back to the {@link techreborn.cofhLib.gui.GuiBase} it is a part of. diff --git a/src/main/java/techreborn/cofhLib/gui/element/listbox/ListBoxElementText.java b/src/main/java/techreborn/cofhLib/gui/element/listbox/ListBoxElementText.java index 40a8ce4a9..c607619b7 100755 --- a/src/main/java/techreborn/cofhLib/gui/element/listbox/ListBoxElementText.java +++ b/src/main/java/techreborn/cofhLib/gui/element/listbox/ListBoxElementText.java @@ -1,7 +1,7 @@ package techreborn.cofhLib.gui.element.listbox; -import techreborn.cofhLib.gui.element.ElementListBox; import net.minecraft.client.Minecraft; +import techreborn.cofhLib.gui.element.ElementListBox; public class ListBoxElementText implements IListBoxElement { diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 82fffa324..08ce11a2c 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -2,7 +2,13 @@ package techreborn.compat; import cpw.mods.fml.common.Loader; import techreborn.compat.ee3.EmcValues; -import techreborn.compat.recipes.*; +import techreborn.compat.recipes.RecipesBiomesOPlenty; +import techreborn.compat.recipes.RecipesBuildcraft; +import techreborn.compat.recipes.RecipesForestry; +import techreborn.compat.recipes.RecipesIC2; +import techreborn.compat.recipes.RecipesNatura; +import techreborn.compat.recipes.RecipesThaumcraft; +import techreborn.compat.recipes.RecipesThermalExpansion; import techreborn.compat.waila.CompatModuleWaila; import java.util.ArrayList; diff --git a/src/main/java/techreborn/compat/ee3/EmcValues.java b/src/main/java/techreborn/compat/ee3/EmcValues.java index 432c92088..23ba86364 100644 --- a/src/main/java/techreborn/compat/ee3/EmcValues.java +++ b/src/main/java/techreborn/compat/ee3/EmcValues.java @@ -22,7 +22,6 @@ import ic2.api.recipe.Recipes; import ic2.core.AdvRecipe; import ic2.core.AdvShapelessRecipe; import ic2.core.Ic2Items; -import ic2.core.item.resources.ItemIngot; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java index 10958dc3e..22e10dd27 100644 --- a/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java @@ -7,7 +7,7 @@ import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiAlloySmelter; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class AlloySmelterRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java index 31a2ef729..c851709c0 100644 --- a/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java @@ -7,7 +7,7 @@ import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiAssemblingMachine; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class AssemblingMachineRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/nei/recipes/BlastFurnaceRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/BlastFurnaceRecipeHandler.java index afc8e3c02..de74a0ec6 100644 --- a/src/main/java/techreborn/compat/nei/recipes/BlastFurnaceRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/BlastFurnaceRecipeHandler.java @@ -4,11 +4,10 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; import net.minecraft.client.gui.inventory.GuiContainer; import techreborn.api.recipe.IBaseRecipeType; -import techreborn.client.gui.GuiAlloySmelter; import techreborn.client.gui.GuiBlastFurnace; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class BlastFurnaceRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/nei/recipes/CentrifugeRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/CentrifugeRecipeHandler.java index 8940cf64b..da88ff62a 100644 --- a/src/main/java/techreborn/compat/nei/recipes/CentrifugeRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/CentrifugeRecipeHandler.java @@ -7,7 +7,7 @@ import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiCentrifuge; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class CentrifugeRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java index 274602057..ecb22888c 100644 --- a/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java @@ -7,7 +7,7 @@ import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiChemicalReactor; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class ChemicalReactorRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/nei/recipes/GrinderRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/GrinderRecipeHandler.java index 2d8d14b9f..fdc9ab110 100644 --- a/src/main/java/techreborn/compat/nei/recipes/GrinderRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/GrinderRecipeHandler.java @@ -13,11 +13,9 @@ import techreborn.api.recipe.machines.GrinderRecipe; import techreborn.client.gui.GuiGrinder; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; -import org.lwjgl.opengl.GL11; - public class GrinderRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { @Override public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { diff --git a/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java index 3fe8ede4e..cb7cd5c35 100644 --- a/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java @@ -7,7 +7,7 @@ import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiImplosionCompressor; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class ImplosionCompressorRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/nei/recipes/IndustrialElectrolyzerRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/IndustrialElectrolyzerRecipeHandler.java index 2a763b214..02dc99b16 100644 --- a/src/main/java/techreborn/compat/nei/recipes/IndustrialElectrolyzerRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/IndustrialElectrolyzerRecipeHandler.java @@ -2,18 +2,15 @@ package techreborn.compat.nei.recipes; import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; +import ic2.core.util.DrawUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import techreborn.api.recipe.IBaseRecipeType; -import techreborn.api.recipe.machines.GrinderRecipe; import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; import techreborn.client.gui.GuiIndustrialElectrolyzer; -import techreborn.compat.nei.recipes.GenericRecipeHander.CachedGenericRecipe; import techreborn.util.ItemUtils; -import ic2.core.util.DrawUtil; import java.util.List; diff --git a/src/main/java/techreborn/compat/nei/recipes/IndustrialSawmillRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/IndustrialSawmillRecipeHandler.java index b692635f5..da2099fd1 100644 --- a/src/main/java/techreborn/compat/nei/recipes/IndustrialSawmillRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/IndustrialSawmillRecipeHandler.java @@ -3,20 +3,16 @@ package techreborn.compat.nei.recipes; import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; import ic2.core.util.DrawUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import techreborn.api.recipe.IBaseRecipeType; -import techreborn.api.recipe.machines.GrinderRecipe; -import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.client.gui.GuiIndustrialSawmill; -import techreborn.compat.nei.recipes.GenericRecipeHander.CachedGenericRecipe; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class IndustrialSawmillRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java index 64179fec6..1e2676ee3 100644 --- a/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java @@ -7,7 +7,7 @@ import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiLathe; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class LatheRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java index 1bb6de772..041a1d14d 100644 --- a/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java @@ -7,7 +7,7 @@ import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiPlateCuttingMachine; import techreborn.util.ItemUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; public class PlateCuttingMachineRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { diff --git a/src/main/java/techreborn/compat/recipes/RecipesForestry.java b/src/main/java/techreborn/compat/recipes/RecipesForestry.java index b6ece14c1..4321a9c46 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesForestry.java +++ b/src/main/java/techreborn/compat/recipes/RecipesForestry.java @@ -4,9 +4,6 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; -import forestry.Forestry; -import forestry.api.core.ForestryAPI; -import forestry.arboriculture.items.ItemWoodBlock; import forestry.core.config.ForestryBlock; import ic2.api.item.IC2Items; import net.minecraft.init.Items; diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index d9cc81245..2ca2ce986 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -8,7 +8,6 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import ic2.api.item.IC2Items; import ic2.api.recipe.RecipeInputOreDict; import ic2.api.recipe.Recipes; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,11 +15,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; import techreborn.compat.ICompatModule; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModBlocks; import techreborn.init.ModItems; import techreborn.items.ItemCrushedOre; -import techreborn.items.ItemDustsTiny; import techreborn.items.ItemDusts; +import techreborn.items.ItemDustsTiny; import techreborn.items.ItemGems; import techreborn.items.ItemIngots; import techreborn.items.ItemParts; diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index c86265952..e062373ef 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -1,10 +1,10 @@ package techreborn.config; -import java.io.File; - import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.Configuration; +import java.io.File; + public class ConfigTechReborn { private static ConfigTechReborn instance = null; public static String CATEGORY_WORLD = "world"; diff --git a/src/main/java/techreborn/config/TechRebornConfigGui.java b/src/main/java/techreborn/config/TechRebornConfigGui.java index bb65af507..d91424d2f 100644 --- a/src/main/java/techreborn/config/TechRebornConfigGui.java +++ b/src/main/java/techreborn/config/TechRebornConfigGui.java @@ -1,17 +1,17 @@ package techreborn.config; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.util.StatCollector; -import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.config.DummyConfigElement; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.GuiConfigEntries; import cpw.mods.fml.client.config.GuiConfigEntries.CategoryEntry; import cpw.mods.fml.client.config.IConfigElement; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.common.config.Configuration; + +import java.util.ArrayList; +import java.util.List; public class TechRebornConfigGui extends GuiConfig { public TechRebornConfigGui(GuiScreen top) diff --git a/src/main/java/techreborn/config/TechRebornGUIFactory.java b/src/main/java/techreborn/config/TechRebornGUIFactory.java index d78ce6603..3ba2ef5c0 100644 --- a/src/main/java/techreborn/config/TechRebornGUIFactory.java +++ b/src/main/java/techreborn/config/TechRebornGUIFactory.java @@ -1,10 +1,10 @@ package techreborn.config; -import java.util.Set; - +import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.client.IModGuiFactory; + +import java.util.Set; public class TechRebornGUIFactory implements IModGuiFactory { @Override diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 560fce8a8..b54366aa9 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -1,13 +1,31 @@ package techreborn.init; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import techreborn.blocks.*; +import techreborn.blocks.BlockChunkLoader; +import techreborn.blocks.BlockComputerCube; +import techreborn.blocks.BlockDigitalChest; +import techreborn.blocks.BlockElectricCraftingTable; +import techreborn.blocks.BlockFusionCoil; +import techreborn.blocks.BlockFusionControlComputer; +import techreborn.blocks.BlockHighlyAdvancedMachine; +import techreborn.blocks.BlockMachineCasing; +import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockMetalShelf; +import techreborn.blocks.BlockOre; +import techreborn.blocks.BlockQuantumChest; +import techreborn.blocks.BlockQuantumTank; +import techreborn.blocks.BlockStorage; +import techreborn.blocks.BlockStorage2; +import techreborn.blocks.BlockSupercondensator; +import techreborn.blocks.BlockWoodenshelf; import techreborn.blocks.generator.BlockDieselGenerator; import techreborn.blocks.generator.BlockDragonEggSiphoner; +import techreborn.blocks.generator.BlockGasTurbine; import techreborn.blocks.generator.BlockHeatGenerator; import techreborn.blocks.generator.BlockLightningRod; import techreborn.blocks.generator.BlockMagicEnergyAbsorber; @@ -15,7 +33,6 @@ import techreborn.blocks.generator.BlockMagicEnergyConverter; import techreborn.blocks.generator.BlockPlasmaGenerator; import techreborn.blocks.generator.BlockSemiFluidGenerator; import techreborn.blocks.generator.BlockThermalGenerator; -import techreborn.blocks.generator.BlockGasTurbine; import techreborn.blocks.machine.BlockAlloyFurnace; import techreborn.blocks.machine.BlockAlloySmelter; import techreborn.blocks.machine.BlockAssemblingMachine; @@ -37,13 +54,47 @@ import techreborn.blocks.storage.BlockAesu; import techreborn.blocks.storage.BlockIDSU; import techreborn.blocks.storage.BlockLesu; import techreborn.blocks.storage.BlockLesuStorage; -import techreborn.itemblocks.*; -import techreborn.tiles.*; +import techreborn.itemblocks.ItemBlockAesu; +import techreborn.itemblocks.ItemBlockDigitalChest; +import techreborn.itemblocks.ItemBlockMachineCasing; +import techreborn.itemblocks.ItemBlockMachineFrame; +import techreborn.itemblocks.ItemBlockOre; +import techreborn.itemblocks.ItemBlockQuantumChest; +import techreborn.itemblocks.ItemBlockQuantumTank; +import techreborn.itemblocks.ItemBlockStorage; +import techreborn.itemblocks.ItemBlockStorage2; +import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAlloyFurnace; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileAssemblingMachine; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileCentrifuge; +import techreborn.tiles.TileChargeBench; +import techreborn.tiles.TileChemicalReactor; +import techreborn.tiles.TileChunkLoader; +import techreborn.tiles.TileDieselGenerator; +import techreborn.tiles.TileDigitalChest; +import techreborn.tiles.TileDragonEggSiphoner; +import techreborn.tiles.TileGasTurbine; +import techreborn.tiles.TileGrinder; +import techreborn.tiles.TileHeatGenerator; +import techreborn.tiles.TileImplosionCompressor; +import techreborn.tiles.TileIndustrialElectrolyzer; +import techreborn.tiles.TileIndustrialSawmill; +import techreborn.tiles.TileLathe; +import techreborn.tiles.TileMachineCasing; +import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.TileMetalShelf; +import techreborn.tiles.TilePlateCuttingMachine; +import techreborn.tiles.TileQuantumChest; +import techreborn.tiles.TileQuantumTank; +import techreborn.tiles.TileRollingMachine; +import techreborn.tiles.TileSemifluidGenerator; +import techreborn.tiles.TileThermalGenerator; import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesuStorage; import techreborn.util.LogHelper; -import cpw.mods.fml.common.registry.GameRegistry; public class ModBlocks { diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 3cb1eab71..19243e4a1 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -1,12 +1,12 @@ package techreborn.init; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import techreborn.blocks.fluid.BlockFluidTechReborn; import techreborn.lib.ModInfo; -import cpw.mods.fml.common.registry.GameRegistry; public class ModFluids { diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 213475460..8f5383888 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -1,5 +1,6 @@ package techreborn.init; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; @@ -11,18 +12,18 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; import techreborn.items.ItemCells; import techreborn.items.ItemCrushedOre; -import techreborn.items.ItemDustsTiny; import techreborn.items.ItemDusts; import techreborn.items.ItemDustsSmall; +import techreborn.items.ItemDustsTiny; import techreborn.items.ItemGems; import techreborn.items.ItemIngots; +import techreborn.items.ItemLapotronicOrb; import techreborn.items.ItemNuggets; import techreborn.items.ItemParts; import techreborn.items.ItemPlates; import techreborn.items.ItemPurifiedCrushedOre; import techreborn.items.ItemRods; import techreborn.items.ItemUUmatter; -import techreborn.items.ItemLapotronicOrb; import techreborn.items.ItemUpgrade; import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLithiumBatpack; @@ -34,7 +35,6 @@ import techreborn.items.tools.ItemRockCutter; import techreborn.items.tools.ItemTechPda; import techreborn.util.BucketHandler; import techreborn.util.LogHelper; -import cpw.mods.fml.common.registry.GameRegistry; public class ModItems { diff --git a/src/main/java/techreborn/init/ModParts.java b/src/main/java/techreborn/init/ModParts.java index 64b4ded71..3b39547f7 100644 --- a/src/main/java/techreborn/init/ModParts.java +++ b/src/main/java/techreborn/init/ModParts.java @@ -1,6 +1,5 @@ package techreborn.init; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import techreborn.partSystem.IPartProvider; import techreborn.partSystem.ModPartRegistry; diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index db501cf49..01d5e8950 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -2,8 +2,6 @@ package techreborn.init; import cpw.mods.fml.common.registry.GameRegistry; import ic2.api.item.IC2Items; -import ic2.core.Ic2Items; -import ic2.core.item.resources.ItemCell; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -12,12 +10,31 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.ArrayUtils; import techreborn.api.recipe.RecipeHandler; -import techreborn.api.recipe.machines.*; +import techreborn.api.recipe.machines.AlloySmelterRecipe; +import techreborn.api.recipe.machines.AssemblingMachineRecipe; +import techreborn.api.recipe.machines.BlastFurnaceRecipe; +import techreborn.api.recipe.machines.CentrifugeRecipe; +import techreborn.api.recipe.machines.ChemicalReactorRecipe; +import techreborn.api.recipe.machines.GrinderRecipe; +import techreborn.api.recipe.machines.ImplosionCompressorRecipe; +import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; +import techreborn.api.recipe.machines.IndustrialSawmillRecipe; +import techreborn.api.recipe.machines.LatheRecipe; +import techreborn.api.recipe.machines.PlateCuttingMachineRecipe; import techreborn.blocks.BlockOre; import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockStorage2; import techreborn.config.ConfigTechReborn; -import techreborn.items.*; +import techreborn.items.ItemCells; +import techreborn.items.ItemDusts; +import techreborn.items.ItemDustsSmall; +import techreborn.items.ItemDustsTiny; +import techreborn.items.ItemGems; +import techreborn.items.ItemIngots; +import techreborn.items.ItemNuggets; +import techreborn.items.ItemParts; +import techreborn.items.ItemPlates; +import techreborn.items.ItemRods; import techreborn.util.CraftingHelper; import techreborn.util.LogHelper; diff --git a/src/main/java/techreborn/itemblocks/ItemBlockAesu.java b/src/main/java/techreborn/itemblocks/ItemBlockAesu.java index 6ed72a36a..9322631a7 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockAesu.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockAesu.java @@ -2,7 +2,6 @@ package techreborn.itemblocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.item.ElectricItem; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +12,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import techreborn.init.ModBlocks; import techreborn.tiles.TileAesu; -import techreborn.tiles.TileQuantumChest; import java.util.List; diff --git a/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java b/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java index 3c5e6bcd4..9d689be07 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java @@ -1,7 +1,7 @@ package techreborn.itemblocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import techreborn.init.ModBlocks; import techreborn.tiles.TileDigitalChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemBlockDigitalChest extends ItemBlock { diff --git a/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java b/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java index 64caf8fa0..d0374bd93 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java @@ -1,7 +1,7 @@ package techreborn.itemblocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import techreborn.init.ModBlocks; import techreborn.tiles.TileQuantumChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemBlockQuantumChest extends ItemBlock { diff --git a/src/main/java/techreborn/itemblocks/ItemBlockStorage.java b/src/main/java/techreborn/itemblocks/ItemBlockStorage.java index b49dbfa0e..8919eb973 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockStorage.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockStorage.java @@ -1,7 +1,6 @@ package techreborn.itemblocks; import net.minecraft.block.Block; -import net.minecraft.item.ItemMultiTexture; import techreborn.blocks.BlockStorage; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/itemblocks/ItemBlockStorage2.java b/src/main/java/techreborn/itemblocks/ItemBlockStorage2.java index 603b966c3..c34159674 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockStorage2.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockStorage2.java @@ -1,7 +1,6 @@ package techreborn.itemblocks; import net.minecraft.block.Block; -import net.minecraft.item.ItemMultiTexture; import techreborn.blocks.BlockStorage2; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/items/ItemCells.java b/src/main/java/techreborn/items/ItemCells.java index 159ed28a5..813f4c9ae 100644 --- a/src/main/java/techreborn/items/ItemCells.java +++ b/src/main/java/techreborn/items/ItemCells.java @@ -1,7 +1,5 @@ package techreborn.items; -import java.util.List; - import ic2.core.Ic2Items; import ic2.core.item.ItemFluidCell; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,6 +14,8 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.util.LogHelper; +import java.util.List; + public class ItemCells extends ItemTR { public static ItemStack getCellByName(String name, int count) diff --git a/src/main/java/techreborn/items/ItemCrushedOre.java b/src/main/java/techreborn/items/ItemCrushedOre.java index ba6a1e8ba..02ff810cc 100644 --- a/src/main/java/techreborn/items/ItemCrushedOre.java +++ b/src/main/java/techreborn/items/ItemCrushedOre.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemCrushedOre extends Item { public static ItemStack getCrushedOreByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index ba72ed7a6..5d87cc0b8 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; @@ -12,6 +9,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemDusts extends ItemTR { public static ItemStack getDustByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index a05eadced..86e5724de 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemDustsSmall extends ItemTR { public static ItemStack getSmallDustByName(String name, int count) diff --git a/src/main/java/techreborn/items/ItemDustsTiny.java b/src/main/java/techreborn/items/ItemDustsTiny.java index 318b452ad..2b538001b 100644 --- a/src/main/java/techreborn/items/ItemDustsTiny.java +++ b/src/main/java/techreborn/items/ItemDustsTiny.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemDustsTiny extends ItemTR { public static ItemStack getTinyDustByName(String name, int count) diff --git a/src/main/java/techreborn/items/ItemGems.java b/src/main/java/techreborn/items/ItemGems.java index b8e3cedf8..8ecf4a690 100644 --- a/src/main/java/techreborn/items/ItemGems.java +++ b/src/main/java/techreborn/items/ItemGems.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemGems extends Item { public static ItemStack getGemByName(String name, int count) diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index ab8449a66..892a3925f 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemIngots extends Item { public static ItemStack getIngotByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemLapotronicOrb.java b/src/main/java/techreborn/items/ItemLapotronicOrb.java index 902f3a1dd..1e609063d 100644 --- a/src/main/java/techreborn/items/ItemLapotronicOrb.java +++ b/src/main/java/techreborn/items/ItemLapotronicOrb.java @@ -1,20 +1,17 @@ package techreborn.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemLapotronicOrb extends Item implements IElectricItem { diff --git a/src/main/java/techreborn/items/ItemNuggets.java b/src/main/java/techreborn/items/ItemNuggets.java index 679531f9f..146c44855 100644 --- a/src/main/java/techreborn/items/ItemNuggets.java +++ b/src/main/java/techreborn/items/ItemNuggets.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemNuggets extends Item { public static ItemStack getNuggetByName(String name, int count) diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index 58aaa9807..e57c73abf 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,6 +12,9 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemParts extends Item { public static ItemStack getPartByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index 25bb5dd01..78614facd 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemPlates extends ItemTR { public static ItemStack getPlateByName(String name, int count) diff --git a/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java b/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java index d2653b00f..1b444b024 100644 --- a/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java +++ b/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemPurifiedCrushedOre extends Item { public static ItemStack getPurifiedCrushedOreByName(String name, int count) diff --git a/src/main/java/techreborn/items/ItemRods.java b/src/main/java/techreborn/items/ItemRods.java index 984dbffef..759c430c9 100644 --- a/src/main/java/techreborn/items/ItemRods.java +++ b/src/main/java/techreborn/items/ItemRods.java @@ -1,8 +1,5 @@ package techreborn.items; -import java.security.InvalidParameterException; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,6 +8,9 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; +import java.security.InvalidParameterException; +import java.util.List; + public class ItemRods extends Item { public static ItemStack getRodByName(String name, int count) diff --git a/src/main/java/techreborn/items/ItemUUmatter.java b/src/main/java/techreborn/items/ItemUUmatter.java index fa9198658..04878a9a4 100644 --- a/src/main/java/techreborn/items/ItemUUmatter.java +++ b/src/main/java/techreborn/items/ItemUUmatter.java @@ -1,10 +1,10 @@ package techreborn.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import techreborn.client.TechRebornCreativeTabMisc; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemUUmatter extends Item{ diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index a37745648..10a9a2301 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -1,10 +1,9 @@ package techreborn.items.armor; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -13,8 +12,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemLapotronPack extends ItemArmor implements IElectricItem { diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 33f966986..b73341b9c 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -1,10 +1,9 @@ package techreborn.items.armor; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -13,8 +12,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemLithiumBatpack extends ItemArmor implements IElectricItem { diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 6fac38b44..a1e4c1b77 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -1,10 +1,9 @@ package techreborn.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -18,8 +17,8 @@ import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.util.TorchHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem { diff --git a/src/main/java/techreborn/items/tools/ItemFluidbucket.java b/src/main/java/techreborn/items/tools/ItemFluidbucket.java index 725dc8655..8a23f6470 100644 --- a/src/main/java/techreborn/items/tools/ItemFluidbucket.java +++ b/src/main/java/techreborn/items/tools/ItemFluidbucket.java @@ -1,13 +1,13 @@ package techreborn.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBucket; import techreborn.client.TechRebornCreativeTabMisc; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFluidbucket extends ItemBucket{ private String iconName; diff --git a/src/main/java/techreborn/items/tools/ItemHammer.java b/src/main/java/techreborn/items/tools/ItemHammer.java index caea56e95..6796416d6 100644 --- a/src/main/java/techreborn/items/tools/ItemHammer.java +++ b/src/main/java/techreborn/items/tools/ItemHammer.java @@ -1,11 +1,11 @@ package techreborn.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import techreborn.items.ItemTR; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemHammer extends ItemTR{ private String iconName; diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 59a173633..cdfffe10f 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -1,10 +1,9 @@ package techreborn.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -19,8 +18,8 @@ import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.util.TorchHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemOmniTool extends ItemPickaxe implements IElectricItem { diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 5319238a0..a28ec321c 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -1,12 +1,9 @@ package techreborn.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - -import org.lwjgl.input.Keyboard; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -16,13 +13,12 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.util.Color; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemRockCutter extends ItemPickaxe implements IElectricItem { diff --git a/src/main/java/techreborn/lib/vecmath/Vecs3d.java b/src/main/java/techreborn/lib/vecmath/Vecs3d.java index df908e5ea..8a9f9abf7 100644 --- a/src/main/java/techreborn/lib/vecmath/Vecs3d.java +++ b/src/main/java/techreborn/lib/vecmath/Vecs3d.java @@ -1,7 +1,8 @@ package techreborn.lib.vecmath; -import java.util.StringTokenizer; - +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -11,9 +12,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.StringTokenizer; public class Vecs3d { protected double x, y, z; diff --git a/src/main/java/techreborn/lib/vecmath/Vecs3dCube.java b/src/main/java/techreborn/lib/vecmath/Vecs3dCube.java index 16a289b51..74e7978c8 100644 --- a/src/main/java/techreborn/lib/vecmath/Vecs3dCube.java +++ b/src/main/java/techreborn/lib/vecmath/Vecs3dCube.java @@ -1,10 +1,10 @@ package techreborn.lib.vecmath; -import java.util.List; - import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import java.util.List; + public class Vecs3dCube { private Vecs3d min, max; diff --git a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java index 89a03795e..8c5ea6a29 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java +++ b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java @@ -1,17 +1,17 @@ package techreborn.multiblocks; -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import techreborn.blocks.BlockMachineCasing; -import techreborn.util.LogHelper; import erogenousbeef.coreTR.common.CoordTriplet; import erogenousbeef.coreTR.multiblock.IMultiblockPart; import erogenousbeef.coreTR.multiblock.MultiblockControllerBase; import erogenousbeef.coreTR.multiblock.MultiblockValidationException; import erogenousbeef.coreTR.multiblock.rectangular.RectangularMultiblockControllerBase; import erogenousbeef.coreTR.multiblock.rectangular.RectangularMultiblockTileEntityBase; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import techreborn.blocks.BlockMachineCasing; +import techreborn.util.LogHelper; public class MultiBlockCasing extends RectangularMultiblockControllerBase { diff --git a/src/main/java/techreborn/packets/PacketHandler.java b/src/main/java/techreborn/packets/PacketHandler.java index c0cffd56d..c181ccacd 100644 --- a/src/main/java/techreborn/packets/PacketHandler.java +++ b/src/main/java/techreborn/packets/PacketHandler.java @@ -1,20 +1,19 @@ package techreborn.packets; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; - -import java.io.IOException; -import java.util.EnumMap; -import java.util.logging.Logger; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.Packet; -import net.minecraft.world.World; import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; import cpw.mods.fml.common.network.FMLOutboundHandler; import cpw.mods.fml.relauncher.Side; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.Packet; +import net.minecraft.world.World; + +import java.io.IOException; +import java.util.EnumMap; +import java.util.logging.Logger; public class PacketHandler extends FMLIndexedMessageToMessageCodec { diff --git a/src/main/java/techreborn/packets/SimplePacket.java b/src/main/java/techreborn/packets/SimplePacket.java index 1777e5829..344f0c902 100644 --- a/src/main/java/techreborn/packets/SimplePacket.java +++ b/src/main/java/techreborn/packets/SimplePacket.java @@ -1,9 +1,7 @@ package techreborn.packets; +import com.google.common.base.Charsets; import io.netty.buffer.ByteBuf; - -import java.io.IOException; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -11,7 +9,7 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import com.google.common.base.Charsets; +import java.io.IOException; public abstract class SimplePacket { protected EntityPlayer player; diff --git a/src/main/java/techreborn/pda/GuiButtonCustomTexture.java b/src/main/java/techreborn/pda/GuiButtonCustomTexture.java index ebafeb128..3c0ecea7d 100644 --- a/src/main/java/techreborn/pda/GuiButtonCustomTexture.java +++ b/src/main/java/techreborn/pda/GuiButtonCustomTexture.java @@ -1,12 +1,10 @@ package techreborn.pda; +import cpw.mods.fml.client.config.GuiButtonExt; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.config.GuiButtonExt; - public class GuiButtonCustomTexture extends GuiButtonExt { public int textureU; diff --git a/src/main/java/techreborn/pda/GuiPda.java b/src/main/java/techreborn/pda/GuiPda.java index 7c3e773c2..38e46e0c0 100644 --- a/src/main/java/techreborn/pda/GuiPda.java +++ b/src/main/java/techreborn/pda/GuiPda.java @@ -1,14 +1,11 @@ package techreborn.pda; -import java.awt.Container; - +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; import techreborn.client.container.ContainerPda; import techreborn.cofhLib.gui.GuiBase; import techreborn.cofhLib.gui.GuiColor; import techreborn.cofhLib.gui.element.ElementSlider; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ResourceLocation; public class GuiPda extends GuiBase { diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 99fb06c26..6248cf8d1 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -6,7 +6,6 @@ import techreborn.client.IconSupplier; import techreborn.client.hud.ChargeHud; import techreborn.client.keybindings.KeyBindings; import techreborn.tiles.idsu.ClientSideIDSUManager; -import techreborn.tiles.idsu.IDSUManager; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index a17c153fc..3551b42a8 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -2,7 +2,6 @@ package techreborn.tiles; import ic2.api.energy.EnergyNet; import ic2.api.tile.IWrenchable; -import ic2.core.block.wiring.TileEntityElectricBlock; import ic2.core.util.Util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,8 +12,6 @@ import techreborn.init.ModBlocks; import techreborn.util.Inventory; import techreborn.util.LogHelper; -import java.lang.reflect.Field; - public class TileAesu extends EUStorageTile implements IWrenchable { public static final int MAX_OUTPUT = 8192; diff --git a/src/main/java/techreborn/tiles/TileAlloySmelter.java b/src/main/java/techreborn/tiles/TileAlloySmelter.java index 9b103d270..0518e301a 100644 --- a/src/main/java/techreborn/tiles/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/TileAlloySmelter.java @@ -14,8 +14,6 @@ import techreborn.api.upgrade.UpgradeHandler; import techreborn.init.ModBlocks; import techreborn.util.Inventory; -import java.util.List; - public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 386fb7c5b..8486a417b 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -13,8 +13,6 @@ import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.util.Inventory; -import java.util.List; - public class TileAssemblingMachine extends TileMachineBase implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileBlastFurnace.java b/src/main/java/techreborn/tiles/TileBlastFurnace.java index 5ef707b13..7cb448b88 100644 --- a/src/main/java/techreborn/tiles/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/TileBlastFurnace.java @@ -13,15 +13,12 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import techreborn.api.TechRebornAPI; import techreborn.api.recipe.RecipeCrafter; -import techreborn.api.upgrade.UpgradeHandler; import techreborn.blocks.BlockMachineCasing; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.lib.Location; import techreborn.util.Inventory; -import techreborn.util.ItemUtils; public class TileBlastFurnace extends TileMachineBase implements IWrenchable, IInventory, IEnergyTile, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileChargeBench.java b/src/main/java/techreborn/tiles/TileChargeBench.java index 1600b78f8..2a4eb6b7d 100644 --- a/src/main/java/techreborn/tiles/TileChargeBench.java +++ b/src/main/java/techreborn/tiles/TileChargeBench.java @@ -4,24 +4,16 @@ import ic2.api.energy.prefab.BasicSink; import ic2.api.energy.tile.IEnergyTile; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; -import ic2.api.item.IElectricItemManager; import ic2.api.tile.IWrenchable; -import ic2.core.item.ElectricItemManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import techreborn.api.recipe.RecipeCrafter; -import techreborn.api.upgrade.UpgradeHandler; -import techreborn.client.hud.ChargeHud; import techreborn.init.ModBlocks; import techreborn.util.Inventory; -import java.util.List; - public class TileChargeBench extends TileMachineBase implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { public BasicSink energy; diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index add2a6fc1..d227ff012 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -13,8 +13,6 @@ import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.util.Inventory; -import java.util.List; - public class TileChemicalReactor extends TileMachineBase implements IWrenchable, IEnergyTile , IInventory, ISidedInventory{ public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileDieselGenerator.java b/src/main/java/techreborn/tiles/TileDieselGenerator.java index 71a952389..1a18654c7 100644 --- a/src/main/java/techreborn/tiles/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/TileDieselGenerator.java @@ -12,7 +12,12 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.util.FluidUtils; diff --git a/src/main/java/techreborn/tiles/TileGasTurbine.java b/src/main/java/techreborn/tiles/TileGasTurbine.java index f8676f114..8a48769a3 100644 --- a/src/main/java/techreborn/tiles/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/TileGasTurbine.java @@ -1,8 +1,5 @@ package techreborn.tiles; -import java.util.Map; -import java.util.HashMap; - import ic2.api.energy.prefab.BasicSource; import ic2.api.energy.tile.IEnergyTile; import ic2.api.tile.IWrenchable; @@ -15,13 +12,21 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.util.FluidUtils; import techreborn.util.Inventory; import techreborn.util.Tank; +import java.util.HashMap; +import java.util.Map; + public class TileGasTurbine extends TileEntity implements IWrenchable, IFluidHandler, IInventory, IEnergyTile { diff --git a/src/main/java/techreborn/tiles/TileGrinder.java b/src/main/java/techreborn/tiles/TileGrinder.java index d9bd167a4..49deb21d0 100644 --- a/src/main/java/techreborn/tiles/TileGrinder.java +++ b/src/main/java/techreborn/tiles/TileGrinder.java @@ -10,14 +10,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import techreborn.api.recipe.RecipeCrafter; import techreborn.blocks.BlockMachineCasing; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.init.ModFluids; import techreborn.lib.Location; -import techreborn.util.FluidUtils; import techreborn.util.Inventory; import techreborn.util.Tank; diff --git a/src/main/java/techreborn/tiles/TileHeatGenerator.java b/src/main/java/techreborn/tiles/TileHeatGenerator.java index cdd49ce34..4c46cf378 100644 --- a/src/main/java/techreborn/tiles/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/TileHeatGenerator.java @@ -10,8 +10,6 @@ import net.minecraft.nbt.NBTTagCompound; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import java.util.List; - public class TileHeatGenerator extends TileMachineBase implements IWrenchable, IEnergyTile { public BasicSource energy; diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index 5e4bd6a1f..2713fdafb 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -16,8 +16,6 @@ import techreborn.init.ModBlocks; import techreborn.lib.Location; import techreborn.util.Inventory; -import java.util.List; - public class TileImplosionCompressor extends TileMachineBase implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index 3811fb2f4..42d59494b 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -20,8 +20,6 @@ import techreborn.init.ModFluids; import techreborn.util.Inventory; import techreborn.util.Tank; -import java.util.List; - public class TileIndustrialElectrolyzer extends TileMachineBase implements IWrenchable, IEnergyTile, IFluidHandler, IInventory, ISidedInventory { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index 03aba1354..a5449558c 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -10,7 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import techreborn.api.recipe.RecipeCrafter; import techreborn.blocks.BlockMachineCasing; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/tiles/TileLathe.java b/src/main/java/techreborn/tiles/TileLathe.java index 76041b979..686858602 100644 --- a/src/main/java/techreborn/tiles/TileLathe.java +++ b/src/main/java/techreborn/tiles/TileLathe.java @@ -10,12 +10,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import techreborn.api.recipe.RecipeCrafter; -import techreborn.asm.Strippable; import techreborn.init.ModBlocks; import techreborn.util.Inventory; -import java.util.List; - public class TileLathe extends TileMachineBase implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java b/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java index c52448035..95962988e 100644 --- a/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java +++ b/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java @@ -13,8 +13,6 @@ import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.util.Inventory; -import java.util.List; - public class TilePlateCuttingMachine extends TileMachineBase implements IWrenchable, IEnergyTile, IInventory, ISidedInventory { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/TileSemifluidGenerator.java index eba4033d0..dc69d9d4d 100644 --- a/src/main/java/techreborn/tiles/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/TileSemifluidGenerator.java @@ -1,8 +1,5 @@ package techreborn.tiles; -import java.util.Map; -import java.util.HashMap; - import ic2.api.energy.prefab.BasicSource; import ic2.api.energy.tile.IEnergyTile; import ic2.api.tile.IWrenchable; @@ -15,13 +12,21 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.util.FluidUtils; import techreborn.util.Inventory; import techreborn.util.Tank; +import java.util.HashMap; +import java.util.Map; + public class TileSemifluidGenerator extends TileEntity implements IWrenchable, IFluidHandler, IInventory, IEnergyTile { diff --git a/src/main/java/techreborn/tiles/TileThermalGenerator.java b/src/main/java/techreborn/tiles/TileThermalGenerator.java index e5e4a8d62..85722f47b 100644 --- a/src/main/java/techreborn/tiles/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/TileThermalGenerator.java @@ -12,7 +12,12 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.util.FluidUtils; diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index 83224f4db..c9fe319d2 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -1,9 +1,7 @@ package techreborn.tiles.lesu; -import ic2.api.tile.IWrenchable; import net.minecraftforge.common.util.ForgeDirection; -import techreborn.blocks.storage.EUStorageTile; import techreborn.config.ConfigTechReborn; import techreborn.powerSystem.TilePowerAcceptor; import techreborn.util.Inventory; diff --git a/src/main/java/techreborn/util/BucketHandler.java b/src/main/java/techreborn/util/BucketHandler.java index 78221de32..6c499a6e1 100644 --- a/src/main/java/techreborn/util/BucketHandler.java +++ b/src/main/java/techreborn/util/BucketHandler.java @@ -1,16 +1,16 @@ package techreborn.util; -import java.util.HashMap; -import java.util.Map; - +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.FillBucketEvent; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +import java.util.HashMap; +import java.util.Map; public class BucketHandler { diff --git a/src/main/java/techreborn/util/ItemUtils.java b/src/main/java/techreborn/util/ItemUtils.java index ccda6a1b1..2a2f8f911 100644 --- a/src/main/java/techreborn/util/ItemUtils.java +++ b/src/main/java/techreborn/util/ItemUtils.java @@ -1,14 +1,14 @@ package techreborn.util; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.List; + /** * Created by mark on 12/04/15. */ diff --git a/src/main/java/techreborn/util/LogHelper.java b/src/main/java/techreborn/util/LogHelper.java index 815d9cf28..00d9cd223 100644 --- a/src/main/java/techreborn/util/LogHelper.java +++ b/src/main/java/techreborn/util/LogHelper.java @@ -1,9 +1,8 @@ package techreborn.util; -import org.apache.logging.log4j.Level; - -import techreborn.lib.ModInfo; import cpw.mods.fml.common.FMLLog; +import org.apache.logging.log4j.Level; +import techreborn.lib.ModInfo; public class LogHelper { diff --git a/src/main/java/techreborn/util/OreDrop.java b/src/main/java/techreborn/util/OreDrop.java index 5f263c5a7..7a9ee613c 100644 --- a/src/main/java/techreborn/util/OreDrop.java +++ b/src/main/java/techreborn/util/OreDrop.java @@ -1,10 +1,11 @@ package techreborn.util; -import java.util.Random; import net.minecraft.item.ItemStack; import techreborn.config.ConfigTechReborn; +import java.util.Random; + public class OreDrop { public OreDrop(ItemStack drop) diff --git a/src/main/java/techreborn/util/OreDropSet.java b/src/main/java/techreborn/util/OreDropSet.java index 055266538..3ccb2ea5e 100644 --- a/src/main/java/techreborn/util/OreDropSet.java +++ b/src/main/java/techreborn/util/OreDropSet.java @@ -1,8 +1,9 @@ package techreborn.util; +import net.minecraft.item.ItemStack; + import java.util.ArrayList; import java.util.Random; -import net.minecraft.item.ItemStack; public class OreDropSet { diff --git a/src/main/java/techreborn/util/RecipeRemover.java b/src/main/java/techreborn/util/RecipeRemover.java index 5ede061ba..8b6bb3a77 100644 --- a/src/main/java/techreborn/util/RecipeRemover.java +++ b/src/main/java/techreborn/util/RecipeRemover.java @@ -1,12 +1,12 @@ package techreborn.util; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; +import java.util.List; + public class RecipeRemover { public static void removeShapedRecipes(List removelist) { diff --git a/src/main/java/techreborn/world/DungeonLoot.java b/src/main/java/techreborn/world/DungeonLoot.java index ab4228671..a7360511c 100644 --- a/src/main/java/techreborn/world/DungeonLoot.java +++ b/src/main/java/techreborn/world/DungeonLoot.java @@ -1,10 +1,9 @@ package techreborn.world; -import techreborn.items.ItemIngots; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; +import techreborn.items.ItemIngots; public class DungeonLoot { diff --git a/src/main/java/techreborn/world/TROreGen.java b/src/main/java/techreborn/world/TROreGen.java index 1a2703822..62fb9b929 100644 --- a/src/main/java/techreborn/world/TROreGen.java +++ b/src/main/java/techreborn/world/TROreGen.java @@ -1,7 +1,6 @@ package techreborn.world; -import java.util.Random; - +import cpw.mods.fml.common.IWorldGenerator; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -9,7 +8,8 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.util.LogHelper; -import cpw.mods.fml.common.IWorldGenerator; + +import java.util.Random; public class TROreGen implements IWorldGenerator { public static ConfigTechReborn config;