mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-20 01:12:13 +02:00
Code

[Wurst-Bot] Update to 23w17a

Browse Source
This commit is contained in:
Alexander01998 2023-04-27 09:54:11 +02:00
parent 69c1cc3a14
commit 5910942e0e
61 changed files with 258 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle.properties
View File

@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these at https://fabricmc.net/develop/ and
# https://www.curseforge.com/minecraft/mc-mods/fabric-api
minecraft_version=23w16a
yarn_mappings=23w16a+build.4
minecraft_version=23w17a
yarn_mappings=23w17a+build.4
loader_version=0.14.19
#Fabric api
fabric_version=0.78.1+1.20
fabric_version=0.79.1+1.20
# Mod Properties
mod_version = v7.32-MC23w16a
mod_version = v7.32-MC23w17a
maven_group = net.wurstclient
archives_base_name = Wurst-Client

2
src/main/java/net/wurstclient/WurstClient.java
View File

@ -57,7 +57,7 @@ public enum WurstClient
public static IMinecraftClient IMC;
public static final String VERSION = "7.32";
public static final String MC_VERSION = "23w16a";
public static final String MC_VERSION = "23w17a";
private WurstAnalytics analytics;
private EventManager eventManager;

4
src/main/java/net/wurstclient/ai/PathFinder.java
View File

@ -283,7 +283,7 @@ public class PathFinder
BlockState state = BlockUtils.getState(pos);
Block block = state.getBlock();
return state.method_51366() && !(block instanceof AbstractSignBlock)
return state.blocksMovement() && !(block instanceof AbstractSignBlock)
|| block instanceof LadderBlock
|| jesus && (block == Blocks.WATER || block == Blocks.LAVA);
}
@ -300,7 +300,7 @@ public class PathFinder
// check if solid
BlockState state = BlockUtils.getState(pos);
Block block = state.getBlock();
if(state.method_51366() && !(block instanceof AbstractSignBlock))
if(state.blocksMovement() && !(block instanceof AbstractSignBlock))
return false;
// check if trapped

13
src/main/java/net/wurstclient/altmanager/AltRenderer.java
View File

@ -15,8 +15,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.authlib.GameProfile;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.network.PlayerListEntry;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BufferRenderer;
@ -53,7 +52,7 @@ public final class AltRenderer
RenderSystem.setShaderTexture(0, loadedSkins.get(name));
}
private static void drawTexture(DrawableHelper helper, int x, int y,
private static void drawTexture(DrawContext helper, int x, int y,
float u, float v, int w, int h, int fw, int fh)
{
int x2 = x + w;
@ -65,7 +64,7 @@ public final class AltRenderer
float vPlusHOverFh = (v + h) / fh;
RenderSystem.setShader(GameRenderer::getPositionTexProgram);
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix4f = matrixStack.peek().getPositionMatrix();
BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer();
bufferBuilder.begin(VertexFormat.DrawMode.QUADS,
@ -81,7 +80,7 @@ public final class AltRenderer
BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
}
public static void drawAltFace(DrawableHelper helper, String name, int x,
public static void drawAltFace(DrawContext helper, String name, int x,
int y, int w, int h, boolean selected)
{
try
@ -116,7 +115,7 @@ public final class AltRenderer
}
}
public static void drawAltBody(DrawableHelper helper, String name, int x,
public static void drawAltBody(DrawContext helper, String name, int x,
int y, int width, int height)
{
try
@ -247,7 +246,7 @@ public final class AltRenderer
}
}
public static void drawAltBack(DrawableHelper helper, String name, int x,
public static void drawAltBack(DrawContext helper, String name, int x,
int y, int width, int height)
{
try

7
src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java
View File

@ -27,8 +27,7 @@ import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
@ -343,12 +342,12 @@ public abstract class AltEditorScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();

24
src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java
View File

@ -29,8 +29,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.screen.ConfirmScreen;
import net.minecraft.client.gui.screen.NoticeScreen;
import net.minecraft.client.gui.screen.Screen;
@ -409,13 +409,13 @@ public final class AltManagerScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);
listGui.render(helper, mouseX, mouseY, partialTicks);
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();
@ -473,7 +473,7 @@ public final class AltManagerScreen extends Screen
renderAltTooltip(helper, mouseX, mouseY);
}
private void renderAltTooltip(DrawableHelper helper, int mouseX, int mouseY)
private void renderAltTooltip(DrawContext helper, int mouseX, int mouseY)
{
if(!listGui.isMouseInList(mouseX, mouseY))
return;
@ -515,10 +515,10 @@ public final class AltManagerScreen extends Screen
if(alt.isFavorite())
addTooltip(tooltip, "favorite");
helper.method_51434(textRenderer, tooltip, mouseX, mouseY);
helper.drawTooltip(textRenderer, tooltip, mouseX, mouseY);
}
private void renderButtonTooltip(DrawableHelper helper, int mouseX,
private void renderButtonTooltip(DrawContext helper, int mouseX,
int mouseY)
{
for(Drawable d : ((IScreen)(Object)this).getButtons())
@ -542,7 +542,7 @@ public final class AltManagerScreen extends Screen
else
addTooltip(tooltip, "window_freeze");
helper.method_51434(textRenderer, tooltip, mouseX, mouseY);
helper.drawTooltip(textRenderer, tooltip, mouseX, mouseY);
break;
}
}
@ -637,12 +637,12 @@ public final class AltManagerScreen extends Screen
}
@Override
protected void renderItem(DrawableHelper helper, int id, int x, int y,
protected void renderItem(DrawContext helper, int id, int x, int y,
int var4, int var5, int var6, float partialTicks)
{
Alt alt = list.get(id);
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();
@ -677,15 +677,15 @@ public final class AltManagerScreen extends Screen
isSelectedItem(id));
// name / email
helper.method_51433(client.textRenderer,
helper.drawText(client.textRenderer,
"Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880,
false);
helper.method_51433(client.textRenderer,
helper.drawText(client.textRenderer,
"Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880,
false);
String bottomText = getBottomText(alt);
helper.method_51433(client.textRenderer, bottomText, x + 31, y + 15,
helper.drawText(client.textRenderer, bottomText, x + 31, y + 15,
10526880, false);
}

22
src/main/java/net/wurstclient/clickgui/ClickGui.java
View File

@ -28,7 +28,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -460,7 +460,7 @@ public final class ClickGui
}
}
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
updateColors();
@ -504,9 +504,9 @@ public final class ClickGui
GL11.glDisable(GL11.GL_BLEND);
}
public void renderPopups(DrawableHelper helper, int mouseX, int mouseY)
public void renderPopups(DrawContext helper, int mouseX, int mouseY)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
for(Popup popup : popups)
{
Component owner = popup.getOwner();
@ -527,9 +527,9 @@ public final class ClickGui
}
}
public void renderTooltip(DrawableHelper helper, int mouseX, int mouseY)
public void renderTooltip(DrawContext helper, int mouseX, int mouseY)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();
@ -586,14 +586,14 @@ public final class ClickGui
// text
RenderSystem.setShaderColor(1, 1, 1, 1);
for(int i = 0; i < lines.length; i++)
helper.method_51433(fr, lines[i], xt1 + 2,
helper.drawText(fr, lines[i], xt1 + 2,
yt1 + 2 + i * fr.fontHeight, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
matrixStack.pop();
}
public void renderPinnedWindows(DrawableHelper helper, float partialTicks)
public void renderPinnedWindows(DrawContext helper, float partialTicks)
{
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glEnable(GL11.GL_BLEND);
@ -626,7 +626,7 @@ public final class ClickGui
acColor = clickGui.getAccentColor();
}
private void renderWindow(DrawableHelper helper, Window window, int mouseX,
private void renderWindow(DrawContext helper, Window window, int mouseX,
int mouseY, float partialTicks)
{
int x1 = window.getX();
@ -635,7 +635,7 @@ public final class ClickGui
int y2 = y1 + window.getHeight();
int y3 = y1 + 13;
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();
@ -892,7 +892,7 @@ public final class ClickGui
TextRenderer fr = MC.textRenderer;
String title = fr.trimToWidth(Text.literal(window.getTitle()), x3 - x1)
.getString();
helper.method_51433(fr, title, x1 + 2, y1 + 3, txtColor, false);
helper.drawText(fr, title, x1 + 2, y1 + 3, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
}

10
src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java
View File

@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -70,9 +70,9 @@ public final class ComboBoxPopup<T extends Enum<T>> extends Popup
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY)
public void render(DrawContext helper, int mouseX, int mouseY)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
int x1 = getX();
int x2 = x1 + getWidth();
int y1 = getY();
@ -150,14 +150,14 @@ public final class ComboBoxPopup<T extends Enum<T>> extends Popup
tessellator.draw();
}
private void drawValueName(DrawableHelper helper, int x1, int yi1,
private void drawValueName(DrawContext helper, int x1, int yi1,
Enum<?> value)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
int txtColor = gui.getTxtColor();
RenderSystem.setShaderColor(1, 1, 1, 1);
helper.method_51433(tr, value.toString(), x1 + 2, yi1 + 2, txtColor,
helper.drawText(tr, value.toString(), x1 + 2, yi1 + 2, txtColor,
false);
GL11.glEnable(GL11.GL_BLEND);
}

4
src/main/java/net/wurstclient/clickgui/Component.java
View File

@ -7,7 +7,7 @@
*/
package net.wurstclient.clickgui;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
public abstract class Component
{
@ -23,7 +23,7 @@ public abstract class Component
}
public abstract void render(DrawableHelper helper, int mouseX, int mouseY,
public abstract void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks);
public abstract int getDefaultWidth();

4
src/main/java/net/wurstclient/clickgui/Popup.java
View File

@ -7,7 +7,7 @@
*/
package net.wurstclient.clickgui;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
public abstract class Popup
{
@ -27,7 +27,7 @@ public abstract class Popup
public abstract void handleMouseClick(int mouseX, int mouseY,
int mouseButton);
public abstract void render(DrawableHelper helper, int mouseX, int mouseY);
public abstract void render(DrawContext helper, int mouseX, int mouseY);
public abstract int getDefaultWidth();

10
src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java
View File

@ -14,7 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -57,7 +57,7 @@ public abstract class AbstractListEditButton extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
@ -80,7 +80,7 @@ public abstract class AbstractListEditButton extends Component
boolean hText = hovering && mouseX < x3;
boolean hBox = hovering && mouseX >= x3;
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();
@ -124,8 +124,8 @@ public abstract class AbstractListEditButton extends Component
// setting name
RenderSystem.setShaderColor(1, 1, 1, 1);
TextRenderer tr = MC.textRenderer;
helper.method_51433(tr, getText(), x1, y1 + 2, txtColor, false);
helper.method_51433(tr, buttonText, x3 + 2, y1 + 2, txtColor, false);
helper.drawText(tr, getText(), x1, y1 + 2, txtColor, false);
helper.drawText(tr, buttonText, x3 + 2, y1 + 2, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
}

8
src/main/java/net/wurstclient/clickgui/components/BlockComponent.java
View File

@ -14,7 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.Block;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
@ -62,7 +62,7 @@ public final class BlockComponent extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
@ -86,7 +86,7 @@ public final class BlockComponent extends Component
ItemStack stack = new ItemStack(setting.getBlock());
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();
@ -121,7 +121,7 @@ public final class BlockComponent extends Component
RenderSystem.setShaderColor(1, 1, 1, 1);
TextRenderer tr = WurstClient.MC.textRenderer;
String text = setting.getName() + ":";
helper.method_51433(tr, text, x1, y1 + 2, txtColor, false);
helper.drawText(tr, text, x1, y1 + 2, txtColor, false);
MatrixStack modelViewStack = RenderSystem.getModelViewStack();
modelViewStack.push();

10
src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java
View File

@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -56,10 +56,10 @@ public final class CheckboxComponent extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
int x1 = getX();
int x2 = x1 + getWidth();
int x3 = x1 + 11;
@ -211,7 +211,7 @@ public final class CheckboxComponent extends Component
tessellator.draw();
}
private void drawName(DrawableHelper helper, int x3, int y1)
private void drawName(DrawContext helper, int x3, int y1)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
int txtColor = gui.getTxtColor();
@ -221,7 +221,7 @@ public final class CheckboxComponent extends Component
String name = setting.getName();
int tx = x3 + 2;
int ty = y1 + 2;
helper.method_51433(MC.textRenderer, name, tx, ty, txtColor, false);
helper.drawText(MC.textRenderer, name, tx, ty, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
}

12
src/main/java/net/wurstclient/clickgui/components/ColorComponent.java
View File

@ -14,7 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -56,10 +56,10 @@ public final class ColorComponent extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
int x1 = getX();
int x2 = x1 + getWidth();
int y1 = getY();
@ -157,7 +157,7 @@ public final class ColorComponent extends Component
tessellator.draw();
}
private void drawNameAndValue(DrawableHelper helper, int x1, int x2, int y1)
private void drawNameAndValue(DrawContext helper, int x1, int x2, int y1)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
int txtColor = gui.getTxtColor();
@ -165,11 +165,11 @@ public final class ColorComponent extends Component
RenderSystem.setShaderColor(1, 1, 1, 1);
TextRenderer tr = MC.textRenderer;
helper.method_51433(tr, setting.getName(), x1, y1, txtColor, false);
helper.drawText(tr, setting.getName(), x1, y1, txtColor, false);
String value = ColorUtils.toHex(setting.getColor());
int valueWidth = tr.getWidth(value);
helper.method_51433(tr, value, x2 - valueWidth, y1, txtColor, false);
helper.drawText(tr, value, x2 - valueWidth, y1, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
}

12
src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java
View File

@ -17,7 +17,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -103,10 +103,10 @@ public final class ComboBoxComponent<T extends Enum<T>> extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
int x1 = getX();
int x2 = x1 + getWidth();
int x3 = x2 - 11;
@ -259,7 +259,7 @@ public final class ComboBoxComponent<T extends Enum<T>> extends Component
tessellator.draw();
}
private void drawNameAndValue(DrawableHelper helper, int x1, int x4, int y1)
private void drawNameAndValue(DrawContext helper, int x1, int x4, int y1)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
int txtColor = gui.getTxtColor();
@ -269,8 +269,8 @@ public final class ComboBoxComponent<T extends Enum<T>> extends Component
String name = setting.getName();
String value = "" + setting.getSelected();
helper.method_51433(tr, name, x1, y1 + 2, txtColor, false);
helper.method_51433(tr, value, x4 + 2, y1 + 2, txtColor, false);
helper.drawText(tr, name, x1, y1 + 2, txtColor, false);
helper.drawText(tr, value, x4 + 2, y1 + 2, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
}

10
src/main/java/net/wurstclient/clickgui/components/FeatureButton.java
View File

@ -16,7 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -96,10 +96,10 @@ public final class FeatureButton extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
int x1 = getX();
int x2 = x1 + getWidth();
int x3 = hasSettings ? x2 - 11 : x2;
@ -290,7 +290,7 @@ public final class FeatureButton extends Component
tessellator.draw();
}
private void drawName(DrawableHelper helper, int x1, int x3, int y1)
private void drawName(DrawContext helper, int x1, int x3, int y1)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
int txtColor = gui.getTxtColor();
@ -303,7 +303,7 @@ public final class FeatureButton extends Component
int tx = x1 + (x3 - x1 - nameWidth) / 2;
int ty = y1 + 2;
helper.method_51433(tr, name, tx, ty, txtColor, false);
helper.drawText(tr, name, tx, ty, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
}

10
src/main/java/net/wurstclient/clickgui/components/FileComponent.java
View File

@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -55,7 +55,7 @@ public final class FileComponent extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
@ -81,7 +81,7 @@ public final class FileComponent extends Component
boolean hText = hovering && mouseX < x3;
boolean hBox = hovering && mouseX >= x3;
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();
@ -130,8 +130,8 @@ public final class FileComponent extends Component
// setting name
RenderSystem.setShaderColor(1, 1, 1, 1);
String text = setting.getName() + ": ";
helper.method_51433(tr, text, x1, y1 + 2, txtColor, false);
helper.method_51433(tr, setting.getSelectedFileName(), x3 + 2, y1 + 2,
helper.drawText(tr, text, x1, y1 + 2, txtColor, false);
helper.drawText(tr, setting.getSelectedFileName(), x3 + 2, y1 + 2,
txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
}

7
src/main/java/net/wurstclient/clickgui/components/RadarComponent.java
View File

@ -11,8 +11,7 @@ import org.joml.Matrix4f;
import org.joml.Quaternionf;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
@ -44,7 +43,7 @@ public final class RadarComponent extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
@ -63,7 +62,7 @@ public final class RadarComponent extends Component
&& mouseY < y2 && mouseY >= -scroll
&& mouseY < getParent().getHeight() - 13 - scroll;
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
Tessellator tessellator = RenderSystem.renderThreadTesselator();
BufferBuilder bufferBuilder = tessellator.getBuffer();

12
src/main/java/net/wurstclient/clickgui/components/SliderComponent.java
View File

@ -14,7 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
@ -76,10 +76,10 @@ public final class SliderComponent extends Component
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
int x1 = getX();
int x2 = x1 + getWidth();
int x3 = x1 + 2;
@ -302,7 +302,7 @@ public final class SliderComponent extends Component
tessellator.draw();
}
private void drawNameAndValue(DrawableHelper helper, int x1, int x2, int y1,
private void drawNameAndValue(DrawContext helper, int x1, int x2, int y1,
boolean renderAsDisabled)
{
ClickGui gui = WurstClient.INSTANCE.getGui();
@ -314,8 +314,8 @@ public final class SliderComponent extends Component
String name = setting.getName();
String value = setting.getValueString();
int valueWidth = tr.getWidth(value);
helper.method_51433(tr, name, x1, y1 + 2, txtColor, false);
helper.method_51433(tr, value, x2 - valueWidth, y1 + 2, txtColor,
helper.drawText(tr, name, x1, y1 + 2, txtColor, false);
helper.drawText(tr, value, x2 - valueWidth, y1 + 2, txtColor,
false);
GL11.glEnable(GL11.GL_BLEND);

16
src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java
View File

@ -14,7 +14,7 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
@ -287,10 +287,10 @@ public final class AddBookOfferScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
listGui.render(helper, mouseX, mouseY, partialTicks);
matrixStack.push();
@ -393,10 +393,10 @@ public final class AddBookOfferScreen extends Screen
}
@Override
protected void renderItem(DrawableHelper helper, int index, int x,
protected void renderItem(DrawContext helper, int index, int x,
int y, int var4, int mouseX, int mouseY, float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
if(isSelectedItem(index))
drawSelectionOutline(matrixStack, x, y);
@ -410,14 +410,14 @@ public final class AddBookOfferScreen extends Screen
String name = bookOffer.getEnchantmentName();
int nameColor = enchantment.isCursed() ? 0xff5555 : 0xf0f0f0;
helper.method_51433(tr, name, x + 28, y, nameColor, false);
helper.drawText(tr, name, x + 28, y, nameColor, false);
helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0,
helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0,
false);
int maxLevel = enchantment.getMaxLevel();
String levels = maxLevel + (maxLevel == 1 ? " level" : " levels");
helper.method_51433(tr, levels, x + 28, y + 18, 0xa0a0a0, false);
helper.drawText(tr, levels, x + 28, y + 18, 0xa0a0a0, false);
}
}
}

4
src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java
View File

@ -7,7 +7,7 @@
*/
package net.wurstclient.clickgui.screens;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.Text;
import net.wurstclient.clickgui.ClickGui;
@ -50,7 +50,7 @@ public final class ClickGuiScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
super.render(helper, mouseX, mouseY, partialTicks);

14
src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java
View File

@ -14,7 +14,7 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.block.Block;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.ConfirmScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
@ -161,10 +161,10 @@ public final class EditBlockListScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
listGui.render(helper, mouseX, mouseY, partialTicks);
helper.drawCenteredTextWithShadow(client.textRenderer,
@ -258,7 +258,7 @@ public final class EditBlockListScreen extends Screen
}
@Override
protected void renderItem(DrawableHelper helper, int index, int x,
protected void renderItem(DrawContext helper, int index, int x,
int y, int var4, int var5, int var6, float partialTicks)
{
String name = list.get(index);
@ -269,9 +269,9 @@ public final class EditBlockListScreen extends Screen
RenderUtils.drawItem(helper, stack, x + 1, y + 1, true);
String displayName = stack.isEmpty() ? "\u00a7ounknown block\u00a7r"
: stack.getName().getString();
helper.method_51433(tr, displayName, x + 28, y, 0xf0f0f0, false);
helper.method_51433(tr, name, x + 28, y + 9, 0xa0a0a0, false);
helper.method_51433(tr,
helper.drawText(tr, displayName, x + 28, y, 0xf0f0f0, false);
helper.drawText(tr, name, x + 28, y + 9, 0xa0a0a0, false);
helper.drawText(tr,
"ID: " + Block.getRawIdFromState(block.getDefaultState()),
x + 28, y + 18, 0xa0a0a0, false);
}

6
src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java
View File

@ -12,7 +12,7 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
@ -97,10 +97,10 @@ public final class EditBlockScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
TextRenderer tr = client.textRenderer;
renderBackground(helper);

10
src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java
View File

@ -10,7 +10,7 @@ package net.wurstclient.clickgui.screens;
import org.lwjgl.glfw.GLFW;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
@ -252,10 +252,10 @@ public final class EditBookOfferScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
renderBackgroundTexture(helper);
matrixStack.push();
@ -280,7 +280,7 @@ public final class EditBookOfferScreen extends Screen
int nameColor = enchantment.isCursed() ? 0xff5555 : 0xffffff;
helper.drawTextWithShadow(tr, name, x + 28, y, nameColor);
helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false);
helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false);
String price;
if(bookOffer.price() >= 64)
@ -292,7 +292,7 @@ public final class EditBookOfferScreen extends Screen
x + 28 + tr.getWidth(price), y + 16, false);
}
helper.method_51433(tr, price, x + 28, y + 18, 0xa0a0a0, false);
helper.drawText(tr, price, x + 28, y + 18, 0xa0a0a0, false);
levelField.render(helper, mouseX, mouseY, partialTicks);
priceField.render(helper, mouseX, mouseY, partialTicks);

16
src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java
View File

@ -13,7 +13,7 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.ConfirmScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
@ -177,10 +177,10 @@ public final class EditBookOffersScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
listGui.render(helper, mouseX, mouseY, partialTicks);
matrixStack.push();
@ -250,10 +250,10 @@ public final class EditBookOffersScreen extends Screen
}
@Override
protected void renderItem(DrawableHelper helper, int index, int x,
protected void renderItem(DrawContext helper, int index, int x,
int y, int var4, int var5, int var6, float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
if(isSelectedItem(index))
drawSelectionOutline(matrixStack, x, y);
@ -267,9 +267,9 @@ public final class EditBookOffersScreen extends Screen
Enchantment enchantment = bookOffer.getEnchantment();
int nameColor = enchantment.isCursed() ? 0xff5555 : 0xf0f0f0;
helper.method_51433(tr, name, x + 28, y, nameColor, false);
helper.drawText(tr, name, x + 28, y, nameColor, false);
helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0,
helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0,
false);
String price;
@ -282,7 +282,7 @@ public final class EditBookOffersScreen extends Screen
x + 28 + tr.getWidth(price), y + 16, false);
}
helper.method_51433(tr, price, x + 28, y + 18, 0xa0a0a0, false);
helper.drawText(tr, price, x + 28, y + 18, 0xa0a0a0, false);
}
}
}

12
src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java
View File

@ -18,7 +18,7 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
@ -165,7 +165,7 @@ public final class EditColorScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
TextRenderer tr = client.textRenderer;
@ -186,13 +186,13 @@ public final class EditColorScreen extends Screen
helper.drawTexture(paletteIdentifier, x, y, u, v, w, h, fw, fh);
// RGB letters
helper.method_51433(tr, "#", fieldsX - 3 - tr.getWidth("#"),
helper.drawText(tr, "#", fieldsX - 3 - tr.getWidth("#"),
fieldsY + 6, 0xF0F0F0, false);
helper.method_51433(tr, "R:", fieldsX - 3 - tr.getWidth("R:"),
helper.drawText(tr, "R:", fieldsX - 3 - tr.getWidth("R:"),
fieldsY + 6 + 35, 0xFF0000, false);
helper.method_51433(tr, "G:", fieldsX + 75 - 3 - tr.getWidth("G:"),
helper.drawText(tr, "G:", fieldsX + 75 - 3 - tr.getWidth("G:"),
fieldsY + 6 + 35, 0x00FF00, false);
helper.method_51433(tr, "B:", fieldsX + 150 - 3 - tr.getWidth("B:"),
helper.drawText(tr, "B:", fieldsX + 150 - 3 - tr.getWidth("B:"),
fieldsY + 6 + 35, 0x0000FF, false);
hexValueField.render(helper, mouseX, mouseY, partialTicks);

14
src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java
View File

@ -13,7 +13,7 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.ConfirmScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
@ -163,10 +163,10 @@ public final class EditItemListScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
listGui.render(helper, mouseX, mouseY, partialTicks);
helper.drawCenteredTextWithShadow(client.textRenderer,
@ -265,7 +265,7 @@ public final class EditItemListScreen extends Screen
}
@Override
protected void renderItem(DrawableHelper helper, int index, int x,
protected void renderItem(DrawContext helper, int index, int x,
int y, int var4, int var5, int var6, float partialTicks)
{
String name = list.get(index);
@ -276,9 +276,9 @@ public final class EditItemListScreen extends Screen
RenderUtils.drawItem(helper, stack, x + 1, y + 1, true);
String displayName = stack.isEmpty() ? "\u00a7ounknown item\u00a7r"
: stack.getName().getString();
helper.method_51433(tr, displayName, x + 28, y, 0xf0f0f0, false);
helper.method_51433(tr, name, x + 28, y + 9, 0xa0a0a0, false);
helper.method_51433(tr, "ID: " + Registries.ITEM.getRawId(item),
helper.drawText(tr, displayName, x + 28, y, 0xf0f0f0, false);
helper.drawText(tr, name, x + 28, y + 9, 0xa0a0a0, false);
helper.drawText(tr, "ID: " + Registries.ITEM.getRawId(item),
x + 28, y + 18, 0xa0a0a0, false);
}
}

4
src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java
View File

@ -10,7 +10,7 @@ package net.wurstclient.clickgui.screens;
import org.lwjgl.glfw.GLFW;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
@ -92,7 +92,7 @@ public final class EditSliderScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);

12
src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java
View File

@ -16,7 +16,7 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.ConfirmScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
@ -162,7 +162,7 @@ public final class SelectFileScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);
@ -174,7 +174,7 @@ public final class SelectFileScreen extends Screen
super.render(helper, mouseX, mouseY, partialTicks);
if(doneButton.isSelected() && !doneButton.active)
helper.method_51434(textRenderer,
helper.drawTooltip(textRenderer,
Arrays.asList(Text.literal("You must first select a file.")),
mouseX, mouseY);
}
@ -234,15 +234,15 @@ public final class SelectFileScreen extends Screen
}
@Override
protected void renderItem(DrawableHelper helper, int index, int x,
protected void renderItem(DrawContext helper, int index, int x,
int y, int var4, int var5, int var6, float partialTicks)
{
TextRenderer tr = mc.textRenderer;
Path path = list.get(index);
helper.method_51433(tr, "" + path.getFileName(), x + 28, y,
helper.drawText(tr, "" + path.getFileName(), x + 28, y,
0xf0f0f0, false);
helper.method_51433(tr,
helper.drawText(tr,
"" + client.runDirectory.toPath().relativize(path), x + 28,
y + 9, 0xa0a0a0, false);
}

5
src/main/java/net/wurstclient/commands/TacoCmd.java
View File

@ -10,8 +10,7 @@ package net.wurstclient.commands;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.util.Window;
import net.minecraft.util.Identifier;
import net.wurstclient.Category;
@ -82,7 +81,7 @@ public final class TacoCmd extends Command
}
@Override
public void onRenderGUI(DrawableHelper helper, float partialTicks)
public void onRenderGUI(DrawContext helper, float partialTicks)
{
GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_CULL_FACE);

9
src/main/java/net/wurstclient/events/GUIRenderListener.java
View File

@ -8,21 +8,20 @@
package net.wurstclient.events;
import java.util.ArrayList;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.wurstclient.event.Event;
import net.wurstclient.event.Listener;
public interface GUIRenderListener extends Listener
{
public void onRenderGUI(DrawableHelper helper, float partialTicks);
public void onRenderGUI(DrawContext helper, float partialTicks);
public static class GUIRenderEvent extends Event<GUIRenderListener>
{
private final float partialTicks;
private final DrawableHelper helper;
private final DrawContext helper;
public GUIRenderEvent(DrawableHelper helper, float partialTicks)
public GUIRenderEvent(DrawContext helper, float partialTicks)
{
this.helper = helper;
this.partialTicks = partialTicks;

9
src/main/java/net/wurstclient/hacks/BowAimbotHack.java
View File

@ -17,8 +17,7 @@ import org.joml.Matrix4f;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
@ -243,9 +242,9 @@ public final class BowAimbotHack extends Hack
}
@Override
public void onRenderGUI(DrawableHelper helper, float partialTicks)
public void onRenderGUI(DrawContext helper, float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
if(target == null)
return;
@ -283,7 +282,7 @@ public final class BowAimbotHack extends Hack
tessellator.draw();
// text
helper.method_51433(MC.textRenderer, message, 2, 1, 0xffffffff, false);
helper.drawText(MC.textRenderer, message, 2, 1, 0xffffffff, false);
matrixStack.pop();

8
src/main/java/net/wurstclient/hacks/ExcavatorHack.java
View File

@ -21,7 +21,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -325,14 +325,14 @@ public final class ExcavatorHack extends Hack
}
@Override
public void onRenderGUI(DrawableHelper helper, float partialTicks)
public void onRenderGUI(DrawContext helper, float partialTicks)
{
// GL settings
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDisable(GL11.GL_CULL_FACE);
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
matrixStack.push();
Matrix4f matrix = matrixStack.peek().getPositionMatrix();
@ -365,7 +365,7 @@ public final class ExcavatorHack extends Hack
tessellator.draw();
// text
helper.method_51433(tr, message, 2, 1, 0xffffffff, false);
helper.drawText(tr, message, 2, 1, 0xffffffff, false);
matrixStack.pop();

2
src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java
View File

@ -299,7 +299,7 @@ public final class MobSpawnEspHack extends Hack
BlockPos pos = new BlockPos(x, y, z);
BlockState state = world.getBlockState(pos);
if(state.method_51366())
if(state.blocksMovement())
continue;
if(!state.getFluidState().isEmpty())
continue;

20
src/main/java/net/wurstclient/hud/HackListHUD.java
View File

@ -13,7 +13,7 @@ import java.util.Comparator;
import java.util.Iterator;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.util.Window;
import net.wurstclient.WurstClient;
import net.wurstclient.events.UpdateListener;
@ -34,7 +34,7 @@ public final class HackListHUD implements UpdateListener
WurstClient.INSTANCE.getEventManager().add(UpdateListener.class, this);
}
public void render(DrawableHelper helper, float partialTicks)
public void render(DrawContext helper, float partialTicks)
{
if(otf.getMode() == Mode.HIDDEN)
return;
@ -64,14 +64,14 @@ public final class HackListHUD implements UpdateListener
drawHackList(helper, partialTicks);
}
private void drawCounter(DrawableHelper helper)
private void drawCounter(DrawContext helper)
{
long size = activeHax.stream().filter(e -> e.hack.isEnabled()).count();
String s = size + " hack" + (size != 1 ? "s" : "") + " active";
drawString(helper, s);
}
private void drawHackList(DrawableHelper helper, float partialTicks)
private void drawHackList(DrawContext helper, float partialTicks)
{
if(otf.isAnimations())
for(HackListEntry e : activeHax)
@ -129,7 +129,7 @@ public final class HackListHUD implements UpdateListener
}
}
private void drawString(DrawableHelper helper, String s)
private void drawString(DrawContext helper, String s)
{
TextRenderer tr = WurstClient.MC.textRenderer;
int posX;
@ -144,13 +144,13 @@ public final class HackListHUD implements UpdateListener
posX = screenWidth - stringWidth - 2;
}
helper.method_51433(tr, s, posX + 1, posY + 1, 0xff000000, false);
helper.method_51433(tr, s, posX, posY, textColor | 0xff000000, false);
helper.drawText(tr, s, posX + 1, posY + 1, 0xff000000, false);
helper.drawText(tr, s, posX, posY, textColor | 0xff000000, false);
posY += 9;
}
private void drawWithOffset(DrawableHelper helper, HackListEntry e,
private void drawWithOffset(DrawContext helper, HackListEntry e,
float partialTicks)
{
TextRenderer tr = WurstClient.MC.textRenderer;
@ -171,9 +171,9 @@ public final class HackListHUD implements UpdateListener
}
int alpha = (int)(255 * (1 - offset / 4)) << 24;
helper.method_51433(tr, s, (int)posX + 1, posY + 1, 0x04000000 | alpha,
helper.drawText(tr, s, (int)posX + 1, posY + 1, 0x04000000 | alpha,
false);
helper.method_51433(tr, s, (int)posX, posY, textColor | alpha, false);
helper.drawText(tr, s, (int)posX, posY, textColor | alpha, false);
posY += 9;
}

5
src/main/java/net/wurstclient/hud/IngameHUD.java
View File

@ -10,8 +10,7 @@ package net.wurstclient.hud;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.wurstclient.WurstClient;
import net.wurstclient.clickgui.ClickGui;
import net.wurstclient.clickgui.screens.ClickGuiScreen;
@ -24,7 +23,7 @@ public final class IngameHUD implements GUIRenderListener
private TabGui tabGui;
@Override
public void onRenderGUI(DrawableHelper helper, float partialTicks)
public void onRenderGUI(DrawContext helper, float partialTicks)
{
if(!WurstClient.INSTANCE.isEnabled())
return;

11
src/main/java/net/wurstclient/hud/TabGui.java
View File

@ -15,8 +15,7 @@ import org.lwjgl.glfw.GLFW;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -122,9 +121,9 @@ public final class TabGui implements KeyPressListener
}
}
public void render(DrawableHelper helper, float partialTicks)
public void render(DrawContext helper, float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
if(tabGuiOtf.isHidden())
return;
@ -158,7 +157,7 @@ public final class TabGui implements KeyPressListener
if(i == selected)
tabName = (tabOpened ? "<" : ">") + tabName;
helper.method_51433(WurstClient.MC.textRenderer, tabName, 2, textY,
helper.drawText(WurstClient.MC.textRenderer, tabName, 2, textY,
txtColor, false);
textY += 10;
}
@ -193,7 +192,7 @@ public final class TabGui implements KeyPressListener
if(i == tab.selected)
fName = ">" + fName;
helper.method_51433(WurstClient.MC.textRenderer, fName, 2,
helper.drawText(WurstClient.MC.textRenderer, fName, 2,
tabTextY, txtColor, false);
tabTextY += 10;
}

8
src/main/java/net/wurstclient/hud/WurstLogo.java
View File

@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.Tessellator;
@ -29,9 +29,9 @@ public final class WurstLogo
private static final Identifier texture =
new Identifier("wurst", "wurst_128.png");
public void render(DrawableHelper helper)
public void render(DrawContext helper)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
WurstLogoOtf otf = WurstClient.INSTANCE.getOtfs().wurstLogoOtf;
if(!otf.isVisible())
return;
@ -55,7 +55,7 @@ public final class WurstLogo
// draw version string
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_DEPTH_TEST);
helper.method_51433(tr, version, 74, 8, otf.getTextColor(), false);
helper.drawText(tr, version, 74, 8, otf.getTextColor(), false);
// draw Wurst logo
RenderSystem.setShaderColor(1, 1, 1, 1);

4
src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java
View File

@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.mojang.blaze3d.systems.RenderSystem;
import net.fabricmc.fabric.api.client.screen.v1.Screens;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.GameMenuScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
@ -112,7 +112,7 @@ public abstract class GameMenuScreenMixin extends Screen
@Inject(at = @At("TAIL"),
method = "render(Lnet/minecraft/client/gui/DrawableHelper;IIF)V")
private void onRender(DrawableHelper helper, int mouseX, int mouseY,
private void onRender(DrawContext helper, int mouseX, int mouseY,
float partialTicks, CallbackInfo ci)
{
if(!WurstClient.INSTANCE.isEnabled() || wurstOptionsButton == null)

7
src/main/java/net/wurstclient/mixin/IngameHudMixin.java
View File

@ -11,8 +11,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.hud.InGameHud;
import net.minecraft.util.Identifier;
import net.wurstclient.WurstClient;
@ -28,7 +27,7 @@ public class IngameHudMixin
remap = false,
ordinal = 3),
method = "render(Lnet/minecraft/client/gui/DrawableHelper;F)V")
private void onRender(DrawableHelper helper, float partialTicks,
private void onRender(DrawContext helper, float partialTicks,
CallbackInfo ci)
{
if(WurstClient.MC.options.debugEnabled)
@ -41,7 +40,7 @@ public class IngameHudMixin
@Inject(at = @At("HEAD"),
method = "renderOverlay(Lnet/minecraft/client/gui/DrawableHelper;Lnet/minecraft/util/Identifier;F)V",
cancellable = true)
private void onRenderOverlay(DrawableHelper helper, Identifier texture,
private void onRenderOverlay(DrawContext helper, Identifier texture,
float opacity, CallbackInfo ci)
{
if(texture == null || texture.getPath() == null)

4
src/main/java/net/wurstclient/mixin/ScreenMixin.java
View File

@ -17,8 +17,8 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.client.gui.AbstractParentElement;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.screen.Screen;
import net.wurstclient.WurstClient;
import net.wurstclient.mixinterface.IScreen;
@ -34,7 +34,7 @@ public abstract class ScreenMixin extends AbstractParentElement
@Inject(at = @At("HEAD"),
method = "renderBackground(Lnet/minecraft/client/gui/DrawableHelper;)V",
cancellable = true)
public void onRenderBackground(DrawableHelper helper, CallbackInfo ci)
public void onRenderBackground(DrawContext helper, CallbackInfo ci)
{
if(WurstClient.INSTANCE.getHax().noBackgroundHack
.shouldCancelBackground((Screen)(Object)this))

2
src/main/java/net/wurstclient/mixin/StatsScreenMixin.java
View File

@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener
.equals(I18n.translate("gui.done")))
continue;
button.setX(width / 2 + 2);
button.method_46421(width / 2 + 2);
button.setWidth(150);
}
}

2
src/main/java/net/wurstclient/mixin/TitleScreenMixin.java
View File

@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen
// adjust AltManager button if Realms button has been moved
// happens when ModMenu is installed
altsButton.setY(realmsButton.getY());
altsButton.method_46419(realmsButton.getY());
}
/**

11
src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java
View File

@ -20,9 +20,8 @@ import org.lwjgl.glfw.GLFW;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.render.BufferBuilder;
@ -319,10 +318,10 @@ public final class NavigatorFeatureScreen extends NavigatorScreen
}
@Override
protected void onRender(DrawableHelper helper, int mouseX, int mouseY,
protected void onRender(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
ClickGui gui = WurstClient.INSTANCE.getGui();
int txtColor = gui.getTxtColor();
@ -476,7 +475,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen
int textY = bgy1 + scroll + 2;
for(String line : text.split("\n"))
{
helper.method_51433(client.textRenderer, line, bgx1 + 2, textY,
helper.drawText(client.textRenderer, line, bgx1 + 2, textY,
txtColor, false);
textY += client.textRenderer.fontHeight;
}
@ -519,7 +518,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen
// text
String buttonText = button.getMessage().getString();
helper.method_51433(client.textRenderer, buttonText,
helper.drawText(client.textRenderer, buttonText,
(x1 + x2 - client.textRenderer.getWidth(buttonText)) / 2,
y1 + 5, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);

16
src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java
View File

@ -17,7 +17,7 @@ import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.client.render.BufferBuilder;
@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen
setFocused(searchBar);
searchBar.setFocused(true);
searchBar.setX(middleX - 100);
searchBar.method_46421(middleX - 100);
setContentHeight(navigatorDisplayList.size() / 3 * 20);
}
@ -228,10 +228,10 @@ public final class NavigatorMainScreen extends NavigatorScreen
}
@Override
protected void onRender(DrawableHelper helper, int mouseX, int mouseY,
protected void onRender(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
ClickGui gui = WurstClient.INSTANCE.getGui();
float[] bgColor = gui.getBgColor();
float[] acColor = gui.getAcColor();
@ -329,15 +329,15 @@ public final class NavigatorMainScreen extends NavigatorScreen
// text
for(int i = 0; i < lines.length; i++)
helper.method_51433(tr, lines[i], xt1 + 2,
helper.drawText(tr, lines[i], xt1 + 2,
yt1 + 2 + i * tr.fontHeight, txtColor, false);
}
}
private void renderFeature(DrawableHelper helper, int mouseX, int mouseY,
private void renderFeature(DrawContext helper, int mouseX, int mouseY,
float partialTicks, int i, int x, int y)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
ClickGui gui = WurstClient.INSTANCE.getGui();
float[] bgColor = gui.getBgColor();
int txtColor = gui.getTxtColor();
@ -475,7 +475,7 @@ public final class NavigatorMainScreen extends NavigatorScreen
RenderSystem.setShader(GameRenderer::getPositionProgram);
RenderSystem.setShaderColor(1, 1, 1, 1);
String buttonText = feature.getName();
helper.method_51433(client.textRenderer, buttonText, area.x + 4,
helper.drawText(client.textRenderer, buttonText, area.x + 4,
area.y + 4, txtColor, false);
GL11.glEnable(GL11.GL_BLEND);
}

7
src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java
View File

@ -14,9 +14,8 @@ import org.lwjgl.glfw.GLFW;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.util.InputUtil;
@ -157,10 +156,10 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen
}
@Override
protected void onRender(DrawableHelper helper, int mouseX, int mouseY,
protected void onRender(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
ClickGui gui = WurstClient.INSTANCE.getGui();
int txtColor = gui.getTxtColor();

7
src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java
View File

@ -16,9 +16,8 @@ import org.lwjgl.glfw.GLFW;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.util.math.MatrixStack;
@ -129,10 +128,10 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen
}
@Override
protected void onRender(DrawableHelper helper, int mouseX, int mouseY,
protected void onRender(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
ClickGui gui = WurstClient.INSTANCE.getGui();
int txtColor = gui.getTxtColor();

9
src/main/java/net/wurstclient/navigator/NavigatorScreen.java
View File

@ -13,8 +13,7 @@ import org.joml.Matrix4f;
import org.lwjgl.opengl.GL11;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.GameRenderer;
@ -143,10 +142,10 @@ public abstract class NavigatorScreen extends Screen
}
@Override
public final void render(DrawableHelper helper, int mouseX, int mouseY,
public final void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
// GL settings
GL11.glEnable(GL11.GL_BLEND);
@ -209,7 +208,7 @@ public abstract class NavigatorScreen extends Screen
protected abstract void onUpdate();
protected abstract void onRender(DrawableHelper helper, int mouseX,
protected abstract void onRender(DrawContext helper, int mouseX,
int mouseY, float partialTicks);
protected final int getStringHeight(String s)

4
src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java
View File

@ -12,7 +12,7 @@ import java.util.List;
import java.util.function.Supplier;
import net.minecraft.client.font.MultilineText;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.text.LiteralTextContent;
@ -101,7 +101,7 @@ public final class ForcedChatReportsScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float delta)
{
renderBackground(helper);

4
src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java
View File

@ -12,7 +12,7 @@ import java.util.List;
import java.util.function.Supplier;
import net.minecraft.client.font.MultilineText;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.text.Text;
@ -117,7 +117,7 @@ public final class NcrModRequiredScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float delta)
{
renderBackground(helper);

4
src/main/java/net/wurstclient/options/EnterProfileNameScreen.java
View File

@ -12,7 +12,7 @@ import java.util.function.Consumer;
import org.lwjgl.glfw.GLFW;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
@ -88,7 +88,7 @@ public final class EnterProfileNameScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);

4
src/main/java/net/wurstclient/options/KeybindEditorScreen.java
View File

@ -7,7 +7,7 @@
*/
package net.wurstclient.options;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
@ -94,7 +94,7 @@ public final class KeybindEditorScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);

10
src/main/java/net/wurstclient/options/KeybindManagerScreen.java
View File

@ -10,7 +10,7 @@ package net.wurstclient.options;
import org.lwjgl.glfw.GLFW;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.ConfirmScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
@ -163,7 +163,7 @@ public final class KeybindManagerScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);
@ -222,16 +222,16 @@ public final class KeybindManagerScreen extends Screen
}
@Override
protected void renderItem(DrawableHelper helper, int index, int x,
protected void renderItem(DrawContext helper, int index, int x,
int y, int slotHeight, int mouseX, int mouseY, float partialTicks)
{
Keybind keybind =
WurstClient.INSTANCE.getKeybinds().getAllKeybinds().get(index);
helper.method_51433(client.textRenderer,
helper.drawText(client.textRenderer,
"Key: " + keybind.getKey().replace("key.keyboard.", ""), x + 3,
y + 3, 0xa0a0a0, false);
helper.method_51433(client.textRenderer,
helper.drawText(client.textRenderer,
"Commands: " + keybind.getCommands(), x + 3, y + 15, 0xa0a0a0,
false);
}

8
src/main/java/net/wurstclient/options/KeybindProfilesScreen.java
View File

@ -17,7 +17,7 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.text.Text;
@ -170,7 +170,7 @@ public final class KeybindProfilesScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);
@ -182,7 +182,7 @@ public final class KeybindProfilesScreen extends Screen
super.render(helper, mouseX, mouseY, partialTicks);
if(loadButton.isSelected() && !loadButton.active)
helper.method_51434(textRenderer,
helper.drawTooltip(textRenderer,
Arrays.asList(Text.literal("You must first select a file.")),
mouseX, mouseY);
}
@ -236,7 +236,7 @@ public final class KeybindProfilesScreen extends Screen
}
@Override
protected void renderItem(DrawableHelper helper, int index, int x,
protected void renderItem(DrawContext helper, int index, int x,
int y, int var4, int var5, int var6, float partialTicks)
{
TextRenderer tr = mc.textRenderer;

5
src/main/java/net/wurstclient/options/PressAKeyScreen.java
View File

@ -8,8 +8,7 @@
package net.wurstclient.options;
import org.lwjgl.glfw.GLFW;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.util.InputUtil;
import net.minecraft.text.Text;
@ -50,7 +49,7 @@ public class PressAKeyScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);

10
src/main/java/net/wurstclient/options/WurstOptionsScreen.java
View File

@ -12,8 +12,8 @@ import java.util.List;
import java.util.function.Supplier;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.ClickableWidget;
@ -146,7 +146,7 @@ public class WurstOptionsScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);
@ -155,7 +155,7 @@ public class WurstOptionsScreen extends Screen
renderButtonTooltip(helper, mouseX, mouseY);
}
private void renderTitles(DrawableHelper helper)
private void renderTitles(DrawContext helper)
{
TextRenderer tr = client.textRenderer;
int middleX = width / 2;
@ -173,7 +173,7 @@ public class WurstOptionsScreen extends Screen
0xcccccc);
}
private void renderButtonTooltip(DrawableHelper helper, int mouseX,
private void renderButtonTooltip(DrawContext helper, int mouseX,
int mouseY)
{
for(Drawable d : ((IScreen)this).getButtons())
@ -191,7 +191,7 @@ public class WurstOptionsScreen extends Screen
if(woButton.tooltip.isEmpty())
continue;
helper.method_51434(textRenderer, woButton.tooltip, mouseX, mouseY);
helper.drawTooltip(textRenderer, woButton.tooltip, mouseX, mouseY);
break;
}
}

4
src/main/java/net/wurstclient/options/ZoomManagerScreen.java
View File

@ -7,7 +7,7 @@
*/
package net.wurstclient.options;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.option.KeyBinding;
@ -94,7 +94,7 @@ public class ZoomManagerScreen extends Screen implements PressAKeyCallback
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
ZoomOtf zoom = WurstClient.INSTANCE.getOtfs().zoomOtf;

8
src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java
View File

@ -14,8 +14,8 @@ import java.util.function.Supplier;
import org.lwjgl.glfw.GLFW;
import net.minecraft.SharedConstants;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
@ -201,7 +201,7 @@ public class CleanUpScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);
@ -215,7 +215,7 @@ public class CleanUpScreen extends Screen
renderButtonTooltip(helper, mouseX, mouseY);
}
private void renderButtonTooltip(DrawableHelper helper, int mouseX,
private void renderButtonTooltip(DrawContext helper, int mouseX,
int mouseY)
{
for(Drawable d : ((IScreen)this).getButtons())
@ -233,7 +233,7 @@ public class CleanUpScreen extends Screen
if(cuButton.tooltip.isEmpty())
continue;
helper.method_51434(textRenderer, cuButton.tooltip, mouseX, mouseY);
helper.drawTooltip(textRenderer, cuButton.tooltip, mouseX, mouseY);
break;
}
}

5
src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java
View File

@ -12,8 +12,7 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import org.lwjgl.glfw.GLFW;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
import net.minecraft.client.gui.widget.ButtonWidget;
@ -214,7 +213,7 @@ public class ServerFinderScreen extends Screen
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float partialTicks)
{
renderBackground(helper);

12
src/main/java/net/wurstclient/util/ListWidget.java
View File

@ -18,8 +18,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.AbstractParentElement;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.render.BufferBuilder;
@ -94,7 +94,7 @@ public abstract class ListWidget extends AbstractParentElement
protected void updateItemPosition(int index, int x, int y, float delta)
{}
protected abstract void renderItem(DrawableHelper helper, int x, int y,
protected abstract void renderItem(DrawContext helper, int x, int y,
int itemHeight, int mouseX, int mouseY, int i, float f);
protected void renderHeader(int x, int y, Tessellator tessellator)
@ -134,7 +134,7 @@ public abstract class ListWidget extends AbstractParentElement
}
@Override
public void render(DrawableHelper helper, int mouseX, int mouseY,
public void render(DrawContext helper, int mouseX, int mouseY,
float delta)
{
if(visible)
@ -145,7 +145,7 @@ public abstract class ListWidget extends AbstractParentElement
capYPosition();
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder bufferBuilder = tessellator.getBuffer();
RenderSystem.setShaderTexture(0, Screen.field_44669);
RenderSystem.setShaderTexture(0, Screen.OPTIONS_BACKGROUND_TEXTURE);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShader(GameRenderer::getPositionTexColorProgram);
bufferBuilder.begin(VertexFormat.DrawMode.QUADS,
@ -374,7 +374,7 @@ public abstract class ListWidget extends AbstractParentElement
return 220;
}
protected void renderList(DrawableHelper helper, int i, int j, int k, int l,
protected void renderList(DrawContext helper, int i, int j, int k, int l,
float f)
{
int m = getItemCount();
@ -435,7 +435,7 @@ public abstract class ListWidget extends AbstractParentElement
{
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder bufferBuilder = tessellator.getBuffer();
RenderSystem.setShaderTexture(0, Screen.field_44669);
RenderSystem.setShaderTexture(0, Screen.OPTIONS_BACKGROUND_TEXTURE);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.setShader(GameRenderer::getPositionTexColorProgram);
bufferBuilder.begin(VertexFormat.DrawMode.QUADS,

10
src/main/java/net/wurstclient/util/RenderUtils.java
View File

@ -16,7 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.block.Blocks;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.BufferBuilder.BuiltBuffer;
import net.minecraft.client.render.Camera;
@ -864,10 +864,10 @@ public enum RenderUtils
bufferBuilder.vertex(matrix, 0, 2, 1).next();
}
public static void drawItem(DrawableHelper helper, ItemStack stack, int x,
public static void drawItem(DrawContext helper, ItemStack stack, int x,
int y, boolean large)
{
MatrixStack matrixStack = helper.method_51448();
MatrixStack matrixStack = helper.getMatrices();
matrixStack.push();
matrixStack.translate(x, y, 0);
@ -880,7 +880,7 @@ public enum RenderUtils
? new ItemStack(Blocks.GRASS_BLOCK) : stack;
DiffuseLighting.enableGuiDepthLighting();
helper.method_51427(renderStack, 0, 0);
helper.drawItem(renderStack, 0, 0);
DiffuseLighting.disableGuiDepthLighting();
matrixStack.pop();
@ -894,7 +894,7 @@ public enum RenderUtils
GL11.glDisable(GL11.GL_DEPTH_TEST);
TextRenderer tr = WurstClient.MC.textRenderer;
helper.method_51433(tr, "?", 3, 2, 0xf0f0f0, false);
helper.drawText(tr, "?", 3, 2, 0xf0f0f0, false);
GL11.glEnable(GL11.GL_DEPTH_TEST);
matrixStack.pop();