Skip to content

Commit

Permalink
[Wurst-Bot] Update to 1.21-pre1
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander01998 committed May 29, 2024
1 parent fc3489f commit fbe7940
Show file tree
Hide file tree
Showing 51 changed files with 303 additions and 321 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ org.gradle.parallel=true
# Fabric Properties
# check these at https://fabricmc.net/develop/ and
# https://modrinth.com/mod/fabric-api/versions
minecraft_version=24w21b
yarn_mappings=24w21b+build.3
minecraft_version=1.21-pre1
yarn_mappings=1.21-pre1+build.2
loader_version=0.15.11

# Fabric API
fabric_version=0.99.1+1.21
fabric_version=0.99.2+1.21

# Mod Properties
mod_version = v7.42-MC24w21b
mod_version = v7.42-MC1.21-pre1
maven_group = net.wurstclient
archives_base_name = Wurst-Client

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/wurstclient/WurstClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public enum WurstClient
public static IMinecraftClient IMC;

public static final String VERSION = "7.42";
public static final String MC_VERSION = "24w21b";
public static final String MC_VERSION = "1.21-pre1";

private WurstAnalytics analytics;
private EventManager eventManager;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/wurstclient/ai/PathRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static void renderArrow(MatrixStack matrixStack, BlockPos start,
{
Tessellator tessellator = RenderSystem.renderThreadTesselator();
RenderSystem.setShader(GameRenderer::getPositionProgram);
BufferBuilder bufferBuilder = tessellator.method_60827(
BufferBuilder bufferBuilder = tessellator.begin(
VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION);

int startX = start.getX() - region.x();
Expand Down Expand Up @@ -96,7 +96,7 @@ public static void renderArrow(MatrixStack matrixStack, BlockPos start,

matrixStack.pop();

BufferRenderer.drawWithGlobalProgram(bufferBuilder.method_60800());
BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
}

public static void renderNode(MatrixStack matrixStack, BlockPos pos,
Expand All @@ -112,7 +112,7 @@ public static void renderNode(MatrixStack matrixStack, BlockPos pos,
Tessellator tessellator = RenderSystem.renderThreadTesselator();

RenderSystem.setShader(GameRenderer::getPositionProgram);
BufferBuilder bufferBuilder = tessellator.method_60827(
BufferBuilder bufferBuilder = tessellator.begin(
VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION);

// middle part
Expand Down Expand Up @@ -154,7 +154,7 @@ public static void renderNode(MatrixStack matrixStack, BlockPos pos,
bufferBuilder.vertex(matrix, 0, -1, 0);
bufferBuilder.vertex(matrix, 0, 0, 1);

BufferRenderer.drawWithGlobalProgram(bufferBuilder.method_60800());
BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());

matrixStack.pop();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/wurstclient/altmanager/AltRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ private static void drawTexture(DrawContext context, int x, int y, float u,
RenderSystem.setShader(GameRenderer::getPositionTexProgram);
MatrixStack matrixStack = context.getMatrices();
Matrix4f matrix4f = matrixStack.peek().getPositionMatrix();
BufferBuilder bufferBuilder = Tessellator.getInstance().method_60827(
BufferBuilder bufferBuilder = Tessellator.getInstance().begin(
VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
bufferBuilder.vertex(matrix4f, x, y, z).texture(uOverFw, vOverFh);
bufferBuilder.vertex(matrix4f, x, y2, z).texture(uOverFw, vPlusHOverFh);
bufferBuilder.vertex(matrix4f, x2, y2, z).texture(uPlusWOverFw,
vPlusHOverFh);
bufferBuilder.vertex(matrix4f, x2, y, z).texture(uPlusWOverFw, vOverFh);
BufferRenderer.drawWithGlobalProgram(bufferBuilder.method_60800());
BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
}

public static void drawAltFace(DrawContext context, String name, int x,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,13 +384,13 @@ public void render(DrawContext context, int mouseX, int mouseY,

RenderSystem.setShaderColor(1, 0, 0, errorTimer / 16F);

BufferBuilder bufferBuilder = tessellator.method_60827(
BufferBuilder bufferBuilder = tessellator.begin(
VertexFormat.DrawMode.QUADS, VertexFormats.POSITION);
bufferBuilder.vertex(matrix, 0, 0, 0);
bufferBuilder.vertex(matrix, width, 0, 0);
bufferBuilder.vertex(matrix, width, height, 0);
bufferBuilder.vertex(matrix, 0, height, 0);
BufferRenderer.drawWithGlobalProgram(bufferBuilder.method_60800());
BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());

GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_BLEND);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,13 @@ public void render(DrawContext context, int mouseX, int mouseY,

RenderSystem.setShaderColor(1, 0, 0, errorTimer / 16F);

BufferBuilder bufferBuilder = tessellator.method_60827(
BufferBuilder bufferBuilder = tessellator.begin(
VertexFormat.DrawMode.QUADS, VertexFormats.POSITION);
bufferBuilder.vertex(matrix, 0, 0, 0);
bufferBuilder.vertex(matrix, width, 0, 0);
bufferBuilder.vertex(matrix, width, height, 0);
bufferBuilder.vertex(matrix, 0, height, 0);
BufferRenderer.drawWithGlobalProgram(bufferBuilder.method_60800());
BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());

GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_BLEND);
Expand Down Expand Up @@ -660,14 +660,14 @@ protected void renderItem(DrawContext context, int id, int x, int y,

RenderSystem.setShaderColor(0, 1, 0, opacity);

BufferBuilder bufferBuilder = tessellator.method_60827(
BufferBuilder bufferBuilder = tessellator.begin(
VertexFormat.DrawMode.QUADS, VertexFormats.POSITION);
bufferBuilder.vertex(matrix, x - 2, y - 2, 0);
bufferBuilder.vertex(matrix, x - 2 + 220, y - 2, 0);
bufferBuilder.vertex(matrix, x - 2 + 220, y - 2 + 30, 0);
bufferBuilder.vertex(matrix, x - 2, y - 2 + 30, 0);
BufferRenderer
.drawWithGlobalProgram(bufferBuilder.method_60800());
.drawWithGlobalProgram(bufferBuilder.end());

GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_BLEND);
Expand Down
Loading

0 comments on commit fbe7940

Please sign in to comment.