From 99939aa2bc2a81be25efa24ff4f9102afe395dad Mon Sep 17 00:00:00 2001
From: Ruben Taelman <rubensworks@gmail.com>
Date: Sun, 24 Apr 2022 07:17:11 +0200
Subject: [PATCH] Update to MC 1.18.2

---
 gradle.properties                                    | 10 +++++-----
 .../integratedcrafting/IntegratedCrafting.java       |  8 ++++++--
 src/main/resources/META-INF/mods.toml                | 12 ++++++------
 src/main/resources/pack.mcmeta                       |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b6d01bfe..cbf632b2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 mod_version=1.0.22
-minecraft_version=1.18.1
-forge_version=39.0.5
-cyclopscore_version=1.13.0-123
-integrateddynamics_version=1.18.1-1.10.6-185
+minecraft_version=1.18.2
+forge_version=40.0.54
+cyclopscore_version=1.13.4-158
+integrateddynamics_version=1.18.2-1.10.13-249
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 
-commoncapabilities_version=1.18.1-2.8.1-46
+commoncapabilities_version=1.18.2-2.8.2-54
 
 # Workaround for Spotless bug
 # https://github.com/diffplug/spotless/issues/834
diff --git a/src/main/java/org/cyclops/integratedcrafting/IntegratedCrafting.java b/src/main/java/org/cyclops/integratedcrafting/IntegratedCrafting.java
index dbc254ae..49139cba 100644
--- a/src/main/java/org/cyclops/integratedcrafting/IntegratedCrafting.java
+++ b/src/main/java/org/cyclops/integratedcrafting/IntegratedCrafting.java
@@ -4,10 +4,11 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.NewRegistryEvent;
 import org.apache.logging.log4j.Level;
 import org.cyclops.cyclopscore.config.ConfigHandler;
 import org.cyclops.cyclopscore.infobook.IInfoBookRegistry;
@@ -55,9 +56,10 @@ public IntegratedCrafting() {
         registerWorldStorage(globalCounters = new GlobalCounters(this));
 
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onRegistriesCreate);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::afterSetup);
     }
 
-    public void onRegistriesCreate(RegistryEvent.NewRegistry event) {
+    public void onRegistriesCreate(NewRegistryEvent event) {
         CraftingAspects.load();
         PartTypes.load();
         MinecraftForge.EVENT_BUS.register(new CraftingNetworkCapabilityConstructors());
@@ -67,7 +69,9 @@ public void onRegistriesCreate(RegistryEvent.NewRegistry event) {
     @Override
     protected void setup(FMLCommonSetupEvent event) {
         super.setup(event);
+    }
 
+    protected void afterSetup(FMLLoadCompleteEvent event) {
         IntegratedDynamics._instance.getRegistryManager().getRegistry(INetworkCraftingHandlerRegistry.class)
                 .register(new NetworkCraftingHandlerCraftingNetwork());
 
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 3b0de6ed..357c06ea 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[39,)"
+loaderVersion="[40,)"
 issueTrackerURL="https://github.com/CyclopsMC/IntegratedCrafting/issues"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/integrated-crafting"
 license="MIT"
@@ -16,30 +16,30 @@ Craft stuff in Integrated Dynamics networks.
 [[dependencies.integratedcrafting]]
     modId="cyclopscore"
     mandatory=true
-    versionRange="[1.13.0,)"
+    versionRange="[1.13.4,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.integratedcrafting]]
     modId="integrateddynamics"
     mandatory=true
-    versionRange="[1.10.6,)"
+    versionRange="[1.10.13,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.integratedcrafting]]
     modId="commoncapabilities"
     mandatory=true
-    versionRange="[2.8.1,)"
+    versionRange="[2.8.2,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.integratedcrafting]]
     modId="forge"
     mandatory=true
-    versionRange="[39,)"
+    versionRange="[40,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.integratedcrafting]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.18.1,]"
+    versionRange="[1.18.2,]"
     ordering="NONE"
     side="BOTH"
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
index 36b57365..8411763a 100644
--- a/src/main/resources/pack.mcmeta
+++ b/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "integratedcrafting resources",
-        "pack_format": 8
+        "pack_format": 9
     }
 }