mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-20 12:29:40 +00:00
Add renderer selection to video settings - (#2215)
This commit is contained in:
1 parent
23e36f2b76
commit
2a8c8756d3
62 files changed
+1345
-1453
No files matched your search
@@ -0,0 +1,174 @@
|
||||
package com.gtnewhorizons.angelica.client.gui;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.config.GLVersionChoice;
|
||||
import com.gtnewhorizons.angelica.config.RenderBackendChoice;
|
||||
import com.gtnewhorizons.angelica.config.SdlGpuDriver;
|
||||
import com.gtnewhorizons.angelica.config.SystemProperties;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.RenderSystem;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.BackendManager;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.BackendOptions;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.BackendStartGuard;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.MoltenVK;
|
||||
import com.gtnewhorizons.angelica.sdlgpu.SDLGPUGate;
|
||||
import me.flashyreese.mods.reeses_sodium_options.client.gui.ReeseSodiumVideoOptionsScreen;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.ActionOption;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionFlag;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionGroup;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionImpl;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.storage.AngelicaOptionsStorage;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.Util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class RendererOptionPages {
|
||||
|
||||
private static final AngelicaOptionsStorage angelicaOpts = new AngelicaOptionsStorage();
|
||||
|
||||
public static OptionPage renderer() {
|
||||
final Util.EnumOS os = Util.getOSType();
|
||||
final boolean sdlAvailable = SDLGPUGate.isSDLGPUAvailable();
|
||||
final RenderBackendChoice[] backends = sdlAvailable ? RenderBackendChoice.values() : new RenderBackendChoice[] { RenderBackendChoice.OPENGL };
|
||||
final SdlGpuDriver[] drivers = allowedDrivers(os);
|
||||
final GLVersionChoice[] glVersions = allowedGlVersions(glVersionCeiling(os));
|
||||
final String active = activeLabel();
|
||||
|
||||
final OptionGroup.Builder status = OptionGroup.createBuilder()
|
||||
.add(ActionOption.label(I18n.format("options.angelica.renderer.status"), I18n.format("options.angelica.renderer.status.tooltip"), statusLabel()))
|
||||
.add(ActionOption.label(I18n.format("options.angelica.renderer.active"), I18n.format("options.angelica.renderer.active.tooltip"), () -> active));
|
||||
if (os == Util.EnumOS.OSX) {
|
||||
final String moltenVk = I18n.format("options.angelica.renderer.moltenvk." + MoltenVK.source().name().toLowerCase());
|
||||
status.add(ActionOption.label(I18n.format("options.angelica.renderer.moltenvk"), I18n.format("options.angelica.renderer.moltenvk.tooltip"), () -> moltenVk));
|
||||
}
|
||||
|
||||
return new OptionPage(I18n.format("options.angelica.renderer.page"), ImmutableList.of(
|
||||
OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(RenderBackendChoice.class, angelicaOpts)
|
||||
.setName(I18n.format("options.angelica.renderer.backend"))
|
||||
.setTooltip(overrideTooltip(backendTooltip(sdlAvailable), SystemProperties.KEY_USE_SDL_GPU, SystemProperties.SDL_GPU_OVERRIDE != null))
|
||||
.setControl(o -> new CyclingControl<>(o, RenderBackendChoice.class, backends))
|
||||
.setBinding((opts, value) -> AngelicaConfig.renderBackend = value, opts -> backendOf(SystemProperties.SDL_GPU_OVERRIDE != null ? SystemProperties.SDL_GPU_OVERRIDE : AngelicaConfig.sdlGpuConfigured()))
|
||||
.setEnabled(SystemProperties.SDL_GPU_OVERRIDE == null)
|
||||
.setFlags(OptionFlag.REQUIRES_GAME_RESTART)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(SdlGpuDriver.class, angelicaOpts)
|
||||
.setName(I18n.format("options.angelica.renderer.driver"))
|
||||
.setTooltip(overrideTooltip(driverTooltip(os), SystemProperties.KEY_SDL_GPU_DRIVER, SystemProperties.SDL_GPU_DRIVER_OVERRIDE != null))
|
||||
.setControl(o -> new CyclingControl<>(o, SdlGpuDriver.class, drivers))
|
||||
.setBinding((opts, value) -> AngelicaConfig.sdlGpuDriver = value, opts -> shownDriver())
|
||||
.setEnabled(SystemProperties.SDL_GPU_DRIVER_OVERRIDE == null)
|
||||
.setFlags(OptionFlag.REQUIRES_GAME_RESTART)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(GLVersionChoice.class, angelicaOpts)
|
||||
.setName(I18n.format("options.angelica.renderer.glVersion"))
|
||||
.setTooltip(I18n.format("options.angelica.renderer.glVersion.tooltip"))
|
||||
.setControl(o -> new CyclingControl<>(o, GLVersionChoice.class, glVersions, glVersionNames()))
|
||||
.setBinding((opts, value) -> AngelicaConfig.glVersion = value.version(), opts -> GLVersionChoice.of(AngelicaConfig.glVersion, GLVersionChoice.GL46.version()))
|
||||
.setFlags(OptionFlag.REQUIRES_GAME_RESTART)
|
||||
.build())
|
||||
.build(),
|
||||
status.build()));
|
||||
}
|
||||
|
||||
public static OptionPage withLink(OptionPage general, ReeseSodiumVideoOptionsScreen gui) {
|
||||
final String rendererPage = I18n.format("options.angelica.renderer.page");
|
||||
final String active = activeLabel();
|
||||
return new OptionPage(general.getName(), ImmutableList.<OptionGroup>builder()
|
||||
.add(OptionGroup.createBuilder()
|
||||
.add(new ActionOption(I18n.format("options.angelica.renderer.link"), I18n.format("options.angelica.renderer.link.tooltip"),
|
||||
() -> active, () -> gui.showPage(rendererPage), () -> true))
|
||||
.build())
|
||||
.addAll(general.getGroups())
|
||||
.build());
|
||||
}
|
||||
|
||||
private static RenderBackendChoice backendOf(boolean sdlGpu) {
|
||||
return sdlGpu ? RenderBackendChoice.SDL_GPU : RenderBackendChoice.OPENGL;
|
||||
}
|
||||
|
||||
private static SdlGpuDriver shownDriver() {
|
||||
final SdlGpuDriver forced = SystemProperties.SDL_GPU_DRIVER_OVERRIDE != null ? SdlGpuDriver.fromSdlName(SystemProperties.SDL_GPU_DRIVER_OVERRIDE) : null;
|
||||
if (forced != null) return forced;
|
||||
return AngelicaConfig.sdlGpuDriver != null ? AngelicaConfig.sdlGpuDriver : SdlGpuDriver.AUTO;
|
||||
}
|
||||
|
||||
static SdlGpuDriver[] allowedDrivers(Util.EnumOS os) {
|
||||
return switch (os) {
|
||||
case OSX -> new SdlGpuDriver[] { SdlGpuDriver.AUTO, SdlGpuDriver.METAL, SdlGpuDriver.VULKAN };
|
||||
case WINDOWS -> new SdlGpuDriver[] { SdlGpuDriver.AUTO, SdlGpuDriver.VULKAN, SdlGpuDriver.D3D12 };
|
||||
default -> new SdlGpuDriver[] { SdlGpuDriver.AUTO, SdlGpuDriver.VULKAN };
|
||||
};
|
||||
}
|
||||
|
||||
private static int glVersionCeiling(Util.EnumOS os) {
|
||||
final int platformMax = os == Util.EnumOS.OSX ? 41 : 46;
|
||||
final int pinned = AngelicaConfig.pinnedGLVersion;
|
||||
return pinned >= 33 && pinned < platformMax ? pinned : platformMax;
|
||||
}
|
||||
|
||||
static GLVersionChoice[] allowedGlVersions(int ceiling) {
|
||||
final List<GLVersionChoice> allowed = new ArrayList<>();
|
||||
for (final GLVersionChoice choice : GLVersionChoice.values()) {
|
||||
if (choice.version() <= ceiling) allowed.add(choice);
|
||||
}
|
||||
return allowed.toArray(new GLVersionChoice[0]);
|
||||
}
|
||||
|
||||
private static String[] glVersionNames() {
|
||||
final GLVersionChoice[] universe = GLVersionChoice.values();
|
||||
final String[] names = new String[universe.length];
|
||||
for (int i = 0; i < universe.length; i++) {
|
||||
names[i] = universe[i] == GLVersionChoice.AUTO ? I18n.format("options.angelica.renderer.glVersion.auto") : universe[i].label();
|
||||
}
|
||||
return names;
|
||||
}
|
||||
|
||||
private static String backendTooltip(boolean sdlAvailable) {
|
||||
final String base = EnumChatFormatting.RED + I18n.format("options.angelica.renderer.backend.experimental") + EnumChatFormatting.RESET + " " + I18n.format("options.angelica.renderer.backend.tooltip");
|
||||
return sdlAvailable ? base : base + " " + I18n.format("options.angelica.renderer.backend.unavailable", SDLGPUGate.missingRequirement());
|
||||
}
|
||||
|
||||
private static String driverTooltip(Util.EnumOS os) {
|
||||
final String base = I18n.format("options.angelica.renderer.driver.tooltip");
|
||||
return switch (os) {
|
||||
case OSX -> base + " " + I18n.format("options.angelica.renderer.driver.tooltip.macos");
|
||||
case WINDOWS -> base + " " + I18n.format("options.angelica.renderer.driver.tooltip.windows") + " " + EnumChatFormatting.RED + I18n.format("options.angelica.renderer.driver.tooltip.d3d12") + EnumChatFormatting.RESET;
|
||||
default -> base + " " + I18n.format("options.angelica.renderer.driver.tooltip.other");
|
||||
};
|
||||
}
|
||||
|
||||
private static Supplier<String> statusLabel() {
|
||||
final String restartLabel = I18n.format("options.angelica.status.restart");
|
||||
final String forcedLabel = I18n.format("options.angelica.renderer.status.forced");
|
||||
final String failedLabel = I18n.format("options.angelica.renderer.status.failed");
|
||||
final String activeLabel = I18n.format("options.angelica.renderer.status.active");
|
||||
final String resetLabel = I18n.format("options.angelica.renderer.status.reset");
|
||||
return () -> {
|
||||
if (AngelicaConfig.sdlGpuConfigured() != BackendOptions.configSdlGpu()
|
||||
|| !AngelicaConfig.sdlGpuDriverName().equals(BackendOptions.configDriver())
|
||||
|| AngelicaConfig.glVersion != BackendOptions.configGlVersion()) {
|
||||
return restartLabel;
|
||||
}
|
||||
if (BackendStartGuard.tripped() && !AngelicaConfig.sdlGpuConfigured()) return resetLabel;
|
||||
if (BackendOptions.sdlGpuRequested() && !BackendManager.RENDER_BACKEND.isSDLGPU()) return failedLabel;
|
||||
return SystemProperties.SDL_GPU_OVERRIDE != null || SystemProperties.SDL_GPU_DRIVER_OVERRIDE != null ? forcedLabel : activeLabel;
|
||||
};
|
||||
}
|
||||
|
||||
private static String activeLabel() {
|
||||
final String name = GLStateManager.getRenderBackendName();
|
||||
return BackendManager.RENDER_BACKEND.isSDLGPU() ? name : name + " " + RenderSystem.getGlMajor() + "." + RenderSystem.getGlMinor();
|
||||
}
|
||||
|
||||
static String overrideTooltip(String base, String flag, boolean overridden) {
|
||||
return overridden ? base + " " + I18n.format("options.angelica.overriddenBy", flag) : base;
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,7 @@ public class TracyOptionPages {
|
||||
default -> startLabel;
|
||||
};
|
||||
|
||||
final String restartLabel = I18n.format("options.angelica.tracy.status.restart");
|
||||
final String restartLabel = I18n.format("options.angelica.status.restart");
|
||||
final String runningLabel = I18n.format("options.angelica.tracy.status.running");
|
||||
final String runningForcedLabel = I18n.format("options.angelica.tracy.status.runningForced");
|
||||
final String failedLabel = I18n.format("options.angelica.tracy.status.failed");
|
||||
@@ -87,8 +87,7 @@ public class TracyOptionPages {
|
||||
.build())
|
||||
.build(),
|
||||
OptionGroup.createBuilder()
|
||||
.add(new ActionOption(I18n.format("options.angelica.tracy.status"), I18n.format("options.angelica.tracy.status.tooltip"),
|
||||
statusLabel, () -> {}, () -> false))
|
||||
.add(ActionOption.label(I18n.format("options.angelica.tracy.status"), I18n.format("options.angelica.tracy.status.tooltip"), statusLabel))
|
||||
.build(),
|
||||
OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(int.class, angelicaOpts)
|
||||
@@ -104,7 +103,6 @@ public class TracyOptionPages {
|
||||
}
|
||||
|
||||
private static String overrideTooltip(String baseKey, String flag, boolean overridden) {
|
||||
final String base = I18n.format(baseKey);
|
||||
return overridden ? base + " " + I18n.format("options.angelica.tracy.overriddenBy", flag) : base;
|
||||
return RendererOptionPages.overrideTooltip(I18n.format(baseKey), flag, overridden);
|
||||
}
|
||||
}
|
||||
@@ -55,14 +55,6 @@ public class AngelicaConfig {
|
||||
@Config.RequiresMcRestart
|
||||
public static int workerThreadCount;
|
||||
|
||||
@Config.Comment("Enable NotFine Options")
|
||||
@Config.DefaultBoolean(false)
|
||||
public static boolean enableNotFineOptions;
|
||||
|
||||
@Config.Comment("Enable Reese's Sodium Options")
|
||||
@Config.DefaultBoolean(true)
|
||||
public static boolean enableReesesSodiumOptions;
|
||||
|
||||
@Config.Comment("Inject BakedModel rendering into some vanilla blocks")
|
||||
@Config.DefaultBoolean(false)
|
||||
@Config.RequiresMcRestart
|
||||
@@ -468,6 +460,22 @@ public class AngelicaConfig {
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean disableGLVersionPinning;
|
||||
|
||||
@Config.Comment("Requested OpenGL context version as an integer (e.g. 46, 41, 33). 0 = highest available. Falls back to probing when the version cannot be created.")
|
||||
@Config.DefaultInt(0)
|
||||
@Config.RangeInt(min = 0, max = 46)
|
||||
@Config.RequiresMcRestart
|
||||
public static int glVersion;
|
||||
|
||||
@Config.Comment("Render backend: OPENGL, or SDL_GPU (experimental; Vulkan/Metal/Direct3D 12 through SDL3, falls back to OpenGL when no device can be created). -Dangelica.sdlgpu.enable=true|false overrides this.")
|
||||
@Config.DefaultEnum("OPENGL")
|
||||
@Config.RequiresMcRestart
|
||||
public static RenderBackendChoice renderBackend;
|
||||
|
||||
@Config.Comment("SDL GPU driver: AUTO, VULKAN, METAL (macOS), D3D12 (Windows). Vulkan on macOS needs MoltenVK and uses Metal without it. -Dangelica.sdlgpu.driver overrides this.")
|
||||
@Config.DefaultEnum("AUTO")
|
||||
@Config.RequiresMcRestart
|
||||
public static SdlGpuDriver sdlGpuDriver;
|
||||
|
||||
@Config.Comment("Disables GL Error checks. Always set to false in dev env or if LWJGL debug is on. Improves performance.")
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
@@ -536,6 +544,14 @@ public class AngelicaConfig {
|
||||
return enableEntityBatching && enableCubeInstancing;
|
||||
}
|
||||
|
||||
public static boolean sdlGpuConfigured() {
|
||||
return renderBackend == RenderBackendChoice.SDL_GPU;
|
||||
}
|
||||
|
||||
public static String sdlGpuDriverName() {
|
||||
return sdlGpuDriver == null ? "" : sdlGpuDriver.sdlName();
|
||||
}
|
||||
|
||||
public static GLProfile getEffectiveGlProfile() {
|
||||
final String sys = SystemProperties.GL_PROFILE.trim().toUpperCase();
|
||||
if ("GLES".equals(sys)) return GLProfile.ES;
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.gtnewhorizons.angelica.config;
|
||||
|
||||
public enum GLVersionChoice {
|
||||
AUTO(0),
|
||||
GL33(33),
|
||||
GL40(40),
|
||||
GL41(41),
|
||||
GL42(42),
|
||||
GL43(43),
|
||||
GL44(44),
|
||||
GL45(45),
|
||||
GL46(46);
|
||||
|
||||
private final int version;
|
||||
|
||||
GLVersionChoice(int version) {
|
||||
this.version = version;
|
||||
}
|
||||
|
||||
public int version() { return version; }
|
||||
|
||||
public String label() {
|
||||
return version / 10 + "." + version % 10;
|
||||
}
|
||||
|
||||
public static GLVersionChoice of(int version, int ceiling) {
|
||||
GLVersionChoice best = AUTO;
|
||||
for (final GLVersionChoice choice : values()) {
|
||||
if (choice.version != 0 && choice.version <= version && choice.version <= ceiling) best = choice;
|
||||
}
|
||||
return best;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.gtnewhorizons.angelica.config;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.NamedState;
|
||||
|
||||
public enum RenderBackendChoice implements NamedState {
|
||||
OPENGL ("options.angelica.renderer.backend.opengl"),
|
||||
SDL_GPU("options.angelica.renderer.backend.sdl_gpu");
|
||||
|
||||
private final String key;
|
||||
|
||||
RenderBackendChoice(String key) {
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getKey() {
|
||||
return key;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.gtnewhorizons.angelica.config;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.NamedState;
|
||||
|
||||
public enum SdlGpuDriver implements NamedState {
|
||||
AUTO ("", "options.angelica.renderer.driver.auto"),
|
||||
VULKAN("vulkan", "options.angelica.renderer.driver.vulkan"),
|
||||
METAL ("metal", "options.angelica.renderer.driver.metal"),
|
||||
D3D12 ("direct3d12", "options.angelica.renderer.driver.d3d12");
|
||||
|
||||
private final String sdlName;
|
||||
private final String key;
|
||||
|
||||
SdlGpuDriver(String sdlName, String key) {
|
||||
this.sdlName = sdlName;
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getKey() {
|
||||
return key;
|
||||
}
|
||||
|
||||
public String sdlName() { return sdlName; }
|
||||
|
||||
public static SdlGpuDriver fromSdlName(String sdlName) {
|
||||
for (final SdlGpuDriver driver : values()) {
|
||||
if (driver.sdlName.equalsIgnoreCase(sdlName)) return driver;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,10 @@ import com.gtnewhorizon.gtnhmixins.builders.ITransformers;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.config.CompatConfig;
|
||||
import com.gtnewhorizons.angelica.config.FontConfig;
|
||||
import com.gtnewhorizons.angelica.config.RenderBackendChoice;
|
||||
import com.gtnewhorizons.angelica.config.SystemProperties;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.BackendOptions;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.BackendStartGuard;
|
||||
import com.gtnewhorizons.angelica.glsm.loading.DependencyVerifier;
|
||||
import com.gtnewhorizons.angelica.glsm.loading.Lwjgl3ifyExclusions;
|
||||
import com.gtnewhorizons.angelica.glsm.profiling.TracyOptions;
|
||||
@@ -33,6 +36,7 @@ import org.apache.logging.log4j.core.config.LoggerConfig;
|
||||
import org.spongepowered.asm.launch.GlobalProperties;
|
||||
import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@@ -68,6 +72,12 @@ public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMix
|
||||
// Angelica Config
|
||||
ConfigurationManager.registerConfig(AngelicaConfig.class);
|
||||
TracyOptions.latch(AngelicaConfig.enableTracy, AngelicaConfig.tracyAllowRemote, AngelicaConfig.tracyFineZones, AngelicaConfig.tracyMaxSrcLocs);
|
||||
if (BackendStartGuard.begin(new File(Launch.minecraftHome, "angelica" + File.separator + "sdlgpu-starting"), AngelicaConfig.sdlGpuConfigured(), SystemProperties.SDL_GPU_OVERRIDE != null)) {
|
||||
LOGGER.warn("The last start with SDL GPU did not reach the main menu; resetting the render backend to OpenGL");
|
||||
AngelicaConfig.renderBackend = RenderBackendChoice.OPENGL;
|
||||
ConfigurationManager.save(AngelicaConfig.class);
|
||||
}
|
||||
BackendOptions.latch(AngelicaConfig.sdlGpuConfigured(), AngelicaConfig.sdlGpuDriverName(), AngelicaConfig.glVersion);
|
||||
ConfigurationManager.registerConfig(CompatConfig.class);
|
||||
ConfigurationManager.registerConfig(FontConfig.class);
|
||||
MCPatcherForgeConfig.registerConfig();
|
||||
@@ -89,7 +99,7 @@ public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMix
|
||||
DependencyVerifier.gtnhLibChecks("Angelica"), LOGGER,
|
||||
(title, message) -> MissingDependencySdl.showFatal(title, message));
|
||||
|
||||
if (SystemProperties.USE_SDL_GPU) {
|
||||
if (BackendOptions.sdlGpuRequested()) {
|
||||
if (SDLGPUGate.isSDLGPUAvailable()) {
|
||||
LOGGER.info("SDL GPU window mode enabled");
|
||||
} else {
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.config.CompatConfig;
|
||||
import com.gtnewhorizons.angelica.config.SystemProperties;
|
||||
import com.gtnewhorizons.angelica.glsm.CaptureGate;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.BackendOptions;
|
||||
import com.gtnewhorizons.angelica.glsm.profiling.TracyOptions;
|
||||
import com.gtnewhorizons.angelica.sdlgpu.SDLGPUGate;
|
||||
import jss.notfine.config.MCPatcherForgeConfig;
|
||||
@@ -104,7 +105,7 @@ public enum Mixins implements IMixins {
|
||||
|
||||
ANGELICA_SDL_GPU_DISPLAY(new MixinBuilder("SDL-GPU-aware Display.create path")
|
||||
.setPhase(Phase.EARLY)
|
||||
.setApplyIf(() -> SystemProperties.USE_SDL_GPU && SDLGPUGate.isSDLGPUAvailable())
|
||||
.setApplyIf(() -> BackendOptions.sdlGpuRequested() && SDLGPUGate.isSDLGPUAvailable())
|
||||
.addClientMixins(
|
||||
"sdlgpu.MixinForgeHooksClient_SDLGPUDisplay",
|
||||
"sdlgpu.MixinMinecraft_SDLGPUIcons"
|
||||
|
||||
@@ -62,6 +62,7 @@ import com.gtnewhorizons.angelica.debug.TPSGraph;
|
||||
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
|
||||
import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfig;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.BackendStartGuard;
|
||||
import com.gtnewhorizons.angelica.glsm.backend.VSyncMode;
|
||||
import com.gtnewhorizons.angelica.glsm.profiling.Tracy;
|
||||
import com.gtnewhorizons.angelica.glsm.shader.ShaderDiskCache;
|
||||
@@ -97,13 +98,10 @@ import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import jss.notfine.core.Settings;
|
||||
import jss.notfine.gui.GuiCustomMenu;
|
||||
import jss.notfine.gui.NotFineGameOptionPages;
|
||||
import jss.notfine.gui.options.named.FOVMode;
|
||||
import me.flashyreese.mods.reeses_sodium_options.client.gui.ReeseSodiumVideoOptionsScreen;
|
||||
import me.jellysquid.mods.sodium.client.gui.FrameRateOptions;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.client.IrisDebugScreenHandler;
|
||||
|
||||
@@ -388,6 +386,7 @@ public final class ClientProxy extends CommonProxy {
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.LOWEST)
|
||||
public void onGuiOpen(GuiOpenEvent event) {
|
||||
BackendStartGuard.finish();
|
||||
if (!event.isCanceled()) {
|
||||
if (event.gui instanceof GuiMainMenu && gameStartTime == -1) {
|
||||
gameStartTime = ManagementFactory.getRuntimeMXBean().getUptime() / 1000f;
|
||||
@@ -403,19 +402,7 @@ public final class ClientProxy extends CommonProxy {
|
||||
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));
|
||||
}
|
||||
Minecraft.getMinecraft().displayGuiScreen(new ReeseSodiumVideoOptionsScreen(eventGui.parentGuiScreen));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,107 +0,0 @@
|
||||
package jss.notfine.gui;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
public class GuiCustomMenu extends GuiScreen {
|
||||
public static GuiCustomMenu instance;
|
||||
public static HashSet<OptionStorage<?>> dirtyStorages = new HashSet<>();
|
||||
private final GuiScreen parentGuiScreen;
|
||||
private final OptionPage optionPage;
|
||||
private final OptionPage[] subPages;
|
||||
protected String screenTitle;
|
||||
|
||||
private GuiCustomOptionsRowList optionsRowList;
|
||||
|
||||
public GuiCustomMenu(GuiScreen parentGuiScreen, OptionPage optionPage, OptionPage... subPages) {
|
||||
this.parentGuiScreen = parentGuiScreen;
|
||||
this.screenTitle = optionPage.getName();
|
||||
this.optionPage = optionPage;
|
||||
this.subPages = subPages;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initGui() {
|
||||
Keyboard.enableRepeatEvents(true);
|
||||
buttonList.clear();
|
||||
buttonList.add(new GuiButton(200, width / 2 - 110, height - 27, I18n.format("gui.done")));
|
||||
optionsRowList = new GuiCustomOptionsRowList(mc, width, height, 32, height - 32, 25, optionPage, subPages);
|
||||
instance = this;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void actionPerformed(GuiButton button) {
|
||||
if(button.enabled && button.id == 200) {
|
||||
if(!(parentGuiScreen instanceof GuiCustomMenu)) {
|
||||
saveChanges();
|
||||
}
|
||||
mc.displayGuiScreen(parentGuiScreen);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) {
|
||||
int originalScale = mc.gameSettings.guiScale;
|
||||
|
||||
super.mouseClicked(mouseX, mouseY, mouseButton);
|
||||
optionsRowList.func_148179_a(mouseX, mouseY, mouseButton);
|
||||
|
||||
if(mc.gameSettings.guiScale != originalScale) {
|
||||
ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
|
||||
setWorldAndResolution(mc, scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseMovedOrUp(int mouseX, int mouseY, int state) {
|
||||
int originalScale = mc.gameSettings.guiScale;
|
||||
|
||||
super.mouseMovedOrUp(mouseX, mouseY, state);
|
||||
optionsRowList.func_148181_b(mouseX, mouseY, state);
|
||||
|
||||
if(mc.gameSettings.guiScale != originalScale) {
|
||||
ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
|
||||
setWorldAndResolution(mc, scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
|
||||
if(mc.theWorld != null && Keyboard.isKeyDown(Keyboard.KEY_F1)) {
|
||||
return;
|
||||
}
|
||||
drawDefaultBackground();
|
||||
optionsRowList.drawScreen(mouseX, mouseY, partialTicks);
|
||||
drawCenteredString(fontRendererObj, screenTitle, width / 2, 5, 16777215);
|
||||
super.drawScreen(mouseX, mouseY, partialTicks);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void keyTyped(char typedChar, int keyCode) {
|
||||
if(keyCode == Keyboard.KEY_ESCAPE && !(parentGuiScreen instanceof GuiCustomMenu)) {
|
||||
saveChanges();
|
||||
}
|
||||
optionsRowList.keyTyped(keyCode);
|
||||
super.keyTyped(typedChar, keyCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onGuiClosed() {
|
||||
Keyboard.enableRepeatEvents(false);
|
||||
}
|
||||
|
||||
private void saveChanges() {
|
||||
for(OptionStorage<?> storage : dirtyStorages) {
|
||||
storage.save();
|
||||
}
|
||||
dirtyStorages = new HashSet<>();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
package jss.notfine.gui;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
|
||||
public class GuiCustomMenuButton extends GuiButton {
|
||||
|
||||
private final OptionPage optionPage;
|
||||
private final OptionPage[] subPages;
|
||||
|
||||
public GuiCustomMenuButton(int xPosition, int yPosition, int width, int height, OptionPage optionPage, OptionPage... subPages) {
|
||||
super(-10, xPosition, yPosition, width, height, optionPage.getName());
|
||||
this.optionPage = optionPage;
|
||||
this.subPages = subPages;
|
||||
}
|
||||
|
||||
public GuiCustomMenuButton(int xPosition, int yPosition, OptionPage optionPage, OptionPage... subPages) {
|
||||
this(xPosition, yPosition, 150, 20, optionPage, subPages);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
|
||||
boolean load = super.mousePressed(mc, mouseX, mouseY);
|
||||
if(load) {
|
||||
mc.displayGuiScreen(new GuiCustomMenu(mc.currentScreen, optionPage, subPages));
|
||||
}
|
||||
return load;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,126 +0,0 @@
|
||||
package jss.notfine.gui;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import jss.notfine.gui.options.control.element.NotFineControlElementFactory;
|
||||
import jss.notfine.gui.options.control.element.SliderControlElement;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.Option;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionGroup;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
|
||||
import me.jellysquid.mods.sodium.client.util.Dim2i;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiListExtended;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiCustomOptionsRowList extends GuiListExtended {
|
||||
private static final NotFineControlElementFactory factory = new NotFineControlElementFactory();
|
||||
private final List<Row> settingsList = Lists.newArrayList();
|
||||
private GuiButton focusedButton;
|
||||
|
||||
public GuiCustomOptionsRowList(Minecraft mc, int width, int height, int top, int bottom, int slotHeight, OptionPage optionPage, OptionPage... subPages) {
|
||||
super(mc, width, height, top, bottom, slotHeight);
|
||||
field_148163_i = false;
|
||||
|
||||
for(OptionGroup optionGroup : optionPage.getGroups()) {
|
||||
Iterator<Option<?>> settings = optionGroup.getOptions().stream().iterator();
|
||||
while(settings.hasNext()) {
|
||||
Option<?> optionOne = settings.next();
|
||||
Option<?> optionTwo = settings.hasNext() ? settings.next() : null;
|
||||
GuiButton buttonOne = (GuiButton)optionOne.getControl().createElement(new Dim2i(width / 2 - 155,0,150,20), factory);
|
||||
GuiButton buttonTwo = optionTwo == null ? null : (GuiButton)optionTwo.getControl().createElement(new Dim2i(width / 2 - 155 + 160,0,150,20), factory);
|
||||
settingsList.add(new GuiCustomOptionsRowList.Row(buttonOne, buttonTwo));
|
||||
}
|
||||
}
|
||||
for(int i = 0; i < subPages.length; i += 2) {
|
||||
OptionPage pageOne = subPages[i];
|
||||
OptionPage pageTwo = i < subPages.length - 1 ? subPages[i + 1] : null;
|
||||
GuiButton buttonOne = new GuiCustomMenuButton(width / 2 - 155, 0, pageOne);
|
||||
GuiButton buttonTwo = pageTwo == null ? null : new GuiCustomMenuButton(width / 2 - 155 + 160, 0, pageTwo);
|
||||
settingsList.add(new Row(buttonOne, buttonTwo));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public GuiCustomOptionsRowList.Row getListEntry(int index) {
|
||||
return settingsList.get(index);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSize() {
|
||||
return settingsList.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getListWidth() {
|
||||
return 400;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getScrollBarX() {
|
||||
return super.getScrollBarX() + 32;
|
||||
}
|
||||
|
||||
public void keyTyped(int keyCode) {
|
||||
if(focusedButton instanceof SliderControlElement slider) {
|
||||
slider.keyTyped(keyCode);
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class Row implements GuiListExtended.IGuiListEntry {
|
||||
private final Minecraft mc = Minecraft.getMinecraft();
|
||||
private final GuiButton buttonOne, buttonTwo;
|
||||
|
||||
public Row(GuiButton one, GuiButton two) {
|
||||
buttonOne = one;
|
||||
buttonTwo = two;
|
||||
|
||||
if(one != null && two == null) {
|
||||
one.width += 160;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawEntry(int varU1, int x, int y, int varU2, int varU3, Tessellator tessellator, int mouseX, int mouseY, boolean varU4) {
|
||||
buttonOne.yPosition = y;
|
||||
buttonOne.drawButton(mc, mouseX, mouseY);
|
||||
|
||||
|
||||
if(buttonTwo != null) {
|
||||
buttonTwo.yPosition = y;
|
||||
buttonTwo.drawButton(mc, mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mousePressed(int index, int x, int y, int mouseEvent, int relativeX, int relativeY) {
|
||||
if(buttonOne.mousePressed(mc, x, y)) {
|
||||
focusedButton = buttonOne;
|
||||
return true;
|
||||
}
|
||||
if(buttonTwo != null && buttonTwo.mousePressed(mc, x, y)) {
|
||||
focusedButton = buttonTwo;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mouseReleased(int index, int x, int y, int mouseEvent, int relativeX, int relativeY) {
|
||||
if(buttonOne != null) {
|
||||
buttonOne.mouseReleased(x, y);
|
||||
}
|
||||
|
||||
if(buttonTwo != null) {
|
||||
buttonTwo.mouseReleased(x, y);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,389 +0,0 @@
|
||||
package jss.notfine.gui;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import jss.notfine.config.NotFineConfig;
|
||||
import jss.notfine.core.Settings;
|
||||
import jss.notfine.core.SettingsManager;
|
||||
import me.jellysquid.mods.sodium.client.gui.FrameRateOptions;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionFlag;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionGroup;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionImpact;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionImpl;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.GraphicsMode;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.GraphicsQuality;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.LightingQuality;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.ParticleMode;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.TextureFilterMode;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.storage.MinecraftOptionsStorage;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.storage.SodiumOptionsStorage;
|
||||
import net.coderbot.iris.Iris;
|
||||
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.lwjgl.opengl.Display;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class NotFineGameOptionPages {
|
||||
private static final MinecraftOptionsStorage vanillaOpts = new MinecraftOptionsStorage();
|
||||
private static final SodiumOptionsStorage sodiumOpts = new SodiumOptionsStorage();
|
||||
|
||||
public static OptionPage general() {
|
||||
List<OptionGroup> groups = new ArrayList<>();
|
||||
|
||||
final FrameRateOptions frameRate = FrameRateOptions.create(vanillaOpts, sodiumOpts);
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(GraphicsMode.class, vanillaOpts)
|
||||
.setName(I18n.format("options.graphics"))
|
||||
.setTooltip(I18n.format("sodium.options.graphics_quality.tooltip"))
|
||||
.setControl(option -> new CyclingControl<>(option, GraphicsMode.class))
|
||||
.setBinding((opts, value) -> {
|
||||
opts.fancyGraphics = value.isFancy();
|
||||
SettingsManager.graphicsUpdated();
|
||||
}, opts -> GraphicsMode.fromBoolean(opts.fancyGraphics))
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(int.class, vanillaOpts)
|
||||
.setName(I18n.format("options.renderDistance"))
|
||||
.setTooltip(I18n.format("sodium.options.view_distance.tooltip"))
|
||||
.setControl(option -> new SliderControl(option, 2, (int) GameSettings.Options.RENDER_DISTANCE.getValueMax(), 1, ControlValueFormatter.quantity("options.chunks")))
|
||||
.setBinding((options, value) -> options.renderDistanceChunks = value, options -> options.renderDistanceChunks)
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.add(frameRate.vsync())
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("options.fullscreen"))
|
||||
.setTooltip(I18n.format("sodium.options.fullscreen.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> {
|
||||
opts.fullScreen = value;
|
||||
Minecraft client = Minecraft.getMinecraft();
|
||||
if (client.isFullScreen() != opts.fullScreen) {
|
||||
client.toggleFullscreen();
|
||||
//The client might not be able to enter full-screen mode
|
||||
opts.fullScreen = client.isFullScreen();
|
||||
}
|
||||
}, (opts) -> opts.fullScreen)
|
||||
.build())
|
||||
.build());
|
||||
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(frameRate.maxFramerate())
|
||||
.build());
|
||||
|
||||
final OptionImpl<GameSettings, Integer> mipmapLevels = OptionImpl.createBuilder(int.class, vanillaOpts)
|
||||
.setName(I18n.format("options.mipmapLevels"))
|
||||
.setTooltip(I18n.format("sodium.options.mipmap_levels.tooltip"))
|
||||
.setControl(option -> new SliderControl(option, 0, 4, 1, ControlValueFormatter.multiplier()))
|
||||
.setBinding((opts, value) -> opts.mipmapLevels = value, opts -> opts.mipmapLevels)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
|
||||
.build();
|
||||
|
||||
final OptionImpl<SodiumGameOptions, TextureFilterMode> textureFilterMode =
|
||||
OptionImpl.createBuilder(TextureFilterMode.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.texture_filtering.name"))
|
||||
.setTooltip(I18n.format("sodium.options.texture_filtering.tooltip"))
|
||||
.setControl(option -> new CyclingControl<>(option, TextureFilterMode.class,
|
||||
TextureFilterMode.selectableValues(SodiumGameOptions.anisotropySupported())))
|
||||
.setBinding((opts, value) -> opts.quality.textureFilterMode = value,
|
||||
opts -> SodiumGameOptions.resolveFilterMode(opts.quality.textureFilterMode))
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setFlags(OptionFlag.REQUIRES_ASSET_RELOAD, OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build();
|
||||
|
||||
int maxGuiScale = Math.max(3, Math.min(Minecraft.getMinecraft().displayWidth / 320, Minecraft.getMinecraft().displayHeight / 240));
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(int.class, vanillaOpts)
|
||||
.setName(I18n.format("options.guiScale"))
|
||||
.setTooltip(I18n.format("sodium.options.gui_scale.tooltip"))
|
||||
.setControl(option -> new SliderControl(option, 0, maxGuiScale, 1, ControlValueFormatter.guiScale()))
|
||||
.setBinding((opts, value) -> opts.guiScale = value, opts -> opts.guiScale)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("options.viewBobbing"))
|
||||
.setTooltip(I18n.format("sodium.options.view_bobbing.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.viewBobbing = value, opts -> opts.viewBobbing)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(LightingQuality.class, vanillaOpts)
|
||||
.setName(I18n.format("options.ao"))
|
||||
.setTooltip(I18n.format("sodium.options.smooth_lighting.tooltip"))
|
||||
.setControl(option -> new CyclingControl<>(option, LightingQuality.class))
|
||||
.setBinding((opts, value) -> opts.ambientOcclusion = value.getVanilla(), opts -> LightingQuality.fromOrdinal(opts.ambientOcclusion))
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(int.class, vanillaOpts)
|
||||
.setName(I18n.format("options.gamma"))
|
||||
.setTooltip(I18n.format("sodium.options.brightness.tooltip"))
|
||||
.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())
|
||||
.add(Settings.MODE_LIGHT_FLICKER.option)
|
||||
.add(Settings.DYNAMIC_FOV.option)
|
||||
.add(mipmapLevels)
|
||||
.add(textureFilterMode)
|
||||
.add(SodiumGameOptionPages.anisotropicFilteringSlider(vanillaOpts, textureFilterMode::getValue),
|
||||
SodiumGameOptions.anisotropySupported())
|
||||
.build());
|
||||
|
||||
if (Iris.enabled) {
|
||||
final OptionImpl<GameSettings, Integer> maxShadowDistanceSlider = OptionImpl.createBuilder(int.class, vanillaOpts)
|
||||
.setName(I18n.format("options.iris.shadowDistance"))
|
||||
.setTooltip(I18n.format("options.iris.shadowDistance.sodium_tooltip"))
|
||||
.setControl(option -> new SliderControl(option, 0, 32, 1, ControlValueFormatter.quantity("options.chunks")))
|
||||
.setBinding((options, value) -> {
|
||||
IrisVideoSettings.shadowDistance = value;
|
||||
try {
|
||||
Iris.getIrisConfig().save();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
},
|
||||
options -> IrisVideoSettings.getOverriddenShadowDistance(IrisVideoSettings.shadowDistance))
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setEnabled(true)
|
||||
.build();
|
||||
maxShadowDistanceSlider.iris$dynamicallyEnable(IrisVideoSettings::isShadowDistanceSliderEnabled);
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(maxShadowDistanceSlider)
|
||||
.build());
|
||||
}
|
||||
|
||||
if (AngelicaConfig.enableZoom) {
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(Settings.ZOOM_SMOOTH.option)
|
||||
.add(Settings.ZOOM_SMOOTH_SPEED.option)
|
||||
.add(Settings.ZOOM_CINEMATIC.option)
|
||||
.build());
|
||||
}
|
||||
|
||||
return new OptionPage(I18n.format("options.video"), ImmutableList.copyOf(groups));
|
||||
}
|
||||
|
||||
public static OptionPage detail() {
|
||||
List<OptionGroup> groups = new ArrayList<>();
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(Settings.MODE_LEAVES.option)
|
||||
.add(OptionImpl.createBuilder(GraphicsQuality.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.grass_quality.name"))
|
||||
.setTooltip(I18n.format("sodium.options.grass_quality.tooltip"))
|
||||
.setControl(option -> new CyclingControl<>(option, GraphicsQuality.class))
|
||||
.setBinding((opts, value) -> opts.quality.grassQuality = value, opts -> opts.quality.grassQuality)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.add(Settings.MODE_WATER.option)
|
||||
.add(Settings.DOWNFALL_DISTANCE.option)
|
||||
.add(Settings.MODE_VIGNETTE.option)
|
||||
.add(Settings.MODE_SHADOWS.option)
|
||||
.add(Settings.VOID_FOG.option)
|
||||
.add(Settings.MODE_DROPPED_ITEMS.option)
|
||||
.add(Settings.MODE_GLINT_WORLD.option)
|
||||
.add(Settings.MODE_GLINT_INV.option)
|
||||
.build());
|
||||
return new OptionPage(I18n.format("options.button.detail"), ImmutableList.copyOf(groups));
|
||||
}
|
||||
|
||||
public static OptionPage atmosphere() {
|
||||
List<OptionGroup> groups = new ArrayList<>();
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(Settings.MODE_SKY.option)
|
||||
.add(Settings.MODE_SUN_MOON.option)
|
||||
.add(Settings.MODE_CLOUDS.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.option)
|
||||
.add(Settings.TERRAIN_FOG.option)
|
||||
.add(Settings.FOG_NEAR_DISTANCE.option)
|
||||
.build());
|
||||
return new OptionPage(I18n.format("options.button.sky"), ImmutableList.copyOf(groups));
|
||||
}
|
||||
|
||||
public static OptionPage particles() {
|
||||
List<OptionGroup> groups = new ArrayList<>();
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(ParticleMode.class, vanillaOpts)
|
||||
.setName(I18n.format("options.particles"))
|
||||
.setTooltip(I18n.format("sodium.options.particle_quality.tooltip"))
|
||||
.setControl(opt -> new CyclingControl<>(opt, ParticleMode.class))
|
||||
.setBinding((opts, value) -> opts.particleSetting = value.ordinal(), (opts) -> ParticleMode.fromOrdinal(opts.particleSetting))
|
||||
.setImpact(OptionImpact.LOW)
|
||||
.build())
|
||||
.add(Settings.PARTICLES_VOID.option)
|
||||
.add(Settings.PARTICLES_ENC_TABLE.option)
|
||||
.build());
|
||||
return new OptionPage(I18n.format("options.button.particle"), ImmutableList.copyOf(groups));
|
||||
}
|
||||
|
||||
public static OptionPage other() {
|
||||
List<OptionGroup> groups = new ArrayList<>();
|
||||
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("options.anaglyph"))
|
||||
.setTooltip(I18n.format("sodium.options.anaglyph.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.anaglyph = value, opts -> opts.anaglyph)
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.setEnabled(NotFineConfig.allowToggle3DAnaglyph)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("options.showCape"))
|
||||
.setTooltip(I18n.format("sodium.options.show_cape.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.showCape = value, opts -> opts.showCape)
|
||||
.build())
|
||||
.add(Settings.MODE_GUI_BACKGROUND.option)
|
||||
.build());
|
||||
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(Settings.GUI_BACKGROUND.option)
|
||||
.build());
|
||||
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.use_chunk_multidraw.name"))
|
||||
.setTooltip(I18n.format("sodium.options.use_chunk_multidraw.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.advanced.useChunkMultidraw = value, opts -> opts.advanced.useChunkMultidraw)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.setImpact(OptionImpact.EXTREME)
|
||||
.setEnabled(true)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.use_vertex_objects.name"))
|
||||
.setTooltip(I18n.format("sodium.options.use_vertex_objects.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.advanced.useVertexArrayObjects = value, opts -> opts.advanced.useVertexArrayObjects)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.setImpact(OptionImpact.LOW)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.use_block_face_culling.name"))
|
||||
.setTooltip(I18n.format("sodium.options.use_block_face_culling.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setBinding((opts, value) -> opts.performance.useBlockFaceCulling = value, opts -> opts.performance.useBlockFaceCulling)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.use_compact_vertex_format.name"))
|
||||
.setTooltip(I18n.format("sodium.options.use_compact_vertex_format.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.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.performance.useFogOcclusion = value, opts -> opts.performance.useFogOcclusion)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.translucency_sorting.name"))
|
||||
.setTooltip(I18n.format("sodium.options.translucency_sorting.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.performance.translucencySorting = value, opts -> opts.performance.translucencySorting)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.use_entity_culling.name"))
|
||||
.setTooltip(I18n.format("sodium.options.use_entity_culling.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.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"))
|
||||
.setTooltip(I18n.format("sodium.options.use_particle_culling.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setBinding((opts, value) -> opts.advanced.useParticleCulling = value, opts -> opts.advanced.useParticleCulling)
|
||||
.build())
|
||||
.build());
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.animate_only_visible_textures.name"))
|
||||
.setTooltip(I18n.format("sodium.options.animate_only_visible_textures.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setBinding((opts, value) -> opts.performance.animateOnlyVisibleTextures = value, opts -> opts.performance.animateOnlyVisibleTextures)
|
||||
.build())
|
||||
.build());
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.allow_direct_memory_access.name"))
|
||||
.setTooltip(I18n.format("sodium.options.allow_direct_memory_access.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setBinding((opts, value) -> opts.advanced.allowDirectMemoryAccess = value, opts -> opts.advanced.allowDirectMemoryAccess)
|
||||
.build())
|
||||
.build());
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.ignore_driver_blacklist.name"))
|
||||
.setTooltip(I18n.format("sodium.options.ignore_driver_blacklist.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.advanced.ignoreDriverBlacklist = value, opts -> opts.advanced.ignoreDriverBlacklist)
|
||||
.build())
|
||||
.build());
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(int.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.chunk_update_threads.name"))
|
||||
.setTooltip(I18n.format("sodium.options.chunk_update_threads.tooltip"))
|
||||
.setControl(o -> new SliderControl(o, 0, Runtime.getRuntime().availableProcessors(), 1, ControlValueFormatter.quantityOrDisabled("sodium.options.threads.value", "sodium.options.default")))
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setBinding((opts, value) -> opts.performance.chunkBuilderThreads = value, opts -> opts.performance.chunkBuilderThreads)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.build());
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.always_defer_chunk_updates.name"))
|
||||
.setTooltip(I18n.format("sodium.options.always_defer_chunk_updates.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setBinding((opts, value) -> opts.performance.alwaysDeferChunkUpdates = value, opts -> opts.performance.alwaysDeferChunkUpdates)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.build());
|
||||
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
|
||||
.setName(I18n.format("sodium.options.use_no_error_context.name"))
|
||||
.setTooltip(I18n.format("sodium.options.use_no_error_context.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setImpact(OptionImpact.LOW)
|
||||
.setBinding((opts, value) -> opts.performance.useNoErrorGLContext = value, opts -> opts.performance.useNoErrorGLContext)
|
||||
.setFlags(OptionFlag.REQUIRES_GAME_RESTART)
|
||||
.build())
|
||||
.build());
|
||||
|
||||
return new OptionPage(I18n.format("options.button.other"), ImmutableList.copyOf(groups));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
package jss.notfine.gui.options.control.element;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.options.Option;
|
||||
import me.jellysquid.mods.sodium.client.util.Dim2i;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
||||
public class CyclingControlElement<T extends Enum<T>> extends NotFineControlElement<T> {
|
||||
private final T[] allowedValues;
|
||||
private final String[] names;
|
||||
|
||||
public CyclingControlElement(Option<T> option, Dim2i dim, T[] allowedValues, String[] names) {
|
||||
super(option, dim);
|
||||
this.allowedValues = allowedValues;
|
||||
this.names = names;
|
||||
}
|
||||
|
||||
private int currentIndex() {
|
||||
for(int i = 0; i < allowedValues.length; ++i) {
|
||||
if(allowedValues[i] == option.getValue()) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLabel() {
|
||||
Enum<T> value = option.getValue();
|
||||
return super.getLabel() + formatValue(names[value.ordinal()]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
|
||||
if(super.mousePressed(mc, mouseX, mouseY)) {
|
||||
option.setValue(allowedValues[(currentIndex() + 1) % allowedValues.length]);
|
||||
onOptionValueChanged();
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
package jss.notfine.gui.options.control.element;
|
||||
|
||||
import jss.notfine.gui.GuiCustomMenu;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
|
||||
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.control.ControlElement;
|
||||
import me.jellysquid.mods.sodium.client.util.Dim2i;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
public class NotFineControlElement<T> extends GuiButton implements ControlElement<T> {
|
||||
protected final Option<T> option;
|
||||
protected final Dim2i dim;
|
||||
|
||||
public NotFineControlElement(Option<T> option, Dim2i dim) {
|
||||
super(-5, dim.getOriginX(), dim.getOriginY(), dim.getWidth(), dim.getHeight(), option.getName());
|
||||
this.option = option;
|
||||
this.dim = dim;
|
||||
enabled = option.isAvailable();
|
||||
}
|
||||
|
||||
private static String disabledStyle() {
|
||||
return String.valueOf(EnumChatFormatting.GRAY) + EnumChatFormatting.STRIKETHROUGH;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawButton(Minecraft mc, int mouseX, int mouseY) {
|
||||
displayString = getLabel();
|
||||
//TODO: tooltips
|
||||
//hovered
|
||||
super.drawButton(mc, mouseX, mouseY);
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
String name = option.getName();
|
||||
String label;
|
||||
enabled = option.isAvailable();
|
||||
if (!enabled) {
|
||||
label = disabledStyle() + name;
|
||||
} else if (option.hasChanged()) {
|
||||
label = EnumChatFormatting.ITALIC + name;
|
||||
} else {
|
||||
label = name;
|
||||
}
|
||||
label += ": ";
|
||||
return label;
|
||||
}
|
||||
|
||||
protected String formatValue(String value) {
|
||||
return option.isAvailable() ? value : disabledStyle() + value;
|
||||
}
|
||||
|
||||
protected void onOptionValueChanged() {
|
||||
option.applyChanges();
|
||||
|
||||
Collection<OptionFlag> flags = option.getFlags();
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
if (flags.contains(OptionFlag.REQUIRES_ASSET_RELOAD)) {
|
||||
SodiumGameOptions.applyAtlasSettings();
|
||||
mc.refreshResources();
|
||||
} else if (flags.contains(OptionFlag.REQUIRES_RENDERER_RELOAD)) {
|
||||
mc.renderGlobal.loadRenderers();
|
||||
}
|
||||
GuiCustomMenu.dirtyStorages.add(option.getStorage());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isHovered() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Option<T> getOption() {
|
||||
return this.option;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dim2i getDimensions() {
|
||||
return this.dim;
|
||||
}
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
package jss.notfine.gui.options.control.element;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.options.Option;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.element.ControlElementFactory;
|
||||
import me.jellysquid.mods.sodium.client.util.Dim2i;
|
||||
|
||||
public class NotFineControlElementFactory implements ControlElementFactory {
|
||||
|
||||
@Override
|
||||
public <T extends Enum<T>> ControlElement<T> cyclingControlElement(Option<T> option, Dim2i dim, T[] allowedValues, String[] names) {
|
||||
return new CyclingControlElement<>(option, dim, allowedValues, names);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ControlElement<Integer> sliderControlElement(Option<Integer> option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter) {
|
||||
return new SliderControlElement(option, dim, min, max, interval, formatter);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ControlElement<Boolean> tickBoxElement(Option<Boolean> option, Dim2i dim) {
|
||||
return new TickBoxControlElement(option, dim);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,115 +0,0 @@
|
||||
package jss.notfine.gui.options.control.element;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.options.Option;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter;
|
||||
import me.jellysquid.mods.sodium.client.util.Dim2i;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
public class SliderControlElement extends NotFineControlElement<Integer> {
|
||||
private final ControlValueFormatter formatter;
|
||||
private final int min, max, interval;
|
||||
|
||||
private float value;
|
||||
private boolean mousePressed;
|
||||
private boolean dirty = false;
|
||||
|
||||
public SliderControlElement(Option<Integer> option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter) {
|
||||
super(option, dim);
|
||||
this.min = min;
|
||||
this.max = max;
|
||||
this.interval = interval;
|
||||
this.formatter = formatter;
|
||||
value = option.getValue();
|
||||
//Normalize value
|
||||
value = MathHelper.clamp_float((value - min) / (max - min), 0f, 1f);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLabel() {
|
||||
return super.getLabel() + formatValue(formatter.format(option.getValue()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getHoverState(boolean mouseOver) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseDragged(Minecraft mc, int mouseX, int mouseY) {
|
||||
if(visible) {
|
||||
if(mousePressed) {
|
||||
updateSlider(mouseX);
|
||||
}
|
||||
GLStateManager.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
drawTexturedModalRect(xPosition + (int)(value * (float)(width - 8)), yPosition, 0, 66, 4, 20);
|
||||
drawTexturedModalRect(xPosition + (int)(value * (float)(width - 8)) + 4, yPosition, 196, 66, 4, 20);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
|
||||
if(super.mousePressed(mc, mouseX, mouseY)) {
|
||||
updateSlider(mouseX);
|
||||
mousePressed = true;
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mouseReleased(int mouseX, int mouseY) {
|
||||
mousePressed = false;
|
||||
if(dirty) {
|
||||
onOptionValueChanged();
|
||||
dirty = false;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean keyTyped(int keyCode) {
|
||||
if(!option.isAvailable()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final int step;
|
||||
if(keyCode == Keyboard.KEY_LEFT) {
|
||||
step = -interval;
|
||||
} else if(keyCode == Keyboard.KEY_RIGHT) {
|
||||
step = interval;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
final int stepped = MathHelper.clamp_int(option.getValue() + step, min, max);
|
||||
if(stepped != option.getValue()) {
|
||||
option.setValue(stepped);
|
||||
value = MathHelper.clamp_float((float)(stepped - min) / (max - min), 0f, 1f);
|
||||
onOptionValueChanged();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void updateSlider(int mouseX) {
|
||||
value = (float)(mouseX - (xPosition + 4)) / (float)(width - 8);
|
||||
//Clamp normalized value
|
||||
value = MathHelper.clamp_float(value, 0f, 1f);
|
||||
//Un-normalize value
|
||||
value = min + (max - min) * MathHelper.clamp_float(value, 0f, 1f);
|
||||
//Clamp value
|
||||
value = MathHelper.clamp_float(value, min, max);
|
||||
//Snap value
|
||||
if(interval > 0) {
|
||||
value = interval * (float)Math.round(value / interval);
|
||||
}
|
||||
//Commit value
|
||||
option.setValue((int)value);
|
||||
//Normalize value
|
||||
value = MathHelper.clamp_float((value - min) / (max - min), 0f, 1f);
|
||||
|
||||
dirty = true;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
package jss.notfine.gui.options.control.element;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.options.Option;
|
||||
import me.jellysquid.mods.sodium.client.util.Dim2i;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
|
||||
public class TickBoxControlElement extends NotFineControlElement<Boolean> {
|
||||
public TickBoxControlElement(Option<Boolean> option, Dim2i dim) {
|
||||
super(option, dim);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLabel() {
|
||||
return super.getLabel() + formatValue(I18n.format(option.getValue() ? "options.on" : "options.off"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
|
||||
if(super.mousePressed(mc, mouseX, mouseY)) {
|
||||
option.setValue(!option.getValue());
|
||||
onOptionValueChanged();
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+72
-15
@@ -1,9 +1,15 @@
|
||||
package me.flashyreese.mods.reeses_sodium_options.client.gui;
|
||||
|
||||
import com.gtnewhorizons.angelica.client.gui.DynamicLightsOptionPages;
|
||||
import com.gtnewhorizons.angelica.client.gui.FontConfigScreen;
|
||||
import com.gtnewhorizons.angelica.client.gui.RendererOptionPages;
|
||||
import com.gtnewhorizons.angelica.client.gui.ScrollableGuiScreen;
|
||||
import com.gtnewhorizons.angelica.client.gui.TracyOptionPages;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.Element;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import jss.notfine.gui.GuiCustomMenu;
|
||||
import com.gtnewhorizons.angelica.config.SystemProperties;
|
||||
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
|
||||
import com.gtnewhorizons.angelica.glsm.profiling.TracyOptions;
|
||||
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;
|
||||
@@ -11,7 +17,6 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.Tab;
|
||||
import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.TabFrame;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
|
||||
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;
|
||||
@@ -27,13 +32,16 @@ import net.minecraft.client.resources.I18n;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
|
||||
public class ReeseSodiumVideoOptionsScreen extends ScrollableGuiScreen {
|
||||
private static final float ASPECT_RATIO = 5f / 4f;
|
||||
private static final int MINIMUM_WIDTH = 550;
|
||||
|
||||
@@ -46,15 +54,63 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
|
||||
|
||||
private static final AtomicReference<String> lastSearch = new AtomicReference<>("");
|
||||
|
||||
private final List<Element> children = new CopyOnWriteArrayList<>();
|
||||
private final List<OptionPage> pages = new ArrayList<>();
|
||||
|
||||
public final GuiScreen prevScreen;
|
||||
|
||||
private FlatButtonWidget applyButton, closeButton, undoButton;
|
||||
private boolean hasPendingChanges;
|
||||
private String pendingPage;
|
||||
|
||||
private AbstractFrame frame;
|
||||
private SearchTextFieldComponent searchTextField;
|
||||
|
||||
public ReeseSodiumVideoOptionsScreen(GuiScreen prevScreen) {
|
||||
super(prevScreen);
|
||||
this.prevScreen = prevScreen;
|
||||
|
||||
this.pages.add(RendererOptionPages.withLink(SodiumGameOptionPages.general(), this));
|
||||
this.pages.add(RendererOptionPages.renderer());
|
||||
this.pages.add(SodiumGameOptionPages.quality());
|
||||
this.pages.add(SodiumGameOptionPages.advanced());
|
||||
this.pages.add(SodiumGameOptionPages.performance());
|
||||
this.pages.add(SodiumGameOptionPages.fpsReducer());
|
||||
this.pages.add(SodiumGameOptionPages.appearance());
|
||||
this.pages.add(SodiumGameOptionPages.text());
|
||||
|
||||
if (DynamicLights.configEnabled) {
|
||||
this.pages.add(DynamicLightsOptionPages.dynamicLights());
|
||||
}
|
||||
|
||||
if (SystemProperties.debugTooling() || TracyOptions.backendPresent()) {
|
||||
this.pages.add(TracyOptionPages.tracy());
|
||||
}
|
||||
}
|
||||
|
||||
public void showPage(String name) {
|
||||
this.pendingPage = name;
|
||||
}
|
||||
|
||||
private void applyPendingPage() {
|
||||
if (this.pendingPage == null) return;
|
||||
lastSearch.set("");
|
||||
tabFrameSelectedTab.set(this.pendingPage);
|
||||
optionPageScrollBarOffset.set(0);
|
||||
this.pendingPage = null;
|
||||
this.rebuildGUI();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<? extends Element> children() {
|
||||
return children;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onGuiClosed() {
|
||||
Keyboard.enableRepeatEvents(false);
|
||||
}
|
||||
|
||||
// Hackalicious! Rebuild UI
|
||||
@Override
|
||||
public void rebuildGUI() {
|
||||
// Preserve search focus state across rebuilds
|
||||
boolean wasSearchFocused = this.searchTextField != null && this.searchTextField.isFocused();
|
||||
@@ -196,6 +252,7 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
|
||||
|
||||
@Override
|
||||
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
|
||||
this.applyPendingPage();
|
||||
super.drawDefaultBackground();
|
||||
handleMouseScroll(mouseX, mouseY, partialTicks);
|
||||
this.updateControls();
|
||||
@@ -275,14 +332,6 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
|
||||
onClose();
|
||||
return;
|
||||
}
|
||||
if (keyCode == Keyboard.KEY_P) {
|
||||
if(isShiftKeyDown()){
|
||||
this.mc.displayGuiScreen(new GuiCustomMenu(this.prevScreen, SodiumGameOptionPages.general(), SodiumGameOptionPages.quality(), SodiumGameOptionPages.advanced(), SodiumGameOptionPages.performance(), SodiumGameOptionPages.appearance()));
|
||||
} else if (isCtrlKeyDown()) {
|
||||
this.mc.displayGuiScreen(new SodiumOptionsGUI(this.prevScreen));
|
||||
}
|
||||
}
|
||||
|
||||
if(focused != null) {
|
||||
focused.keyTyped(typedChar, keyCode);
|
||||
}
|
||||
@@ -293,6 +342,7 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
|
||||
final boolean onSearchField = this.searchTextField.isMouseOver(mouseX, mouseY);
|
||||
|
||||
super.mouseClicked(mouseX, mouseY, mouseButton);
|
||||
this.children.forEach(element -> element.mouseClicked(mouseX, mouseY, mouseButton));
|
||||
|
||||
if (!onSearchField) {
|
||||
this.searchTextField.setFocused(false);
|
||||
@@ -301,13 +351,20 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseClickMove(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick) {
|
||||
super.mouseClickMove(mouseX, mouseY, mouseButton, timeSinceLastClick);
|
||||
|
||||
this.children.forEach(element -> element.mouseDragged(mouseX, mouseY, mouseButton));
|
||||
}
|
||||
|
||||
public boolean shouldCloseOnEsc() {
|
||||
return !this.hasPendingChanges;
|
||||
}
|
||||
|
||||
@Override
|
||||
// We can't override onGuiClosed due to StackOverflow
|
||||
public void onClose() {
|
||||
lastSearch.set("");
|
||||
super.onClose();
|
||||
this.mc.displayGuiScreen(this.prevScreen);
|
||||
super.onGuiClosed();
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,7 @@ import com.gtnewhorizons.angelica.config.GpuCullingMode;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import cpw.mods.fml.common.Optional.Method;
|
||||
import com.gtnewhorizons.angelica.glsm.streaming.StreamingUploader;
|
||||
import jss.notfine.config.NotFineConfig;
|
||||
import jss.notfine.core.Settings;
|
||||
import jss.notfine.core.SettingsManager;
|
||||
import me.flashyreese.mods.reeses_sodium_options.client.gui.ReeseSodiumVideoOptionsScreen;
|
||||
@@ -131,9 +132,6 @@ public class SodiumGameOptionPages {
|
||||
if(Minecraft.getMinecraft().currentScreen instanceof ReeseSodiumVideoOptionsScreen oldGui) {
|
||||
Minecraft.getMinecraft().displayGuiScreen(new ReeseSodiumVideoOptionsScreen(oldGui.prevScreen));
|
||||
}
|
||||
else if(Minecraft.getMinecraft().currentScreen instanceof SodiumOptionsGUI oldGui) {
|
||||
Minecraft.getMinecraft().displayGuiScreen(new SodiumOptionsGUI(oldGui.prevScreen));
|
||||
}
|
||||
}, opts -> opts.guiScale)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
@@ -812,6 +810,21 @@ public class SodiumGameOptionPages {
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(Settings.MODE_GUI_BACKGROUND.option)
|
||||
.add(Settings.GUI_BACKGROUND.option)
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("options.showCape"))
|
||||
.setTooltip(I18n.format("sodium.options.show_cape.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.showCape = value, opts -> opts.showCape)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("options.anaglyph"))
|
||||
.setTooltip(I18n.format("sodium.options.anaglyph.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.anaglyph = value, opts -> opts.anaglyph)
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.setEnabled(NotFineConfig.allowToggle3DAnaglyph)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, angelicaOpts)
|
||||
.setName(I18n.format("options.angelica.disablef3"))
|
||||
.setTooltip(I18n.format("options.angelica.disablef3.tooltip"))
|
||||
|
||||
@@ -204,7 +204,6 @@ public class SodiumGameOptions {
|
||||
public static class AdvancedSettings {
|
||||
public VSyncMode vsyncMode;
|
||||
public boolean useVertexArrayObjects = true;
|
||||
public boolean useChunkMultidraw = true;
|
||||
public MultiDrawMode multiDrawMode = MultiDrawMode.DIRECT;
|
||||
|
||||
public boolean useParticleCulling = true;
|
||||
|
||||
@@ -1,343 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.gui;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.client.gui.DynamicLightsOptionPages;
|
||||
import com.gtnewhorizons.angelica.client.gui.ScrollableGuiScreen;
|
||||
import com.gtnewhorizons.angelica.client.gui.TracyOptionPages;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.Drawable;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.Element;
|
||||
import com.gtnewhorizons.angelica.config.SystemProperties;
|
||||
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
|
||||
import com.gtnewhorizons.angelica.glsm.profiling.TracyOptions;
|
||||
import jss.notfine.gui.GuiCustomMenu;
|
||||
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;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionImpact;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.Control;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.element.SodiumControlElementFactory;
|
||||
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;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class SodiumOptionsGUI extends ScrollableGuiScreen {
|
||||
|
||||
protected static final SodiumControlElementFactory elementFactory = new SodiumControlElementFactory();
|
||||
|
||||
protected final List<Element> children = new CopyOnWriteArrayList<>();
|
||||
|
||||
protected final List<OptionPage> pages = new ArrayList<>();
|
||||
|
||||
protected final List<ControlElement<?>> controls = new ArrayList<>();
|
||||
protected final List<Drawable> drawable = new ArrayList<>();
|
||||
|
||||
public final GuiScreen prevScreen;
|
||||
|
||||
protected OptionPage currentPage;
|
||||
|
||||
protected FlatButtonWidget applyButton, closeButton, undoButton;
|
||||
|
||||
protected boolean hasPendingChanges;
|
||||
protected ControlElement<?> hoveredElement;
|
||||
private Element focusedElement;
|
||||
|
||||
protected OptionPage shaderPacks;
|
||||
|
||||
public SodiumOptionsGUI(GuiScreen prevScreen) {
|
||||
this.prevScreen = prevScreen;
|
||||
|
||||
this.pages.add(SodiumGameOptionPages.general());
|
||||
this.pages.add(SodiumGameOptionPages.quality());
|
||||
this.pages.add(SodiumGameOptionPages.advanced());
|
||||
this.pages.add(SodiumGameOptionPages.performance());
|
||||
this.pages.add(SodiumGameOptionPages.fpsReducer());
|
||||
this.pages.add(SodiumGameOptionPages.appearance());
|
||||
this.pages.add(SodiumGameOptionPages.text());
|
||||
|
||||
// Add Dynamic Lights page if enabled
|
||||
if (DynamicLights.configEnabled) {
|
||||
this.pages.add(DynamicLightsOptionPages.dynamicLights());
|
||||
}
|
||||
|
||||
if (SystemProperties.debugTooling() || TracyOptions.backendPresent()) {
|
||||
this.pages.add(TracyOptionPages.tracy());
|
||||
}
|
||||
|
||||
if (Iris.enabled) {
|
||||
shaderPacks = new OptionPage(I18n.format("options.iris.shaderPackSelection"), ImmutableList.of());
|
||||
this.pages.add(shaderPacks);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void setPage(OptionPage page) {
|
||||
if (Iris.enabled && page == shaderPacks) {
|
||||
mc.displayGuiScreen(new ShaderPackScreen(this));
|
||||
return;
|
||||
}
|
||||
|
||||
this.currentPage = page;
|
||||
|
||||
this.rebuildGUI();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initGui() {
|
||||
Keyboard.enableRepeatEvents(true);
|
||||
this.rebuildGUI();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onGuiClosed() {
|
||||
Keyboard.enableRepeatEvents(false);
|
||||
}
|
||||
|
||||
protected void rebuildGUI() {
|
||||
this.controls.clear();
|
||||
this.children.clear();
|
||||
this.drawable.clear();
|
||||
this.focusedElement = null;
|
||||
|
||||
if (this.currentPage == null) {
|
||||
if (this.pages.isEmpty()) {
|
||||
throw new IllegalStateException("No pages are available?!");
|
||||
}
|
||||
|
||||
// Just use the first page for now
|
||||
this.currentPage = this.pages.getFirst();
|
||||
}
|
||||
|
||||
this.rebuildGUIPages();
|
||||
this.rebuildGUIOptions();
|
||||
|
||||
this.undoButton = new FlatButtonWidget(new Dim2i(this.width - 211, this.height - 26, 65, 20), I18n.format("sodium.options.buttons.undo"), this::undoChanges);
|
||||
this.applyButton = new FlatButtonWidget(new Dim2i(this.width - 142, this.height - 26, 65, 20), I18n.format("sodium.options.buttons.apply"), this::applyChanges);
|
||||
this.closeButton = new FlatButtonWidget(new Dim2i(this.width - 73, this.height - 26, 65, 20), I18n.format("gui.done"), this::onClose);
|
||||
|
||||
this.children.add(this.undoButton);
|
||||
this.children.add(this.applyButton);
|
||||
this.children.add(this.closeButton);
|
||||
|
||||
for (Element element : this.children) {
|
||||
if (element instanceof Drawable) {
|
||||
this.drawable.add((Drawable) element);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void rebuildGUIPages() {
|
||||
int x = 6;
|
||||
final int y = 6;
|
||||
|
||||
for (OptionPage page : this.pages) {
|
||||
final int width = 12 + this.fontRendererObj.getStringWidth(page.getName());
|
||||
|
||||
final FlatButtonWidget button = new FlatButtonWidget(new Dim2i(x, y, width, 18), page.getName(), () -> this.setPage(page));
|
||||
button.setSelected(this.currentPage == page);
|
||||
|
||||
x += width + 6;
|
||||
|
||||
this.children.add(button);
|
||||
}
|
||||
}
|
||||
|
||||
private void rebuildGUIOptions() {
|
||||
final int x = 6;
|
||||
int y = 28;
|
||||
|
||||
for (OptionGroup group : this.currentPage.getGroups()) {
|
||||
// Add each option's control element
|
||||
for (Option<?> option : group.getOptions()) {
|
||||
final Control<?> control = option.getControl();
|
||||
final ControlElement<?> element = control.createElement(new Dim2i(x, y, 200, 18), elementFactory);
|
||||
|
||||
this.controls.add(element);
|
||||
//Safe if SodiumControlElementFactory or a compatible ControlElementFactory is used to create element.
|
||||
this.children.add((Element)element);
|
||||
|
||||
// Move down to the next option
|
||||
y += 18;
|
||||
}
|
||||
|
||||
// Add padding beneath each option group
|
||||
y += 4;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawScreen(int mouseX, int mouseY, float delta) {
|
||||
super.drawScreen(mouseX, mouseY, delta);
|
||||
super.drawDefaultBackground();
|
||||
|
||||
this.updateControls();
|
||||
|
||||
for (Drawable drawable : this.drawable) {
|
||||
drawable.render(mouseX, mouseY, delta);
|
||||
}
|
||||
|
||||
if (this.hoveredElement != null) {
|
||||
this.renderOptionTooltip(this.hoveredElement);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<? extends Element> children() {
|
||||
return children;
|
||||
}
|
||||
|
||||
private void updateControls() {
|
||||
ControlElement<?> hovered = this.getActiveControls()
|
||||
.filter(ControlElement::isHovered)
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
|
||||
final boolean hasChanges = this.getAllOptions().anyMatch(Option::hasChanged);
|
||||
|
||||
this.applyButton.setEnabled(hasChanges);
|
||||
this.undoButton.setVisible(hasChanges);
|
||||
this.closeButton.setEnabled(!hasChanges);
|
||||
|
||||
this.hasPendingChanges = hasChanges;
|
||||
this.hoveredElement = hovered;
|
||||
}
|
||||
|
||||
private Stream<Option<?>> getAllOptions() {
|
||||
return this.pages.stream()
|
||||
.flatMap(s -> s.getOptions().stream());
|
||||
}
|
||||
|
||||
private Stream<ControlElement<?>> getActiveControls() {
|
||||
return this.controls.stream();
|
||||
}
|
||||
|
||||
private void renderOptionTooltip(ControlElement<?> element) {
|
||||
final Dim2i dim = element.getDimensions();
|
||||
|
||||
final int textPadding = 3;
|
||||
final int boxPadding = 3;
|
||||
|
||||
final int boxWidth = 200;
|
||||
|
||||
int boxY = dim.getOriginY();
|
||||
final int boxX = dim.getLimitX() + boxPadding;
|
||||
|
||||
final Option<?> option = element.getOption();
|
||||
final List<String> tooltip = new ArrayList<>(this.fontRendererObj.listFormattedStringToWidth(option.getTooltip(), boxWidth - (textPadding * 2)));
|
||||
|
||||
final OptionImpact impact = option.getImpact();
|
||||
|
||||
if (impact != null) {
|
||||
tooltip.add(EnumChatFormatting.GRAY + I18n.format("sodium.options.performance_impact_string", impact.toDisplayString()));
|
||||
}
|
||||
|
||||
final int boxHeight = (tooltip.size() * 12) + boxPadding;
|
||||
final int boxYLimit = boxY + boxHeight;
|
||||
final int boxYCutoff = this.height - 40;
|
||||
|
||||
// If the box is going to be cutoff on the Y-axis, move it back up the difference
|
||||
if (boxYLimit > boxYCutoff) {
|
||||
boxY -= boxYLimit - boxYCutoff;
|
||||
}
|
||||
|
||||
this.drawGradientRect(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xE0000000, 0xE0000000);
|
||||
|
||||
for (int i = 0; i < tooltip.size(); i++) {
|
||||
this.fontRendererObj.drawString(tooltip.get(i), boxX + textPadding, boxY + textPadding + (i * 12), 0xFFFFFFFF);
|
||||
}
|
||||
}
|
||||
|
||||
private void applyChanges() {
|
||||
final HashSet<OptionStorage<?>> dirtyStorages = new HashSet<>();
|
||||
final EnumSet<OptionFlag> flags = EnumSet.noneOf(OptionFlag.class);
|
||||
|
||||
this.getAllOptions().forEach((option -> {
|
||||
if (!option.hasChanged()) {
|
||||
return;
|
||||
}
|
||||
|
||||
option.applyChanges();
|
||||
|
||||
flags.addAll(option.getFlags());
|
||||
dirtyStorages.add(option.getStorage());
|
||||
}));
|
||||
|
||||
if (flags.contains(OptionFlag.REQUIRES_ASSET_RELOAD)) {
|
||||
SodiumGameOptions.applyAtlasSettings();
|
||||
this.mc.refreshResources();
|
||||
} else if (flags.contains(OptionFlag.REQUIRES_RENDERER_RELOAD)) {
|
||||
this.mc.renderGlobal.loadRenderers();
|
||||
}
|
||||
|
||||
for (OptionStorage<?> storage : dirtyStorages) {
|
||||
storage.save();
|
||||
}
|
||||
}
|
||||
|
||||
private void undoChanges() {
|
||||
this.getAllOptions().forEach(Option::reset);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyTyped(char typedChar, int keyCode) {
|
||||
if(keyCode == Keyboard.KEY_ESCAPE && !shouldCloseOnEsc()) {
|
||||
return;
|
||||
} else if (keyCode == Keyboard.KEY_ESCAPE) {
|
||||
onClose();
|
||||
return;
|
||||
}
|
||||
|
||||
if (keyCode == Keyboard.KEY_P && isShiftKeyDown()) {
|
||||
this.mc.displayGuiScreen(new GuiCustomMenu(this.prevScreen, SodiumGameOptionPages.general(),
|
||||
SodiumGameOptionPages.quality(), SodiumGameOptionPages.advanced(), SodiumGameOptionPages.performance(),
|
||||
SodiumGameOptionPages.appearance()));
|
||||
}
|
||||
|
||||
if (this.focusedElement != null) {
|
||||
this.focusedElement.keyTyped(typedChar, keyCode);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean shouldCloseOnEsc() {
|
||||
return !this.hasPendingChanges;
|
||||
}
|
||||
|
||||
// We can't override onGuiClosed due to StackOverflow
|
||||
public void onClose() {
|
||||
this.mc.displayGuiScreen(this.prevScreen);
|
||||
super.onGuiClosed();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) {
|
||||
super.mouseClicked(mouseX, mouseY, mouseButton);
|
||||
|
||||
this.children.forEach(element -> {
|
||||
if (element.mouseClicked(mouseX, mouseY, mouseButton)) {
|
||||
this.focusedElement = element;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseClickMove(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick) {
|
||||
super.mouseClickMove(mouseX, mouseY, mouseButton, timeSinceLastClick);
|
||||
|
||||
this.children.forEach(element -> element.mouseDragged(mouseX, mouseY, mouseButton));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -8,12 +8,27 @@ public class ActionOption extends ButtonOption {
|
||||
private final Supplier<String> label;
|
||||
private final Runnable action;
|
||||
private final BooleanSupplier available;
|
||||
private final boolean clickable;
|
||||
|
||||
public ActionOption(String name, String tooltip, Supplier<String> label, Runnable action, BooleanSupplier available) {
|
||||
this(name, tooltip, label, action, available, true);
|
||||
}
|
||||
|
||||
private ActionOption(String name, String tooltip, Supplier<String> label, Runnable action, BooleanSupplier available, boolean clickable) {
|
||||
super(name, tooltip, 100);
|
||||
this.label = label;
|
||||
this.action = action;
|
||||
this.available = available;
|
||||
this.clickable = clickable;
|
||||
}
|
||||
|
||||
public static ActionOption label(String name, String tooltip, Supplier<String> label) {
|
||||
return new ActionOption(name, tooltip, label, () -> {}, () -> true, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean clickable() {
|
||||
return this.clickable;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -40,6 +40,10 @@ public abstract class ButtonOption implements Option<Void> {
|
||||
|
||||
protected abstract void invoke();
|
||||
|
||||
protected boolean clickable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return this.name;
|
||||
@@ -127,12 +131,12 @@ public abstract class ButtonOption implements Option<Void> {
|
||||
|
||||
final String label = this.target.label();
|
||||
final int width = this.font.getStringWidth(label);
|
||||
this.drawString(label, this.dim.getLimitX() - width - 6, this.dim.getCenterY() - 4, this.hovered ? LABEL_HOVERED : LABEL_IDLE);
|
||||
this.drawString(label, this.dim.getLimitX() - width - 6, this.dim.getCenterY() - 4, this.hovered && this.target.clickable() ? LABEL_HOVERED : LABEL_IDLE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseClicked(double mouseX, double mouseY, int button) {
|
||||
if (!this.target.isAvailable() || button != 0 || !this.dim.containsCursor(mouseX, mouseY)) return false;
|
||||
if (!this.target.clickable() || !this.target.isAvailable() || button != 0 || !this.dim.containsCursor(mouseX, mouseY)) return false;
|
||||
|
||||
this.playClickSound();
|
||||
this.target.invoke();
|
||||
|
||||
+4
-14
@@ -1,6 +1,5 @@
|
||||
package me.jellysquid.mods.sodium.client.gui.options.control.element;
|
||||
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.Option;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter;
|
||||
@@ -58,20 +57,11 @@ public class SodiumControlElementFactory implements ControlElementFactory {
|
||||
|
||||
@Override
|
||||
public boolean mouseClicked(double mouseX, double mouseY, int button) {
|
||||
if(AngelicaConfig.enableReesesSodiumOptions) {
|
||||
if (this.option.isAvailable() && this.dim.containsCursor(mouseX, mouseY) && (button == 0 || button == 1)) {
|
||||
this.option.setValue(this.allowedValues[Math.floorMod(this.currentIndex() + (button == 0 ? 1 : -1), this.allowedValues.length)]);
|
||||
this.playClickSound();
|
||||
if (this.option.isAvailable() && this.dim.containsCursor(mouseX, mouseY) && (button == 0 || button == 1)) {
|
||||
this.option.setValue(this.allowedValues[Math.floorMod(this.currentIndex() + (button == 0 ? 1 : -1), this.allowedValues.length)]);
|
||||
this.playClickSound();
|
||||
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
if (this.option.isAvailable() && button == 0 && this.dim.containsCursor(mouseX, mouseY)) {
|
||||
this.option.setValue(this.allowedValues[(this.currentIndex() + 1) % this.allowedValues.length]);
|
||||
this.playClickSound();
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user