fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed UI background not being drawn.

Browse Source 
Mezz removed said displayGuiScreenWithoutClose() so said workaround can be removed.
This commit is contained in:
Gunther De Wachter
2017-07-06 08:07:51 +02:00
parent fbcf8c4705
commit d8c5e6a5fa
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseGui.java
+1 -16
View File
@@ -35,11 +35,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Stopwatch; import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import mezz.jei.api.IRecipesGui;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.vertex.VertexBuffer;
import net.minecraftforge.client.event.GuiOpenEvent;
import net.minecraftforge.common.MinecraftForge;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@@ -105,8 +101,6 @@ public abstract class AEBaseGui extends GuiContainer
super( container ); super( container );
this.subGui = switchingGuis; this.subGui = switchingGuis;
switchingGuis = false; switchingGuis = false;
// TODO : Remove when mezz removes displayGuiScreenWithoutClose() in 1.12.
MinecraftForge.EVENT_BUS.register( this );
} }
protected static String join( final Collection<String> toolTip, final String delimiter ) protected static String join( final Collection<String> toolTip, final String delimiter )
@@ -164,6 +158,7 @@ public abstract class AEBaseGui extends GuiContainer
@Override @Override
public void drawScreen( final int mouseX, final int mouseY, final float btn ) public void drawScreen( final int mouseX, final int mouseY, final float btn )
{ {
super.drawDefaultBackground();
super.drawScreen( mouseX, mouseY, btn ); super.drawScreen( mouseX, mouseY, btn );
for( final Object c : this.buttonList ) for( final Object c : this.buttonList )
@@ -587,21 +582,11 @@ public abstract class AEBaseGui extends GuiContainer
return false; return false;
} }
// TODO : Remove when mezz removes displayGuiScreenWithoutClose() in 1.12.
public void onGuiOpenEvent(GuiOpenEvent event) { // Why oh why mezz? (RecipesGui.java, displayGuiScreenWithoutClose()
if(event.getGui() instanceof IRecipesGui)
{
subGui = true;
}
}
@Override @Override
public void onGuiClosed() public void onGuiClosed()
{ {
super.onGuiClosed(); super.onGuiClosed();
this.subGui = true; // in case the gui is reopened later ( i'm looking at you NEI ) this.subGui = true; // in case the gui is reopened later ( i'm looking at you NEI )
// TODO : Remove when mezz removes displayGuiScreenWithoutClose() in 1.12.
MinecraftForge.EVENT_BUS.unregister( this );
} }
protected Slot getSlot( final int mouseX, final int mouseY ) protected Slot getSlot( final int mouseX, final int mouseY )
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
-14
View File
@@ -22,9 +22,6 @@ package appeng.client.gui.implementations;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import mezz.jei.api.IRecipesGui;
import net.minecraftforge.client.event.GuiOpenEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
@@ -383,17 +380,6 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
memoryText = this.searchField.getText(); memoryText = this.searchField.getText();
} }
// TODO : Remove when mezz removes displayGuiScreenWithoutClose() in 1.12.
@Override
@SubscribeEvent
public void onGuiOpenEvent(GuiOpenEvent event) {
super.onGuiOpenEvent(event);
if(event.getGui() instanceof IRecipesGui)
{
memoryText = this.searchField.getText();
}
}
@Override @Override
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{ {