API cleanups (#3155)

* Remove obsolete api and fix some warning
* Move MEMonitorHandler to internal code and fix some warnings
* Rename exceptions to conform to naming scheme
This commit is contained in:
fscan
2017-10-14 14:15:28 +02:00
committed by yueh
parent 905dd6c888
commit 4f07b63b13
77 changed files with 298 additions and 398 deletions
@@ -28,9 +28,9 @@ import com.google.common.base.Preconditions;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient;
@@ -43,7 +43,7 @@ public class GroupIngredient implements IIngredient
private ItemStack[] baked;
private boolean isInside = false;
public GroupIngredient( final String myName, final List<IIngredient> ingredients, final int qty ) throws RecipeError
public GroupIngredient( final String myName, final List<IIngredient> ingredients, final int qty ) throws RecipeException
{
Preconditions.checkNotNull( myName );
Preconditions.checkNotNull( ingredients );
@@ -57,27 +57,27 @@ public class GroupIngredient implements IIngredient
{
if( ingredient.isAir() )
{
throw new RecipeError( "Cannot include air in a group." );
throw new RecipeException( "Cannot include air in a group." );
}
}
this.ingredients = ingredients;
}
IIngredient copy( final int qty ) throws RecipeError
IIngredient copy( final int qty ) throws RecipeException
{
Preconditions.checkState( qty > 0 );
return new GroupIngredient( this.name, this.ingredients, qty );
}
@Override
public ItemStack getItemStack() throws RegistrationError, MissingIngredientError
public ItemStack getItemStack() throws RegistrationException, MissingIngredientException
{
throw new RegistrationError( "Cannot pass group of items to a recipe which desires a single recipe item." );
throw new RegistrationException( "Cannot pass group of items to a recipe which desires a single recipe item." );
}
@Override
public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError
public ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException
{
if( this.baked != null )
{
@@ -99,7 +99,7 @@ public class GroupIngredient implements IIngredient
{
out.addAll( Arrays.asList( i.getItemStackSet() ) );
}
catch( final MissingIngredientError mir )
catch( final MissingIngredientException mir )
{
// oh well this is a group!
}
@@ -112,7 +112,7 @@ public class GroupIngredient implements IIngredient
if( out.isEmpty() )
{
throw new MissingIngredientError( this.toString() + " - group could not be resolved to any items." );
throw new MissingIngredientException( this.toString() + " - group could not be resolved to any items." );
}
for( final ItemStack is : out )
@@ -154,7 +154,7 @@ public class GroupIngredient implements IIngredient
}
@Override
public void bake() throws RegistrationError, MissingIngredientError
public void bake() throws RegistrationException, MissingIngredientException
{
this.baked = null;
this.baked = this.getItemStackSet();
+15 -15
View File
@@ -31,9 +31,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient;
import appeng.api.recipes.ResolverResult;
import appeng.api.recipes.ResolverResultSet;
@@ -50,7 +50,7 @@ public class Ingredient implements IIngredient
private NBTTagCompound nbt = null;
private ItemStack[] baked;
public Ingredient( final RecipeHandler handler, final String input, final int qty ) throws RecipeError, MissedIngredientSet
public Ingredient( final RecipeHandler handler, final String input, final int qty ) throws RecipeException, MissedIngredientSet
{
Preconditions.checkNotNull( handler );
Preconditions.checkNotNull( input );
@@ -83,7 +83,7 @@ public class Ingredient implements IIngredient
{
if( parts.length == 3 )
{
throw new RecipeError( "Cannot specify meta when using ore dictionary." );
throw new RecipeException( "Cannot specify meta when using ore dictionary." );
}
sel = OreDictionary.WILDCARD_VALUE;
}
@@ -106,7 +106,7 @@ public class Ingredient implements IIngredient
}
catch( final IllegalArgumentException e )
{
throw new RecipeError( tmpName + " is not a valid ae2 item definition." );
throw new RecipeException( tmpName + " is not a valid ae2 item definition." );
}
}
@@ -126,7 +126,7 @@ public class Ingredient implements IIngredient
}
catch( final NumberFormatException e )
{
throw new RecipeError( "Invalid Metadata." );
throw new RecipeException( "Invalid Metadata." );
}
}
}
@@ -134,7 +134,7 @@ public class Ingredient implements IIngredient
}
else
{
throw new RecipeError( input + " : Needs at least Namespace and Name." );
throw new RecipeException( input + " : Needs at least Namespace and Name." );
}
handler.getData().knownItem.add( this.toString() );
@@ -147,16 +147,16 @@ public class Ingredient implements IIngredient
}
@Override
public ItemStack getItemStack() throws RegistrationError, MissingIngredientError
public ItemStack getItemStack() throws RegistrationException, MissingIngredientException
{
if( this.isAir )
{
throw new RegistrationError( "Found blank item and expected a real item." );
throw new RegistrationException( "Found blank item and expected a real item." );
}
if( this.nameSpace.equalsIgnoreCase( "oreDictionary" ) )
{
throw new RegistrationError( "Recipe format expected a single item, but got a set of items." );
throw new RegistrationException( "Recipe format expected a single item, but got a set of items." );
}
Block blk = Block.getBlockFromName( this.nameSpace + ":" + this.itemName );
@@ -195,7 +195,7 @@ public class Ingredient implements IIngredient
* instanceof BlockAir)) ) return new ItemStack( (Block) o, qty, meta );
*/
throw new MissingIngredientError( "Unable to find item: " + this.toString() );
throw new MissingIngredientException( "Unable to find item: " + this.toString() );
}
private ItemStack makeItemStack( final Item it, final int quantity, final int damageValue, final NBTTagCompound compound )
@@ -206,7 +206,7 @@ public class Ingredient implements IIngredient
}
@Override
public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError
public ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException
{
if( this.baked != null )
{
@@ -228,7 +228,7 @@ public class Ingredient implements IIngredient
if( set.length == 0 )
{
throw new MissingIngredientError( this.itemName + " - ore dictionary could not be resolved to any items." );
throw new MissingIngredientException( this.itemName + " - ore dictionary could not be resolved to any items." );
}
return set;
@@ -268,7 +268,7 @@ public class Ingredient implements IIngredient
}
@Override
public void bake() throws RegistrationError, MissingIngredientError
public void bake() throws RegistrationException, MissingIngredientException
{
this.baked = null;
this.baked = this.getItemStackSet();
@@ -27,8 +27,8 @@ import com.google.common.base.Preconditions;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient;
import appeng.api.recipes.ResolverResultSet;
@@ -55,13 +55,13 @@ public class IngredientSet implements IIngredient
}
@Override
public ItemStack getItemStack() throws RegistrationError, MissingIngredientError
public ItemStack getItemStack() throws RegistrationException, MissingIngredientException
{
throw new RegistrationError( "Cannot pass group of items to a recipe which desires a single recipe item." );
throw new RegistrationException( "Cannot pass group of items to a recipe which desires a single recipe item." );
}
@Override
public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError
public ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException
{
if( this.baked != null )
{
@@ -78,7 +78,7 @@ public class IngredientSet implements IIngredient
if( out.isEmpty() )
{
throw new MissingIngredientError( this.toString() + " - group could not be resolved to any items." );
throw new MissingIngredientException( this.toString() + " - group could not be resolved to any items." );
}
for( final ItemStack is : out )
@@ -120,7 +120,7 @@ public class IngredientSet implements IIngredient
}
@Override
public void bake() throws RegistrationError, MissingIngredientError
public void bake() throws RegistrationException, MissingIngredientException
{
this.baked = null;
this.baked = this.getItemStackSet();
+26 -26
View File
@@ -47,9 +47,9 @@ import appeng.api.AEApi;
import appeng.api.definitions.IBlocks;
import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IItems;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.features.IRecipeHandlerRegistry;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
@@ -102,7 +102,7 @@ public class RecipeHandler implements IRecipeHandler
return this.getName( is );
}
}
catch( final RecipeError ignored )
catch( final RecipeException ignored )
{
}
catch( final Throwable t )
@@ -114,7 +114,7 @@ public class RecipeHandler implements IRecipeHandler
return i.getNameSpace() + ':' + i.getItemName();
}
private String getName( final ItemStack is ) throws RecipeError
private String getName( final ItemStack is ) throws RecipeException
{
Preconditions.checkNotNull( is );
@@ -123,7 +123,7 @@ public class RecipeHandler implements IRecipeHandler
if( !id.getResourceDomain().equals( AppEng.MOD_ID ) && !id.getResourceDomain().equals( "minecraft" ) )
{
throw new RecipeError( "Not applicable for website" );
throw new RecipeException( "Not applicable for website" );
}
final IDefinitions definitions = AEApi.instance().definitions();
@@ -388,7 +388,7 @@ public class RecipeHandler implements IRecipeHandler
processed.put( clz, i + 1 );
}
}
catch( final MissingIngredientError e )
catch( final MissingIngredientException e )
{
if( this.data.errorOnMissing )
{
@@ -403,7 +403,7 @@ public class RecipeHandler implements IRecipeHandler
}
}
}
catch( final RegistrationError e )
catch( final RegistrationException e )
{
AELog.warn( "Unable to register a recipe: " + e.getMessage() );
if( this.data.exceptions )
@@ -447,7 +447,7 @@ public class RecipeHandler implements IRecipeHandler
}
}
}
catch( final RecipeError ignored )
catch( final RecipeException ignored )
{
}
@@ -455,11 +455,11 @@ public class RecipeHandler implements IRecipeHandler
{
}
catch( final RegistrationError ignored )
catch( final RegistrationException ignored )
{
}
catch( final MissingIngredientError ignored )
catch( final MissingIngredientException ignored )
{
}
@@ -521,7 +521,7 @@ public class RecipeHandler implements IRecipeHandler
return this.data;
}
private void processTokens( final IRecipeLoader loader, final String file, final int line ) throws RecipeError
private void processTokens( final IRecipeLoader loader, final String file, final int line ) throws RecipeException
{
try
{
@@ -545,7 +545,7 @@ public class RecipeHandler implements IRecipeHandler
}
else
{
throw new RecipeError( "Alias must have exactly 1 input and 1 output." );
throw new RecipeException( "Alias must have exactly 1 input and 1 output." );
}
}
else if( operation.equals( "group" ) )
@@ -561,7 +561,7 @@ public class RecipeHandler implements IRecipeHandler
}
else
{
throw new RecipeError( "Group must have exactly 1 output, and 1 or more inputs." );
throw new RecipeException( "Group must have exactly 1 output, and 1 or more inputs." );
}
}
else if( operation.equals( "ore" ) )
@@ -578,7 +578,7 @@ public class RecipeHandler implements IRecipeHandler
}
else
{
throw new RecipeError( "Group must have exactly 1 output, and 1 or more inputs in a single row." );
throw new RecipeException( "Group must have exactly 1 output, and 1 or more inputs in a single row." );
}
}
else
@@ -598,7 +598,7 @@ public class RecipeHandler implements IRecipeHandler
}
else
{
throw new RecipeError( "Invalid crafting type: " + operation );
throw new RecipeException( "Invalid crafting type: " + operation );
}
}
}
@@ -614,7 +614,7 @@ public class RecipeHandler implements IRecipeHandler
}
else
{
throw new RecipeError( "exceptions must be true or false explicitly." );
throw new RecipeException( "exceptions must be true or false explicitly." );
}
}
else if( operation.equals( "crash" ) && ( this.tokens.get( 0 ).equals( "true" ) || this.tokens.get( 0 ).equals( "false" ) ) )
@@ -625,7 +625,7 @@ public class RecipeHandler implements IRecipeHandler
}
else
{
throw new RecipeError( "crash must be true or false explicitly." );
throw new RecipeException( "crash must be true or false explicitly." );
}
}
else if( operation.equals( "erroronmissing" ) )
@@ -636,7 +636,7 @@ public class RecipeHandler implements IRecipeHandler
}
else
{
throw new RecipeError( "erroronmissing must be true or false explicitly." );
throw new RecipeException( "erroronmissing must be true or false explicitly." );
}
}
else if( operation.equals( "import" ) )
@@ -647,16 +647,16 @@ public class RecipeHandler implements IRecipeHandler
}
else
{
throw new RecipeError( "Import must have exactly 1 input." );
throw new RecipeException( "Import must have exactly 1 input." );
}
}
else
{
throw new RecipeError( operation + ": " + this.tokens.toString() + "; recipe without an output." );
throw new RecipeException( operation + ": " + this.tokens.toString() + "; recipe without an output." );
}
}
}
catch( final RecipeError e )
catch( final RecipeException e )
{
AELog.warn( "Recipe Error '" + e.getMessage() + "' near line:" + line + " in " + file + " with: " + this.tokens.toString() );
if( this.data.exceptions )
@@ -672,7 +672,7 @@ public class RecipeHandler implements IRecipeHandler
this.tokens.clear();
}
private List<List<IIngredient>> parseLines( final Iterable<String> subList ) throws RecipeError
private List<List<IIngredient>> parseLines( final Iterable<String> subList ) throws RecipeException
{
final List<List<IIngredient>> out = new LinkedList<>();
List<IIngredient> cList = new LinkedList<>();
@@ -686,7 +686,7 @@ public class RecipeHandler implements IRecipeHandler
{
if( hasQty )
{
throw new RecipeError( "Qty found with no item." );
throw new RecipeException( "Qty found with no item." );
}
if( !cList.isEmpty() )
{
@@ -700,7 +700,7 @@ public class RecipeHandler implements IRecipeHandler
{
if( hasQty )
{
throw new RecipeError( "Qty found with no item." );
throw new RecipeException( "Qty found with no item." );
}
hasQty = true;
qty = Integer.parseInt( v );
@@ -728,7 +728,7 @@ public class RecipeHandler implements IRecipeHandler
return out;
}
private IIngredient findIngredient( final String v, final int qty ) throws RecipeError
private IIngredient findIngredient( final String v, final int qty ) throws RecipeException
{
final GroupIngredient gi = this.data.groups.get( v );
@@ -19,10 +19,10 @@
package appeng.recipes.game;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.RegistrationException;
public interface IRecipeBakeable
{
void bake() throws RegistrationError;
void bake() throws RegistrationException;
}
@@ -31,8 +31,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient;
@@ -228,11 +228,11 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn
matched = matched || this.checkItemEquals( item, slot );
}
}
catch( final RegistrationError e )
catch( final RegistrationException e )
{
// :P
}
catch( final MissingIngredientError e )
catch( final MissingIngredientException e )
{
// :P
}
@@ -309,7 +309,7 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn
}
@Override
public void bake() throws RegistrationError
public void bake() throws RegistrationException
{
try
{
@@ -322,7 +322,7 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn
}
}
}
catch( final MissingIngredientError err )
catch( final MissingIngredientException err )
{
this.disable = true;
}
@@ -29,8 +29,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient;
@@ -100,11 +100,11 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr
match = match || this.checkItemEquals( item, slot );
}
}
catch( final RegistrationError e )
catch( final RegistrationException e )
{
// :P
}
catch( final MissingIngredientError e )
catch( final MissingIngredientException e )
{
// :P
}
@@ -164,7 +164,7 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr
}
@Override
public void bake() throws RegistrationError
public void bake() throws RegistrationException
{
try
{
@@ -177,7 +177,7 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr
}
}
}
catch( final MissingIngredientError e )
catch( final MissingIngredientException e )
{
this.disable = true;
}
@@ -23,9 +23,9 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.core.AELog;
@@ -42,7 +42,7 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( input.size() == 1 && output.size() == 1 )
{
@@ -54,11 +54,11 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
return;
}
}
throw new RecipeError( "Crusher must have a single input, and single output." );
throw new RecipeException( "Crusher must have a single input, and single output." );
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
final IRC rc = Integrations.rc();
for( final ItemStack is : this.pro_input.getItemStackSet() )
@@ -81,7 +81,7 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack output ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack output ) throws RegistrationException, MissingIngredientException
{
return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
}
@@ -24,9 +24,9 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.features.IGrinderRecipe;
import appeng.api.features.IGrinderRecipeBuilder;
import appeng.api.features.IGrinderRegistry;
@@ -43,7 +43,7 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( input.size() == 1 && output.size() == 1 )
{
@@ -55,11 +55,11 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
return;
}
}
throw new RecipeError( "Grind must have a single input, and single output." );
throw new RecipeException( "Grind must have a single input, and single output." );
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
for( final ItemStack is : this.pro_input.getItemStackSet() )
{
@@ -81,7 +81,7 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack output ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack output ) throws RegistrationException, MissingIngredientException
{
return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
}
@@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.core.AELog;
@@ -42,7 +42,7 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( input.size() == 1 && output.size() == 1 )
{
@@ -54,11 +54,11 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
return;
}
}
throw new RecipeError( "Crusher must have a single input, and single output." );
throw new RecipeException( "Crusher must have a single input, and single output." );
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
for( final ItemStack beginStack : this.pro_input.getItemStackSet() )
{
@@ -94,7 +94,7 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack output ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack output ) throws RegistrationException, MissingIngredientException
{
return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
}
@@ -21,8 +21,8 @@ package appeng.recipes.handlers;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationException;
import appeng.recipes.RecipeHandler;
@@ -31,5 +31,5 @@ public interface IWebsiteSerializer
String getPattern( RecipeHandler han );
boolean canCraft( ItemStack output ) throws RegistrationError, MissingIngredientError;
boolean canCraft( ItemStack output ) throws RegistrationException, MissingIngredientException;
}
@@ -26,8 +26,8 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.features.IInscriberRecipeBuilder;
import appeng.api.features.InscriberProcessType;
@@ -43,7 +43,7 @@ import appeng.api.features.InscriberProcessType;
public final class Inscribe extends InscriberProcess
{
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
if( this.getImprintable() == null )
{
@@ -25,9 +25,9 @@ import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.recipes.RecipeHandler;
@@ -57,7 +57,7 @@ public abstract class InscriberProcess implements ICraftHandler, IWebsiteSeriali
private IIngredient output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( output.size() == 1 && output.get( 0 ).size() == 1 )
{
@@ -76,17 +76,17 @@ public abstract class InscriberProcess implements ICraftHandler, IWebsiteSeriali
}
else
{
throw new RecipeError( "Inscriber recipes cannot have rows, and must have more then one input." );
throw new RecipeException( "Inscriber recipes cannot have rows, and must have more then one input." );
}
}
else
{
throw new RecipeError( "Inscriber recipes must produce a single output." );
throw new RecipeException( "Inscriber recipes must produce a single output." );
}
}
@Override
public boolean canCraft( final ItemStack reqOutput ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack reqOutput ) throws RegistrationException, MissingIngredientException
{
return this.output != null && Platform.itemComparisons().isSameItem( this.output.getItemStack(), reqOutput );
}
@@ -23,9 +23,9 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.core.AELog;
@@ -42,7 +42,7 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( input.size() == 1 && output.size() == 1 )
{
@@ -54,11 +54,11 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
return;
}
}
throw new RecipeError( "Grind must have a single input, and single output." );
throw new RecipeException( "Grind must have a single input, and single output." );
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
IIC2 ic2 = Integrations.ic2();
for( final ItemStack is : this.pro_input.getItemStackSet() )
@@ -81,7 +81,7 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack output ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack output ) throws RegistrationException, MissingIngredientException
{
return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
}
@@ -23,9 +23,9 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.core.AELog;
@@ -42,7 +42,7 @@ public class MekCrusher implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( input.size() == 1 && output.size() == 1 )
{
@@ -55,11 +55,11 @@ public class MekCrusher implements ICraftHandler, IWebsiteSerializer
}
}
throw new RecipeError( "MekCrusher must have a single input, and single output." );
throw new RecipeException( "MekCrusher must have a single input, and single output." );
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
IMekanism mekanism = Integrations.mekanism();
for( final ItemStack is : this.pro_input.getItemStackSet() )
@@ -82,7 +82,7 @@ public class MekCrusher implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack output ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack output ) throws RegistrationException, MissingIngredientException
{
return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
}
@@ -23,9 +23,9 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.core.AELog;
@@ -42,7 +42,7 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( input.size() == 1 && output.size() == 1 )
{
@@ -54,11 +54,11 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
return;
}
}
throw new RecipeError( "MekCrusher must have a single input, and single output." );
throw new RecipeException( "MekCrusher must have a single input, and single output." );
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
IMekanism mekanism = Integrations.mekanism();
for( final ItemStack is : this.pro_input.getItemStackSet() )
@@ -81,7 +81,7 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack output ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack output ) throws RegistrationException, MissingIngredientException
{
return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
}
@@ -24,9 +24,9 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
@@ -44,13 +44,13 @@ public class OreRegistration implements ICraftHandler
}
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
for( final IIngredient i : this.inputs )
{
@@ -26,8 +26,8 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.features.IInscriberRecipe;
import appeng.api.features.IInscriberRecipeBuilder;
import appeng.api.features.InscriberProcessType;
@@ -44,7 +44,7 @@ import appeng.api.features.InscriberProcessType;
public final class Press extends InscriberProcess
{
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
if( this.getImprintable() == null )
{
@@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.recipes.RecipeHandler;
@@ -41,7 +41,7 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( input.size() == 1 && output.size() == 1 )
{
@@ -53,11 +53,11 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
return;
}
}
throw new RecipeError( "Grind must have a single input, and single output." );
throw new RecipeException( "Grind must have a single input, and single output." );
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
final NBTTagCompound toSend = new NBTTagCompound();
toSend.setInteger( "energy", 800 );
@@ -80,7 +80,7 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack output ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack output ) throws RegistrationException, MissingIngredientException
{
return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
}
@@ -24,9 +24,9 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.core.AELog;
@@ -43,7 +43,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
private int cols;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( output.size() == 1 && output.get( 0 ).size() == 1 )
{
@@ -57,7 +57,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
{
if( anInput.size() != this.cols )
{
throw new RecipeError( "all rows in a shaped crafting recipe must contain the same number of ingredients." );
throw new RecipeException( "all rows in a shaped crafting recipe must contain the same number of ingredients." );
}
}
@@ -66,22 +66,22 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
}
else
{
throw new RecipeError( "Crafting recipes must have 1-3 columns." );
throw new RecipeException( "Crafting recipes must have 1-3 columns." );
}
}
else
{
throw new RecipeError( "shaped crafting recipes must have 1-3 rows." );
throw new RecipeException( "shaped crafting recipes must have 1-3 rows." );
}
}
else
{
throw new RecipeError( "Crafting must produce a single output." );
throw new RecipeException( "Crafting must produce a single output." );
}
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
char first = 'A';
final List<Object> args = new ArrayList<>();
@@ -117,7 +117,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
catch( final Throwable e )
{
AELog.debug( e );
throw new RegistrationError( "Error while adding shaped recipe." );
throw new RegistrationException( "Error while adding shaped recipe." );
}
}
@@ -149,7 +149,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack reqOutput ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack reqOutput ) throws RegistrationException, MissingIngredientException
{
for( int y = 0; y < this.rows; y++ )
{
@@ -24,9 +24,9 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.core.AELog;
@@ -41,7 +41,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
private IIngredient output;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( output.size() == 1 && output.get( 0 ).size() == 1 )
{
@@ -52,17 +52,17 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
}
else
{
throw new RecipeError( "Shapeless crafting recipes cannot have rows." );
throw new RecipeException( "Shapeless crafting recipes cannot have rows." );
}
}
else
{
throw new RecipeError( "Crafting must produce a single output." );
throw new RecipeException( "Crafting must produce a single output." );
}
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
final List<Object> args = new ArrayList<>();
for( final IIngredient i : this.inputs )
@@ -81,7 +81,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
catch( final Throwable e )
{
AELog.debug( e );
throw new RegistrationError( "Error while adding shapeless recipe." );
throw new RegistrationException( "Error while adding shapeless recipe." );
}
}
@@ -119,7 +119,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack reqOutput ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack reqOutput ) throws RegistrationException, MissingIngredientException
{
for( final IIngredient i : this.inputs )
@@ -25,9 +25,9 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient;
import appeng.recipes.RecipeHandler;
@@ -41,7 +41,7 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer
private IIngredient out;
@Override
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeError
public void setup( final List<List<IIngredient>> input, final List<List<IIngredient>> output ) throws RecipeException
{
if( input.size() == 1 && output.size() == 1 )
{
@@ -54,20 +54,20 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer
return;
}
}
throw new RecipeError( "Smelting recipe can only have a single input and output." );
throw new RecipeException( "Smelting recipe can only have a single input and output." );
}
@Override
public void register() throws RegistrationError, MissingIngredientError
public void register() throws RegistrationException, MissingIngredientException
{
if( this.in.getItemStack().getItem() == Items.AIR )
{
throw new RegistrationError( this.in.toString() + ": Smelting Input is not a valid item." );
throw new RegistrationException( this.in.toString() + ": Smelting Input is not a valid item." );
}
if( this.out.getItemStack().getItem() == Items.AIR )
{
throw new RegistrationError( this.out.toString() + ": Smelting Output is not a valid item." );
throw new RegistrationException( this.out.toString() + ": Smelting Output is not a valid item." );
}
GameRegistry.addSmelting( this.in.getItemStack(), this.out.getItemStack(), 0 );
@@ -80,7 +80,7 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer
}
@Override
public boolean canCraft( final ItemStack reqOutput ) throws RegistrationError, MissingIngredientError
public boolean canCraft( final ItemStack reqOutput ) throws RegistrationException, MissingIngredientException
{
return Platform.itemComparisons().isSameItem( this.out.getItemStack(), reqOutput );
}