diff --git a/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/Profiles.java b/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/Profiles.java index 4510aaf..b870c98 100644 --- a/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/Profiles.java +++ b/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/Profiles.java @@ -2,7 +2,6 @@ package com.axolotlmaid.optionsprofiles.profiles; import com.axolotlmaid.optionsprofiles.OptionsProfilesMod; import com.axolotlmaid.optionsprofiles.profiles.loaders.DistantHorizonsLoader; -import com.axolotlmaid.optionsprofiles.profiles.loaders.EmbeddiumLoader; import com.axolotlmaid.optionsprofiles.profiles.loaders.SodiumExtraLoader; import com.axolotlmaid.optionsprofiles.profiles.loaders.SodiumLoader; import org.apache.commons.io.FileUtils; @@ -22,7 +21,6 @@ public class Profiles { public static final Path OPTIFINE_OPTIONS_FILE = Paths.get("optionsof.txt"); public static final Path SODIUM_OPTIONS_FILE = Paths.get("config/sodium-options.json"); public static final Path SODIUM_EXTRA_OPTIONS_FILE = Paths.get("config/sodium-extra-options.json"); - public static final Path EMBEDDIUM_OPTIONS_FILE = Paths.get("config/embeddium-options.json"); public static final Path DISTANT_HORIZONS_OPTIONS_FILE = Paths.get("config/DistantHorizons.toml"); // This function goes through every profile and updates / adds the configuration file if it doesn't exist @@ -124,7 +122,6 @@ public class Profiles { copyOptionFile(profile, OPTIFINE_OPTIONS_FILE); copyOptionFile(profile, SODIUM_OPTIONS_FILE); copyOptionFile(profile, SODIUM_EXTRA_OPTIONS_FILE); - copyOptionFile(profile, EMBEDDIUM_OPTIONS_FILE); copyOptionFile(profile, DISTANT_HORIZONS_OPTIONS_FILE); if (!overwriting) { @@ -156,7 +153,6 @@ public class Profiles { Optional.of(OPTIFINE_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add); Optional.of(SODIUM_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add); Optional.of(SODIUM_EXTRA_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add); - Optional.of(EMBEDDIUM_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add); Optional.of(DISTANT_HORIZONS_OPTIONS_FILE).filter(Files::exists).ifPresent(optionFiles::add); // Check if the original option file and the profile option file have the same content @@ -259,7 +255,6 @@ public class Profiles { loadOptionFile(profileName, OPTIFINE_OPTIONS_FILE); loadOptionFile(profileName, SODIUM_OPTIONS_FILE, SodiumLoader::load); loadOptionFile(profileName, SODIUM_EXTRA_OPTIONS_FILE, SodiumExtraLoader::load); - loadOptionFile(profileName, EMBEDDIUM_OPTIONS_FILE, EmbeddiumLoader::load); loadOptionFile(profileName, DISTANT_HORIZONS_OPTIONS_FILE); // Overwrite / load original Disant Horizons option file loadOptionFile(profileName, DISTANT_HORIZONS_OPTIONS_FILE, DistantHorizonsLoader::load); // Tell Distant Horizons mod to reload configuration diff --git a/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/loaders/EmbeddiumLoader.java b/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/loaders/EmbeddiumLoader.java deleted file mode 100644 index 78884d5..0000000 --- a/common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/loaders/EmbeddiumLoader.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.axolotlmaid.optionsprofiles.profiles.loaders; - -import com.axolotlmaid.optionsprofiles.OptionsProfilesMod; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import org.embeddedt.embeddium.impl.Embeddium; -import org.embeddedt.embeddium.impl.gui.EmbeddiumOptions; - -import java.io.FileReader; -import java.io.IOException; -import java.nio.file.Path; - -public class EmbeddiumLoader { - public static void load(Path file) { - try (FileReader reader = new FileReader(file.toFile())) { - Gson gson = new GsonBuilder().create(); - Configuration configData = gson.fromJson(reader, Configuration.class); - - apply(configData); - } catch (IOException e) { - OptionsProfilesMod.LOGGER.error("An error occurred when loading Sodium's configuration", e); - } - } - - private static void apply(Configuration configuration) { - Embeddium.options().quality.weatherQuality = EmbeddiumOptions.GraphicsQuality.valueOf(configuration.quality.weather_quality); - Embeddium.options().quality.leavesQuality = EmbeddiumOptions.GraphicsQuality.valueOf(configuration.quality.leaves_quality); - Embeddium.options().quality.enableVignette = configuration.quality.enable_vignette; - - Embeddium.options().advanced.enableMemoryTracing = configuration.advanced.enable_memory_tracing; - Embeddium.options().advanced.useAdvancedStagingBuffers = configuration.advanced.use_advanced_staging_buffers; - Embeddium.options().advanced.disableIncompatibleModWarnings = configuration.advanced.disable_incompatible_mod_warnings; - Embeddium.options().advanced.cpuRenderAheadLimit = configuration.advanced.cpu_render_ahead_limit; - - Embeddium.options().performance.chunkBuilderThreads = configuration.performance.chunk_builder_threads; - Embeddium.options().performance.alwaysDeferChunkUpdates = configuration.performance.always_defer_chunk_updates_v2; - Embeddium.options().performance.animateOnlyVisibleTextures = configuration.performance.animate_only_visible_textures; - Embeddium.options().performance.useEntityCulling = configuration.performance.use_entity_culling; - Embeddium.options().performance.useFogOcclusion = configuration.performance.use_fog_occlusion; - Embeddium.options().performance.useBlockFaceCulling = configuration.performance.use_block_face_culling; - Embeddium.options().performance.useCompactVertexFormat = configuration.performance.use_compact_vertex_format; - Embeddium.options().performance.useTranslucentFaceSorting = configuration.performance.use_translucent_face_sorting_v2; - Embeddium.options().performance.useNoErrorGLContext = configuration.performance.use_no_error_g_l_context; - - Embeddium.options().notifications.hasClearedDonationButton = configuration.notifications.has_cleared_donation_button; - Embeddium.options().notifications.hasSeenDonationPrompt = configuration.notifications.has_seen_donation_prompt; - - try { - EmbeddiumOptions.writeToDisk(Embeddium.options()); - } catch (IOException e) { - OptionsProfilesMod.LOGGER.error("An error occurred when loading Embeddium's configuration", e); - } - } - - public static class Configuration { - public SodiumLoader.Configuration.Quality quality; - public Advanced advanced; - public Performance performance; - public SodiumLoader.Configuration.Notifications notifications; - - public static class Advanced extends SodiumLoader.Configuration.Advanced { - public boolean disable_incompatible_mod_warnings; - } - - public static class Performance extends SodiumLoader.Configuration.Performance { - public boolean use_compact_vertex_format; - public boolean use_translucent_face_sorting_v2; - } - } -}