Skip to content

Commit c448e01

Browse files
cev-apicev-api
committed
Port 1.21.8 to 1.21.1
1 parent 144a814 commit c448e01

File tree

64 files changed

+450
-801
lines changed

Some content is hidden

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

64 files changed

+450
-801
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.8) - Modified by CevAPI
1+
# Wurst Client v7.51.2 (MC1.21.1) - Modified by CevAPI
22

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

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ loom_version=1.13-SNAPSHOT
1818
fabric_version=0.116.7+1.21.1
1919

2020
# Mod Properties
21-
mod_version=v7.51.2-CevaPI-MC1.21.1
21+
mod_version=v7.51.2-CevAPI-MC1.21.1
2222
maven_group=net.wurstclient
2323
archives_base_name=Wurst-Client
2424
mod_loader=Fabric

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import net.minecraft.Util;
5757
import net.minecraft.client.Minecraft;
5858
import net.minecraft.client.gui.components.toasts.SystemToast;
59-
import net.minecraft.client.gui.components.toasts.ToastManager;
59+
import net.minecraft.client.gui.components.toasts.ToastComponent;
6060
import net.minecraft.client.multiplayer.ClientPacketListener;
6161
import net.minecraft.network.Connection;
6262
import net.minecraft.network.chat.Component;
@@ -252,7 +252,7 @@ public static boolean applyDecision(PolicyResult result,
252252
Minecraft target =
253253
mcClient != null ? mcClient : Minecraft.getInstance();
254254
if(target != null)
255-
target.getToastManager().queued.clear();
255+
target.getToasts().queued.clear();
256256
sendStatus(connection, context,
257257
ServerboundResourcePackPacket.Action.DECLINED);
258258
noteHandled(context);
@@ -405,7 +405,7 @@ public static void flushToasts()
405405
TOAST_QUEUE.clear();
406406
}
407407

408-
ToastManager manager = client.getToastManager();
408+
ToastComponent manager = client.getToasts();
409409
for(ToastPayload payload : payloads)
410410
{
411411
try

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

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,14 @@ public enum WurstRenderLayers
166166
* culling.
167167
*/
168168
public static final RenderType.CompositeRenderType QUADS_NO_CULLING =
169-
RenderType.create("wurst:quads_no_culling", 1536, false, true,
170-
WurstShaderPipelines.QUADS_NO_CULLING,
171-
RenderType.CompositeState.builder().createCompositeState(false));
169+
RenderType.create("wurst:quads_no_culling",
170+
DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.QUADS, 1536,
171+
false, true,
172+
RenderType.CompositeState.builder()
173+
.setShaderState(RenderType.POSITION_COLOR_SHADER)
174+
.setTransparencyState(RenderType.TRANSLUCENT_TRANSPARENCY)
175+
.setDepthTestState(RenderType.LEQUAL_DEPTH_TEST)
176+
.setCullState(RenderType.NO_CULL).createCompositeState(false));
172177

173178
/**
174179
* Similar to {@link RenderType#debugQuads()}, but with culling enabled
@@ -249,16 +254,25 @@ public static RenderType getLines(boolean depthTest)
249254
public static RenderType.CompositeRenderType getLines(boolean depthTest,
250255
double width)
251256
{
252-
return RenderType.create(
253-
depthTest ? "wurst:lines_custom" : "wurst:esp_lines_custom", 1536,
254-
depthTest ? WurstShaderPipelines.DEPTH_TEST_LINES
255-
: WurstShaderPipelines.ESP_LINES,
257+
RenderType.CompositeState.CompositeStateBuilder builder =
256258
RenderType.CompositeState.builder()
259+
.setShaderState(RenderType.RENDERTYPE_LINES_SHADER)
257260
.setLineState(new RenderStateShard.LineStateShard(
258261
OptionalDouble.of(width)))
259262
.setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING)
260263
.setOutputState(RenderType.ITEM_ENTITY_TARGET)
261-
.createCompositeState(false));
264+
.setWriteMaskState(RenderType.COLOR_DEPTH_WRITE)
265+
.setCullState(RenderType.NO_CULL);
266+
267+
if(depthTest)
268+
builder.setDepthTestState(RenderType.LEQUAL_DEPTH_TEST);
269+
else
270+
builder.setDepthTestState(RenderType.NO_DEPTH_TEST);
271+
272+
return RenderType.create(
273+
depthTest ? "wurst:lines_custom" : "wurst:esp_lines_custom",
274+
DefaultVertexFormat.POSITION_COLOR_NORMAL, VertexFormat.Mode.LINES,
275+
1536, false, true, builder.createCompositeState(false));
262276
}
263277

264278
/**
@@ -283,17 +297,26 @@ public static RenderType getLineStrip(boolean depthTest)
283297
public static RenderType.CompositeRenderType getLineStrip(boolean depthTest,
284298
double width)
285299
{
286-
return RenderType.create(
287-
depthTest
288-
? "wurst:line_strip_custom" : "wurst:esp_line_strip_custom",
289-
1536,
290-
depthTest ? WurstShaderPipelines.DEPTH_TEST_LINE_STRIP
291-
: WurstShaderPipelines.ESP_LINE_STRIP,
300+
RenderType.CompositeState.CompositeStateBuilder builder =
292301
RenderType.CompositeState.builder()
302+
.setShaderState(RenderType.RENDERTYPE_LINES_SHADER)
293303
.setLineState(new RenderStateShard.LineStateShard(
294-
java.util.OptionalDouble.of(width)))
304+
OptionalDouble.of(width)))
295305
.setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING)
296306
.setOutputState(RenderType.ITEM_ENTITY_TARGET)
297-
.createCompositeState(false));
307+
.setWriteMaskState(RenderType.COLOR_DEPTH_WRITE)
308+
.setCullState(RenderType.NO_CULL);
309+
310+
if(depthTest)
311+
builder.setDepthTestState(RenderType.LEQUAL_DEPTH_TEST);
312+
else
313+
builder.setDepthTestState(RenderType.NO_DEPTH_TEST);
314+
315+
return RenderType.create(
316+
depthTest ? "wurst:line_strip_custom"
317+
: "wurst:esp_line_strip_custom",
318+
DefaultVertexFormat.POSITION_COLOR_NORMAL,
319+
VertexFormat.Mode.LINE_STRIP, 1536, false, true,
320+
builder.createCompositeState(false));
298321
}
299322
}

‎src/main/java/net/wurstclient/clickgui/ClickGui.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import net.wurstclient.hacks.ClickGuiHack;
3737
import net.wurstclient.hacks.TooManyHaxHack;
3838
import net.wurstclient.settings.Setting;
39+
import net.wurstclient.util.GuiRenderStateHelper;
3940
import net.wurstclient.util.RenderUtils;
4041
import net.wurstclient.util.json.JsonUtils;
4142

@@ -724,9 +725,9 @@ public void render(GuiGraphics context, int mouseX, int mouseY,
724725
renderPopups(context, mouseX, mouseY);
725726
renderTooltip(context, mouseX, mouseY);
726727

727-
matrixStack.popMatrix();
728+
matrixStack.popPose();
728729
for(int i = 0; i < windowLayers; i++)
729-
context.guiRenderState.down();
730+
GuiRenderStateHelper.down(context);
730731
windowLayers = 0;
731732
}
732733

@@ -819,16 +820,16 @@ public void renderPinnedWindows(GuiGraphics context, float partialTicks)
819820
renderWindowsWithIsolation(context, pinnedWindows,
820821
Integer.MIN_VALUE, Integer.MIN_VALUE, partialTicks);
821822
for(int i = 0; i < windowLayers; i++)
822-
context.guiRenderState.down();
823+
GuiRenderStateHelper.down(context);
823824
windowLayers = previousLayers;
824825
}else
825826
{
826827
for(Window window : pinnedWindows)
827828
{
828-
context.guiRenderState.up();
829+
GuiRenderStateHelper.up(context);
829830
renderWindow(context, window, Integer.MIN_VALUE,
830831
Integer.MIN_VALUE, partialTicks);
831-
context.guiRenderState.down();
832+
GuiRenderStateHelper.down(context);
832833
}
833834
}
834835
}
@@ -1109,7 +1110,7 @@ private void renderWindowsWithIsolation(GuiGraphics context,
11091110

11101111
private void pushWindowLayer(GuiGraphics context)
11111112
{
1112-
context.guiRenderState.up();
1113+
GuiRenderStateHelper.up(context);
11131114
windowLayers++;
11141115
}
11151116

‎src/main/java/net/wurstclient/clickgui/StringDropdownPopup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.minecraft.client.gui.GuiGraphics;
1414
import net.wurstclient.WurstClient;
1515
import net.wurstclient.settings.StringDropdownSetting;
16+
import net.wurstclient.util.GuiRenderStateHelper;
1617
import net.wurstclient.util.RenderUtils;
1718

1819
public final class StringDropdownPopup extends Popup
@@ -122,7 +123,7 @@ public void render(GuiGraphics context, int mouseX, int mouseY)
122123
context.fill(x1, yi1, x2, yi2, RenderUtils.toIntColor(
123124
GUI.getBgColor(), GUI.getOpacity() * (hValue ? 1.5F : 1)));
124125

125-
context.guiRenderState.up();
126+
GuiRenderStateHelper.up(context);
126127
context.drawString(TR, value, x1 + 2, yi1 + 2, GUI.getTxtColor(),
127128
false);
128129

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import net.wurstclient.clickgui.Window;
1919
import net.wurstclient.hacks.TooManyHaxHack;
2020
import net.wurstclient.util.ChatUtils;
21+
import net.wurstclient.util.GuiRenderStateHelper;
2122
import net.wurstclient.util.RenderUtils;
2223
import net.wurstclient.ui.UiScale;
2324
import org.lwjgl.glfw.GLFW;
@@ -155,7 +156,7 @@ public void render(GuiGraphics context, int mouseX, int mouseY,
155156
RenderUtils.drawScaledText(context, TR, name, tx, ty, GUI.getTxtColor(),
156157
false, scale);
157158

158-
context.guiRenderState.down();
159+
GuiRenderStateHelper.down(context);
159160
}
160161

161162
private int getButtonColor(boolean enabled, boolean hovering)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import net.wurstclient.settings.MobWeaponRuleSetting;
2424
import net.wurstclient.settings.MobWeaponRuleSetting.MobOption;
2525
import net.wurstclient.settings.MobWeaponRuleSetting.WeaponCategory;
26+
import net.wurstclient.util.GuiRenderStateHelper;
2627
import net.wurstclient.util.RenderUtils;
2728

2829
public final class MobWeaponRuleComponent extends Component
@@ -163,7 +164,7 @@ private void drawDropdown(GuiGraphics context, Box box, String value,
163164
RenderUtils.toIntColor(GUI.getBgColor(),
164165
GUI.getOpacity() * (hovering ? 1.5F : 1F)));
165166

166-
context.guiRenderState.up();
167+
GuiRenderStateHelper.up(context);
167168

168169
// outlines
169170
int outlineColor = RenderUtils.toIntColor(GUI.getAcColor(), 0.5F);
@@ -335,7 +336,7 @@ public void render(GuiGraphics context, int mouseX, int mouseY)
335336
RenderUtils.toIntColor(GUI.getBgColor(),
336337
GUI.getOpacity() * (hovering ? 1.5F : 1F)));
337338

338-
context.guiRenderState.up();
339+
GuiRenderStateHelper.up(context);
339340
context.drawString(TR, labelGetter.apply(option), x1 + 2,
340341
currentY + 2, GUI.getTxtColor(), false);
341342

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import net.wurstclient.clickgui.Component;
1818
import net.wurstclient.clickgui.StringDropdownPopup;
1919
import net.wurstclient.settings.StringDropdownSetting;
20+
import net.wurstclient.util.GuiRenderStateHelper;
2021
import net.wurstclient.util.RenderUtils;
2122

2223
public final class StringDropdownComponent extends Component
@@ -106,7 +107,7 @@ public void render(GuiGraphics context, int mouseX, int mouseY,
106107
context.fill(x1, getY(), x2, boxY1, getFillColor(false));
107108
context.fill(x1, boxY1, x2, boxY2, getFillColor(hBox));
108109

109-
context.guiRenderState.up();
110+
GuiRenderStateHelper.up(context);
110111

111112
int outlineColor = RenderUtils.toIntColor(GUI.getAcColor(), 0.5F);
112113
RenderUtils.drawBorder2D(context, x1, boxY1, x2, boxY2, outlineColor);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Locale;
1313
import java.util.Objects;
1414

15-
import org.jetbrains.annotations.Nullable;
1615
import org.lwjgl.glfw.GLFW;
1716

1817
import com.mojang.blaze3d.vertex.PoseStack;
@@ -32,13 +31,15 @@
3231
import net.minecraft.network.chat.Component;
3332
import net.minecraft.resources.ResourceLocation;
3433
import net.minecraft.tags.EnchantmentTags;
34+
import net.minecraft.util.CommonColors;
3535
import net.minecraft.world.item.Item;
3636
import net.minecraft.world.item.ItemStack;
3737
import net.minecraft.world.item.Items;
3838
import net.minecraft.world.item.enchantment.Enchantment;
3939
import net.wurstclient.clickgui.widgets.MultiSelectEntryListWidget;
4040
import net.wurstclient.hacks.autolibrarian.BookOffer;
4141
import net.wurstclient.settings.BookOffersSetting;
42+
import net.wurstclient.util.WurstColors;
4243
import net.wurstclient.util.MathUtils;
4344
import net.wurstclient.util.RenderUtils;
4445

0 commit comments

Comments
 (0)