diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBufferRebuildTimes.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBufferRebuildTimes.java index 9e06b5be2..2995141d3 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBufferRebuildTimes.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBufferRebuildTimes.java @@ -30,6 +30,7 @@ package com.seibel.distanthorizons.api.enums.config; * @author Leonardo Amato * @version 9-25-2021 */ +@Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed public enum EBufferRebuildTimes { CONSTANT(0, 0, 0, 1), diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGenerationPriority.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGenerationPriority.java index d8cc3a36d..b4ac64283 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGenerationPriority.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGenerationPriority.java @@ -30,6 +30,7 @@ package com.seibel.distanthorizons.api.enums.config; * @author Leonardo Amato * @version 12-1-2021 */ +@Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed public enum EGenerationPriority { // Reminder: diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGpuUploadMethod.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGpuUploadMethod.java index 56397436a..9c9f40a5f 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGpuUploadMethod.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGpuUploadMethod.java @@ -38,30 +38,20 @@ public enum EGpuUploadMethod // commented out since it isn't currently in use //BUFFER_STORAGE_MAPPING(true, true), - /** - * Default for NVIDIA if OpenGL 4.5 is supported.
- * Fast rendering, no stuttering. - */ + /** Fast rendering, no stuttering. */ BUFFER_STORAGE(false, true), - /** - * Backup option for NVIDIA.
- * Fast rendering but may stutter when uploading. - */ + /** Fast rendering but may stutter when uploading. */ SUB_DATA(false, false), /** - * Default option for AMD/Intel.
* May end up storing buffers in System memory.
* Fast rending if in GPU memory, slow if in system memory,
* but won't stutter when uploading. */ BUFFER_MAPPING(true, false), - /** - * Backup option for AMD/Intel.
- * Fast rendering but may stutter when uploading. - */ + /** Fast rendering but may stutter when uploading. */ DATA(false, false); diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EHorizontalQuality.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EHorizontalQuality.java index bc2f17bf7..72c81292a 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EHorizontalQuality.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EHorizontalQuality.java @@ -24,6 +24,7 @@ package com.seibel.distanthorizons.api.enums.config; * LOW
* MEDIUM
* HIGH
+ * UNLIMITED
*/ public enum EHorizontalQuality { diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELightGenerationMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELightGenerationMode.java index c8ca28c0b..914d8b265 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELightGenerationMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELightGenerationMode.java @@ -20,8 +20,8 @@ package com.seibel.distanthorizons.api.enums.config; /** - * FAST,
- * FANCY, + * DISTANT_HORIZONS,
+ * MINECRAFT, * * @author Leetom * @version 2023-6-7 diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EShadingMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EShadingMode.java deleted file mode 100644 index 0c7ed80a0..000000000 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EShadingMode.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), - * licensed under the GNU LGPL v3 License. - * - * Copyright (C) 2020-2022 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.api.enums.config; - -/** - * NONE, GAME_SHADING - * - * @author James Seibel - * @version 7-25-2020 - */ -public enum EShadingMode -{ - /** - * LODs will have darker sides and bottoms to simulate - * Minecraft's fast lighting. - */ - GAME_SHADING, - - /** - * LODs will use ambient occlusion to mimic Minecraft's - * Fancy lighting. - */ - AMBIENT_OCCLUSION -} \ No newline at end of file diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVanillaOverdraw.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVanillaOverdraw.java index db8f35e9d..d8b7ced6a 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVanillaOverdraw.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVanillaOverdraw.java @@ -30,6 +30,7 @@ package com.seibel.distanthorizons.api.enums.config; * @author James Seibel * @version 2022-6-30 */ +@Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed public enum EVanillaOverdraw { // Reminder: diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVerticalQuality.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVerticalQuality.java index ce4846982..c5655370f 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVerticalQuality.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVerticalQuality.java @@ -26,7 +26,7 @@ import com.seibel.distanthorizons.coreapi.util.MathUtil; * LOW
* MEDIUM
* HIGH
- * ULTRA
+ * EXTREME
* * @author Leonardo Amato * @version 2023-2-5 diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java index a5e2d765a..ec99b5a5f 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java @@ -8,6 +8,7 @@ package com.seibel.distanthorizons.api.enums.worldGeneration; * @author James Seibel * @version 7-14-2022 */ +@Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed public enum EDhApiWorldGenThreadMode { /** 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 7cabc4e13..bddaba15e 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 @@ -630,16 +630,16 @@ public class Config .build(); public static ConfigEntry lightingEngine = new ConfigEntry.Builder() - .set(ELightGenerationMode.DISTANT_HORIZONS) + .set(ELightGenerationMode.MINECRAFT) .comment("" + " How should distant generation chunk lighting be generated? \n" + "\n" - + ELightGenerationMode.DISTANT_HORIZONS + ": Uses Distant Horizons' lighting engine to estimate chunk lighting. \n" - + " Generally lower quality; but more stable for large numbers of world generator threads. \n" + ELightGenerationMode.MINECRAFT + ": Use Minecraft's lighting engine to generate chunk lighting. \n" + " Generally higher quality; but may crash MC's lighting engine if there is an issue. \n" + + ELightGenerationMode.DISTANT_HORIZONS + ": Uses Distant Horizons' lighting engine to estimate chunk lighting. \n" + + " Generally lower quality; but more stable for large numbers of world generator threads. \n" + "\n" - + "This will effect generation speed, but not the rendering performance.") + + "This will effect generation speed, but not rendering performance.") .build(); // deprecated and not implemented, can be made public if we ever re-implement it diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java index a40c1ad78..a5eb7aa3b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java @@ -52,7 +52,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE new HashMap() {{ this.put(EQualityPreset.MINIMUM, ETransparency.DISABLED); - this.put(EQualityPreset.LOW, ETransparency.FAKE); + this.put(EQualityPreset.LOW, ETransparency.DISABLED); // should be fake if/when fake is fixed this.put(EQualityPreset.MEDIUM, ETransparency.COMPLETE); this.put(EQualityPreset.HIGH, ETransparency.COMPLETE); this.put(EQualityPreset.EXTREME, ETransparency.COMPLETE); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java index f0e7c3144..9b788b029 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java @@ -2,7 +2,7 @@ package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding; import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; import com.seibel.distanthorizons.api.enums.rendering.EDebugRendering; -import com.seibel.distanthorizons.api.enums.rendering.EGLProxyContext; +import com.seibel.distanthorizons.core.enums.EGLProxyContext; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EGLProxyContext.java b/core/src/main/java/com/seibel/distanthorizons/core/enums/EGLProxyContext.java similarity index 90% rename from api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EGLProxyContext.java rename to core/src/main/java/com/seibel/distanthorizons/core/enums/EGLProxyContext.java index 897a32f78..610ea5ef3 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EGLProxyContext.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/enums/EGLProxyContext.java @@ -17,10 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.api.enums.rendering; +package com.seibel.distanthorizons.core.enums; /** - * Minecraft, Lod_Builder, None + * Minecraft,
+ * Lod_Builder,
+ * Proxy_Worker,
+ * None
* * @author James Seibel * @version 10-1-2021 diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java index 9794a1d9f..8ab297696 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java @@ -41,7 +41,7 @@ import org.lwjgl.opengl.GLUtil; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.seibel.distanthorizons.coreapi.ModInfo; import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; -import com.seibel.distanthorizons.api.enums.rendering.EGLProxyContext; +import com.seibel.distanthorizons.core.enums.EGLProxyContext; import com.seibel.distanthorizons.core.util.objects.GLMessage; import com.seibel.distanthorizons.core.util.objects.GLMessageOutputStream; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java index 0b905a06f..9d472807b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java @@ -1,7 +1,7 @@ package com.seibel.distanthorizons.core.render.glObject.buffer; import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; -import com.seibel.distanthorizons.api.enums.rendering.EGLProxyContext; +import com.seibel.distanthorizons.core.enums.EGLProxyContext; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.render.glObject.GLProxy; import com.seibel.distanthorizons.core.util.LodUtil;