Skip to content

Commit 3c5efd8

Browse files
Alexander01998Alexander01998
committed
Update to 1.21.9-pre1
1 parent 64c0a74 commit 3c5efd8

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

‎src/main/java/net/wurstclient/altmanager/AltRenderer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private static Identifier loadOfflineSkin(String name)
6161
UUID uuid = Uuids.getOfflinePlayerUuid(name);
6262
GameProfile profile = new GameProfile(uuid, name);
6363
PlayerListEntry entry = new PlayerListEntry(profile, false);
64-
Identifier texture = entry.getSkinTextures().body();
64+
Identifier texture = entry.getSkinTextures().body().texturePath();
6565
offlineSkins.put(name, texture);
6666
return texture;
6767
}
@@ -91,7 +91,7 @@ private static void queueOnlineSkinLoading(String name)
9191
}, BACKGROUND_THREAD).thenAcceptAsync(skinTextures -> {
9292

9393
if(skinTextures != null)
94-
onlineSkins.put(name, skinTextures.body());
94+
onlineSkins.put(name, skinTextures.body().texturePath());
9595

9696
}, BACKGROUND_THREAD);
9797
}

‎src/main/java/net/wurstclient/mixin/BlockEntityRenderDispatcherMixin.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.spongepowered.asm.mixin.injection.Inject;
1313
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1414

15+
import net.minecraft.class_12075;
1516
import net.minecraft.client.render.block.entity.BlockEntityRenderManager;
1617
import net.minecraft.client.render.block.entity.state.BlockEntityRenderState;
1718
import net.minecraft.client.render.command.OrderedRenderCommandQueue;
@@ -23,11 +24,11 @@
2324
public class BlockEntityRenderDispatcherMixin
2425
{
2526
@Inject(at = @At("HEAD"),
26-
method = "render(Lnet/minecraft/client/render/block/entity/state/BlockEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;)V",
27+
method = "render(Lnet/minecraft/client/render/block/entity/state/BlockEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;Lnet/minecraft/class_12075;)V",
2728
cancellable = true)
2829
private <S extends BlockEntityRenderState> void onRenderRenderState(
2930
S renderState, MatrixStack matrices, OrderedRenderCommandQueue queue,
30-
CallbackInfo ci)
31+
class_12075 otherRenderState, CallbackInfo ci)
3132
{
3233
RenderBlockEntityEvent event = new RenderBlockEntityEvent(renderState);
3334
EventManager.fire(event);

‎src/main/java/net/wurstclient/mixin/LabelCommandRendererMixin.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.List;
1111

1212
import org.jetbrains.annotations.Nullable;
13+
import org.spongepowered.asm.mixin.Final;
1314
import org.spongepowered.asm.mixin.Mixin;
1415
import org.spongepowered.asm.mixin.Shadow;
1516
import org.spongepowered.asm.mixin.injection.At;
@@ -19,6 +20,7 @@
1920
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
2021
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
2122

23+
import net.minecraft.class_12075;
2224
import net.minecraft.client.render.command.LabelCommandRenderer;
2325
import net.minecraft.client.render.command.OrderedRenderCommandQueueImpl;
2426
import net.minecraft.client.util.math.MatrixStack;
@@ -32,18 +34,20 @@ public class LabelCommandRendererMixin
3234
{
3335
// Note: These fields are backwards compared to 25w36b, might be a bug.
3436
@Shadow // labelCommands
35-
private List<OrderedRenderCommandQueueImpl.LabelCommand> field_62987;
37+
@Final
38+
List<OrderedRenderCommandQueueImpl.LabelCommand> field_62987;
3639

3740
@Shadow // seeThroughLabelCommands
38-
private List<OrderedRenderCommandQueueImpl.LabelCommand> field_62988;
41+
@Final
42+
List<OrderedRenderCommandQueueImpl.LabelCommand> field_62988;
3943

4044
@WrapOperation(
4145
at = @At(value = "INVOKE",
4246
target = "Lnet/minecraft/client/util/math/MatrixStack;scale(FFF)V"),
43-
method = "method_74829(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZID)V")
47+
method = "method_74829(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZIDLnet/minecraft/class_12075;)V")
4448
private void wrapLabelScale(MatrixStack matrices, float x, float y, float z,
4549
Operation<Void> original, MatrixStack matrices2, @Nullable Vec3d vec3d,
46-
Text text, boolean bl, int i, double d)
50+
Text text, boolean bl, int i, double d, class_12075 state)
4751
{
4852
NameTagsHack nameTags = WurstClient.INSTANCE.getHax().nameTagsHack;
4953
if(!nameTags.isEnabled())
@@ -65,7 +69,7 @@ private void wrapLabelScale(MatrixStack matrices, float x, float y, float z,
6569
* is enabled.
6670
*/
6771
@ModifyVariable(at = @At("HEAD"),
68-
method = "method_74829(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZID)V",
72+
method = "method_74829(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZIDLnet/minecraft/class_12075;)V",
6973
argsOnly = true)
7074
private boolean forceNotSneaking(boolean notSneaking)
7175
{
@@ -82,7 +86,7 @@ private boolean forceNotSneaking(boolean notSneaking)
8286
at = @At(value = "INVOKE",
8387
target = "Ljava/util/List;add(Ljava/lang/Object;)Z",
8488
ordinal = 0),
85-
method = "method_74829(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZID)V")
89+
method = "method_74829(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZIDLnet/minecraft/class_12075;)V")
8690
private List<OrderedRenderCommandQueueImpl.LabelCommand> swapFirstList(
8791
List<OrderedRenderCommandQueueImpl.LabelCommand> originalList,
8892
Object labelCommand)
@@ -109,7 +113,7 @@ private List<OrderedRenderCommandQueueImpl.LabelCommand> swapFirstList(
109113
at = @At(value = "INVOKE",
110114
target = "Ljava/util/List;add(Ljava/lang/Object;)Z",
111115
ordinal = 1),
112-
method = "method_74829(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZID)V")
116+
method = "method_74829(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZIDLnet/minecraft/class_12075;)V")
113117
private List<OrderedRenderCommandQueueImpl.LabelCommand> swapSecondList(
114118
List<OrderedRenderCommandQueueImpl.LabelCommand> originalList,
115119
Object labelCommand)

‎src/main/java/net/wurstclient/util/RenderUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void applyRenderOffset(MatrixStack matrixStack)
6464

6565
public static Vec3d getCameraPos()
6666
{
67-
Camera camera = WurstClient.MC.getBlockEntityRenderDispatcher().camera;
67+
Camera camera = WurstClient.MC.gameRenderer.getCamera();
6868
if(camera == null)
6969
return Vec3d.ZERO;
7070

@@ -73,7 +73,7 @@ public static Vec3d getCameraPos()
7373

7474
public static BlockPos getCameraBlockPos()
7575
{
76-
Camera camera = WurstClient.MC.getBlockEntityRenderDispatcher().camera;
76+
Camera camera = WurstClient.MC.gameRenderer.getCamera();
7777
if(camera == null)
7878
return BlockPos.ORIGIN;
7979

‎src/main/resources/fabric.mod.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"accessWidener": "wurst.accesswidener",
2828
"depends": {
2929
"fabricloader": ">=0.17.0",
30-
"fabric-api": ">=0.133.5",
31-
"minecraft": "~1.21.9-alpha.25.37.a",
30+
"fabric-api": ">=0.133.7",
31+
"minecraft": "~1.21.9-beta.1",
3232
"java": ">=21"
3333
},
3434
"suggests": {

0 commit comments

Comments
 (0)