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

Merge 1.19.2 into 1.19.4

Browse Source
This commit is contained in:
embeddedt 2023-08-03 17:01:13 -04:00
commit b64fefa73c
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java
View File

@ -20,7 +20,7 @@ public class MinecraftMixin {
@Inject(method = "tick", at = @At("HEAD")) @Inject(method = "tick", at = @At("HEAD"))
private void onClientTick(CallbackInfo ci) { private void onClientTick(CallbackInfo ci) {
if(this.overlay == null) { if(this.overlay == null && ModernFixClient.INSTANCE != null) {
ModernFixClient.INSTANCE.onGameLaunchFinish(); ModernFixClient.INSTANCE.onGameLaunchFinish();
} }
} }

18
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resource_key_equality/ResourceKeyMixin.java Normal file
View File

@ -0,0 +1,18 @@
package org.embeddedt.modernfix.forge.mixin.perf.resource_key_equality;
import net.minecraft.resources.ResourceKey;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
@Mixin(ResourceKey.class)
public class ResourceKeyMixin {
/**
* @author embeddedt
* @reason ResourceKeys are interned, so there is no reason to waste time doing any deeper comparison. This override
* is patched in by Forge, it doesn't exist in vanilla
*/
@Overwrite(remap = false)
public boolean equals(Object o) {
return o == this;
}
}