From 3654052fb63a571c5eaca7f20714b87c17f7e966 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Fri, 4 Nov 2016 15:05:30 +1000 Subject: % Cleaned up Imports. --- src/Java/gtPlusPlus/GTplusplus.java | 28 ++++++------- src/Java/gtPlusPlus/core/block/ModBlocks.java | 3 +- .../core/block/base/BlockBaseModular.java | 8 ++-- .../gtPlusPlus/core/block/general/LightGlass.java | 9 ++--- .../core/block/general/antigrief/TowerDevice.java | 12 +++--- .../general/fluids/BlockFluidJackDaniels.java | 4 +- .../core/block/machine/BlockGtFrameBox.java | 2 +- .../core/block/machine/Machine_Charger.java | 5 +-- .../gtPlusPlus/core/block/machine/Machine_NHG.java | 5 +-- .../core/block/machine/Machine_Workbench.java | 12 +++--- .../block/machine/Machine_WorkbenchAdvanced.java | 12 +++--- .../machine/heliumgen/block/HeliumGenerator.java | 9 ++--- .../container/ContainerHeliumGenerator.java | 5 +-- .../machine/heliumgen/gui/GUIHeliumGenerator.java | 9 ++--- .../tileentity/TileEntityHeliumGenerator.java | 9 ++--- src/Java/gtPlusPlus/core/commands/CommandMath.java | 5 +-- src/Java/gtPlusPlus/core/common/CommonProxy.java | 17 +++----- .../common/compat/COMPAT_CompactWindmills.java | 1 + .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 3 +- .../gtPlusPlus/core/container/Container_NHG.java | 4 +- .../core/container/Container_Workbench.java | 15 ++----- .../container/Container_WorkbenchAdvanced.java | 15 ++----- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 6 +-- .../gtPlusPlus/core/entity/EntityTeleportFX.java | 4 +- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 6 +-- .../core/fluids/FluidRegistryHandler.java | 3 +- src/Java/gtPlusPlus/core/fluids/GenericFluid.java | 2 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 6 +-- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 6 +-- .../gtPlusPlus/core/gui/machine/GUI_Charger.java | 4 +- src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java | 4 +- .../gtPlusPlus/core/gui/machine/GUI_Workbench.java | 9 ++--- .../core/gui/machine/GUI_WorkbenchAdvanced.java | 9 ++--- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 46 ++++------------------ src/Java/gtPlusPlus/core/handler/GuiHandler.java | 8 ++-- .../core/handler/Recipes/RegistrationHandler.java | 7 +--- .../core/handler/events/LoginEventHandler.java | 9 ++--- .../events/PickaxeBlockBreakEventHandler.java | 11 ++---- .../handler/events/UnbreakableBlockManager.java | 4 +- .../workbench/Workbench_CraftingHandler.java | 8 +--- .../handler/workbench/Workbench_RecipeSorter.java | 4 +- .../core/inventories/BaseInventoryBackpack.java | 3 +- .../inventories/InventoryWorkbenchCrafting.java | 4 +- src/Java/gtPlusPlus/core/item/ModItems.java | 25 ++++-------- src/Java/gtPlusPlus/core/item/base/BaseEuItem.java | 29 +++++--------- .../core/item/base/BaseItemBackpack.java | 6 +-- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 4 +- .../core/item/base/BaseItemComponent.java | 7 ++-- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 3 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 5 +-- .../core/item/base/BaseItemWithCharge.java | 5 +-- .../core/item/base/BaseItemWithDamageValue.java | 3 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 24 ++++------- src/Java/gtPlusPlus/core/item/base/CoreItem.java | 13 +++--- .../core/item/base/cell/BaseItemCell.java | 4 +- .../core/item/base/dusts/BaseItemDust.java | 8 ++-- .../core/item/base/dusts/BaseItemDustAbstract.java | 5 +-- .../core/item/base/dusts/BaseItemDustUnique.java | 8 ++-- .../item/base/dusts/decimal/BaseItemCentidust.java | 7 ++-- .../item/base/dusts/decimal/BaseItemDecidust.java | 7 ++-- .../core/item/base/foods/BaseItemFood.java | 2 +- .../core/item/base/foods/BaseItemHotFood.java | 5 +-- .../core/item/base/ingots/BaseItemIngot.java | 7 ++-- .../core/item/base/ingots/BaseItemIngotHot.java | 5 +-- .../core/item/base/itemblock/ItemBlockFluid.java | 5 +-- .../core/item/base/itemblock/ItemBlockGtBlock.java | 5 +-- .../gtPlusPlus/core/item/effects/RarityEffect.java | 6 +-- .../gtPlusPlus/core/item/effects/RarityEpic.java | 6 +-- .../gtPlusPlus/core/item/effects/RarityRare.java | 6 +-- .../core/item/effects/RarityUncommon.java | 4 +- .../core/item/general/BedLocator_Base.java | 5 +-- .../gtPlusPlus/core/item/general/BufferCore.java | 9 ++--- .../core/item/general/ItemBlueprint.java | 7 ++-- .../core/item/general/ItemCloakingDevice.java | 17 ++++---- .../core/item/general/ItemHealingDevice.java | 17 ++++---- .../core/item/general/NuclearFuelRodBase.java | 2 +- .../core/item/general/RF2EU_Battery.java | 19 ++++----- .../core/item/general/fuelrods/FuelRod_Base.java | 5 +-- .../core/item/tool/misc/SandstoneHammer.java | 9 ++--- .../core/item/tool/staballoy/MultiPickaxeBase.java | 6 +-- .../core/item/tool/staballoy/MultiSpadeBase.java | 6 +-- .../core/item/tool/staballoy/StaballoyAxe.java | 28 +++---------- .../core/item/tool/staballoy/StaballoyPickaxe.java | 17 +++----- .../core/item/tool/staballoy/StaballoySpade.java | 17 +++----- src/Java/gtPlusPlus/core/lib/CORE.java | 7 ++-- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 2 +- src/Java/gtPlusPlus/core/material/Material.java | 10 ++--- .../core/material/MaterialGenerator.java | 6 +-- .../gtPlusPlus/core/material/MaterialStack.java | 3 +- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 7 +--- src/Java/gtPlusPlus/core/proxy/ServerProxy.java | 4 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 5 +-- .../core/recipe/RECIPES_LaserEngraver.java | 5 +-- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 5 +-- .../core/recipe/RECIPES_MachineComponents.java | 6 +-- src/Java/gtPlusPlus/core/slots/SlotCrafting.java | 8 +--- src/Java/gtPlusPlus/core/slots/SlotFrame.java | 2 +- src/Java/gtPlusPlus/core/slots/SlotOutput.java | 2 +- .../core/tileentities/ModTileEntities.java | 2 +- .../tileentities/general/TileEntityReverter.java | 3 +- .../tileentities/machines/TileEntityWorkbench.java | 12 ++---- .../machines/TileEntityWorkbenchAdvanced.java | 12 ++---- src/Java/gtPlusPlus/core/util/ClassUtils.java | 4 +- src/Java/gtPlusPlus/core/util/LoggingUtils.java | 5 +-- src/Java/gtPlusPlus/core/util/Utils.java | 30 +++++--------- .../gtPlusPlus/core/util/UtilsChatFormatting.java | 5 +-- .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 2 +- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 8 ++-- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 24 +++-------- .../core/util/debug/DEBUG_ScreenOverlay.java | 6 +-- .../core/util/debug/DEBUG_TimerThread.java | 3 +- .../gtPlusPlus/core/util/entity/EntityUtils.java | 7 +--- .../gtPlusPlus/core/util/fluid/FluidUtils.java | 10 +---- .../gregtech/recipehandlers/GregtechRecipe.java | 5 +-- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 9 ++--- .../core/util/materials/MaterialUtils.java | 12 ++---- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 4 +- .../core/util/networking/NetworkUtils.java | 8 +--- .../gtPlusPlus/core/util/player/PlayerCache.java | 21 ++-------- .../gtPlusPlus/core/util/player/PlayerUtils.java | 9 ++--- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 13 ++---- .../core/util/recipe/shapeless/ShapelessUtils.java | 3 +- .../core/util/reflect/ReflectionUtils.java | 6 +-- .../xmod/Computronics/HANDLER_Computronics.java | 5 +-- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 2 +- .../bees/alveary/FR_AlvearyFrameBlock.java | 8 +--- .../forestry/bees/alveary/FR_BlockAlveary.java | 18 ++++----- .../xmod/forestry/bees/alveary/FR_TileAlveary.java | 24 ++++------- .../bees/alveary/ISidedFrameWearingInventory.java | 2 +- .../bees/alveary/TileAlvearyFrameHousing.java | 40 ++++++------------- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 10 ++--- .../bees/alveary/gui/GUI_FrameHousing.java | 4 +- .../bees/alveary/gui/InventoryFrameHousing.java | 22 ++++------- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 11 ++---- .../xmod/forestry/bees/items/MB_ItemFrame.java | 16 +++----- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 4 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 5 +-- .../gregtech/api/enums/GregtechOrePrefixes.java | 26 +++--------- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 13 +++--- .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 5 +-- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 9 ++--- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 9 ++--- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 1 + .../internal/Interface_ItemBehaviour.java | 5 +-- .../interfaces/internal/Interface_ToolStats.java | 5 +-- .../gregtech/api/items/Gregtech_Generic_Item.java | 20 ++++------ .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 26 ++++-------- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 18 +++------ .../gregtech/api/items/Gregtech_MetaItem_X32.java | 19 ++++----- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 18 ++++----- .../gregtech/api/items/tools/GT_MetaGenTool.java | 18 +++------ .../gregtech/api/items/types/ToolType_Base.java | 9 ++--- .../api/items/types/ToolType_HardHammer.java | 12 ++---- .../gregtech/api/items/types/ToolType_Wrench.java | 11 ++---- .../implementations/GregtechMetaEnergyBuffer.java | 1 + .../GregtechMetaPipeEntityFluid.java | 18 ++++----- .../GregtechMetaPipeEntity_Cable.java | 19 ++++----- .../GregtechMetaPipeEntity_SuperConductor.java | 18 ++++----- .../GregtechMetaSuperConductorNodeBase.java | 6 +-- .../base/GregtechMetaPipeEntityBase_Cable.java | 20 ++++------ .../base/GregtechMetaTileEntity.java | 1 + .../base/GregtechMeta_MultiBlockBase.java | 25 +++--------- .../GregtechDoubleFuelGeneratorBase.java | 6 +-- .../base/generators/GregtechMetaBoilerBase.java | 4 +- .../generators/GregtechMetaSolarGenerator.java | 1 + .../GregtechRocketFuelGeneratorBase.java | 6 +-- .../GregtechBaseMetaTileEntityLossless.java | 18 +++------ .../GregtechMetaPipeEntity_BaseSuperConductor.java | 22 +++++------ .../lossless/GregtechMetaTileEntityLossless.java | 1 + ...chMetaTileEntityLosslessTieredMachineBlock.java | 1 + .../base/lossless/MetaTileEntityLossless.java | 21 ++++------ .../base/machines/GregtechMetaSafeBlockBase.java | 6 +-- .../creative/GregtechMetaCreativeEnergyBuffer.java | 10 +---- .../gregtech/api/objects/GregtechItemData.java | 9 +---- .../api/objects/GregtechRenderedTexture.java | 4 +- .../ProcessingSkookumChoocherToolRecipes.java | 4 +- .../api/util/GregtechOreDictUnificator.java | 18 ++++----- .../api/util/GregtechRecipeRegistrator.java | 13 ++---- .../xmod/gregtech/common/Meta_GT_Proxy.java | 36 +++++------------ .../common/blocks/GregtechMetaCasingBlocks.java | 4 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 4 -- .../blocks/GregtechMetaCasingBlocksAbstract.java | 15 +++---- .../blocks/GregtechMetaItemCasingsAbstract.java | 3 +- .../common/blocks/fluid/GregtechFluidHandler.java | 4 +- .../blocks/textures/CasingTextureHandler2.java | 3 -- .../common/items/MetaGeneratedGregtechItems.java | 16 ++------ .../items/behaviours/Behaviour_Choocher.java | 5 +-- .../items/behaviours/Behaviour_Prospecting_Ex.java | 9 ++--- .../GT_MetaTileEntity_TesseractGenerator.java | 10 ++--- .../GT_MetaTileEntity_TesseractTerminal.java | 4 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 6 +-- .../GregtechMetaTileEntityGeothermalGenerator.java | 6 +-- .../GregtechMetaTileEntityRocketFuelGenerator.java | 6 +-- .../GregtechMetaTileEntitySolarGenerator.java | 1 + .../basic/GregtechMetaTileEntityChunkLoader.java | 1 + .../machines/multi/GregtechMTE_NuclearReactor.java | 16 +++----- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 11 ++---- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 11 +++--- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 12 +++--- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 12 +++--- ...GregtechMetaTileEntity_IndustrialMacerator.java | 7 +--- ...regtechMetaTileEntity_IndustrialPlatePress.java | 8 ++-- .../GregtechMetaTileEntity_IndustrialSinter.java | 9 ++--- .../GregtechMetaTileEntity_IndustrialWireMill.java | 5 +-- .../GregtechMetaTileEntity_MassFabricator.java | 21 ++++------ .../multi/GregtechMetaTileEntity_MultiTank.java | 7 ++-- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 10 ++--- .../common/tools/TOOL_Gregtech_Choocher.java | 11 ++---- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 4 +- .../loaders/ProcessingToolHeadChoocher.java | 5 +-- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 5 +-- .../gregtech/loaders/RecipeGen_BlastSmelterGT.java | 4 +- .../registration/gregtech/GregtechConduits.java | 19 +++------ .../gregtech/GregtechEnergyBuffer.java | 4 +- .../GregtechGeothermalThermalGenerator.java | 4 +- .../gregtech/GregtechRocketFuelGenerator.java | 4 +- .../registration/gregtech/GregtechSafeBlock.java | 5 +-- .../gregtech/GregtechSolarGenerators.java | 2 +- .../xmod/growthcraft/booze/Register_Booze.java | 6 +-- .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 22 +++++------ .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 4 +- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 5 +-- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 9 ++--- .../kieticgenerator/IC2_BlockKineticGenerator.java | 7 ++-- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 3 +- .../container/ContainerKineticWindgenerator.java | 5 +-- .../gui/GuiKineticWindGenerator.java | 9 ++--- .../tileentity/TileEntityKineticWindGenerator.java | 16 +++----- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 11 ++---- src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 10 ++--- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 3 +- src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 5 +-- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 5 +-- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 9 +---- .../block/TF_Block_Fluid_Cryotheum.java | 24 +++++------ .../block/TF_Block_Fluid_Pyrotheum.java | 17 ++++---- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 4 +- .../xmod/thermalfoundation/item/TF_Items.java | 10 ++--- .../recipe/TF_Gregtech_Recipes.java | 4 +- 239 files changed, 769 insertions(+), 1423 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 7065393c26..b3847da83d 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -7,6 +7,17 @@ import static gtPlusPlus.core.lib.CORE.configSwitches.enableAlternativeBatteryAl import static gtPlusPlus.core.lib.CORE.configSwitches.enableAlternativeDivisionSigilRecipe; import static gtPlusPlus.core.lib.CORE.configSwitches.enableCustomAlvearyBlocks; import static gtPlusPlus.core.lib.CORE.configSwitches.enableThaumcraftShardUnification; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.util.Collection; + +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_Config; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; @@ -25,24 +36,7 @@ import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.util.Collection; - import net.minecraftforge.common.config.Configuration; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -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.event.FMLServerStoppingEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @Mod(modid=CORE.MODID, name=CORE.name, version=CORE.VERSION, dependencies="required-after:Forge; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;") public class GTplusplus diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 3b6f061ca7..2e6a7c3e07 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -1,16 +1,15 @@ package gtPlusPlus.core.block; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.general.LightGlass; import gtPlusPlus.core.block.machine.Machine_Workbench; import gtPlusPlus.core.block.machine.Machine_WorkbenchAdvanced; import gtPlusPlus.core.fluids.FluidRegistryHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.common.registry.GameRegistry; public final class ModBlocks { diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index a2d2589f5e..5d003fc2a3 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.block.base; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox; import gtPlusPlus.core.lib.CORE; @@ -8,10 +12,6 @@ import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockBaseModular extends BasicBlock{ diff --git a/src/Java/gtPlusPlus/core/block/general/LightGlass.java b/src/Java/gtPlusPlus/core/block/general/LightGlass.java index 5aa9f5b818..873752d8a3 100644 --- a/src/Java/gtPlusPlus/core/block/general/LightGlass.java +++ b/src/Java/gtPlusPlus/core/block/general/LightGlass.java @@ -1,18 +1,17 @@ package gtPlusPlus.core.block.general; +import java.util.Random; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; - -import java.util.Random; - import net.minecraft.block.BlockBreakable; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class LightGlass extends BlockBreakable { diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java index 7fa890b6c8..ab5417a0e5 100644 --- a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java @@ -1,14 +1,16 @@ package gtPlusPlus.core.block.general.antigrief; import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityReverter; -import gtPlusPlus.core.util.Utils; import java.util.List; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityReverter; +import gtPlusPlus.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,8 +25,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TowerDevice extends Block { private static IIcon TEX_ANTIBUILDER; diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java index 6096da7054..6a8c89064f 100644 --- a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java +++ b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.general.fluids; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import net.minecraft.block.material.Material; @@ -9,8 +11,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockFluidJackDaniels extends BlockFluidClassic { diff --git a/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java index 2832d4d0a4..6de87e522b 100644 --- a/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java +++ b/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.block.machine; -import gtPlusPlus.core.block.base.MetaBlock; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; +import gtPlusPlus.core.block.base.MetaBlock; import gtPlusPlus.core.lib.CORE; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java index 4f426b99c9..43a38d0b52 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java @@ -1,12 +1,11 @@ package gtPlusPlus.core.block.machine; +import java.util.ArrayList; + import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityCharger; - -import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java b/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java index 011e293000..72cfc91826 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java @@ -1,12 +1,11 @@ package gtPlusPlus.core.block.machine; +import java.util.ArrayList; + import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityNHG; - -import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java index ed986b756e..6827ec6741 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java @@ -1,5 +1,11 @@ package gtPlusPlus.core.block.machine; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.api.tool.ITool; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; @@ -15,12 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.api.tool.ITool; public class Machine_Workbench extends BlockContainer { diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java index 2f061ea298..37b801836f 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java @@ -1,5 +1,11 @@ package gtPlusPlus.core.block.machine; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.api.tool.ITool; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; @@ -15,12 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.api.tool.ITool; public class Machine_WorkbenchAdvanced extends BlockContainer { diff --git a/src/Java/gtPlusPlus/core/block/machine/heliumgen/block/HeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/block/HeliumGenerator.java index 7a76b09cca..e83e189ddf 100644 --- a/src/Java/gtPlusPlus/core/block/machine/heliumgen/block/HeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/block/HeliumGenerator.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.block.machine.heliumgen.block; +import java.util.Random; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; - -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,8 +22,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class HeliumGenerator extends BlockContainer { diff --git a/src/Java/gtPlusPlus/core/block/machine/heliumgen/container/ContainerHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/container/ContainerHeliumGenerator.java index d701f6f125..6531d5810f 100644 --- a/src/Java/gtPlusPlus/core/block/machine/heliumgen/container/ContainerHeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/container/ContainerHeliumGenerator.java @@ -1,11 +1,10 @@ package gtPlusPlus.core.block.machine.heliumgen.container; +import java.util.List; + import gtPlusPlus.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator; import ic2.core.ContainerBase; import ic2.core.slot.SlotInvSlot; - -import java.util.List; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; diff --git a/src/Java/gtPlusPlus/core/block/machine/heliumgen/gui/GUIHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/gui/GUIHeliumGenerator.java index 2106f144be..850a7f3629 100644 --- a/src/Java/gtPlusPlus/core/block/machine/heliumgen/gui/GUIHeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/gui/GUIHeliumGenerator.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.block.machine.heliumgen.gui; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.block.machine.heliumgen.container.ContainerHeliumGenerator; import gtPlusPlus.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator; import gtPlusPlus.core.lib.CORE; @@ -8,11 +12,6 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GUIHeliumGenerator extends GuiContainer { diff --git a/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java index 5ffd70efc4..805f3df2f8 100644 --- a/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.block.machine.heliumgen.tileentity; +import java.util.List; + import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.block.machine.heliumgen.slots.InvSlotRadiation; import gtPlusPlus.core.item.ModItems; @@ -9,17 +11,12 @@ import ic2.api.Direction; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; import ic2.api.tile.IWrenchable; -import ic2.core.IC2; -import ic2.core.IC2DamageSource; -import ic2.core.Ic2Items; +import ic2.core.*; import ic2.core.block.TileEntityInventory; import ic2.core.init.MainConfig; import ic2.core.item.reactor.ItemReactorHeatStorage; import ic2.core.network.NetworkManager; import ic2.core.util.ConfigUtil; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java index 01091d84e3..914b4f67a2 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java @@ -1,11 +1,10 @@ package gtPlusPlus.core.commands; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.player.PlayerUtils; - import java.util.ArrayList; import java.util.List; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.player.PlayerUtils; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 53c4256ed6..76ffc5dcac 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -1,11 +1,14 @@ package gtPlusPlus.core.common; import static gtPlusPlus.core.lib.CORE.DEBUG; + +import java.util.Iterator; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.*; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.COMPAT_HANDLER; -import gtPlusPlus.core.handler.COMPAT_IntermodStaging; -import gtPlusPlus.core.handler.GuiHandler; +import gtPlusPlus.core.handler.*; import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; @@ -16,18 +19,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.player.PlayerCache; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; - -import java.util.Iterator; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.FMLCommonHandler; -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; public class CommonProxy { diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java index c64e332c50..0c3d61a955 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java @@ -2,6 +2,7 @@ package gtPlusPlus.core.common.compat; import static gtPlusPlus.core.handler.COMPAT_HANDLER.AddRecipeQueue; import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; + import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index c1546bba63..593deb9b11 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java @@ -2,8 +2,9 @@ package gtPlusPlus.core.common.compat; import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; -import gtPlusPlus.core.lib.LoadedMods; + import gtPlusPlus.core.lib.CORE.configSwitches; +import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/container/Container_NHG.java b/src/Java/gtPlusPlus/core/container/Container_NHG.java index 64a84ce680..5fd19489c0 100644 --- a/src/Java/gtPlusPlus/core/container/Container_NHG.java +++ b/src/Java/gtPlusPlus/core/container/Container_NHG.java @@ -2,9 +2,7 @@ package gtPlusPlus.core.container; import gtPlusPlus.core.tileentities.machines.TileEntityNHG; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.inventory.SlotFurnace; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; public class Container_NHG extends Container diff --git a/src/Java/gtPlusPlus/core/container/Container_Workbench.java b/src/Java/gtPlusPlus/core/container/Container_Workbench.java index c814f8815e..25ea6e8fe5 100644 --- a/src/Java/gtPlusPlus/core/container/Container_Workbench.java +++ b/src/Java/gtPlusPlus/core/container/Container_Workbench.java @@ -3,24 +3,15 @@ package gtPlusPlus.core.container; import gregtech.api.gui.GT_Slot_Holo; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.interfaces.IItemBlueprint; -import gtPlusPlus.core.inventories.InventoryWorkbenchChest; -import gtPlusPlus.core.inventories.InventoryWorkbenchHoloCrafting; -import gtPlusPlus.core.inventories.InventoryWorkbenchHoloSlots; -import gtPlusPlus.core.inventories.InventoryWorkbenchTools; +import gtPlusPlus.core.inventories.*; import gtPlusPlus.core.item.general.ItemBlueprint; -import gtPlusPlus.core.slots.SlotBlueprint; -import gtPlusPlus.core.slots.SlotGtTool; -import gtPlusPlus.core.slots.SlotNoInput; -import gtPlusPlus.core.slots.SlotOutput; +import gtPlusPlus.core.slots.*; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; diff --git a/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java index f7dc7bb08c..8451cd0d2d 100644 --- a/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java +++ b/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java @@ -3,24 +3,15 @@ package gtPlusPlus.core.container; import gregtech.api.gui.GT_Slot_Holo; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.interfaces.IItemBlueprint; -import gtPlusPlus.core.inventories.InventoryWorkbenchChest; -import gtPlusPlus.core.inventories.InventoryWorkbenchHoloCrafting; -import gtPlusPlus.core.inventories.InventoryWorkbenchHoloSlots; -import gtPlusPlus.core.inventories.InventoryWorkbenchToolsElectric; +import gtPlusPlus.core.inventories.*; import gtPlusPlus.core.item.general.ItemBlueprint; -import gtPlusPlus.core.slots.SlotBlueprint; -import gtPlusPlus.core.slots.SlotGtToolElectric; -import gtPlusPlus.core.slots.SlotNoInput; -import gtPlusPlus.core.slots.SlotOutput; +import gtPlusPlus.core.slots.*; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; diff --git a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java index 31613f2b85..b6bbe2c0a8 100644 --- a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -1,10 +1,6 @@ package gtPlusPlus.core.creative; -import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabBlock; -import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabMachines; -import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabMisc; -import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabOther; -import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabTools; +import gtPlusPlus.core.creative.tabs.*; import gtPlusPlus.core.lib.CORE; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java b/src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java index eff516c289..d6fd8534fe 100644 --- a/src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java +++ b/src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Items; @@ -7,8 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class EntityTeleportFX extends Entity { diff --git a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java index 52bfa7d2d9..4ca7d6aedb 100644 --- a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java +++ b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.fluids; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; @@ -11,9 +14,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockFluidBase extends BlockFluidClassic { diff --git a/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java b/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java index 477d5da944..73d74adf57 100644 --- a/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java +++ b/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java @@ -2,11 +2,12 @@ package gtPlusPlus.core.fluids; import static gtPlusPlus.core.block.ModBlocks.blockFluidJackDaniels; import static gtPlusPlus.core.block.ModBlocks.fluidJackDaniels; + +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.general.fluids.BlockFluidJackDaniels; import gtPlusPlus.core.lib.CORE; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.FluidRegistry; -import cpw.mods.fml.common.registry.GameRegistry; public class FluidRegistryHandler { diff --git a/src/Java/gtPlusPlus/core/fluids/GenericFluid.java b/src/Java/gtPlusPlus/core/fluids/GenericFluid.java index 38af8774eb..f855030d53 100644 --- a/src/Java/gtPlusPlus/core/fluids/GenericFluid.java +++ b/src/Java/gtPlusPlus/core/fluids/GenericFluid.java @@ -1,11 +1,11 @@ package gtPlusPlus.core.fluids; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.item.base.itemblock.ItemBlockFluid; import gtPlusPlus.core.material.Material; import net.minecraft.block.Block; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import cpw.mods.fml.common.registry.GameRegistry; public class GenericFluid extends Fluid{ diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java index b3531ceb3e..89ac13b697 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java +++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java @@ -1,10 +1,8 @@ package gtPlusPlus.core.gui.beta; -import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; +import java.util.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; public class Gui_ID_Registry { diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java index cd7b141bd4..263e9d58fa 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java +++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.gui.item; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import gtPlusPlus.core.container.Container_BackpackBase; import gtPlusPlus.core.inventories.BaseInventoryBackpack; import gtPlusPlus.core.lib.CORE; @@ -11,9 +14,6 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - public class GuiBaseBackpack extends GuiContainer { /** x and y size of the inventory window in pixels. Defined as float, passed as int diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java index c1f687c554..27f0dc5c04 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java +++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import org.lwjgl.opengl.GL11; + import gtPlusPlus.core.container.Container_Charger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityCharger; @@ -10,8 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - public class GUI_Charger extends GuiContainer { private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/machine_Charger.png"); diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java index 09b2ee93d8..acfe8fcc3b 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java +++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.gui.machine; +import org.lwjgl.opengl.GL11; + import gtPlusPlus.core.container.Container_NHG; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityNHG; @@ -10,8 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - public class GUI_NHG extends GuiContainer { private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/helium_collector_gui_12.png"); diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java index 86388a2632..6c108312b4 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java +++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.gui.machine; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_Workbench; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; @@ -8,11 +12,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GUI_Workbench extends GuiContainer { diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java index 5c04acf13b..34b5472f32 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java +++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.gui.machine; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.container.Container_WorkbenchAdvanced; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced; @@ -7,11 +11,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GUI_WorkbenchAdvanced extends GuiContainer { diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 63cf7d42c2..d6caf1af72 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -1,54 +1,22 @@ package gtPlusPlus.core.handler; import static gtPlusPlus.core.lib.LoadedMods.Gregtech; + +import java.util.LinkedList; +import java.util.Queue; + import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.common.compat.COMPAT_BigReactors; -import gtPlusPlus.core.common.compat.COMPAT_CompactWindmills; -import gtPlusPlus.core.common.compat.COMPAT_EnderIO; -import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils; -import gtPlusPlus.core.common.compat.COMPAT_IC2; -import gtPlusPlus.core.common.compat.COMPAT_MorePlanets; -import gtPlusPlus.core.common.compat.COMPAT_PneumaticCraft; -import gtPlusPlus.core.common.compat.COMPAT_RFTools; -import gtPlusPlus.core.common.compat.COMPAT_SimplyJetpacks; -import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft; +import gtPlusPlus.core.common.compat.*; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.recipe.RECIPES_GREGTECH; -import gtPlusPlus.core.recipe.RECIPES_LaserEngraver; -import gtPlusPlus.core.recipe.ShapedRecipeObject; +import gtPlusPlus.core.recipe.*; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; -import gtPlusPlus.xmod.gregtech.registration.gregtech.Gregtech4Content; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeothermalThermalGenerator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialBlastSmelter; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMultiTank; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSafeBlock; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarGenerators; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamCondenser; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperConductionPoint; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredFluidTanks; - -import java.util.LinkedList; -import java.util.Queue; - +import gtPlusPlus.xmod.gregtech.registration.gregtech.*; import net.minecraft.item.ItemStack; public class COMPAT_HANDLER { diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java index c2b120d428..a5af5cd378 100644 --- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java +++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java @@ -1,9 +1,9 @@ package gtPlusPlus.core.handler; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.network.NetworkRegistry; import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.container.Container_BackpackBase; -import gtPlusPlus.core.container.Container_Workbench; -import gtPlusPlus.core.container.Container_WorkbenchAdvanced; +import gtPlusPlus.core.container.*; import gtPlusPlus.core.gui.beta.Gui_ID_Registry; import gtPlusPlus.core.gui.beta.MU_GuiId; import gtPlusPlus.core.gui.item.GuiBaseBackpack; @@ -22,8 +22,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.NetworkRegistry; public class GuiHandler implements IGuiHandler { diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java index 275a67f571..30e15668d9 100644 --- a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java +++ b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java @@ -1,12 +1,7 @@ package gtPlusPlus.core.handler.Recipes; import gtPlusPlus.core.handler.COMPAT_HANDLER; -import gtPlusPlus.core.recipe.RECIPES_General; -import gtPlusPlus.core.recipe.RECIPES_MachineComponents; -import gtPlusPlus.core.recipe.RECIPES_Machines; -import gtPlusPlus.core.recipe.RECIPES_Shapeless; -import gtPlusPlus.core.recipe.RECIPES_Tools; -import gtPlusPlus.core.recipe.RECIPE_Batteries; +import gtPlusPlus.core.recipe.*; import gtPlusPlus.core.util.Utils; public class RegistrationHandler { diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java index e529d47699..90f231faf4 100644 --- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java @@ -1,16 +1,15 @@ package gtPlusPlus.core.handler.events; +import java.util.UUID; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.PlayerCache; import gtPlusPlus.core.util.player.PlayerUtils; - -import java.util.UUID; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; public class LoginEventHandler { diff --git a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java index 49b844f057..1bbfd13123 100644 --- a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java @@ -1,21 +1,18 @@ package gtPlusPlus.core.handler.events; +import java.util.UUID; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.BaseTileEntity; +import gregtech.api.metatileentity.*; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase; - -import java.util.UUID; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent.BreakEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class PickaxeBlockBreakEventHandler { @SubscribeEvent diff --git a/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java b/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java index 3e126d4463..4abffed1bc 100644 --- a/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java +++ b/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java @@ -1,9 +1,7 @@ package gtPlusPlus.core.handler.events; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.BaseTileEntity; +import gregtech.api.metatileentity.*; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; import net.minecraft.block.Block; diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java index b5c0c035ec..f37886c6c0 100644 --- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java +++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java @@ -1,8 +1,6 @@ package gtPlusPlus.core.handler.workbench; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; +import java.util.*; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -10,9 +8,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.item.crafting.*; import net.minecraft.world.World; public class Workbench_CraftingHandler { diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java index 79d80aa677..97ea2365c0 100644 --- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java +++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java @@ -2,9 +2,7 @@ package gtPlusPlus.core.handler.workbench; import java.util.Comparator; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.item.crafting.*; public class Workbench_RecipeSorter implements Comparator { diff --git a/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java b/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java index 59fe8aa4fa..3513e34a63 100644 --- a/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java +++ b/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java @@ -1,9 +1,8 @@ package gtPlusPlus.core.inventories; -import gtPlusPlus.core.item.base.BaseItemBackpack; - import java.util.UUID; +import gtPlusPlus.core.item.base.BaseItemBackpack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java index 333bb5c847..8c0738cab9 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java +++ b/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java @@ -1,9 +1,7 @@ package gtPlusPlus.core.inventories; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 2fa0d2c698..884973572d 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -2,13 +2,13 @@ package gtPlusPlus.core.item; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT; + +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.common.compat.COMPAT_Baubles; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.BaseEuItem; -import gtPlusPlus.core.item.base.BaseItemBackpack; -import gtPlusPlus.core.item.base.CoreItem; +import gtPlusPlus.core.item.base.*; import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust; import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust; import gtPlusPlus.core.item.base.foods.BaseItemFood; @@ -16,33 +16,22 @@ import gtPlusPlus.core.item.base.foods.BaseItemHotFood; import gtPlusPlus.core.item.base.ingots.BaseItemIngot; import gtPlusPlus.core.item.base.plates.BaseItemPlate; import gtPlusPlus.core.item.effects.RarityUncommon; -import gtPlusPlus.core.item.general.BufferCore; -import gtPlusPlus.core.item.general.ItemBlueprint; -import gtPlusPlus.core.item.general.RF2EU_Battery; +import gtPlusPlus.core.item.general.*; import gtPlusPlus.core.item.general.fuelrods.FuelRod_Base; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.tool.misc.SandstoneHammer; -import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase; -import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase; -import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe; -import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe; +import gtPlusPlus.core.item.tool.staballoy.*; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.configSwitches; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.*; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.item.ItemUtils; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; +import net.minecraft.item.*; import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; -import cpw.mods.fml.common.registry.GameRegistry; public final class ModItems { public static ToolMaterial STABALLOY = EnumHelper.addToolMaterial("Staballoy", 3, 2500, 7, 1.0F, 18); diff --git a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java index 80412fdd3c..e9e2317044 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java @@ -2,6 +2,12 @@ package gtPlusPlus.core.item.base; import static gregtech.api.enums.GT_Values.D1; import static gregtech.api.enums.GT_Values.V; + +import java.util.*; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.SubTag; @@ -9,37 +15,20 @@ import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.IItemContainer; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Ut