From 167ca94e690e806e65c4187c91f3c6817c21ae5d Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 22 Dec 2025 20:31:24 -0600 Subject: [PATCH] Remove deprecated disableVanillaFog config --- .../methods/config/client/DhApiFogConfig.java | 3 +- .../distanthorizons/core/config/Config.java | 13 ------ .../api/converters/InvertedBoolConverter.java | 43 +++++++++++++++++++ 3 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 core/src/main/java/com/seibel/distanthorizons/core/config/api/converters/InvertedBoolConverter.java diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFogConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFogConfig.java index 13db26165..50cf4cb5d 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFogConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFogConfig.java @@ -28,6 +28,7 @@ import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogCo import com.seibel.distanthorizons.core.config.api.DhApiConfigValue; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.config.api.converters.ApiFogDrawModeConverter; +import com.seibel.distanthorizons.core.config.api.converters.InvertedBoolConverter; public class DhApiFogConfig implements IDhApiFogConfig { @@ -67,7 +68,7 @@ public class DhApiFogConfig implements IDhApiFogConfig @Override @Deprecated public IDhApiConfigValue disableVanillaFog() - { return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.disableVanillaFog); } + { return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog, new InvertedBoolConverter()); } @Override public IDhApiConfigValue enableVanillaFog() { return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java index 116ff7d6f..919a2d5fd 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java @@ -505,11 +505,6 @@ public class Config + "Note: Other mods may conflict with this setting. \n" + "") .build(); - @Deprecated - public static ConfigEntry disableVanillaFog = new ConfigEntry.Builder() - .set(!enableVanillaFog.get()) - .setAppearance(EConfigEntryAppearance.ONLY_IN_API) - .build(); @@ -571,14 +566,6 @@ public class Config - static - { - disableVanillaFog.addListener( - new ConfigChangeListener(disableVanillaFog, - (disableVanillaFog) -> enableVanillaFog.setApiValue(disableVanillaFog)) - ); - } - public static class HeightFog { public static ConfigUIComment heightFogHeader = new ConfigUIComment.Builder().setParentConfigClass(HeightFog.class).build(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/api/converters/InvertedBoolConverter.java b/core/src/main/java/com/seibel/distanthorizons/core/config/api/converters/InvertedBoolConverter.java new file mode 100644 index 000000000..19dff55bb --- /dev/null +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/api/converters/InvertedBoolConverter.java @@ -0,0 +1,43 @@ +/* + * This file is part of the Distant Horizons mod + * licensed under the GNU LGPL v3 License. + * + * Copyright (C) 2020 James Seibel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.seibel.distanthorizons.core.config.api.converters; + +import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter; + +/** + * Used to support deprecated config options that may be identical + * in implementation but with the On/Off values flipped. + * + * @author James Seibel + * @version 2025-12-22 + */ +public class InvertedBoolConverter implements IConverter +{ + + @Override + public Boolean convertToCoreType(Boolean core) + { return !core; } + + @Override + public Boolean convertToApiType(Boolean api) + { return !api; } + +}