tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/java/appeng/api/IAppEngApi.java
View file

@ -26,8 +26,8 @@ package appeng.api;
import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IDefinitions;
import appeng.api.features.IRegistryContainer; import appeng.api.features.IRegistryContainer;
import appeng.api.networking.IGridNode;
import appeng.api.networking.IGridHelper; import appeng.api.networking.IGridHelper;
import appeng.api.networking.IGridNode;
import appeng.api.parts.IPartHelper; import appeng.api.parts.IPartHelper;
import appeng.api.storage.IStorageHelper; import appeng.api.storage.IStorageHelper;

64
src/api/java/appeng/api/client/BakingPipeline.java
View file

@ -1,64 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2013 AlgorithmX2
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package appeng.api.client;
import java.util.List;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.util.EnumFacing;
/**
* TODO: Needs to be moved to an internal class. API is only allowed to contain interfaces and/or data.
*
* @deprecated
*/
@Deprecated
public class BakingPipeline<F, T> implements BakingPipelineElement<F, T>
{
private final ImmutableList<BakingPipelineElement<?, ?>> pipeline;
public BakingPipeline( BakingPipelineElement<?, ?>... pipeline )
{
this.pipeline = ImmutableList.copyOf( pipeline );
}
/**
* TODO: fix generics
*/
@Override
public List pipe( List things, IBakedModel parent, IBlockState state, EnumFacing side, long rand )
{
for( BakingPipelineElement pipe : this.pipeline )
{
things = pipe.pipe( things, parent, state, side, rand );
}
return things;
}
}

39
src/api/java/appeng/api/client/BakingPipelineElement.java
View file

@ -1,39 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2013 AlgorithmX2
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package appeng.api.client;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.util.EnumFacing;
public interface BakingPipelineElement<F, T>
{
public List<T> pipe( List<F> elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand );
}

2
src/api/java/appeng/api/exceptions/CoreInaccessibleException.java
View file

@ -21,6 +21,8 @@ package appeng.api.exceptions;
public class CoreInaccessibleException extends RuntimeException public class CoreInaccessibleException extends RuntimeException
{ {
private static final long serialVersionUID = -7434641554655517242L;
public CoreInaccessibleException( final String message ) public CoreInaccessibleException( final String message )
{ {
super( message ); super( message );

2
src/api/java/appeng/api/exceptions/ExistingConnectionException.java
View file

@ -37,7 +37,7 @@ import appeng.api.networking.IGridNode;
* @version rv3 * @version rv3
* @since rv3 * @since rv3
*/ */
public class ExistingConnectionException extends FailedConnection public class ExistingConnectionException extends FailedConnectionException
{ {
private static final long serialVersionUID = 2975450379720353182L; private static final long serialVersionUID = 2975450379720353182L;

6
src/api/java/appeng/api/exceptions/FailedConnection.java → src/api/java/appeng/api/exceptions/FailedConnectionException.java
View file

@ -40,16 +40,16 @@ import appeng.api.networking.IGridNode;
* @version rv3 * @version rv3
* @since rv0 * @since rv0
*/ */
public class FailedConnection extends Exception public class FailedConnectionException extends Exception
{ {
private static final long serialVersionUID = -2544208090248293753L; private static final long serialVersionUID = -2544208090248293753L;
public FailedConnection() public FailedConnectionException()
{ {
} }
public FailedConnection( String message ) public FailedConnectionException( String message )
{ {
super( message ); super( message );
} }

6
src/api/java/appeng/api/exceptions/MissingDefinition.java → src/api/java/appeng/api/exceptions/MissingDefinitionException.java
View file

@ -19,9 +19,11 @@
package appeng.api.exceptions; package appeng.api.exceptions;
public class MissingDefinition extends RuntimeException public class MissingDefinitionException extends RuntimeException
{ {
public MissingDefinition( final String message ) private static final long serialVersionUID = -6547396584255825761L;
public MissingDefinitionException( final String message )
{ {
super( message ); super( message );
} }

4
src/api/java/appeng/api/exceptions/MissingIngredientError.java → src/api/java/appeng/api/exceptions/MissingIngredientException.java
View file

@ -24,12 +24,12 @@
package appeng.api.exceptions; package appeng.api.exceptions;
public class MissingIngredientError extends Exception public class MissingIngredientException extends Exception
{ {
private static final long serialVersionUID = -998858343831371697L; private static final long serialVersionUID = -998858343831371697L;
public MissingIngredientError( final String n ) public MissingIngredientException( final String n )
{ {
super( n ); super( n );
} }

4
src/api/java/appeng/api/exceptions/ModNotInstalled.java → src/api/java/appeng/api/exceptions/ModNotInstalledException.java
View file

@ -24,12 +24,12 @@
package appeng.api.exceptions; package appeng.api.exceptions;
public class ModNotInstalled extends Exception public class ModNotInstalledException extends Exception
{ {
private static final long serialVersionUID = -9052435206368425494L; private static final long serialVersionUID = -9052435206368425494L;
public ModNotInstalled( final String t ) public ModNotInstalledException( final String t )
{ {
super( t ); super( t );
} }

2
src/api/java/appeng/api/exceptions/NullNodeConnectionException.java
View file

@ -34,7 +34,7 @@ package appeng.api.exceptions;
* @version rv3 * @version rv3
* @since rv3 * @since rv3
*/ */
public class NullNodeConnectionException extends FailedConnection public class NullNodeConnectionException extends FailedConnectionException
{ {
private static final long serialVersionUID = -2143719383495321764L; private static final long serialVersionUID = -2143719383495321764L;

4
src/api/java/appeng/api/exceptions/RecipeError.java → src/api/java/appeng/api/exceptions/RecipeException.java
View file

@ -24,12 +24,12 @@
package appeng.api.exceptions; package appeng.api.exceptions;
public class RecipeError extends Exception public class RecipeException extends Exception
{ {
private static final long serialVersionUID = -6602870588617670262L; private static final long serialVersionUID = -6602870588617670262L;
public RecipeError( final String n ) public RecipeException( final String n )
{ {
super( n ); super( n );
} }

4
src/api/java/appeng/api/exceptions/RegistrationError.java → src/api/java/appeng/api/exceptions/RegistrationException.java
View file

@ -24,12 +24,12 @@
package appeng.api.exceptions; package appeng.api.exceptions;
public class RegistrationError extends Exception public class RegistrationException extends Exception
{ {
private static final long serialVersionUID = -6602870588617670263L; private static final long serialVersionUID = -6602870588617670263L;
public RegistrationError( final String n ) public RegistrationException( final String n )
{ {
super( n ); super( n );
} }

2
src/api/java/appeng/api/exceptions/SecurityConnectionException.java
View file

@ -34,7 +34,7 @@ package appeng.api.exceptions;
* @version rv3 * @version rv3
* @since rv3 * @since rv3
*/ */
public class SecurityConnectionException extends FailedConnection public class SecurityConnectionException extends FailedConnectionException
{ {
private static final long serialVersionUID = 5048714900434215426L; private static final long serialVersionUID = 5048714900434215426L;
private static final String DEFAULT_MESSAGE = "Connection failed due to different security realms."; private static final String DEFAULT_MESSAGE = "Connection failed due to different security realms.";

6
src/api/java/appeng/api/networking/IGridHelper.java
View file

@ -24,7 +24,7 @@
package appeng.api.networking; package appeng.api.networking;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnectionException;
/** /**
@ -57,8 +57,8 @@ public interface IGridHelper
* @param a to be connected gridnode * @param a to be connected gridnode
* @param b to be connected gridnode * @param b to be connected gridnode
* *
* @throws appeng.api.exceptions.FailedConnection * @throws appeng.api.exceptions.FailedConnectionException
*/ */
IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnection; IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnectionException;
} }

2
src/api/java/appeng/api/networking/storage/IBaseMonitor.java
View file

@ -28,7 +28,7 @@ import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
public interface IBaseMonitor<T extends IAEStack> public interface IBaseMonitor<T extends IAEStack<T>>
{ {
/** /**

2
src/api/java/appeng/api/networking/storage/IStackWatcherHost.java
View file

@ -50,5 +50,5 @@ public interface IStackWatcherHost
* @param src action source * @param src action source
* @param chan storage channel * @param chan storage channel
*/ */
void onStackChange( IItemList o, IAEStack fullStack, IAEStack diffStack, IActionSource src, IStorageChannel chan ); void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan );
} }

4
src/api/java/appeng/api/networking/storage/IStorageGrid.java
View file

@ -29,8 +29,8 @@ import appeng.api.networking.IGridHost;
import appeng.api.networking.security.IActionSource; import appeng.api.networking.security.IActionSource;
import appeng.api.storage.ICellContainer; import appeng.api.storage.ICellContainer;
import appeng.api.storage.ICellProvider; import appeng.api.storage.ICellProvider;
import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.IStorageChannel; import appeng.api.storage.IStorageChannel;
import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
@ -50,7 +50,7 @@ public interface IStorageGrid extends IGridCache, IStorageMonitorable
* *
* @param input injected items * @param input injected items
*/ */
void postAlterationOfStoredItems( IStorageChannel chan, Iterable<? extends IAEStack> input, IActionSource src ); void postAlterationOfStoredItems( IStorageChannel<?> chan, Iterable<? extends IAEStack<?>> input, IActionSource src );
/** /**
* Used to add a cell provider to the storage system * Used to add a cell provider to the storage system

16
src/api/java/appeng/api/recipes/ICraftHandler.java
View file

@ -26,9 +26,9 @@ package appeng.api.recipes;
import java.util.List; import java.util.List;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
public interface ICraftHandler public interface ICraftHandler
@ -40,15 +40,15 @@ public interface ICraftHandler
* @param input parsed inputs * @param input parsed inputs
* @param output parsed outputs * @param output parsed outputs
* *
* @throws RecipeError * @throws RecipeException
*/ */
void setup( List<List<IIngredient>> input, List<List<IIngredient>> output ) throws RecipeError; void setup( List<List<IIngredient>> input, List<List<IIngredient>> output ) throws RecipeException;
/** /**
* called when all recipes are parsed, and your required to register your recipe. * called when all recipes are parsed, and your required to register your recipe.
* *
* @throws RegistrationError * @throws RegistrationException
* @throws MissingIngredientError * @throws MissingIngredientException
*/ */
void register() throws RegistrationError, MissingIngredientError; void register() throws RegistrationException, MissingIngredientException;
} }

22
src/api/java/appeng/api/recipes/IIngredient.java
View file

@ -26,8 +26,8 @@ package appeng.api.recipes;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
public interface IIngredient public interface IIngredient
@ -39,10 +39,10 @@ public interface IIngredient
* *
* @return a single ItemStack for the recipe handler. * @return a single ItemStack for the recipe handler.
* *
* @throws RegistrationError * @throws RegistrationException
* @throws MissingIngredientError * @throws MissingIngredientException
*/ */
ItemStack getItemStack() throws RegistrationError, MissingIngredientError; ItemStack getItemStack() throws RegistrationException, MissingIngredientException;
/** /**
* Acquire a list of all the input stacks for the current recipe, this is for handlers that support * Acquire a list of all the input stacks for the current recipe, this is for handlers that support
@ -50,10 +50,10 @@ public interface IIngredient
* *
* @return an array of ItemStacks for the recipe handler. * @return an array of ItemStacks for the recipe handler.
* *
* @throws RegistrationError * @throws RegistrationException
* @throws MissingIngredientError * @throws MissingIngredientException
*/ */
ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError; ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException;
/** /**
* If you wish to support air, you must test before getting the ItemStack, or ItemStackSet * If you wish to support air, you must test before getting the ItemStack, or ItemStackSet
@ -85,8 +85,8 @@ public interface IIngredient
/** /**
* Bakes the lists in for faster runtime look-ups. * Bakes the lists in for faster runtime look-ups.
* *
* @throws MissingIngredientError * @throws MissingIngredientException
* @throws RegistrationError * @throws RegistrationException
*/ */
void bake() throws RegistrationError, MissingIngredientError; void bake() throws RegistrationException, MissingIngredientException;
} }

2
src/api/java/appeng/api/storage/ICellProvider.java
View file

@ -42,7 +42,7 @@ public interface ICellProvider
* *
* @return a valid list of handlers, NEVER NULL * @return a valid list of handlers, NEVER NULL
*/ */
List<IMEInventoryHandler> getCellArray( IStorageChannel channel ); List<IMEInventoryHandler> getCellArray( IStorageChannel<?> channel );
/** /**
* the storage's priority. * the storage's priority.

4
src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java
View file

@ -29,7 +29,7 @@ import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
public interface IMEMonitorHandlerReceiver<StackType extends IAEStack> public interface IMEMonitorHandlerReceiver<T extends IAEStack<T>>
{ {
/** /**
@ -46,7 +46,7 @@ public interface IMEMonitorHandlerReceiver<StackType extends IAEStack>
* *
* @param change done change * @param change done change
*/ */
void postChange( IBaseMonitor<StackType> monitor, Iterable<StackType> change, IActionSource actionSource ); void postChange( IBaseMonitor<T> monitor, Iterable<T> change, IActionSource actionSource );
/** /**
* called when the list updates its contents, this is mostly for handling power events. * called when the list updates its contents, this is mostly for handling power events.

2
src/api/java/appeng/api/storage/ISaveProvider.java
View file

@ -27,5 +27,5 @@ package appeng.api.storage;
public interface ISaveProvider public interface ISaveProvider
{ {
void saveChanges( IMEInventory cellInventory ); void saveChanges( IMEInventory<?> cellInventory );
} }

18
src/api/java/appeng/api/storage/data/IAEStack.java
View file

@ -35,7 +35,7 @@ import appeng.api.config.FuzzyMode;
import appeng.api.storage.IStorageChannel; import appeng.api.storage.IStorageChannel;
public interface IAEStack<StackType extends IAEStack<StackType>> public interface IAEStack<T extends IAEStack<T>>
{ {
/** /**
@ -43,7 +43,7 @@ public interface IAEStack<StackType extends IAEStack<StackType>>
* *
* @param is added item * @param is added item
*/ */
void add( StackType is ); void add( T is );
/** /**
* number of items in the stack. * number of items in the stack.
@ -57,7 +57,7 @@ public interface IAEStack<StackType extends IAEStack<StackType>>
* *
* @param stackSize , ItemStack.stackSize = N * @param stackSize , ItemStack.stackSize = N
*/ */
StackType setStackSize( long stackSize ); T setStackSize( long stackSize );
/** /**
* Same as getStackSize, but for requestable items. ( LP ) * Same as getStackSize, but for requestable items. ( LP )
@ -71,7 +71,7 @@ public interface IAEStack<StackType extends IAEStack<StackType>>
* *
* @return basically itemStack.stackSize = N but for setStackSize items. * @return basically itemStack.stackSize = N but for setStackSize items.
*/ */
StackType setCountRequestable( long countRequestable ); T setCountRequestable( long countRequestable );
/** /**
* true, if the item can be crafted. * true, if the item can be crafted.
@ -85,12 +85,12 @@ public interface IAEStack<StackType extends IAEStack<StackType>>
* *
* @param isCraftable can item be crafted * @param isCraftable can item be crafted
*/ */
StackType setCraftable( boolean isCraftable ); T setCraftable( boolean isCraftable );
/** /**
* clears, requestable, craftable, and stack sizes. * clears, requestable, craftable, and stack sizes.
*/ */
StackType reset(); T reset();
/** /**
* returns true, if the item can be crafted, requested, or extracted. * returns true, if the item can be crafted, requested, or extracted.
@ -174,14 +174,14 @@ public interface IAEStack<StackType extends IAEStack<StackType>>
* *
* @return a new Stack, which is copied from the original. * @return a new Stack, which is copied from the original.
*/ */
StackType copy(); T copy();
/** /**
* create an empty stack. * create an empty stack.
* *
* @return a new stack, which represents an empty copy of the original. * @return a new stack, which represents an empty copy of the original.
*/ */
StackType empty(); T empty();
/** /**
* @return true if the stack is a {@link IAEItemStack} * @return true if the stack is a {@link IAEItemStack}
@ -196,7 +196,7 @@ public interface IAEStack<StackType extends IAEStack<StackType>>
/** /**
* @return ITEM or FLUID * @return ITEM or FLUID
*/ */
IStorageChannel getChannel(); IStorageChannel<T> getChannel();
/** /**
* Returns itemstack for display and similar purposes. Always has a count of 1. * Returns itemstack for display and similar purposes. Always has a count of 1.

5
src/main/java/appeng/block/AEBaseBlock.java
View file

@ -100,14 +100,12 @@ public abstract class AEBaseBlock extends Block
return new BlockStateContainer( this, this.getAEStates() ); return new BlockStateContainer( this, this.getAEStates() );
} }
@SuppressWarnings( "deprecation" )
@Override @Override
public final boolean isNormalCube( IBlockState state ) public final boolean isNormalCube( IBlockState state )
{ {
return this.isFullSize() && this.isOpaque(); return this.isFullSize() && this.isOpaque();
} }
@SuppressWarnings( "deprecation" )
@Override @Override
public AxisAlignedBB getBoundingBox( IBlockState state, IBlockAccess source, BlockPos pos ) public AxisAlignedBB getBoundingBox( IBlockState state, IBlockAccess source, BlockPos pos )
{ {
@ -226,7 +224,6 @@ public abstract class AEBaseBlock extends Block
return super.getSelectedBoundingBox( state, w, pos ); return super.getSelectedBoundingBox( state, w, pos );
} }
@SuppressWarnings( "deprecation" )
@Override @Override
public final boolean isOpaqueCube( IBlockState state ) public final boolean isOpaqueCube( IBlockState state )
{ {
@ -281,14 +278,12 @@ public abstract class AEBaseBlock extends Block
return super.collisionRayTrace( state, w, pos, a, b ); return super.collisionRayTrace( state, w, pos, a, b );
} }
@SuppressWarnings( "deprecation" )
@Override @Override
public boolean hasComparatorInputOverride( IBlockState state ) public boolean hasComparatorInputOverride( IBlockState state )
{ {
return this.isInventory(); return this.isInventory();
} }
@SuppressWarnings( "deprecation" )
@Override @Override
public int getComparatorInputOverride( IBlockState state, final World worldIn, final BlockPos pos ) public int getComparatorInputOverride( IBlockState state, final World worldIn, final BlockPos pos )
{ {

1
src/main/java/appeng/block/AEBaseItemBlock.java
View file

@ -67,7 +67,6 @@ public class AEBaseItemBlock extends ItemBlock
@Override @Override
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
@SuppressWarnings( "unchecked" )
public final void addInformation( final ItemStack itemStack, final World world, final List<String> toolTip, final ITooltipFlag advancedTooltips ) public final void addInformation( final ItemStack itemStack, final World world, final List<String> toolTip, final ITooltipFlag advancedTooltips )
{ {
this.addCheckedInformation( itemStack, world, toolTip, advancedTooltips ); this.addCheckedInformation( itemStack, world, toolTip, advancedTooltips );

3
src/main/java/appeng/block/networking/BlockController.java
View file

@ -97,7 +97,6 @@ public class BlockController extends AEBaseTileBlock
* controllers and the network state of this controller (offline, online, conflicted). This is used to * controllers and the network state of this controller (offline, online, conflicted). This is used to
* get a rudimentary connected texture feel for the controller based on how it is placed. * get a rudimentary connected texture feel for the controller based on how it is placed.
*/ */
@SuppressWarnings( "deprecation" )
@Override @Override
public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos ) public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos )
{ {
@ -160,7 +159,6 @@ public class BlockController extends AEBaseTileBlock
return state.getValue( CONTROLLER_STATE ).ordinal(); return state.getValue( CONTROLLER_STATE ).ordinal();
} }
@SuppressWarnings( "deprecation" )
@Override @Override
public IBlockState getStateFromMeta( final int meta ) public IBlockState getStateFromMeta( final int meta )
{ {
@ -174,7 +172,6 @@ public class BlockController extends AEBaseTileBlock
return BlockRenderLayer.CUTOUT; return BlockRenderLayer.CUTOUT;
} }
@SuppressWarnings( "deprecation" )
@Override @Override
public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos ) public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
{ {

1
src/main/java/appeng/client/gui/AEBaseGui.java
View file

@ -140,7 +140,6 @@ public abstract class AEBaseGui extends GuiContainer
} }
} }
@SuppressWarnings( "unchecked" )
private List<Slot> getInventorySlots() private List<Slot> getInventorySlots()
{ {
return this.inventorySlots.inventorySlots; return this.inventorySlots.inventorySlots;

1
src/main/java/appeng/client/gui/AEBaseMEGui.java
View file

@ -120,7 +120,6 @@ public abstract class AEBaseMEGui extends AEBaseGui
ITooltipFlag.TooltipFlags tooltipFlag = this.mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL; ITooltipFlag.TooltipFlags tooltipFlag = this.mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL;
if( myStack != null ) if( myStack != null )
{ {
@SuppressWarnings( "unchecked" )
final List<String> currentToolTip = stack.getTooltip( this.mc.player, tooltipFlag ); final List<String> currentToolTip = stack.getTooltip( this.mc.player, tooltipFlag );
if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) ) if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )

8
src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
View file

@ -168,6 +168,8 @@ public class CableBusBakedModel implements IBakedModel
return firstType == AECableType.DENSE_COVERED && secondType == AECableType.DENSE_COVERED; return firstType == AECableType.DENSE_COVERED && secondType == AECableType.DENSE_COVERED;
case DENSE_SMART: case DENSE_SMART:
return firstType == AECableType.DENSE_SMART && secondType == AECableType.DENSE_SMART; return firstType == AECableType.DENSE_SMART && secondType == AECableType.DENSE_SMART;
default:
break;
} }
return true; return true;
@ -208,6 +210,8 @@ public class CableBusBakedModel implements IBakedModel
case DENSE_SMART: case DENSE_SMART:
this.cableBuilder.addStraightDenseSmartConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut ); this.cableBuilder.addStraightDenseSmartConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut );
break; break;
default:
break;
} }
return; // Don't render the other form of connection return; // Don't render the other form of connection
@ -237,6 +241,8 @@ public class CableBusBakedModel implements IBakedModel
case DENSE_SMART: case DENSE_SMART:
// Dense cables do not render connections to parts since none can be attached // Dense cables do not render connections to parts since none can be attached
break; break;
default:
break;
} }
} }
@ -265,6 +271,8 @@ public class CableBusBakedModel implements IBakedModel
case DENSE_SMART: case DENSE_SMART:
this.cableBuilder.addDenseSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut ); this.cableBuilder.addDenseSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut );
break; break;
default:
break;
} }
} }
} }

3
src/main/java/appeng/container/AEBaseContainer.java
View file

@ -1108,7 +1108,8 @@ public abstract class AEBaseContainer extends Container
{ {
try try
{ {
NetworkHandler.instance().sendTo( new PacketInventoryAction( InventoryAction.UPDATE_HAND, 0, AEItemStack.fromItemStack( p.inventory.getItemStack() ) ), NetworkHandler.instance().sendTo(
new PacketInventoryAction( InventoryAction.UPDATE_HAND, 0, AEItemStack.fromItemStack( p.inventory.getItemStack() ) ),
p ); p );
} }
catch( final IOException e ) catch( final IOException e )

4
src/main/java/appeng/core/api/ApiGrid.java
View file

@ -21,7 +21,7 @@ package appeng.core.api;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnectionException;
import appeng.api.networking.IGridBlock; import appeng.api.networking.IGridBlock;
import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridHelper; import appeng.api.networking.IGridHelper;
@ -54,7 +54,7 @@ public class ApiGrid implements IGridHelper
} }
@Override @Override
public IGridConnection createGridConnection( final IGridNode a, final IGridNode b ) throws FailedConnection public IGridConnection createGridConnection( final IGridNode a, final IGridNode b ) throws FailedConnectionException
{ {
Preconditions.checkNotNull( a ); Preconditions.checkNotNull( a );
Preconditions.checkNotNull( b ); Preconditions.checkNotNull( b );

2
src/main/java/appeng/core/api/definitions/ApiItems.java
View file

@ -337,7 +337,7 @@ public final class ApiItems implements IItems
@Override @Override
public IItemDefinition biometricCard() public IItemDefinition biometricCard()
{ {
return this.biometricCard; return this.chargedStaff;
} }
@Override @Override

10
src/main/java/appeng/core/api/definitions/ApiParts.java
View file

@ -21,7 +21,7 @@ package appeng.core.api.definitions;
import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IItemDefinition;
import appeng.api.definitions.IParts; import appeng.api.definitions.IParts;
import appeng.api.exceptions.MissingDefinition; import appeng.api.exceptions.MissingDefinitionException;
import appeng.api.util.AEColor; import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition; import appeng.api.util.AEColoredItemDefinition;
import appeng.bootstrap.FeatureFactory; import appeng.bootstrap.FeatureFactory;
@ -180,28 +180,28 @@ public final class ApiParts implements IParts
@Override @Override
public AEColoredItemDefinition lumenCableSmart() public AEColoredItemDefinition lumenCableSmart()
{ {
throw new MissingDefinition( "Lumen Smart Cable has yet to be implemented." ); throw new MissingDefinitionException( "Lumen Smart Cable has yet to be implemented." );
// return this.lumenCableSmart; // return this.lumenCableSmart;
} }
@Override @Override
public AEColoredItemDefinition lumenCableCovered() public AEColoredItemDefinition lumenCableCovered()
{ {
throw new MissingDefinition( "Lumen Covered Cable has yet to be implemented." ); throw new MissingDefinitionException( "Lumen Covered Cable has yet to be implemented." );
// return this.lumenCableCovered; // return this.lumenCableCovered;
} }
@Override @Override
public AEColoredItemDefinition lumenCableGlass() public AEColoredItemDefinition lumenCableGlass()
{ {
throw new MissingDefinition( "Lumen Glass Cable has yet to be implemented." ); throw new MissingDefinitionException( "Lumen Glass Cable has yet to be implemented." );
// return this.lumenCableGlass; // return this.lumenCableGlass;
} }
@Override @Override
public AEColoredItemDefinition lumenDenseCableSmart() public AEColoredItemDefinition lumenDenseCableSmart()
{ {
throw new MissingDefinition( "Lumen Dense Cable has yet to be implemented." ); throw new MissingDefinitionException( "Lumen Dense Cable has yet to be implemented." );
// return this.lumenCableDense; // return this.lumenCableDense;
} }

6
src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java
View file

@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition; import appeng.api.exceptions.MissingDefinitionException;
import appeng.client.render.effects.ChargedOreFX; import appeng.client.render.effects.ChargedOreFX;
import appeng.core.AEConfig; import appeng.core.AEConfig;
import appeng.core.AppEng; import appeng.core.AppEng;
@ -53,7 +53,7 @@ public final class BlockChargedQuartzOre extends BlockQuartzOre
.materials() .materials()
.certusQuartzCrystalCharged() .certusQuartzCrystalCharged()
.maybeItem() .maybeItem()
.orElseThrow( () -> new MissingDefinition( "Tried to access charged certus quartz crystal, even though they are disabled" ) ); .orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) );
} }
@Override @Override
@ -64,7 +64,7 @@ public final class BlockChargedQuartzOre extends BlockQuartzOre
.materials() .materials()
.certusQuartzCrystalCharged() .certusQuartzCrystalCharged()
.maybeStack( 1 ) .maybeStack( 1 )
.orElseThrow( () -> new MissingDefinition( "Tried to access charged certus quartz crystal, even though they are disabled" ) ) .orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) )
.getItemDamage(); .getItemDamage();
} }

6
src/main/java/appeng/decorative/solid/BlockQuartzOre.java
View file

@ -31,7 +31,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition; import appeng.api.exceptions.MissingDefinitionException;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
@ -98,7 +98,7 @@ public class BlockQuartzOre extends AEBaseBlock
.materials() .materials()
.certusQuartzCrystal() .certusQuartzCrystal()
.maybeItem() .maybeItem()
.orElseThrow( () -> new MissingDefinition( "Tried to access certus quartz crystal, even though they are disabled" ) ); .orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) );
} }
@Override @Override
@ -122,7 +122,7 @@ public class BlockQuartzOre extends AEBaseBlock
.materials() .materials()
.certusQuartzCrystal() .certusQuartzCrystal()
.maybeStack( 1 ) .maybeStack( 1 )
.orElseThrow( () -> new MissingDefinition( "Tried to access certus quartz crystal, even though they are disabled" ) ) .orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) )
.getItemDamage(); .getItemDamage();
} }

1
src/main/java/appeng/entity/AEBaseEntityItem.java
View file

@ -40,7 +40,6 @@ public abstract class AEBaseEntityItem extends EntityItem
super( world, x, y, z, stack ); super( world, x, y, z, stack );
} }
@SuppressWarnings( "unchecked" )
protected List<Entity> getCheckedEntitiesWithinAABBExcludingEntity( final AxisAlignedBB region ) protected List<Entity> getCheckedEntitiesWithinAABBExcludingEntity( final AxisAlignedBB region )
{ {
return this.world.getEntitiesWithinAABBExcludingEntity( this, region ); return this.world.getEntitiesWithinAABBExcludingEntity( this, region );

6
src/main/java/appeng/integration/IntegrationNode.java
View file

@ -22,7 +22,7 @@ package appeng.integration;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModAPIManager; import net.minecraftforge.fml.common.ModAPIManager;
import appeng.api.exceptions.ModNotInstalled; import appeng.api.exceptions.ModNotInstalledException;
import appeng.core.AEConfig; import appeng.core.AEConfig;
import appeng.core.AELog; import appeng.core.AELog;
@ -96,7 +96,7 @@ final class IntegrationNode
} }
else else
{ {
throw new ModNotInstalled( this.modID ); throw new ModNotInstalledException( this.modID );
} }
this.mod.preInit(); this.mod.preInit();
@ -130,7 +130,7 @@ final class IntegrationNode
if( this.getState() == IntegrationStage.FAILED ) if( this.getState() == IntegrationStage.FAILED )
{ {
AELog.info( this.displayName + " - Integration Disabled" ); AELog.info( this.displayName + " - Integration Disabled" );
if( !( this.exception instanceof ModNotInstalled ) ) if( !( this.exception instanceof ModNotInstalledException ) )
{ {
AELog.integration( this.exception ); AELog.integration( this.exception );
} }

6
src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java
View file

@ -29,8 +29,8 @@ import net.minecraft.item.ItemStack;
import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.core.AEConfig; import appeng.core.AEConfig;
import appeng.recipes.game.ShapedRecipe; import appeng.recipes.game.ShapedRecipe;
@ -72,7 +72,7 @@ class ShapedRecipeWrapper implements IShapedCraftingRecipeWrapper
ItemStack[] is = ing.getItemStackSet(); ItemStack[] is = ing.getItemStackSet();
slotList = useSingleItems ? Platform.findPreferred( is ) : Arrays.asList( is ); slotList = useSingleItems ? Platform.findPreferred( is ) : Arrays.asList( is );
} }
catch( final RegistrationError | MissingIngredientError ignored ) catch( final RegistrationException | MissingIngredientException ignored )
{ {
} }
in.add( slotList ); in.add( slotList );

6
src/main/java/appeng/integration/modules/jei/ShapelessRecipeWrapper.java
View file

@ -29,8 +29,8 @@ import net.minecraft.item.ItemStack;
import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper; import mezz.jei.api.recipe.IRecipeWrapper;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.recipes.game.ShapelessRecipe; import appeng.recipes.game.ShapelessRecipe;
@ -60,7 +60,7 @@ class ShapelessRecipeWrapper implements IRecipeWrapper
{ {
inputs.add( Lists.newArrayList( ingredient.getItemStackSet() ) ); inputs.add( Lists.newArrayList( ingredient.getItemStackSet() ) );
} }
catch( RegistrationError | MissingIngredientError registrationError ) catch( RegistrationException | MissingIngredientException registrationError )
{ {
throw new RuntimeException( "Unable to register recipe with JEI" ); throw new RuntimeException( "Unable to register recipe with JEI" );
} }

1
src/main/java/appeng/items/AEBaseItem.java
View file

@ -55,7 +55,6 @@ public abstract class AEBaseItem extends Item
} }
@Override @Override
@SuppressWarnings( "unchecked" )
public final void getSubItems( final CreativeTabs creativeTab, final NonNullList<ItemStack> itemStacks ) public final void getSubItems( final CreativeTabs creativeTab, final NonNullList<ItemStack> itemStacks )
{ {
if( this.isInCreativeTab( creativeTab ) ) if( this.isInCreativeTab( creativeTab ) )

2
src/main/java/appeng/items/contents/PortableCellViewer.java
View file

@ -33,12 +33,12 @@ import appeng.api.implementations.guiobjects.IPortableCell;
import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.implementations.items.IAEItemPowerStorage;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IStorageChannel; import appeng.api.storage.IStorageChannel;
import appeng.api.storage.MEMonitorHandler;
import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.container.interfaces.IInventorySlotAware; import appeng.container.interfaces.IInventorySlotAware;
import appeng.me.helpers.MEMonitorHandler;
import appeng.me.storage.CellInventory; import appeng.me.storage.CellInventory;
import appeng.util.ConfigManager; import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;

4
src/main/java/appeng/items/parts/ItemFacade.java
View file

@ -45,7 +45,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition; import appeng.api.exceptions.MissingDefinitionException;
import appeng.api.parts.IAlphaPassItem; import appeng.api.parts.IAlphaPassItem;
import appeng.api.util.AEPartLocation; import appeng.api.util.AEPartLocation;
import appeng.core.AELog; import appeng.core.AELog;
@ -318,7 +318,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
.items() .items()
.facade() .facade()
.maybeStack( 1 ) .maybeStack( 1 )
.orElseThrow( () -> new MissingDefinition( "Tried to create a facade, while facades are being deactivated." ) ); .orElseThrow( () -> new MissingDefinitionException( "Tried to create a facade, while facades are being deactivated." ) );
// Convert back to a registry name... // Convert back to a registry name...
Item item = Item.REGISTRY.getObjectById( ids[0] ); Item item = Item.REGISTRY.getObjectById( ids[0] );

4
src/main/java/appeng/items/storage/ItemBasicStorageCell.java
View file

@ -39,7 +39,7 @@ import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
import appeng.api.config.IncludeExclude; import appeng.api.config.IncludeExclude;
import appeng.api.exceptions.MissingDefinition; import appeng.api.exceptions.MissingDefinitionException;
import appeng.api.implementations.items.IItemGroup; import appeng.api.implementations.items.IItemGroup;
import appeng.api.implementations.items.IStorageCell; import appeng.api.implementations.items.IStorageCell;
import appeng.api.implementations.items.IUpgradeModule; import appeng.api.implementations.items.IUpgradeModule;
@ -303,7 +303,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe
.materials() .materials()
.emptyStorageCell() .emptyStorageCell()
.maybeStack( 1 ) .maybeStack( 1 )
.orElseThrow( () -> new MissingDefinition( "Tried to use empty storage cells while basic storage cells are defined." ) ); .orElseThrow( () -> new MissingDefinitionException( "Tried to use empty storage cells while basic storage cells are defined." ) );
} }
@Override @Override

4
src/main/java/appeng/me/GridConnection.java
View file

@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
import appeng.api.exceptions.ExistingConnectionException; import appeng.api.exceptions.ExistingConnectionException;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnectionException;
import appeng.api.exceptions.NullNodeConnectionException; import appeng.api.exceptions.NullNodeConnectionException;
import appeng.api.exceptions.SecurityConnectionException; import appeng.api.exceptions.SecurityConnectionException;
import appeng.api.networking.GridFlags; import appeng.api.networking.GridFlags;
@ -54,7 +54,7 @@ public class GridConnection implements IGridConnection, IPathItem
private AEPartLocation fromAtoB; private AEPartLocation fromAtoB;
private GridNode sideB; private GridNode sideB;
public GridConnection( final IGridNode aNode, final IGridNode bNode, final AEPartLocation fromAtoB ) throws FailedConnection public GridConnection( final IGridNode aNode, final IGridNode bNode, final AEPartLocation fromAtoB ) throws FailedConnectionException
{ {
final GridNode a = (GridNode) aNode; final GridNode a = (GridNode) aNode;

6
src/main/java/appeng/me/GridNode.java
View file

@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnectionException;
import appeng.api.networking.GridFlags; import appeng.api.networking.GridFlags;
import appeng.api.networking.GridNotification; import appeng.api.networking.GridNotification;
import appeng.api.networking.IGrid; import appeng.api.networking.IGrid;
@ -457,7 +457,7 @@ public class GridNode implements IGridNode, IPathItem
{ {
new GridConnection( node, this, f.getOpposite() ); new GridConnection( node, this, f.getOpposite() );
} }
catch( final FailedConnection e ) catch( final FailedConnectionException e )
{ {
TickHandler.INSTANCE.addCallable( node.getWorld(), new MachineSecurityBreak( this ) ); TickHandler.INSTANCE.addCallable( node.getWorld(), new MachineSecurityBreak( this ) );
@ -484,7 +484,7 @@ public class GridNode implements IGridNode, IPathItem
{ {
new GridConnection( node, this, f.getOpposite() ); new GridConnection( node, this, f.getOpposite() );
} }
catch( final FailedConnection e ) catch( final FailedConnectionException e )
{ {
TickHandler.INSTANCE.addCallable( node.getWorld(), new MachineSecurityBreak( this ) ); TickHandler.INSTANCE.addCallable( node.getWorld(), new MachineSecurityBreak( this ) );

2
src/main/java/appeng/me/cache/CraftingGridCache.java vendored
View file

@ -379,7 +379,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
} }
@Override @Override
public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel ) public List<IMEInventoryHandler> getCellArray( final IStorageChannel<?> channel )
{ {
final List<IMEInventoryHandler> list = new ArrayList<>( 1 ); final List<IMEInventoryHandler> list = new ArrayList<>( 1 );

2
src/main/java/appeng/me/cache/GridStorageCache.java vendored
View file

@ -276,7 +276,7 @@ public class GridStorageCache implements IStorageGrid
} }
@Override @Override
public void postAlterationOfStoredItems( final IStorageChannel chan, final Iterable<? extends IAEStack> input, final IActionSource src ) public void postAlterationOfStoredItems( final IStorageChannel<?> chan, final Iterable<? extends IAEStack<?>> input, final IActionSource src )
{ {
this.storageMonitors.get( chan ).postChange( true, (Iterable) input, src ); this.storageMonitors.get( chan ).postChange( true, (Iterable) input, src );
} }

4
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
View file

@ -32,7 +32,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.events.LocatableEventAnnounce; import appeng.api.events.LocatableEventAnnounce;
import appeng.api.events.LocatableEventAnnounce.LocatableEvent; import appeng.api.events.LocatableEventAnnounce.LocatableEvent;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnectionException;
import appeng.api.features.ILocatable; import appeng.api.features.ILocatable;
import appeng.api.networking.IGridHost; import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
@ -158,7 +158,7 @@ public class QuantumCluster implements ILocatable, IAECluster
sideA.connection = sideB.connection = new ConnectionWrapper( AEApi.instance().grid().createGridConnection( sideA.getNode(), sideA.connection = sideB.connection = new ConnectionWrapper( AEApi.instance().grid().createGridConnection( sideA.getNode(),
sideB.getNode() ) ); sideB.getNode() ) );
} }
catch( final FailedConnection e ) catch( final FailedConnectionException e )
{ {
// :( // :(
} }

10
src/api/java/appeng/api/storage/MEMonitorHandler.java → src/main/java/appeng/me/helpers/MEMonitorHandler.java
View file

@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
package appeng.api.storage; package appeng.me.helpers;
import java.util.HashMap; import java.util.HashMap;
@ -33,6 +33,10 @@ import com.google.common.collect.ImmutableList;
import appeng.api.config.AccessRestriction; import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable; import appeng.api.config.Actionable;
import appeng.api.networking.security.IActionSource; import appeng.api.networking.security.IActionSource;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.IStorageChannel;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
@ -42,11 +46,9 @@ import appeng.api.storage.data.IItemList;
* listeners. * listeners.
* *
* @param <T> * @param <T>
* @deprecated
* *
* TODO: Needs to be redesigned to solve performance issues. Also should not be part of the API as class. * TODO: Needs to be redesigned to solve performance issues.
*/ */
@Deprecated
public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T> public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
{ {

8
src/main/java/appeng/parts/CableBusContainer.java
View file

@ -48,7 +48,7 @@ import net.minecraft.world.World;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.YesNo; import appeng.api.config.YesNo;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnectionException;
import appeng.api.implementations.parts.IPartCable; import appeng.api.implementations.parts.IPartCable;
import appeng.api.networking.IGridHost; import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
@ -243,7 +243,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
{ {
new GridConnection( cn, sn, AEPartLocation.INTERNAL ); new GridConnection( cn, sn, AEPartLocation.INTERNAL );
} }
catch( final FailedConnection e ) catch( final FailedConnectionException e )
{ {
// ekk! // ekk!
@ -294,7 +294,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
{ {
new GridConnection( cn, sn, AEPartLocation.INTERNAL ); new GridConnection( cn, sn, AEPartLocation.INTERNAL );
} }
catch( final FailedConnection e ) catch( final FailedConnectionException e )
{ {
// ekk! // ekk!
@ -634,7 +634,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
{ {
AEApi.instance().grid().createGridConnection( cn, sn ); AEApi.instance().grid().createGridConnection( cn, sn );
} }
catch( final FailedConnection e ) catch( final FailedConnectionException e )
{ {
// ekk // ekk
} }

4
src/main/java/appeng/parts/misc/PartToggleBus.java
View file

@ -33,7 +33,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnectionException;
import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartCollisionHelper;
@ -205,7 +205,7 @@ public class PartToggleBus extends PartBasicState
{ {
this.connection = AEApi.instance().grid().createGridConnection( this.getProxy().getNode(), this.getOuterProxy().getNode() ); this.connection = AEApi.instance().grid().createGridConnection( this.getProxy().getNode(), this.getOuterProxy().getNode() );
} }
catch( final FailedConnection e ) catch( final FailedConnectionException e )
{ {
// :( // :(
} }

4
src/main/java/appeng/parts/p2p/PartP2PTunnelME.java
View file

@ -31,7 +31,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnectionException;
import appeng.api.networking.GridFlags; import appeng.api.networking.GridFlags;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.IGridTickable;
@ -243,7 +243,7 @@ public class PartP2PTunnelME extends PartP2PTunnel<PartP2PTunnelME> implements I
new TunnelConnection( me, AEApi.instance().grid().createGridConnection( this.outerProxy.getNode(), new TunnelConnection( me, AEApi.instance().grid().createGridConnection( this.outerProxy.getNode(),
me.outerProxy.getNode() ) ) ); me.outerProxy.getNode() ) ) );
} }
catch( final FailedConnection e ) catch( final FailedConnectionException e )
{ {
final TileEntity start = this.getTile(); final TileEntity start = this.getTile();
final TileEntity end = me.getTile(); final TileEntity end = me.getTile();

24
src/main/java/appeng/recipes/GroupIngredient.java
View file

@ -28,9 +28,9 @@ import com.google.common.base.Preconditions;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
@ -43,7 +43,7 @@ public class GroupIngredient implements IIngredient
private ItemStack[] baked; private ItemStack[] baked;
private boolean isInside = false; 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( myName );
Preconditions.checkNotNull( ingredients ); Preconditions.checkNotNull( ingredients );
@ -57,27 +57,27 @@ public class GroupIngredient implements IIngredient
{ {
if( ingredient.isAir() ) if( ingredient.isAir() )
{ {
throw new RecipeError( "Cannot include air in a group." ); throw new RecipeException( "Cannot include air in a group." );
} }
} }
this.ingredients = ingredients; this.ingredients = ingredients;
} }
IIngredient copy( final int qty ) throws RecipeError IIngredient copy( final int qty ) throws RecipeException
{ {
Preconditions.checkState( qty > 0 ); Preconditions.checkState( qty > 0 );
return new GroupIngredient( this.name, this.ingredients, qty ); return new GroupIngredient( this.name, this.ingredients, qty );
} }
@Override @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 @Override
public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError public ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException
{ {
if( this.baked != null ) if( this.baked != null )
{ {
@ -99,7 +99,7 @@ public class GroupIngredient implements IIngredient
{ {
out.addAll( Arrays.asList( i.getItemStackSet() ) ); out.addAll( Arrays.asList( i.getItemStackSet() ) );
} }
catch( final MissingIngredientError mir ) catch( final MissingIngredientException mir )
{ {
// oh well this is a group! // oh well this is a group!
} }
@ -112,7 +112,7 @@ public class GroupIngredient implements IIngredient
if( out.isEmpty() ) 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 ) for( final ItemStack is : out )
@ -154,7 +154,7 @@ public class GroupIngredient implements IIngredient
} }
@Override @Override
public void bake() throws RegistrationError, MissingIngredientError public void bake() throws RegistrationException, MissingIngredientException
{ {
this.baked = null; this.baked = null;
this.baked = this.getItemStackSet(); this.baked = this.getItemStackSet();

30
src/main/java/appeng/recipes/Ingredient.java
View file

@ -31,9 +31,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.api.recipes.ResolverResult; import appeng.api.recipes.ResolverResult;
import appeng.api.recipes.ResolverResultSet; import appeng.api.recipes.ResolverResultSet;
@ -50,7 +50,7 @@ public class Ingredient implements IIngredient
private NBTTagCompound nbt = null; private NBTTagCompound nbt = null;
private ItemStack[] baked; 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( handler );
Preconditions.checkNotNull( input ); Preconditions.checkNotNull( input );
@ -83,7 +83,7 @@ public class Ingredient implements IIngredient
{ {
if( parts.length == 3 ) 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; sel = OreDictionary.WILDCARD_VALUE;
} }
@ -106,7 +106,7 @@ public class Ingredient implements IIngredient
} }
catch( final IllegalArgumentException e ) 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 ) catch( final NumberFormatException e )
{ {
throw new RecipeError( "Invalid Metadata." ); throw new RecipeException( "Invalid Metadata." );
} }
} }
} }
@ -134,7 +134,7 @@ public class Ingredient implements IIngredient
} }
else 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() ); handler.getData().knownItem.add( this.toString() );
@ -147,16 +147,16 @@ public class Ingredient implements IIngredient
} }
@Override @Override
public ItemStack getItemStack() throws RegistrationError, MissingIngredientError public ItemStack getItemStack() throws RegistrationException, MissingIngredientException
{ {
if( this.isAir ) 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" ) ) 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 ); 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 ); * 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 ) 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 @Override
public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError public ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException
{ {
if( this.baked != null ) if( this.baked != null )
{ {
@ -228,7 +228,7 @@ public class Ingredient implements IIngredient
if( set.length == 0 ) 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; return set;
@ -268,7 +268,7 @@ public class Ingredient implements IIngredient
} }
@Override @Override
public void bake() throws RegistrationError, MissingIngredientError public void bake() throws RegistrationException, MissingIngredientException
{ {
this.baked = null; this.baked = null;
this.baked = this.getItemStackSet(); this.baked = this.getItemStackSet();

14
src/main/java/appeng/recipes/IngredientSet.java
View file

@ -27,8 +27,8 @@ import com.google.common.base.Preconditions;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.api.recipes.ResolverResultSet; import appeng.api.recipes.ResolverResultSet;
@ -55,13 +55,13 @@ public class IngredientSet implements IIngredient
} }
@Override @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 @Override
public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError public ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException
{ {
if( this.baked != null ) if( this.baked != null )
{ {
@ -78,7 +78,7 @@ public class IngredientSet implements IIngredient
if( out.isEmpty() ) 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 ) for( final ItemStack is : out )
@ -120,7 +120,7 @@ public class IngredientSet implements IIngredient
} }
@Override @Override
public void bake() throws RegistrationError, MissingIngredientError public void bake() throws RegistrationException, MissingIngredientException
{ {
this.baked = null; this.baked = null;
this.baked = this.getItemStackSet(); this.baked = this.getItemStackSet();

52
src/main/java/appeng/recipes/RecipeHandler.java
View file

@ -47,9 +47,9 @@ import appeng.api.AEApi;
import appeng.api.definitions.IBlocks; import appeng.api.definitions.IBlocks;
import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IItems; import appeng.api.definitions.IItems;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.features.IRecipeHandlerRegistry; import appeng.api.features.IRecipeHandlerRegistry;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
@ -102,7 +102,7 @@ public class RecipeHandler implements IRecipeHandler
return this.getName( is ); return this.getName( is );
} }
} }
catch( final RecipeError ignored ) catch( final RecipeException ignored )
{ {
} }
catch( final Throwable t ) catch( final Throwable t )
@ -114,7 +114,7 @@ public class RecipeHandler implements IRecipeHandler
return i.getNameSpace() + ':' + i.getItemName(); return i.getNameSpace() + ':' + i.getItemName();
} }
private String getName( final ItemStack is ) throws RecipeError private String getName( final ItemStack is ) throws RecipeException
{ {
Preconditions.checkNotNull( is ); Preconditions.checkNotNull( is );
@ -123,7 +123,7 @@ public class RecipeHandler implements IRecipeHandler
if( !id.getResourceDomain().equals( AppEng.MOD_ID ) && !id.getResourceDomain().equals( "minecraft" ) ) 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(); final IDefinitions definitions = AEApi.instance().definitions();
@ -388,7 +388,7 @@ public class RecipeHandler implements IRecipeHandler
processed.put( clz, i + 1 ); processed.put( clz, i + 1 );
} }
} }
catch( final MissingIngredientError e ) catch( final MissingIngredientException e )
{ {
if( this.data.errorOnMissing ) 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() ); AELog.warn( "Unable to register a recipe: " + e.getMessage() );
if( this.data.exceptions ) 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; 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 try
{ {
@ -545,7 +545,7 @@ public class RecipeHandler implements IRecipeHandler
} }
else 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" ) ) else if( operation.equals( "group" ) )
@ -561,7 +561,7 @@ public class RecipeHandler implements IRecipeHandler
} }
else 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" ) ) else if( operation.equals( "ore" ) )
@ -578,7 +578,7 @@ public class RecipeHandler implements IRecipeHandler
} }
else 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 else
@ -598,7 +598,7 @@ public class RecipeHandler implements IRecipeHandler
} }
else 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 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" ) ) ) 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 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" ) ) else if( operation.equals( "erroronmissing" ) )
@ -636,7 +636,7 @@ public class RecipeHandler implements IRecipeHandler
} }
else 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" ) ) else if( operation.equals( "import" ) )
@ -647,16 +647,16 @@ public class RecipeHandler implements IRecipeHandler
} }
else else
{ {
throw new RecipeError( "Import must have exactly 1 input." ); throw new RecipeException( "Import must have exactly 1 input." );
} }
} }
else 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() ); AELog.warn( "Recipe Error '" + e.getMessage() + "' near line:" + line + " in " + file + " with: " + this.tokens.toString() );
if( this.data.exceptions ) if( this.data.exceptions )
@ -672,7 +672,7 @@ public class RecipeHandler implements IRecipeHandler
this.tokens.clear(); 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<>(); final List<List<IIngredient>> out = new LinkedList<>();
List<IIngredient> cList = new LinkedList<>(); List<IIngredient> cList = new LinkedList<>();
@ -686,7 +686,7 @@ public class RecipeHandler implements IRecipeHandler
{ {
if( hasQty ) if( hasQty )
{ {
throw new RecipeError( "Qty found with no item." ); throw new RecipeException( "Qty found with no item." );
} }
if( !cList.isEmpty() ) if( !cList.isEmpty() )
{ {
@ -700,7 +700,7 @@ public class RecipeHandler implements IRecipeHandler
{ {
if( hasQty ) if( hasQty )
{ {
throw new RecipeError( "Qty found with no item." ); throw new RecipeException( "Qty found with no item." );
} }
hasQty = true; hasQty = true;
qty = Integer.parseInt( v ); qty = Integer.parseInt( v );
@ -728,7 +728,7 @@ public class RecipeHandler implements IRecipeHandler
return out; 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 ); final GroupIngredient gi = this.data.groups.get( v );

4
src/main/java/appeng/recipes/game/IRecipeBakeable.java
View file

@ -19,10 +19,10 @@
package appeng.recipes.game; package appeng.recipes.game;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
public interface IRecipeBakeable public interface IRecipeBakeable
{ {
void bake() throws RegistrationError; void bake() throws RegistrationException;
} }

12
src/main/java/appeng/recipes/game/ShapedRecipe.java
View file

@ -31,8 +31,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
@ -228,11 +228,11 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn
matched = matched || this.checkItemEquals( item, slot ); matched = matched || this.checkItemEquals( item, slot );
} }
} }
catch( final RegistrationError e ) catch( final RegistrationException e )
{ {
// :P // :P
} }
catch( final MissingIngredientError e ) catch( final MissingIngredientException e )
{ {
// :P // :P
} }
@ -309,7 +309,7 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn
} }
@Override @Override
public void bake() throws RegistrationError public void bake() throws RegistrationException
{ {
try try
{ {
@ -322,7 +322,7 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn
} }
} }
} }
catch( final MissingIngredientError err ) catch( final MissingIngredientException err )
{ {
this.disable = true; this.disable = true;
} }

12
src/main/java/appeng/recipes/game/ShapelessRecipe.java
View file

@ -29,8 +29,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
@ -100,11 +100,11 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr
match = match || this.checkItemEquals( item, slot ); match = match || this.checkItemEquals( item, slot );
} }
} }
catch( final RegistrationError e ) catch( final RegistrationException e )
{ {
// :P // :P
} }
catch( final MissingIngredientError e ) catch( final MissingIngredientException e )
{ {
// :P // :P
} }
@ -164,7 +164,7 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr
} }
@Override @Override
public void bake() throws RegistrationError public void bake() throws RegistrationException
{ {
try try
{ {
@ -177,7 +177,7 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr
} }
} }
} }
catch( final MissingIngredientError e ) catch( final MissingIngredientException e )
{ {
this.disable = true; this.disable = true;
} }

14
src/main/java/appeng/recipes/handlers/Crusher.java
View file

@ -23,9 +23,9 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.core.AELog; import appeng.core.AELog;
@ -42,7 +42,7 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output; private IIngredient[] pro_output;
@Override @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 ) if( input.size() == 1 && output.size() == 1 )
{ {
@ -54,11 +54,11 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
return; 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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
final IRC rc = Integrations.rc(); final IRC rc = Integrations.rc();
for( final ItemStack is : this.pro_input.getItemStackSet() ) for( final ItemStack is : this.pro_input.getItemStackSet() )
@ -81,7 +81,7 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
} }
@Override @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 ); return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
} }

14
src/main/java/appeng/recipes/handlers/Grind.java
View file

@ -24,9 +24,9 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.features.IGrinderRecipe; import appeng.api.features.IGrinderRecipe;
import appeng.api.features.IGrinderRecipeBuilder; import appeng.api.features.IGrinderRecipeBuilder;
import appeng.api.features.IGrinderRegistry; import appeng.api.features.IGrinderRegistry;
@ -43,7 +43,7 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output; private IIngredient[] pro_output;
@Override @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 ) if( input.size() == 1 && output.size() == 1 )
{ {
@ -55,11 +55,11 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
return; 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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
for( final ItemStack is : this.pro_input.getItemStackSet() ) for( final ItemStack is : this.pro_input.getItemStackSet() )
{ {
@ -81,7 +81,7 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
} }
@Override @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 ); return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
} }

14
src/main/java/appeng/recipes/handlers/HCCrusher.java
View file

@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.event.FMLInterModComms;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.core.AELog; import appeng.core.AELog;
@ -42,7 +42,7 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output; private IIngredient[] pro_output;
@Override @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 ) if( input.size() == 1 && output.size() == 1 )
{ {
@ -54,11 +54,11 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
return; 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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
for( final ItemStack beginStack : this.pro_input.getItemStackSet() ) for( final ItemStack beginStack : this.pro_input.getItemStackSet() )
{ {
@ -94,7 +94,7 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
} }
@Override @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 ); return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
} }

6
src/main/java/appeng/recipes/handlers/IWebsiteSerializer.java
View file

@ -21,8 +21,8 @@ package appeng.recipes.handlers;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.recipes.RecipeHandler; import appeng.recipes.RecipeHandler;
@ -31,5 +31,5 @@ public interface IWebsiteSerializer
String getPattern( RecipeHandler han ); String getPattern( RecipeHandler han );
boolean canCraft( ItemStack output ) throws RegistrationError, MissingIngredientError; boolean canCraft( ItemStack output ) throws RegistrationException, MissingIngredientException;
} }

6
src/main/java/appeng/recipes/handlers/Inscribe.java
View file

@ -26,8 +26,8 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.features.IInscriberRecipeBuilder; import appeng.api.features.IInscriberRecipeBuilder;
import appeng.api.features.InscriberProcessType; import appeng.api.features.InscriberProcessType;
@ -43,7 +43,7 @@ import appeng.api.features.InscriberProcessType;
public final class Inscribe extends InscriberProcess public final class Inscribe extends InscriberProcess
{ {
@Override @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
if( this.getImprintable() == null ) if( this.getImprintable() == null )
{ {

14
src/main/java/appeng/recipes/handlers/InscriberProcess.java
View file

@ -25,9 +25,9 @@ import javax.annotation.Nullable;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.recipes.RecipeHandler; import appeng.recipes.RecipeHandler;
@ -57,7 +57,7 @@ public abstract class InscriberProcess implements ICraftHandler, IWebsiteSeriali
private IIngredient output; private IIngredient output;
@Override @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 ) if( output.size() == 1 && output.get( 0 ).size() == 1 )
{ {
@ -76,17 +76,17 @@ public abstract class InscriberProcess implements ICraftHandler, IWebsiteSeriali
} }
else 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 else
{ {
throw new RecipeError( "Inscriber recipes must produce a single output." ); throw new RecipeException( "Inscriber recipes must produce a single output." );
} }
} }
@Override @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 ); return this.output != null && Platform.itemComparisons().isSameItem( this.output.getItemStack(), reqOutput );
} }

14
src/main/java/appeng/recipes/handlers/Macerator.java
View file

@ -23,9 +23,9 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.core.AELog; import appeng.core.AELog;
@ -42,7 +42,7 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output; private IIngredient[] pro_output;
@Override @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 ) if( input.size() == 1 && output.size() == 1 )
{ {
@ -54,11 +54,11 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
return; 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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
IIC2 ic2 = Integrations.ic2(); IIC2 ic2 = Integrations.ic2();
for( final ItemStack is : this.pro_input.getItemStackSet() ) for( final ItemStack is : this.pro_input.getItemStackSet() )
@ -81,7 +81,7 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
} }
@Override @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 ); return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
} }

14
src/main/java/appeng/recipes/handlers/MekCrusher.java
View file

@ -23,9 +23,9 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.core.AELog; import appeng.core.AELog;
@ -42,7 +42,7 @@ public class MekCrusher implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output; private IIngredient[] pro_output;
@Override @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 ) 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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
IMekanism mekanism = Integrations.mekanism(); IMekanism mekanism = Integrations.mekanism();
for( final ItemStack is : this.pro_input.getItemStackSet() ) for( final ItemStack is : this.pro_input.getItemStackSet() )
@ -82,7 +82,7 @@ public class MekCrusher implements ICraftHandler, IWebsiteSerializer
} }
@Override @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 ); return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
} }

14
src/main/java/appeng/recipes/handlers/MekEnrichment.java
View file

@ -23,9 +23,9 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.core.AELog; import appeng.core.AELog;
@ -42,7 +42,7 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output; private IIngredient[] pro_output;
@Override @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 ) if( input.size() == 1 && output.size() == 1 )
{ {
@ -54,11 +54,11 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
return; 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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
IMekanism mekanism = Integrations.mekanism(); IMekanism mekanism = Integrations.mekanism();
for( final ItemStack is : this.pro_input.getItemStackSet() ) for( final ItemStack is : this.pro_input.getItemStackSet() )
@ -81,7 +81,7 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
} }
@Override @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 ); return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
} }

10
src/main/java/appeng/recipes/handlers/OreRegistration.java
View file

@ -24,9 +24,9 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
@ -44,13 +44,13 @@ public class OreRegistration implements ICraftHandler
} }
@Override @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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
for( final IIngredient i : this.inputs ) for( final IIngredient i : this.inputs )
{ {

6
src/main/java/appeng/recipes/handlers/Press.java
View file

@ -26,8 +26,8 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.features.IInscriberRecipe; import appeng.api.features.IInscriberRecipe;
import appeng.api.features.IInscriberRecipeBuilder; import appeng.api.features.IInscriberRecipeBuilder;
import appeng.api.features.InscriberProcessType; import appeng.api.features.InscriberProcessType;
@ -44,7 +44,7 @@ import appeng.api.features.InscriberProcessType;
public final class Press extends InscriberProcess public final class Press extends InscriberProcess
{ {
@Override @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
if( this.getImprintable() == null ) if( this.getImprintable() == null )
{ {

14
src/main/java/appeng/recipes/handlers/Pulverizer.java
View file

@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.event.FMLInterModComms;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.recipes.RecipeHandler; import appeng.recipes.RecipeHandler;
@ -41,7 +41,7 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
private IIngredient[] pro_output; private IIngredient[] pro_output;
@Override @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 ) if( input.size() == 1 && output.size() == 1 )
{ {
@ -53,11 +53,11 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
return; 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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
final NBTTagCompound toSend = new NBTTagCompound(); final NBTTagCompound toSend = new NBTTagCompound();
toSend.setInteger( "energy", 800 ); toSend.setInteger( "energy", 800 );
@ -80,7 +80,7 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
} }
@Override @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 ); return Platform.itemComparisons().isSameItem( this.pro_output[0].getItemStack(), output );
} }

22
src/main/java/appeng/recipes/handlers/Shaped.java
View file

@ -24,9 +24,9 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.core.AELog; import appeng.core.AELog;
@ -43,7 +43,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
private int cols; private int cols;
@Override @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 ) if( output.size() == 1 && output.get( 0 ).size() == 1 )
{ {
@ -57,7 +57,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
{ {
if( anInput.size() != this.cols ) 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 else
{ {
throw new RecipeError( "Crafting recipes must have 1-3 columns." ); throw new RecipeException( "Crafting recipes must have 1-3 columns." );
} }
} }
else else
{ {
throw new RecipeError( "shaped crafting recipes must have 1-3 rows." ); throw new RecipeException( "shaped crafting recipes must have 1-3 rows." );
} }
} }
else else
{ {
throw new RecipeError( "Crafting must produce a single output." ); throw new RecipeException( "Crafting must produce a single output." );
} }
} }
@Override @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
char first = 'A'; char first = 'A';
final List<Object> args = new ArrayList<>(); final List<Object> args = new ArrayList<>();
@ -117,7 +117,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
catch( final Throwable e ) catch( final Throwable e )
{ {
AELog.debug( 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 @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++ ) for( int y = 0; y < this.rows; y++ )
{ {

18
src/main/java/appeng/recipes/handlers/Shapeless.java
View file

@ -24,9 +24,9 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.core.AELog; import appeng.core.AELog;
@ -41,7 +41,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
private IIngredient output; private IIngredient output;
@Override @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 ) if( output.size() == 1 && output.get( 0 ).size() == 1 )
{ {
@ -52,17 +52,17 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
} }
else else
{ {
throw new RecipeError( "Shapeless crafting recipes cannot have rows." ); throw new RecipeException( "Shapeless crafting recipes cannot have rows." );
} }
} }
else else
{ {
throw new RecipeError( "Crafting must produce a single output." ); throw new RecipeException( "Crafting must produce a single output." );
} }
} }
@Override @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
final List<Object> args = new ArrayList<>(); final List<Object> args = new ArrayList<>();
for( final IIngredient i : this.inputs ) for( final IIngredient i : this.inputs )
@ -81,7 +81,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
catch( final Throwable e ) catch( final Throwable e )
{ {
AELog.debug( 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 @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 ) for( final IIngredient i : this.inputs )

18
src/main/java/appeng/recipes/handlers/Smelt.java
View file

@ -25,9 +25,9 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.MissingIngredientException;
import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RecipeException;
import appeng.api.exceptions.RegistrationError; import appeng.api.exceptions.RegistrationException;
import appeng.api.recipes.ICraftHandler; import appeng.api.recipes.ICraftHandler;
import appeng.api.recipes.IIngredient; import appeng.api.recipes.IIngredient;
import appeng.recipes.RecipeHandler; import appeng.recipes.RecipeHandler;
@ -41,7 +41,7 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer
private IIngredient out; private IIngredient out;
@Override @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 ) if( input.size() == 1 && output.size() == 1 )
{ {
@ -54,20 +54,20 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer
return; 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 @Override
public void register() throws RegistrationError, MissingIngredientError public void register() throws RegistrationException, MissingIngredientException
{ {
if( this.in.getItemStack().getItem() == Items.AIR ) 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 ) 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 ); GameRegistry.addSmelting( this.in.getItemStack(), this.out.getItemStack(), 0 );
@ -80,7 +80,7 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer
} }
@Override @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 ); return Platform.itemComparisons().isSameItem( this.out.getItemStack(), reqOutput );
} }

2
src/main/java/appeng/tile/misc/TileSecurityStation.java
View file

@ -59,7 +59,6 @@ import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IStorageChannel; import appeng.api.storage.IStorageChannel;
import appeng.api.storage.ITerminalHost; import appeng.api.storage.ITerminalHost;
import appeng.api.storage.MEMonitorHandler;
import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAEStack;
@ -70,6 +69,7 @@ import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.helpers.PlayerSecurityWrapper; import appeng.helpers.PlayerSecurityWrapper;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.me.helpers.MEMonitorHandler;
import appeng.me.storage.SecurityStationInventory; import appeng.me.storage.SecurityStationInventory;
import appeng.tile.grid.AENetworkTile; import appeng.tile.grid.AENetworkTile;
import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.AppEngInternalInventory;

2
src/main/java/appeng/tile/storage/TileChest.java
View file

@ -78,7 +78,6 @@ import appeng.api.storage.IStorageChannel;
import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.IStorageMonitorableAccessor; import appeng.api.storage.IStorageMonitorableAccessor;
import appeng.api.storage.ITerminalHost; import appeng.api.storage.ITerminalHost;
import appeng.api.storage.MEMonitorHandler;
import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.channels.IFluidStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEFluidStack;
@ -89,6 +88,7 @@ import appeng.api.util.IConfigManager;
import appeng.capabilities.Capabilities; import appeng.capabilities.Capabilities;
import appeng.helpers.IPriorityHost; import appeng.helpers.IPriorityHost;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.me.helpers.MEMonitorHandler;
import appeng.me.helpers.MachineSource; import appeng.me.helpers.MachineSource;
import appeng.me.storage.MEInventoryHandler; import appeng.me.storage.MEInventoryHandler;
import appeng.tile.grid.AENetworkPowerTile; import appeng.tile.grid.AENetworkPowerTile;

3
src/main/java/appeng/util/inv/ItemSlot.java
View file

@ -48,7 +48,8 @@ public class ItemSlot
public IAEItemStack getAEItemStack() public IAEItemStack getAEItemStack()
{ {
return this.aeItemStack == null ? ( this.itemStack.isEmpty() ? null : ( this.aeItemStack = AEItemStack.fromItemStack( this.itemStack ) ) ) : this.aeItemStack; return this.aeItemStack == null ? ( this.itemStack
.isEmpty() ? null : ( this.aeItemStack = AEItemStack.fromItemStack( this.itemStack ) ) ) : this.aeItemStack;
} }
void setAEItemStack( final IAEItemStack is ) void setAEItemStack( final IAEItemStack is )