Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2025-02-27 03:33:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename ViaFabricPlus#init

Browse Source
This commit is contained in:
FlorianMichael 2024-04-23 20:22:07 +02:00
parent 0b84e59948
commit ac6d5b8ee6
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
View File

@ -60,7 +60,7 @@ public class ViaFabricPlus {
private CompletableFuture<Void> loadingFuture; private CompletableFuture<Void> loadingFuture;
@SuppressWarnings("ResultOfMethodCallIgnored") @SuppressWarnings("ResultOfMethodCallIgnored")
public void bootstrap() { public void init() {
directory.mkdir(); directory.mkdir();
ClassLoaderPriorityUtil.loadOverridingJars(directory); // Load overriding jars first so other code can access the new classes ClassLoaderPriorityUtil.loadOverridingJars(directory); // Load overriding jars first so other code can access the new classes
@ -70,10 +70,11 @@ public class ViaFabricPlus {
settingsManager = new SettingsManager(); settingsManager = new SettingsManager();
saveManager = new SaveManager(settingsManager); saveManager = new SaveManager(settingsManager);
// Block game loading until ViaVersion has loaded
PostGameLoadCallback.EVENT.register(() -> { PostGameLoadCallback.EVENT.register(() -> {
loadingFuture.join(); loadingFuture.join();
saveManager.init(); saveManager.init();
}); // Block game loading until ViaVersion has loaded });
} }
public static ViaFabricPlus global() { public static ViaFabricPlus global() {

2
src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMain.java
View File

@ -33,7 +33,7 @@ public abstract class MixinMain {
@Inject(method = "main", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;startTimerHack()V")) @Inject(method = "main", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;startTimerHack()V"))
private static void bootstrap(CallbackInfo ci) { private static void bootstrap(CallbackInfo ci) {
LoadCallback.EVENT.invoker().onLoad(LoadCallback.State.PRE); LoadCallback.EVENT.invoker().onLoad(LoadCallback.State.PRE);
ViaFabricPlus.global().bootstrap(); ViaFabricPlus.global().init();
LoadCallback.EVENT.invoker().onLoad(LoadCallback.State.POST); LoadCallback.EVENT.invoker().onLoad(LoadCallback.State.POST);
} }