From 1c197c0f204ffeec912eec23ac9db27eaa92a810 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Sun, 15 May 2022 08:18:27 -0300 Subject: [PATCH] Fix incorrect with behavior with interfaces and storage busses while using interfaces with crafting cards --- gradle.properties | 2 +- src/main/java/appeng/helpers/DualityInterface.java | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index a0d4ac0e2..0ee846730 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 extended=extended_life -extendedversion=v0.52.6 +extendedversion=v0.52.7 ######################################################### # Versions # ######################################################### diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 4e005035d..71d00303b 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -104,9 +104,6 @@ import java.util.*; public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost { - @CapabilityInject( Capabilities.class ) - public static Capability STORAGE_MONITORABLE_ACCESSOR = null; - public static final int NUMBER_OF_STORAGE_SLOTS = 9; public static final int NUMBER_OF_CONFIG_SLOTS = 9; 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() ) ) { - IStorageMonitorableAccessor mon = te.getCapability( STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); + IStorageMonitorableAccessor mon = te.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); if( mon != null ) { IStorageMonitorable sm = mon.getInventory( this.mySource ); @@ -1204,7 +1201,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } else { - IStorageMonitorableAccessor mon = te.getCapability( STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); + IStorageMonitorableAccessor mon = te.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); if( mon != null ) { IStorageMonitorable sm = mon.getInventory( this.mySource ); @@ -1365,7 +1362,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } else { - IStorageMonitorableAccessor mon = te.getCapability( STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); + IStorageMonitorableAccessor mon = te.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, s.getOpposite() ); if( mon != null ) { IStorageMonitorable sm = mon.getInventory( this.mySource ); @@ -1709,7 +1706,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn 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" ) @@ -1719,7 +1716,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { return (T) this.storage; } - else if( capabilityClass == STORAGE_MONITORABLE_ACCESSOR ) + else if( capabilityClass == Capabilities.STORAGE_MONITORABLE_ACCESSOR ) { return (T) this.accessor; }