From 8ec8babb6a83b6cdf3ad091bfb9696facdf691b3 Mon Sep 17 00:00:00 2001 From: yueh Date: Thu, 20 Jul 2017 21:18:49 +0200 Subject: [PATCH] Organised imports --- .../java/appeng/api/parts/IFacadePart.java | 2 - .../block/AEBaseItemBlockChargeable.java | 1 - .../java/appeng/block/AEBaseTileBlock.java | 1 - .../block/crafting/BlockCraftingMonitor.java | 1 - .../block/crafting/BlockCraftingStorage.java | 4 -- .../block/networking/BlockController.java | 3 - .../networking/BlockCreativeEnergyCell.java | 1 - .../networking/BlockDenseEnergyCell.java | 4 -- .../block/networking/BlockEnergyAcceptor.java | 1 - .../block/networking/BlockEnergyCell.java | 2 - .../block/spatial/BlockMatrixFrame.java | 1 - .../bootstrap/BlockDefinitionBuilder.java | 4 +- .../java/appeng/bootstrap/FeatureFactory.java | 8 ++- .../java/appeng/bootstrap/IBlockBuilder.java | 2 +- .../bootstrap/ItemDefinitionBuilder.java | 2 +- .../components/ModelRegComponent.java | 3 +- .../components/TileEntityComponent.java | 9 +-- .../java/appeng/client/gui/AEBaseGui.java | 2 +- .../gui/implementations/GuiNetworkStatus.java | 3 +- .../client/render/SpatialSkyRender.java | 2 +- .../ItemEncodedPatternBakedModel.java | 3 +- .../render/model/BiometricCardBakedModel.java | 2 +- .../model/ColorApplicatorBakedModel.java | 2 +- .../render/renderable/ItemRenderable.java | 2 +- .../appeng/client/render/tesr/CrankTESR.java | 2 +- .../client/render/tesr/InscriberTESR.java | 4 +- .../ContainerNetworkStatus.java | 1 - .../container/slot/AppEngCraftingSlot.java | 7 -- .../appeng/container/slot/AppEngSlot.java | 8 +-- .../java/appeng/container/slot/NullSlot.java | 4 +- .../container/slot/OptionalSlotFake.java | 4 +- src/main/java/appeng/core/ApiDefinitions.java | 5 -- src/main/java/appeng/core/FacadeConfig.java | 1 - src/main/java/appeng/core/Registration.java | 11 ++- .../core/api/definitions/ApiBlocks.java | 72 +++++++++---------- .../core/stats/PlayerStatsRegistration.java | 1 - src/main/java/appeng/coremod/AppEngCore.java | 3 +- .../coremod/transformer/ASMIntegration.java | 2 +- .../appeng/entity/EntityTinyTNTPrimed.java | 1 - src/main/java/appeng/facade/FacadePart.java | 2 - .../appeng/integration/IntegrationNode.java | 2 - .../java/appeng/integration/Integrations.java | 7 +- .../modules/ic2/IC2RecipeInput.java | 10 +-- .../integration/modules/jei/JEIPlugin.java | 1 - .../theoneprobe/TheOneProbeModule.java | 4 +- .../waila/tile/ChargerWailaDataProvider.java | 4 +- src/main/java/appeng/items/AEBaseItem.java | 1 - .../appeng/items/misc/ItemCrystalSeed.java | 5 +- .../appeng/items/misc/ItemEncodedPattern.java | 4 +- .../java/appeng/items/misc/ItemPaintBall.java | 1 - .../java/appeng/items/parts/PartType.java | 10 ++- .../items/storage/ItemBasicStorageCell.java | 4 +- .../storage/ItemCreativeStorageCell.java | 21 +++--- .../items/storage/ItemSpatialStorageCell.java | 5 +- .../appeng/items/tools/ToolBiometricCard.java | 4 +- .../appeng/items/tools/ToolMemoryCard.java | 4 +- .../tools/powered/ToolColorApplicator.java | 3 +- .../items/tools/powered/ToolMatterCannon.java | 4 +- .../powered/powersink/AERootPoweredItem.java | 4 +- .../appeng/me/cache/CraftingGridCache.java | 1 - .../java/appeng/me/cache/PathGridCache.java | 1 - .../parts/layers/LayerIEnergyHandler.java | 8 ++- .../appeng/parts/misc/PartStorageBus.java | 1 - .../java/appeng/parts/p2p/PartP2PFEPower.java | 18 ++--- .../java/appeng/parts/p2p/PartP2PItems.java | 12 ++-- .../java/appeng/parts/p2p/PartP2PRFPower.java | 22 +++--- .../java/appeng/recipes/RecipeHandler.java | 18 +++-- .../recipes/game/DisassembleRecipe.java | 1 - .../appeng/recipes/game/FacadeRecipe.java | 1 - .../appeng/recipes/game/ShapedRecipe.java | 3 - .../appeng/recipes/game/ShapelessRecipe.java | 3 - .../java/appeng/recipes/handlers/Shaped.java | 2 - .../appeng/recipes/handlers/Shapeless.java | 2 - .../recipes/helpers/PartRecipeFactory.java | 4 +- .../helpers/PartShapedCraftingFactory.java | 17 +++-- .../helpers/PartShapelessCraftingFactory.java | 13 ++-- .../recipes/ores/OreDictionaryHandler.java | 1 - .../appeng/services/export/ExportProcess.java | 6 +- .../export/MinecraftItemCSVExporter.java | 4 +- .../appeng/spatial/StorageChunkProvider.java | 2 +- .../java/appeng/tile/storage/TileChest.java | 3 +- src/main/java/appeng/util/Platform.java | 3 +- .../util/helpers/ItemComparisonHelper.java | 1 - .../appeng/util/inv/AdaptorIInventory.java | 1 - .../appeng/util/inv/IMEAdaptorIterator.java | 3 +- .../client/render/UVLightmapJsonTest.java | 5 +- 86 files changed, 209 insertions(+), 238 deletions(-) diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java index 00e07965b..c767a97ba 100644 --- a/src/api/java/appeng/api/parts/IFacadePart.java +++ b/src/api/java/appeng/api/parts/IFacadePart.java @@ -24,8 +24,6 @@ package appeng.api.parts; -import javax.annotation.Nullable; - import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.item.Item; diff --git a/src/main/java/appeng/block/AEBaseItemBlockChargeable.java b/src/main/java/appeng/block/AEBaseItemBlockChargeable.java index abc8d1370..bddac7207 100644 --- a/src/main/java/appeng/block/AEBaseItemBlockChargeable.java +++ b/src/main/java/appeng/block/AEBaseItemBlockChargeable.java @@ -24,7 +24,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 2e163c463..837ea284c 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -34,7 +34,6 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumDyeColor; diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java index b723391d8..843fec8b9 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java @@ -22,7 +22,6 @@ package appeng.block.crafting; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; diff --git a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java index d5f9bc466..5940ab0d3 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java @@ -18,10 +18,6 @@ package appeng.block.crafting; - -import appeng.tile.crafting.TileCraftingStorageTile; - - public class BlockCraftingStorage extends BlockCraftingUnit { diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index 7465b6063..35211507b 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -34,9 +34,6 @@ import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.tile.networking.TileController; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class BlockController extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java b/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java index 5f5a9daa1..73f773a28 100644 --- a/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java @@ -21,7 +21,6 @@ package appeng.block.networking; import appeng.block.AEBaseTileBlock; import appeng.helpers.AEGlassMaterial; -import appeng.tile.networking.TileCreativeEnergyCell; public class BlockCreativeEnergyCell extends AEBaseTileBlock diff --git a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java index 9191959bd..5a263993a 100644 --- a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java @@ -18,10 +18,6 @@ package appeng.block.networking; - -import appeng.tile.networking.TileDenseEnergyCell; - - public class BlockDenseEnergyCell extends BlockEnergyCell { diff --git a/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java b/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java index 099b08546..eefd04c5e 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java +++ b/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java @@ -22,7 +22,6 @@ package appeng.block.networking; import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; -import appeng.tile.networking.TileEnergyAcceptor; public class BlockEnergyAcceptor extends AEBaseTileBlock diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/BlockEnergyCell.java index 040c1b710..a4e13b026 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCell.java @@ -23,7 +23,6 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; @@ -32,7 +31,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import appeng.block.AEBaseTileBlock; import appeng.helpers.AEGlassMaterial; -import appeng.tile.networking.TileEnergyCell; import appeng.util.Platform; diff --git a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java index ab1712f9f..876611f28 100644 --- a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java +++ b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java @@ -26,7 +26,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index 0332236f9..4b4a662e3 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -29,8 +29,6 @@ import java.util.function.Supplier; import javax.annotation.Nullable; -import appeng.bootstrap.definitions.TileEntityDefinition; -import appeng.core.Registration; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; @@ -44,9 +42,11 @@ import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseBlock; import appeng.block.AEBaseItemBlock; import appeng.block.AEBaseTileBlock; +import appeng.bootstrap.definitions.TileEntityDefinition; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.CreativeTab; +import appeng.core.Registration; import appeng.core.features.AEFeature; import appeng.core.features.ActivityState; import appeng.core.features.BlockDefinition; diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index 67a42f836..124b56680 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; -import appeng.bootstrap.components.*; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.client.model.IModel; @@ -33,6 +32,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.definitions.IItemDefinition; import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; +import appeng.bootstrap.components.BuiltInModelComponent; +import appeng.bootstrap.components.InitComponent; +import appeng.bootstrap.components.ModelOverrideComponent; +import appeng.bootstrap.components.ModelRegComponent; +import appeng.bootstrap.components.PostInitComponent; +import appeng.bootstrap.components.PreInitComponent; +import appeng.bootstrap.components.TileEntityComponent; import appeng.core.features.AEFeature; import appeng.core.features.ActivityState; import appeng.core.features.ColoredItemDefinition; diff --git a/src/main/java/appeng/bootstrap/IBlockBuilder.java b/src/main/java/appeng/bootstrap/IBlockBuilder.java index 16f8e587b..f8332dc57 100644 --- a/src/main/java/appeng/bootstrap/IBlockBuilder.java +++ b/src/main/java/appeng/bootstrap/IBlockBuilder.java @@ -22,12 +22,12 @@ package appeng.bootstrap; import java.util.function.BiConsumer; import java.util.function.Function; -import appeng.bootstrap.definitions.TileEntityDefinition; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import appeng.api.definitions.IBlockDefinition; +import appeng.bootstrap.definitions.TileEntityDefinition; import appeng.core.features.AEFeature; diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java index 19233cf73..8271c3916 100644 --- a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.function.Consumer; import java.util.function.Supplier; -import appeng.core.Registration; import net.minecraft.block.BlockDispenser; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.dispenser.IBehaviorDispenseItem; @@ -37,6 +36,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.CreativeTab; +import appeng.core.Registration; import appeng.core.features.AEFeature; import appeng.core.features.ItemDefinition; import appeng.util.Platform; diff --git a/src/main/java/appeng/bootstrap/components/ModelRegComponent.java b/src/main/java/appeng/bootstrap/components/ModelRegComponent.java index 42cff9fe1..3bbad4332 100644 --- a/src/main/java/appeng/bootstrap/components/ModelRegComponent.java +++ b/src/main/java/appeng/bootstrap/components/ModelRegComponent.java @@ -2,9 +2,10 @@ package appeng.bootstrap.components; -import appeng.bootstrap.IBootstrapComponent; import net.minecraftforge.fml.relauncher.Side; +import appeng.bootstrap.IBootstrapComponent; + /** * @author GuntherDW diff --git a/src/main/java/appeng/bootstrap/components/TileEntityComponent.java b/src/main/java/appeng/bootstrap/components/TileEntityComponent.java index a512988d5..42cd451a8 100644 --- a/src/main/java/appeng/bootstrap/components/TileEntityComponent.java +++ b/src/main/java/appeng/bootstrap/components/TileEntityComponent.java @@ -2,13 +2,14 @@ package appeng.bootstrap.components; -import appeng.bootstrap.definitions.TileEntityDefinition; -import appeng.core.AppEng; +import java.util.ArrayList; +import java.util.List; + import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; -import java.util.ArrayList; -import java.util.List; +import appeng.bootstrap.definitions.TileEntityDefinition; +import appeng.core.AppEng; /** diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 6afa8b43b..9a66bb3cd 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -35,7 +35,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; -import net.minecraft.client.renderer.BufferBuilder; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -43,6 +42,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java b/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java index cbabe62d4..d5450cd42 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java @@ -22,12 +22,11 @@ package appeng.client.gui.implementations; import java.io.IOException; import java.util.List; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.input.Mouse; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index b6754dd0a..2714a5a5e 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -21,11 +21,11 @@ package appeng.client.render; import java.util.Random; -import net.minecraft.client.renderer.BufferBuilder; import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java index fc3db1530..843651194 100644 --- a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java @@ -9,8 +9,6 @@ import javax.vecmath.Matrix4f; import com.google.common.collect.ImmutableMap; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.PerspectiveMapWrapper; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.input.Keyboard; @@ -26,6 +24,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.common.model.TRSRTransformation; import appeng.items.misc.ItemEncodedPattern; diff --git a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java index 47bb21841..34860a8b7 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java @@ -15,7 +15,6 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; import com.mojang.authlib.GameProfile; -import net.minecraftforge.client.model.IModel; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.block.state.IBlockState; @@ -29,6 +28,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.model.IModel; import net.minecraftforge.common.model.TRSRTransformation; import appeng.api.implementations.items.IBiometricCard; diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java index 941f01895..1471b5ece 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java @@ -11,7 +11,6 @@ import javax.vecmath.Matrix4f; import com.google.common.collect.ImmutableMap; -import net.minecraftforge.client.model.PerspectiveMapWrapper; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.block.state.IBlockState; @@ -21,6 +20,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.common.model.TRSRTransformation; diff --git a/src/main/java/appeng/client/render/renderable/ItemRenderable.java b/src/main/java/appeng/client/render/renderable/ItemRenderable.java index 5a9175e2a..9d4146571 100644 --- a/src/main/java/appeng/client/render/renderable/ItemRenderable.java +++ b/src/main/java/appeng/client/render/renderable/ItemRenderable.java @@ -22,12 +22,12 @@ package appeng.client.render.renderable; import java.nio.FloatBuffer; import java.util.function.Function; -import net.minecraft.client.renderer.BufferBuilder; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.BufferUtils; import org.lwjgl.util.vector.Matrix4f; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/client/render/tesr/CrankTESR.java b/src/main/java/appeng/client/render/tesr/CrankTESR.java index 78678b164..aa1f3c337 100644 --- a/src/main/java/appeng/client/render/tesr/CrankTESR.java +++ b/src/main/java/appeng/client/render/tesr/CrankTESR.java @@ -19,12 +19,12 @@ package appeng.client.render.tesr; -import net.minecraft.client.renderer.BufferBuilder; import org.lwjgl.opengl.GL11; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/appeng/client/render/tesr/InscriberTESR.java b/src/main/java/appeng/client/render/tesr/InscriberTESR.java index b0f2c3716..ef665449b 100644 --- a/src/main/java/appeng/client/render/tesr/InscriberTESR.java +++ b/src/main/java/appeng/client/render/tesr/InscriberTESR.java @@ -2,12 +2,11 @@ package appeng.client.render.tesr; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.init.Blocks; import org.lwjgl.opengl.GL11; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; @@ -16,6 +15,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.TextureStitchEvent; diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java index 983d7ab0b..67b003b7b 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java @@ -24,7 +24,6 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import appeng.api.AEApi; diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java index 68da25871..eb7f22419 100644 --- a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java +++ b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java @@ -20,16 +20,9 @@ package appeng.container.slot; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemHoe; -import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.item.ItemTool; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.util.NonNullList; diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index 6e665e6a7..8962bb7a8 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/src/main/java/appeng/container/slot/AppEngSlot.java @@ -19,17 +19,17 @@ package appeng.container.slot; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; - -import appeng.container.AEBaseContainer; -import appeng.tile.inventory.AppEngInternalInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; +import appeng.container.AEBaseContainer; +import appeng.tile.inventory.AppEngInternalInventory; public class AppEngSlot extends Slot diff --git a/src/main/java/appeng/container/slot/NullSlot.java b/src/main/java/appeng/container/slot/NullSlot.java index 297c09619..e489b8385 100644 --- a/src/main/java/appeng/container/slot/NullSlot.java +++ b/src/main/java/appeng/container/slot/NullSlot.java @@ -19,13 +19,13 @@ package appeng.container.slot; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import javax.annotation.Nonnull; - public class NullSlot extends Slot { diff --git a/src/main/java/appeng/container/slot/OptionalSlotFake.java b/src/main/java/appeng/container/slot/OptionalSlotFake.java index dfb370bbd..3f1150b31 100644 --- a/src/main/java/appeng/container/slot/OptionalSlotFake.java +++ b/src/main/java/appeng/container/slot/OptionalSlotFake.java @@ -19,11 +19,11 @@ package appeng.container.slot; +import javax.annotation.Nonnull; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import javax.annotation.Nonnull; - public class OptionalSlotFake extends SlotFake { diff --git a/src/main/java/appeng/core/ApiDefinitions.java b/src/main/java/appeng/core/ApiDefinitions.java index b8d4cbf11..34bfeabdf 100644 --- a/src/main/java/appeng/core/ApiDefinitions.java +++ b/src/main/java/appeng/core/ApiDefinitions.java @@ -26,11 +26,6 @@ import appeng.core.api.definitions.ApiItems; import appeng.core.api.definitions.ApiMaterials; import appeng.core.api.definitions.ApiParts; import appeng.core.features.registries.PartModels; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; /** diff --git a/src/main/java/appeng/core/FacadeConfig.java b/src/main/java/appeng/core/FacadeConfig.java index 201462c60..b45d0bd31 100644 --- a/src/main/java/appeng/core/FacadeConfig.java +++ b/src/main/java/appeng/core/FacadeConfig.java @@ -25,7 +25,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.config.Configuration; diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 62f4515ad..a90528571 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -27,10 +27,6 @@ import java.util.Set; import javax.annotation.Nonnull; -import appeng.integration.IntegrationRegistry; -import appeng.integration.IntegrationType; -import appeng.items.parts.ItemFacade; -import appeng.recipes.game.DisassembleRecipe; import com.google.common.base.Preconditions; import net.minecraft.block.Block; @@ -50,6 +46,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; +import net.minecraftforge.registries.IForgeRegistry; import appeng.api.config.Upgrades; import appeng.api.definitions.IBlocks; @@ -78,8 +75,11 @@ import appeng.core.localization.GuiText; import appeng.core.localization.PlayerMessages; import appeng.core.stats.PlayerStatsRegistration; import appeng.hooks.TickHandler; +import appeng.integration.IntegrationRegistry; +import appeng.integration.IntegrationType; import appeng.integration.Integrations; import appeng.items.materials.ItemMaterial; +import appeng.items.parts.ItemFacade; import appeng.loot.ChestLoot; import appeng.me.cache.CraftingGridCache; import appeng.me.cache.EnergyGridCache; @@ -93,6 +93,7 @@ import appeng.parts.PartPlacement; import appeng.recipes.AEItemResolver; import appeng.recipes.CustomRecipeConfig; import appeng.recipes.RecipeHandler; +import appeng.recipes.game.DisassembleRecipe; import appeng.recipes.game.FacadeRecipe; import appeng.recipes.game.ShapedRecipe; import appeng.recipes.game.ShapelessRecipe; @@ -114,8 +115,6 @@ import appeng.spatial.StorageWorldProvider; import appeng.tile.AEBaseTile; import appeng.worldgen.MeteoriteWorldGen; import appeng.worldgen.QuartzWorldGen; -import net.minecraftforge.registries.IForgeRegistry; -import scala.App; public final class Registration diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 65a55b5f1..201a12946 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -19,41 +19,6 @@ package appeng.core.api.definitions; -import appeng.bootstrap.definitions.TileEntityDefinition; -import appeng.debug.TileChunkLoader; -import appeng.debug.TileCubeGenerator; -import appeng.debug.TileItemGen; -import appeng.debug.TilePhantomNode; -import appeng.tile.crafting.TileCraftingMonitorTile; -import appeng.tile.crafting.TileCraftingStorageTile; -import appeng.tile.crafting.TileCraftingTile; -import appeng.tile.crafting.TileMolecularAssembler; -import appeng.tile.grindstone.TileCrank; -import appeng.tile.grindstone.TileGrinder; -import appeng.tile.misc.TileCellWorkbench; -import appeng.tile.misc.TileCharger; -import appeng.tile.misc.TileCondenser; -import appeng.tile.misc.TileInscriber; -import appeng.tile.misc.TileInterface; -import appeng.tile.misc.TileLightDetector; -import appeng.tile.misc.TilePaint; -import appeng.tile.misc.TileQuartzGrowthAccelerator; -import appeng.tile.misc.TileSecurityStation; -import appeng.tile.misc.TileSkyCompass; -import appeng.tile.misc.TileVibrationChamber; -import appeng.tile.networking.TileController; -import appeng.tile.networking.TileCreativeEnergyCell; -import appeng.tile.networking.TileDenseEnergyCell; -import appeng.tile.networking.TileEnergyAcceptor; -import appeng.tile.networking.TileEnergyCell; -import appeng.tile.networking.TileWireless; -import appeng.tile.qnb.TileQuantumBridge; -import appeng.tile.spatial.TileSpatialIOPort; -import appeng.tile.spatial.TileSpatialPylon; -import appeng.tile.storage.TileChest; -import appeng.tile.storage.TileDrive; -import appeng.tile.storage.TileIOPort; -import appeng.tile.storage.TileSkyChest; import com.google.common.base.Verify; import net.minecraft.block.Block; @@ -63,9 +28,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -130,6 +93,7 @@ import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.FeatureFactory; import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; +import appeng.bootstrap.definitions.TileEntityDefinition; import appeng.client.render.crafting.CraftingCubeRendering; import appeng.client.render.model.GlassModel; import appeng.client.render.spatial.SpatialPylonRendering; @@ -141,6 +105,10 @@ import appeng.debug.BlockChunkloader; import appeng.debug.BlockCubeGenerator; import appeng.debug.BlockItemGen; import appeng.debug.BlockPhantomNode; +import appeng.debug.TileChunkLoader; +import appeng.debug.TileCubeGenerator; +import appeng.debug.TileItemGen; +import appeng.debug.TilePhantomNode; import appeng.decorative.slab.BlockSlabCommon; import appeng.decorative.solid.BlockChargedQuartzOre; import appeng.decorative.solid.BlockChiseledQuartz; @@ -154,6 +122,36 @@ import appeng.decorative.solid.BlockSkyStone; import appeng.decorative.solid.BlockSkyStone.SkystoneType; import appeng.decorative.stair.BlockStairCommon; import appeng.hooks.DispenserBehaviorTinyTNT; +import appeng.tile.crafting.TileCraftingMonitorTile; +import appeng.tile.crafting.TileCraftingStorageTile; +import appeng.tile.crafting.TileCraftingTile; +import appeng.tile.crafting.TileMolecularAssembler; +import appeng.tile.grindstone.TileCrank; +import appeng.tile.grindstone.TileGrinder; +import appeng.tile.misc.TileCellWorkbench; +import appeng.tile.misc.TileCharger; +import appeng.tile.misc.TileCondenser; +import appeng.tile.misc.TileInscriber; +import appeng.tile.misc.TileInterface; +import appeng.tile.misc.TileLightDetector; +import appeng.tile.misc.TilePaint; +import appeng.tile.misc.TileQuartzGrowthAccelerator; +import appeng.tile.misc.TileSecurityStation; +import appeng.tile.misc.TileSkyCompass; +import appeng.tile.misc.TileVibrationChamber; +import appeng.tile.networking.TileController; +import appeng.tile.networking.TileCreativeEnergyCell; +import appeng.tile.networking.TileDenseEnergyCell; +import appeng.tile.networking.TileEnergyAcceptor; +import appeng.tile.networking.TileEnergyCell; +import appeng.tile.networking.TileWireless; +import appeng.tile.qnb.TileQuantumBridge; +import appeng.tile.spatial.TileSpatialIOPort; +import appeng.tile.spatial.TileSpatialPylon; +import appeng.tile.storage.TileChest; +import appeng.tile.storage.TileDrive; +import appeng.tile.storage.TileIOPort; +import appeng.tile.storage.TileSkyChest; /** diff --git a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java index 443b73d9c..9b75871c1 100644 --- a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java +++ b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java @@ -19,7 +19,6 @@ package appeng.core.stats; -import net.minecraft.advancements.Advancement; import net.minecraftforge.fml.common.eventhandler.EventBus; import appeng.core.AEConfig; diff --git a/src/main/java/appeng/coremod/AppEngCore.java b/src/main/java/appeng/coremod/AppEngCore.java index 91353b9dd..ef53b0076 100644 --- a/src/main/java/appeng/coremod/AppEngCore.java +++ b/src/main/java/appeng/coremod/AppEngCore.java @@ -25,6 +25,8 @@ import javax.annotation.Nullable; import com.google.common.eventbus.EventBus; +import org.apache.logging.log4j.Level; + import net.minecraftforge.fml.common.DummyModContainer; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.LoadController; @@ -35,7 +37,6 @@ import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion; import appeng.core.AEConfig; -import org.apache.logging.log4j.Level; @MCVersion( "1.12" ) diff --git a/src/main/java/appeng/coremod/transformer/ASMIntegration.java b/src/main/java/appeng/coremod/transformer/ASMIntegration.java index 14e7fdcc1..c9f238f60 100644 --- a/src/main/java/appeng/coremod/transformer/ASMIntegration.java +++ b/src/main/java/appeng/coremod/transformer/ASMIntegration.java @@ -23,7 +23,6 @@ import java.util.Iterator; import javax.annotation.Nullable; -import net.minecraftforge.fml.common.FMLLog; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; @@ -33,6 +32,7 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraftforge.fml.common.FMLLog; import appeng.coremod.annotations.Integration; import appeng.helpers.Reflected; diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index fc9560e7e..7b12fb656 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -29,7 +29,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.MoverType; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityTNTPrimed; -import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 7fb8f5506..ea2080a36 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -19,8 +19,6 @@ package appeng.facade; -import javax.annotation.Nullable; - import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/appeng/integration/IntegrationNode.java b/src/main/java/appeng/integration/IntegrationNode.java index 4ecd7c276..ac34d3e1e 100644 --- a/src/main/java/appeng/integration/IntegrationNode.java +++ b/src/main/java/appeng/integration/IntegrationNode.java @@ -25,8 +25,6 @@ import net.minecraftforge.fml.common.ModAPIManager; import appeng.api.exceptions.ModNotInstalled; import appeng.core.AEConfig; import appeng.core.AELog; -//import appeng.integration.modules.ic2.IC2Module; -import appeng.integration.modules.jei.JEIModule; final class IntegrationNode diff --git a/src/main/java/appeng/integration/Integrations.java b/src/main/java/appeng/integration/Integrations.java index 85a8da23d..759b07058 100644 --- a/src/main/java/appeng/integration/Integrations.java +++ b/src/main/java/appeng/integration/Integrations.java @@ -19,7 +19,12 @@ package appeng.integration; -import appeng.integration.abstraction.*; +import appeng.integration.abstraction.IIC2; +import appeng.integration.abstraction.IInvTweaks; +import appeng.integration.abstraction.IJEI; +import appeng.integration.abstraction.IMekanism; +import appeng.integration.abstraction.IRC; +import appeng.integration.abstraction.IRF; /** diff --git a/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java b/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java index b7c8b1233..6d72a6f40 100644 --- a/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java +++ b/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java @@ -19,13 +19,15 @@ package appeng.integration.modules.ic2; -import ic2.api.recipe.IRecipeInput; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; + /** * Implementation of IRecipeInput for the macerator recipe. diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java index b7d617c6f..94d82ed96 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java @@ -45,7 +45,6 @@ import appeng.container.implementations.ContainerPatternTerm; import appeng.core.AEConfig; import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; -import appeng.integration.Integrations; import appeng.items.parts.ItemFacade; diff --git a/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java b/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java index 5d7d0d810..0fb0b0172 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java @@ -19,6 +19,8 @@ package appeng.integration.modules.theoneprobe; +import java.util.function.Function; + import net.minecraftforge.fml.common.event.FMLInterModComms; import mcjty.theoneprobe.api.ITheOneProbe; @@ -26,8 +28,6 @@ import mcjty.theoneprobe.api.ITheOneProbe; import appeng.integration.IIntegrationModule; import appeng.integration.modules.theoneprobe.config.AEConfigProvider; -import java.util.function.Function; - public class TheOneProbeModule implements IIntegrationModule, Function { diff --git a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java index 2f19a8dff..3dc363153 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java @@ -21,6 +21,8 @@ package appeng.integration.modules.waila.tile; import java.util.List; +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; @@ -35,8 +37,6 @@ import appeng.core.localization.WailaText; import appeng.integration.modules.waila.BaseWailaDataProvider; import appeng.tile.misc.TileCharger; -import javax.annotation.Nonnull; - /** * Charger provider for WAILA diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 06fad2c22..34965b59b 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -23,7 +23,6 @@ import java.util.List; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index f57e7440b..6679fc383 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -29,13 +29,14 @@ import net.minecraft.block.material.Material; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.AEApi; import appeng.api.definitions.IMaterials; @@ -47,8 +48,6 @@ import appeng.entity.EntityGrowingCrystal; import appeng.entity.EntityIds; import appeng.items.AEBaseItem; import appeng.util.Platform; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index bbe314bf8..96ec78515 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -34,6 +34,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.AEApi; import appeng.api.implementations.ICraftingPatternItem; @@ -44,8 +46,6 @@ import appeng.core.localization.GuiText; import appeng.helpers.PatternHelper; import appeng.items.AEBaseItem; import appeng.util.Platform; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternItem diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index 05201cf77..1a87e4388 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -20,7 +20,6 @@ package appeng.items.misc; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index cdf1155f8..92acb0a1f 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -28,8 +28,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import appeng.integration.IntegrationHelper; -import appeng.parts.p2p.*; import com.google.common.collect.ImmutableList; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -61,6 +59,14 @@ import appeng.parts.networking.PartCableGlass; import appeng.parts.networking.PartCableSmart; import appeng.parts.networking.PartDenseCable; import appeng.parts.networking.PartQuartzFiber; +import appeng.parts.p2p.PartP2PFEPower; +import appeng.parts.p2p.PartP2PFluids; +import appeng.parts.p2p.PartP2PIC2Power; +import appeng.parts.p2p.PartP2PItems; +import appeng.parts.p2p.PartP2PLight; +import appeng.parts.p2p.PartP2PRFPower; +import appeng.parts.p2p.PartP2PRedstone; +import appeng.parts.p2p.PartP2PTunnelME; import appeng.parts.reporting.PartConversionMonitor; import appeng.parts.reporting.PartCraftingTerminal; import appeng.parts.reporting.PartDarkPanel; diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index 56547d17e..dd273341b 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -33,6 +33,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.AEApi; import appeng.api.config.FuzzyMode; @@ -56,8 +58,6 @@ import appeng.items.contents.CellUpgrades; import appeng.items.materials.MaterialType; import appeng.util.InventoryAdaptor; import appeng.util.Platform; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, IItemGroup diff --git a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java b/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java index 7267b3cf6..4679d6fc0 100644 --- a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java @@ -19,24 +19,23 @@ package appeng.items.storage; -import appeng.api.AEApi; -import appeng.api.storage.ICellInventoryHandler; -import appeng.api.storage.IMEInventoryHandler; -import appeng.api.storage.StorageChannel; +import java.util.List; + import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - -import appeng.api.config.FuzzyMode; -import appeng.api.storage.ICellWorkbenchItem; -import appeng.items.AEBaseItem; -import appeng.items.contents.CellConfig; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import appeng.api.AEApi; +import appeng.api.config.FuzzyMode; +import appeng.api.storage.ICellInventoryHandler; +import appeng.api.storage.ICellWorkbenchItem; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.StorageChannel; +import appeng.items.AEBaseItem; +import appeng.items.contents.CellConfig; public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenchItem diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java index fe1152306..d1f70994c 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java @@ -22,11 +22,12 @@ package appeng.items.storage; import java.util.List; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.implementations.TransitionResult; import appeng.api.implementations.items.ISpatialStorageCell; @@ -37,8 +38,6 @@ import appeng.items.AEBaseItem; import appeng.spatial.StorageHelper; import appeng.spatial.StorageWorldProvider; import appeng.util.Platform; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorageCell diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 8242fa2a6..fdd3e6c38 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -34,6 +34,8 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; @@ -42,8 +44,6 @@ import appeng.api.networking.security.ISecurityRegistry; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; import appeng.util.Platform; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ToolBiometricCard extends AEBaseItem implements IBiometricCard diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index 8f3b91600..fe9d6c8ac 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -32,6 +32,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; @@ -39,8 +41,6 @@ import appeng.core.localization.GuiText; import appeng.core.localization.PlayerMessages; import appeng.items.AEBaseItem; import appeng.util.Platform; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ToolMemoryCard extends AEBaseItem implements IMemoryCard diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 21238e21a..050dce9d9 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.lang3.text.WordUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockStainedGlass; @@ -80,7 +82,6 @@ import appeng.tile.misc.TilePaint; import appeng.util.ItemSorters; import appeng.util.Platform; import appeng.util.item.AEItemStack; -import org.apache.commons.lang3.text.WordUtils; public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem diff --git a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java index 628084a7f..1cf22ae62 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java @@ -44,6 +44,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -78,8 +80,6 @@ import appeng.me.storage.CellInventoryHandler; import appeng.tile.misc.TilePaint; import appeng.util.LookDirection; import appeng.util.Platform; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell diff --git a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java index c93a0137e..f16600927 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java @@ -29,6 +29,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.config.AccessRestriction; import appeng.api.config.PowerUnits; @@ -36,8 +38,6 @@ import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; import appeng.util.Platform; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPowerStorage diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index bcc53f513..17949bbac 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -36,7 +36,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; -import appeng.api.networking.IMachineSet; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index f96f0876d..5290f25a6 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -53,7 +53,6 @@ import appeng.me.pathfinding.ControllerValidator; import appeng.me.pathfinding.IPathItem; import appeng.me.pathfinding.PathSegment; import appeng.tile.networking.TileController; -import appeng.util.Platform; public class PathGridCache implements IPathingGrid diff --git a/src/main/java/appeng/parts/layers/LayerIEnergyHandler.java b/src/main/java/appeng/parts/layers/LayerIEnergyHandler.java index f44613e1c..063588326 100644 --- a/src/main/java/appeng/parts/layers/LayerIEnergyHandler.java +++ b/src/main/java/appeng/parts/layers/LayerIEnergyHandler.java @@ -19,13 +19,15 @@ package appeng.parts.layers; -import appeng.api.parts.IPart; -import appeng.api.parts.LayerBase; +import net.minecraft.util.EnumFacing; + import cofh.redstoneflux.api.IEnergyConnection; import cofh.redstoneflux.api.IEnergyHandler; import cofh.redstoneflux.api.IEnergyProvider; import cofh.redstoneflux.api.IEnergyReceiver; -import net.minecraft.util.EnumFacing; + +import appeng.api.parts.IPart; +import appeng.api.parts.LayerBase; public class LayerIEnergyHandler extends LayerBase implements IEnergyHandler, IEnergyReceiver, IEnergyProvider diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index f2b18ad95..6bf8c8ab2 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -73,7 +73,6 @@ import appeng.api.util.IConfigManager; import appeng.capabilities.Capabilities; import appeng.core.AppEng; import appeng.core.settings.TickRates; -import appeng.core.stats.Achievements; import appeng.core.sync.GuiBridge; import appeng.helpers.IInterfaceHost; import appeng.helpers.IPriorityHost; diff --git a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java b/src/main/java/appeng/parts/p2p/PartP2PFEPower.java index 7e6a55ddc..f1da59ecd 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PFEPower.java @@ -21,11 +21,11 @@ package appeng.parts.p2p; -import appeng.api.config.PowerUnits; -import appeng.api.parts.IPartModel; -import appeng.items.parts.PartModels; -import appeng.me.GridAccessException; -import appeng.util.Platform; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -33,9 +33,11 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; +import appeng.api.config.PowerUnits; +import appeng.api.parts.IPartModel; +import appeng.items.parts.PartModels; +import appeng.me.GridAccessException; +import appeng.util.Platform; /** diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 5e0c01527..9110fe171 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -22,7 +22,8 @@ package appeng.parts.p2p; import java.util.LinkedList; import java.util.List; -import appeng.util.inv.AdaptorIInventory; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -31,6 +32,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkBootingStatusChange; @@ -47,13 +51,9 @@ import appeng.me.GridAccessException; import appeng.me.cache.helpers.TunnelCollection; import appeng.tile.inventory.AppEngNullInventory; import appeng.util.Platform; +import appeng.util.inv.AdaptorIInventory; import appeng.util.inv.WrapperChainedInventory; import appeng.util.inv.WrapperMCISidedInventory; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; - -import javax.annotation.Nonnull; // TODO: BC Integration diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index cfb71d2a7..fd077841b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -20,23 +20,23 @@ package appeng.parts.p2p; import java.util.List; -import java.util.Stack; -import appeng.api.parts.IPartModel; -import appeng.items.parts.PartModels; -import cofh.redstoneflux.api.IEnergyReceiver; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - -import appeng.api.config.PowerUnits; -import appeng.integration.IntegrationType; -import appeng.me.GridAccessException; -import appeng.coremod.annotations.Integration.Interface; -import appeng.coremod.annotations.Integration.InterfaceList; -import appeng.util.Platform; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import cofh.redstoneflux.api.IEnergyReceiver; + +import appeng.api.config.PowerUnits; +import appeng.api.parts.IPartModel; +import appeng.coremod.annotations.Integration.Interface; +import appeng.coremod.annotations.Integration.InterfaceList; +import appeng.integration.IntegrationType; +import appeng.items.parts.PartModels; +import appeng.me.GridAccessException; +import appeng.util.Platform; + @InterfaceList( value = { @Interface( iface = "cofh.redstoneflux.api.IEnergyReceiver", iname = IntegrationType.RF ) } ) public final class PartP2PRFPower extends PartP2PTunnel implements IEnergyReceiver diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 7e5421936..2cc9fe7a7 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -23,8 +23,13 @@ import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.function.BooleanSupplier; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -33,8 +38,8 @@ import javax.annotation.Nonnull; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; - import com.google.gson.JsonObject; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.JsonUtils; @@ -45,8 +50,6 @@ import net.minecraftforge.common.crafting.JsonContext; import net.minecraftforge.fml.common.LoaderState; import appeng.api.AEApi; -import appeng.api.recipes.*; -import appeng.core.Api; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItems; @@ -54,8 +57,15 @@ import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RegistrationError; import appeng.api.features.IRecipeHandlerRegistry; +import appeng.api.recipes.ICraftHandler; +import appeng.api.recipes.IIngredient; +import appeng.api.recipes.IRecipeHandler; +import appeng.api.recipes.IRecipeLoader; +import appeng.api.recipes.ResolverResult; +import appeng.api.recipes.ResolverResultSet; import appeng.core.AEConfig; import appeng.core.AELog; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.features.AEFeature; import appeng.items.materials.ItemMaterial; diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 80dd71f10..0faa39883 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -31,7 +31,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index e5ec79a2f..cf233834a 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -26,7 +26,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; diff --git a/src/main/java/appeng/recipes/game/ShapedRecipe.java b/src/main/java/appeng/recipes/game/ShapedRecipe.java index 771217d61..8d6464acc 100644 --- a/src/main/java/appeng/recipes/game/ShapedRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapedRecipe.java @@ -27,7 +27,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; @@ -36,8 +35,6 @@ import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.RegistrationError; import appeng.api.recipes.IIngredient; -import javax.annotation.Nullable; - public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEntry.Impl implements IRecipe, IRecipeBakeable { diff --git a/src/main/java/appeng/recipes/game/ShapelessRecipe.java b/src/main/java/appeng/recipes/game/ShapelessRecipe.java index 9de33785f..53c09c6ce 100644 --- a/src/main/java/appeng/recipes/game/ShapelessRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapelessRecipe.java @@ -25,7 +25,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; @@ -34,8 +33,6 @@ import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.RegistrationError; import appeng.api.recipes.IIngredient; -import javax.annotation.Nullable; - public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistryEntry.Impl implements IRecipe, IRecipeBakeable { diff --git a/src/main/java/appeng/recipes/handlers/Shaped.java b/src/main/java/appeng/recipes/handlers/Shaped.java index d2feee536..d408b448a 100644 --- a/src/main/java/appeng/recipes/handlers/Shaped.java +++ b/src/main/java/appeng/recipes/handlers/Shaped.java @@ -22,7 +22,6 @@ package appeng.recipes.handlers; import java.util.ArrayList; import java.util.List; -import appeng.core.Registration; import net.minecraft.item.ItemStack; import appeng.api.exceptions.MissingIngredientError; @@ -32,7 +31,6 @@ import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.IIngredient; import appeng.core.AELog; import appeng.recipes.RecipeHandler; -import appeng.recipes.game.ShapedRecipe; import appeng.util.Platform; diff --git a/src/main/java/appeng/recipes/handlers/Shapeless.java b/src/main/java/appeng/recipes/handlers/Shapeless.java index a3a2b2876..22c82ff56 100644 --- a/src/main/java/appeng/recipes/handlers/Shapeless.java +++ b/src/main/java/appeng/recipes/handlers/Shapeless.java @@ -22,7 +22,6 @@ package appeng.recipes.handlers; import java.util.ArrayList; import java.util.List; -import appeng.core.Registration; import net.minecraft.item.ItemStack; import appeng.api.exceptions.MissingIngredientError; @@ -32,7 +31,6 @@ import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.IIngredient; import appeng.core.AELog; import appeng.recipes.RecipeHandler; -import appeng.recipes.game.ShapelessRecipe; import appeng.util.Platform; diff --git a/src/main/java/appeng/recipes/helpers/PartRecipeFactory.java b/src/main/java/appeng/recipes/helpers/PartRecipeFactory.java index 85dcc145f..9ebb7885a 100644 --- a/src/main/java/appeng/recipes/helpers/PartRecipeFactory.java +++ b/src/main/java/appeng/recipes/helpers/PartRecipeFactory.java @@ -19,9 +19,9 @@ package appeng.recipes.helpers; -import appeng.core.AppEng; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; + import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.JsonUtils; import net.minecraft.util.ResourceLocation; @@ -29,6 +29,8 @@ import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.IRecipeFactory; import net.minecraftforge.common.crafting.JsonContext; +import appeng.core.AppEng; + /** * @author GuntherDW diff --git a/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java b/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java index 0b0122d43..1ee3b7a28 100644 --- a/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java +++ b/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java @@ -19,16 +19,18 @@ package appeng.recipes.helpers; -import appeng.api.recipes.ResolverResult; -import appeng.core.AELog; -import appeng.core.Api; -import appeng.core.AppEng; +import java.util.Map; +import java.util.Set; + +import javax.annotation.Nonnull; + import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; @@ -39,9 +41,10 @@ import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.JsonContext; import net.minecraftforge.oredict.ShapedOreRecipe; -import javax.annotation.Nonnull; -import java.util.Map; -import java.util.Set; +import appeng.api.recipes.ResolverResult; +import appeng.core.AELog; +import appeng.core.Api; +import appeng.core.AppEng; /** diff --git a/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java b/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java index 4f46d61dd..bc4e60e0f 100644 --- a/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java +++ b/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java @@ -19,15 +19,13 @@ package appeng.recipes.helpers; -import appeng.api.recipes.ResolverResult; -import appeng.api.recipes.ResolverResultSet; -import appeng.core.AELog; -import appeng.core.Api; -import appeng.core.AppEng; +import javax.annotation.Nonnull; + import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSyntaxException; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; @@ -38,7 +36,10 @@ import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.JsonContext; import net.minecraftforge.oredict.ShapelessOreRecipe; -import javax.annotation.Nonnull; +import appeng.api.recipes.ResolverResult; +import appeng.core.AELog; +import appeng.core.Api; +import appeng.core.AppEng; /** diff --git a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java index 258fd34fe..8c4a5dcc5 100644 --- a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java +++ b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/appeng/services/export/ExportProcess.java b/src/main/java/appeng/services/export/ExportProcess.java index 19c30a997..e3534a307 100644 --- a/src/main/java/appeng/services/export/ExportProcess.java +++ b/src/main/java/appeng/services/export/ExportProcess.java @@ -21,7 +21,6 @@ package appeng.services.export; import java.io.File; import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; @@ -32,11 +31,10 @@ import com.google.common.base.Stopwatch; import net.minecraft.item.Item; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.registries.IForgeRegistry; import appeng.core.AELog; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.registries.GameData; -import net.minecraftforge.registries.IForgeRegistry; /** diff --git a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java index 38ecff9e8..4b7091144 100644 --- a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java +++ b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java @@ -36,8 +36,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.registries.IForgeRegistry; import org.apache.commons.io.FileUtils; import net.minecraft.block.Block; @@ -47,6 +45,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.registries.IForgeRegistry; import appeng.core.AELog; diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index 2ffe0d055..a38ec8aba 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -28,10 +28,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.gen.ChunkGeneratorOverworld; import appeng.api.AEApi; import appeng.core.AppEng; -import net.minecraft.world.gen.ChunkGeneratorOverworld; public class StorageChunkProvider extends ChunkGeneratorOverworld diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index aa5a73cd2..6695baa7f 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -25,7 +25,6 @@ import java.util.List; import javax.annotation.Nullable; -import appeng.util.item.AEFluidStack; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; @@ -41,6 +40,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.FluidTankProperties; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; + import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -96,6 +96,7 @@ import appeng.tile.inventory.InvOperation; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; +import appeng.util.item.AEFluidStack; public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, ITickable diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 6e4f47489..555da42ae 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -73,7 +73,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.ModContainer; @@ -81,6 +80,7 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.registries.IForgeRegistry; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; @@ -134,7 +134,6 @@ import appeng.util.helpers.ItemComparisonHelper; import appeng.util.item.AEItemStack; import appeng.util.item.AESharedNBT; import appeng.util.prioritylist.IPartitionList; -import net.minecraftforge.registries.IForgeRegistry; /** diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java index 236311473..f2cf61be7 100644 --- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java +++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Set; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/appeng/util/inv/AdaptorIInventory.java b/src/main/java/appeng/util/inv/AdaptorIInventory.java index 7282f81b8..eac460a70 100644 --- a/src/main/java/appeng/util/inv/AdaptorIInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorIInventory.java @@ -22,7 +22,6 @@ package appeng.util.inv; import java.util.Iterator; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import appeng.api.config.FuzzyMode; diff --git a/src/main/java/appeng/util/inv/IMEAdaptorIterator.java b/src/main/java/appeng/util/inv/IMEAdaptorIterator.java index 50e74e5fd..23664e814 100644 --- a/src/main/java/appeng/util/inv/IMEAdaptorIterator.java +++ b/src/main/java/appeng/util/inv/IMEAdaptorIterator.java @@ -21,9 +21,10 @@ package appeng.util.inv; import java.util.Iterator; +import net.minecraft.item.ItemStack; + import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; -import net.minecraft.item.ItemStack; public final class IMEAdaptorIterator implements Iterator diff --git a/src/test/java/appeng/client/render/UVLightmapJsonTest.java b/src/test/java/appeng/client/render/UVLightmapJsonTest.java index 74241ca58..7ed4ff184 100644 --- a/src/test/java/appeng/client/render/UVLightmapJsonTest.java +++ b/src/test/java/appeng/client/render/UVLightmapJsonTest.java @@ -19,7 +19,6 @@ package appeng.client.render; -import appeng.core.Registration; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -38,8 +37,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import appeng.core.Registration; @Mod( modid = "UVLightmapJsonTest", name = "UVLightmapJsonTest", version = "0.0.0" )