tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Removed registration of layers

This commit is contained in:
thatsIch 2015-06-26 22:50:09 +02:00
parent e21dab14e5
commit 8b921a7b79
6 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/java/appeng/api/parts/IPartHelper.java
View File

@ -33,10 +33,8 @@ import net.minecraft.world.World;
public interface IPartHelper
{
/**
* Register a new layer with the part layer system, this allows you to write
* an in between between tile entities and parts.
* Register a new layer with the part layer system, this allows you to write an in between between tile entities and parts.
*
* AE By Default includes,
*
@ -54,11 +52,9 @@ public interface IPartHelper
*
* 7. IPipeConnection BC Pipe Connections
*
* As long as a valid layer is registered for a interface you can simply
* implement that interface on a part get implement it.
* As long as a valid layer is registered for a interface you can simply implement that interface on a part get implement it.
*
* @return true on success, false on failure, usually a error will be logged
* as well.
* @return true on success, false on failure, usually a error will be logged as well.
*/
boolean registerNewLayer( String string, String layerInterface );
@ -70,11 +66,11 @@ public interface IPartHelper
/**
* use in use item, to try and place a IBusItem
*
* @param is ItemStack of an item which implements {@link IPartItem}
* @param BlockPos pos of part
* @param side side which the part should be on
* @param is ItemStack of an item which implements {@link IPartItem}
* @param pos pos of part
* @param side side which the part should be on
* @param player player placing part
* @param world part in world
* @param world part in world
*
* @return true if placing was successful
*/

39
src/main/java/appeng/core/Registration.java
View File

@ -68,8 +68,6 @@ import appeng.core.localization.GuiText;
import appeng.core.localization.PlayerMessages;
import appeng.core.stats.PlayerStatsRegistration;
import appeng.hooks.TickHandler;
import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType;
import appeng.items.materials.ItemMultiMaterial;
import appeng.me.cache.CraftingGridCache;
import appeng.me.cache.EnergyGridCache;
@ -229,25 +227,26 @@ public final class Registration
final Runnable recipeLoader = new RecipeLoader( this.recipeHandler );
recipeLoader.run();
partHelper.registerNewLayer( "appeng.parts.layers.LayerISidedInventory", "net.minecraft.inventory.ISidedInventory" );
partHelper.registerNewLayer( "appeng.parts.layers.LayerIFluidHandler", "net.minecraftforge.fluids.IFluidHandler" );
partHelper.registerNewLayer( "appeng.parts.layers.LayerITileStorageMonitorable", "appeng.api.implementations.tiles.ITileStorageMonitorable" );
// TODO readd layers
// partHelper.registerNewLayer( "appeng.parts.layers.LayerISidedInventory", "net.minecraft.inventory.ISidedInventory" );
// partHelper.registerNewLayer( "appeng.parts.layers.LayerIFluidHandler", "net.minecraftforge.fluids.IFluidHandler" );
// partHelper.registerNewLayer( "appeng.parts.layers.LayerITileStorageMonitorable", "appeng.api.implementations.tiles.ITileStorageMonitorable" );
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.IC2 ) )
{
partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySink", "ic2.api.energy.tile.IEnergySink" );
partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySource", "ic2.api.energy.tile.IEnergySource" );
}
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.RF ) )
{
partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergyHandler", "cofh.api.energy.IEnergyReceiver" );
}
if ( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) )
{
partHelper.registerNewLayer( "appeng.parts.layers.LayerSidedEnvironment", "li.cil.oc.api.network.SidedEnvironment" );
}
// if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.IC2 ) )
// {
// partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySink", "ic2.api.energy.tile.IEnergySink" );
// partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySource", "ic2.api.energy.tile.IEnergySource" );
// }
//
// if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.RF ) )
// {
// partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergyHandler", "cofh.api.energy.IEnergyReceiver" );
// }
//
// if ( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) )
// {
// partHelper.registerNewLayer( "appeng.parts.layers.LayerSidedEnvironment", "li.cil.oc.api.network.SidedEnvironment" );
// }
FMLCommonHandler.instance().bus().register( TickHandler.INSTANCE );
MinecraftForge.EVENT_BUS.register( TickHandler.INSTANCE );

2
src/main/resources/assets/appliedenergistics2/recipes/port.recipe
View File

@ -140,7 +140,7 @@ shaped=
shaped=
mc:iron_ingot cable mc:iron_ingot,
ae2:BlockQuartzGlass ae2:BlockFluix ae2:BlockQuartzGlass,
ae2:BlockQuartzGlass ae2:fluix ae2:BlockQuartzGlass,
mc:iron_ingot cable mc:iron_ingot
-> ae2:BlockQuartzGrowthAccelerator

6
src/main/resources/assets/appliedenergistics2/recipes/process.recipe
View File

@ -92,7 +92,7 @@ shaped=
shaped=
oredictionary:crystalFluix oredictionary:crystalFluix,
oredictionary:crystalFluix oredictionary:crystalFluix
-> ae2:BlockFluix
-> ae2:fluix
# Pure Storage Blocks
@ -112,7 +112,7 @@ shaped=
ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal,
ae2:ItemMaterial.PurifiedFluixCrystal _ ae2:ItemMaterial.PurifiedFluixCrystal,
ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal
-> ae2:BlockFluix
-> ae2:fluix
@ -142,7 +142,7 @@ shaped=
-> 4 ae2:ItemMaterial.CertusQuartzCrystal
shapeless=
ae2:BlockFluix
ae2:fluix
-> 4 ae2:ItemMaterial.FluixCrystal
# Quantum Pearl

2
src/main/resources/assets/appliedenergistics2/recipes/slabs.recipe
View File

@ -3,7 +3,7 @@ shaped=
-> 6 ae2:ChiseledQuartzSlabBlock
shaped=
ae2:BlockFluix ae2:BlockFluix ae2:BlockFluix
ae2:fluix ae2:fluix ae2:fluix
-> 6 ae2:FluixSlabBlock
shaped=

6
src/main/resources/assets/appliedenergistics2/recipes/stairs.recipe
View File

@ -5,9 +5,9 @@ shaped=
-> 4 ae2:ChiseledQuartzStairBlock
shaped=
ae2:BlockFluix _ _,
ae2:BlockFluix ae2:BlockFluix _,
ae2:BlockFluix ae2:BlockFluix ae2:BlockFluix
ae2:fluix _ _,
ae2:fluix ae2:fluix _,
ae2:fluix ae2:fluix ae2:fluix
-> 4 ae2:FluixStairBlock
shaped=