Optimized Imports.
This commit is contained in:
parent
b4d99d3d06
commit
ab78f940db
12 changed files with 52 additions and 44 deletions
block/solids
client/render/items
core/features/registries
integration/modules/helpers
items/tools
me/storage
recipes
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
||||
|
|
|
@ -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<IAEItemStack>
|
||||
{
|
||||
|
||||
|
|
|
@ -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<Class, Integer> processed = new HashMap<Class, Integer>();
|
||||
try
|
||||
{
|
||||
|
@ -141,37 +141,46 @@ public class RecipeHandler implements IRecipeHandler
|
|||
ZipOutputStream out = new ZipOutputStream( new FileOutputStream( "recipes.zip" ) );
|
||||
|
||||
HashMultimap<String, IWebsiteSeralizer> 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<IWebsiteSeralizer> 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();
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue