R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use vanilla stitcher for simple atlases

Browse Source 
Fixes some minor mod compatibility issues
This commit is contained in:
embeddedt 2024-04-21 21:26:13 -04:00
parent 97e2a318f3
commit 2915a88465
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java
View File

@ -41,10 +41,16 @@ public class StitcherMixin {
*/ */
@Inject(method = "stitch", at = @At("HEAD"), cancellable = true) @Inject(method = "stitch", at = @At("HEAD"), cancellable = true)
private void stitchFast(CallbackInfo ci) { private void stitchFast(CallbackInfo ci) {
this.loadableSpriteInfos = null;
if(!ModernFixPlatformHooks.INSTANCE.isLoadingNormally()) { if(!ModernFixPlatformHooks.INSTANCE.isLoadingNormally()) {
ModernFix.LOGGER.error("Using vanilla stitcher implementation due to invalid loading state"); ModernFix.LOGGER.error("Using vanilla stitcher implementation due to invalid loading state");
return; return;
} }
if(this.texturesToBeStitched.size() < 100) {
// The vanilla implementation is fine for small atlases, and using it allows mods like JEI that depend on
// precise texture alignments to avoid bugs.
return;
}
ci.cancel(); ci.cancel();
ObjectArrayList<Stitcher.Holder> holderList = new ObjectArrayList<>(this.texturesToBeStitched); ObjectArrayList<Stitcher.Holder> holderList = new ObjectArrayList<>(this.texturesToBeStitched);
holderList.sort(HOLDER_COMPARATOR); holderList.sort(HOLDER_COMPARATOR);
@ -69,7 +75,7 @@ public class StitcherMixin {
*/ */
@Inject(method = "gatherSprites", at = @At("HEAD"), cancellable = true) @Inject(method = "gatherSprites", at = @At("HEAD"), cancellable = true)
private void gatherSpritesFast(Stitcher.SpriteLoader spriteLoader, CallbackInfo ci) { private void gatherSpritesFast(Stitcher.SpriteLoader spriteLoader, CallbackInfo ci) {
if(!ModernFixPlatformHooks.INSTANCE.isLoadingNormally()) if(this.loadableSpriteInfos == null)
return; return;
ci.cancel(); ci.cancel();
for(StbStitcher.LoadableSpriteInfo info : loadableSpriteInfos) { for(StbStitcher.LoadableSpriteInfo info : loadableSpriteInfos) {