diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index 978b753b19..68758588e2 100644 --- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java +++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -710,7 +710,7 @@ public class FMLClientHandler implements IFMLSidedHandler public void showInGameModOptions(GuiIngameMenu guiIngameMenu) { - showGuiScreen(new GuiIngameModOptions(guiIngameMenu)); + showGuiScreen(new GuiModList(guiIngameMenu)); } public IModGuiFactory getGuiFactoryFor(ModContainer selectedMod) diff --git a/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java b/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java deleted file mode 100644 index fbee967cd9..0000000000 --- a/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.minecraftforge.fml.client; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.I18n; - -public class GuiIngameModOptions extends GuiScreen -{ - private final GuiScreen parentScreen; - protected String title = "Mod Options"; - private GuiModOptionList optionList; - - public GuiIngameModOptions(GuiScreen parentScreen) - { - this.parentScreen = parentScreen; - } - - @SuppressWarnings("unchecked") - @Override - public void initGui() - { - this.optionList=new GuiModOptionList(this); - //this.optionList.registerScrollButtons(this.buttonList, 7, 8); - this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 6 + 168, I18n.format("gui.done", new Object[0]))); - } - - @Override - protected void actionPerformed(GuiButton button) - { - if (button.enabled) - { - if (button.id == 200) - { - this.mc.gameSettings.saveOptions(); - this.mc.displayGuiScreen(this.parentScreen); - } - } - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) - { - // force a non-transparent background - this.drawDefaultBackground(); - this.optionList.drawScreen(mouseX, mouseY, partialTicks); - this.drawCenteredString(this.fontRendererObj, this.title, this.width / 2, 15, 0xFFFFFF); - super.drawScreen(mouseX, mouseY, partialTicks); - } - - FontRenderer getFontRenderer() { - return fontRendererObj; - } - -} diff --git a/src/main/java/net/minecraftforge/fml/client/GuiModList.java b/src/main/java/net/minecraftforge/fml/client/GuiModList.java index 9974788755..618464cbf8 100644 --- a/src/main/java/net/minecraftforge/fml/client/GuiModList.java +++ b/src/main/java/net/minecraftforge/fml/client/GuiModList.java @@ -578,7 +578,6 @@ public class GuiModList extends GuiScreen k += GuiModList.this.fontRendererObj.getStringWidth(((ChatComponentText)part).getChatComponentText_TextValue()); if (k >= x) { - System.out.println(part); GuiModList.this.func_175276_a(part); break; } diff --git a/src/main/java/net/minecraftforge/fml/client/GuiModOptionList.java b/src/main/java/net/minecraftforge/fml/client/GuiModOptionList.java deleted file mode 100644 index 21e3536f06..0000000000 --- a/src/main/java/net/minecraftforge/fml/client/GuiModOptionList.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.minecraftforge.fml.client; - -import net.minecraft.client.renderer.Tessellator; - -public class GuiModOptionList extends GuiScrollingList { - - private GuiIngameModOptions parent; - - public GuiModOptionList(GuiIngameModOptions parent) - { - super(parent.mc, 150, parent.height, 32, parent.height - 65 + 4, 10, 35, parent.width, parent.height); - this.parent = parent; - } - - @Override - protected int getSize() - { - return 1; - } - - @Override - protected void elementClicked(int index, boolean doubleClick) - { - // TODO Auto-generated method stub - - } - - @Override - protected boolean isSelected(int index) - { - return false; - } - - @Override - protected void drawBackground() - { - } - - @Override - protected void drawSlot(int slotIdx, int entryRight, int slotTop, int slotBuffer, Tessellator tess) - { - this.parent.getFontRenderer().drawString(this.parent.getFontRenderer().trimStringToWidth("Test 1", listWidth - 10), this.left + 3 , slotTop + 2, 0xFF2222); - this.parent.getFontRenderer().drawString(this.parent.getFontRenderer().trimStringToWidth("TEST 2", listWidth - 10), this.left + 3 , slotTop + 12, 0xFF2222); - this.parent.getFontRenderer().drawString(this.parent.getFontRenderer().trimStringToWidth("DISABLED", listWidth - 10), this.left + 3 , slotTop + 22, 0xFF2222); - } - -} diff --git a/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java b/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java index d7f374a1bc..d3dc65ee37 100644 --- a/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java +++ b/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; @@ -95,15 +96,27 @@ public abstract class GuiScrollingList protected abstract void drawBackground(); + /** + * Draw anything special on the screen. GL_SCISSOR is enabled for anything that + * is rendered outside of the view box. Do not mess with SCISSOR unless you support this. + */ protected abstract void drawSlot(int slotIdx, int entryRight, int slotTop, int slotBuffer, Tessellator tess); @Deprecated protected void func_27260_a(int entryRight, int relativeY, Tessellator tess) {} + /** + * Draw anything special on the screen. GL_SCISSOR is enabled for anything that + * is rendered outside of the view box. Do not mess with SCISSOR unless you support this. + */ protected void drawHeader(int entryRight, int relativeY, Tessellator tess) { func_27260_a(entryRight, relativeY, tess); } @Deprecated protected void func_27255_a(int x, int y) {} protected void clickHeader(int x, int y) { func_27255_a(x, y); } @Deprecated protected void func_27257_b(int mouseX, int mouseY) {} + /** + * Draw anything special on the screen. GL_SCISSOR is enabled for anything that + * is rendered outside of the view box. Do not mess with SCISSOR unless you support this. + */ protected void drawScreen(int mouseX, int mouseY) { func_27257_b(mouseX, mouseY); } public int func_27256_c(int x, int y) @@ -251,6 +264,13 @@ public abstract class GuiScrollingList Tessellator tess = Tessellator.getInstance(); WorldRenderer worldr = tess.getWorldRenderer(); + ScaledResolution res = new ScaledResolution(client, client.displayWidth, client.displayHeight); + double scaleW = client.displayWidth / res.getScaledWidth_double(); + double scaleH = client.displayHeight / res.getScaledHeight_double(); + GL11.glEnable(GL11.GL_SCISSOR_TEST); + GL11.glScissor((int)(left * scaleW), (int)(client.displayHeight - (bottom * scaleH)), + (int)(listWidth * scaleW), (int)(viewHeight * scaleH)); + if (this.client.theWorld != null) { this.drawGradientRect(this.left, this.top, this.right, this.bottom, 0xC0101010, 0xD0101010); @@ -310,34 +330,6 @@ public abstract class GuiScrollingList } GlStateManager.disableDepth(); - if (this.client.theWorld == null) - { - this.overlayBackground(0, this.top, 255, 255); - this.overlayBackground(this.bottom, this.listHeight, 255, 255); - } - - // Render the entire background over everything but our view - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.disableAlpha(); - GlStateManager.shadeModel(GL11.GL_SMOOTH); - GlStateManager.disableTexture2D(); - worldr.startDrawingQuads(); - worldr.setColorRGBA_I(0, 0); - worldr.addVertexWithUV(this.left, this.top + border, 0.0D, 0.0D, 1.0D); - worldr.addVertexWithUV(this.right, this.top + border, 0.0D, 1.0D, 1.0D); - worldr.setColorRGBA_I(0, 255); - worldr.addVertexWithUV(this.right, this.top, 0.0D, 1.0D, 0.0D); - worldr.addVertexWithUV(this.left, this.top, 0.0D, 0.0D, 0.0D); - tess.draw(); - worldr.startDrawingQuads(); - worldr.setColorRGBA_I(0, 255); - worldr.addVertexWithUV(this.left, this.bottom, 0.0D, 0.0D, 1.0D); - worldr.addVertexWithUV(this.right, this.bottom, 0.0D, 1.0D, 1.0D); - worldr.setColorRGBA_I(0, 0); - worldr.addVertexWithUV(this.right, this.bottom - border, 0.0D, 1.0D, 0.0D); - worldr.addVertexWithUV(this.left, this.bottom - border, 0.0D, 0.0D, 0.0D); - tess.draw(); int extraHeight = this.getContentHeight() - viewHeight - border; if (extraHeight > 0) @@ -355,6 +347,7 @@ public abstract class GuiScrollingList barTop = this.top; } + GlStateManager.disableTexture2D(); worldr.startDrawingQuads(); worldr.setColorRGBA_I(0, 255); worldr.addVertexWithUV(scrollBarLeft, this.bottom, 0.0D, 0.0D, 1.0D); @@ -383,24 +376,7 @@ public abstract class GuiScrollingList GlStateManager.shadeModel(GL11.GL_FLAT); GlStateManager.enableAlpha(); GlStateManager.disableBlend(); - } - - private void overlayBackground(int top, int height, int alpha1, int alpah2) - { - Tessellator tess = Tessellator.getInstance(); - WorldRenderer worldr = tess.getWorldRenderer(); - this.client.renderEngine.bindTexture(Gui.optionsBackground); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - float scale = 32.0F; - double startUV = (screenWidth / scale) / screenWidth * (left-0); - worldr.startDrawingQuads(); - worldr.setColorRGBA_I(0x404040, alpah2); - worldr.addVertexWithUV(left, height, 0.0D, startUV, height / scale); - worldr.addVertexWithUV(left+listWidth+8, height, 0.0D, (left+listWidth+8) / scale, height / scale); - worldr.setColorRGBA_I(0x404040, alpha1); - worldr.addVertexWithUV(left+listWidth+8, top, 0.0D, (left+listWidth+8) / scale, top / scale); - worldr.addVertexWithUV(left, top, 0.0D, startUV, top / scale); - tess.draw(); + GL11.glDisable(GL11.GL_SCISSOR_TEST); } protected void drawGradientRect(int left, int top, int right, int bottom, int color1, int color2)