Skip to content

Keep immutable sprite frame times beside their animation counters #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BonsUnleashed wants to merge 1 commit into
base: 20.1/forge
Choose a base branch
from
Open

Keep immutable sprite frame times beside their animation counters #579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions ...s/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimatorImplMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package me.jellysquid.mods.sodium.mixin.features.textures.animations.tracking;

import com.google.common.collect.ImmutableList;
import me.jellysquid.mods.sodium.client.SodiumClientMod;
import me.jellysquid.mods.sodium.client.render.texture.SpriteContentsExtended;
import net.minecraft.client.renderer.texture.SpriteContents;
Expand All @@ -26,13 +27,30 @@ public class SpriteContentsAnimatorImplMixin {
@Unique
private SpriteContents parent;

@Unique
private int[] frameTimes;

/**
* @author IMS
* @reason Replace fragile Shadow
*/
@Inject(method = "<init>", at = @At("RETURN"))
public void assignParent(SpriteContents spriteContents, SpriteContents.AnimatedTexture animation, SpriteContents.InterpolationData interpolation, CallbackInfo ci) {
this.parent = spriteContents;
List<SpriteContents.FrameInfo> frames = ((SpriteContentsAnimationAccessor) animation).getFrames();
Class<?> type = frames.getClass();
// Mutable lists supplied by other mods must continue to be read each tick.
if (frames instanceof ImmutableList<?> || type == List.of(0).getClass()
|| type == List.of(0, 1, 2).getClass()) {
int[] times = new int[frames.size()];
for (int i = 0; i < times.length; i++) {
if (frames.get(i) == null) {
return;
}
times[i] = ((SpriteContentsAnimationFrameAccessor) frames.get(i)).getTime();
}
this.frameTimes = times;
}
}

@Inject(method = "tickAndUpload", at = @At("HEAD"), cancellable = true)
Expand All @@ -43,10 +61,18 @@ private void preTick(CallbackInfo ci) {

if (onDemand && !parent.sodium$isActive()) {
this.subFrame++;
List<SpriteContents.FrameInfo> frames = ((SpriteContentsAnimationAccessor)this.animationInfo).getFrames();
if (this.subFrame >= ((SpriteContentsAnimationFrameAccessor)frames.get(this.frame)).getTime()) {
this.frame = (this.frame + 1) % frames.size();
this.subFrame = 0;
int[] times = this.frameTimes;
if (times != null && this.frame >= 0 && this.frame < times.length) {
if (this.subFrame >= times[this.frame]) {
this.frame = (this.frame + 1) % times.length;
this.subFrame = 0;
}
} else {
List<SpriteContents.FrameInfo> frames = ((SpriteContentsAnimationAccessor) this.animationInfo).getFrames();
if (this.subFrame >= ((SpriteContentsAnimationFrameAccessor) frames.get(this.frame)).getTime()) {
this.frame = (this.frame + 1) % frames.size();
this.subFrame = 0;
}
}
ci.cancel();
}
Expand Down
Loading