Basic reformat, hit once, hope never again
This commit is contained in:
thatsIch
@@ -62,191 +62,44 @@ import appeng.items.parts.ItemMultiPart;
|
||||
import appeng.recipes.handlers.IWebsiteSerializer;
|
||||
import appeng.recipes.handlers.OreRegistration;
|
||||
|
||||
|
||||
public class RecipeHandler implements IRecipeHandler
|
||||
{
|
||||
|
||||
final public List<String> tokens = new LinkedList<String>();
|
||||
final RecipeData data;
|
||||
|
||||
public RecipeHandler() {
|
||||
public RecipeHandler()
|
||||
{
|
||||
this.data = new RecipeData();
|
||||
}
|
||||
|
||||
RecipeHandler(RecipeHandler parent) {
|
||||
RecipeHandler( RecipeHandler parent )
|
||||
{
|
||||
this.data = parent.data;
|
||||
}
|
||||
|
||||
private void addCrafting(ICraftHandler ch)
|
||||
private void addCrafting( ICraftHandler ch )
|
||||
{
|
||||
this.data.Handlers.add( ch );
|
||||
}
|
||||
|
||||
public List<IWebsiteSerializer> findRecipe(ItemStack output)
|
||||
{
|
||||
List<IWebsiteSerializer> out = new LinkedList<IWebsiteSerializer>();
|
||||
|
||||
for (ICraftHandler ch : this.data.Handlers)
|
||||
{
|
||||
try
|
||||
{
|
||||
if ( ch instanceof IWebsiteSerializer && ((IWebsiteSerializer) ch).canCraft( output ) )
|
||||
{
|
||||
out.add( (IWebsiteSerializer) ch );
|
||||
}
|
||||
}
|
||||
catch (Throwable t)
|
||||
{
|
||||
AELog.error( t );
|
||||
}
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectRecipes()
|
||||
{
|
||||
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
|
||||
{
|
||||
for (ICraftHandler ch : this.data.Handlers)
|
||||
{
|
||||
try
|
||||
{
|
||||
ch.register();
|
||||
|
||||
Class clz = ch.getClass();
|
||||
Integer i = processed.get( clz );
|
||||
if ( i == null )
|
||||
processed.put( clz, 1 );
|
||||
else
|
||||
processed.put( clz, i + 1 );
|
||||
}
|
||||
catch (RegistrationError e)
|
||||
{
|
||||
AELog.warning( "Unable to register a recipe: " + e.getMessage() );
|
||||
if ( this.data.exceptions )
|
||||
AELog.error( e );
|
||||
if ( this.data.crash )
|
||||
throw e;
|
||||
}
|
||||
catch (MissingIngredientError e)
|
||||
{
|
||||
if ( this.data.errorOnMissing )
|
||||
{
|
||||
AELog.warning( "Unable to register a recipe:" + e.getMessage() );
|
||||
if ( this.data.exceptions )
|
||||
AELog.error( e );
|
||||
if ( this.data.crash )
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
if ( this.data.exceptions )
|
||||
AELog.error( e );
|
||||
if ( this.data.crash )
|
||||
throw new RuntimeException( e );
|
||||
}
|
||||
|
||||
for (Entry<Class, Integer> e : processed.entrySet())
|
||||
{
|
||||
AELog.info( "Recipes Loading: " + e.getKey().getSimpleName() + ": " + e.getValue() + " loaded." );
|
||||
}
|
||||
|
||||
if ( AEConfig.instance.isFeatureEnabled( AEFeature.WebsiteRecipes ) )
|
||||
{
|
||||
try
|
||||
{
|
||||
ZipOutputStream out = new ZipOutputStream( new FileOutputStream( "recipes.zip" ) );
|
||||
|
||||
HashMultimap<String, IWebsiteSerializer> combined = HashMultimap.create();
|
||||
|
||||
for (String s : this.data.knownItem)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
Ingredient i = new Ingredient( this, s, 1 );
|
||||
|
||||
for (ItemStack is : i.getItemStackSet())
|
||||
{
|
||||
String realName = this.getName( is );
|
||||
List<IWebsiteSerializer> recipes = this.findRecipe( is );
|
||||
if ( !recipes.isEmpty() )
|
||||
combined.putAll( realName, recipes );
|
||||
}
|
||||
|
||||
}
|
||||
catch (RecipeError ignored)
|
||||
{
|
||||
|
||||
}
|
||||
catch (MissedIngredientSet ignored)
|
||||
{
|
||||
|
||||
}
|
||||
catch (RegistrationError ignored)
|
||||
{
|
||||
|
||||
}
|
||||
catch (MissingIngredientError ignored)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
for (String realName : combined.keySet())
|
||||
{
|
||||
int offset = 0;
|
||||
|
||||
for (IWebsiteSerializer ws : combined.get( realName ))
|
||||
{
|
||||
String rew = ws.getPattern( this );
|
||||
if ( rew != null && rew.length() > 0 )
|
||||
{
|
||||
out.putNextEntry( new ZipEntry( realName + '_' + offset + ".txt" ) );
|
||||
offset++;
|
||||
out.write( rew.getBytes() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
out.close();
|
||||
}
|
||||
catch (FileNotFoundException e1)
|
||||
{
|
||||
AELog.error( e1 );
|
||||
}
|
||||
catch (IOException e1)
|
||||
{
|
||||
AELog.error( e1 );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public String getName(IIngredient i)
|
||||
public String getName( IIngredient i )
|
||||
{
|
||||
try
|
||||
{
|
||||
for (ItemStack is : i.getItemStackSet())
|
||||
for( ItemStack is : i.getItemStackSet() )
|
||||
{
|
||||
try
|
||||
{
|
||||
return this.getName( is );
|
||||
}
|
||||
catch (RecipeError ignored)
|
||||
catch( RecipeError ignored )
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Throwable t)
|
||||
catch( Throwable t )
|
||||
{
|
||||
t.printStackTrace();
|
||||
// :P
|
||||
@@ -255,12 +108,12 @@ public class RecipeHandler implements IRecipeHandler
|
||||
return i.getNameSpace() + ':' + i.getItemName();
|
||||
}
|
||||
|
||||
public String getName(ItemStack is) throws RecipeError
|
||||
public String getName( ItemStack is ) throws RecipeError
|
||||
{
|
||||
UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor( is.getItem() );
|
||||
String realName = id.modId + ':' + id.name;
|
||||
|
||||
if ( !id.modId.equals( AppEng.MOD_ID ) && !id.modId.equals( "minecraft" ) )
|
||||
if( !id.modId.equals( AppEng.MOD_ID ) && !id.modId.equals( "minecraft" ) )
|
||||
throw new RecipeError( "Not applicable for website" );
|
||||
|
||||
final IDefinitions definitions = AEApi.instance().definitions();
|
||||
@@ -273,97 +126,96 @@ public class RecipeHandler implements IRecipeHandler
|
||||
final Optional<Item> maybeCraftingUnitItem = blocks.craftingUnit().maybeItem();
|
||||
final Optional<Item> maybeSkyChestItem = blocks.skyChest().maybeItem();
|
||||
|
||||
if ( maybeCrystalSeedItem.isPresent() && is.getItem() == maybeCrystalSeedItem.get() )
|
||||
if( maybeCrystalSeedItem.isPresent() && is.getItem() == maybeCrystalSeedItem.get() )
|
||||
{
|
||||
int dmg = is.getItemDamage();
|
||||
if ( dmg < ItemCrystalSeed.Nether )
|
||||
if( dmg < ItemCrystalSeed.Nether )
|
||||
realName += ".Certus";
|
||||
else if ( dmg < ItemCrystalSeed.Fluix )
|
||||
else if( dmg < ItemCrystalSeed.Fluix )
|
||||
realName += ".Nether";
|
||||
else if ( dmg < ItemCrystalSeed.END )
|
||||
else if( dmg < ItemCrystalSeed.END )
|
||||
realName += ".Fluix";
|
||||
}
|
||||
else if ( maybeSkyStoneItem.isPresent() && is.getItem() == maybeSkyStoneItem.get() )
|
||||
else if( maybeSkyStoneItem.isPresent() && is.getItem() == maybeSkyStoneItem.get() )
|
||||
{
|
||||
switch (is.getItemDamage())
|
||||
switch( is.getItemDamage() )
|
||||
{
|
||||
case 1:
|
||||
realName += ".Block";
|
||||
break;
|
||||
case 2:
|
||||
realName += ".Brick";
|
||||
break;
|
||||
case 3:
|
||||
realName += ".SmallBrick";
|
||||
break;
|
||||
default:
|
||||
case 1:
|
||||
realName += ".Block";
|
||||
break;
|
||||
case 2:
|
||||
realName += ".Brick";
|
||||
break;
|
||||
case 3:
|
||||
realName += ".SmallBrick";
|
||||
break;
|
||||
default:
|
||||
}
|
||||
}
|
||||
else if ( maybeCraftingStorageItem.isPresent() && is.getItem() == maybeCraftingStorageItem.get() )
|
||||
else if( maybeCraftingStorageItem.isPresent() && is.getItem() == maybeCraftingStorageItem.get() )
|
||||
{
|
||||
switch (is.getItemDamage())
|
||||
switch( is.getItemDamage() )
|
||||
{
|
||||
case 1:
|
||||
realName += "4k";
|
||||
break;
|
||||
case 2:
|
||||
realName += "16k";
|
||||
break;
|
||||
case 3:
|
||||
realName += "64k";
|
||||
break;
|
||||
default:
|
||||
case 1:
|
||||
realName += "4k";
|
||||
break;
|
||||
case 2:
|
||||
realName += "16k";
|
||||
break;
|
||||
case 3:
|
||||
realName += "64k";
|
||||
break;
|
||||
default:
|
||||
}
|
||||
}
|
||||
else if ( maybeCraftingUnitItem.isPresent() && is.getItem() == maybeCraftingUnitItem.get() )
|
||||
else if( maybeCraftingUnitItem.isPresent() && is.getItem() == maybeCraftingUnitItem.get() )
|
||||
{
|
||||
switch (is.getItemDamage())
|
||||
switch( is.getItemDamage() )
|
||||
{
|
||||
case 1:
|
||||
realName = realName.replace( "Unit", "Accelerator" );
|
||||
break;
|
||||
default:
|
||||
case 1:
|
||||
realName = realName.replace( "Unit", "Accelerator" );
|
||||
break;
|
||||
default:
|
||||
}
|
||||
}
|
||||
else if ( maybeSkyChestItem.isPresent() && is.getItem() == maybeSkyChestItem.get() )
|
||||
else if( maybeSkyChestItem.isPresent() && is.getItem() == maybeSkyChestItem.get() )
|
||||
{
|
||||
switch (is.getItemDamage())
|
||||
switch( is.getItemDamage() )
|
||||
{
|
||||
case 1:
|
||||
realName += ".Block";
|
||||
break;
|
||||
default:
|
||||
case 1:
|
||||
realName += ".Block";
|
||||
break;
|
||||
default:
|
||||
}
|
||||
}
|
||||
else if ( is.getItem() instanceof ItemMultiMaterial )
|
||||
else if( is.getItem() instanceof ItemMultiMaterial )
|
||||
{
|
||||
realName = realName.replace( "ItemMultiMaterial", "ItemMaterial" );
|
||||
realName += '.' + ((ItemMultiMaterial) is.getItem()).getTypeByStack( is ).name();
|
||||
realName += '.' + ( (ItemMultiMaterial) is.getItem() ).getTypeByStack( is ).name();
|
||||
}
|
||||
else if ( is.getItem() instanceof ItemMultiPart )
|
||||
else if( is.getItem() instanceof ItemMultiPart )
|
||||
{
|
||||
realName = realName.replace( "ItemMultiPart", "ItemPart" );
|
||||
realName += '.' + ((ItemMultiPart) is.getItem()).getTypeByStack( is ).name();
|
||||
realName += '.' + ( (ItemMultiPart) is.getItem() ).getTypeByStack( is ).name();
|
||||
}
|
||||
else if ( is.getItemDamage() > 0 )
|
||||
else if( is.getItemDamage() > 0 )
|
||||
realName += "." + is.getItemDamage();
|
||||
|
||||
return realName;
|
||||
|
||||
}
|
||||
|
||||
public String alias(String in)
|
||||
public String alias( String in )
|
||||
{
|
||||
String out = this.data.aliases.get( in );
|
||||
|
||||
if ( out != null )
|
||||
if( out != null )
|
||||
return out;
|
||||
|
||||
return in;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void parseRecipes(IRecipeLoader loader, String path)
|
||||
public void parseRecipes( IRecipeLoader loader, String path )
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -372,10 +224,10 @@ public class RecipeHandler implements IRecipeHandler
|
||||
{
|
||||
reader = loader.getFile( path );
|
||||
}
|
||||
catch (Exception err)
|
||||
catch( Exception err )
|
||||
{
|
||||
AELog.warning( "Error Loading Recipe File:" + path );
|
||||
if ( this.data.exceptions )
|
||||
if( this.data.exceptions )
|
||||
AELog.error( err );
|
||||
return;
|
||||
}
|
||||
@@ -387,134 +239,281 @@ public class RecipeHandler implements IRecipeHandler
|
||||
int line = 0;
|
||||
|
||||
int val = -1;
|
||||
while ((val = reader.read()) != -1)
|
||||
while( ( val = reader.read() ) != -1 )
|
||||
{
|
||||
char c = (char) val;
|
||||
|
||||
if ( c == '\n' )
|
||||
if( c == '\n' )
|
||||
line++;
|
||||
|
||||
if ( inComment )
|
||||
if( inComment )
|
||||
{
|
||||
if ( c == '\n' || c == '\r' )
|
||||
if( c == '\n' || c == '\r' )
|
||||
inComment = false;
|
||||
}
|
||||
else if ( inQuote )
|
||||
else if( inQuote )
|
||||
{
|
||||
switch (c)
|
||||
switch( c )
|
||||
{
|
||||
case '"':
|
||||
inQuote = !inQuote;
|
||||
break;
|
||||
default:
|
||||
token += c;
|
||||
case '"':
|
||||
inQuote = !inQuote;
|
||||
break;
|
||||
default:
|
||||
token += c;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (c)
|
||||
switch( c )
|
||||
{
|
||||
case '"':
|
||||
inQuote = !inQuote;
|
||||
break;
|
||||
case ',':
|
||||
case '"':
|
||||
inQuote = !inQuote;
|
||||
break;
|
||||
case ',':
|
||||
|
||||
if ( token.length() > 0 )
|
||||
{
|
||||
this.tokens.add( token );
|
||||
this.tokens.add( "," );
|
||||
}
|
||||
token = "";
|
||||
break;
|
||||
if( token.length() > 0 )
|
||||
{
|
||||
this.tokens.add( token );
|
||||
this.tokens.add( "," );
|
||||
}
|
||||
token = "";
|
||||
break;
|
||||
|
||||
case '=':
|
||||
case '=':
|
||||
|
||||
this.processTokens( loader, path, line );
|
||||
this.processTokens( loader, path, line );
|
||||
|
||||
if ( token.length() > 0 )
|
||||
this.tokens.add( token );
|
||||
token = "";
|
||||
if( token.length() > 0 )
|
||||
this.tokens.add( token );
|
||||
token = "";
|
||||
|
||||
break;
|
||||
break;
|
||||
|
||||
case '#':
|
||||
inComment = true;
|
||||
// then add a token if you can...
|
||||
case '#':
|
||||
inComment = true;
|
||||
// then add a token if you can...
|
||||
|
||||
case '\n':
|
||||
case '\t':
|
||||
case '\r':
|
||||
case ' ':
|
||||
case '\n':
|
||||
case '\t':
|
||||
case '\r':
|
||||
case ' ':
|
||||
|
||||
if ( token.length() > 0 )
|
||||
this.tokens.add( token );
|
||||
token = "";
|
||||
if( token.length() > 0 )
|
||||
this.tokens.add( token );
|
||||
token = "";
|
||||
|
||||
break;
|
||||
default:
|
||||
token += c;
|
||||
break;
|
||||
default:
|
||||
token += c;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if ( token.length() > 0 )
|
||||
if( token.length() > 0 )
|
||||
this.tokens.add( token );
|
||||
|
||||
reader.close();
|
||||
this.processTokens( loader, path, line );
|
||||
}
|
||||
catch (Throwable e)
|
||||
catch( Throwable e )
|
||||
{
|
||||
AELog.error( e );
|
||||
if ( this.data.crash )
|
||||
if( this.data.crash )
|
||||
throw new RuntimeException( e );
|
||||
}
|
||||
}
|
||||
|
||||
private void processTokens(IRecipeLoader loader, String file, int line) throws RecipeError
|
||||
@Override
|
||||
public void injectRecipes()
|
||||
{
|
||||
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
|
||||
{
|
||||
for( ICraftHandler ch : this.data.Handlers )
|
||||
{
|
||||
try
|
||||
{
|
||||
ch.register();
|
||||
|
||||
Class clz = ch.getClass();
|
||||
Integer i = processed.get( clz );
|
||||
if( i == null )
|
||||
processed.put( clz, 1 );
|
||||
else
|
||||
processed.put( clz, i + 1 );
|
||||
}
|
||||
catch( RegistrationError e )
|
||||
{
|
||||
AELog.warning( "Unable to register a recipe: " + e.getMessage() );
|
||||
if( this.data.exceptions )
|
||||
AELog.error( e );
|
||||
if( this.data.crash )
|
||||
throw e;
|
||||
}
|
||||
catch( MissingIngredientError e )
|
||||
{
|
||||
if( this.data.errorOnMissing )
|
||||
{
|
||||
AELog.warning( "Unable to register a recipe:" + e.getMessage() );
|
||||
if( this.data.exceptions )
|
||||
AELog.error( e );
|
||||
if( this.data.crash )
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch( Throwable e )
|
||||
{
|
||||
if( this.data.exceptions )
|
||||
AELog.error( e );
|
||||
if( this.data.crash )
|
||||
throw new RuntimeException( e );
|
||||
}
|
||||
|
||||
for( Entry<Class, Integer> e : processed.entrySet() )
|
||||
{
|
||||
AELog.info( "Recipes Loading: " + e.getKey().getSimpleName() + ": " + e.getValue() + " loaded." );
|
||||
}
|
||||
|
||||
if( AEConfig.instance.isFeatureEnabled( AEFeature.WebsiteRecipes ) )
|
||||
{
|
||||
try
|
||||
{
|
||||
ZipOutputStream out = new ZipOutputStream( new FileOutputStream( "recipes.zip" ) );
|
||||
|
||||
HashMultimap<String, IWebsiteSerializer> combined = HashMultimap.create();
|
||||
|
||||
for( String s : this.data.knownItem )
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
Ingredient i = new Ingredient( this, s, 1 );
|
||||
|
||||
for( ItemStack is : i.getItemStackSet() )
|
||||
{
|
||||
String realName = this.getName( is );
|
||||
List<IWebsiteSerializer> recipes = this.findRecipe( is );
|
||||
if( !recipes.isEmpty() )
|
||||
combined.putAll( realName, recipes );
|
||||
}
|
||||
}
|
||||
catch( RecipeError ignored )
|
||||
{
|
||||
|
||||
}
|
||||
catch( MissedIngredientSet ignored )
|
||||
{
|
||||
|
||||
}
|
||||
catch( RegistrationError ignored )
|
||||
{
|
||||
|
||||
}
|
||||
catch( MissingIngredientError ignored )
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
for( String realName : combined.keySet() )
|
||||
{
|
||||
int offset = 0;
|
||||
|
||||
for( IWebsiteSerializer ws : combined.get( realName ) )
|
||||
{
|
||||
String rew = ws.getPattern( this );
|
||||
if( rew != null && rew.length() > 0 )
|
||||
{
|
||||
out.putNextEntry( new ZipEntry( realName + '_' + offset + ".txt" ) );
|
||||
offset++;
|
||||
out.write( rew.getBytes() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
out.close();
|
||||
}
|
||||
catch( FileNotFoundException e1 )
|
||||
{
|
||||
AELog.error( e1 );
|
||||
}
|
||||
catch( IOException e1 )
|
||||
{
|
||||
AELog.error( e1 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<IWebsiteSerializer> findRecipe( ItemStack output )
|
||||
{
|
||||
List<IWebsiteSerializer> out = new LinkedList<IWebsiteSerializer>();
|
||||
|
||||
for( ICraftHandler ch : this.data.Handlers )
|
||||
{
|
||||
try
|
||||
{
|
||||
if( ch instanceof IWebsiteSerializer && ( (IWebsiteSerializer) ch ).canCraft( output ) )
|
||||
{
|
||||
out.add( (IWebsiteSerializer) ch );
|
||||
}
|
||||
}
|
||||
catch( Throwable t )
|
||||
{
|
||||
AELog.error( t );
|
||||
}
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
private void processTokens( IRecipeLoader loader, String file, int line ) throws RecipeError
|
||||
{
|
||||
try
|
||||
{
|
||||
IRecipeHandlerRegistry cr = AEApi.instance().registries().recipes();
|
||||
|
||||
if ( this.tokens.isEmpty() )
|
||||
if( this.tokens.isEmpty() )
|
||||
return;
|
||||
|
||||
int split = this.tokens.indexOf( "->" );
|
||||
if ( split != -1 )
|
||||
if( split != -1 )
|
||||
{
|
||||
String operation = this.tokens.remove( 0 ).toLowerCase();
|
||||
|
||||
if ( operation.equals( "alias" ) )
|
||||
if( operation.equals( "alias" ) )
|
||||
{
|
||||
if ( this.tokens.size() == 3 && this.tokens.indexOf( "->" ) == 1 )
|
||||
if( this.tokens.size() == 3 && this.tokens.indexOf( "->" ) == 1 )
|
||||
this.data.aliases.put( this.tokens.get( 0 ), this.tokens.get( 2 ) );
|
||||
else
|
||||
throw new RecipeError( "Alias must have exactly 1 input and 1 output." );
|
||||
}
|
||||
else if ( operation.equals( "group" ) )
|
||||
else if( operation.equals( "group" ) )
|
||||
{
|
||||
List<String> pre = this.tokens.subList( 0, split - 1 );
|
||||
List<String> post = this.tokens.subList( split, this.tokens.size() );
|
||||
|
||||
List<List<IIngredient>> inputs = this.parseLines( pre );
|
||||
|
||||
if ( inputs.size() == 1 && inputs.get( 0 ).size() > 0 && post.size() == 1 )
|
||||
if( inputs.size() == 1 && inputs.get( 0 ).size() > 0 && post.size() == 1 )
|
||||
{
|
||||
this.data.groups.put( post.get( 0 ), new GroupIngredient( post.get( 0 ), inputs.get( 0 ) ) );
|
||||
}
|
||||
else
|
||||
throw new RecipeError( "Group must have exactly 1 output, and 1 or more inputs." );
|
||||
}
|
||||
else if ( operation.equals( "ore" ) )
|
||||
else if( operation.equals( "ore" ) )
|
||||
{
|
||||
List<String> pre = this.tokens.subList( 0, split - 1 );
|
||||
List<String> post = this.tokens.subList( split, this.tokens.size() );
|
||||
|
||||
List<List<IIngredient>> inputs = this.parseLines( pre );
|
||||
|
||||
if ( inputs.size() == 1 && inputs.get( 0 ).size() > 0 && post.size() == 1 )
|
||||
if( inputs.size() == 1 && inputs.get( 0 ).size() > 0 && post.size() == 1 )
|
||||
{
|
||||
ICraftHandler ch = new OreRegistration( inputs.get( 0 ), post.get( 0 ) );
|
||||
this.addCrafting( ch );
|
||||
@@ -532,7 +531,7 @@ public class RecipeHandler implements IRecipeHandler
|
||||
|
||||
ICraftHandler ch = cr.getCraftHandlerFor( operation );
|
||||
|
||||
if ( ch != null )
|
||||
if( ch != null )
|
||||
{
|
||||
ch.setup( inputs, outputs );
|
||||
this.addCrafting( ch );
|
||||
@@ -545,58 +544,57 @@ public class RecipeHandler implements IRecipeHandler
|
||||
{
|
||||
String operation = this.tokens.remove( 0 ).toLowerCase();
|
||||
|
||||
if ( operation.equals( "exceptions" ) && (this.tokens.get( 0 ).equals( "true" ) || this.tokens.get( 0 ).equals( "false" )) )
|
||||
if( operation.equals( "exceptions" ) && ( this.tokens.get( 0 ).equals( "true" ) || this.tokens.get( 0 ).equals( "false" ) ) )
|
||||
{
|
||||
if ( this.tokens.size() == 1 )
|
||||
if( this.tokens.size() == 1 )
|
||||
{
|
||||
this.data.exceptions = this.tokens.get( 0 ).equals( "true" );
|
||||
}
|
||||
else
|
||||
throw new RecipeError( "exceptions must be true or false explicitly." );
|
||||
}
|
||||
else if ( operation.equals( "crash" ) && (this.tokens.get( 0 ).equals( "true" ) || this.tokens.get( 0 ).equals( "false" )) )
|
||||
else if( operation.equals( "crash" ) && ( this.tokens.get( 0 ).equals( "true" ) || this.tokens.get( 0 ).equals( "false" ) ) )
|
||||
{
|
||||
if ( this.tokens.size() == 1 )
|
||||
if( this.tokens.size() == 1 )
|
||||
{
|
||||
this.data.crash = this.tokens.get( 0 ).equals( "true" );
|
||||
}
|
||||
else
|
||||
throw new RecipeError( "crash must be true or false explicitly." );
|
||||
}
|
||||
else if ( operation.equals( "erroronmissing" ) )
|
||||
else if( operation.equals( "erroronmissing" ) )
|
||||
{
|
||||
if ( this.tokens.size() == 1 && (this.tokens.get( 0 ).equals( "true" ) || this.tokens.get( 0 ).equals( "false" )) )
|
||||
if( this.tokens.size() == 1 && ( this.tokens.get( 0 ).equals( "true" ) || this.tokens.get( 0 ).equals( "false" ) ) )
|
||||
{
|
||||
this.data.errorOnMissing = this.tokens.get( 0 ).equals( "true" );
|
||||
}
|
||||
else
|
||||
throw new RecipeError( "erroronmissing must be true or false explicitly." );
|
||||
}
|
||||
else if ( operation.equals( "import" ) )
|
||||
else if( operation.equals( "import" ) )
|
||||
{
|
||||
if ( this.tokens.size() == 1 )
|
||||
(new RecipeHandler( this )).parseRecipes( loader, this.tokens.get( 0 ) );
|
||||
if( this.tokens.size() == 1 )
|
||||
( new RecipeHandler( this ) ).parseRecipes( loader, this.tokens.get( 0 ) );
|
||||
else
|
||||
throw new RecipeError( "Import must have exactly 1 input." );
|
||||
}
|
||||
else
|
||||
throw new RecipeError( operation + ": " + this.tokens.toString() + "; recipe without an output." );
|
||||
}
|
||||
|
||||
}
|
||||
catch (RecipeError e)
|
||||
catch( RecipeError e )
|
||||
{
|
||||
AELog.warning( "Recipe Error '" + e.getMessage() + "' near line:" + line + " in " + file + " with: " + this.tokens.toString() );
|
||||
if ( this.data.exceptions )
|
||||
if( this.data.exceptions )
|
||||
AELog.error( e );
|
||||
if ( this.data.crash )
|
||||
if( this.data.crash )
|
||||
throw e;
|
||||
}
|
||||
|
||||
this.tokens.clear();
|
||||
}
|
||||
|
||||
private List<List<IIngredient>> parseLines(List<String> subList) throws RecipeError
|
||||
private List<List<IIngredient>> parseLines( List<String> subList ) throws RecipeError
|
||||
{
|
||||
List<List<IIngredient>> out = new LinkedList<List<IIngredient>>();
|
||||
List<IIngredient> cList = new LinkedList<IIngredient>();
|
||||
@@ -604,28 +602,28 @@ public class RecipeHandler implements IRecipeHandler
|
||||
boolean hasQty = false;
|
||||
int qty = 1;
|
||||
|
||||
for (String v : subList)
|
||||
for( String v : subList )
|
||||
{
|
||||
if ( v.equals( "," ) )
|
||||
if( v.equals( "," ) )
|
||||
{
|
||||
if ( hasQty )
|
||||
if( hasQty )
|
||||
throw new RecipeError( "Qty found with no item." );
|
||||
if ( !cList.isEmpty() )
|
||||
if( !cList.isEmpty() )
|
||||
out.add( cList );
|
||||
cList = new LinkedList<IIngredient>();
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( this.isNumber( v ) )
|
||||
if( this.isNumber( v ) )
|
||||
{
|
||||
if ( hasQty )
|
||||
if( hasQty )
|
||||
throw new RecipeError( "Qty found with no item." );
|
||||
hasQty = true;
|
||||
qty = Integer.parseInt( v );
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( hasQty )
|
||||
if( hasQty )
|
||||
{
|
||||
cList.add( this.findIngredient( v, qty ) );
|
||||
hasQty = false;
|
||||
@@ -636,42 +634,41 @@ public class RecipeHandler implements IRecipeHandler
|
||||
}
|
||||
}
|
||||
|
||||
if ( !cList.isEmpty() )
|
||||
if( !cList.isEmpty() )
|
||||
out.add( cList );
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
private IIngredient findIngredient(String v, int qty) throws RecipeError
|
||||
private IIngredient findIngredient( String v, int qty ) throws RecipeError
|
||||
{
|
||||
GroupIngredient gi = this.data.groups.get( v );
|
||||
|
||||
if ( gi != null )
|
||||
if( gi != null )
|
||||
return gi.copy( qty );
|
||||
|
||||
try
|
||||
{
|
||||
return new Ingredient( this, v, qty );
|
||||
}
|
||||
catch (MissedIngredientSet grp)
|
||||
catch( MissedIngredientSet grp )
|
||||
{
|
||||
return new IngredientSet( grp.rrs );
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isNumber(String v)
|
||||
private boolean isNumber( String v )
|
||||
{
|
||||
if ( v.length() <= 0 )
|
||||
if( v.length() <= 0 )
|
||||
return false;
|
||||
|
||||
int l = v.length();
|
||||
for (int x = 0; x < l; x++)
|
||||
for( int x = 0; x < l; x++ )
|
||||
{
|
||||
if ( !Character.isDigit( v.charAt( x ) ) )
|
||||
if( !Character.isDigit( v.charAt( x ) ) )
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user