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

Refactored StorageChannel enum into an interface (#3138)

Browse Source 
This replaces the static enum with a more dynamic interface providing
factory methods for handling network storage.
This commit is contained in:
yueh
2017-10-08 17:59:30 +02:00
committed by GitHub
parent 8ad8ce68b5
commit 6e81f698c0
115 changed files with 1255 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/Api.java
+10 -25
View File
@@ -20,20 +20,14 @@ package appeng.core;
import appeng.api.IAppEngApi;
import appeng.api.exceptions.FailedConnection;
import appeng.api.features.IRegistryContainer;
import appeng.api.networking.IGridBlock;
import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridNode;
import appeng.api.networking.IGridHelper;
import appeng.api.storage.IStorageHelper;
import appeng.api.util.AEPartLocation;
import appeng.core.api.ApiGrid;
import appeng.core.api.ApiPart;
import appeng.core.api.ApiStorage;
import appeng.core.features.registries.PartModels;
import appeng.core.features.registries.RegistryContainer;
import appeng.me.GridConnection;
import appeng.me.GridNode;
import appeng.util.Platform;
public final class Api implements IAppEngApi
@@ -45,11 +39,13 @@ public final class Api implements IAppEngApi
// private MovableTileRegistry MovableRegistry = new MovableTileRegistry();
private final IRegistryContainer registryContainer;
private final IStorageHelper storageHelper;
private final IGridHelper networkHelper;
private final ApiDefinitions definitions;
private Api()
{
this.storageHelper = new ApiStorage();
this.networkHelper = new ApiGrid();
this.registryContainer = new RegistryContainer();
this.partHelper = new ApiPart();
this.definitions = new ApiDefinitions( (PartModels) this.registryContainer.partModels() );
@@ -72,6 +68,12 @@ public final class Api implements IAppEngApi
return this.storageHelper;
}
@Override
public IGridHelper grid()
{
return this.networkHelper;
}
@Override
public ApiPart partHelper()
{
@@ -83,21 +85,4 @@ public final class Api implements IAppEngApi
{
return this.definitions;
}
@Override
public IGridNode createGridNode( final IGridBlock blk )
{
if( Platform.isClient() )
{
throw new IllegalStateException( "Grid features for " + blk + " are server side only." );
}
return new GridNode( blk );
}
@Override
public IGridConnection createGridConnection( final IGridNode a, final IGridNode b ) throws FailedConnection
{
return new GridConnection( a, b, AEPartLocation.INTERNAL );
}
}
src/main/java/appeng/core/api/ApiGrid.java
+65
View File
@@ -0,0 +1,65 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.core.api;
import com.google.common.base.Preconditions;
import appeng.api.exceptions.FailedConnection;
import appeng.api.networking.IGridBlock;
import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridHelper;
import appeng.api.networking.IGridNode;
import appeng.api.util.AEPartLocation;
import appeng.me.GridConnection;
import appeng.me.GridNode;
import appeng.util.Platform;
/**
* @author yueh
* @version rv5
* @since rv5
*/
public class ApiGrid implements IGridHelper
{
@Override
public IGridNode createGridNode( final IGridBlock blk )
{
Preconditions.checkNotNull( blk );
if( Platform.isClient() )
{
throw new IllegalStateException( "Grid features for " + blk + " are server side only." );
}
return new GridNode( blk );
}
@Override
public IGridConnection createGridConnection( final IGridNode a, final IGridNode b ) throws FailedConnection
{
Preconditions.checkNotNull( a );
Preconditions.checkNotNull( b );
return new GridConnection( a, b, AEPartLocation.INTERNAL );
}
}
src/main/java/appeng/core/api/ApiStorage.java
+151 -41
View File
@@ -20,6 +20,12 @@ package appeng.core.api;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import com.google.common.base.Preconditions;
import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.MutableClassToInstanceMap;
import io.netty.buffer.ByteBuf;
@@ -32,9 +38,13 @@ import appeng.api.networking.crafting.ICraftingRequester;
import appeng.api.networking.energy.IEnergySource;
import appeng.api.networking.security.IActionSource;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IStorageChannel;
import appeng.api.storage.IStorageHelper;
import appeng.api.storage.channels.IFluidStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.crafting.CraftingLink;
import appeng.util.Platform;
@@ -47,57 +57,157 @@ import appeng.util.item.ItemList;
public class ApiStorage implements IStorageHelper
{
private final ClassToInstanceMap<IStorageChannel<?>> channels;
public ApiStorage()
{
this.channels = MutableClassToInstanceMap.create();
this.registerStorageChannel( IItemStorageChannel.class, new ItemStorageChannel() );
this.registerStorageChannel( IFluidStorageChannel.class, new FluidStorageChannel() );
}
@Override
public <T extends IAEStack<T>, C extends IStorageChannel<T>> void registerStorageChannel( Class<C> channel, C factory )
{
Preconditions.checkNotNull( channel );
Preconditions.checkNotNull( factory );
Preconditions.checkArgument( channel.isInstance( factory ) );
Preconditions.checkArgument( !this.channels.containsKey( channel ) );
this.channels.putInstance( channel, factory );
}
@Override
public <T extends IAEStack<T>, C extends IStorageChannel<T>> C getStorageChannel( Class<C> channel )
{
Preconditions.checkNotNull( channel );
final C type = this.channels.getInstance( channel );
Preconditions.checkNotNull( type );
return type;
}
@Override
public Collection<IStorageChannel<? extends IAEStack<?>>> storageChannels()
{
return Collections.unmodifiableCollection( this.channels.values() );
}
@Override
public ICraftingLink loadCraftingLink( final NBTTagCompound data, final ICraftingRequester req )
{
Preconditions.checkNotNull( data );
Preconditions.checkNotNull( req );
return new CraftingLink( data, req );
}
@Override
public IAEItemStack createItemStack( final ItemStack is )
private static final class ItemStorageChannel implements IItemStorageChannel
{
return AEItemStack.create( is );
@Override
public IItemList<IAEItemStack> createList()
{
return new ItemList();
}
@Override
public IAEItemStack createStack( Object input )
{
Preconditions.checkNotNull( input );
if( input instanceof ItemStack )
{
return AEItemStack.fromItemStack( (ItemStack) input );
}
return null;
}
@Override
public IAEItemStack readFromPacket( ByteBuf input ) throws IOException
{
Preconditions.checkNotNull( input );
return AEItemStack.fromPacket( input );
}
@Override
public IAEItemStack poweredExtraction( IEnergySource energy, IMEInventory<IAEItemStack> cell, IAEItemStack request, IActionSource src )
{
Preconditions.checkNotNull( energy );
Preconditions.checkNotNull( cell );
Preconditions.checkNotNull( request );
Preconditions.checkNotNull( src );
return Platform.poweredExtraction( energy, cell, request, src );
}
@Override
public IAEItemStack poweredInsert( IEnergySource energy, IMEInventory<IAEItemStack> cell, IAEItemStack input, IActionSource src )
{
Preconditions.checkNotNull( energy );
Preconditions.checkNotNull( cell );
Preconditions.checkNotNull( input );
Preconditions.checkNotNull( src );
return Platform.poweredInsert( energy, cell, input, src );
}
}
@Override
public IAEFluidStack createFluidStack( final FluidStack is )
private static final class FluidStorageChannel implements IFluidStorageChannel
{
return AEFluidStack.create( is );
@Override
public IItemList<IAEFluidStack> createList()
{
return new FluidList();
}
@Override
public IAEFluidStack createStack( Object input )
{
Preconditions.checkNotNull( input );
if( input instanceof FluidStack )
{
return AEFluidStack.fromFluidStack( (FluidStack) input );
}
return null;
}
@Override
public IAEFluidStack readFromPacket( ByteBuf input ) throws IOException
{
Preconditions.checkNotNull( input );
return AEFluidStack.fromPacket( input );
}
@Override
public IAEFluidStack poweredExtraction( IEnergySource energy, IMEInventory<IAEFluidStack> cell, IAEFluidStack request, IActionSource src )
{
Preconditions.checkNotNull( energy );
Preconditions.checkNotNull( cell );
Preconditions.checkNotNull( request );
Preconditions.checkNotNull( src );
return null;
}
@Override
public IAEFluidStack poweredInsert( IEnergySource energy, IMEInventory<IAEFluidStack> cell, IAEFluidStack input, IActionSource src )
{
Preconditions.checkNotNull( energy );
Preconditions.checkNotNull( cell );
Preconditions.checkNotNull( input );
Preconditions.checkNotNull( src );
return input;
}
}
@Override
public IItemList<IAEItemStack> createItemList()
{
return new ItemList();
}
@Override
public IItemList<IAEFluidStack> createFluidList()
{
return new FluidList();
}
@Override
public IAEItemStack readItemFromPacket( final ByteBuf input ) throws IOException
{
return AEItemStack.loadItemStackFromPacket( input );
}
@Override
public IAEFluidStack readFluidFromPacket( final ByteBuf input ) throws IOException
{
return AEFluidStack.loadFluidStackFromPacket( input );
}
@Override
public IAEItemStack poweredExtraction( final IEnergySource energy, final IMEInventory<IAEItemStack> cell, final IAEItemStack request, final IActionSource src )
{
return Platform.poweredExtraction( energy, cell, request, src );
}
@Override
public IAEItemStack poweredInsert( final IEnergySource energy, final IMEInventory<IAEItemStack> cell, final IAEItemStack input, final IActionSource src )
{
return Platform.poweredInsert( energy, cell, input, src );
}
}
src/main/java/appeng/core/features/registries/cell/BasicCellHandler.java
+6 -4
View File
@@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import appeng.api.AEApi;
import appeng.api.implementations.tiles.IChestOrDrive;
import appeng.api.storage.ICellHandler;
import appeng.api.storage.ICellInventory;
@@ -30,7 +31,8 @@ import appeng.api.storage.ICellInventoryHandler;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.ISaveProvider;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.IStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.util.AEPartLocation;
import appeng.core.sync.GuiBridge;
import appeng.me.storage.CellInventory;
@@ -48,9 +50,9 @@ public class BasicCellHandler implements ICellHandler
}
@Override
public IMEInventoryHandler getCellInventory( final ItemStack is, final ISaveProvider container, final StorageChannel channel )
public IMEInventoryHandler getCellInventory( final ItemStack is, final ISaveProvider container, final IStorageChannel channel )
{
if( channel == StorageChannel.ITEMS )
if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
{
return CellInventory.getCell( is, container );
}
@@ -58,7 +60,7 @@ public class BasicCellHandler implements ICellHandler
}
@Override
public void openChestGui( final EntityPlayer player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final StorageChannel chan )
public void openChestGui( final EntityPlayer player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final IStorageChannel chan )
{
Platform.openGUI( player, (TileEntity) chest, AEPartLocation.fromFacing( chest.getUp() ), GuiBridge.GUI_ME );
}
src/main/java/appeng/core/features/registries/cell/CellRegistry.java
+2 -2
View File
@@ -28,7 +28,7 @@ import appeng.api.storage.ICellHandler;
import appeng.api.storage.ICellRegistry;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.ISaveProvider;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.IStorageChannel;
public class CellRegistry implements ICellRegistry
@@ -85,7 +85,7 @@ public class CellRegistry implements ICellRegistry
}
@Override
public IMEInventoryHandler getCellInventory( final ItemStack is, final ISaveProvider container, final StorageChannel chan )
public IMEInventoryHandler getCellInventory( final ItemStack is, final ISaveProvider container, final IStorageChannel chan )
{
if( is.isEmpty() )
{
src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java
+7 -4
View File
@@ -23,12 +23,14 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import appeng.api.AEApi;
import appeng.api.implementations.tiles.IChestOrDrive;
import appeng.api.storage.ICellHandler;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.ISaveProvider;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.IStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.util.AEPartLocation;
import appeng.core.sync.GuiBridge;
import appeng.items.storage.ItemCreativeStorageCell;
@@ -46,9 +48,10 @@ public class CreativeCellHandler implements ICellHandler
}
@Override
public IMEInventoryHandler getCellInventory( final ItemStack is, final ISaveProvider container, final StorageChannel channel )
public IMEInventoryHandler getCellInventory( final ItemStack is, final ISaveProvider container, final IStorageChannel channel )
{
if( channel == StorageChannel.ITEMS && !is.isEmpty() && is.getItem() instanceof ItemCreativeStorageCell )
if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) && !is.isEmpty() && is
.getItem() instanceof ItemCreativeStorageCell )
{
return CreativeCellInventory.getCell( is );
}
@@ -56,7 +59,7 @@ public class CreativeCellHandler implements ICellHandler
}
@Override
public void openChestGui( final EntityPlayer player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final StorageChannel chan )
public void openChestGui( final EntityPlayer player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final IStorageChannel chan )
{
Platform.openGUI( player, (TileEntity) chest, AEPartLocation.fromFacing( chest.getUp() ), GuiBridge.GUI_ME );
}
src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class PacketAssemblerAnimation extends AppEngPacket
this.y = stream.readInt();
this.z = stream.readInt();
this.rate = stream.readByte();
this.is = AEItemStack.loadItemStackFromPacket( stream );
this.is = AEItemStack.fromPacket( stream );
}
// api
src/main/java/appeng/core/sync/packets/PacketInventoryAction.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class PacketInventoryAction extends AppEngPacket
final boolean hasItem = stream.readBoolean();
if( hasItem )
{
this.slotItem = AEItemStack.loadItemStackFromPacket( stream );
this.slotItem = AEItemStack.fromPacket( stream );
}
else
{
src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java
+5 -3
View File
@@ -36,6 +36,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.SecurityPermissions;
import appeng.api.networking.IGrid;
@@ -44,6 +45,7 @@ import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.networking.security.ISecurityGrid;
import appeng.api.networking.storage.IStorageGrid;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
@@ -135,7 +137,7 @@ public class PacketJEIRecipe extends AppEngPacket
if( inv != null && this.recipe != null && security != null )
{
final IMEMonitor<IAEItemStack> storage = inv.getItemInventory();
final IMEMonitor<IAEItemStack> storage = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
final IPartitionList<IAEItemStack> filter = ItemViewCell.createFilter( cct.getViewCells() );
for( int x = 0; x < craftMatrix.getSlots(); x++ )
@@ -151,7 +153,7 @@ public class PacketJEIRecipe extends AppEngPacket
// put away old item
if( newItem != currentItem && security.hasPermission( player, SecurityPermissions.INJECT ) )
{
final IAEItemStack in = AEItemStack.create( currentItem );
final IAEItemStack in = AEItemStack.fromItemStack( currentItem );
final IAEItemStack out = cct.useRealItems() ? Platform.poweredInsert( energy, storage, in, cct.getActionSource() ) : null;
if( out != null )
{
@@ -169,7 +171,7 @@ public class PacketJEIRecipe extends AppEngPacket
// for each variant
for( int y = 0; y < this.recipe[x].length && currentItem.isEmpty(); y++ )
{
final IAEItemStack request = AEItemStack.create( this.recipe[x][y] );
final IAEItemStack request = AEItemStack.fromItemStack( this.recipe[x][y] );
if( request != null )
{
// try ae
src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
while( uncompressed.readableBytes() > 0 )
{
this.list.add( AEItemStack.loadItemStackFromPacket( uncompressed ) );
this.list.add( AEItemStack.fromPacket( uncompressed ) );
}
this.empty = this.list.isEmpty();
src/main/java/appeng/core/sync/packets/PacketPatternSlot.java
+3 -2
View File
@@ -29,6 +29,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.container.implementations.ContainerPatternTerm;
import appeng.core.sync.AppEngPacket;
@@ -65,7 +66,7 @@ public class PacketPatternSlot extends AppEngPacket
if( hasItem )
{
return AEItemStack.loadItemStackFromPacket( stream );
return AEItemStack.fromPacket( stream );
}
return null;
@@ -87,7 +88,7 @@ public class PacketPatternSlot extends AppEngPacket
this.writeItem( slotItem, data );
for( int x = 0; x < 9; x++ )
{
this.pattern[x] = AEApi.instance().storage().createItemStack( pat.getStackInSlot( x ) );
this.pattern[x] = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( pat.getStackInSlot( x ) );
this.writeItem( this.pattern[x], data );
}