- fix startup crash with Immersive Engineering

Author: Smartin

CHANGELOG.md

@@ -1,15 +1,2 @@
-## v1.1.3 (1.20.1)
-- added Banner cosmetic support
-- expanded Lore Text to allow for Formatting
-- normalised module expansion and skin and synergy format to support "replace","remove" and "merge"
-- added Slot-types and Cosmetic sub-slot option for purely cosmetic modules
-- added Projectile Armor attribute
-- added Exhaustion attribute for passive food drain
-- added fabric swimspeed attribute to match forges
-- changing settings related to fallback-renderer now apply instantly without world reloading(on fabric)
-- fixed issues were enchantments could not be applied to items
-- fixed compatibility issues with Entity Texture Features
-- fixed Bug were Buster skin would not load
-- fixed some Typos and wordings within Translations
-- fixed arrow-part items not stacking correctly
-- fixed internal issues where slot rotation was not normalised correctly
+## v1.1.4 (1.20.1)
+- fixed server startup crash with Immersive Engineering

forge/src/main/java/smartin/miapi/forge/TrulyModularForge.java

@@ -4,7 +4,6 @@
 import dev.architectury.event.events.common.LifecycleEvent;
 import dev.architectury.platform.forge.EventBuses;
 import net.minecraft.resource.ResourcePackManager;
-import net.minecraft.server.ServerTask;
 import net.minecraft.world.SaveProperties;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.EntityRenderersEvent;
@@ -16,11 +15,13 @@
 import smartin.miapi.Miapi;
 import smartin.miapi.attributes.AttributeRegistry;
 import smartin.miapi.config.MiapiConfig;
-import smartin.miapi.events.MiapiEvents;
+import smartin.miapi.datapack.ReloadEvents;
 import smartin.miapi.modules.properties.AttributeProperty;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import static smartin.miapi.Miapi.MOD_ID;
 import static smartin.miapi.attributes.AttributeRegistry.SWIM_SPEED;
@@ -41,33 +42,16 @@ public TrulyModularForge() {
         }));
         LifecycleEvent.SERVER_STARTED.register((minecraftServer -> {
             if(!Environment.isClient() && MiapiConfig.OtherConfigGroup.forgeAutoReloads.getValue()){
+                Map<String,String> cacheDatapack = new HashMap<>(ReloadEvents.DATA_PACKS);
                 Miapi.LOGGER.info("Truly Modular will now go onto reload twice.");
                 Miapi.LOGGER.info("This is done because Forges classloading is buggy and stupid. Until we have a better fix, this is used");
                 Miapi.LOGGER.info("This can be turned off in Miapis config.json");
-                MiapiEvents.GENERATED_MATERIAL.hasBeenSorted();
-                minecraftServer.executeTask(new ServerTask(10, () -> {
-                    ResourcePackManager resourcePackManager = minecraftServer.getDataPackManager();
-                    SaveProperties saveProperties = minecraftServer.getSaveProperties();
-                    Collection<String> collection = resourcePackManager.getEnabledNames();
-                    Collection<String> collection2 = findNewDataPacks(resourcePackManager, saveProperties, collection);
-                    minecraftServer.reloadResources(collection2).exceptionally((throwable) -> {
-                        Miapi.LOGGER.warn("Failed to execute sceduled reload reload", throwable);
-                        return null;
-                    });
-                    minecraftServer.executeTask(new ServerTask(10, () -> {
-                        ResourcePackManager resourcePackManager1 = minecraftServer.getDataPackManager();
-                        SaveProperties saveProperties1 = minecraftServer.getSaveProperties();
-                        Collection<String> collection1 = resourcePackManager1.getEnabledNames();
-                        Collection<String> collection21 = findNewDataPacks(resourcePackManager1, saveProperties1, collection1);
-                        minecraftServer.reloadResources(collection21).exceptionally((throwable) -> {
-                            Miapi.LOGGER.warn("Failed to execute sceduled reload reload", throwable);
-                            return null;
-                        });
-                        Miapi.LOGGER.info("Truly Modulars double Reload was successfull.");
-                        Miapi.LOGGER.info("This is done because Forges classloading is buggy and stupid. Until we have a better fix, this is used");
-                        Miapi.LOGGER.info("This can be turned off in Miapis config.json");
-                    }));
-                }));
+                ReloadEvents.inReload = true;
+                ReloadEvents.START.fireEvent(false);
+                ReloadEvents.DataPackLoader.trigger(cacheDatapack);
+                ReloadEvents.MAIN.fireEvent(false);
+                ReloadEvents.END.fireEvent(false);
+                ReloadEvents.inReload = false;
             }
         }));
         AttributeProperty.replaceMap.put("miapi:generic.reach", ForgeMod.BLOCK_REACH);

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 minecraft_version=1.20.1
 
 archives_base_name=Truly-Modular-miapi
-mod_version=1.1.3
+mod_version=1.1.4
 maven_group=smartin
 github=Truly-Modular.Modular-Item-API