Skip to content

Commit e282e4e

Browse files
cev-apicev-api
committed
Cherry-pick Master into 1.21.11
1 parent 92dbb06 commit e282e4e

30 files changed

Lines changed: 262 additions & 248 deletions

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# Wurst Client v7.53.1 (MC1.21.11) - Modified by CevAPI
1+
# Wurst Client v7.54 (MC1.21.11) - Modified by CevAPI
22

3-
![CevAPI Logo](https://i.imgur.com/kBIn9Ab.png)
3+
![CevAPI Logo](https://i.imgur.com/4x8fvbp.jpeg)
44

55
- Original Repo: https://github.com/Wurst-Imperium/Wurst7
66
- Installation guide: [https://www.wurstclient.net/tutorials/how-to-install/](https://go.wimods.net/from/github.com/Wurst-Imperium/Wurst7?to=https%3A%2F%2Fwww.wurstclient.net%2Ftutorials%2Fhow-to-install%2F%3Futm_source%3DGitHub%26utm_medium%3DWurst7%2Brepo)
77
- Original Wurst Wiki: [https://wurst.wiki/](https://go.wimods.net/from/github.com/Wurst-Imperium/Wurst7?to=https%3A%2F%2Fwurst.wiki%2F%3Futm_source%3DGitHub%26utm_medium%3DWurst7%2Brepo)
88
- Wurst 7 CevAPI Wiki: https://github.com/cev-api/Wurst7-CevAPI/wiki
9+
- CevAPI Discord: https://discord.gg/5fddQNST84
910

1011
### Download
1112
Pre-compiled copies are available on the [Release Page](https://github.com/cev-api/Wurst7-CevAPI/releases).

‎src/main/java/net/wurstclient/FriendsList.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ private static void sendFriendAlert(String message)
754754
Component.literal("[Friends] ").withStyle(ChatFormatting.BLUE);
755755
MutableComponent body =
756756
Component.literal(message).withStyle(ChatFormatting.WHITE);
757-
mc.gui.getChat().addClientSystemMessage(prefix.append(body));
757+
mc.gui.getChat().addMessage(prefix.append(body));
758758
});
759759
}
760760

‎src/main/java/net/wurstclient/clickgui/screens/EditFriendListScreen.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515

1616
import org.lwjgl.glfw.GLFW;
1717
import net.minecraft.client.Minecraft;
18-
import net.minecraft.client.gui.GuiGraphicsExtractor;
18+
import net.minecraft.client.gui.GuiGraphics;
1919
import net.minecraft.client.gui.components.Button;
2020
import net.minecraft.client.gui.components.EditBox;
21-
import net.minecraft.client.gui.components.Renderable;
2221
import net.minecraft.client.gui.screens.ConfirmScreen;
2322
import net.minecraft.client.gui.screens.Screen;
2423
import net.minecraft.client.input.KeyEvent;
@@ -119,18 +118,15 @@ public void init()
119118
}
120119

121120
@Override
122-
public void extractRenderState(GuiGraphicsExtractor context, int mouseX,
123-
int mouseY, float partialTicks)
121+
public void render(GuiGraphics context, int mouseX, int mouseY,
122+
float partialTicks)
124123
{
125-
listGui.extractRenderState(context, mouseX, mouseY, partialTicks);
124+
super.render(context, mouseX, mouseY, partialTicks);
126125

127-
context.centeredText(
126+
context.drawCenteredString(
128127
minecraft.font, friendList.getName() + " ("
129128
+ friendList.getFriendNames().size() + ")",
130129
width / 2, 12, CommonColors.WHITE);
131-
132-
for(Renderable drawable : renderables)
133-
drawable.extractRenderState(context, mouseX, mouseY, partialTicks);
134130
}
135131

136132
@Override
@@ -207,15 +203,15 @@ public Component getNarration()
207203
}
208204

209205
@Override
210-
public void extractContent(GuiGraphicsExtractor context, int mouseX,
211-
int mouseY, boolean hovered, float tickDelta)
206+
public void renderContent(GuiGraphics context, int mouseX, int mouseY,
207+
boolean hovered, float tickDelta)
212208
{
213209
int x = getContentX();
214210
int y = getContentY();
215211

216-
context.text(minecraft.font, friendName, x + 4, y + 4,
212+
context.drawString(minecraft.font, friendName, x + 4, y + 4,
217213
CommonColors.WHITE, false);
218-
context.text(minecraft.font, "Click or shift-click to select",
214+
context.drawString(minecraft.font, "Click or shift-click to select",
219215
x + 4, y + 16, CommonColors.LIGHT_GRAY, false);
220216
}
221217

‎src/main/java/net/wurstclient/commands/NecoCmd.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88
package net.wurstclient.commands;
99

10-
import java.awt.AlphaComposite;
11-
import java.awt.Graphics2D;
12-
import java.awt.image.BufferedImage;
13-
import java.io.ByteArrayInputStream;
10+
import java.awt.AlphaComposite;
11+
import java.awt.Graphics2D;
12+
import java.awt.image.BufferedImage;
13+
import java.io.ByteArrayInputStream;
1414
import java.io.ByteArrayOutputStream;
1515
import java.io.IOException;
1616
import java.io.InputStream;
@@ -26,11 +26,11 @@
2626

2727
import org.lwjgl.glfw.GLFW;
2828
import org.w3c.dom.NamedNodeMap;
29-
import org.w3c.dom.Node;
30-
31-
import com.mojang.blaze3d.platform.NativeImage;
32-
33-
import net.minecraft.client.gui.GuiGraphics;
29+
import org.w3c.dom.Node;
30+
31+
import com.mojang.blaze3d.platform.NativeImage;
32+
33+
import net.minecraft.client.gui.GuiGraphics;
3434
import net.minecraft.client.renderer.RenderPipelines;
3535
import net.minecraft.client.renderer.texture.DynamicTexture;
3636
import net.minecraft.resources.Identifier;
@@ -125,9 +125,9 @@ public void doPrimaryAction()
125125
WURST.getCmdProcessor().process("neco");
126126
}
127127

128-
@Override
129-
public void onRenderGUI(GuiGraphics context, float partialTicks)
130-
{
128+
@Override
129+
public void onRenderGUI(GuiGraphics context, float partialTicks)
130+
{
131131
if(!enabled || gifLoadFailed || gifFrames.isEmpty())
132132
return;
133133

‎src/main/java/net/wurstclient/hacks/AutoFlyHack.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,15 +1448,15 @@ public void onRenderGUI(GuiGraphics context, float partialTicks)
14481448
int y = context.guiHeight() / 2 + 10;
14491449
int textWidth = font.width(info);
14501450
int x = centerX - textWidth / 2;
1451-
context.drawString(font, info, x, y, 0xFFFFFFFF, true);
1452-
1453-
if(eta != null && !eta.isBlank())
1454-
{
1455-
int etaWidth = font.width(eta);
1456-
int etaX = centerX - etaWidth / 2;
1457-
context.drawString(font, eta, etaX, y + 10, 0xFFAAAAAA, true);
1458-
}
1459-
}
1451+
context.drawString(font, info, x, y, 0xFFFFFFFF, true);
1452+
1453+
if(eta != null && !eta.isBlank())
1454+
{
1455+
int etaWidth = font.width(eta);
1456+
int etaX = centerX - etaWidth / 2;
1457+
context.drawString(font, eta, etaX, y + 10, 0xFFAAAAAA, true);
1458+
}
1459+
}
14601460

14611461
@Override
14621462
public void onRender(PoseStack matrixStack, float partialTicks)

‎src/main/java/net/wurstclient/hacks/BaseFinderHack.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ protected void onEnable()
369369
lastMinY = minY.getValueI();
370370
lastMaxY = maxY.getValueI();
371371
lastSticky = stickyArea.isChecked();
372-
lastPlayerChunk = ChunkPos.containing(MC.player.blockPosition());
372+
lastPlayerChunk = new ChunkPos(MC.player.blockPosition());
373373
lastAreaSelection = area.getSelected();
374374
coordinator.setQuery((pos, state) -> {
375375
String idFull = BlockUtils.getName(state.getBlock());
@@ -480,7 +480,7 @@ public void onUpdate()
480480
lastSticky = sticky;
481481
}
482482

483-
ChunkPos currentChunk = ChunkPos.containing(MC.player.blockPosition());
483+
ChunkPos currentChunk = new ChunkPos(MC.player.blockPosition());
484484
if(!sticky && !currentChunk.equals(lastPlayerChunk))
485485
{
486486
lastPlayerChunk = currentChunk;

‎src/main/java/net/wurstclient/hacks/EnchantmentHandlerHack.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public final class EnchantmentHandlerHack extends Hack
159159
private int hoveredSlotId = -1;
160160
private long hoverStartMs;
161161
private AbstractContainerScreen<?> lastRenderedScreen;
162-
private GuiGraphicsExtractor lastRenderContext;
162+
private GuiGraphics lastRenderContext;
163163

164164
public EnchantmentHandlerHack()
165165
{
@@ -493,10 +493,10 @@ private void startPanelDrag(double mouseX, double mouseY)
493493
customPosition = true;
494494
}
495495

496-
private void savePanelPosition()
497-
{
498-
if(renderingInventoryScreen)
499-
{
496+
private void savePanelPosition()
497+
{
498+
if(renderingInventoryScreen)
499+
{
500500
savedInventoryPosition.setChecked(inventoryCustomPosition);
501501
savedInventoryX.setValue(inventoryPanelX);
502502
savedInventoryY.setValue(inventoryPanelY);
@@ -511,13 +511,13 @@ private void savePanelPosition()
511511
private void addHiddenPositionSetting(
512512
net.wurstclient.settings.Setting setting)
513513
{
514-
setting.setVisibleInGui(false);
515-
addSetting(setting);
516-
}
517-
518-
private void renderOverlay(GuiGraphics context)
519-
{
520-
hitboxes.clear();
514+
setting.setVisibleInGui(false);
515+
addSetting(setting);
516+
}
517+
518+
private void renderOverlay(GuiGraphics context)
519+
{
520+
hitboxes.clear();
521521

522522
Font tr = MC.font;
523523
float scale = Mth.clamp(textScale.getValueF(), 0.5F, 1.25F);
@@ -881,8 +881,8 @@ else if(cyclePos <= travel + HOVER_SCROLL_PAUSE)
881881
float textX = titleX - renderScroll;
882882
if(useItemIcons.isChecked() && !entry.iconStack.isEmpty())
883883
{
884-
context.item(entry.iconStack, titleX,
885-
entryY + (lineHeight - 16) / 2);
884+
RenderUtils.drawItem(context, entry.iconStack, titleX,
885+
entryY + (lineHeight - 16) / 2, true);
886886
textX += iconSpace;
887887
}
888888
int textY = entryY + Math.max(0,

‎src/main/java/net/wurstclient/hacks/ItemEspHack.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.HashSet;
1515
import java.util.Locale;
1616
import net.minecraft.client.gui.Font;
17-
import net.minecraft.client.gui.GuiGraphicsExtractor;
17+
import net.minecraft.client.gui.GuiGraphics;
1818
import net.minecraft.core.registries.BuiltInRegistries;
1919
import net.minecraft.resources.Identifier;
2020
import net.minecraft.world.InteractionHand;
@@ -244,7 +244,7 @@ protected void onDisable()
244244
}
245245

246246
@Override
247-
public void onRenderGUI(GuiGraphicsExtractor context, float partialTicks)
247+
public void onRenderGUI(GuiGraphics context, float partialTicks)
248248
{
249249
if(!itemTags.isChecked() || MC.level == null || MC.player == null)
250250
return;
@@ -342,8 +342,8 @@ public void onRenderGUI(GuiGraphicsExtractor context, float partialTicks)
342342
}
343343
}
344344

345-
private void drawItemTag(GuiGraphicsExtractor context, Font font,
346-
ItemStack stack, int displayCount, float centerX, float centerY)
345+
private void drawItemTag(GuiGraphics context, Font font, ItemStack stack,
346+
int displayCount, float centerX, float centerY)
347347
{
348348
float scale = itemTagScale.getValueF();
349349
String count = displayCount > 1 ? String.valueOf(displayCount) : "";
@@ -359,9 +359,9 @@ private void drawItemTag(GuiGraphicsExtractor context, Font font,
359359
context.pose().pushMatrix();
360360
context.pose().translate(x + 1 * scale, y + 1 * scale);
361361
context.pose().scale(scale, scale);
362-
context.item(stack, 0, 0);
362+
RenderUtils.drawItem(context, stack, 0, 0, true);
363363
if(!count.isEmpty())
364-
context.text(font, count, 19, 5, 0xFFFFFFFF, true);
364+
context.drawString(font, count, 19, 5, 0xFFFFFFFF, true);
365365
context.pose().popMatrix();
366366
}
367367

‎src/main/java/net/wurstclient/hacks/NbtFilterHack.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ private void debugSanitizedChunk(ChunkPos chunk, int strippedRecords)
562562
private InspectionResult checkBlockEntityPacket(
563563
ClientboundBlockEntityDataPacket packet)
564564
{
565-
ChunkPos chunkPos = ChunkPos.containing(packet.getPos());
565+
ChunkPos chunkPos = new ChunkPos(packet.getPos());
566566
if(isBannedChunk(chunkPos))
567567
return InspectionResult.dangerous(PacketKind.BLOCK_ENTITY,
568568
"block entity in quarantined chunk", -1, chunkPos, null);
@@ -699,10 +699,10 @@ private ChunkPos getAffectedChunk(Packet<?> packet)
699699
return new ChunkPos(p.getX(), p.getZ());
700700

701701
if(packet instanceof ClientboundBlockEntityDataPacket p)
702-
return ChunkPos.containing(p.getPos());
702+
return new ChunkPos(p.getPos());
703703

704704
if(packet instanceof ClientboundBlockUpdatePacket p)
705-
return ChunkPos.containing(p.getPos());
705+
return new ChunkPos(p.getPos());
706706

707707
if(packet instanceof ClientboundSectionBlocksUpdatePacket p)
708708
return getSectionUpdateChunk(p);
@@ -843,12 +843,12 @@ private String formatResultDetails(InspectionResult result)
843843

844844
private int chunkX(ChunkPos chunk)
845845
{
846-
return chunk == null ? 0 : chunk.x();
846+
return chunk == null ? 0 : chunk.x;
847847
}
848848

849849
private int chunkZ(ChunkPos chunk)
850850
{
851-
return chunk == null ? 0 : chunk.z();
851+
return chunk == null ? 0 : chunk.z;
852852
}
853853

854854
private boolean isBannedChunk(ChunkPos chunk)

‎src/main/java/net/wurstclient/hacks/NbtSizeCounterHack.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.Map;
1616
import net.minecraft.client.Camera;
1717
import net.minecraft.client.gui.Font;
18-
import net.minecraft.client.gui.GuiGraphicsExtractor;
18+
import net.minecraft.client.gui.GuiGraphics;
1919
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
2020
import net.minecraft.client.input.MouseButtonEvent;
2121
import net.minecraft.client.multiplayer.ClientLevel;
@@ -269,7 +269,7 @@ public void onContainerScreenClosed(AbstractContainerScreen<?> screen)
269269
}
270270

271271
public void renderOnHandledScreen(AbstractContainerScreen<?> screen,
272-
GuiGraphicsExtractor context)
272+
GuiGraphics context)
273273
{
274274
if(!showScreenOverlay.isChecked())
275275
return;
@@ -324,7 +324,7 @@ public void renderOnHandledScreen(AbstractContainerScreen<?> screen,
324324
y + lines.size() * (font.lineHeight + 1) + 2, 0x90000000);
325325

326326
for(int i = 0; i < lines.size(); i++)
327-
context.text(font, Component.literal(lines.get(i)), x,
327+
context.drawString(font, Component.literal(lines.get(i)), x,
328328
y + i * (font.lineHeight + 1), 0xFFE6E6E6, true);
329329
}
330330

@@ -776,7 +776,7 @@ private void drawWorldLabel(PoseStack matrices, String text, double x,
776776

777777
private long chunkKey(ChunkPos pos)
778778
{
779-
return ((long)pos.x() << 32) ^ (pos.z() & 0xFFFFFFFFL);
779+
return ((long)pos.x << 32) ^ (pos.z & 0xFFFFFFFFL);
780780
}
781781

782782
private ItemStack extractItemStackFromEntityDataPacket(

0 commit comments

Comments
 (0)