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. --- src/Java/cofh/energy/TileEnergyHandler.java | 1 + src/Java/cofh/mod/BaseMod.java | 49 ++++++++-------------- src/Java/gregtech/api/enums/TAE.java | 3 +- src/Java/gregtech/api/util/CustomRecipeMap.java | 4 +- src/Java/gregtech/api/util/EmptyRecipeMap.java | 4 +- src/Java/gregtech/api/util/FishPondFakeRecipe.java | 5 ++- src/Java/gregtech/api/util/HotFuel.java | 1 + .../api/util/MultiblockRecipeMapHandler.java | 5 ++- src/Java/gregtech/api/util/Recipe_GT.java | 7 ++-- src/Java/gtPlusPlus/GTplusplus.java | 8 ++-- src/Java/gtPlusPlus/GTplusplus_Secondary.java | 3 +- .../gtPlusPlus/api/damage/DamageTeslaTower.java | 3 +- src/Java/gtPlusPlus/api/enums/Quality.java | 3 +- .../gtPlusPlus/api/helpers/MaterialHelper.java | 4 +- .../gtPlusPlus/api/interfaces/IEntityCatcher.java | 3 +- .../gtPlusPlus/api/interfaces/IGregtechPower.java | 12 +++--- .../gtPlusPlus/api/interfaces/ITexturedBlock.java | 3 +- src/Java/gtPlusPlus/api/objects/Logger.java | 1 + .../gtPlusPlus/api/objects/minecraft/BlockPos.java | 3 +- .../api/objects/minecraft/ChunkManager.java | 28 +++++-------- .../gtPlusPlus/api/objects/minecraft/FluidGT6.java | 1 + .../api/objects/minecraft/GenericStack.java | 1 + src/Java/gtPlusPlus/core/block/ModBlocks.java | 24 +++-------- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 3 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 7 ++-- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 12 +++--- .../core/block/base/BlockBaseModular.java | 7 +++- .../gtPlusPlus/core/block/base/BlockBaseNBT.java | 7 ++-- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 13 +++--- .../core/block/base/MultiTextureBlock.java | 5 ++- .../block/general/BlockCompressedObsidian.java | 8 ++-- .../gtPlusPlus/core/block/general/BlockNet.java | 8 ++-- .../core/block/general/BlockTankXpConverter.java | 21 ++++++---- .../gtPlusPlus/core/block/general/FirePit.java | 8 ++-- .../core/block/general/FluidTankInfinite.java | 15 ++++--- .../gtPlusPlus/core/block/general/HellFire.java | 17 ++++---- .../gtPlusPlus/core/block/general/LightGlass.java | 8 ++-- .../core/block/general/MiningExplosives.java | 8 ++-- .../block/general/antigrief/BlockWitherProof.java | 9 ++-- .../core/block/general/antigrief/TowerDevice.java | 10 +++-- .../block/general/fluids/BlockFluidSludge.java | 6 ++- .../core/block/machine/BlockGtFrameBox.java | 7 ++-- .../gtPlusPlus/core/block/machine/FishTrap.java | 16 +++---- .../core/block/machine/HeliumGenerator.java | 10 +++-- .../block/machine/Machine_ModularityTable.java | 16 +++---- .../core/block/machine/Machine_ProjectTable.java | 22 +++++----- .../core/block/machine/Machine_TradeTable.java | 14 ++++--- .../core/block/machine/Machine_Workbench.java | 20 +++++---- .../block/machine/Machine_WorkbenchAdvanced.java | 14 +++---- .../core/client/model/ModelSickBlaze.java | 1 + .../core/client/model/ModelStaballoyConstruct.java | 1 + .../client/renderer/CustomOreBlockRenderer.java | 9 ++-- .../renderer/RenderMiningExplosivesPrimed.java | 8 ++-- .../core/client/renderer/RenderPlasmaBolt.java | 13 +++--- .../core/client/renderer/RenderPotionthrow.java | 1 + .../core/client/renderer/RenderSickBlaze.java | 10 +++-- .../client/renderer/RenderStaballoyConstruct.java | 12 ++++-- .../core/client/renderer/RenderToxinball.java | 4 +- src/Java/gtPlusPlus/core/commands/CommandMath.java | 9 ++-- src/Java/gtPlusPlus/core/common/BasePlayer.java | 9 ++-- src/Java/gtPlusPlus/core/common/CommonProxy.java | 5 ++- .../core/common/compat/COMPAT_Baubles.java | 4 +- .../core/common/compat/COMPAT_BigReactors.java | 4 +- .../common/compat/COMPAT_CompactWindmills.java | 6 +-- .../core/common/compat/COMPAT_EnderIO.java | 4 +- .../core/common/compat/COMPAT_ExtraUtils.java | 3 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 3 +- .../core/common/compat/COMPAT_PneumaticCraft.java | 4 +- .../core/common/compat/COMPAT_RFTools.java | 4 +- .../core/common/compat/COMPAT_SimplyJetpacks.java | 4 +- .../core/common/compat/COMPAT_Thaumcraft.java | 3 +- src/Java/gtPlusPlus/core/config/ConfigHandler.java | 1 + .../core/container/Container_BackpackBase.java | 5 ++- .../core/container/Container_FishTrap.java | 9 ++-- .../core/container/Container_Grindle.java | 5 ++- .../core/container/Container_HeliumGenerator.java | 13 +++--- .../core/container/Container_ModularityTable.java | 15 ++++--- .../core/container/Container_ProjectTable.java | 15 ++++--- .../core/container/Container_TradeTable.java | 13 +++--- .../core/container/Container_Workbench.java | 18 ++++---- .../container/Container_WorkbenchAdvanced.java | 14 ++++--- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 3 +- .../creative/tabs/MiscUtilCreativeTabBlock.java | 3 +- .../creative/tabs/MiscUtilCreativeTabMachines.java | 3 +- .../creative/tabs/MiscUtilCreativeTabMisc.java | 3 +- .../creative/tabs/MiscUtilCreativeTabOther.java | 3 +- .../creative/tabs/MiscUtilCreativeTabTools.java | 3 +- .../core/entity/EntityPrimedMiningExplosive.java | 5 ++- .../gtPlusPlus/core/entity/EntityTeleportFX.java | 1 + .../core/entity/EntityTeslaTowerLightning.java | 9 ++-- .../core/entity/InternalEntityRegistry.java | 1 + .../core/entity/monster/EntitySickBlaze.java | 4 +- .../entity/monster/EntityStaballoyConstruct.java | 12 +++--- .../projectile/EntityHydrofluoricAcidPotion.java | 10 +++-- .../projectile/EntitySulfuricAcidPotion.java | 10 +++-- .../core/entity/projectile/EntityToxinball.java | 1 + .../gtPlusPlus/core/fluids/BlockFluidBase.java | 10 +++-- .../core/fluids/FluidRegistryHandler.java | 7 ++-- src/Java/gtPlusPlus/core/fluids/GenericFluid.java | 4 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 4 +- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 7 ++-- .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java | 22 ++++------ .../gtPlusPlus/core/gui/item/GuiScreenGrindle.java | 18 ++++---- .../gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 8 ++-- .../core/gui/machine/GUI_HeliumGenerator.java | 8 ++-- .../core/gui/machine/GUI_ModularityTable.java | 9 ++-- .../core/gui/machine/GUI_ProjectTable.java | 10 ++--- .../core/gui/machine/GUI_TradeTable.java | 10 +++-- .../gtPlusPlus/core/gui/machine/GUI_Workbench.java | 8 ++-- .../core/gui/machine/GUI_WorkbenchAdvanced.java | 8 ++-- src/Java/gtPlusPlus/core/handler/BookHandler.java | 5 ++- .../core/handler/BurnableFuelHandler.java | 6 ++- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 4 +- src/Java/gtPlusPlus/core/handler/GuiHandler.java | 32 ++++---------- .../gtPlusPlus/core/handler/OldCircuitHandler.java | 1 + .../gtPlusPlus/core/handler/PacketHandler.java | 9 ++-- .../handler/analytics/AnalyticsLoggingPlugin.java | 5 +-- .../core/handler/analytics/BlockingFlush.java | 8 ++-- .../core/handler/analytics/SegmentAnalytics.java | 9 ++-- .../core/handler/analytics/SegmentHelper.java | 5 +-- .../core/handler/events/BlockEventHandler.java | 16 +++---- .../core/handler/events/LoginEventHandler.java | 13 +++--- .../events/PickaxeBlockBreakEventHandler.java | 10 +++-- .../core/handler/events/SneakManager.java | 3 +- .../handler/events/UnbreakableBlockManager.java | 12 ++++-- .../events/ZombieBackupSpawnEventHandler.java | 1 + .../core/handler/render/CapeHandler.java | 10 +++-- .../core/handler/render/FirepitModel.java | 3 +- .../workbench/Workbench_CraftingHandler.java | 8 +++- .../handler/workbench/Workbench_RecipeSorter.java | 4 +- .../core/inventories/BaseInventoryBackpack.java | 3 +- .../core/inventories/BaseInventoryGrindle.java | 3 +- .../inventories/InventoryWorkbenchCrafting.java | 4 +- .../inventories/InventoryWorkbenchHoloSlots.java | 3 +- .../core/inventories/InventoryWorkbenchTools.java | 3 +- .../InventoryWorkbenchToolsElectric.java | 8 ++-- .../modulartable/InventoryModularMain.java | 5 +-- .../modulartable/InventoryModularOutput.java | 3 +- .../projecttable/InventoryProjectMain.java | 1 - .../inventories/tradetable/InventoryTradeMain.java | 1 - src/Java/gtPlusPlus/core/item/ModItems.java | 39 +++++------------ src/Java/gtPlusPlus/core/item/base/BaseEuItem.java | 26 +++++++----- .../core/item/base/BaseItemBackpack.java | 13 +++--- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 1 + .../core/item/base/BaseItemBurnable.java | 5 ++- .../core/item/base/BaseItemColourable.java | 11 ++--- .../core/item/base/BaseItemComponent.java | 19 +++++---- .../core/item/base/BaseItemDamageable.java | 6 ++- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 3 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 12 +++--- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 13 +++--- .../core/item/base/BaseItemWithCharge.java | 5 ++- .../core/item/base/BaseItemWithDamageValue.java | 4 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 10 +++-- src/Java/gtPlusPlus/core/item/base/CoreItem.java | 10 +++-- .../core/item/base/cell/BaseItemCell.java | 8 ++-- .../core/item/base/cell/BaseItemPlasmaCell.java | 10 +++-- .../core/item/base/dusts/BaseItemDust.java | 13 +++--- .../core/item/base/dusts/BaseItemDustAbstract.java | 4 +- .../core/item/base/dusts/BaseItemDustUnique.java | 9 ++-- .../item/base/dusts/decimal/BaseItemCentidust.java | 8 ++-- .../item/base/dusts/decimal/BaseItemDecidust.java | 8 ++-- .../core/item/base/foods/BaseItemFood.java | 6 ++- .../core/item/base/foods/BaseItemHotFood.java | 9 ++-- .../core/item/base/ingots/BaseItemIngot.java | 4 +- .../core/item/base/ingots/BaseItemIngotHot.java | 15 ++++--- .../core/item/base/ingots/BaseItemIngot_OLD.java | 11 +++-- .../item/base/itemblock/ItemBlockBasicTile.java | 3 +- .../item/base/itemblock/ItemBlockBasicTooltip.java | 3 +- .../item/base/itemblock/ItemBlockEntityBase.java | 5 ++- .../core/item/base/itemblock/ItemBlockFluid.java | 9 ++-- .../core/item/base/itemblock/ItemBlockGtBlock.java | 11 +++-- .../item/base/itemblock/ItemBlockGtFrameBox.java | 5 +-- .../core/item/base/itemblock/ItemBlockMeta.java | 1 + .../core/item/base/itemblock/ItemBlockNBT.java | 12 +++--- .../core/item/base/itemblock/ItemBlockOre.java | 14 +++---- .../core/item/base/misc/BaseItemMisc.java | 15 ++++--- .../core/item/base/ore/BaseOreComponent.java | 18 ++++---- .../core/item/base/plates/BaseItemPlateDouble.java | 3 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 13 +++--- .../core/item/base/rods/BaseItemRod.java | 4 +- .../core/item/base/rods/BaseItemRodLong.java | 4 +- .../core/item/base/screws/BaseItemScrew.java | 4 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 18 ++++---- .../core/item/bauble/HealthBoostBauble.java | 5 ++- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 20 +++++---- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 10 +++-- .../gtPlusPlus/core/item/effects/RarityEffect.java | 5 ++- .../gtPlusPlus/core/item/effects/RarityEpic.java | 5 ++- .../gtPlusPlus/core/item/effects/RarityRare.java | 5 ++- .../core/item/effects/RarityUncommon.java | 5 ++- .../core/item/general/BaseItemGrindle.java | 15 ++++--- .../core/item/general/BedLocator_Base.java | 5 ++- .../gtPlusPlus/core/item/general/BufferCore.java | 9 ++-- .../core/item/general/ItemAirFilter.java | 8 ++-- .../core/item/general/ItemAreaClear.java | 17 ++++---- .../core/item/general/ItemBasicFirestarter.java | 9 ++-- .../core/item/general/ItemBlueprint.java | 16 +++---- .../core/item/general/ItemCloakingDevice.java | 18 ++++---- .../gtPlusPlus/core/item/general/ItemEmpty.java | 3 +- .../core/item/general/ItemGemShards.java | 8 ++-- .../core/item/general/ItemHalfCompleteCasings.java | 8 ++-- .../core/item/general/ItemHealingDevice.java | 22 ++++++---- .../core/item/general/ItemLavaFilter.java | 10 +++-- .../core/item/general/ItemSlowBuildingRing.java | 16 +++---- .../core/item/general/NuclearFuelRodBase.java | 2 + .../core/item/general/RF2EU_Battery.java | 16 ++++--- .../core/item/general/books/ItemBaseBook.java | 16 +++---- .../item/general/capture/ItemEntityCatcher.java | 16 +++---- .../item/general/chassis/ItemBoilerChassis.java | 8 ++-- .../item/general/chassis/ItemDehydratorCoil.java | 8 ++-- .../general/chassis/ItemDehydratorCoilWire.java | 8 ++-- .../core/item/general/fuelrods/FuelRod_Base.java | 5 ++- .../throwables/ItemHydrofluoricAcidPotion.java | 7 ++-- .../general/throwables/ItemSulfuricAcidPotion.java | 7 ++-- src/Java/gtPlusPlus/core/item/init/ItemsFoods.java | 6 ++- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 1 + .../core/item/tool/misc/ConnectedBlockFinder.java | 9 ++-- .../core/item/tool/misc/SandstoneHammer.java | 6 ++- .../core/item/tool/staballoy/MultiPickaxeBase.java | 16 ++++--- .../core/item/tool/staballoy/MultiSpadeBase.java | 6 ++- .../core/item/tool/staballoy/StaballoyAxe.java | 8 +++- .../core/item/tool/staballoy/StaballoyPickaxe.java | 16 ++++--- .../core/item/tool/staballoy/StaballoySpade.java | 16 ++++--- src/Java/gtPlusPlus/core/lib/CORE.java | 6 ++- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 4 +- src/Java/gtPlusPlus/core/material/ALLOY.java | 1 + src/Java/gtPlusPlus/core/material/ELEMENT.java | 1 + src/Java/gtPlusPlus/core/material/Material.java | 15 ++++--- .../core/material/MaterialGenerator.java | 11 ++--- .../gtPlusPlus/core/material/MaterialStack.java | 3 +- src/Java/gtPlusPlus/core/material/NONMATERIAL.java | 1 + src/Java/gtPlusPlus/core/material/ORES.java | 1 + .../core/material/gregtech/CustomGTMaterials.java | 15 ------- .../core/material/nuclear/FLUORIDES.java | 5 ++- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 5 ++- src/Java/gtPlusPlus/core/players/FakeFarmer.java | 5 ++- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 11 ++--- src/Java/gtPlusPlus/core/proxy/ServerProxy.java | 5 ++- .../core/recipe/Gregtech_Recipe_Adder.java | 6 ++- .../core/recipe/LOADER_Machine_Components.java | 1 + .../gtPlusPlus/core/recipe/RECIPES_Extruder.java | 14 +++---- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 21 ++++------ .../gtPlusPlus/core/recipe/RECIPES_General.java | 11 +++-- .../core/recipe/RECIPES_LaserEngraver.java | 4 +- .../core/recipe/RECIPES_MachineComponents.java | 1 + .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 10 ++--- .../core/recipe/RECIPES_Old_Circuits.java | 12 ++++-- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 3 +- src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 9 ++-- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 4 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 3 +- src/Java/gtPlusPlus/core/recipe/common/CI.java | 12 ++++-- src/Java/gtPlusPlus/core/slots/SlotBlueprint.java | 5 ++- src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java | 7 ++-- src/Java/gtPlusPlus/core/slots/SlotCrafting.java | 2 + .../core/slots/SlotCraftingNoCollect.java | 1 + src/Java/gtPlusPlus/core/slots/SlotDataStick.java | 8 ++-- src/Java/gtPlusPlus/core/slots/SlotElectric.java | 8 ++-- src/Java/gtPlusPlus/core/slots/SlotFrame.java | 3 +- src/Java/gtPlusPlus/core/slots/SlotFuelRod.java | 6 ++- src/Java/gtPlusPlus/core/slots/SlotGtTool.java | 6 ++- .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 8 ++-- .../gtPlusPlus/core/slots/SlotItemBackpackInv.java | 3 +- .../gtPlusPlus/core/slots/SlotModularBauble.java | 3 +- .../core/slots/SlotModularBaubleUpgrades.java | 10 ++--- src/Java/gtPlusPlus/core/slots/SlotOutput.java | 2 + src/Java/gtPlusPlus/core/slots/SlotRTG.java | 3 +- .../core/tileentities/ModTileEntities.java | 13 ++---- .../core/tileentities/base/TileEntityBase.java | 3 +- .../core/tileentities/base/TilePoweredGT.java | 24 +++++------ .../tileentities/general/TileEntityFishTrap.java | 16 +++---- .../general/TileEntityHeliumGenerator.java | 11 ++--- .../general/TileEntityInfiniteFluid.java | 1 + .../tileentities/general/TileEntityReverter.java | 3 +- .../general/TileEntityXpConverter.java | 14 +++---- .../machines/TileEntityModularityTable.java | 16 ++++--- .../machines/TileEntityProjectTable.java | 19 +++++---- .../machines/TileEntityTradeTable.java | 7 ++-- .../tileentities/machines/TileEntityWorkbench.java | 13 +++--- .../machines/TileEntityWorkbenchAdvanced.java | 15 +++---- src/Java/gtPlusPlus/core/util/Utils.java | 41 ++++++++---------- src/Java/gtPlusPlus/core/util/data/ArrayUtils.java | 9 +--- src/Java/gtPlusPlus/core/util/data/EnumUtils.java | 2 - .../gtPlusPlus/core/util/data/LocaleUtils.java | 11 +++-- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 8 ++-- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 18 +++++--- .../core/util/debug/DEBUG_ScreenOverlay.java | 6 ++- .../core/util/debug/DEBUG_TimerThread.java | 3 +- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 2 +- .../core/util/minecraft/EntityUtils.java | 14 ++++--- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 14 +++---- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 16 +++---- .../core/util/minecraft/MaterialUtils.java | 4 +- .../core/util/minecraft/MiningUtils.java | 3 +- .../core/util/minecraft/ModularArmourUtils.java | 8 ++-- .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 10 +++-- .../core/util/minecraft/PlayerUtils.java | 4 +- .../core/util/minecraft/RecipeUtils.java | 19 ++++++--- .../core/util/minecraft/ShapelessUtils.java | 3 +- .../util/minecraft/gregtech/PollutionUtils.java | 5 ++- .../gregtech/material/MaterialBuilder.java | 10 ----- .../gregtech/recipehandlers/GregtechRecipe.java | 4 +- .../minecraft/particles/BlockBreakParticles.java | 3 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 5 ++- .../core/util/reflect/AddGregtechRecipe.java | 6 +-- .../core/util/reflect/ReflectionUtils.java | 4 +- src/Java/gtPlusPlus/core/util/sys/GeoUtils.java | 4 +- .../gtPlusPlus/core/util/sys/NetworkUtils.java | 4 +- .../core/world/darkworld/Dimension_DarkWorld.java | 5 ++- .../darkworld/biome/BiomeGenerator_Custom.java | 10 +++-- .../world/darkworld/biome/Biome_DarkWorld.java | 14 ++++--- .../world/darkworld/biome/GenLayerDarkWorld.java | 4 +- .../darkworld/block/BlockDarkWorldGround.java | 4 +- .../block/BlockDarkWorldPollutedDirt.java | 6 ++- .../darkworld/block/BlockDarkWorldPortal.java | 13 +++--- .../darkworld/block/BlockDarkWorldPortalFrame.java | 6 ++- .../darkworld/block/BlockDarkWorldSludgeFluid.java | 5 ++- .../darkworld/block/DarkWorldContentLoader.java | 5 ++- .../world/darkworld/chunk/ChunkProviderModded.java | 13 ++++-- .../darkworld/gen/WorldGenMinable_Custom.java | 3 +- .../core/world/darkworld/gen/gt/WorldGen_GT.java | 5 ++- .../world/darkworld/gen/gt/WorldGen_GT_Base.java | 14 ++++--- .../darkworld/gen/gt/WorldGen_GT_Ore_Layer.java | 17 ++++---- .../core/world/darkworld/gen/gt/WorldGen_Ores.java | 6 +-- .../darkworld/item/ItemBlockToxicEverglades.java | 4 +- .../darkworld/item/ItemDarkWorldPortalTrigger.java | 13 +++--- .../core/world/darkworld/object/BoxedQuad.java | 3 +- .../darkworld/world/TeleporterDimensionMod.java | 7 +++- .../darkworld/world/WorldChunkManagerCustom.java | 16 +++++-- .../world/darkworld/world/WorldProviderMod.java | 6 ++- .../core/world/explosions/MiningExplosion.java | 11 +++-- src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java | 25 +++++++---- src/Java/gtPlusPlus/nei/NEI_GT_Config.java | 3 +- .../gtPlusPlus/plugin/fishing/item/BaseFish.java | 6 ++- .../plugin/fishing/misc/BaseFishTypes.java | 4 +- .../gtPlusPlus/preloader/Preloader_GT_OreDict.java | 5 ++- .../preloader/asm/Preloader_DummyContainer.java | 5 ++- .../preloader/asm/Preloader_FMLLoadingPlugin.java | 1 + .../transformers/Preloader_ClassTransformer.java | 5 ++- .../transformers/Preloader_ClassTransformer2.java | 31 +++++++------- .../Preloader_Transformer_Handler.java | 4 +- .../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 +++-- 612 files changed, 3020 insertions(+), 2128 deletions(-) (limited to 'src/Java') diff --git a/src/Java/cofh/energy/TileEnergyHandler.java b/src/Java/cofh/energy/TileEnergyHandler.java index f8e3ea4291..bd89f37bc9 100644 --- a/src/Java/cofh/energy/TileEnergyHandler.java +++ b/src/Java/cofh/energy/TileEnergyHandler.java @@ -2,6 +2,7 @@ package cofh.energy; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; public class TileEnergyHandler diff --git a/src/Java/cofh/mod/BaseMod.java b/src/Java/cofh/mod/BaseMod.java index 7ab858eabd..081526d5e7 100644 --- a/src/Java/cofh/mod/BaseMod.java +++ b/src/Java/cofh/mod/BaseMod.java @@ -1,14 +1,20 @@ package cofh.mod; -import cofh.mod.updater.IUpdatableMod; -import cofh.mod.updater.ModRange; -import cofh.mod.updater.ModVersion; +import java.io.*; +import java.util.*; +import java.util.Locale; +import java.util.jar.JarFile; +import java.util.zip.ZipEntry; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.helpers.Loader; +import org.apache.logging.log4j.spi.AbstractLogger; + import com.google.common.base.Strings; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ICrashCallable; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ObfuscationReflectionHelper; + +import cpw.mods.fml.common.*; import cpw.mods.fml.common.network.NetworkCheckHandler; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.versioning.InvalidVersionSpecificationException; @@ -16,33 +22,14 @@ import cpw.mods.fml.relauncher.FMLLaunchHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.jar.JarFile; -import java.util.zip.ZipEntry; - import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.IReloadableResourceManager; -import net.minecraft.client.resources.IResource; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; +import net.minecraft.client.resources.*; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringTranslate; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.helpers.Loader; -import org.apache.logging.log4j.spi.AbstractLogger; +import cofh.mod.updater.IUpdatableMod; +import cofh.mod.updater.ModRange; +import cofh.mod.updater.ModVersion; public abstract class BaseMod implements IUpdatableMod { diff --git a/src/Java/gregtech/api/enums/TAE.java b/src/Java/gregtech/api/enums/TAE.java index 248722269b..8f262ad121 100644 --- a/src/Java/gregtech/api/enums/TAE.java +++ b/src/Java/gregtech/api/enums/TAE.java @@ -2,10 +2,9 @@ package gregtech.api.enums; import java.lang.reflect.Field; -import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_CopiedBlockTexture; -import gregtech.api.objects.GT_RenderedTexture; + import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; diff --git a/src/Java/gregtech/api/util/CustomRecipeMap.java b/src/Java/gregtech/api/util/CustomRecipeMap.java index 5096947886..a39050b4e0 100644 --- a/src/Java/gregtech/api/util/CustomRecipeMap.java +++ b/src/Java/gregtech/api/util/CustomRecipeMap.java @@ -4,11 +4,13 @@ import static gregtech.api.enums.GT_Values.*; import java.util.*; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.objects.GT_ItemStack; + import gtPlusPlus.api.objects.Logger; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gregtech/api/util/EmptyRecipeMap.java b/src/Java/gregtech/api/util/EmptyRecipeMap.java index 60da5c3d0a..31e1e3db17 100644 --- a/src/Java/gregtech/api/util/EmptyRecipeMap.java +++ b/src/Java/gregtech/api/util/EmptyRecipeMap.java @@ -2,8 +2,10 @@ package gregtech.api.util; import java.util.Collection; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import net.minecraft.item.ItemStack; + +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; + import net.minecraftforge.fluids.FluidStack; public class EmptyRecipeMap extends GT_Recipe_Map{ diff --git a/src/Java/gregtech/api/util/FishPondFakeRecipe.java b/src/Java/gregtech/api/util/FishPondFakeRecipe.java index 9cb82bf5e0..e8032d63d5 100644 --- a/src/Java/gregtech/api/util/FishPondFakeRecipe.java +++ b/src/Java/gregtech/api/util/FishPondFakeRecipe.java @@ -2,12 +2,13 @@ package gregtech.api.util; import java.util.ArrayList; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomFishable; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomFishable; import net.minecraftforge.common.FishingHooks; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gregtech/api/util/HotFuel.java b/src/Java/gregtech/api/util/HotFuel.java index 62aaceeaad..746ff68382 100644 --- a/src/Java/gregtech/api/util/HotFuel.java +++ b/src/Java/gregtech/api/util/HotFuel.java @@ -1,6 +1,7 @@ package gregtech.api.util; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidStack; public class HotFuel { diff --git a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java index a93748390b..7f241b1178 100644 --- a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java +++ b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java @@ -3,12 +3,13 @@ package gregtech.api.util; import java.util.ArrayList; import java.util.Collection; -import gregtech.api.util.GT_Recipe; +import net.minecraft.item.ItemStack; + import gregtech.api.util.GT_Recipe.GT_Recipe_Map; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index 38f07e9f7e..1eb385ed68 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -4,15 +4,14 @@ import static gregtech.api.enums.GT_Values.*; import java.util.*; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map_Assembler; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index b5e1008a8e..250c8b57f5 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -1,7 +1,6 @@ package gtPlusPlus; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableUpdateChecker; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -15,9 +14,13 @@ import cpw.mods.fml.common.event.*; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.launchwrapper.Launch; + import gregtech.api.enums.Materials; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.ChunkManager; import gtPlusPlus.core.commands.CommandMath; @@ -44,7 +47,6 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; import gtPlusPlus.xmod.gregtech.loaders.GT_Material_Loader; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; -import net.minecraft.launchwrapper.Launch; import net.minecraftforge.oredict.OreDictionary; @MCVersion(value = "1.7.10") diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/GTplusplus_Secondary.java index 41288f24c2..c8fa7bb7d5 100644 --- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java +++ b/src/Java/gtPlusPlus/GTplusplus_Secondary.java @@ -9,9 +9,10 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.*; +import gtPlusPlus.core.lib.CORE.Everglades; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.ORES; import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; diff --git a/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java b/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java index ecde9fe930..f35c9cbc6b 100644 --- a/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java +++ b/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java @@ -1,11 +1,12 @@ package gtPlusPlus.api.damage; -import gtPlusPlus.core.world.damage.BaseCustomDamageSource; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IChatComponent; +import gtPlusPlus.core.world.damage.BaseCustomDamageSource; + public class DamageTeslaTower extends BaseCustomDamageSource{ public DamageTeslaTower(Entity transmitter) { diff --git a/src/Java/gtPlusPlus/api/enums/Quality.java b/src/Java/gtPlusPlus/api/enums/Quality.java index 0c59cd58fb..050f335b5e 100644 --- a/src/Java/gtPlusPlus/api/enums/Quality.java +++ b/src/Java/gtPlusPlus/api/enums/Quality.java @@ -1,8 +1,9 @@ package gtPlusPlus.api.enums; -import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.util.EnumChatFormatting; +import gtPlusPlus.core.util.math.MathUtils; + public enum Quality { // Magic Blue diff --git a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java index b1398f1367..0acee40a0f 100644 --- a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java +++ b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java @@ -1,10 +1,12 @@ package gtPlusPlus.api.helpers; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; + import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; public class MaterialHelper { diff --git a/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java b/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java index 12813e1dd0..5ab90d47ce 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java +++ b/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java @@ -1,10 +1,11 @@ package gtPlusPlus.api.interfaces; -import gtPlusPlus.api.objects.minecraft.BlockPos; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import gtPlusPlus.api.objects.minecraft.BlockPos; + public interface IEntityCatcher { public boolean hasEntity(ItemStack aStack); diff --git a/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java index de639c6bae..5f624e7a8c 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ b/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java @@ -1,17 +1,15 @@ package gtPlusPlus.api.interfaces; -import gregtech.api.interfaces.IDescribable; -import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; -import gregtech.api.interfaces.tileentity.IGearEnergyTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.interfaces.tileentity.ITurnable; -import gtPlusPlus.core.tileentities.base.TilePoweredGT; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import gregtech.api.interfaces.IDescribable; +import gregtech.api.interfaces.tileentity.*; + +import gtPlusPlus.core.tileentities.base.TilePoweredGT; + public abstract interface IGregtechPower extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer { @Override diff --git a/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java b/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java index 3a4b8f188c..47e692bffb 100644 --- a/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java +++ b/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java @@ -1,8 +1,9 @@ package gtPlusPlus.api.interfaces; +import net.minecraft.block.Block; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; -import net.minecraft.block.Block; public interface ITexturedBlock extends ITexturedTileEntity{ diff --git a/src/Java/gtPlusPlus/api/objects/Logger.java b/src/Java/gtPlusPlus/api/objects/Logger.java index 1ecdaa9e86..2c50f0c15e 100644 --- a/src/Java/gtPlusPlus/api/objects/Logger.java +++ b/src/Java/gtPlusPlus/api/objects/Logger.java @@ -4,6 +4,7 @@ import org.apache.logging.log4j.LogManager; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.relauncher.FMLRelaunchLog; + import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.proxy.ClientProxy; diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java index d38acdd8cd..7ee71e7c9f 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -4,9 +4,10 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import gtPlusPlus.api.objects.data.AutoMap; import net.minecraft.block.Block; import net.minecraft.world.World; + +import gtPlusPlus.api.objects.data.AutoMap; import net.minecraftforge.common.DimensionManager; public class BlockPos implements Serializable{ diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java b/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java index b411e8875a..82f3adfc9e 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java +++ b/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java @@ -8,31 +8,25 @@ */ package gtPlusPlus.api.objects.minecraft; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Triplet; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.ConcurrentHashMap; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.entity.Entity; +import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.Triplet; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.LoadingCallback; -import net.minecraftforge.common.ForgeChunkManager.OrderedLoadingCallback; -import net.minecraftforge.common.ForgeChunkManager.Ticket; -import net.minecraftforge.common.ForgeChunkManager.Type; +import net.minecraftforge.common.ForgeChunkManager.*; import net.minecraftforge.event.entity.EntityEvent; /** diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index d5922242f4..2535046792 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -1,6 +1,7 @@ package gtPlusPlus.api.objects.minecraft; import gregtech.api.GregTech_API; + import gtPlusPlus.core.lib.CORE; import net.minecraftforge.fluids.Fluid; diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java b/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java index f5db1d9e3a..9c1b231961 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java +++ b/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java @@ -1,6 +1,7 @@ package gtPlusPlus.api.objects.minecraft; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidStack; public class GenericStack { diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 04ada83922..50d403f3b2 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -1,31 +1,19 @@ package gtPlusPlus.core.block; import cpw.mods.fml.common.registry.GameRegistry; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseOre; -import gtPlusPlus.core.block.general.BlockCompressedObsidian; -import gtPlusPlus.core.block.general.BlockNet; -import gtPlusPlus.core.block.general.BlockTankXpConverter; -import gtPlusPlus.core.block.general.FirePit; -import gtPlusPlus.core.block.general.FluidTankInfinite; -import gtPlusPlus.core.block.general.HellFire; -import gtPlusPlus.core.block.general.LightGlass; -import gtPlusPlus.core.block.general.MiningExplosives; +import gtPlusPlus.core.block.general.*; import gtPlusPlus.core.block.general.antigrief.BlockWitherProof; -import gtPlusPlus.core.block.machine.FishTrap; -import gtPlusPlus.core.block.machine.HeliumGenerator; -import gtPlusPlus.core.block.machine.Machine_ModularityTable; -import gtPlusPlus.core.block.machine.Machine_ProjectTable; -import gtPlusPlus.core.block.machine.Machine_TradeTable; -import gtPlusPlus.core.block.machine.Machine_Workbench; -import gtPlusPlus.core.block.machine.Machine_WorkbenchAdvanced; +import gtPlusPlus.core.block.machine.*; import gtPlusPlus.core.fluids.FluidRegistryHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; public final class ModBlocks { diff --git a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java index d8e59f96c8..f63762a2d7 100644 --- a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.block.base; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -9,6 +8,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.core.lib.CORE; + public class AdvancedBlock extends Block { protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x, final float blockHardness, final float blockResistance, final float blockLightLevel, diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java index 01db44f28b..f2edf65740 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -1,8 +1,5 @@ package gtPlusPlus.core.block.base; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; @@ -10,6 +7,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; + public class BasicBlock extends BlockContainer { public BasicBlock(final String unlocalizedName, final Material material) { diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java index 6f837e8709..49bb5aaf0c 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -2,22 +2,24 @@ package gtPlusPlus.core.block.base; import java.util.Random; -import cofh.lib.render.particle.EntityDropParticleFX; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + +import cofh.lib.render.particle.EntityDropParticleFX; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index 351c44b0c5..101e568188 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -3,7 +3,12 @@ package gtPlusPlus.core.block.base; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.world.IBlockAccess; + import gregtech.api.util.GT_OreDictUnificator; + import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox; import gtPlusPlus.core.lib.CORE; @@ -11,8 +16,6 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.world.IBlockAccess; public class BlockBaseModular extends BasicBlock { diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseNBT.java index 7ac07880c9..e4dff82ec4 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseNBT.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseNBT.java @@ -1,11 +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.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockNBT; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -17,6 +15,9 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockNBT; + public abstract class BlockBaseNBT extends BlockContainer { @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index 5f476ef8df..28a209118e 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -3,6 +3,13 @@ package gtPlusPlus.core.block.base; import java.lang.reflect.Field; import cpw.mods.fml.common.registry.GameRegistry; + +import net.minecraft.block.Block; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -10,6 +17,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_CopiedBlockTexture; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_OreDictUnificator; + import gtPlusPlus.api.interfaces.ITexturedBlock; import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer; import g