Skip to content

Commit 7b06786

Browse files
cev-apicev-api
committed
Update to MC1.21.11
1 parent f9427aa commit 7b06786

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+254
-209
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Wurst Client v7.51.2 (MC1.21.10) - Modified by CevAPI
1+
# Wurst Client v7.51.3 (MC1.21.11) - Modified by CevAPI
22

33
![CevAPI Logo](https://i.imgur.com/kBIn9Ab.png)
44

‎src/main/java/net/cevapi/config/AntiFingerprintConfigScreen.java‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -56,58 +56,55 @@ protected void init()
5656
.bounds(centerX - 100, doneButtonY, 200, 20).build());
5757

5858
addRenderableWidget(CycleButton.<AntiFingerprintConfig.Policy> builder(
59-
policy -> Component.literal(policy.toString()))
60-
.withValues(AntiFingerprintConfig.Policy.values())
61-
.withInitialValue(config.getPolicy()).create(centerX - 100, y, 200,
62-
20, Component.literal("Policy"), (button, value) -> config
63-
.getPolicySetting().setSelected(value)));
59+
policy -> Component.literal(policy.toString()), config::getPolicy)
60+
.withValues(AntiFingerprintConfig.Policy.values()).create(
61+
centerX - 100, y, 200, 20, Component.literal("Policy"), (button,
62+
value) -> config.getPolicySetting().setSelected(value)));
6463
y += 26;
6564

6665
addRenderableWidget(
6766
CycleButton.<AntiFingerprintConfig.ToastVerbosity> builder(
68-
level -> Component.literal(level.toString()))
67+
level -> Component.literal(level.toString()),
68+
config::getToastVerbosity)
6969
.withValues(AntiFingerprintConfig.ToastVerbosity.values())
70-
.withInitialValue(config.getToastVerbosity())
7170
.create(centerX - 100, y, 200, 20,
7271
Component.literal("Toast verbosity"),
7372
(button, value) -> config.getToastVerbositySetting()
7473
.setSelected(value)));
7574
y += 26;
7675

77-
addRenderableWidget(CycleButton.onOffBuilder()
78-
.withInitialValue(config.isAuditLogEnabled()).create(centerX - 100,
79-
y, 200, 20, Component.literal("Audit logging"), (button,
80-
value) -> config.getAuditLogSetting().setChecked(value)));
76+
addRenderableWidget(CycleButton.onOffBuilder(config.isAuditLogEnabled())
77+
.create(centerX - 100, y, 200, 20,
78+
Component.literal("Audit logging"), (button, value) -> config
79+
.getAuditLogSetting().setChecked(value)));
8180
y += 34;
8281

83-
addRenderableWidget(CycleButton.onOffBuilder()
84-
.withInitialValue(config.shouldClearCache()).create(centerX - 100,
85-
y, 200, 20, Component.literal("Clear cache before download"),
86-
(button, value) -> config.getPurgeCacheSetting()
87-
.setChecked(value)));
82+
addRenderableWidget(CycleButton.onOffBuilder(config.shouldClearCache())
83+
.create(centerX - 100, y, 200, 20,
84+
Component.literal("Clear cache before download"), (button,
85+
value) -> config.getPurgeCacheSetting().setChecked(value)));
8886
y += 34;
8987

90-
addRenderableWidget(CycleButton.onOffBuilder()
91-
.withInitialValue(config.shouldIsolateCache()).create(centerX - 100,
92-
y, 200, 20, Component.literal("Isolate cached packs"),
88+
addRenderableWidget(CycleButton
89+
.onOffBuilder(config.shouldIsolateCache()).create(centerX - 100, y,
90+
200, 20, Component.literal("Isolate cached packs"),
9391
(button, value) -> config.getIsolateCacheSetting()
9492
.setChecked(value)));
9593
y += 34;
9694

97-
addRenderableWidget(CycleButton.onOffBuilder()
98-
.withInitialValue(config.shouldExtractSandbox())
99-
.create(centerX - 100, y, 200, 20,
100-
Component.literal("Extract sandbox copy"),
95+
addRenderableWidget(CycleButton
96+
.onOffBuilder(config.shouldExtractSandbox()).create(centerX - 100,
97+
y, 200, 20, Component.literal("Extract sandbox copy"),
10198
(button, value) -> config.getExtractSandboxSetting()
10299
.setChecked(value)));
103100
y += 34;
104101

105-
addRenderableWidget(CycleButton.onOffBuilder()
106-
.withInitialValue(config.shouldShowMultiplayerButton())
107-
.create(centerX - 100, y, 200, 20,
108-
Component.literal("Show Multiplayer button"),
109-
(button, value) -> config.getShowMultiplayerButtonSetting()
110-
.setChecked(value)));
102+
addRenderableWidget(
103+
CycleButton.onOffBuilder(config.shouldShowMultiplayerButton())
104+
.create(centerX - 100, y, 200, 20,
105+
Component.literal("Show Multiplayer button"),
106+
(button, value) -> config.getShowMultiplayerButtonSetting()
107+
.setChecked(value)));
111108
y += 34;
112109

113110
// Extra breathing room before first text field so labels never clip

‎src/main/java/net/cevapi/security/ResourcePackProtector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import net.cevapi.config.AntiFingerprintConfig;
5454
import net.cevapi.config.AntiFingerprintConfig.Policy;
5555
import net.cevapi.config.AntiFingerprintConfig.ToastLevel;
56-
import net.minecraft.Util;
56+
import net.minecraft.util.Util;
5757
import net.minecraft.client.Minecraft;
5858
import net.minecraft.client.gui.components.toasts.SystemToast;
5959
import net.minecraft.client.gui.components.toasts.ToastManager;

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@ public enum WurstRenderLayers
5151
"wurst:esp_quads", RenderSetup.builder(WurstShaderPipelines.ESP_QUADS)
5252
.sortOnUpload().createRenderSetup());
5353

54+
/**
55+
* Similar to {@link RenderType#getDebugQuads()}, but without back-face
56+
* culling.
57+
*/
58+
public static final RenderType QUADS_NO_CULLING =
59+
RenderType.create("wurst:quads_no_culling",
60+
RenderSetup.builder(WurstShaderPipelines.QUADS_NO_CULLING)
61+
.sortOnUpload().useLightmap().createRenderSetup());
62+
5463
/**
5564
* Similar to {@link RenderType#getDebugQuads()}, but with no depth test.
5665
*/
@@ -76,4 +85,22 @@ public static RenderType getLines(boolean depthTest)
7685
{
7786
return depthTest ? LINES : ESP_LINES;
7887
}
88+
89+
/**
90+
* Kept for backwards compatibility. The {@code lineWidth} parameter is
91+
* currently handled per-vertex via {@code setLineWidth()}.
92+
*/
93+
public static RenderType getLines(boolean depthTest, double lineWidth)
94+
{
95+
return getLines(depthTest);
96+
}
97+
98+
/**
99+
* Returns the same RenderType as {@link #getLines(boolean)}. Line strips
100+
* are rendered via explicit segments, so this simply forwards the request.
101+
*/
102+
public static RenderType getLineStrip(boolean depthTest, double width)
103+
{
104+
return getLines(depthTest);
105+
}
79106
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public enum WurstShaderPipelines
6565
public static final RenderPipeline QUADS_NO_CULLING = RenderPipelines
6666
.register(RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
6767
.withLocation(
68-
ResourceLocation.parse("wurst:pipeline/wurst_quads_no_culling"))
68+
Identifier.parse("wurst:pipeline/wurst_quads_no_culling"))
6969
.withCull(false)
7070
.withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST)
7171
.build());

‎src/main/java/net/wurstclient/chestsearch/ChestCleaner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void register()
5858
String curDimension = null;
5959
try
6060
{
61-
curDimension = mc.level.dimension().location().toString();
61+
curDimension = mc.level.dimension().identifier().toString();
6262
}catch(Throwable ignored)
6363
{}
6464
// reset grace timer on server/dimension change
@@ -86,7 +86,7 @@ public void register()
8686
String dimension = null;
8787
try
8888
{
89-
dimension = mc.level.dimension().location().toString();
89+
dimension = mc.level.dimension().identifier().toString();
9090
}catch(Throwable ignored)
9191
{}
9292

‎src/main/java/net/wurstclient/chestsearch/ChestRecorder.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.minecraft.core.Holder;
1313
import net.minecraft.core.component.DataComponents;
1414
import net.minecraft.core.registries.BuiltInRegistries;
15-
import net.minecraft.resources.ResourceLocation;
15+
import net.minecraft.resources.Identifier;
1616
import net.minecraft.world.effect.MobEffect;
1717
import net.minecraft.world.effect.MobEffectInstance;
1818
import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -376,8 +376,8 @@ private void recordFromStacksInternal(String serverIp, String dimension,
376376
Holder<Enchantment> ren = e.getKey();
377377
if(ren == null)
378378
continue;
379-
ResourceLocation id = ren.unwrapKey()
380-
.map(k -> k.location()).orElse(null);
379+
Identifier id = ren.unwrapKey()
380+
.map(k -> k.identifier()).orElse(null);
381381
String idStr = id != null ? id.toString()
382382
: ren.getRegisteredName();
383383
int lvl = e.getIntValue();
@@ -404,8 +404,8 @@ private void recordFromStacksInternal(String serverIp, String dimension,
404404
.getAllEffects())
405405
{
406406
Holder<MobEffect> effEntry = sei.getEffect();
407-
ResourceLocation id = effEntry.unwrapKey()
408-
.map(k -> k.location()).orElse(null);
407+
Identifier id = effEntry.unwrapKey()
408+
.map(k -> k.identifier()).orElse(null);
409409
String idStr = id != null ? id.toString()
410410
: effEntry.getRegisteredName();
411411
if(idStr != null && !idStr.isBlank())
@@ -422,9 +422,8 @@ private void recordFromStacksInternal(String serverIp, String dimension,
422422
potionContents.potion();
423423
if(basePotion.isPresent())
424424
{
425-
ResourceLocation id =
426-
basePotion.get().unwrapKey()
427-
.map(k -> k.location()).orElse(null);
425+
Identifier id = basePotion.get().unwrapKey()
426+
.map(k -> k.identifier()).orElse(null);
428427
String idStr = id != null ? id.toString()
429428
: basePotion.get().getRegisteredName();
430429
it.primaryPotion = idStr;

‎src/main/java/net/wurstclient/chestsearch/ChestSearchMarkerRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.mojang.blaze3d.vertex.VertexConsumer;
1212
import java.util.List;
1313
import net.minecraft.client.renderer.MultiBufferSource;
14-
import net.minecraft.client.renderer.RenderType;
14+
import net.minecraft.client.renderer.rendertype.RenderType;
1515
import net.minecraft.world.phys.AABB;
1616
import net.minecraft.world.phys.Vec3;
1717
import net.wurstclient.WurstRenderLayers;

‎src/main/java/net/wurstclient/chestsearch/TargetHighlighter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public synchronized void onRender(PoseStack matrixStack, float partialTicks)
101101
{
102102
if(WurstClient.MC == null || WurstClient.MC.level == null)
103103
return;
104-
String dim = WurstClient.MC.level.dimension().location().toString();
104+
String dim = WurstClient.MC.level.dimension().identifier().toString();
105105
long now = System.currentTimeMillis();
106106
List<AABB> boxes = new ArrayList<>();
107107
Iterator<Map.Entry<String, Target>> it = targets.entrySet().iterator();

‎src/main/java/net/wurstclient/clickgui/components/TextFieldEditButton.java‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import net.minecraft.client.input.CharacterEvent;
1717
import net.minecraft.client.input.KeyEvent;
1818
import net.minecraft.client.input.MouseButtonEvent;
19+
import net.minecraft.network.chat.Style;
1920
import net.wurstclient.clickgui.ClickGui;
2021
import net.wurstclient.clickgui.Component;
2122
import net.wurstclient.clickgui.KeyboardInput;
22-
import net.wurstclient.clickgui.Window;
2323
import net.wurstclient.settings.TextFieldSetting;
2424
import net.wurstclient.util.ChatUtils;
2525
import net.wurstclient.util.RenderUtils;
@@ -67,7 +67,7 @@ public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
6767
{
6868
if(!editing)
6969
startEditing();
70-
inlineField.mouseClicked(context, false);
70+
inlineField.onClick(context, false);
7171
}else if(editing)
7272
finishEditing(true);
7373
break;
@@ -157,7 +157,7 @@ else if(hBox && !editing)
157157
TR.getSplitter().plainIndexAtWidth(value, maxWidth, Style.EMPTY);
158158
if(maxLength < value.length())
159159
value = value.substring(0, maxLength) + "...";
160-
context.drawString(TR, value, x1 + 2, y3 + 2, txtColor, false);
160+
context.drawString(TR, value, x1 + 2, boxY1 + 2, txtColor, false);
161161
}
162162

163163
@Override
@@ -171,4 +171,39 @@ public int getDefaultHeight()
171171
{
172172
return TEXT_HEIGHT * 2;
173173
}
174+
175+
private void updateInlineFieldBounds()
176+
{
177+
int x = getX() + 2;
178+
int y = getY() + TEXT_HEIGHT + 2;
179+
int width = Math.max(0, getWidth() - 4);
180+
inlineField.setX(x);
181+
inlineField.setY(y);
182+
inlineField.setWidth(width);
183+
inlineField.setHeight(TEXT_HEIGHT);
184+
}
185+
186+
@Override
187+
public boolean onKeyPressed(KeyEvent event)
188+
{
189+
if(!editing)
190+
return false;
191+
192+
return inlineField.keyPressed(event);
193+
}
194+
195+
@Override
196+
public boolean onCharTyped(CharacterEvent event)
197+
{
198+
if(!editing)
199+
return false;
200+
201+
return inlineField.charTyped(event);
202+
}
203+
204+
@Override
205+
public void onKeyboardFocusLost()
206+
{
207+
finishEditing(true);
208+
}
174209
}

0 commit comments

Comments
 (0)