Skip to content

Commit a68fde9

Browse files
Alexander01998Alexander01998
committed
Update to 26.1-snapshot-11
1 parent e3ba00b commit a68fde9

File tree

9 files changed

+26
-26
lines changed

9 files changed

+26
-26
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
1818

1919
import net.minecraft.client.Camera;
20-
import net.minecraft.client.renderer.state.CameraRenderState;
20+
import net.minecraft.client.renderer.state.level.CameraRenderState;
2121
import net.minecraft.world.level.material.FogType;
2222
import net.wurstclient.WurstClient;
2323
import net.wurstclient.hacks.CameraDistanceHack;
@@ -64,7 +64,7 @@ private void onGetSubmersionType(CallbackInfoReturnable<FogType> cir)
6464
* even without this mixin. Might be a bug in that snapshot.
6565
*/
6666
@Inject(at = @At("RETURN"),
67-
method = "extractRenderState(Lnet/minecraft/client/renderer/state/CameraRenderState;F)V")
67+
method = "extractRenderState(Lnet/minecraft/client/renderer/state/level/CameraRenderState;F)V")
6868
private void onExtractRenderState(CameraRenderState cameraState,
6969
float partialTicks, CallbackInfo ci)
7070
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.mojang.blaze3d.vertex.PoseStack;
1919

2020
import net.minecraft.client.renderer.GameRenderer;
21-
import net.minecraft.client.renderer.state.CameraRenderState;
21+
import net.minecraft.client.renderer.state.level.CameraRenderState;
2222
import net.minecraft.world.entity.LivingEntity;
2323
import net.wurstclient.WurstClient;
2424
import net.wurstclient.event.EventManager;
@@ -32,7 +32,7 @@ public abstract class GameRendererMixin implements AutoCloseable
3232
* Prevents view bobbing when hacks disable it.
3333
*/
3434
@WrapOperation(at = @At(value = "INVOKE",
35-
target = "Lnet/minecraft/client/renderer/GameRenderer;bobView(Lnet/minecraft/client/renderer/state/CameraRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;)V",
35+
target = "Lnet/minecraft/client/renderer/GameRenderer;bobView(Lnet/minecraft/client/renderer/state/level/CameraRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;)V",
3636
ordinal = 0),
3737
method = "renderLevel(Lnet/minecraft/client/DeltaTracker;)V")
3838
private void onBobView(GameRenderer instance, CameraRenderState cameraState,
@@ -77,7 +77,7 @@ private static void onGetNightVisionStrength(LivingEntity entity,
7777
* Makes NoHurtcam work.
7878
*/
7979
@Inject(at = @At("HEAD"),
80-
method = "bobHurt(Lnet/minecraft/client/renderer/state/CameraRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;)V",
80+
method = "bobHurt(Lnet/minecraft/client/renderer/state/level/CameraRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;)V",
8181
cancellable = true)
8282
private void onTiltViewWhenHurt(CameraRenderState cameraState,
8383
PoseStack matrices, CallbackInfo ci)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import net.minecraft.client.renderer.SubmitNodeStorage;
2525
import net.minecraft.client.renderer.feature.NameTagFeatureRenderer;
26-
import net.minecraft.client.renderer.state.CameraRenderState;
26+
import net.minecraft.client.renderer.state.level.CameraRenderState;
2727
import net.minecraft.network.chat.Component;
2828
import net.minecraft.world.phys.Vec3;
2929
import net.wurstclient.WurstClient;
@@ -43,7 +43,7 @@ public class LabelCommandRendererMixin
4343
@WrapOperation(
4444
at = @At(value = "INVOKE",
4545
target = "Lcom/mojang/blaze3d/vertex/PoseStack;scale(FFF)V"),
46-
method = "add(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/CameraRenderState;)V")
46+
method = "add(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/level/CameraRenderState;)V")
4747
private void wrapLabelScale(PoseStack matrices, float x, float y, float z,
4848
Operation<Void> original, PoseStack matrices2, @Nullable Vec3 vec3d,
4949
int i, Component text, boolean bl, int j, double d,
@@ -69,7 +69,7 @@ private void wrapLabelScale(PoseStack matrices, float x, float y, float z,
6969
* is enabled.
7070
*/
7171
@ModifyVariable(at = @At("HEAD"),
72-
method = "add(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/CameraRenderState;)V",
72+
method = "add(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/level/CameraRenderState;)V",
7373
argsOnly = true)
7474
private boolean forceNotSneaking(boolean notSneaking)
7575
{
@@ -86,7 +86,7 @@ private boolean forceNotSneaking(boolean notSneaking)
8686
at = @At(value = "INVOKE",
8787
target = "Ljava/util/List;add(Ljava/lang/Object;)Z",
8888
ordinal = 0),
89-
method = "add(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/CameraRenderState;)V")
89+
method = "add(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/level/CameraRenderState;)V")
9090
private List<SubmitNodeStorage.NameTagSubmit> swapFirstList(
9191
List<SubmitNodeStorage.NameTagSubmit> originalList, Object labelCommand)
9292
{
@@ -108,7 +108,7 @@ private List<SubmitNodeStorage.NameTagSubmit> swapFirstList(
108108
at = @At(value = "INVOKE",
109109
target = "Ljava/util/List;add(Ljava/lang/Object;)Z",
110110
ordinal = 1),
111-
method = "add(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/CameraRenderState;)V")
111+
method = "add(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/phys/Vec3;ILnet/minecraft/network/chat/Component;ZIDLnet/minecraft/client/renderer/state/level/CameraRenderState;)V")
112112
private List<SubmitNodeStorage.NameTagSubmit> swapSecondList(
113113
List<SubmitNodeStorage.NameTagSubmit> originalList, Object labelCommand)
114114
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
import net.minecraft.client.DeltaTracker;
2222
import net.minecraft.client.renderer.LevelRenderer;
2323
import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
24-
import net.minecraft.client.renderer.state.CameraRenderState;
24+
import net.minecraft.client.renderer.state.level.CameraRenderState;
2525
import net.wurstclient.event.EventManager;
2626
import net.wurstclient.events.RenderListener.RenderEvent;
2727

2828
@Mixin(LevelRenderer.class)
2929
public class LevelRendererMixin
3030
{
3131
@Inject(at = @At("RETURN"),
32-
method = "renderLevel(Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;Lnet/minecraft/client/DeltaTracker;ZLnet/minecraft/client/renderer/state/CameraRenderState;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;ZLnet/minecraft/client/renderer/chunk/ChunkSectionsToRender;)V")
32+
method = "renderLevel(Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;Lnet/minecraft/client/DeltaTracker;ZLnet/minecraft/client/renderer/state/level/CameraRenderState;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;ZLnet/minecraft/client/renderer/chunk/ChunkSectionsToRender;)V")
3333
private void onRender(GraphicsResourceAllocator allocator,
3434
DeltaTracker tickCounter, boolean renderBlockOutline,
3535
CameraRenderState cameraState, Matrix4f positionMatrix,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.minecraft.client.renderer.SubmitNodeCollector;
1818
import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
1919
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
20-
import net.minecraft.client.renderer.state.CameraRenderState;
20+
import net.minecraft.client.renderer.state.level.CameraRenderState;
2121
import net.wurstclient.WurstClient;
2222

2323
@Mixin(BlockEntityRenderDispatcher.class)
@@ -27,7 +27,7 @@ public class BlockEntityRenderDispatcherMixin
2727
* Hides block entities like chests when X-Ray is enabled.
2828
*/
2929
@Inject(at = @At("HEAD"),
30-
method = "submit(Lnet/minecraft/client/renderer/blockentity/state/BlockEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/CameraRenderState;)V",
30+
method = "submit(Lnet/minecraft/client/renderer/blockentity/state/BlockEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/CameraRenderState;)V",
3131
cancellable = true)
3232
private <S extends BlockEntityRenderState> void onRenderRenderState(
3333
S renderState, PoseStack matrices, SubmitNodeCollector queue,

‎src/main/java/net/wurstclient/mixin/xray/BlockModelRendererMixin.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import net.minecraft.client.renderer.block.BlockAndTintGetter;
2020
import net.minecraft.client.renderer.block.BlockQuadOutput;
2121
import net.minecraft.client.renderer.block.ModelBlockRenderer;
22-
import net.minecraft.client.renderer.block.model.BakedQuad;
23-
import net.minecraft.client.renderer.block.model.BlockModelPart;
22+
import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
23+
import net.minecraft.client.resources.model.geometry.BakedQuad;
2424
import net.minecraft.core.BlockPos;
2525
import net.minecraft.core.Direction;
2626
import net.minecraft.util.ARGB;
@@ -68,8 +68,8 @@ private boolean onRenderSmoothOrFlat(BlockState state,
6868
* coloring and shading is done, if neither Sodium nor Indigo are running.
6969
*/
7070
@WrapOperation(at = @At(value = "INVOKE",
71-
target = "Lnet/minecraft/client/renderer/block/BlockQuadOutput;put(FFFLnet/minecraft/client/renderer/block/model/BakedQuad;Lcom/mojang/blaze3d/vertex/QuadInstance;)V"),
72-
method = "putQuadWithTint(Lnet/minecraft/client/renderer/block/BlockQuadOutput;FFFLnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/client/renderer/block/model/BakedQuad;)V")
71+
target = "Lnet/minecraft/client/renderer/block/BlockQuadOutput;put(FFFLnet/minecraft/client/resources/model/geometry/BakedQuad;Lcom/mojang/blaze3d/vertex/QuadInstance;)V"),
72+
method = "putQuadWithTint(Lnet/minecraft/client/renderer/block/BlockQuadOutput;FFFLnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/client/resources/model/geometry/BakedQuad;)V")
7373
private void modifyOpacity(BlockQuadOutput output, float x, float y,
7474
float z, BakedQuad quad, QuadInstance instance,
7575
Operation<Void> original)
@@ -94,16 +94,16 @@ private void modifyOpacity(BlockQuadOutput output, float x, float y,
9494
* when X-Ray should hide the block.
9595
*/
9696
@WrapOperation(at = @At(value = "INVOKE",
97-
target = "Lnet/minecraft/client/renderer/block/model/BlockModelPart;getQuads(Lnet/minecraft/core/Direction;)Ljava/util/List;",
97+
target = "Lnet/minecraft/client/renderer/block/dispatch/BlockStateModelPart;getQuads(Lnet/minecraft/core/Direction;)Ljava/util/List;",
9898
ordinal = 1),
9999
method = {
100100
"tesselateFlat(Lnet/minecraft/client/renderer/block/BlockQuadOutput;FFFLjava/util/List;Lnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V",
101101
"tesselateAmbientOcclusion(Lnet/minecraft/client/renderer/block/BlockQuadOutput;FFFLjava/util/List;Lnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V"})
102-
private List<BakedQuad> hideUnculledQuads(BlockModelPart part,
102+
private List<BakedQuad> hideUnculledQuads(BlockStateModelPart part,
103103
Direction direction, Operation<List<BakedQuad>> original,
104104
BlockQuadOutput output, float x, float y, float z,
105-
List<BlockModelPart> list, BlockAndTintGetter level, BlockState state,
106-
BlockPos pos)
105+
List<BlockStateModelPart> list, BlockAndTintGetter level,
106+
BlockState state, BlockPos pos)
107107
{
108108
XRayHack xray = WurstClient.INSTANCE.getHax().xRayHack;
109109
Boolean shouldDrawSide = xray.shouldDrawSide(state, pos);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import net.minecraft.client.gui.navigation.ScreenRectangle;
1717
import net.minecraft.client.gui.render.TextureSetup;
18-
import net.minecraft.client.gui.render.state.GuiElementRenderState;
18+
import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
1919
import net.minecraft.client.renderer.RenderPipelines;
2020

2121
public record CustomQuadRenderState(RenderPipeline pipeline,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"accessWidener": "wurst.accesswidener",
2727
"depends": {
2828
"fabricloader": ">=0.18.3",
29-
"fabric-api": ">=0.143.6",
30-
"minecraft": "~26.1-alpha.10",
29+
"fabric-api": ">=0.143.10",
30+
"minecraft": "~26.1-alpha.11",
3131
"java": ">=25"
3232
},
3333
"suggests": {

‎src/main/resources/wurst.accesswidener‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ accessible method net/minecraft/world/entity/player/Player canGlide ()Z
1212
accessible method net/minecraft/world/entity/projectile/FishingHook calculateOpenWater (Lnet/minecraft/core/BlockPos;)Z
1313
accessible field net/minecraft/client/Minecraft rightClickDelay I
1414
accessible field net/minecraft/client/gui/GuiGraphics scissorStack Lnet/minecraft/client/gui/GuiGraphics$ScissorStack;
15-
accessible field net/minecraft/client/gui/GuiGraphics guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
15+
accessible field net/minecraft/client/gui/GuiGraphics guiRenderState Lnet/minecraft/client/renderer/state/gui/GuiRenderState;
1616
accessible field net/minecraft/client/gui/components/ChatComponent trimmedMessages Ljava/util/List;
1717
accessible field net/minecraft/client/gui/screens/Screen renderables Ljava/util/List;
1818
accessible field net/minecraft/client/gui/screens/TitleScreen fading Z

0 commit comments

Comments
 (0)