diff --git a/block/solids/BlockQuartzLamp.java b/block/solids/BlockQuartzLamp.java index 5e3fa28b6..43e141f68 100644 --- a/block/solids/BlockQuartzLamp.java +++ b/block/solids/BlockQuartzLamp.java @@ -7,8 +7,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.world.World; import appeng.client.render.effects.VibrantFX; -import appeng.core.CommonHelper; import appeng.core.AEConfig; +import appeng.core.CommonHelper; import appeng.core.features.AEFeature; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/block/solids/OreQuartzCharged.java b/block/solids/OreQuartzCharged.java index cfc2c5467..5fb85a22b 100644 --- a/block/solids/OreQuartzCharged.java +++ b/block/solids/OreQuartzCharged.java @@ -8,8 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import appeng.api.AEApi; import appeng.client.render.effects.ChargedOreFX; -import appeng.core.CommonHelper; import appeng.core.AEConfig; +import appeng.core.CommonHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/client/render/items/ToolBiometricCardRender.java b/client/render/items/ToolBiometricCardRender.java index faff6a28b..af80997fc 100644 --- a/client/render/items/ToolBiometricCardRender.java +++ b/client/render/items/ToolBiometricCardRender.java @@ -8,12 +8,12 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import com.mojang.authlib.GameProfile; - import appeng.api.implementations.items.IBiometricCard; import appeng.api.util.AEColor; import appeng.client.texture.ExtraItemTextures; +import com.mojang.authlib.GameProfile; + public class ToolBiometricCardRender implements IItemRenderer { diff --git a/core/features/registries/PlayerRegistry.java b/core/features/registries/PlayerRegistry.java index 78405ef09..7b710e302 100644 --- a/core/features/registries/PlayerRegistry.java +++ b/core/features/registries/PlayerRegistry.java @@ -1,11 +1,11 @@ package appeng.core.features.registries; -import com.mojang.authlib.GameProfile; - import net.minecraft.entity.player.EntityPlayer; import appeng.api.features.IPlayerRegistry; import appeng.core.WorldSettings; +import com.mojang.authlib.GameProfile; + public class PlayerRegistry implements IPlayerRegistry { diff --git a/integration/modules/helpers/FMPPacketEvent.java b/integration/modules/helpers/FMPPacketEvent.java index 10235d16a..5931301fc 100644 --- a/integration/modules/helpers/FMPPacketEvent.java +++ b/integration/modules/helpers/FMPPacketEvent.java @@ -1,7 +1,7 @@ package appeng.integration.modules.helpers; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.eventhandler.Event; public class FMPPacketEvent extends Event { diff --git a/items/tools/ToolBiometricCard.java b/items/tools/ToolBiometricCard.java index 5daf5fe11..5f0bfd996 100644 --- a/items/tools/ToolBiometricCard.java +++ b/items/tools/ToolBiometricCard.java @@ -3,8 +3,6 @@ package appeng.items.tools; import java.util.EnumSet; import java.util.List; -import com.mojang.authlib.GameProfile; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -22,6 +20,8 @@ import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; import appeng.util.Platform; +import com.mojang.authlib.GameProfile; + public class ToolBiometricCard extends AEBaseItem implements IBiometricCard { diff --git a/me/storage/SecurityInventory.java b/me/storage/SecurityInventory.java index 5eece85dc..ae0f1968a 100644 --- a/me/storage/SecurityInventory.java +++ b/me/storage/SecurityInventory.java @@ -1,7 +1,5 @@ package appeng.me.storage; -import com.mojang.authlib.GameProfile; - import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -16,6 +14,8 @@ import appeng.api.storage.data.IItemList; import appeng.me.GridAccessException; import appeng.tile.misc.TileSecurity; +import com.mojang.authlib.GameProfile; + public class SecurityInventory implements IMEInventoryHandler { diff --git a/recipes/RecipeHandler.java b/recipes/RecipeHandler.java index 0fa131ca8..d5949ae0c 100644 --- a/recipes/RecipeHandler.java +++ b/recipes/RecipeHandler.java @@ -11,9 +11,6 @@ import java.util.Map.Entry; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import com.google.common.collect.HashMultimap; -import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader; - import net.minecraft.item.ItemStack; import appeng.api.AEApi; import appeng.api.exceptions.MissingIngredientError; @@ -33,6 +30,9 @@ import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; import appeng.recipes.handlers.IWebsiteSeralizer; import appeng.recipes.handlers.OreRegistration; + +import com.google.common.collect.HashMultimap; + import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; @@ -81,9 +81,9 @@ public class RecipeHandler implements IRecipeHandler @Override public void injectRecipes() { - if ( cpw.mods.fml.common.Loader.instance().hasReachedState( LoaderState.POSTINITIALIZATION )) - throw new RuntimeException("Recipes must now be loaded in Init."); - + if ( cpw.mods.fml.common.Loader.instance().hasReachedState( LoaderState.POSTINITIALIZATION ) ) + throw new RuntimeException( "Recipes must now be loaded in Init." ); + HashMap processed = new HashMap(); try { @@ -141,37 +141,46 @@ public class RecipeHandler implements IRecipeHandler ZipOutputStream out = new ZipOutputStream( new FileOutputStream( "recipes.zip" ) ); HashMultimap combined = HashMultimap.create(); - + for (String s : data.knownItem) { - try { - + try + { + Ingredient i = new Ingredient( this, s, 1 ); - + for (ItemStack is : i.getItemStackSet()) { String realName = getName( is ); List recipes = findRecipe( is ); if ( !recipes.isEmpty() ) - combined.putAll(realName, recipes); + combined.putAll( realName, recipes ); } - - } catch (RecipeError e1) { - - } catch (MissedIngredientSet e1) { - - } catch (RegistrationError e1) { - - } catch (MissingIngredientError e1) { - + + } + catch (RecipeError e1) + { + + } + catch (MissedIngredientSet e1) + { + + } + catch (RegistrationError e1) + { + + } + catch (MissingIngredientError e1) + { + } } - - for ( String realName : combined.keySet() ) + + for (String realName : combined.keySet()) { int offset = 0; - - for ( IWebsiteSeralizer ws : combined.get(realName) ) + + for (IWebsiteSeralizer ws : combined.get( realName )) { String rew = ws.getPattern( this ); if ( rew != null && rew.length() > 0 ) @@ -180,7 +189,7 @@ public class RecipeHandler implements IRecipeHandler offset++; out.write( rew.getBytes() ); } - } + } } out.close(); diff --git a/recipes/game/ShapedRecipe.java b/recipes/game/ShapedRecipe.java index 73191ab4c..4e34d5081 100644 --- a/recipes/game/ShapedRecipe.java +++ b/recipes/game/ShapedRecipe.java @@ -3,14 +3,14 @@ package appeng.recipes.game; import java.util.ArrayList; import java.util.HashMap; -import appeng.api.exceptions.MissingIngredientError; -import appeng.api.exceptions.RegistrationError; -import appeng.api.recipes.IIngredient; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import appeng.api.exceptions.MissingIngredientError; +import appeng.api.exceptions.RegistrationError; +import appeng.api.recipes.IIngredient; public class ShapedRecipe implements IRecipe, IRecipeBakeable { diff --git a/recipes/game/ShapelessRecipe.java b/recipes/game/ShapelessRecipe.java index 9c5dac1fd..1a5a07741 100644 --- a/recipes/game/ShapelessRecipe.java +++ b/recipes/game/ShapelessRecipe.java @@ -3,14 +3,14 @@ package appeng.recipes.game; import java.util.ArrayList; import java.util.Iterator; -import appeng.api.exceptions.MissingIngredientError; -import appeng.api.exceptions.RegistrationError; -import appeng.api.recipes.IIngredient; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import appeng.api.exceptions.MissingIngredientError; +import appeng.api.exceptions.RegistrationError; +import appeng.api.recipes.IIngredient; public class ShapelessRecipe implements IRecipe, IRecipeBakeable { diff --git a/recipes/handlers/HCCrusher.java b/recipes/handlers/HCCrusher.java index 2c5c4536f..3f822c8a5 100644 --- a/recipes/handlers/HCCrusher.java +++ b/recipes/handlers/HCCrusher.java @@ -2,7 +2,6 @@ package appeng.recipes.handlers; import java.util.List; -import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import appeng.api.exceptions.MissingIngredientError; @@ -13,6 +12,7 @@ import appeng.api.recipes.IIngredient; import appeng.core.AELog; import appeng.recipes.RecipeHandler; import appeng.util.Platform; +import cpw.mods.fml.common.event.FMLInterModComms; public class HCCrusher implements ICraftHandler, IWebsiteSeralizer { diff --git a/recipes/handlers/Smelt.java b/recipes/handlers/Smelt.java index bcd1cf95b..460b894a8 100644 --- a/recipes/handlers/Smelt.java +++ b/recipes/handlers/Smelt.java @@ -3,7 +3,6 @@ package appeng.recipes.handlers; import java.util.List; import net.minecraft.item.ItemStack; - import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RegistrationError;