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

Fix incorrect with behavior with interfaces and storage busses

Browse Source 
while using interfaces with crafting cards
This commit is contained in:
PrototypeTrousers
2022-05-15 08:18:27 -03:00
parent 46a1faaca2
commit 1c197c0f20
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -4,7 +4,7 @@ aebuild=7
aegroup=appeng aegroup=appeng
aebasename=appliedenergistics2 aebasename=appliedenergistics2
extended=extended_life extended=extended_life
extendedversion=v0.52.6 extendedversion=v0.52.7
######################################################### #########################################################
# Versions # # Versions #
######################################################### #########################################################
src/main/java/appeng/helpers/DualityInterface.java
+5 -8
View File
@@ -104,9 +104,6 @@ import java.util.*;
public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
{ {
@CapabilityInject( Capabilities.class )
public static Capability<IStorageMonitorableAccessor> STORAGE_MONITORABLE_ACCESSOR = null;
public static final int NUMBER_OF_STORAGE_SLOTS = 9; public static final int NUMBER_OF_STORAGE_SLOTS = 9;
public static final int NUMBER_OF_CONFIG_SLOTS = 9; public static final int NUMBER_OF_CONFIG_SLOTS = 9;
public static final int NUMBER_OF_PATTERN_SLOTS = 36; public static final int NUMBER_OF_PATTERN_SLOTS = 36;
@@ -816,7 +813,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
if( !targetTE.getInterfaceDuality().sameGrid( this.gridProxy.getGrid() ) ) if( !targetTE.getInterfaceDuality().sameGrid( this.gridProxy.getGrid() ) )
{ {
IStorageMonitorableAccessor mon = te.getCapability( STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); IStorageMonitorableAccessor mon = te.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() );
if( mon != null ) if( mon != null )
{ {
IStorageMonitorable sm = mon.getInventory( this.mySource ); IStorageMonitorable sm = mon.getInventory( this.mySource );
@@ -1204,7 +1201,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
} }
else else
{ {
IStorageMonitorableAccessor mon = te.getCapability( STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); IStorageMonitorableAccessor mon = te.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() );
if( mon != null ) if( mon != null )
{ {
IStorageMonitorable sm = mon.getInventory( this.mySource ); IStorageMonitorable sm = mon.getInventory( this.mySource );
@@ -1365,7 +1362,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
} }
else else
{ {
IStorageMonitorableAccessor mon = te.getCapability( STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); IStorageMonitorableAccessor mon = te.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() );
if( mon != null ) if( mon != null )
{ {
IStorageMonitorable sm = mon.getInventory( this.mySource ); IStorageMonitorable sm = mon.getInventory( this.mySource );
@@ -1709,7 +1706,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
public boolean hasCapability( Capability<?> capabilityClass, EnumFacing facing ) public boolean hasCapability( Capability<?> capabilityClass, EnumFacing facing )
{ {
return capabilityClass == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || capabilityClass == STORAGE_MONITORABLE_ACCESSOR; return capabilityClass == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || capabilityClass == Capabilities.STORAGE_MONITORABLE_ACCESSOR;
} }
@SuppressWarnings( "unchecked" ) @SuppressWarnings( "unchecked" )
@@ -1719,7 +1716,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
{ {
return (T) this.storage; return (T) this.storage;
} }
else if( capabilityClass == STORAGE_MONITORABLE_ACCESSOR ) else if( capabilityClass == Capabilities.STORAGE_MONITORABLE_ACCESSOR )
{ {
return (T) this.accessor; return (T) this.accessor;
} }