From 47a2ec5babcab6c42d9c74370aca260838a25401 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Tue, 27 Feb 2018 02:26:03 +1000 Subject: $ Organized imports. $ FindBugs fixes. --- .../xmod/Computronics/HANDLER_Computronics.java | 1 + .../xmod/bop/blocks/BOP_Block_Registrator.java | 5 ++- .../xmod/bop/blocks/base/LeavesBase.java | 16 +++++--- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 14 ++++--- .../xmod/bop/blocks/base/SaplingBase.java | 20 ++++++---- .../blocks/rainforest/LeavesRainforestTree.java | 7 ++-- .../blocks/rainforest/SaplingRainforestTree.java | 11 ++++-- .../xmod/bop/creative/MiscUtilsBOPTab.java | 3 +- .../features/trees/WorldGenRainForestTree_Ex.java | 3 +- .../xmod/eio/handler/HandlerTooltip_EIO.java | 7 +++- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 6 ++- .../forestry/bees/blocks/FR_BlockRegistry.java | 6 ++- .../xmod/forestry/bees/custom/CustomCombs.java | 1 + .../forestry/bees/custom/GTPP_Bee_Definition.java | 3 +- .../xmod/forestry/bees/custom/GTPP_Bees.java | 15 +++++--- .../xmod/forestry/bees/custom/ItemCustomComb.java | 17 +++++---- .../xmod/forestry/bees/gui/ContainerBeeHouse.java | 1 + .../xmod/forestry/bees/gui/GuiBeeHouse.java | 1 + .../bees/inventory/InventoryDenseBeeHouse.java | 5 ++- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 8 +++- .../xmod/forestry/bees/items/MB_ItemFrame.java | 12 ++++-- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 7 ++-- .../bees/tileentities/TileDenseBeeHouse.java | 20 +++------- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 5 ++- .../xmod/gregtech/api/enums/CustomGtTextures.java | 8 ++-- .../xmod/gregtech/api/enums/GregtechItemList.java | 8 +++- .../gregtech/api/enums/GregtechOrePrefixes.java | 14 +++++-- .../xmod/gregtech/api/enums/GregtechTextures.java | 7 ++-- .../gregtech/api/gui/CONTAINER_AdvancedBoiler.java | 15 ++++++-- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 11 ++++-- .../api/gui/CONTAINER_IndustrialCentrifuge.java | 5 ++- .../api/gui/CONTAINER_IronBlastFurnace.java | 5 ++- .../xmod/gregtech/api/gui/CONTAINER_MatterFab.java | 4 +- .../gregtech/api/gui/CONTAINER_MultiMachine.java | 3 +- .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 10 +++-- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 7 +++- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 9 +++-- .../gregtech/api/gui/CONTAINER_SuperChest.java | 13 ++++--- .../gregtech/api/gui/CONTAINER_TreeFarmer.java | 6 ++- .../xmod/gregtech/api/gui/GUI_AdvancedBoiler.java | 3 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 5 ++- .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 4 +- .../gregtech/api/gui/GUI_IronBlastFurnace.java | 4 +- .../xmod/gregtech/api/gui/GUI_MatterFab.java | 4 +- .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 4 +- .../xmod/gregtech/api/gui/GUI_SafeBlock.java | 4 +- .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 3 +- .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 4 +- .../xmod/gregtech/api/gui/GUI_SuperChest.java | 5 ++- .../xmod/gregtech/api/gui/GUI_TreeFarmer.java | 4 +- .../api/gui/basic/CONTAINER_PollutionCleaner.java | 8 ++-- .../api/gui/basic/GUI_PollutionCleaner.java | 4 +- .../gregtech/api/gui/hatches/CONTAINER_2by2.java | 5 ++- .../gregtech/api/gui/hatches/CONTAINER_4by4.java | 5 ++- .../xmod/gregtech/api/gui/hatches/GUI_2by2.java | 6 +-- .../xmod/gregtech/api/gui/hatches/GUI_4by4.java | 6 +-- .../hatches/charge/CONTAINER_Electric_2by2.java | 4 +- .../hatches/charge/CONTAINER_Electric_4by4.java | 4 +- .../api/gui/hatches/charge/GUI_Electric_2by2.java | 4 +- .../api/gui/hatches/charge/GUI_Electric_4by4.java | 4 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 1 + .../internal/Interface_ItemBehaviour.java | 6 ++- .../internal/Interface_OreRecipeRegistrator.java | 4 +- .../Interface_OreRecipeRegistrator_GT.java | 4 +- .../interfaces/internal/Interface_ToolStats.java | 10 +++-- .../gregtech/api/items/Gregtech_Generic_Item.java | 17 ++++++--- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 25 +++++++++---- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 19 ++++++---- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 19 +++++++--- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 33 ++++++++++------- .../gregtech/api/items/tools/GT_MetaGenTool.java | 26 ++++++++----- .../gregtech/api/items/types/ToolType_Base.java | 12 ++++-- .../api/items/types/ToolType_HardHammer.java | 14 ++++--- .../gregtech/api/items/types/ToolType_Wrench.java | 14 ++++--- .../GT_MetaTileEntity_DeluxeMachine.java | 21 ++++++----- .../GT_MetaTileEntity_DeluxeTank.java | 8 ++-- .../GT_MetaTileEntity_Hatch_InputBattery.java | 8 ++-- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 9 +++-- .../GregtechMetaPipeEntityFluid.java | 4 +- .../GregtechMetaPipeEntity_Cable.java | 17 ++++----- .../GregtechMetaTreeFarmerStructural.java | 4 +- .../base/GregtechMetaPipeEntityBase_Cable.java | 28 ++++++++------ .../base/GregtechMetaTileEntity.java | 1 + .../base/GregtechMetaTransformerHiAmp.java | 8 ++-- .../base/GregtechMeta_MultiBlockBase.java | 19 ++++++---- .../GregtechDoubleFuelGeneratorBase.java | 8 ++-- .../base/generators/GregtechMetaBoilerBase.java | 14 ++++--- .../generators/GregtechMetaSolarGenerator.java | 3 +- .../GregtechRocketFuelGeneratorBase.java | 8 ++-- .../base/machines/GregtechMetaSafeBlockBase.java | 8 ++-- .../base/machines/GregtechMetaTreeFarmerBase.java | 6 ++- .../xmod/gregtech/api/objects/GregtechFluid.java | 1 + .../gregtech/api/objects/GregtechItemData.java | 4 +- .../ProcessingSkookumChoocherToolRecipes.java | 8 +++- .../xmod/gregtech/api/util/GTPP_Config.java | 8 ++-- .../api/util/GregtechOreDictUnificator.java | 14 +++++-- .../api/util/GregtechRecipeRegistrator.java | 12 ++++-- .../xmod/gregtech/api/world/GTPP_Worldgen.java | 6 +-- .../gregtech/api/world/GTPP_Worldgen_Boulder.java | 6 +-- .../api/world/GTPP_Worldgen_GT_Ore_Layer.java | 8 ++-- .../xmod/gregtech/api/world/GTPP_Worldgen_Ore.java | 7 ++-- .../api/world/GTPP_Worldgen_Ore_Normal.java | 6 +-- .../xmod/gregtech/common/Meta_GT_Proxy.java | 5 ++- .../common/blocks/GregtechMetaCasingBlocks.java | 9 +++-- .../common/blocks/GregtechMetaCasingBlocks2.java | 6 ++- .../common/blocks/GregtechMetaCasingBlocks3.java | 7 ++-- .../blocks/GregtechMetaCasingBlocksAbstract.java | 15 +++++--- .../blocks/GregtechMetaItemCasingsAbstract.java | 3 +- .../common/blocks/fluid/GregtechFluidHandler.java | 7 ++-- .../blocks/textures/CasingTextureHandler.java | 6 ++- .../blocks/textures/CasingTextureHandler2.java | 3 +- .../blocks/textures/CasingTextureHandler3.java | 1 - .../textures/TexturesCentrifugeMultiblock.java | 8 ++-- .../common/blocks/textures/TexturesGregtech58.java | 8 ++-- .../common/blocks/textures/TexturesGregtech59.java | 8 ++-- .../common/blocks/textures/TexturesGtBlock.java | 8 ++-- .../common/blocks/textures/TexturesGtTools.java | 8 ++-- .../gregtech/common/helpers/ChargingHelper.java | 17 ++++++--- .../gregtech/common/helpers/CraftingHelper.java | 8 ++-- .../gregtech/common/helpers/TreeFarmHelper.java | 43 +++++++++------------- .../helpers/autocrafter/AC_Helper_Container.java | 3 +- .../helpers/autocrafter/AC_Helper_Utils.java | 12 +----- .../common/helpers/tesseract/TesseractHelper.java | 12 ++---- .../common/items/MetaGeneratedGregtechItems.java | 14 +++---- .../common/items/MetaGeneratedGregtechTools.java | 1 + .../items/behaviours/Behaviour_Choocher.java | 7 ++-- .../items/behaviours/Behaviour_Prospecting_Ex.java | 18 +++++---- .../gregtech/common/render/GTPP_CapeRenderer.java | 15 +++++--- .../GT_MetaTileEntity_TesseractGenerator.java | 25 +++++++------ .../GT_MetaTileEntity_TesseractTerminal.java | 16 +++++--- .../generators/GT_MetaTileEntity_Boiler_Base.java | 17 ++++++--- .../generators/GT_MetaTileEntity_Boiler_HV.java | 1 + .../generators/GT_MetaTileEntity_Boiler_LV.java | 1 + .../generators/GT_MetaTileEntity_Boiler_MV.java | 1 + .../generators/GT_MetaTileEntity_Boiler_Solar.java | 6 ++- .../GT_MetaTileEntity_SemiFluidGenerator.java | 13 +++++-- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 9 ++++- .../GregtechMetaTileEntityGeothermalGenerator.java | 11 ++++-- .../GregtechMetaTileEntityRocketFuelGenerator.java | 9 ++++- .../GregtechMetaTileEntitySolarGenerator.java | 4 +- .../generators/GregtechMetaTileEntity_RTG.java | 14 ++++--- .../creative/GregtechMetaCreativeEnergyBuffer.java | 15 +++----- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 21 +++++++---- .../GregtechMetaAtmosphericReconditioner.java | 8 ++-- .../machines/basic/GregtechMetaCondensor.java | 4 +- .../basic/GregtechMetaPollutionCreator.java | 10 +++-- .../basic/GregtechMetaPollutionDetector.java | 10 +++-- .../basic/GregtechMetaTileEntityChunkLoader.java | 17 +++++---- .../basic/GregtechMetaTileEntity_BasicWasher.java | 4 +- ...regtechMetaTileEntity_CompactFusionReactor.java | 14 ++++--- .../basic/GregtechMetaTileEntity_PocketFusion.java | 14 ++++--- .../basic/GregtechMetaWirelessCharger.java | 13 ++++--- .../machines/multi/GT4Entity_AutoCrafter.java | 13 ++++--- .../machines/multi/GT4Entity_ThermalBoiler.java | 6 ++- .../machines/multi/GregtechMTE_NuclearReactor.java | 10 +++-- .../machines/multi/GregtechMTE_TeslaTower.java | 26 ++++++------- .../multi/GregtechMetaTileEntityAnimalFarm.java | 3 +- .../GregtechMetaTileEntityGeneratorArray.java | 6 ++- .../multi/GregtechMetaTileEntityTreeFarm.java | 15 ++++---- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 8 ++-- .../GregtechMetaTileEntity_CatalyticReactor.java | 8 ++-- .../multi/GregtechMetaTileEntity_Cyclotron.java | 18 ++++++--- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 8 ++-- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 9 +++-- ...echMetaTileEntity_IndustrialCuttingMachine.java | 8 ++-- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 8 ++-- .../GregtechMetaTileEntity_IndustrialExtruder.java | 14 +++---- ...egtechMetaTileEntity_IndustrialFishingPond.java | 14 ++++--- ...GregtechMetaTileEntity_IndustrialMacerator.java | 8 ++-- ...regtechMetaTileEntity_IndustrialPlatePress.java | 13 ++++--- .../GregtechMetaTileEntity_IndustrialSifter.java | 12 +++--- .../GregtechMetaTileEntity_IndustrialSinter.java | 10 +++-- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 8 ++-- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 11 +++--- .../GregtechMetaTileEntity_IndustrialWireMill.java | 8 ++-- .../GregtechMetaTileEntity_IronBlastFurnace.java | 14 ++++--- .../GregtechMetaTileEntity_MassFabricator.java | 24 +++++------- .../multi/GregtechMetaTileEntity_MultiTank.java | 16 +++++--- ...chMetaTileEntity_PowerSubStationController.java | 14 ++++--- .../multi/GregtechMetaTileEntity_Refinery.java | 14 +++++-- .../storage/GT_MetaTileEntity_TieredChest.java | 12 +++--- .../storage/GT_MetaTileEntity_TieredTank.java | 6 ++- .../storage/GregtechMetaEnergyBuffer.java | 15 ++++---- .../storage/GregtechMetaSafeBlock.java | 4 +- .../storage/shelving/GT4Entity_Shelf.java | 10 +++-- .../shelving/GT4Entity_Shelf_Compartment.java | 13 ++++--- .../storage/shelving/GT4Entity_Shelf_Desk.java | 5 ++- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 14 ++++--- .../common/tools/TOOL_Gregtech_Choocher.java | 24 +++++++----- .../xmod/gregtech/loaders/GT_Material_Loader.java | 1 + .../xmod/gregtech/loaders/Gregtech_Blocks.java | 1 + .../loaders/ProcessingToolHeadChoocher.java | 4 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 1 + .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 4 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 4 +- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 12 ++++-- .../gregtech/loaders/RecipeGen_DustGeneration.java | 4 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 4 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 1 + .../loaders/RecipeGen_MaterialProcessing.java | 4 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 4 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 4 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 8 +++- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 4 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 4 +- .../machines/RECIPEHANDLER_AssemblyLine.java | 1 + .../recipes/machines/RECIPEHANDLER_CokeOven.java | 3 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 3 +- .../registration/gregtech/Gregtech4Content.java | 5 --- .../gregtech/GregtechAdvancedBoilers.java | 12 ++++-- .../gregtech/GregtechAdvancedMixer.java | 1 + .../gregtech/GregtechComponentAssembler.java | 11 +++--- .../registration/gregtech/GregtechConduits.java | 11 ++++-- .../registration/gregtech/GregtechDehydrator.java | 5 ++- .../gregtech/GregtechEnergyBuffer.java | 5 ++- .../GregtechGeothermalThermalGenerator.java | 8 +++- .../gregtech/GregtechHiAmpTransformer.java | 8 ++-- .../gregtech/GregtechIndustrialExtruder.java | 1 - .../gregtech/GregtechIndustrialFishPond.java | 1 + .../gregtech/GregtechIndustrialSifter.java | 1 - .../GregtechIndustrialThermalCentrifuge.java | 1 - .../gregtech/GregtechIndustrialWashPlant.java | 2 - .../gregtech/GregtechMiniRaFusion.java | 7 +--- .../gregtech/GregtechNitroDieselFix.java | 13 ++----- .../gregtech/GregtechPollutionDevices.java | 4 +- .../gregtech/GregtechPowerSubStation.java | 3 +- .../gregtech/GregtechRocketFuelGenerator.java | 8 +++- .../registration/gregtech/GregtechSafeBlock.java | 1 + .../gregtech/GregtechSemiFluidgenerators.java | 1 - .../gregtech/GregtechSimpleWasher.java | 4 +- .../gregtech/GregtechSuperConductionPoint.java | 3 -- .../registration/gregtech/GregtechSuperTanks.java | 2 +- .../gregtech/GregtechTieredChunkloaders.java | 2 - .../gregtech/GregtechWirelessChargers.java | 1 + .../gregtech/NewHorizonsAccelerator.java | 7 +--- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 4 +- .../xmod/growthcraft/fishtrap/Growthcraft_New.java | 4 +- .../xmod/growthcraft/fishtrap/Growthcraft_Old.java | 4 +- .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 16 +++++--- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 8 ++-- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 3 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 6 ++- .../kieticgenerator/IC2_BlockKineticGenerator.java | 12 +++--- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 3 +- .../container/ContainerKineticWindgenerator.java | 3 +- .../gui/GuiKineticWindGenerator.java | 8 ++-- .../tileentity/TileEntityKineticWindGenerator.java | 16 ++++---- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 8 +++- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 5 ++- src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 10 +++-- src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 5 ++- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 3 +- src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 11 +++--- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 11 +++--- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 13 ++++--- .../gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java | 6 ++- .../thaumcraft/common/ItemBlockThaumcraft.java | 3 +- .../common/block/BlockFastAlchemyFurnace.java | 12 +++--- .../common/block/BlockFastArcaneAlembic.java | 14 +++---- .../thaumcraft/common/tile/TCTileEntities.java | 1 + .../common/tile/TileFastAlchemyFurnace.java | 2 + .../common/tile/TileFastArcaneAlembic.java | 4 +- .../gui/ContainerFastAlchemyFurnace.java | 4 +- .../xmod/thaumcraft/gui/GuiFastAlchemyFurnace.java | 4 +- .../block/TF_Block_Fluid_Cryotheum.java | 18 +++++---- .../block/TF_Block_Fluid_Ender.java | 14 ++++--- .../block/TF_Block_Fluid_Pyrotheum.java | 16 +++++--- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 7 ++-- .../xmod/thermalfoundation/item/TF_Items.java | 5 ++- .../recipe/TF_Gregtech_Recipes.java | 10 +++-- 270 files changed, 1393 insertions(+), 888 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod') diff --git a/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java b/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java index 5362f13437..e062d70552 100644 --- a/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java +++ b/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java @@ -3,6 +3,7 @@ package gtPlusPlus.xmod.Computronics; import gregtech.GT_Mod; import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; + import gtPlusPlus.core.lib.LoadedMods; public class HANDLER_Computronics { diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java index 6626076eeb..99d2d56936 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java +++ b/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java @@ -1,8 +1,11 @@ package gtPlusPlus.xmod.bop.blocks; -import gtPlusPlus.xmod.bop.blocks.rainforest.*; import net.minecraft.block.Block; +import gtPlusPlus.xmod.bop.blocks.rainforest.LeavesRainforestTree; +import gtPlusPlus.xmod.bop.blocks.rainforest.LogRainforestTree; +import gtPlusPlus.xmod.bop.blocks.rainforest.SaplingRainforestTree; + public class BOP_Block_Registrator { public static Block log_Rainforest; diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 24a3e93326..7a40ab154d 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -7,19 +7,23 @@ 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.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; + import net.minecraft.block.BlockLeaves; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public class LeavesBase extends BlockLeaves { protected IIcon[][] leafTextures = new IIcon[2][]; diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/Java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 687bcabe51..976361a01b 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/Java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -6,17 +6,21 @@ 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.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; + import net.minecraft.block.BlockLog; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public abstract class LogBase extends BlockLog { public String[] treeType = new String[] {}; diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index 8551f01cb2..1aab5133dc 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -7,21 +7,27 @@ 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.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.feature.WorldGenBigTree; +import net.minecraft.world.gen.feature.WorldGenTrees; +import net.minecraft.world.gen.feature.WorldGenerator; + +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.ItemUtils; public class SaplingBase extends BlockSapling { diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java index 5970305710..39e434243a 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java +++ b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java @@ -2,13 +2,14 @@ package gtPlusPlus.xmod.bop.blocks.rainforest; import java.util.Random; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; -import gtPlusPlus.xmod.bop.blocks.base.LeavesBase; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.base.LeavesBase; + public class LeavesRainforestTree extends LeavesBase { public LeavesRainforestTree(){ diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java index 26accd283e..73b916d383 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java +++ b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java @@ -2,14 +2,17 @@ package gtPlusPlus.xmod.bop.blocks.rainforest; import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenBigTree; +import net.minecraft.world.gen.feature.WorldGenTrees; +import net.minecraft.world.gen.feature.WorldGenerator; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; import gtPlusPlus.xmod.bop.blocks.base.SaplingBase; import gtPlusPlus.xmod.bop.world.features.trees.WorldGenRainForestTree_Ex; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.*; public class SaplingRainforestTree extends SaplingBase { diff --git a/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java b/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java index 054d82ffa7..f7a9ea3d41 100644 --- a/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java +++ b/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java @@ -1,9 +1,10 @@ package gtPlusPlus.xmod.bop.creative; -import gtPlusPlus.core.item.ModItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import gtPlusPlus.core.item.ModItems; + public class MiscUtilsBOPTab extends CreativeTabs { public MiscUtilsBOPTab(final String lable) { diff --git a/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java b/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java index 2357fe4ea6..fa29f99655 100644 --- a/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java +++ b/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java @@ -2,12 +2,13 @@ package gtPlusPlus.xmod.bop.world.features.trees; import java.util.Random; -import gtPlusPlus.api.objects.Logger; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; + +import gtPlusPlus.api.objects.Logger; import net.minecraftforge.common.util.ForgeDirection; public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree{ diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index b892a2a95c..667b5d2e51 100644 --- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -5,12 +5,15 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltip import java.lang.reflect.Field; import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; + import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.eio.material.MaterialEIO; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.player.ItemTooltipEvent; public class HandlerTooltip_EIO { diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index dbc0589fd2..1343bdc8af 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -4,12 +4,14 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import cpw.mods.fml.common.Optional; + +import net.minecraft.block.Block; +import net.minecraft.world.World; + import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; -import net.minecraft.block.Block; -import net.minecraft.world.World; public class HANDLER_FR { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java index f896dcd05c..fa36732cb6 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java @@ -1,11 +1,13 @@ package gtPlusPlus.xmod.forestry.bees.blocks; import cpw.mods.fml.common.registry.GameRegistry; -import forestry.core.utils.StringUtil; -import forestry.plugins.PluginManager; + import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; + +import forestry.core.utils.StringUtil; +import forestry.plugins.PluginManager; import net.minecraftforge.oredict.OreDictionary; public abstract class FR_BlockRegistry { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java index 11f6e71b8d..b4d6e4c2fc 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.custom; import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; + import gtPlusPlus.core.util.Utils; public enum CustomCombs { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java index be18441d54..3dbe10af59 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java @@ -7,6 +7,8 @@ import java.util.Locale; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.text.WordUtils; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.*; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -19,7 +21,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.BiomeDictionary.Type; public enum GTPP_Bee_Definition implements IBeeDefinition { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java index 4e3e353807..e2a67197d3 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java @@ -1,15 +1,22 @@ package gtPlusPlus.xmod.forestry.bees.custom; -import java.lang.reflect.*; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import org.apache.commons.lang3.reflect.FieldUtils; import cpw.mods.fml.common.Loader; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; import gtPlusPlus.core.item.base.misc.BaseItemMisc; @@ -18,8 +25,6 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public class GTPP_Bees { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java index a8ab811eed..a33ea101c2 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java @@ -10,19 +10,22 @@ import com.google.common.collect.ImmutableMap; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; -import forestry.api.recipes.RecipeManagers; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import gregtech.GT_Mod; import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; + +import forestry.api.core.Tabs; +import forestry.api.recipes.RecipeManagers; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public class ItemCustomComb extends Item { @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java b/src/Java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java index 91ab60f8bb..4aa9de8220 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java @@ -11,6 +11,7 @@ package gtPlusPlus.xmod.forestry.bees.gui; import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.gui.ContainerBeeHelper; import forestry.apiculture.gui.IContainerBeeHousing; import forestry.apiculture.tiles.TileBeeHousingBase; diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java b/src/Java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java index b510b7a4d6..89a2f121d9 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java @@ -11,6 +11,7 @@ package gtPlusPlus.xmod.forestry.bees.gui; import net.minecraft.inventory.Container; + import forestry.apiculture.gui.IContainerBeeHousing; import forestry.apiculture.gui.IGuiBeeHousingInventory; import forestry.core.config.Constants; diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java b/src/Java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java index 5cb1d06982..47c380fdfe 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java @@ -13,13 +13,14 @@ package gtPlusPlus.xmod.forestry.bees.inventory; import java.util.ArrayList; import java.util.Collection; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.*; import forestry.apiculture.InventoryBeeHousing; import forestry.apiculture.inventory.IApiaryInventory; import forestry.core.access.IAccessHandler; import forestry.core.utils.SlotUtil; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class InventoryDenseBeeHouse extends InventoryBeeHousing implements IApiaryInventory { public static final int SLOT_FRAMES_1 = 9; diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index baa49ef826..e21852f2cf 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -11,10 +11,14 @@ package gtPlusPlus.xmod.forestry.bees.items; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; + +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomChestContent; + import forestry.core.utils.StringUtil; import gtPlusPlus.core.lib.LoadedMods; -import net.minecraft.item.*; -import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; public class FR_ItemRegistry { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java index 6e9a2006d0..f57caff45b 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java @@ -5,14 +5,18 @@ import java.util.List; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.*; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import forestry.api.apiculture.*; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; + public class MB_ItemFrame extends Item implements IHiveFrame { private final MB_FrameType type; diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java index 5bdddce572..2e0bcc9c2b 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.forestry.bees.recipe; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class FR_Gregtech_Recipes { diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java b/src/Java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java index d121c920b2..9b3424ef08 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java @@ -10,23 +10,15 @@ ******************************************************************************/ package gtPlusPlus.xmod.forestry.bees.tileentities; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import java.util.*; + +import cpw.mods.fml.common.Optional; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - -import forestry.api.apiculture.IBeeHousingInventory; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IHiveFrame; +import buildcraft.api.statements.ITriggerExternal; +import forestry.api.apiculture.*; import forestry.apiculture.ApiaryBeeListener; import forestry.apiculture.ApiaryBeeModifier; import forestry.apiculture.IApiary; @@ -36,7 +28,7 @@ import forestry.apiculture.tiles.TileBeeHousingBase; import forestry.apiculture.trigger.ApicultureTriggers; import gtPlusPlus.xmod.forestry.bees.gui.ContainerBeeHouse; import gtPlusPlus.xmod.forestry.bees.gui.GuiBeeHouse; -import buildcraft.api.statements.ITriggerExternal; +import net.minecraftforge.common.util.ForgeDirection; public class TileDenseBeeHouse extends TileBeeHousingBase implements IApiary { private final IBeeModifier beeModifier = new ApiaryBeeModifier(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 9945665705..1b3b682ea4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import gregtech.api.util.GT_Config; + import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.handler.OldCircuitHandler; import gtPlusPlus.core.lib.CORE; @@ -15,7 +16,9 @@ import gtPlusPlus.xmod.gregtech.api.world.GTPP_Worldgen; import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import gtPlusPlus.xmod.gregtech.loaders.*; +import gtPlusPlus.xmod.gregtech.loaders.Gregtech_Blocks; +import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_Ex; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechNitroDieselFix; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java index f62db49f48..2a8802b6f4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java @@ -1,13 +1,15 @@ package gtPlusPlus.xmod.gregtech.api.enums; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_RenderedTexture; + import gtPlusPlus.core.lib.CORE; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; public class CustomGtTextures { public enum ItemIcons implements IIconContainer, Runnable { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 3907e284a5..aa9c96b615 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -2,12 +2,16 @@ package gtPlusPlus.xmod.gregtech.api.enums; import static gregtech.api.enums.GT_Values.W; -import gregtech.api.util.*; -import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; + +import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; import net.minecraftforge.fluids.Fluid; /** diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index aa22dac95d..b611ce083c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -5,18 +5,24 @@ import static gtPlusPlus.core.util.Utils.getTcAspectStack; import java.util.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.interfaces.*; +import gregtech.api.interfaces.IColorModulationContainer; +import gregtech.api.interfaces.ICondition; +import gregtech.api.interfaces.ISubTagContainer; import gregtech.api.objects.GT_FluidStack; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.*; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_Utility; + import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData; import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java index 1fc8f6bb69..d2554de225 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.gregtech.api.enums; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; public class GregtechTextures { public enum BlockIcons implements Interface_IconContainer, Runnable { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java index e480ffbfef..344be4430d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java @@ -4,13 +4,16 @@ import java.util.Iterator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.gui.GT_ContainerMetaTile_Machine; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_Base; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import gregtech.api.gui.GT_ContainerMetaTile_Machine; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_Base; + public class CONTAINER_AdvancedBoiler extends GT_ContainerMetaTile_Machine { private int mSteamCapacity = 0;//FB: UR - UR_UNINIT_READ_CALLED_FROM_SUPER_CONSTRUCTOR @@ -49,6 +52,12 @@ public class CONTAINER_AdvancedBoiler if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) { return; } + + if (this.mSteamCapacity <= 0) { + this.mSteamCapacity = (int) ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).maxSteamStore(); + + } + this.maxStorage = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).getCapacity(); this.mTemperature = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mTemperature; this.mProcessingEnergy = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mProcessingEnergy; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java index 50eaad7d0e..a4508781aa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java @@ -4,13 +4,18 @@ import java.util.Iterator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.gui.*; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import gregtech.api.gui.GT_Container_BasicTank; +import gregtech.api.gui.GT_Slot_Output; +import gregtech.api.gui.GT_Slot_Render; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank; + /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! *

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java index efacb9f30e..df8df2f775 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.gui; -import gregtech.api.gui.GT_ContainerMetaTile_Machine; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +import gregtech.api.gui.GT_ContainerMetaTile_Machine; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! *

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java index 89cc70c61a..78150aedbe 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; + import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.gui.GT_Slot_Output; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; public class CONTAINER_IronBlastFurnace extends GT_ContainerMetaTile_Machine { public CONTAINER_IronBlastFurnace(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java index c38485a7ee..24520a6109 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java @@ -1,9 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_MassFabricator; -import net.minecraft.entity.player.InventoryPlayer; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java index bac513d304..bdf19454ce 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java @@ -1,8 +1,9 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.entity.player.InventoryPlayer; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java index d1eaa14991..9a84ba66ab 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java @@ -2,15 +2,17 @@ package gtPlusPlus.xmod.gregtech.api.gui; import java.util.UUID; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.gui.GT_Slot_Holo; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.core.util.player.PlayerCache; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; public class CONTAINER_SafeBlock extends GT_ContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java index 27825b7d80..356f1a89ae 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java @@ -4,11 +4,14 @@ import java.util.Iterator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; + import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; public class CONTAINER_SolarGenerator extends GT_ContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java index 4d24ffca5c..3211d53d08 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java @@ -4,13 +4,16 @@ import java.util.Iterator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.gui.GT_ContainerMetaTile_Machine; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import gregtech.api.gui.GT_ContainerMetaTile_Machine; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase; + public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine { public CONTAINER_SteamCondenser(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final int aSteamCapacity) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java index 8caf8fe575..3d63f43b5c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java @@ -1,17 +1,20 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import java.util.Iterator; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; + import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.gui.GT_Slot_Output; import gregtech.api.gui.GT_Slot_Render; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; -import java.util.Iterator; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; public class CONTAINER_SuperChest extends GT_ContainerMetaTile_Machine { public int mContent = 0; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java index 240ca6cfe8..3303674dee 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java @@ -2,12 +2,14 @@ package gtPlusPlus.xmod.gregtech.api.gui; import java.util.List; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; + import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.core.slots.SlotBuzzSaw; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityTreeFarm; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; public class CONTAINER_TreeFarmer extends GT_ContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java index fd3cf76c83..f7b37aed49 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java @@ -1,8 +1,9 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.entity.player.InventoryPlayer; public class GUI_AdvancedBoiler extends GT_GUIContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java index 99faba0e2b..c6d8d4ef7e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java @@ -2,11 +2,12 @@ package gtPlusPlus.xmod.gregtech.api.gui; import static gregtech.api.enums.GT_Values.RES_PATH_GUI; -import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; +import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + public class GUI_DeluxeTank extends GT_GUIContainerMetaTile_Machine { private final String mName; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java index fcb53db533..2e1f76f362 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java @@ -1,10 +1,12 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.core.lib.CORE; -import net.minecraft.entity.player.InventoryPlayer; public class GUI_IndustrialCentrifuge extends GT_GUIContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java index a93d9ecf5f..b44ad916b7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java @@ -1,9 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.core.lib.CORE; -import net.minecraft.entity.player.InventoryPlayer; public class GUI_IronBlastFurnace extends GT_GUIContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java index 952f8978f6..95bde9fd9f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java @@ -1,10 +1,12 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.core.lib.CORE; -import net.minecraft.entity.player.InventoryPlayer; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java index c927d814f8..425fe6d01f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java @@ -1,10 +1,12 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.core.lib.CORE; -import net.minecraft.entity.player.InventoryPlayer; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java index 77d0656f60..c18d58b4b6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java @@ -1,9 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.core.lib.CORE; -import net.minecraft.entity.player.InventoryPlayer; public class GUI_SafeBlock extends GT_GUIContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java index 419c86da7d..912e7ded18 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java @@ -1,8 +1,9 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.entity.player.InventoryPlayer; public class GUI_SolarGenerator extends GT_GUIContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java index a4a98a0644..f472fc9edb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java @@ -1,9 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gtPlusPlus.core.lib.CORE; -import net.minecraft.entity.player.InventoryPlayer; public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java index 259f589950..d324c50dd0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.gui; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.StatCollector; + import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileE