fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API cleanups (#3155)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/handlers/Crusher.java
+7 -7
View File
@@ -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 );
}
src/main/java/appeng/recipes/handlers/Grind.java
+7 -7
View File
@@ -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 );
}
src/main/java/appeng/recipes/handlers/HCCrusher.java
+7 -7
View File
@@ -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 );
}
src/main/java/appeng/recipes/handlers/IWebsiteSerializer.java
+3 -3
View File
@@ -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;
}
src/main/java/appeng/recipes/handlers/Inscribe.java
+3 -3
View File
@@ -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 )
{
src/main/java/appeng/recipes/handlers/InscriberProcess.java
+7 -7
View File
@@ -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 );
}
src/main/java/appeng/recipes/handlers/Macerator.java
+7 -7
View File
@@ -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 );
}
src/main/java/appeng/recipes/handlers/MekCrusher.java
+7 -7
View File
@@ -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 );
}
src/main/java/appeng/recipes/handlers/MekEnrichment.java
+7 -7
View File
@@ -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 );
}
src/main/java/appeng/recipes/handlers/OreRegistration.java
+5 -5
View File
@@ -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 )
{
src/main/java/appeng/recipes/handlers/Press.java
+3 -3
View File
@@ -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 )
{
src/main/java/appeng/recipes/handlers/Pulverizer.java
+7 -7
View File
@@ -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 );
}
src/main/java/appeng/recipes/handlers/Shaped.java
+11 -11
View File
@@ -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++ )
{
src/main/java/appeng/recipes/handlers/Shapeless.java
+9 -9
View File
@@ -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 )
src/main/java/appeng/recipes/handlers/Smelt.java
+9 -9
View File
@@ -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 );
}