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

Closes #2501: Hide substitution buttons for processing 

Hides the substition button in processing mode to avoid confusion as it is
not usable there as well as not showing it as part of the tooltip.
Further it ensures that patterns are encoded with the setting being
disabled, should we add the support later without breaking existing
setups.
This commit is contained in:
yueh 2016-10-24 11:31:28 +02:00
parent 30a978b614
commit a1ae91af76
3 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java
View File

@ -34,6 +34,7 @@ import appeng.client.gui.widgets.GuiImgButton;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.container.implementations.ContainerPatternTerm;
import appeng.container.slot.AppEngSlot;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketValueConfig;
@ -42,6 +43,9 @@ import appeng.core.sync.packets.PacketValueConfig;
public class GuiPatternTerm extends GuiMEMonitorable
{
private static final String BACKGROUND_CRAFTING_MODE = "guis/pattern.png";
private static final String BACKGROUND_PROCESSING_MODE = "guis/pattern2.png";
private static final String SUBSITUTION_DISABLE = "0";
private static final String SUBSITUTION_ENABLE = "1";
@ -94,8 +98,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
}
catch( final IOException e )
{
// TODO Auto-generated catch block
e.printStackTrace();
AELog.error( e );
}
}
@ -129,26 +132,28 @@ public class GuiPatternTerm extends GuiMEMonitorable
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
if( !this.container.isCraftingMode() )
{
this.tabCraftButton.visible = false;
this.tabProcessButton.visible = true;
}
else
if( this.container.isCraftingMode() )
{
this.tabCraftButton.visible = true;
this.tabProcessButton.visible = false;
}
if( this.container.substitute )
{
this.substitutionsEnabledBtn.visible = true;
this.substitutionsDisabledBtn.visible = false;
if( this.container.substitute )
{
this.substitutionsEnabledBtn.visible = true;
this.substitutionsDisabledBtn.visible = false;
}
else
{
this.substitutionsEnabledBtn.visible = false;
this.substitutionsDisabledBtn.visible = true;
}
}
else
{
this.tabCraftButton.visible = false;
this.tabProcessButton.visible = true;
this.substitutionsEnabledBtn.visible = false;
this.substitutionsDisabledBtn.visible = true;
this.substitutionsDisabledBtn.visible = false;
}
super.drawFG( offsetX, offsetY, mouseX, mouseY );
@ -160,21 +165,17 @@ public class GuiPatternTerm extends GuiMEMonitorable
{
if( this.container.isCraftingMode() )
{
return "guis/pattern.png";
return BACKGROUND_CRAFTING_MODE;
}
return "guis/pattern2.png";
return BACKGROUND_PROCESSING_MODE;
}
@Override
protected void repositionSlot( final AppEngSlot s )
{
if( s.isPlayerSide() )
{
s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
}
else
{
s.yDisplayPosition = s.getY() + this.ySize - 78 - 3;
}
final int offsetPlayerSide = s.isPlayerSide() ? 5 : 3;
s.yDisplayPosition = s.getY() + this.ySize - 78 - offsetPlayerSide;
}
}

2
src/main/java/appeng/helpers/PatternHelper.java
View File

@ -76,7 +76,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
final NBTTagList outTag = encodedValue.getTagList( "out", 10 );
this.isCrafting = encodedValue.getBoolean( "crafting" );
this.canSubstitute = encodedValue.getBoolean( "substitute" );
this.canSubstitute = this.isCrafting && encodedValue.getBoolean( "substitute" );
this.patternItem = is;
this.pattern = AEItemStack.create( is );

9
src/main/java/appeng/items/misc/ItemEncodedPattern.java
View File

@ -142,10 +142,13 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
first = false;
}
final String substitutionLabel = GuiText.Substitute.getLocal() + " ";
final String canSubstitute = substitute ? GuiText.Yes.getLocal() : GuiText.No.getLocal();
if( isCrafting )
{
final String substitutionLabel = GuiText.Substitute.getLocal() + " ";
final String canSubstitute = substitute ? GuiText.Yes.getLocal() : GuiText.No.getLocal();
lines.add( substitutionLabel + canSubstitute );
lines.add( substitutionLabel + canSubstitute );
}
}
@Override