Move DefaultExtractorLoader to FMLLoadCompleteEvent (#168)

This commit is contained in:
miozune authored and GitHub committed 2023-10-25 23:02:07 +09:00
1 parent 1efa92adad
commit 567b1dbce5
5 files changed
+52 -12

No files matched your search

+35 -6
View File
@@ -1,9 +1,38 @@
*.bat
.gradle/
.idea/
out/
.gradle
.settings
/.idea/
/.vscode/
/run/
/build/
/eclipse/
.classpath
.project
/bin/
/config/
/crash-reports/
/logs/
options.txt
/saves/
usernamecache.json
banned-ips.json
banned-players.json
eula.txt
ops.json
server.properties
servers.dat
usercache.json
whitelist.json
/out/
*.iml
*.ipr
*.iws
run/
build/
src/main/resources/mixins.*([!.]).json
*.bat
*.DS_Store
!gradlew.bat
.factorypath
addon.local.gradle
addon.local.gradle.kts
addon.late.local.gradle
addon.late.local.gradle.kts
layout.json
+2 -2
View File
@@ -1,4 +1,4 @@
//version: 1696952014
//version: 1697697256
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -798,7 +798,7 @@ dependencies {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7')
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
}
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -89,6 +89,11 @@ public class FluidCraft {
proxy.postInit(event);
}
@Mod.EventHandler
public void onLoadComplete(FMLLoadCompleteEvent event) {
proxy.onLoadComplete(event);
}
@Mod.EventHandler
public void onServerStart(FMLServerStartingEvent event) {
SPacketMEUpdateBuffer.init();
@@ -106,9 +111,6 @@ public class FluidCraft {
}
}
@Mod.EventHandler
public void onLoadComplete(FMLLoadCompleteEvent event) {}
public static ResourceLocation resource(String path) {
return new ResourceLocation(MODID, path);
}
@@ -7,6 +7,7 @@ import com.glodblock.github.nei.recipes.DefaultExtractorLoader;
import com.glodblock.github.util.ModAndClassUtil;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@@ -28,8 +29,13 @@ public class ClientProxy extends CommonProxy {
@Override
public void postInit(FMLPostInitializationEvent event) {
super.postInit(event);
}
@Override
public void onLoadComplete(FMLLoadCompleteEvent event) {
super.onLoadComplete(event);
if (ModAndClassUtil.NEI) {
(new DefaultExtractorLoader()).run();
new DefaultExtractorLoader().run();
}
}
}
@@ -21,6 +21,7 @@ import appeng.api.config.Upgrades;
import appeng.helpers.InterfaceTerminalSupportedClassProvider;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
@@ -72,6 +73,8 @@ public class CommonProxy {
InterfaceTerminalSupportedClassProvider.register(TileFluidInterface.class);
}
public void onLoadComplete(FMLLoadCompleteEvent event) {}
public void registerRenderers() {}
public void registerMovables() {