Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void handleMouseInput() throws IOException {

@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
list.drawScreen(mouseX, mouseY, partialTicks);
list.drawScreen(mouseX, mouseY);
GlStateManager.pushMatrix();
GlStateManager.scale(2.0, 2.0, 2.0);
String title = EnumChatFormatting.BOLD + "ViaMCP";
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/thoq/backend/BackendConnector.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
package dev.thoq.backend;

import dev.thoq.Alya;
import net.minecraft.client.Minecraft;

import java.io.IOException;
import java.net.URI;
Expand All @@ -47,6 +48,7 @@ private void sendUserOnline() throws IOException, InterruptedException {
}

public void poll() {
if(!Minecraft.getMinecraft().gameSettings.sense) return;
try {
sendUserOnline();
} catch(final Exception exception) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/minecraft/client/gui/GuiControls.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ protected void keyTyped(char typedChar, int keyCode) throws IOException {
/** Draws the screen and all the components in it. Args : mouseX, mouseY, renderPartialTicks */
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.drawDefaultBackground();
this.keyBindingList.drawScreen(mouseX, mouseY, partialTicks);
this.keyBindingList.drawScreen(mouseX, mouseY);
this.drawCenteredString(this.screenTitle, this.width / 2, 8, 16777215);
boolean flag = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private boolean func_146382_i()
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
this.createFlatWorldListSlotGui.drawScreen(mouseX, mouseY, partialTicks);
this.createFlatWorldListSlotGui.drawScreen(mouseX, mouseY);
this.drawCenteredString(this.fontRendererObj, this.flatWorldTitle, this.width / 2, 8, 16777215);
int i = this.width / 2 - 92 - 16;
this.drawString(this.fontRendererObj, this.field_146394_i, i, 32, 16777215);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1756,7 +1756,7 @@ protected void mouseReleased(int mouseX, int mouseY, int state) {
/** Draws the screen and all the components in it. Args : mouseX, mouseY, renderPartialTicks */
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.drawDefaultBackground();
this.field_175349_r.drawScreen(mouseX, mouseY, partialTicks);
this.field_175349_r.drawScreen(mouseX, mouseY);
this.drawCenteredString(this.field_175341_a, this.width / 2, 2, 16777215);
this.drawCenteredString(this.field_175333_f, this.width / 2, 12, 16777215);
this.drawCenteredString(this.field_175335_g, this.width / 2, 22, 16777215);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/minecraft/client/gui/GuiFlatPresets.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ protected void actionPerformed(GuiButton button) throws IOException {

public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.drawDefaultBackground();
this.field_146435_s.drawScreen(mouseX, mouseY, partialTicks);
this.field_146435_s.drawScreen(mouseX, mouseY);
this.drawCenteredString(this.fontRendererObj, this.presetsTitle, this.width / 2, 8, 16777215);
this.drawString(this.fontRendererObj, this.presetsShare, 50, 30, 10526880);
this.drawString(this.fontRendererObj, this.field_146436_r, 50, 70, 10526880);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/minecraft/client/gui/GuiLanguage.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ protected void actionPerformed(GuiButton button) throws IOException {

/** Draws the screen and all the components in it. Args : mouseX, mouseY, renderPartialTicks */
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.list.drawScreen(mouseX, mouseY, partialTicks);
this.list.drawScreen(mouseX, mouseY);
this.drawCenteredString(
I18n.format("options.language", new Object[0]), this.width / 2, 16, 16777215);
this.drawCenteredString(
Expand Down
271 changes: 256 additions & 15 deletions src/main/java/net/minecraft/client/gui/GuiMainMenu.java

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/java/net/minecraft/client/gui/GuiMultiplayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ protected void keyTyped(char typedChar, int keyCode) throws IOException {
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.hoveringText = null;
this.drawDefaultBackground();
this.serverListSelector.drawScreen(mouseX, mouseY, partialTicks);
this.serverListSelector.drawScreen(mouseX, mouseY);
drawCenteredString(I18n.format("multiplayer.title"), this.width / 2, 20, 16777215);
super.drawScreen(mouseX, mouseY, partialTicks);

Expand Down
22 changes: 7 additions & 15 deletions src/main/java/net/minecraft/client/gui/GuiOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,51 +115,43 @@ public void initGui() {
150,
20,
I18n.format("options.controls", new Object[0])));
this.buttonList.add(
new GuiButton(
102,
this.width / 2 - 155,
this.height / 6 + 96 - 6,
150,
20,
I18n.format("options.language", new Object[0])));
this.buttonList.add(
new GuiButton(
103,
this.width / 2 + 5,
this.width / 2 - 155,
this.height / 6 + 96 - 6,
150,
20,
I18n.format("options.chat.title", new Object[0])));
this.buttonList.add(
new GuiButton(
105,
this.width / 2 - 155,
this.height / 6 + 120 - 6,
this.width / 2 + 5,
this.height / 6 + 96 - 6,
150,
20,
I18n.format("options.resourcepack", new Object[0])));
this.buttonList.add(
new GuiButton(
104,
this.width / 2 + 5,
this.width / 2 - 155,
this.height / 6 + 120 - 6,
150,
20,
I18n.format("options.snooper.view", new Object[0])));
this.buttonList.add(
new GuiButton(
8675309,
this.width / 2 - 155,
this.height / 6 + 144 - 6,
this.width / 2 + 5,
this.height / 6 + 120 - 6,
150,
20,
"Super Secret Settings..."));
this.buttonList.add(
new GuiButton(
200,
this.width / 2 - 100,
this.height / 6 + 168,
this.height / 6 + 168 - 6,
200,
20,
I18n.format("gui.done", new Object[0])));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public GuiResourcePackList(
this.mc = mcIn;
this.field_148204_l = p_i45055_4_;
this.field_148163_i = false;
this.setHasListHeader(true, (int) (font.getFontHeight() * 1.5F));
this.setHasListHeader((int) (font.getFontHeight() * 1.5F));
}

/** Handles drawing a list's header row. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ protected void actionPerformed(GuiButton button) throws IOException {
/** Draws the screen and all the components in it. Args : mouseX, mouseY, renderPartialTicks */
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.drawDefaultBackground();
this.field_175311_g.drawScreen(mouseX, mouseY, partialTicks);
this.field_175311_g.drawScreen(mouseX, mouseY);
this.drawCenteredString(this.field_175315_a, this.width / 2, 8, 16777215);
this.drawString(this.field_175313_s, 50, 30, 10526880);
this.drawString(this.field_175312_t, 50, 70, 10526880);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ protected void mouseReleased(int mouseX, int mouseY, int state) {
/** Draws the screen and all the components in it. Args : mouseX, mouseY, renderPartialTicks */
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
this.drawBackground(0);
this.availableResourcePacksList.drawScreen(mouseX, mouseY, partialTicks);
this.selectedResourcePacksList.drawScreen(mouseX, mouseY, partialTicks);
this.availableResourcePacksList.drawScreen(mouseX, mouseY);
this.selectedResourcePacksList.drawScreen(mouseX, mouseY);
this.drawCenteredString(
I18n.format("resourcePack.title", new Object[0]), this.width / 2, 16, 16777215);
this.drawCenteredString(
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/minecraft/client/gui/GuiSelectWorld.java
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public void confirmClicked(boolean result, int id)

public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.availableWorlds.drawScreen(mouseX, mouseY, partialTicks);
this.availableWorlds.drawScreen(mouseX, mouseY);
this.drawCenteredString(this.fontRendererObj, this.screenTitle, this.width / 2, 20, 16777215);
super.drawScreen(mouseX, mouseY, partialTicks);
}
Expand Down
Loading
Loading