tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fixed configuration tabs not rendering properly

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-24 18:09:31 -04:00
parent 3cb4562461
commit 6c70dc100b
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/mekanism/client/gui/GuiSideConfiguration.java
View file

@ -1,6 +1,8 @@
package mekanism.client.gui; package mekanism.client.gui;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
@ -38,6 +40,8 @@ public class GuiSideConfiguration extends GuiMekanism
public ISideConfiguration configurable; public ISideConfiguration configurable;
public TransmissionType currentType; public TransmissionType currentType;
public List<GuiConfigTypeTab> configTabs = new ArrayList<GuiConfigTypeTab>();
public GuiSideConfiguration(EntityPlayer player, ISideConfiguration tile) public GuiSideConfiguration(EntityPlayer player, ISideConfiguration tile)
{ {
@ -49,7 +53,10 @@ public class GuiSideConfiguration extends GuiMekanism
for(TransmissionType type : configurable.getConfig().transmissions) for(TransmissionType type : configurable.getConfig().transmissions)
{ {
guiElements.add(new GuiConfigTypeTab(this, (TileEntity)configurable, type, MekanismUtils.getResource(ResourceType.GUI, "GuiConfiguration.png"))); GuiConfigTypeTab tab = new GuiConfigTypeTab(this, (TileEntity)configurable, type, MekanismUtils.getResource(ResourceType.GUI, "GuiConfiguration.png"));
guiElements.add(tab);
configTabs.add(tab);
} }
currentType = getTopTransmission(); currentType = getTopTransmission();
@ -73,22 +80,17 @@ public class GuiSideConfiguration extends GuiMekanism
{ {
int rendered = 0; int rendered = 0;
for(GuiElement element : guiElements) for(GuiConfigTypeTab tab : configTabs)
{ {
if(element instanceof GuiConfigTypeTab) tab.visible = currentType != tab.transmission;
if(tab.visible)
{ {
GuiConfigTypeTab tab = (GuiConfigTypeTab)element; tab.left = rendered >= 0 && rendered <= 2;
tab.setY(2+((rendered%3)*(26+2)));
tab.visible = currentType != tab.transmission;
if(tab.visible)
{
tab.left = rendered >= 0 && rendered <= 2;
tab.setY(2+((rendered%3)*(26+2)));
}
rendered++;
} }
rendered++;
} }
} }

5
src/main/java/mekanism/common/tile/component/TileComponentConfig.java
View file

@ -43,7 +43,10 @@ public class TileComponentConfig implements ITileComponent
public void addSupported(TransmissionType type) public void addSupported(TransmissionType type)
{ {
transmissions.add(type); if(!transmissions.contains(type))
{
transmissions.add(type);
}
sideOutputs.put(type.ordinal(), new ArrayList<SideData>()); sideOutputs.put(type.ordinal(), new ArrayList<SideData>());
ejecting.put(type.ordinal(), false); ejecting.put(type.ordinal(), false);