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-03-11 11:51:31 -05:00
commit 42fe91ad91
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/embeddedt/modernfix/ModernFixClient.java
View File

@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.ConnectScreen; import net.minecraft.client.gui.screens.ConnectScreen;
import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraftforge.client.event.ScreenOpenEvent; import net.minecraftforge.client.event.ScreenEvent;
import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.network.syncher.SynchedEntityData;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
@ -53,7 +53,7 @@ public class ModernFixClient {
} }
@SubscribeEvent(priority = EventPriority.LOWEST) @SubscribeEvent(priority = EventPriority.LOWEST)
public void onMultiplayerConnect(ScreenOpenEvent event) { public void onMultiplayerConnect(ScreenEvent.InitScreenEvent.Pre event) {
if(event.getScreen() instanceof ConnectScreen && !event.isCanceled()) { if(event.getScreen() instanceof ConnectScreen && !event.isCanceled()) {
worldLoadStartTime = System.nanoTime(); worldLoadStartTime = System.nanoTime();
} else if (event.getScreen() instanceof TitleScreen && gameStartTimeSeconds < 0) { } else if (event.getScreen() instanceof TitleScreen && gameStartTimeSeconds < 0) {