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/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 +++--- 310 files changed, 1495 insertions(+), 1131 deletions(-) (limited to 'src/Java/gtPlusPlus/core') 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 gtPlusPlus.core.creative.AddToCreativeTab; @@ -19,11 +27,6 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -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; public class BlockBaseOre extends BasicBlock implements ITexturedBlock { diff --git a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java index 4e91509c6e..a04bf841ba 100644 --- a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.block.base; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; + public class MultiTextureBlock extends Block { public IIcon[] icons = new IIcon[6]; diff --git a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index 879f932165..03ca846b7d 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java @@ -7,9 +7,7 @@ import java.util.Random; 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 net.minecraft.block.BlockObsidian; import net.minecraft.block.material.MapColor; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,6 +17,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.lib.CORE; + public class BlockCompressedObsidian extends BlockObsidian { private final IIcon textureArray[] = new IIcon[6]; diff --git a/src/Java/gtPlusPlus/core/block/general/BlockNet.java b/src/Java/gtPlusPlus/core/block/general/BlockNet.java index 26871662b2..1f0f145392 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockNet.java +++ b/src/Java/gtPlusPlus/core/block/general/BlockNet.java @@ -4,13 +4,15 @@ import java.util.Random; 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.ModItems; -import gtPlusPlus.core.lib.CORE; + import net.minecraft.block.BlockWeb; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.lib.CORE; + public class BlockNet extends BlockWeb{ public BlockNet(){ diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index fab163398d..bab2ecc349 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -8,15 +8,7 @@ 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 gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.api.objects.data.Triplet; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityXpConverter; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.EnchantingUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -29,6 +21,17 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gregtech.common.items.GT_MetaGenerated_Tool_01; + +import gtPlusPlus.api.objects.data.Triplet; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityXpConverter; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.EnchantingUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; + public class BlockTankXpConverter extends BlockContainer { @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/block/general/FirePit.java b/src/Java/gtPlusPlus/core/block/general/FirePit.java index cf24025124..6f35715c48 100644 --- a/src/Java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/Java/gtPlusPlus/core/block/general/FirePit.java @@ -9,9 +9,7 @@ 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.block.base.BasicBlock; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.tileentities.general.TileEntityFirepit; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,6 +20,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; + +import gtPlusPlus.core.block.base.BasicBlock; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.tileentities.general.TileEntityFirepit; import net.minecraftforge.common.util.ForgeDirection; public class FirePit extends BasicBlock{ diff --git a/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java index 3b2f73de86..bbec95a28e 100644 --- a/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -4,10 +4,7 @@ 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.tileentities.general.TileEntityInfiniteFluid; -import gtPlusPlus.core.util.minecraft.PlayerUtils; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,10 +14,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.ItemFluidContainer; + +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid; +import gtPlusPlus.core.util.minecraft.PlayerUtils; +import net.minecraftforge.fluids.*; public class FluidTankInfinite extends BlockContainer { diff --git a/src/Java/gtPlusPlus/core/block/general/HellFire.java b/src/Java/gtPlusPlus/core/block/general/HellFire.java index ef15f373ae..fb9078d47a 100644 --- a/src/Java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/Java/gtPlusPlus/core/block/general/HellFire.java @@ -1,11 +1,6 @@ package gtPlusPlus.core.block.general; -import static net.minecraftforge.common.util.ForgeDirection.DOWN; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.UP; -import static net.minecraftforge.common.util.ForgeDirection.WEST; +import static net.minecraftforge.common.util.ForgeDirection.*; import java.util.IdentityHashMap; import java.util.Map.Entry; @@ -17,10 +12,7 @@ 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.random.XSTR; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockFire; import net.minecraft.block.material.MapColor; @@ -31,6 +23,11 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + +import gtPlusPlus.api.objects.random.XSTR; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.math.MathUtils; import net.minecraftforge.common.util.ForgeDirection; public class HellFire extends BlockFire { diff --git a/src/Java/gtPlusPlus/core/block/general/LightGlass.java b/src/Java/gtPlusPlus/core/block/general/LightGlass.java index fd2d575158..5a265ed7ef 100644 --- a/src/Java/gtPlusPlus/core/block/general/LightGlass.java +++ b/src/Java/gtPlusPlus/core/block/general/LightGlass.java @@ -4,15 +4,17 @@ import java.util.Random; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; + import net.minecraft.block.BlockBreakable; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; + public class LightGlass extends BlockBreakable { private int state = 0; diff --git a/src/Java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/Java/gtPlusPlus/core/block/general/MiningExplosives.java index c02a16f88d..ceb35ad673 100644 --- a/src/Java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/Java/gtPlusPlus/core/block/general/MiningExplosives.java @@ -6,9 +6,7 @@ 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.entity.EntityPrimedMiningExplosive; -import gtPlusPlus.core.lib.CORE; + import net.minecraft.block.Block; import net.minecraft.block.BlockTNT; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,6 +19,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; +import gtPlusPlus.core.lib.CORE; + public class MiningExplosives extends BlockTNT { @SideOnly(Side.CLIENT) private IIcon textureTop; diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index 3d97fb0aa3..ed531cef2d 100644 --- a/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -1,12 +1,9 @@ package gtPlusPlus.core.block.general.antigrief; 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 net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,6 +16,10 @@ import net.minecraft.world.Explosion; 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 BlockWitherProof extends Block{ public BlockWitherProof(){ diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java index ea3d9c3ee9..01a2116a0b 100644 --- a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java @@ -7,10 +7,7 @@ import java.util.Random; 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.tileentities.general.TileEntityReverter; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,6 +23,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityReverter; + public class TowerDevice extends Block { private static IIcon TEX_ANTIBUILDER; public static final int META_ANTIBUILDER = 9; diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java index b87054748d..6af27639ae 100644 --- a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java +++ b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java @@ -2,14 +2,16 @@ package gtPlusPlus.core.block.general.fluids; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; + import net.minecraft.block.material.Material; 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 gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; diff --git a/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java index 0ed3aa5afd..a4ed895b13 100644 --- a/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java +++ b/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.block.machine; -import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; -import gtPlusPlus.core.block.base.MetaBlock; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.IBlockAccess; +import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; +import gtPlusPlus.core.block.base.MetaBlock; +import gtPlusPlus.core.lib.CORE; + public class BlockGtFrameBox extends MetaBlock { private int[] colours; diff --git a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java index b4273a008d..8e5f8a33f5 100644 --- a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java @@ -4,13 +4,7 @@ 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.GTplusplus; -import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; -import gtPlusPlus.core.util.minecraft.InventoryUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -24,6 +18,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; +import gtPlusPlus.core.util.minecraft.InventoryUtils; + public class FishTrap extends BlockContainer implements ITileTooltip { @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java index 0f5bbcbb3b..5dc8604a93 100644 --- a/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java @@ -4,10 +4,7 @@ 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.GTplusplus; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,6 +13,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator; + public class HeliumGenerator extends BlockContainer { @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index 46d5994a66..6f60d39ce7 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -4,13 +4,7 @@ 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.GTplusplus; -import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,6 +15,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; + public class Machine_ModularityTable extends BlockContainer implements ITileTooltip { @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index 199736c07d..eecc379290 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -5,6 +5,18 @@ 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 net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.api.objects.Logger; @@ -16,16 +28,6 @@ import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO") public class Machine_ProjectTable extends BlockContainer implements ITileTooltip diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java index ca51b8948c..5195e0f18c 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java @@ -2,12 +2,7 @@ package gtPlusPlus.core.block.machine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.block.base.BlockBaseNBT; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; @@ -17,6 +12,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.block.base.BlockBaseNBT; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; + public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip { @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java index 4d38115725..675aeaaf2b 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java @@ -5,15 +5,7 @@ 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.GTplusplus; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import ic2.core.item.tool.ItemToolWrench; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,6 +17,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; +import gtPlusPlus.core.util.minecraft.PlayerUtils; +import gtPlusPlus.core.util.reflect.ReflectionUtils; +import ic2.core.item.tool.ItemToolWrench; + @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO") public class Machine_Workbench extends BlockContainer { diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java index 5129bc56ab..af2f9f82e0 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java @@ -1,26 +1,22 @@ package gtPlusPlus.core.block.machine; -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import ic2.core.item.tool.ItemToolWrench; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced; + public class Machine_WorkbenchAdvanced extends BlockContainer { @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java index 43930fb9fb..455df761cb 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java +++ b/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java @@ -2,6 +2,7 @@ package gtPlusPlus.core.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.client.model.ModelBlaze; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java b/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java index bba3bd1ad8..aa23635b4d 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java +++ b/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java @@ -2,6 +2,7 @@ package gtPlusPlus.core.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.client.model.ModelIronGolem; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java index 01d597df5e..4adfefaec9 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java +++ b/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java @@ -4,9 +4,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; -import gregtech.api.interfaces.ITexture; -import gtPlusPlus.api.interfaces.ITexturedBlock; -import gtPlusPlus.api.objects.Logger; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -15,6 +13,11 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import gregtech.api.interfaces.ITexture; + +import gtPlusPlus.api.interfaces.ITexturedBlock; +import gtPlusPlus.api.objects.Logger; + public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { public static CustomOreBlockRenderer INSTANCE; diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java b/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java index 69776b4d95..893982e8ac 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java @@ -4,15 +4,17 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.RenderTNTPrimed; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; + @SideOnly(Side.CLIENT) public class RenderMiningExplosivesPrimed extends RenderTNTPrimed { private final RenderBlocks blockRenderer = new RenderBlocks(); diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java b/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java index cb17793c59..b73154da10 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java @@ -1,17 +1,20 @@ package gtPlusPlus.core.client.renderer; +import java.util.Random; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.random.XSTR; -import gtPlusPlus.core.entity.EntityTeslaTowerLightning; -import java.util.Random; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; + +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.random.XSTR; +import gtPlusPlus.core.entity.EntityTeslaTowerLightning; @SideOnly(Side.CLIENT) public class RenderPlasmaBolt extends Render { diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java b/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java index e86a3fa7ab..a0e396bc23 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java @@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL12; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java b/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java index d2b8ff4868..e1e8360840 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java @@ -2,12 +2,16 @@ package gtPlusPlus.core.client.renderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.ResourceLocation; + import gtPlusPlus.core.client.model.ModelSickBlaze; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.lib.CORE; -import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.*; -import net.minecraft.util.ResourceLocation; @SideOnly(Side.CLIENT) public class RenderSickBlaze extends RenderLiving diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java b/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java index 8de64eef26..c1fd88773d 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java @@ -5,16 +5,20 @@ import org.lwjgl.opengl.GL12; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.client.model.ModelStaballoyConstruct; -import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; -import gtPlusPlus.core.lib.CORE; + import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; +import gtPlusPlus.core.client.model.ModelStaballoyConstruct; +import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; +import gtPlusPlus.core.lib.CORE; + @SideOnly(Side.CLIENT) public class RenderStaballoyConstruct extends RenderLiving { private static final ResourceLocation staballoyGolemTextures = new ResourceLocation(CORE.MODID+":"+"textures/entity/golemStaballoy.png"); diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java b/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java index 774e506146..711cec169b 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL12; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.entity.projectile.EntityToxinball; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; @@ -14,6 +14,8 @@ import net.minecraft.init.Items; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import gtPlusPlus.core.entity.projectile.EntityToxinball; + @SideOnly(Side.CLIENT) public class RenderToxinball extends Render { diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java index 1022eb0629..a05bb42756 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java @@ -3,19 +3,16 @@ package gtPlusPlus.core.commands; import java.util.ArrayList; import java.util.List; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; -import net.mine