diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index 9877fc5b1..a76ba0646 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -200,7 +200,7 @@ public class AngelicaConfig { "net.minecraft.block.BlockStairs" }) public static String[] blockCrackFixBlacklist; - + @Config.Comment({"Block classes that have render pass other than 0 but still need to be manipulated.", "Add a block class here if you see flickering (z-fighting) with fixBlockCrack enabled" }) @@ -221,4 +221,8 @@ public class AngelicaConfig { @Config.DefaultBoolean(false) public static boolean useVanillaChunkTracking; + @Config.Comment("Disables additional F3 information added by Angelica.") + @Config.DefaultBoolean(false) + public static boolean disableF3Additions; + } diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasDebugScreenHandler.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasDebugScreenHandler.java index 258635bec..11d0531b4 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasDebugScreenHandler.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasDebugScreenHandler.java @@ -1,6 +1,7 @@ package com.gtnewhorizons.angelica.rendering.celeritas; import com.gtnewhorizons.angelica.Tags; +import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.dynamiclights.DynamicLights; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.states.FogState; @@ -20,7 +21,7 @@ public class CeleritasDebugScreenHandler { @SubscribeEvent(priority = EventPriority.LOW) public void onRenderGameOverlayTextEvent(RenderGameOverlayEvent.Text event) { final Minecraft mc = Minecraft.getMinecraft(); - if (!mc.gameSettings.showDebugInfo) { + if (!mc.gameSettings.showDebugInfo || AngelicaConfig.disableF3Additions) { return; } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index f4fbba351..9052a2ec7 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -397,6 +397,12 @@ public class SodiumGameOptionPages { groups.add(OptionGroup.createBuilder() .add(Settings.MODE_GUI_BACKGROUND.option) .add(Settings.GUI_BACKGROUND.option) + .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) + .setName(I18n.format("options.angelica.disablef3")) + .setTooltip(I18n.format("options.angelica.disablef3.tooltip")) + .setControl(TickBoxControl::new) + .setBinding((opts, value) -> AngelicaConfig.disableF3Additions = value, opts -> AngelicaConfig.disableF3Additions) + .build()) .build()); return new OptionPage(I18n.format("sodium.options.pages.advanced"), ImmutableList.copyOf(groups)); diff --git a/src/main/java/net/coderbot/iris/client/IrisDebugScreenHandler.java b/src/main/java/net/coderbot/iris/client/IrisDebugScreenHandler.java index 80284e3af..de6e1b72c 100644 --- a/src/main/java/net/coderbot/iris/client/IrisDebugScreenHandler.java +++ b/src/main/java/net/coderbot/iris/client/IrisDebugScreenHandler.java @@ -37,7 +37,7 @@ public class IrisDebugScreenHandler { @SubscribeEvent(priority = EventPriority.LOW) public void onRenderGameOverlayTextEvent(RenderGameOverlayEvent.Text event) { final Minecraft mc = Minecraft.getMinecraft(); - if (mc.gameSettings.showDebugInfo) { + if (mc.gameSettings.showDebugInfo && !AngelicaConfig.disableF3Additions) { event.right.add(Math.min(event.right.size(), 2), "Direct Buffers: +" + iris$humanReadableByteCountBin(iris$directPool.getMemoryUsed())); if (Iris.getIrisConfig().areShadersEnabled()) { diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 4044c4445..60b58ebac 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -4,6 +4,7 @@ options.chunks=%s chunks options.entityShadows=Entity Shadows options.droppedItems=%s items options.droppedItems.max=Unlimited + sodium.option_impact.low=Low sodium.option_impact.medium=Medium sodium.option_impact.high=High @@ -90,11 +91,14 @@ sodium.options.default=Default sodium.options.buttons.undo=Undo sodium.options.buttons.apply=Apply sodium.options.buttons.donate=Buy coffee for JellySquid! + options.dynamic_fov=Dynamic FOV options.dynamic_fov.tooltip=If enabled, the game's field of view will change based on the player's speed. options.framerate=%s FPS + iris.shaders.toggled=Toggled shaders to %s! iris.shaders.disabled=Shaders disabled! + options.iris.apply=Apply options.iris.refresh=Refresh options.iris.openShaderPackFolder=Open Shader Pack Folder... @@ -131,6 +135,7 @@ options.iris.shadowDistance.enabled=Allows you to change the maximum distance fo options.iris.shadowDistance.disabled=Your current shader pack has already set a render distance for shadows; you cannot change it. options.iris.gui.hide=Hide GUI options.iris.gui.show=Show GUI + options.dynamic_lights=Dynamic Lights options.dynamic_lights.tooltip=Enables dynamic lights. Modes: OFF - off, FASTEST - 500ms delay, FAST - 250ms delay, FANCY - 50ms delay, REALTIME - no delay. options.dynamic_lights_shader_force=Dynamic Lights - Forced With Shaders @@ -153,6 +158,7 @@ options.dynamiclights.entities.title=Dynamic Lights - Entities options.dynamiclights.entities.info=Toggle which entity types emit dynamic light. Some entries are for mod compatibility. options.dynamiclights.entities.search=Search (@mod, $on, $off) options.dynamiclights.entity.tooltip=Toggle dynamic lighting for %s entities. Disable to improve performance if this entity type emits unwanted lights. + options.angelica.search.no_results=No matching options options.angelica.fontconfig=Font Configuration... options.angelica.fontconfig.title=Font Configuration @@ -199,9 +205,13 @@ options.angelica.sleepbeforeswap=Alternate FPS Limiter options.angelica.sleepbeforeswap.tooltip=Switches to an alternate FPS limiter that gives more stable frametimes, in exchange for slightly more latency. Will never introduce more than one frame of latency, and has a lower impact at higher framerates. options.angelica.threadedChunkBuilding=Threaded Chunk Building options.angelica.threadedChunkBuilding.tooltip=If enabled, chunk meshing will be performed on multiple threads in parallel, significantly improving chunk build speed. Disable if you experience rendering issues with mods that have custom block renderers. Requires renderer reload to take effect. + pack.iris.select.title=Select pack.iris.configure.title=Configure label.iris.true=On label.iris.false=Off + options.angelica.aggressiveChunkLoading=Aggressive Chunk Loading options.angelica.aggressiveChunkLoading.tooltip=Renders chunks immediately when loaded, even if neighbors aren't ready yet. Improves perceived loading speed at render distance edges. Chunks rebuild automatically when neighbors load. Useful for low render distance servers. +options.angelica.disablef3=Disable F3 Additions +options.angelica.disablef3.tooltip=Disables Angelica's additions to the F3 debug screen.