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/game/IRecipeBakeable.java
+2 -2
View File
@@ -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;
}
src/main/java/appeng/recipes/game/ShapedRecipe.java
+6 -6
View File
@@ -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;
}
src/main/java/appeng/recipes/game/ShapelessRecipe.java
+6 -6
View File
@@ -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;
}