diff --git a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java index 2d6db742a..f47df7dfb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java @@ -1,19 +1,21 @@ package com.gtnewhorizons.angelica; -import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID; - import com.gtnewhorizons.angelica.common.BlockError; import com.gtnewhorizons.angelica.compat.ModStatus; +import com.gtnewhorizons.angelica.config.ConfigMigrator; import com.gtnewhorizons.angelica.proxy.CommonProxy; import com.gtnewhorizons.angelica.utils.AnimationMode; import com.gtnewhorizons.angelica.utils.ManagedEnum; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID; @Mod( modid = MOD_ID, @@ -33,6 +35,15 @@ public class AngelicaMod { public static final String MOD_ID = "angelica"; public static final Logger LOGGER = LogManager.getLogger("Angelica"); + private static SodiumGameOptions CONFIG; + + public static SodiumGameOptions options() { + if (CONFIG == null) { + CONFIG = SodiumGameOptions.load(ConfigMigrator.handleConfigMigration("angelica-options.json")); + } + return CONFIG; + } + @SidedProxy(clientSide = "com.gtnewhorizons.angelica.proxy.ClientProxy", serverSide = "com.gtnewhorizons.angelica.proxy.CommonProxy") public static CommonProxy proxy; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/toremove/RenderPhase.java b/src/main/java/com/gtnewhorizons/angelica/compat/toremove/RenderPhase.java index 863ad4802..110116104 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/toremove/RenderPhase.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/toremove/RenderPhase.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica.compat.toremove; +import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.glsm.GLStateManager; -import me.jellysquid.mods.sodium.client.SodiumClientMod; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -147,7 +147,7 @@ public abstract class RenderPhase { FOG = new Fog("fog", () -> { // Unclear what this should do // BackgroundRenderer.setFogBlack(), also levelFogColor() - SodiumClientMod.LOGGER.debug("Fog - Not setting level fog color"); + AngelicaMod.LOGGER.debug("Fog - Not setting level fog color"); GLStateManager.enableFog(); }, GLStateManager::disableFog); BLACK_FOG = new Fog("black_fog", () -> { @@ -156,7 +156,7 @@ public abstract class RenderPhase { }, () -> { // Unclear what this should do // BackgroundRenderer.setFogBlack(), also levelFogColor() - SodiumClientMod.LOGGER.debug("Fog - Not setting level fog color"); + AngelicaMod.LOGGER.debug("Fog - Not setting level fog color"); GLStateManager.disableFog(); }); MAIN_TARGET = new Target("main_target", () -> { @@ -164,7 +164,7 @@ public abstract class RenderPhase { }); OUTLINE_TARGET = new Target("outline_target", () -> { // TODO: Sodium - SodiumClientMod.LOGGER.debug("NOT enabling the entity outline framebuffer"); + AngelicaMod.LOGGER.debug("NOT enabling the entity outline framebuffer"); //MinecraftClient.getInstance().worldRenderer.getEntityOutlinesFramebuffer().beginWrite(false); }, () -> { Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false); @@ -172,7 +172,7 @@ public abstract class RenderPhase { TRANSLUCENT_TARGET = new Target("translucent_target", () -> { if (Minecraft.isFancyGraphicsEnabled()) { // TODO: Sodium - SodiumClientMod.LOGGER.debug("NOT enabling the translucent framebuffer"); + AngelicaMod.LOGGER.debug("NOT enabling the translucent framebuffer"); // MinecraftClient.getInstance().worldRenderer.getTranslucentFramebuffer().beginWrite(false); } @@ -345,7 +345,7 @@ public abstract class RenderPhase { super("lightmap", () -> { if (lightmap) { // TODO: Sodium - LightmapTextureManager - SodiumClientMod.LOGGER.debug("Lightmap - enable (not implemented)"); + AngelicaMod.LOGGER.debug("Lightmap - enable (not implemented)"); // throw new RuntimeException("Not Implemented Yet"); // MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager().enable(); @@ -354,7 +354,7 @@ public abstract class RenderPhase { }, () -> { if (lightmap) { // TODO: Sodium - LightmapTextureManager - SodiumClientMod.LOGGER.debug("Lightmap - disable (not implemented)"); + AngelicaMod.LOGGER.debug("Lightmap - disable (not implemented)"); // throw new RuntimeException("Not Implemented Yet"); // MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager().disable(); } diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java index e4109efa8..87e81ce27 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java @@ -1,11 +1,9 @@ package com.gtnewhorizons.angelica.proxy; -import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID; -import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; - import com.google.common.base.Objects; import com.gtnewhorizon.gtnhlib.client.model.loading.ModelRegistry; import com.gtnewhorizon.gtnhlib.client.renderer.vao.VAOManager; +import com.gtnewhorizons.angelica.commands.AngelicaCommand; import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.compat.bettercrashes.BetterCrashesCompat; import com.gtnewhorizons.angelica.config.AngelicaConfig; @@ -18,6 +16,7 @@ import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfig; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.debug.OpenGLDebugging; import com.gtnewhorizons.angelica.hudcaching.HUDCaching; +import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt; import com.gtnewhorizons.angelica.render.CloudRenderer; import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry; @@ -27,10 +26,7 @@ import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskRegistr import com.gtnewhorizons.angelica.rendering.celeritas.threading.DefaultChunkTaskProvider; import com.gtnewhorizons.angelica.rendering.celeritas.threading.ThreadedChunkTaskProvider; import com.gtnewhorizons.angelica.zoom.Zoom; -import com.gtnewhorizons.angelica.commands.AngelicaCommand; import cpw.mods.fml.client.registry.ClientRegistry; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; -import net.minecraftforge.client.ClientCommandHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -40,10 +36,11 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.relauncher.ReflectionHelper; -import java.lang.management.ManagementFactory; -import java.util.Locale; -import java.util.concurrent.ConcurrentHashMap; import jss.notfine.core.Settings; +import jss.notfine.gui.GuiCustomMenu; +import jss.notfine.gui.NotFineGameOptionPages; +import me.flashyreese.mods.reeses_sodium_options.client.gui.ReeseSodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; import net.coderbot.iris.Iris; import net.coderbot.iris.client.IrisDebugScreenHandler; import net.minecraft.block.Block; @@ -51,6 +48,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiMainMenu; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiVideoSettings; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.settings.GameSettings; @@ -61,14 +60,23 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.chunk.Chunk; +import net.minecraftforge.client.ClientCommandHandler; import net.minecraftforge.client.event.EntityViewRenderEvent; import net.minecraftforge.client.event.FOVUpdateEvent; import net.minecraftforge.client.event.GuiOpenEvent; +import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; import org.lwjgl.input.Keyboard; +import java.lang.management.ManagementFactory; +import java.util.Locale; +import java.util.concurrent.ConcurrentHashMap; + +import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID; +import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; + public class ClientProxy extends CommonProxy { final Minecraft mc = Minecraft.getMinecraft(); @@ -323,6 +331,20 @@ public class ClientProxy extends CommonProxy { } } + @SubscribeEvent + public void onGuiInit(GuiScreenEvent.InitGuiEvent.Pre event) { + if(event.gui instanceof GuiVideoSettings eventGui) { + event.setCanceled(true); + if(AngelicaConfig.enableNotFineOptions || GuiScreen.isShiftKeyDown()) { + Minecraft.getMinecraft().displayGuiScreen(new GuiCustomMenu(eventGui.parentGuiScreen, NotFineGameOptionPages.general(), NotFineGameOptionPages.detail(), NotFineGameOptionPages.atmosphere(), NotFineGameOptionPages.particles(), NotFineGameOptionPages.other())); + } else if(!AngelicaConfig.enableReesesSodiumOptions || GuiScreen.isCtrlKeyDown()) { + Minecraft.getMinecraft().displayGuiScreen(new SodiumOptionsGUI(eventGui.parentGuiScreen)); + } else { + Minecraft.getMinecraft().displayGuiScreen(new ReeseSodiumVideoOptionsScreen(eventGui.parentGuiScreen)); + } + } + } + /* coerce NaN fog values back to 0 (https://bugs.mojang.com/browse/MC-10480) - from ArchaicFix */ @SubscribeEvent(priority = EventPriority.LOWEST) public void onFogColor(EntityViewRenderEvent.FogColors event) { diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java index 6716cd46c..e5e89a69d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java @@ -1,32 +1,29 @@ package com.gtnewhorizons.angelica.rendering.celeritas; +import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.dynamiclights.DynamicLights; import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightSource; - -import java.util.Arrays; -import java.util.List; import com.gtnewhorizons.angelica.rendering.celeritas.iris.BlockRenderContext; import com.gtnewhorizons.angelica.rendering.celeritas.iris.IrisExtendedChunkVertexEncoder; -import org.embeddedt.embeddium.impl.model.light.LightPipeline; -import org.embeddedt.embeddium.impl.model.light.flat.FlatLightPipeline; -import org.embeddedt.embeddium.impl.render.chunk.ChunkColorWriter; import com.gtnewhorizons.angelica.rendering.celeritas.light.LightDataCache; import com.gtnewhorizons.angelica.rendering.celeritas.light.QuadLightingHelper; import com.gtnewhorizons.angelica.rendering.celeritas.light.VanillaDiffuseProvider; -import org.embeddedt.embeddium.impl.model.light.smooth.SmoothLightPipeline; import com.gtnewhorizons.angelica.rendering.celeritas.world.WorldSlice; import lombok.Getter; -import me.jellysquid.mods.sodium.client.SodiumClientMod; import net.coderbot.iris.block_rendering.BlockRenderingSettings; import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.world.IBlockAccess; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import org.embeddedt.embeddium.impl.model.light.LightPipeline; import org.embeddedt.embeddium.impl.model.light.data.LightDataAccess; import org.embeddedt.embeddium.impl.model.light.data.QuadLightData; +import org.embeddedt.embeddium.impl.model.light.flat.FlatLightPipeline; +import org.embeddedt.embeddium.impl.model.light.smooth.SmoothLightPipeline; import org.embeddedt.embeddium.impl.model.quad.properties.ModelQuadFacing; +import org.embeddedt.embeddium.impl.render.chunk.ChunkColorWriter; import org.embeddedt.embeddium.impl.render.chunk.RenderPassConfiguration; import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkBuildBuffers; import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkBuildContext; @@ -36,6 +33,9 @@ import org.embeddedt.embeddium.impl.render.chunk.terrain.material.Material; import org.embeddedt.embeddium.impl.render.chunk.vertex.format.ChunkVertexEncoder; import org.embeddedt.embeddium.impl.util.QuadUtil; +import java.util.Arrays; +import java.util.List; + public class AngelicaChunkBuildContext extends ChunkBuildContext { public static final int NUM_PASSES = 2; @@ -95,7 +95,7 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext { private Material selectMaterial(Material material, TextureAtlasSprite sprite, boolean isShaderPackOverride) { // Don't apply transparency-based optimization when shader pack explicitly overrides the material - if (isShaderPackOverride) { + if (!AngelicaMod.options().performance.useRenderPassOptimization || isShaderPackOverride) { return material; } if (sprite != null && sprite.getClass() == TextureAtlasSprite.class && !sprite.hasAnimationMetadata()) { @@ -124,7 +124,7 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext { final boolean hasDynamicLights = chunkLightSources != null && !chunkLightSources.isEmpty(); final boolean separateAo = BlockRenderingSettings.INSTANCE.shouldUseSeparateAo(); - final boolean celeritasSmoothLighting = SodiumClientMod.options().quality.useCeleritasSmoothLighting; + final boolean celeritasSmoothLighting = AngelicaMod.options().quality.useCeleritasSmoothLighting; final boolean shaderActive = IrisApi.getInstance().isShaderPackInUse(); final boolean useAoCalculation = lightPipelineReady && (separateAo || celeritasSmoothLighting || shaderActive); final boolean stripDiffuse = shaderActive && BlockRenderingSettings.INSTANCE.shouldDisableDirectionalShading(); diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java index d5211639f..dcd98f00f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java @@ -1,11 +1,12 @@ package com.gtnewhorizons.angelica.rendering.celeritas; +import com.gtnewhorizons.angelica.AngelicaMod; +import com.gtnewhorizons.angelica.mixins.interfaces.RenderSectionManagerAccessor; import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue; import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder; import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskProvider; import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskRegistry; import com.gtnewhorizons.angelica.rendering.celeritas.world.cloned.ClonedChunkSectionCache; -import me.jellysquid.mods.sodium.client.SodiumClientMod; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -15,7 +16,6 @@ import org.embeddedt.embeddium.impl.render.chunk.ChunkRenderMatrices; import org.embeddedt.embeddium.impl.render.chunk.RenderPassConfiguration; import org.embeddedt.embeddium.impl.render.chunk.RenderSection; import org.embeddedt.embeddium.impl.render.chunk.RenderSectionManager; -import org.embeddedt.embeddium.impl.render.viewport.CameraTransform; import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkBuildOutput; import org.embeddedt.embeddium.impl.render.chunk.compile.tasks.ChunkBuilderTask; import org.embeddedt.embeddium.impl.render.chunk.lists.SectionTicker; @@ -23,12 +23,11 @@ import org.embeddedt.embeddium.impl.render.chunk.occlusion.AsyncOcclusionMode; import org.embeddedt.embeddium.impl.render.chunk.sprite.GenericSectionSpriteTicker; import org.embeddedt.embeddium.impl.render.chunk.terrain.TerrainRenderPass; import org.embeddedt.embeddium.impl.render.chunk.vertex.format.ChunkVertexType; +import org.embeddedt.embeddium.impl.render.viewport.CameraTransform; import org.embeddedt.embeddium.impl.render.viewport.Viewport; import org.embeddedt.embeddium.impl.util.PositionUtil; import org.jetbrains.annotations.Nullable; -import com.gtnewhorizons.angelica.mixins.interfaces.RenderSectionManagerAccessor; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -88,7 +87,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { @Override protected AsyncOcclusionMode getAsyncOcclusionMode() { - return AsyncOcclusionMode.EVERYTHING; + return AngelicaMod.options().performance.asyncOcclusionMode; } @Override @@ -98,7 +97,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { @Override protected boolean useFogOcclusion() { - return true; + return AngelicaMod.options().performance.useFogOcclusion && !IrisShaderProviderHolder.isActive(); } @Override @@ -108,10 +107,13 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { @Override protected boolean shouldUseOcclusionCulling(Viewport positionedViewport, boolean spectator) { - if (!spectator) return true; - - final var camBlockPos = positionedViewport.getBlockCoord(); - return !this.world.getBlock(camBlockPos.x(), camBlockPos.y(), camBlockPos.z()).isOpaqueCube(); + if (spectator) { + final var camBlockPos = positionedViewport.getBlockCoord(); + if (this.world.getBlock(camBlockPos.x(), camBlockPos.y(), camBlockPos.z()).isOpaqueCube()) { + return false; + } + } + return AngelicaMod.options().performance.useOcclusionCulling; } @Override @@ -150,7 +152,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { @Override protected boolean allowImportantRebuilds() { - return !SodiumClientMod.options().performance.alwaysDeferChunkUpdates; + return !AngelicaMod.options().performance.alwaysDeferChunkUpdates; } @Override diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java index 323b8bce2..c4cb0126b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java @@ -1,11 +1,14 @@ package com.gtnewhorizons.angelica.rendering.celeritas; +import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.dynamiclights.DynamicLights; import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightWorldRenderer; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.mixins.interfaces.ITileEntityBoundingBoxCache; import com.gtnewhorizons.angelica.rendering.RenderingState; import com.gtnewhorizons.angelica.rendering.TileEntityRenderBoundsRegistry; +import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProvider; +import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder; import net.coderbot.iris.pipeline.ShadowRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; @@ -23,9 +26,6 @@ import org.embeddedt.embeddium.impl.render.chunk.lists.ChunkRenderList; import org.embeddedt.embeddium.impl.render.chunk.lists.SortedRenderLists; import org.embeddedt.embeddium.impl.render.chunk.vertex.format.ChunkMeshFormats; import org.embeddedt.embeddium.impl.render.chunk.vertex.format.ChunkVertexType; -import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProvider; -import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder; -import me.jellysquid.mods.sodium.client.SodiumClientMod; import org.embeddedt.embeddium.impl.render.terrain.SimpleWorldRenderer; import org.embeddedt.embeddium.impl.render.viewport.Viewport; import org.joml.Matrix4f; @@ -118,7 +118,7 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer opts.advanced.useBlockFaceCulling = value, opts -> opts.advanced.useBlockFaceCulling) + .setBinding((opts, value) -> opts.performance.useBlockFaceCulling = value, opts -> opts.performance.useBlockFaceCulling) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build()) .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) @@ -305,14 +304,14 @@ public class NotFineGameOptionPages { .setTooltip(I18n.format("sodium.options.use_compact_vertex_format.tooltip")) .setControl(TickBoxControl::new) .setImpact(OptionImpact.MEDIUM) - .setBinding((opts, value) -> opts.advanced.useCompactVertexFormat = value, opts -> opts.advanced.useCompactVertexFormat) + .setBinding((opts, value) -> opts.performance.useCompactVertexFormat = value, opts -> opts.performance.useCompactVertexFormat) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build()) .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) .setName(I18n.format("sodium.options.use_fog_occlusion.name")) .setTooltip(I18n.format("sodium.options.use_fog_occlusion.tooltip")) .setControl(TickBoxControl::new) - .setBinding((opts, value) -> opts.advanced.useFogOcclusion = value, opts -> opts.advanced.useFogOcclusion) + .setBinding((opts, value) -> opts.performance.useFogOcclusion = value, opts -> opts.performance.useFogOcclusion) .setImpact(OptionImpact.MEDIUM) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build()) @@ -320,7 +319,7 @@ public class NotFineGameOptionPages { .setName(I18n.format("sodium.options.translucency_sorting.name")) .setTooltip(I18n.format("sodium.options.translucency_sorting.tooltip")) .setControl(TickBoxControl::new) - .setBinding((opts, value) -> opts.advanced.translucencySorting = value, opts -> opts.advanced.translucencySorting) + .setBinding((opts, value) -> opts.performance.translucencySorting = value, opts -> opts.performance.translucencySorting) .setImpact(OptionImpact.MEDIUM) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build()) @@ -329,7 +328,7 @@ public class NotFineGameOptionPages { .setTooltip(I18n.format("sodium.options.use_entity_culling.tooltip")) .setControl(TickBoxControl::new) .setImpact(OptionImpact.MEDIUM) - .setBinding((opts, value) -> opts.advanced.useEntityCulling = value, opts -> opts.advanced.useEntityCulling) + .setBinding((opts, value) -> opts.performance.useEntityCulling = value, opts -> opts.performance.useEntityCulling) .build()) .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) .setName(I18n.format("sodium.options.use_particle_culling.name")) @@ -345,7 +344,7 @@ public class NotFineGameOptionPages { .setTooltip(I18n.format("sodium.options.animate_only_visible_textures.tooltip")) .setControl(TickBoxControl::new) .setImpact(OptionImpact.MEDIUM) - .setBinding((opts, value) -> opts.advanced.animateOnlyVisibleTextures = value, opts -> opts.advanced.animateOnlyVisibleTextures) + .setBinding((opts, value) -> opts.performance.animateOnlyVisibleTextures = value, opts -> opts.performance.animateOnlyVisibleTextures) .build()) .build()); groups.add(OptionGroup.createBuilder() diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/ReeseSodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/ReeseSodiumVideoOptionsScreen.java index e0298d18a..2d6276bb0 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/ReeseSodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/ReeseSodiumVideoOptionsScreen.java @@ -4,7 +4,6 @@ import com.gtnewhorizons.angelica.client.gui.FontConfigScreen; import com.gtnewhorizons.angelica.compat.mojang.Element; import com.gtnewhorizons.angelica.config.AngelicaConfig; import jss.notfine.gui.GuiCustomMenu; -import net.coderbot.iris.Iris; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.BasicFrame; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.SearchTextFieldComponent; @@ -19,6 +18,7 @@ import me.jellysquid.mods.sodium.client.gui.options.OptionPage; import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.coderbot.iris.Iris; import net.coderbot.iris.gui.screen.ShaderPackScreen; import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.gui.GuiScreen; @@ -283,7 +283,7 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI { } if (keyCode == Keyboard.KEY_P) { if(isShiftKeyDown()){ - this.mc.displayGuiScreen(new GuiCustomMenu(this.prevScreen, SodiumGameOptionPages.general(), SodiumGameOptionPages.quality(), SodiumGameOptionPages.advanced(), SodiumGameOptionPages.performance())); + this.mc.displayGuiScreen(new GuiCustomMenu(this.prevScreen, SodiumGameOptionPages.general(), SodiumGameOptionPages.quality(), SodiumGameOptionPages.advanced(), SodiumGameOptionPages.performance(), SodiumGameOptionPages.appearance(), SodiumGameOptionPages.debug())); } else if (isCtrlKeyDown()) { this.mc.displayGuiScreen(new SodiumOptionsGUI(this.prevScreen)); } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java b/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java deleted file mode 100644 index f263df08d..000000000 --- a/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java +++ /dev/null @@ -1,88 +0,0 @@ -package me.jellysquid.mods.sodium.client; - -import com.gtnewhorizons.angelica.Tags; -import com.gtnewhorizons.angelica.config.ConfigMigrator; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import lombok.Getter; -import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; -import me.jellysquid.mods.sodium.proxy.CommonProxy; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -@Mod(modid = SodiumClientMod.MODID, - name = SodiumClientMod.NAME, - version = Tags.VERSION, - acceptedMinecraftVersions = "[1.7.10]", - acceptableRemoteVersions = "*") -public class SodiumClientMod { - @SidedProxy(clientSide = "me.jellysquid.mods.sodium.proxy.ClientProxy", serverSide = "me.jellysquid.mods.sodium.proxy.CommonProxy") - public static CommonProxy proxy; - - private static SodiumGameOptions CONFIG; - public static Logger LOGGER = LogManager.getLogger("Embeddium"); - - private static String MOD_VERSION = Tags.VERSION; - - public static final String MODID = "embeddium"; - public static final String NAME = "Embeddium"; - - @Getter - private static Thread MainThread; - - public SodiumClientMod() { - MainThread = Thread.currentThread(); - } - - - - public static SodiumGameOptions options() { - if (CONFIG == null) { - CONFIG = loadConfig(); - } - - return CONFIG; - } - - public static Logger logger() { - if (LOGGER == null) { - LOGGER = LogManager.getLogger("Embeddium"); - } - - return LOGGER; - } - - private static SodiumGameOptions loadConfig() { - return SodiumGameOptions.load(ConfigMigrator.handleConfigMigration("angelica-options.json")); - } - - public static String getVersion() { - if (MOD_VERSION == null) { - throw new NullPointerException("Mod version hasn't been populated yet"); - } - - return MOD_VERSION; - } - - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) { - proxy.preInit(event); - } - - @Mod.EventHandler - public void init(FMLInitializationEvent event) { - proxy.init(event); - } - - @Mod.EventHandler - public void postInit(FMLPostInitializationEvent event) { - proxy.postInit(event); - } - - public static boolean isDirectMemoryAccessEnabled() { - return options().advanced.allowDirectMemoryAccess; - } -} 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 9052a2ec7..517b338f0 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 @@ -2,7 +2,6 @@ package me.jellysquid.mods.sodium.client.gui; import com.google.common.collect.ImmutableList; import com.gtnewhorizons.angelica.config.AngelicaConfig; -import com.gtnewhorizons.angelica.dynamiclights.DynamicLights; import com.gtnewhorizons.angelica.glsm.GLStateManager; import jss.notfine.core.Settings; import jss.notfine.core.SettingsManager; @@ -28,6 +27,7 @@ import net.coderbot.iris.gui.option.IrisVideoSettings; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.GameSettings; +import org.embeddedt.embeddium.impl.render.chunk.occlusion.AsyncOcclusionMode; import org.lwjgl.opengl.Display; import java.io.IOException; @@ -80,19 +80,6 @@ public class SodiumGameOptionPages { .setControl(opt -> new SliderControl(opt, 0, 100, 1, ControlValueFormatter.brightness())) .setBinding((opts, value) -> opts.gammaSetting = value * 0.01F, (opts) -> (int) (opts.gammaSetting / 0.01F)) .build()); - firstGroupBuilder.add(Settings.MODE_LIGHT_FLICKER.option) - .add(Settings.MODE_SKY.option) - .add(Settings.MODE_SUN_MOON.option) - .add(Settings.RENDER_DISTANCE_CLOUDS.option) - .add(Settings.CLOUD_HEIGHT.option) - .add(Settings.CLOUD_SCALE.option) - .add(Settings.MODE_CLOUD_TRANSLUCENCY.option) - .add(Settings.MODE_STARS.option) - .add(Settings.TOTAL_STARS.option) - .add(Settings.HORIZON_DISABLE.option) - .add(Settings.FOG_DISABLE.option) - .add(Settings.FOG_NEAR_DISTANCE.option) - .add(Settings.VOID_FOG.option); groups.add(firstGroupBuilder.build()); int maxGuiScale = Math.max(3, Math.min(Minecraft.getMinecraft().displayWidth / 320, Minecraft.getMinecraft().displayHeight / 240)); @@ -166,24 +153,6 @@ public class SodiumGameOptionPages { .add(Settings.DYNAMIC_FOV.option) .add(Settings.MODE_WATER.option) .add(Settings.MODE_DROPPED_ITEMS.option) - .add( - OptionImpl.createBuilder(int.class, angelicaOpts) - .setName(I18n.format("options.angelica.droppedItemLimit")) - .setTooltip(I18n.format("options.angelica.droppedItemLimit.tooltip")) - .setControl(option -> new SliderControl(option, 32, 2048, 32, ControlValueFormatter.droppedItemLimitLimit())) - .setBinding((options, value) -> AngelicaConfig.droppedItemLimit = value, options -> AngelicaConfig.droppedItemLimit) - .setImpact(OptionImpact.MEDIUM) - .build() - ) - .add( - OptionImpl.createBuilder(int.class, angelicaOpts) - .setName(I18n.format("options.angelica.mobSpawnerRenderDistance")) - .setTooltip(I18n.format("options.angelica.mobSpawnerRenderDistance.tooltip")) - .setControl(option -> new SliderControl(option, 16, 64, 1, ControlValueFormatter.number())) - .setBinding((options, value) -> AngelicaConfig.mobSpawnerRenderDistance = value, options -> (int) AngelicaConfig.mobSpawnerRenderDistance) - .setImpact(OptionImpact.MEDIUM) - .build() - ) .build()); return new OptionPage(I18n.format("stat.generalButton"), ImmutableList.copyOf(groups)); @@ -305,7 +274,7 @@ public class SodiumGameOptionPages { .setTooltip(I18n.format("sodium.options.use_block_face_culling.tooltip")) .setControl(TickBoxControl::new) .setImpact(OptionImpact.MEDIUM) - .setBinding((opts, value) -> opts.advanced.useBlockFaceCulling = value, opts -> opts.advanced.useBlockFaceCulling) + .setBinding((opts, value) -> opts.performance.useBlockFaceCulling = value, opts -> opts.performance.useBlockFaceCulling) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build() ) @@ -314,7 +283,7 @@ public class SodiumGameOptionPages { .setTooltip(I18n.format("sodium.options.use_compact_vertex_format.tooltip")) .setControl(TickBoxControl::new) .setImpact(OptionImpact.MEDIUM) - .setBinding((opts, value) -> opts.advanced.useCompactVertexFormat = value, opts -> opts.advanced.useCompactVertexFormat) + .setBinding((opts, value) -> opts.performance.useCompactVertexFormat = value, opts -> opts.performance.useCompactVertexFormat) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build() ) @@ -322,7 +291,7 @@ public class SodiumGameOptionPages { .setName(I18n.format("sodium.options.use_fog_occlusion.name")) .setTooltip(I18n.format("sodium.options.use_fog_occlusion.tooltip")) .setControl(TickBoxControl::new) - .setBinding((opts, value) -> opts.advanced.useFogOcclusion = value, opts -> opts.advanced.useFogOcclusion) + .setBinding((opts, value) -> opts.performance.useFogOcclusion = value, opts -> opts.performance.useFogOcclusion) .setImpact(OptionImpact.MEDIUM) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build() @@ -331,7 +300,7 @@ public class SodiumGameOptionPages { .setName(I18n.format("sodium.options.translucency_sorting.name")) .setTooltip(I18n.format("sodium.options.translucency_sorting.tooltip")) .setControl(TickBoxControl::new) - .setBinding((opts, value) -> opts.advanced.translucencySorting = value, opts -> opts.advanced.translucencySorting) + .setBinding((opts, value) -> opts.performance.translucencySorting = value, opts -> opts.performance.translucencySorting) .setImpact(OptionImpact.MEDIUM) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build() @@ -341,7 +310,7 @@ public class SodiumGameOptionPages { .setTooltip(I18n.format("sodium.options.use_entity_culling.tooltip")) .setControl(TickBoxControl::new) .setImpact(OptionImpact.MEDIUM) - .setBinding((opts, value) -> opts.advanced.useEntityCulling = value, opts -> opts.advanced.useEntityCulling) + .setBinding((opts, value) -> opts.performance.useEntityCulling = value, opts -> opts.performance.useEntityCulling) .build() ) .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) @@ -357,7 +326,34 @@ public class SodiumGameOptionPages { .setTooltip(I18n.format("sodium.options.animate_only_visible_textures.tooltip")) .setControl(TickBoxControl::new) .setImpact(OptionImpact.MEDIUM) - .setBinding((opts, value) -> opts.advanced.animateOnlyVisibleTextures = value, opts -> opts.advanced.animateOnlyVisibleTextures) + .setBinding((opts, value) -> opts.performance.animateOnlyVisibleTextures = value, opts -> opts.performance.animateOnlyVisibleTextures) + .build() + ) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_render_pass_optimization.name")) + .setTooltip(I18n.format("sodium.options.use_render_pass_optimization.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> opts.performance.useRenderPassOptimization = value, opts -> opts.performance.useRenderPassOptimization) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build() + ) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_occlusion_culling.name")) + .setTooltip(I18n.format("sodium.options.use_occlusion_culling.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.EXTREME) + .setBinding((opts, value) -> opts.performance.useOcclusionCulling = value, opts -> opts.performance.useOcclusionCulling) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build() + ) + .add(OptionImpl.createBuilder(AsyncOcclusionMode.class, sodiumOpts) + .setName(I18n.format("sodium.options.async_occlusion_mode.name")) + .setTooltip(I18n.format("sodium.options.async_occlusion_mode.tooltip")) + .setControl(o -> new CyclingControl<>(o, AsyncOcclusionMode.class, new String[]{"None", "Only Shadow", "Everything"})) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> opts.performance.asyncOcclusionMode = value, opts -> opts.performance.asyncOcclusionMode) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build() ) .build()); @@ -383,28 +379,6 @@ public class SodiumGameOptionPages { ) .build()); - groups.add(OptionGroup.createBuilder() - .add(OptionImpl.createBuilder(int.class, angelicaOpts) - .setName(I18n.format("options.angelica.itemdisplaylistcount")) - .setTooltip(I18n.format("options.angelica.itemdisplaylistcount.tooltip")) - .setControl(o -> new SliderControl(o, 256, 1024, 16, ControlValueFormatter.number())) - .setImpact(OptionImpact.MEDIUM) - .setBinding((opts, value) -> AngelicaConfig.itemRendererCacheSize = value, options -> AngelicaConfig.itemRendererCacheSize) - .build() - ) - .build()); - - 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)); } @@ -446,14 +420,6 @@ public class SodiumGameOptionPages { .setBinding((opts, value) -> opts.performance.useNoErrorGLContext = value, opts -> opts.performance.useNoErrorGLContext) .setFlags(OptionFlag.REQUIRES_GAME_RESTART) .build()) - .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) - .setName(I18n.format("sodium.options.use_gl_state_cache.name")) - .setTooltip(I18n.format("sodium.options.use_gl_state_cache.tooltip")) - .setControl(TickBoxControl::new) - .setImpact(OptionImpact.EXTREME) - .setBinding((opts, value) -> GLStateManager.BYPASS_CACHE = !value, opts -> !GLStateManager.BYPASS_CACHE) - .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) - .build()) .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) .setName(I18n.format("options.angelica.aggressiveChunkLoading")) .setTooltip(I18n.format("options.angelica.aggressiveChunkLoading.tooltip")) @@ -462,9 +428,94 @@ public class SodiumGameOptionPages { .setBinding((opts, value) -> AngelicaConfig.useVanillaChunkTracking = value, opts -> AngelicaConfig.useVanillaChunkTracking) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) .build()) + .add(OptionImpl.createBuilder(int.class, sodiumOpts) + .setName(I18n.format("sodium.options.cpu_render_ahead_limit.name")) + .setTooltip(I18n.format("sodium.options.cpu_render_ahead_limit.tooltip")) + .setControl(o -> new SliderControl(o, 0, 9, 1, ControlValueFormatter.quantity("sodium.options.cpu_render_ahead_limit.value"))) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> opts.performance.cpuRenderAheadLimit = value, opts -> opts.performance.cpuRenderAheadLimit) + .setEnabled(GLStateManager.capabilities != null && GLStateManager.capabilities.OpenGL32) + .build()) .build()); + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(int.class, angelicaOpts) + .setName(I18n.format("options.angelica.droppedItemLimit")) + .setTooltip(I18n.format("options.angelica.droppedItemLimit.tooltip")) + .setControl(option -> new SliderControl(option, 32, 2048, 32, ControlValueFormatter.droppedItemLimitLimit())) + .setBinding((options, value) -> AngelicaConfig.droppedItemLimit = value, options -> AngelicaConfig.droppedItemLimit) + .setImpact(OptionImpact.MEDIUM) + .build()) + .add(OptionImpl.createBuilder(int.class, angelicaOpts) + .setName(I18n.format("options.angelica.mobSpawnerRenderDistance")) + .setTooltip(I18n.format("options.angelica.mobSpawnerRenderDistance.tooltip")) + .setControl(option -> new SliderControl(option, 16, 64, 1, ControlValueFormatter.number())) + .setBinding((options, value) -> AngelicaConfig.mobSpawnerRenderDistance = value, options -> (int) AngelicaConfig.mobSpawnerRenderDistance) + .setImpact(OptionImpact.MEDIUM) + .build()) + .add(OptionImpl.createBuilder(int.class, angelicaOpts) + .setName(I18n.format("options.angelica.itemdisplaylistcount")) + .setTooltip(I18n.format("options.angelica.itemdisplaylistcount.tooltip")) + .setControl(o -> new SliderControl(o, 256, 1024, 16, ControlValueFormatter.number())) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> AngelicaConfig.itemRendererCacheSize = value, options -> AngelicaConfig.itemRendererCacheSize) + .build()) + .build()); + return new OptionPage(I18n.format("sodium.options.pages.performance"), ImmutableList.copyOf(groups)); } + + public static OptionPage appearance() { + final List groups = new ArrayList<>(); + + groups.add(OptionGroup.createBuilder() + .add(Settings.MODE_SKY.option) + .add(Settings.MODE_SUN_MOON.option) + .add(Settings.RENDER_DISTANCE_CLOUDS.option) + .add(Settings.CLOUD_HEIGHT.option) + .add(Settings.CLOUD_SCALE.option) + .add(Settings.MODE_CLOUD_TRANSLUCENCY.option) + .add(Settings.MODE_STARS.option) + .add(Settings.TOTAL_STARS.option) + .add(Settings.HORIZON_DISABLE.option) + .add(Settings.MODE_LIGHT_FLICKER.option) + .build()); + + groups.add(OptionGroup.createBuilder() + .add(Settings.FOG_DISABLE.option) + .add(Settings.FOG_NEAR_DISTANCE.option) + .add(Settings.VOID_FOG.option) + .build()); + + 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.appearance"), ImmutableList.copyOf(groups)); + } + + public static OptionPage debug() { + final List groups = new ArrayList<>(); + + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_gl_state_cache.name")) + .setTooltip(I18n.format("sodium.options.use_gl_state_cache.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.EXTREME) + .setBinding((opts, value) -> GLStateManager.BYPASS_CACHE = !value, opts -> !GLStateManager.BYPASS_CACHE) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) + .build()); + + return new OptionPage(I18n.format("sodium.options.pages.debug"), ImmutableList.copyOf(groups)); + } } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java index 2fcf5db4b..2bb3ed5ac 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java @@ -4,9 +4,11 @@ import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonSyntaxException; -import me.jellysquid.mods.sodium.client.SodiumClientMod; +import com.gtnewhorizons.angelica.AngelicaMod; +import com.gtnewhorizons.angelica.glsm.GLStateManager; import me.jellysquid.mods.sodium.client.gui.options.named.GraphicsQuality; import net.coderbot.iris.Iris; +import org.embeddedt.embeddium.impl.render.chunk.occlusion.AsyncOcclusionMode; import java.io.FileReader; import java.io.IOException; @@ -26,21 +28,26 @@ public class SodiumGameOptions { public boolean useVertexArrayObjects = true; public boolean useChunkMultidraw = true; - public boolean animateOnlyVisibleTextures = true; - public boolean useEntityCulling = true; public boolean useParticleCulling = true; - public boolean useFogOcclusion = true; - public boolean useCompactVertexFormat = true; - public boolean useBlockFaceCulling = true; public boolean allowDirectMemoryAccess = true; public boolean ignoreDriverBlacklist = false; - public boolean translucencySorting = true; } public static class PerformanceSettings { public int chunkBuilderThreads = 0; public boolean alwaysDeferChunkUpdates = true; public boolean useNoErrorGLContext = true; + public AsyncOcclusionMode asyncOcclusionMode = AsyncOcclusionMode.EVERYTHING; + public boolean useOcclusionCulling = true; + + public boolean animateOnlyVisibleTextures = true; + public boolean useEntityCulling = true; + public boolean useFogOcclusion = true; + public boolean useBlockFaceCulling = true; + public boolean useCompactVertexFormat = true; + public boolean translucencySorting = true; + public boolean useRenderPassOptimization = true; + public int cpuRenderAheadLimit = 3; } public static class EntityRenderDistance { @@ -74,7 +81,7 @@ public class SodiumGameOptions { } catch (IOException e) { throw new RuntimeException("Could not parse config", e); } catch (JsonSyntaxException e) { - SodiumClientMod.logger().error("Could not parse config, will fallback to default settings", e); + AngelicaMod.LOGGER.error("Could not parse config, will fallback to default settings", e); config = new SodiumGameOptions(); resaveConfig = false; } @@ -84,6 +91,11 @@ public class SodiumGameOptions { config.configPath = path; + // Clamp render-ahead to 0 if GL 3.2 fences aren't available + if (GLStateManager.capabilities == null || !GLStateManager.capabilities.OpenGL32) { + config.performance.cpuRenderAheadLimit = 0; + } + try { if(resaveConfig) config.writeChanges(); diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumOptionsGUI.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumOptionsGUI.java index 91b40bbb8..563b16f81 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumOptionsGUI.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumOptionsGUI.java @@ -7,7 +7,6 @@ import com.gtnewhorizons.angelica.compat.mojang.Drawable; import com.gtnewhorizons.angelica.compat.mojang.Element; import com.gtnewhorizons.angelica.dynamiclights.DynamicLights; import jss.notfine.gui.GuiCustomMenu; -import net.coderbot.iris.Iris; import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.OptionFlag; import me.jellysquid.mods.sodium.client.gui.options.OptionGroup; @@ -19,6 +18,7 @@ import me.jellysquid.mods.sodium.client.gui.options.control.element.SodiumContro import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.coderbot.iris.Iris; import net.coderbot.iris.gui.screen.ShaderPackScreen; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; @@ -62,6 +62,7 @@ public class SodiumOptionsGUI extends ScrollableGuiScreen { this.pages.add(SodiumGameOptionPages.quality()); this.pages.add(SodiumGameOptionPages.advanced()); this.pages.add(SodiumGameOptionPages.performance()); + this.pages.add(SodiumGameOptionPages.appearance()); // Add Dynamic Lights page if enabled if (DynamicLights.configEnabled) { @@ -75,6 +76,8 @@ public class SodiumOptionsGUI extends ScrollableGuiScreen { shaderPacks = new OptionPage(I18n.format("options.iris.shaderPackSelection"), ImmutableList.of()); this.pages.add(shaderPacks); } + + this.pages.add(SodiumGameOptionPages.debug()); } public void setPage(OptionPage page) { @@ -298,7 +301,8 @@ public class SodiumOptionsGUI extends ScrollableGuiScreen { if (keyCode == Keyboard.KEY_P && isShiftKeyDown()) { this.mc.displayGuiScreen(new GuiCustomMenu(this.prevScreen, SodiumGameOptionPages.general(), - SodiumGameOptionPages.quality(), SodiumGameOptionPages.advanced(), SodiumGameOptionPages.performance())); + SodiumGameOptionPages.quality(), SodiumGameOptionPages.advanced(), SodiumGameOptionPages.performance(), + SodiumGameOptionPages.appearance(), SodiumGameOptionPages.debug())); } } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/AngelicaOptionsStorage.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/AngelicaOptionsStorage.java index baf8e8f01..4f2d9c52b 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/AngelicaOptionsStorage.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/AngelicaOptionsStorage.java @@ -1,8 +1,8 @@ package me.jellysquid.mods.sodium.client.gui.options.storage; import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; +import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.config.AngelicaConfig; -import me.jellysquid.mods.sodium.client.SodiumClientMod; public class AngelicaOptionsStorage implements OptionStorage { @@ -18,6 +18,6 @@ public class AngelicaOptionsStorage implements OptionStorage { @Override public void save() { ConfigurationManager.save(AngelicaConfig.class); - SodiumClientMod.logger().info("Flushed changes to Angelica configuration"); + AngelicaMod.LOGGER.info("Flushed changes to Angelica configuration"); } } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/MinecraftOptionsStorage.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/MinecraftOptionsStorage.java index 1630c57ef..95f991d56 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/MinecraftOptionsStorage.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/MinecraftOptionsStorage.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.gui.options.storage; -import me.jellysquid.mods.sodium.client.SodiumClientMod; +import com.gtnewhorizons.angelica.AngelicaMod; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; @@ -20,6 +20,6 @@ public class MinecraftOptionsStorage implements OptionStorage { public void save() { this.getData().saveOptions(); - SodiumClientMod.logger().info("Flushed changes to Minecraft configuration"); + AngelicaMod.LOGGER.info("Flushed changes to Minecraft configuration"); } } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/SodiumOptionsStorage.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/SodiumOptionsStorage.java index 1e636ad26..dbfba6cb8 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/SodiumOptionsStorage.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/storage/SodiumOptionsStorage.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.gui.options.storage; -import me.jellysquid.mods.sodium.client.SodiumClientMod; +import com.gtnewhorizons.angelica.AngelicaMod; import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; import java.io.IOException; @@ -9,7 +9,7 @@ public class SodiumOptionsStorage implements OptionStorage { private final SodiumGameOptions options; public SodiumOptionsStorage() { - this.options = SodiumClientMod.options(); + this.options = AngelicaMod.options(); } @Override @@ -25,6 +25,6 @@ public class SodiumOptionsStorage implements OptionStorage { throw new RuntimeException("Couldn't save configuration changes", e); } - SodiumClientMod.logger().info("Flushed changes to Angelica configuration"); + AngelicaMod.LOGGER.info("Flushed changes to Angelica configuration"); } } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/utils/URLUtils.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/utils/URLUtils.java index 9fb35cfda..fb9f5362a 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/utils/URLUtils.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/utils/URLUtils.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.gui.utils; -import me.jellysquid.mods.sodium.client.SodiumClientMod; +import com.gtnewhorizons.angelica.AngelicaMod; import net.minecraft.util.Util; import java.io.IOException; @@ -19,7 +19,7 @@ public class URLUtils { try { Runtime.getRuntime().exec(getURLOpenCommand(url)); } catch (IOException exception) { - SodiumClientMod.logger().error("Couldn't open url '{}'", url, exception); + AngelicaMod.LOGGER.error("Couldn't open url '{}'", url, exception); } } diff --git a/src/main/java/me/jellysquid/mods/sodium/proxy/ClientProxy.java b/src/main/java/me/jellysquid/mods/sodium/proxy/ClientProxy.java deleted file mode 100644 index bfb9fdc34..000000000 --- a/src/main/java/me/jellysquid/mods/sodium/proxy/ClientProxy.java +++ /dev/null @@ -1,58 +0,0 @@ -package me.jellysquid.mods.sodium.proxy; - -import com.gtnewhorizons.angelica.config.AngelicaConfig; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import jss.notfine.gui.GuiCustomMenu; -import jss.notfine.gui.NotFineGameOptionPages; -import me.flashyreese.mods.reeses_sodium_options.client.gui.ReeseSodiumVideoOptionsScreen; -import me.jellysquid.mods.sodium.client.SodiumClientMod; -import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiVideoSettings; -import net.minecraftforge.client.event.GuiScreenEvent; -import net.minecraftforge.common.MinecraftForge; - -public class ClientProxy extends CommonProxy { - - @Override - public void preInit(FMLPreInitializationEvent event) { -// FMLCommonHandler.instance().bus().register(this); - MinecraftForge.EVENT_BUS.register(this); - SodiumClientMod.options(); - } - - @SubscribeEvent - public void onGui(GuiScreenEvent.InitGuiEvent.Pre event) { - if(event.gui instanceof GuiVideoSettings eventGui) { - event.setCanceled(true); - if(AngelicaConfig.enableNotFineOptions || GuiScreen.isShiftKeyDown()) { - Minecraft.getMinecraft().displayGuiScreen(new GuiCustomMenu(eventGui.parentGuiScreen, - NotFineGameOptionPages.general(), - NotFineGameOptionPages.detail(), NotFineGameOptionPages.atmosphere(), - NotFineGameOptionPages.particles(), NotFineGameOptionPages.other() - )); - } else if(!AngelicaConfig.enableReesesSodiumOptions || GuiScreen.isCtrlKeyDown()) { - Minecraft.getMinecraft().displayGuiScreen(new SodiumOptionsGUI(eventGui.parentGuiScreen)); - } else { - Minecraft.getMinecraft().displayGuiScreen(new ReeseSodiumVideoOptionsScreen(eventGui.parentGuiScreen)); - } - } - } - - @Override - public void init(FMLInitializationEvent event) { - // Nothing to do here (yet) - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - // Nothing to do here (yet) - } - - - -} diff --git a/src/main/java/me/jellysquid/mods/sodium/proxy/CommonProxy.java b/src/main/java/me/jellysquid/mods/sodium/proxy/CommonProxy.java deleted file mode 100644 index 96363eba5..000000000 --- a/src/main/java/me/jellysquid/mods/sodium/proxy/CommonProxy.java +++ /dev/null @@ -1,16 +0,0 @@ -package me.jellysquid.mods.sodium.proxy; - -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; - -public class CommonProxy { - - public void preInit(FMLPreInitializationEvent event) { - - } - - public void init(FMLInitializationEvent event) {} - - public void postInit(FMLPostInitializationEvent event) {} -} diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 60b58ebac..d295d1006 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -13,6 +13,8 @@ sodium.option_impact.varies=Varies sodium.options.pages.quality=Quality sodium.options.pages.performance=Performance sodium.options.pages.advanced=Advanced +sodium.options.pages.appearance=Appearance +sodium.options.pages.debug=Debug sodium.options.view_distance.tooltip=The render distance controls how far away terrain will be rendered. Shorter distances mean that less terrain will be rendered, improving frame rates. sodium.options.simulation_distance.tooltip=The simulation distance controls how far away terrain and entities will be loaded and ticked. Shorter distances can reduce the internal server's load and may improve frame rates. sodium.options.brightness.tooltip=Controls the brightness (gamma) of the game. @@ -86,6 +88,10 @@ sodium.options.use_no_error_context.name=No Error Context sodium.options.use_no_error_context.tooltip=If enabled, the OpenGL context will be created with error checking disabled. This may slightly improve performance, but it also increases the risk that the game will crash instead of gracefully handling OpenGL errors. You should disable this option if you are experiencing sudden unexplained crashes. sodium.options.use_gl_state_cache.name=GL State Cache sodium.options.use_gl_state_cache.tooltip=If enabled, the OpenGL state cache will be used to reduce the number of redundant state changes. This can improve performance, but it may also cause issues with some mods. Does not persist across game restarts. +sodium.options.async_occlusion_mode.name=Async Occlusion +sodium.options.async_occlusion_mode.tooltip=Controls which render passes use asynchronous occlusion culling. ONLY_SHADOW (default) runs async occlusion only for the shadow pass, keeping the main render list synchronous. EVERYTHING runs all passes async, which may cause 1-frame visibility lag during fast camera movement. NONE disables async occlusion entirely. +sodium.options.use_occlusion_culling.name=Occlusion Culling +sodium.options.use_occlusion_culling.tooltip=If enabled, chunks that are hidden behind other chunks will not be rendered. Disabling this will significantly reduce performance but can be useful for debugging. sodium.options.threads.value=%s thread(s) sodium.options.default=Default sodium.options.buttons.undo=Undo @@ -211,6 +217,9 @@ pack.iris.configure.title=Configure label.iris.true=On label.iris.false=Off +sodium.options.use_render_pass_optimization.name=Render Pass Optimization +sodium.options.use_render_pass_optimization.tooltip=Analyzes sprite transparency to automatically downgrade render passes (e.g. translucent to cutout, cutout to solid) when the sprite doesn't need the more expensive pass. Reduces draw calls and overdraw. + 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 diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft.java index c2ffd6b9c..17c87c708 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft.java @@ -7,6 +7,7 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; +import org.embeddedt.embeddium.impl.render.frame.RenderAheadManager; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.spongepowered.asm.mixin.Mixin; @@ -34,6 +35,9 @@ public abstract class MixinMinecraft { @Unique private long angelica$lastFrameTime = 0; + @Unique + private final RenderAheadManager celeritas$renderAheadManager = new RenderAheadManager(); + /** * @author mitchej123 * @reason Avoid GL_PROXY_TEXTURE_2D which doesn't work with GLSM's texture binding. @@ -91,4 +95,19 @@ public abstract class MixinMinecraft { private void angelica$setShowFpsGraph(CallbackInfo ci) { ((IGameSettingsExt) gameSettings).angelica$setShowFpsGraph(Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU)); } + + @Inject(method = "runTick", at = @At("HEAD")) + private void celeritas$renderAheadStartFrame(CallbackInfo ci) { + final int limit = AngelicaMod.options().performance.cpuRenderAheadLimit; + if (limit > 0) { + celeritas$renderAheadManager.startFrame(limit); + } + } + + @Inject(method = "runTick", at = @At("RETURN")) + private void celeritas$renderAheadEndFrame(CallbackInfo ci) { + if (AngelicaMod.options().performance.cpuRenderAheadLimit > 0) { + celeritas$renderAheadManager.endFrame(); + } + } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/features/culling/MixinEffectRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/features/culling/MixinEffectRenderer.java index ffb7500aa..cb7016799 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/features/culling/MixinEffectRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/features/culling/MixinEffectRenderer.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.mixins.early.celeritas.features.culling; +import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasWorldRenderer; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; @@ -26,7 +27,7 @@ public class MixinEffectRenderer { @Unique private void setupCullingViewport() { - final boolean useCulling = true;// TODO: boolean useCulling = SodiumClientMod.options().advanced.useParticleCulling; + final boolean useCulling = AngelicaMod.options().advanced.useParticleCulling; if(useCulling) { this.cullingViewport = CeleritasWorldRenderer.getInstance().getLastViewport(); } else { diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderGlobal.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderGlobal.java index 25ecb1227..fb7d79c4f 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderGlobal.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderGlobal.java @@ -58,6 +58,7 @@ public class MixinRenderGlobal implements IRenderGlobalExt { @Unique private CeleritasWorldRenderer celeritas$renderer; @Unique private int celeritas$frame; @Unique private float celeritas$lastFov; + @Unique private int celeritas$lastThirdPersonView = -1; @Unique private boolean angelica$isSpectatorMode() { @@ -190,9 +191,9 @@ public class MixinRenderGlobal implements IRenderGlobalExt { final Entity viewEntity = this.mc.renderViewEntity; final float fogDistance = ChunkShaderFogComponent.FOG_SERVICE.getFogCutoff(); - final double camX = viewEntity.posX; - final double camY = viewEntity.posY + viewEntity.getEyeHeight(); - final double camZ = viewEntity.posZ; + final double camX = lerp(viewEntity.lastTickPosX, viewEntity.posX, partialTicks); + final double camY = lerp(viewEntity.lastTickPosY, viewEntity.posY, partialTicks) + viewEntity.getEyeHeight(); + final double camZ = lerp(viewEntity.lastTickPosZ, viewEntity.posZ, partialTicks); final float currentFov = RenderingState.INSTANCE.getFov(); if (currentFov != this.celeritas$lastFov) { @@ -200,6 +201,12 @@ public class MixinRenderGlobal implements IRenderGlobalExt { this.celeritas$lastFov = currentFov; } + final int currentThirdPerson = this.mc.gameSettings.thirdPersonView; + if (currentThirdPerson != this.celeritas$lastThirdPersonView) { + this.celeritas$renderer.scheduleTerrainUpdate(); + this.celeritas$lastThirdPersonView = currentThirdPerson; + } + final SimpleWorldRenderer.CameraState cameraState = new SimpleWorldRenderer.CameraState( camX, camY, camZ, viewEntity.rotationPitch, viewEntity.rotationYaw, fogDistance diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java index 524c927ac..e9e455e84 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java @@ -3,11 +3,10 @@ package com.gtnewhorizons.angelica.mixins.early.rendering; import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.common.BlockError; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; -import net.coderbot.iris.Iris; import cpw.mods.fml.client.registry.RenderingRegistry; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; -import me.jellysquid.mods.sodium.client.SodiumClientMod; +import net.coderbot.iris.Iris; import net.coderbot.iris.block_rendering.BlockRenderingSettings; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -87,7 +86,7 @@ public abstract class MixinRenderBlocks { @Redirect(method = "renderStandardBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isAmbientOcclusionEnabled()Z")) private boolean checkAOEnabled() { - if ((this.isRenderingByType && Minecraft.isAmbientOcclusionEnabled() && SodiumClientMod.options().quality.useCeleritasSmoothLighting) || + if ((this.isRenderingByType && Minecraft.isAmbientOcclusionEnabled() && AngelicaMod.options().quality.useCeleritasSmoothLighting) || (Iris.enabled && BlockRenderingSettings.INSTANCE.shouldUseSeparateAo())) { return false; // Force sodium pipeline with Iris or for standard blocks rendered from renderBlockByRenderType when using AO }