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

Do not cache supported glyphs in lazy provider

Browse Source
This commit is contained in:
embeddedt 2026-03-13 19:53:33 -04:00
parent 02f486ebf4
commit 2050516bf1
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/embeddedt/modernfix/render/font/LazyGlyphProvider.java
View File

@ -4,7 +4,6 @@ import com.mojang.blaze3d.font.GlyphInfo;
import com.mojang.blaze3d.font.GlyphProvider; import com.mojang.blaze3d.font.GlyphProvider;
import com.mojang.datafixers.util.Either; import com.mojang.datafixers.util.Either;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.ints.IntSet;
import net.minecraft.client.gui.font.providers.GlyphProviderDefinition; import net.minecraft.client.gui.font.providers.GlyphProviderDefinition;
import net.minecraft.client.gui.font.providers.GlyphProviderType; import net.minecraft.client.gui.font.providers.GlyphProviderType;
@ -21,8 +20,6 @@ public class LazyGlyphProvider implements GlyphProvider {
private SoftReference<GlyphProvider> innerProvider = new SoftReference<>(null); private SoftReference<GlyphProvider> innerProvider = new SoftReference<>(null);
private IntSet supportedGlyphs;
LazyGlyphProvider(GlyphProviderDefinition.Loader loader, ResourceManager manager) { LazyGlyphProvider(GlyphProviderDefinition.Loader loader, ResourceManager manager) {
this.loader = loader; this.loader = loader;
this.manager = manager; this.manager = manager;
@ -61,16 +58,13 @@ public class LazyGlyphProvider implements GlyphProvider {
} }
@Override @Override
public synchronized IntSet getSupportedGlyphs() { public IntSet getSupportedGlyphs() {
if (supportedGlyphs == null) { var prov = getGlyphProvider();
var prov = getGlyphProvider(); if (prov != null) {
if (prov != null) { return prov.getSupportedGlyphs();
supportedGlyphs = new IntOpenHashSet(prov.getSupportedGlyphs()); } else {
} else { return IntSet.of();
supportedGlyphs = IntSet.of();
}
} }
return supportedGlyphs;
} }
private static class Definition implements GlyphProviderDefinition { private static class Definition implements GlyphProviderDefinition {