From b2a11c8695fa4699c1aaca91122d2fee71d1b832 Mon Sep 17 00:00:00 2001
From: SparkGNRK <saintetrystan60@gmail.com>
Date: Sun, 18 Dec 2022 18:35:12 +0100
Subject: [PATCH] Update to Forge 1.18.2-40.1.86

---
 build.gradle                                  |  4 +--
 .../StructuredModLoader.java                  | 29 +++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 46407ab..511afb7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ minecraft {
     //
     // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: '1.18.1'
+    mappings channel: 'official', version: '1.18.2'
 
     // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
 
@@ -128,7 +128,7 @@ dependencies {
     // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.18.1-39.0.43'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.1.86'
 
     // Real mod deobf dependency examples - these get remapped to your current mappings
     // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
diff --git a/src/main/java/com/chaos02/structuredmodloader/StructuredModLoader.java b/src/main/java/com/chaos02/structuredmodloader/StructuredModLoader.java
index 5ab6e89..e6b32de 100644
--- a/src/main/java/com/chaos02/structuredmodloader/StructuredModLoader.java
+++ b/src/main/java/com/chaos02/structuredmodloader/StructuredModLoader.java
@@ -1,32 +1,29 @@
 package com.chaos02.structuredmodloader;
 
-import java.io.File;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.electronwill.nightconfig.core.ConfigSpec;
 import com.electronwill.nightconfig.core.ConfigSpec.CorrectionListener;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-//import net.minecraftforge.fml.InterModComms;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.loading.FMLPaths;
 import net.minecraftforge.fml.loading.LogMarkers;
-import net.minecraftforge.fml.loading.moddiscovery.AbstractJarFileLocator;
+import net.minecraftforge.fml.loading.moddiscovery.ClasspathLocator;
 import net.minecraftforge.forgespi.locating.IModLocator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 @Mod("structuredmodloader")
-public class StructuredModLoader extends AbstractJarFileLocator implements IModLocator {
+public class StructuredModLoader extends ClasspathLocator implements IModLocator {
 	// Directly reference a log4j logger.
 	private static final Logger LOGGER = LogManager.getLogger();