Filter control button (if present) overlaps fuzzy control

Oredictionary card disables other filter slots
Fixed too long GUI text

Author: repo-alt

src/main/java/appeng/client/gui/implementations/GuiStorageBus.java

@@ -61,7 +61,7 @@ protected void addButtons()
 		this.rwMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.ACCESS, AccessRestriction.READ_WRITE );
 		this.storageFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY );
 		this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
-		this.oreFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 108, Settings.ACTIONS, ActionItems.ORE_FILTER);
+		this.oreFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 88, Settings.ACTIONS, ActionItems.ORE_FILTER);
 
 		this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) );
 

src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java

@@ -81,7 +81,7 @@ protected void addButtons()
 		this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 28, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
 		this.craftMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.CRAFT_ONLY, YesNo.NO );
 		this.schedulingMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 68, Settings.SCHEDULING_MODE, SchedulingMode.DEFAULT );
-		this.oreFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 88, Settings.ACTIONS, ActionItems.ORE_FILTER);
+		this.oreFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 28, Settings.ACTIONS, ActionItems.ORE_FILTER);
 
 		this.buttonList.add( this.craftMode );
 		this.buttonList.add( this.redstoneMode );
@@ -142,7 +142,7 @@ protected void handleButtonVisibility()
 		}
 		if( this.fuzzyMode != null )
 		{
-			this.fuzzyMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.FUZZY ) > 0 );
+			this.fuzzyMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.FUZZY ) > 0 && this.bc.getInstalledUpgrades( Upgrades.ORE_FILTER ) == 0);
 		}
 		if( this.craftMode != null )
 		{

src/main/java/appeng/container/implementations/ContainerStorageBus.java

@@ -72,14 +72,8 @@ protected void setupConfig()
 		{
 			for( int x = 0; x < 9; x++ )
 			{
-				if( y < 2 )
-				{
-					this.addSlotToContainer( new SlotFakeTypeOnly( config, y * 9 + x, xo + x * 18, yo + y * 18 ) );
-				}
-				else
-				{
-					this.addSlotToContainer( new OptionalSlotFakeTypeOnly( config, this, y * 9 + x, xo, yo, x, y, y - 2 ) );
-				}
+//				this.addSlotToContainer( new SlotFakeTypeOnly( config, y * 9 + x, xo + x * 18, yo + y * 18 ) );
+				this.addSlotToContainer( new OptionalSlotFakeTypeOnly( config, this, y * 9 + x, xo, yo, x, y, y ) );
 			}
 		}
 
@@ -121,9 +115,12 @@ public void detectAndSendChanges()
 	@Override
 	public boolean isSlotEnabled( final int idx )
 	{
+		if (this.getUpgradeable().getInstalledUpgrades(Upgrades.ORE_FILTER) > 0)
+			return false;
+
 		final int upgrades = this.getUpgradeable().getInstalledUpgrades( Upgrades.CAPACITY );
 
-		return upgrades > idx;
+		return upgrades > (idx-2);
 	}
 
 	public void clear()

src/main/java/appeng/container/implementations/ContainerUpgradeable.java

@@ -127,8 +127,7 @@ protected void setupConfig()
 		final IInventory inv = this.getUpgradeable().getInventoryByName( "config" );
 		final int y = 40;
 		final int x = 80;
-		this.addSlotToContainer( new SlotFakeTypeOnly( inv, 0, x, y ) );
-
+		this.addSlotToContainer( new OptionalSlotFakeTypeOnly( inv, this, 0, x, y, 0, 0, 0 ) );
 		if( this.supportCapacity() )
 		{
 			this.addSlotToContainer( new OptionalSlotFakeTypeOnly( inv, this, 1, x, y, -1, 0, 1 ) );
@@ -248,6 +247,12 @@ protected void standardDetectAndSendChanges()
 	@Override
 	public boolean isSlotEnabled( final int idx )
 	{
+		if (this.getUpgradeable().getInstalledUpgrades( Upgrades.ORE_FILTER ) > 0)
+			return false;
+
+		if (idx == 0)
+			return true;
+
 		final int upgrades = this.getUpgradeable().getInstalledUpgrades( Upgrades.CAPACITY );
 
 		if( idx == 1 && upgrades > 0 )

src/main/java/appeng/core/Registration.java

@@ -629,7 +629,7 @@ void postInit( final FMLPostInitializationEvent event )
 		Upgrades.FUZZY.registerItem( parts.formationPlane(), 1 );
 		Upgrades.INVERTER.registerItem( parts.formationPlane(), 1 );
 		Upgrades.CAPACITY.registerItem( parts.formationPlane(), 5 );
-		Upgrades.ORE_FILTER.registerItem( parts.formationPlane(), 1 );
+		//Upgrades.ORE_FILTER.registerItem( parts.formationPlane(), 1 );
 
 		// Matter Cannon
 		Upgrades.FUZZY.registerItem( items.massCannon(), 1 );

src/main/resources/assets/appliedenergistics2/lang/en_US.lang

@@ -234,7 +234,7 @@ gui.appliedenergistics2.Fuzzy=Fuzzy
 gui.appliedenergistics2.SmallFontCraft=Craft
 gui.appliedenergistics2.LargeFontCraft=+
 gui.appliedenergistics2.Renamer=Custom Name: (Enter to set)
-gui.appliedenergistics2.OreFilterLabel=Ore dictionary filter (may use regex)
+gui.appliedenergistics2.OreFilterLabel=Ore dictionary filter
 gui.appliedenergistics2.Nothing=Nothing
 
 # GUI Tooltips
@@ -330,7 +330,7 @@ gui.tooltips.appliedenergistics2.SchedulingModeRandom=Export items in random mod
 gui.tooltips.appliedenergistics2.ItemsStored=Items Stored: %s
 gui.tooltips.appliedenergistics2.ItemsRequestable=Items Requestable: %s
 gui.tooltips.appliedenergistics2.P2PFrequency=Frequency: %s
-gui.tooltips.appliedenergistics2.OreFilterHint=Filter using oredictionary names
+gui.tooltips.appliedenergistics2.OreFilterHint=Filter items using ore dictionary names
 gui.tooltips.appliedenergistics2.OreFilter=Oredictioary filter
 
 # Units