Skip to content

Commit 00e248e

Browse files
tr7zwtr7zw
committed
Update to 26.1
1 parent 001e1e2 commit 00e248e

13 files changed

Lines changed: 60 additions & 20 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
steps:
1111
- name: checkout repository
1212
uses: actions/checkout@v2
13-
- name: setup jdk 21
13+
- name: setup jdk 25
1414
uses: actions/setup-java@v4
1515
with:
1616
distribution: temurin
17-
java-version: 21
17+
java-version: 25
1818
# to cache gradle files
1919
- name: Setup Gradle
2020
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/tag.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
steps:
99
- name: checkout repository
1010
uses: actions/checkout@v2
11-
- name: setup jdk 21
11+
- name: setup jdk 25
1212
uses: actions/setup-java@v1
1313
with:
14-
java-version: 21
14+
java-version: 25
1515
- name: Get Release Changelog
1616
run: |
1717
# Read the event payload to get the changelog and save it to a file

‎gradle-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: '0.0.2'
2-
source: "https://github.com/tr7zw/ProcessedModTemplate/tree/stonecutter"
2+
source: "https://github.com/tr7zw/ProcessedModTemplate/tree/stonecutter261"
33
replacements:
44
name: "NotEnoughAnimations"
55
id: "notenoughanimations"

settings.json renamed to legacy.json

File renamed without changes.

‎modern.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"versions": [
3+
"26.1-fabric"
4+
]
5+
}

‎src/main/java/dev/tr7zw/notenoughanimations/logic/HeldItemHandler.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Set;
66

77
import dev.tr7zw.notenoughanimations.access.*;
8+
import dev.tr7zw.notenoughanimations.mixins.*;
89
import dev.tr7zw.notenoughanimations.versionless.animations.*;
910
import net.minecraft.client.*;
1011
import net.minecraft.client.renderer.*;
@@ -319,8 +320,19 @@ private void lanternAnimation(LivingEntity entity, PlayerData playerData, ItemSt
319320
// Return pivot
320321
matrices.translate(-chainOffset, -chainYOffset, -chainOffset);
321322

323+
// the 26.1+ version is technically not correct for how stuff should be done
324+
//? if >= 26.0 {
325+
326+
var blockState = new net.minecraft.client.renderer.block.BlockModelRenderState();
327+
((EntityRenderDispatcherAccessor) Minecraft.getInstance().getEntityRenderDispatcher())
328+
.nea$getBlockModelResolver().update(blockState, Block.byItem(itemStack.getItem()).defaultBlockState(),
329+
net.minecraft.client.renderer.block.model.BlockDisplayContext.create());
330+
blockState.submit(matrices, vertexConsumers, 15728880, OverlayTexture.NO_OVERLAY, 0);
331+
//? } else {
332+
/*
322333
vertexConsumers.submitBlock(matrices, Block.byItem(itemStack.getItem()).defaultBlockState(),
323334
LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, 0);
335+
*///? }
324336
matrices.popPose();
325337
}
326338
//? }

‎src/main/java/dev/tr7zw/notenoughanimations/mixins/EntityRenderDispatcherAccessor.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package dev.tr7zw.notenoughanimations.mixins;
2+
3+
import org.spongepowered.asm.mixin.*;
4+
import org.spongepowered.asm.mixin.gen.*;
5+
6+
@Mixin(net.minecraft.client.renderer.entity.EntityRenderDispatcher.class)
7+
public interface EntityRenderDispatcherAccessor {
8+
9+
//? if >= 26.0 {
10+
11+
@Accessor("blockModelResolver")
12+
net.minecraft.client.renderer.block.BlockModelResolver nea$getBlockModelResolver();
13+
//? }
14+
15+
}

‎src/main/java/dev/tr7zw/notenoughanimations/mixins/LevelRendererMixin.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
*///? }
3131
//? if >= 1.19.3 {
3232

33-
import org.joml.Matrix4f;
34-
import org.joml.Vector4f;
33+
import org.joml.*;
3534
//? } else {
3635
/*
3736
import com.mojang.math.Matrix4f;
@@ -41,13 +40,21 @@
4140
public class LevelRendererMixin {
4241

4342
@Inject(method = "renderLevel", at = @At("HEAD"))
44-
//? if >= 1.21.9 {
43+
//? if >= 26.0 {
4544

46-
public void renderLevel(GraphicsResourceAllocator graphicsResourceAllocator, DeltaTracker deltaTracker, boolean bl,
45+
public void renderLevel(final GraphicsResourceAllocator resourceAllocator, final DeltaTracker deltaTracker,
46+
final boolean renderOutline, final net.minecraft.client.renderer.state.level.CameraRenderState cameraState,
47+
final Matrix4fc modelViewMatrix, final com.mojang.blaze3d.buffers.GpuBufferSlice terrainFog,
48+
final Vector4f fogColor, final boolean shouldRenderSky,
49+
final net.minecraft.client.renderer.chunk.ChunkSectionsToRender chunkSectionsToRender, CallbackInfo ci) {
50+
float tickDelta = deltaTracker.getGameTimeDeltaPartialTick(false);
51+
//? } else if >= 1.21.9 {
52+
/*
53+
public void renderLevel(GraphicsResourceAllocator graphicsResourceAllocator, DeltaTracker deltaTracker, boolean bl,
4754
Camera camera, Matrix4f matrix4f, Matrix4f matrix4f2, Matrix4f matrix4f3,
4855
com.mojang.blaze3d.buffers.GpuBufferSlice gpuBufferSlice, Vector4f vector4f, boolean bl2, CallbackInfo ci) {
4956
float tickDelta = deltaTracker.getGameTimeDeltaPartialTick(false);
50-
//? } else if <= 1.20.4 {
57+
*///? } else if <= 1.20.4 {
5158
/*
5259
private void beforeRender(PoseStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline,
5360
Camera camera, GameRenderer gameRenderer, LightTexture lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) {

‎src/main/java/dev/tr7zw/notenoughanimations/mixins/PlayerEntityModelMixin.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract class PlayerEntityModelMixin
2929
extends HumanoidModel<net.minecraft.client.renderer.entity.state.AvatarRenderState> {
3030
//? } else if >= 1.21.2 {
3131
/*
32-
public abstract class PlayerEntityModelMixin extends HumanoidModel<net.minecraft.client.renderer.entity.state.PlayerRenderState> {
32+
public abstract class PlayerEntityModelMixin extends HumanoidModel<net.minecraft.client.renderer.entity.state.AvatarRenderState> {
3333
*///? } else {
3434
/*
3535
public abstract class PlayerEntityModelMixin<T extends net.minecraft.world.entity.LivingEntity> extends HumanoidModel<T> {
@@ -38,7 +38,7 @@ public abstract class PlayerEntityModelMixin<T extends net.minecraft.world.entit
3838
@Unique
3939
//? if >= 1.21.2 && < 1.21.9 {
4040
/*
41-
private static final String SETUP_ANIM_METHOD = "setupAnim(Lnet/minecraft/client/renderer/entity/state/PlayerRenderState;)V";
41+
private static final String SETUP_ANIM_METHOD = "setupAnim(Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;)V";
4242
*///? } else {
4343

4444
private static final String SETUP_ANIM_METHOD = "setupAnim";
@@ -64,7 +64,7 @@ public void setupAnimHEAD(
6464
net.minecraft.client.renderer.entity.state.AvatarRenderState state,
6565
//? } else {
6666
/*
67-
net.minecraft.client.renderer.entity.state.PlayerRenderState state,
67+
net.minecraft.client.renderer.entity.state.AvatarRenderState state,
6868
*///? }
6969
CallbackInfo info) {
7070
if (state == null || !(state instanceof ExtendedLivingRenderState)) {
@@ -100,7 +100,7 @@ public void setupAnim(
100100
net.minecraft.client.renderer.entity.state.AvatarRenderState state,
101101
//? } else {
102102
/*
103-
net.minecraft.client.renderer.entity.state.PlayerRenderState state,
103+
net.minecraft.client.renderer.entity.state.AvatarRenderState state,
104104
*///? }
105105
CallbackInfo info) {
106106
float limbSwing = state.walkAnimationPos; // makes total sense :thumbs_up:
@@ -134,7 +134,7 @@ public void setupAnimEnd(
134134
net.minecraft.client.renderer.entity.state.AvatarRenderState state,
135135
//? } else {
136136
/*
137-
net.minecraft.client.renderer.entity.state.PlayerRenderState state,
137+
net.minecraft.client.renderer.entity.state.AvatarRenderState state,
138138
*///? }
139139
CallbackInfo info) {
140140
AbstractClientPlayer player = null;

‎src/main/java/dev/tr7zw/notenoughanimations/mixins/PlayerRendererMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ private void includeData(net.minecraft.world.entity.Avatar abstractClientPlayer,
8585
}
8686
//? } else if >= 1.21.2 {
8787
/*
88-
@Inject(method = "extractRenderState(Lnet/minecraft/client/player/AbstractClientPlayer;Lnet/minecraft/client/renderer/entity/state/PlayerRenderState;F)V", at = @At("HEAD"))
89-
private void includeData(AbstractClientPlayer abstractClientPlayer, net.minecraft.client.renderer.entity.state.PlayerRenderState playerRenderState, float f,
88+
@Inject(method = "extractRenderState(Lnet/minecraft/client/player/AbstractClientPlayer;Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;F)V", at = @At("HEAD"))
89+
private void includeData(AbstractClientPlayer abstractClientPlayer, net.minecraft.client.renderer.entity.state.AvatarRenderState playerRenderState, float f,
9090
CallbackInfo ci) {
9191
if (abstractClientPlayer instanceof PlayerData playerData) {
9292
RenderStateHolder.RenderStateData data = playerData.getData(RenderStateHolder.INSTANCE,

0 commit comments

Comments
 (0)