diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 727794f..3a639c4 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -3,14 +3,14 @@ plugins { } project.configurations.runtimeClasspath { - exclude(group: "loom_mappings_1_20_4_layered_hash_919249853_v2.net.fabricmc", module: "fabric-loader") + exclude(group: "loom_mappings_1_20_4_layered_hash_1137964741_v2.net.fabricmc", module: "fabric-loader") } dependencies { minecraft libs.minecraft mappings(loom.layered { - it.parchment("${libs.parchment.mappings.get()}@zip") it.officialMojangMappings() + it.parchment("${libs.parchment.mappings.get()}@zip") }) modImplementation fabric.fabric.loader @@ -40,8 +40,8 @@ dependencies { // modLocalRuntime fabric.cloth modCompileOnly libs.figura.fabric - modLocalRuntime libs.figura.fabric - localRuntime libs.bundles.figura.runtime +// modLocalRuntime libs.figura.fabric +// localRuntime libs.bundles.figura.runtime // modCompileOnly "${libs.emi.fabric.get()}:api" } diff --git a/Fabric/src/main/java/dev/cammiescorner/icarus/fabric/entrypoints/Modmenu.java b/Fabric/src/main/java/dev/cammiescorner/icarus/fabric/entrypoints/Modmenu.java index 5e8cfea..ebb25ac 100644 --- a/Fabric/src/main/java/dev/cammiescorner/icarus/fabric/entrypoints/Modmenu.java +++ b/Fabric/src/main/java/dev/cammiescorner/icarus/fabric/entrypoints/Modmenu.java @@ -10,6 +10,6 @@ public class Modmenu implements ModMenuApi { @Override public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> new ConfigScreen(parent, null, Icarus.CONFIGURATOR.getConfig(IcarusConfig.class)); + return parent -> new ConfigScreen(parent, Icarus.CONFIGURATOR.getConfig(IcarusConfig.class)); } } diff --git a/Quilt/build.gradle b/Quilt/build.gradle index f99a36a..588fe12 100644 --- a/Quilt/build.gradle +++ b/Quilt/build.gradle @@ -11,8 +11,8 @@ project.configurations.configureEach { dependencies { minecraft libs.minecraft mappings(loom.layered { - it.parchment("${libs.parchment.mappings.get()}@zip") it.officialMojangMappings() + it.parchment("${libs.parchment.mappings.get()}@zip") }) modImplementation quilt.quilt.loader diff --git a/Quilt/libs.versions.toml b/Quilt/libs.versions.toml index 8519c82..2a4dea8 100644 --- a/Quilt/libs.versions.toml +++ b/Quilt/libs.versions.toml @@ -2,7 +2,7 @@ # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html quilt_loom = "1.7.+" -quilt_loader = "0.24.0" +quilt_loader = "0.26.4-beta.1" quilted_fabric_api = "9.0.0-alpha.8+0.97.0-1.20.4" [libraries] diff --git a/Quilt/src/main/java/dev/cammiescorner/icarus/quilt/entrypoints/Modmenu.java b/Quilt/src/main/java/dev/cammiescorner/icarus/quilt/entrypoints/Modmenu.java index ae6a0a6..6234124 100644 --- a/Quilt/src/main/java/dev/cammiescorner/icarus/quilt/entrypoints/Modmenu.java +++ b/Quilt/src/main/java/dev/cammiescorner/icarus/quilt/entrypoints/Modmenu.java @@ -10,6 +10,6 @@ public class Modmenu implements ModMenuApi { @Override public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> new ConfigScreen(parent, null, Icarus.CONFIGURATOR.getConfig(IcarusConfig.class)); + return parent -> new ConfigScreen(parent, Icarus.CONFIGURATOR.getConfig(IcarusConfig.class)); } }