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

Merge remote-tracking branch 'origin/main' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-05-08 16:39:38 -04:00
commit 1639f4297e
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_loading/TextureAtlasMixin.java
View File

@ -25,14 +25,14 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
@Mixin(value = TextureAtlas.class, priority = 1500) @Mixin(value = TextureAtlas.class, priority = 600)
@ClientOnlyMixin @ClientOnlyMixin
public abstract class TextureAtlasMixin { public abstract class TextureAtlasMixin {
@Shadow protected abstract ResourceLocation getResourceLocation(ResourceLocation location); @Shadow protected abstract ResourceLocation getResourceLocation(ResourceLocation location);
@Shadow protected abstract Collection<TextureAtlasSprite.Info> getBasicSpriteInfos(ResourceManager resourceManager, Set<ResourceLocation> spriteLocations); @Shadow protected abstract Collection<TextureAtlasSprite.Info> getBasicSpriteInfos(ResourceManager resourceManager, Set<ResourceLocation> spriteLocations);
private Map<ResourceLocation, Pair<Resource, NativeImage>> loadedImages; private Map<ResourceLocation, Pair<Resource, NativeImage>> loadedImages = new ConcurrentHashMap<>();
private boolean usingFasterLoad; private boolean usingFasterLoad;
private Collection<TextureAtlasSprite.Info> storedResults; private Collection<TextureAtlasSprite.Info> storedResults;
/** /**
@ -48,7 +48,6 @@ public abstract class TextureAtlasMixin {
} }
List<CompletableFuture<?>> futures = new ArrayList<>(); List<CompletableFuture<?>> futures = new ArrayList<>();
ConcurrentLinkedQueue<TextureAtlasSprite.Info> results = new ConcurrentLinkedQueue<>(); ConcurrentLinkedQueue<TextureAtlasSprite.Info> results = new ConcurrentLinkedQueue<>();
loadedImages = new ConcurrentHashMap<>();
for(ResourceLocation location : imageLocations) { for(ResourceLocation location : imageLocations) {
if(MissingTextureAtlasSprite.getLocation().equals(location)) if(MissingTextureAtlasSprite.getLocation().equals(location))
continue; continue;