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

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

Browse Source
This commit is contained in:
embeddedt 2023-05-06 11:46:15 -04:00
commit 7eb702545b
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -5,6 +5,12 @@ A performance mod for modern Minecraft that significantly improves launch times,
Some fixes are based on prior work in various Forge PRs (check commit history and/or code comments). The config system Some fixes are based on prior work in various Forge PRs (check commit history and/or code comments). The config system
is directly derived from Sodium and used under the terms of the LGPL-3.0 license. is directly derived from Sodium and used under the terms of the LGPL-3.0 license.
## Development builds (generally stable, but may occasionally have bugs)
- 1.16.5, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/main/Package.zip
- 1.18.2, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/1.18/Package.zip
- 1.19.2, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/1.19.2/Package.zip
- 1.19.4, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/1.19.4/Package.zip
------------ ------------
![YourKit logo](https://www.yourkit.com/images/yklogo.png) ![YourKit logo](https://www.yourkit.com/images/yklogo.png)

7
common/src/main/java/org/embeddedt/modernfix/ModernFix.java
View File

@ -31,7 +31,12 @@ public class ModernFix {
static { static {
if(ModernFixMixinPlugin.instance.isOptionEnabled("perf.dedicated_reload_executor.ReloadExecutor")) { if(ModernFixMixinPlugin.instance.isOptionEnabled("perf.dedicated_reload_executor.ReloadExecutor")) {
resourceReloadService = Util.makeExecutor("ResourceReload"); try {
resourceReloadService = Util.makeExecutor("ResourceReload");
} catch(Throwable e) {
LOGGER.error("Error creating resource reload service, using fallback", e);
resourceReloadService = Util.backgroundExecutor();
}
} else { } else {
resourceReloadService = Util.backgroundExecutor(); resourceReloadService = Util.backgroundExecutor();
} }

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

@ -27,7 +27,7 @@ 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(TextureAtlas.class) @Mixin(value = TextureAtlas.class, priority = 1500)
@ClientOnlyMixin @ClientOnlyMixin
public abstract class TextureAtlasMixin { public abstract class TextureAtlasMixin {
@Shadow protected abstract ResourceLocation getResourceLocation(ResourceLocation location); @Shadow protected abstract ResourceLocation getResourceLocation(ResourceLocation location);

5
forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
View File

@ -111,7 +111,10 @@ public class ModernFixPlatformHooksImpl {
try { try {
return (TextureAtlasSprite)textureAtlasSpriteConstruct.invokeExact(atlasTexture, textureInfo, mipmapLevel, atlasWidth, atlasHeight, spriteX, spriteY, image); return (TextureAtlasSprite)textureAtlasSpriteConstruct.invokeExact(atlasTexture, textureInfo, mipmapLevel, atlasWidth, atlasHeight, spriteX, spriteY, image);
} catch(Throwable e) { } catch(Throwable e) {
throw new AssertionError("MethodHandle failed", e); if(e instanceof RuntimeException)
throw (RuntimeException)e;
else
throw new RuntimeException("TextureAtlasSprite construction failed", e);
} }
} }
} }