Added Crafting/Stored/Both setting to ItemRepo
This commit is contained in:
@@ -369,6 +369,12 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
|
|||||||
return configSrc.getSetting( Settings.SORT_DIRECTION );
|
return configSrc.getSetting( Settings.SORT_DIRECTION );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Enum getSortDisplay()
|
||||||
|
{
|
||||||
|
return configSrc.getSetting( Settings.VIEW_MODE );
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateSetting(IConfigManager manager, Enum settingName, Enum newValue)
|
public void updateSetting(IConfigManager manager, Enum settingName, Enum newValue)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11;
|
|||||||
import appeng.api.config.Settings;
|
import appeng.api.config.Settings;
|
||||||
import appeng.api.config.SortDir;
|
import appeng.api.config.SortDir;
|
||||||
import appeng.api.config.SortOrder;
|
import appeng.api.config.SortOrder;
|
||||||
|
import appeng.api.config.ViewItems;
|
||||||
import appeng.api.implementations.guiobjects.INetworkTool;
|
import appeng.api.implementations.guiobjects.INetworkTool;
|
||||||
import appeng.api.storage.data.IAEItemStack;
|
import appeng.api.storage.data.IAEItemStack;
|
||||||
import appeng.client.gui.AEBaseGui;
|
import appeng.client.gui.AEBaseGui;
|
||||||
@@ -285,4 +286,10 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
|
|||||||
{
|
{
|
||||||
return SortDir.ASCENDING;
|
return SortDir.ASCENDING;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Enum getSortDisplay()
|
||||||
|
{
|
||||||
|
return ViewItems.ALL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,24 @@
|
|||||||
package appeng.client.gui.widgets;
|
package appeng.client.gui.widgets;
|
||||||
|
|
||||||
|
import appeng.api.config.SortDir;
|
||||||
|
import appeng.api.config.ViewItems;
|
||||||
|
|
||||||
public interface ISortSource
|
public interface ISortSource
|
||||||
{
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Sor
|
||||||
|
*/
|
||||||
Enum getSortBy();
|
Enum getSortBy();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return {@link SortDir}
|
||||||
|
*/
|
||||||
Enum getSortDir();
|
Enum getSortDir();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return {@link ViewItems}
|
||||||
|
*/
|
||||||
|
Enum getSortDisplay();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import appeng.api.config.SearchBoxMode;
|
|||||||
import appeng.api.config.Settings;
|
import appeng.api.config.Settings;
|
||||||
import appeng.api.config.SortOrder;
|
import appeng.api.config.SortOrder;
|
||||||
import appeng.api.config.Upgrades;
|
import appeng.api.config.Upgrades;
|
||||||
|
import appeng.api.config.ViewItems;
|
||||||
import appeng.api.config.YesNo;
|
import appeng.api.config.YesNo;
|
||||||
import appeng.api.implementations.items.IUpgradeModule;
|
import appeng.api.implementations.items.IUpgradeModule;
|
||||||
import appeng.api.storage.data.IAEItemStack;
|
import appeng.api.storage.data.IAEItemStack;
|
||||||
@@ -189,6 +190,7 @@ public class ItemRepo
|
|||||||
view.ensureCapacity( list.size() );
|
view.ensureCapacity( list.size() );
|
||||||
dsp.ensureCapacity( list.size() );
|
dsp.ensureCapacity( list.size() );
|
||||||
|
|
||||||
|
Enum vmode = sortSrc.getSortDisplay();
|
||||||
Enum mode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
|
Enum mode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
|
||||||
if ( mode == SearchBoxMode.NEI_AUTOSEARCH || mode == SearchBoxMode.NEI_MANUAL_SEARCH )
|
if ( mode == SearchBoxMode.NEI_AUTOSEARCH || mode == SearchBoxMode.NEI_MANUAL_SEARCH )
|
||||||
updateNEI( searchString );
|
updateNEI( searchString );
|
||||||
@@ -222,6 +224,18 @@ public class ItemRepo
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( vmode == ViewItems.CRAFTABLE && !is.isCraftable() )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if ( vmode == ViewItems.CRAFTABLE )
|
||||||
|
{
|
||||||
|
is = is.copy();
|
||||||
|
is.setStackSize( 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( vmode == ViewItems.STORED && is.getStackSize() == 0 )
|
||||||
|
continue;
|
||||||
|
|
||||||
String dspName = Platform.getItemDisplayName( is );
|
String dspName = Platform.getItemDisplayName( is );
|
||||||
notDone = true;
|
notDone = true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user