diff --git a/common/build.gradle b/common/build.gradle index dd2e538..d7ae20f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -26,9 +26,9 @@ dependencies { modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version" // Mod implementations - modImplementation "maven.modrinth:sodium:mc1.21.9-0.7.0-fabric" // Sodium + modImplementation "maven.modrinth:sodium:mc1.21.10-0.7.2-fabric" // Sodium modImplementation "maven.modrinth:sodium-extra:mc1.21.9-0.7.0+fabric" // Sodium Extra - modImplementation "maven.modrinth:iris:1.9.3+1.21.9-fabric" // Iris - modImplementation "maven.modrinth:distanthorizons:2.3.4-b-1.21.8" // Distant Horizons - modImplementation "maven.modrinth:controlify:2.4.1-fabric,1.21.9" // Controlify + modImplementation "maven.modrinth:iris:1.9.6+1.21.10-fabric" // Iris + modImplementation "maven.modrinth:distanthorizons:2.3.6-b-1.21.10" // Distant Horizons + modImplementation "maven.modrinth:controlify:2.4.2-fabric,1.21.9" // Controlify } diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java index da5976b..4f565cb 100644 --- a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java +++ b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/DistantHorizonsLoader.java @@ -1,11 +1,11 @@ package net.trafficlunar.optionsprofiles.profiles.loaders; -import com.seibel.distanthorizons.core.config.ConfigBase; +import com.seibel.distanthorizons.core.config.ConfigHandler; import java.nio.file.Path; public class DistantHorizonsLoader { public static void load(Path file) { - ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile(); + ConfigHandler.INSTANCE.configFileHandler.loadFromFile(); } } diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java index b6299ca..d523265 100644 --- a/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java +++ b/common/src/main/java/net/trafficlunar/optionsprofiles/profiles/loaders/SodiumExtraLoader.java @@ -1,13 +1,14 @@ package net.trafficlunar.optionsprofiles.profiles.loaders; -import me.flashyreese.mods.sodiumextra.client.gui.FogTypeConfig; -import net.minecraft.world.level.material.FogType; -import net.trafficlunar.optionsprofiles.OptionsProfilesMod; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod; +import me.flashyreese.mods.sodiumextra.client.gui.FogTypeConfig; import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraGameOptions; +import me.flashyreese.mods.sodiumextra.common.util.ResourceLocationSerializer; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.material.FogType; +import net.trafficlunar.optionsprofiles.OptionsProfilesMod; import java.io.FileReader; import java.io.IOException; @@ -18,7 +19,7 @@ import java.util.Map; public class SodiumExtraLoader { public static void load(Path file) { try (FileReader reader = new FileReader(file.toFile())) { - Gson gson = new GsonBuilder().create(); + Gson gson = new GsonBuilder().registerTypeAdapter(ResourceLocation.class, new ResourceLocationSerializer()).create(); Configuration configuration = gson.fromJson(reader, Configuration.class); apply(configuration); diff --git a/gradle.properties b/gradle.properties index 3a32b31..7a5be0a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true loom.ignoreDependencyLoomVersionValidation=true # Mod properties -mod_version=1.4.3 +mod_version=1.4.4 maven_group=net.trafficlunar.optionsprofiles archives_name=optionsprofiles enabled_platforms=fabric,neoforge diff --git a/settings.gradle b/settings.gradle index c2b5263..3f4b07a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,4 +11,4 @@ include("common") include("fabric") include("neoforge") -rootProject.name = "optionsprofiles-v1.4.3-1.21.9" +rootProject.name = "optionsprofiles-v1.4.4-1.21.9"