Skip to content
This repository has been archived by the owner on Jan 21, 2023. It is now read-only.

Commit

Permalink
Adding Missing Localization Keys，Fix config
Browse files Browse the repository at this point in the history
  • Loading branch information
@TexBlock
TexBlock committed Jul 22, 2022
1 parent 32171e2 commit 105ee94
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 129 deletions.
Binary file added build/libs/rubidium_extras-mc1.16.5_v1.3.2-Compatibility-Hotfix2.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ org.gradle.daemon = false

# mod version info
mod_id = rubidium_extras
mod_version = 1.3.2-Compatibility-Hotfix
mod_version = 1.3.2-Compatibility-Hotfix2
minecraft_version = 1.16.5
forge_version = 36.2.0
mappings_version=2021.10.17-1.16.5
Expand Down
90 changes: 45 additions & 45 deletions src/main/java/vice/rubidium_extras/config/MagnesiumExtrasConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,59 +65,59 @@ public class MagnesiumExtrasConfig

static
{
val builder = new ConfigBuilder(I18n.get("ru_extras.dynamic_light.title"));
val builder = new ConfigBuilder("Dynamic Lights Settings");

builder.Block(I18n.get("ru_extras.misc.option.title"), b -> {
cloudHeight = b.define(I18n.get("ru_extras.misc.cloud_height.title"), 196);
fadeInQuality = b.define(I18n.get("ru_extras.misc.chunk_quality.title"), "FANCY");
fog = b.define(I18n.get("ru_extras.misc.render_fog.title"), true);
fullScreenMode = b.defineEnum(I18n.get("ru_extras.misc.full_screen_mode.title"), FullscreenMode.FULLSCREEN);
builder.Block("Misc", b -> {
cloudHeight = b.define("Cloud Height [Raw, Default 196]", 196);
fadeInQuality = b.define("Chunk Fade In Quality (OFF, FAST, FANCY)", "FANCY");
fog = b.define("Render Fog", true);
fullScreenMode = b.defineEnum("Use Borderless Fullscreen", FullscreenMode.FULLSCREEN);
});

builder.Block(I18n.get("ru_extras.fps_counter.option.title"), b -> {
fpsCounterMode = b.define(I18n.get("ru_extras.fps_counter.mode.title"), "ADVANCED");
fpsCounterPosition = b.define(I18n.get("ru_extras.fps_counter.position.title"), 12);
builder.Block("FPS Counter", b -> {
fpsCounterMode = b.define("Display FPS Counter (OFF, SIMPLE, ADVANCED)", "ADVANCED");
fpsCounterPosition = b.define("FPS Counter Distance", 12);
});

builder.Block(I18n.get("ru_extras.entity_dis.option.title"), b -> {
enableDistanceChecks = b.define(I18n.get("ru_extras.entity_dis.enable_dis_checks.title"), true);
builder.Block("Entity Distance", b -> {
enableDistanceChecks = b.define("Enable Max Distance Checks", true);

maxTileEntityRenderDistanceSquare = b.define(I18n.get("ru_extras.entity_dis.max_TE_render_dis_S.title"), 4096);
maxTileEntityRenderDistanceY = b.define(I18n.get("ru_extras.entity_distance.max_TE_render_dis_Y.title"), 32);
maxTileEntityRenderDistanceSquare = b.define("(TileEntity) Max Horizontal Render Distance [Squared, Default 64^2]", 4096);
maxTileEntityRenderDistanceY = b.define("(TileEntity) Max Vertical Render Distance [Raw, Default 32]", 32);

maxEntityRenderDistanceSquare = b.define(I18n.get("ru_extras.entity_distance.max_entity_render_dis_S.title"), 4096);
maxEntityRenderDistanceY = b.define(I18n.get("ru_extras.entity_distance.max_entity_render_dis_Y.title"), 32);
maxEntityRenderDistanceSquare = b.define("(Entity) Max Horizontal Render Distance [Squared, Default 64^2]", 4096);
maxEntityRenderDistanceY = b.define("(Entity) Max Vertical Render Distance [Raw, Default 32]", 32);
});

builder.Block(I18n.get("ru_extras.zoom.option.name"), b -> {
lowerZoomSensitivity = b.define(I18n.get("ru_extras.zoom.lower_sensitivity.title"), true);
zoomScrolling = b.define(I18n.get("ru_extras.zoom.scrolling.title"), true);
zoomTransition = b.define(I18n.get("ru_extras.zoom.transition.title"), ZoomTransitionOptions.SMOOTH.toString());
zoomMode = b.define(I18n.get("ru_extras.zoom.keybind_mode.title"), ZoomModes.HOLD.toString());
cinematicCameraMode = b.define(I18n.get("ru_extras.zoom.cinematic_cam_mode.title"), CinematicCameraOptions.OFF.toString());
zoomOverlay = b.define(I18n.get("ru_extras.zoom.overlay.title"), true);
//zoomValues = b.define(I18n.get("ru_extras.zoom.values.title"), new ZoomValues());
builder.Block("Zoom", b -> {
lowerZoomSensitivity = b.define("Lower Zoom Sensitivity", true);
zoomScrolling = b.define("Zoom Scrolling", true);
zoomTransition = b.define("Zoom Transition Mode (OFF, LINEAR, SMOOTH)", ZoomTransitionOptions.SMOOTH.toString());
zoomMode = b.define("Zoom Transition Mode (TOGGLE, HOLD, PERSISTENT)", ZoomModes.HOLD.toString());
cinematicCameraMode = b.define("Cinematic Camera Mode (OFF, VANILLA, MULTIPLIED)", CinematicCameraOptions.OFF.toString());
zoomOverlay = b.define("Zoom Overlay?", true);
//zoomValues = b.define(I18n.get("Zoom Advanced Values", new ZoomValues());
});

builder.Block(I18n.get("ru_extras.ture_darkness.option.title"), b -> {
trueDarknessEnabled = b.define(I18n.get("ru_extras.ture_darkness.enable_switch.title"), true);
darknessOption = b.defineEnum(I18n.get("ru_extras.ture_darkness.setting.title"), DarknessOption.DARK);
builder.Block("True Darkness", b -> {
trueDarknessEnabled = b.define("Use True Darkness", true);
darknessOption = b.defineEnum("Darkness Setting (PITCH_BLACK, REALLY_DARK, DARK, DIM)", DarknessOption.DARK);

builder.Block(I18n.get("ru_extras.advanced.option.title"), b2 -> {
blockLightOnly = b2.define(I18n.get("ru_extras.advanced.block_light_only.title"), false);
ignoreMoonPhase = b2.define(I18n.get("ru_extras.advanced.ignore_moon_light.title"), false);
minimumMoonLevel = b2.defineInRange(I18n.get("ru_extras.advanced.mini_moon_light.title"), 0, 0, 1d);
maximumMoonLevel = b2.defineInRange(I18n.get("ru_extras.advanced.max_moon_light.title"), 0.25d, 0, 1d);
builder.Block("Advanced", b2 -> {
blockLightOnly = b2.define("Only Effect Block Lighting", false);
ignoreMoonPhase = b2.define("Ignore Moon Light", false);
minimumMoonLevel = b2.defineInRange("Maximum Moon Brightness (0->1)", 0, 0, 1d);
maximumMoonLevel = b2.defineInRange("Minimum Moon Brightness (0->1)", 0.25d, 0, 1d);
});

builder.Block(I18n.get("ru_extras.dim_setting.option.title"), b2 -> {
darkOverworld = b2.define(I18n.get("ru_extras.dim_setting.dark_overworld.title"), true);
darkDefault = b2.define(I18n.get("ru_extras.dim_setting.dark_default.title"), false);
darkNether = b2.define(I18n.get("ru_extras.dim_setting.dark_nether.title"), false);
darkNetherFogConfigured = b2.defineInRange(I18n.get("ru_extras.dim_setting.dark_nether_fog_configured.title"), .5, 0, 1d);
darkEnd = b2.define(I18n.get("ru_extras.dim_setting.dark_end.title"), false);
darkEndFogConfigured = b.defineInRange(I18n.get("ru_extras.dim_setting.dark_end_fog_configured.title"), 0, 0, 1d);
darkSkyless = b2.define(I18n.get("ru_extras.dim_setting.dark_skylight.title"), false);
builder.Block("Dimension Settings", b2 -> {
darkOverworld = b2.define("Dark Overworld?", true);
darkDefault = b2.define("Dark By Default?", false);
darkNether = b2.define("Dark Nether?", false);
darkNetherFogConfigured = b2.defineInRange("Dark Nether Fog Brightness (0->1)", .5, 0, 1d);
darkEnd = b2.define("Dark End?", false);
darkEndFogConfigured = b.defineInRange("Dark End Fog Brightness (0->1)", 0, 0, 1d);
darkSkyless = b2.define("Dark If No Skylight?", false);
});
});

Expand All @@ -134,9 +134,9 @@ public static void loadConfig(Path path) {

public static enum Complexity implements TextProvider
{
OFF(I18n.get("ru_extras.option.off")),
SIMPLE(I18n.get("ru_extras.option.simple")),
ADVANCED(I18n.get("ru_extras.option.advanced"));
OFF("Off"),
SIMPLE("Simple"),
ADVANCED("Advanced");

private final String name;

Expand All @@ -151,9 +151,9 @@ public String getLocalizedName() {

public static enum Quality implements TextProvider
{
OFF(I18n.get("ru_extras.option.off")),
FAST(I18n.get("ru_extras.option.fast")),
FANCY(I18n.get("ru_extras.option.fancy"));
OFF("Off"),
FAST("FAST"),
FANCY("Fancy");

private final String name;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vice/rubidium_extras/keybinds/KeyboardInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
@Mod.EventBusSubscriber(value = Dist.CLIENT)
public class KeyboardInput
{
public static final KeyBinding zoomKey = new KeyBinding("key.zoom",
public static final KeyBinding zoomKey = new KeyBinding("rb_extra.key.zoom",
KeyConflictContext.IN_GAME,
KeyModifier.NONE,
InputMappings.Type.KEYSYM,
GLFW.GLFW_KEY_C,
"key.category." + MagnesiumExtras.MODID);
"rb_extra.key.category");

}
44 changes: 3 additions & 41 deletions src/main/resources/assets/rubidium_extras/lang/en_us.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"rb_extra.key.zoom": "Zoom",
"rb_extra.key.category": "Rubidium Extras",

"ru_extras.option.off": "Off",
"ru_extras.option.simple": "Simple",
Expand Down Expand Up @@ -28,30 +30,19 @@
"ru_extras.experimental.options.name": "Experimental",
"ru_extras.display_fps.display.title": "Display FPS",

"ru_extras.dynamic_light.title":"Dynamic Lights Settings",
"ru_extras.misc.cloud_height.title": "Cloud Height [Raw, Default 196]",
"ru_extras.cloud_height.title": "Cloud Height",
"ru_extras.cloud_height.desc": "Raises cloud height.",
"ru_extras.misc.chunk_quality.title": "Chunk Fade In Quality (OFF, FAST, FANCY)",
"ru_extras.misc.chunk_fade_quality.title": "Chunk Fade In Quality",
"ru_extras.misc.chunk_fade_quality.desc": "Controls how fast chunks fade in. No performance hit, Fancy simply takes longer, but looks a bit cooler.",
"ru_extras.misc.render_fog.title": "Render Fog",
"ru_extras.fog.title": "Enable fog",
"ru_extras.fog.desc": "Toggles off all fog in the overworld.",
"ru_extras.misc.full_screen_mode.title": "Use Borderless Fullscreen",
"ru_extras.full_screen_mode.title": "Fullscreen Mode",
"ru_extras.full_screen_mode.desc": "Windowed - the game will display in a small window.\nBorderless - the game will be fullscreened, and locked to your monitor's refresh rate, but allow you to tab out easily.\nFullscreen - the game will display in native fullscreen mode.",

"ru_extras.fps_counter.option.title": "FPS Counter",
"ru_extras.fps_counter.mode.title": "Display FPS Counter (OFF, SIMPLE, ADVANCED)",

"ru_extras.display_fps.display.desc": "Displays the current FPS. Advanced mode also displays minimum FPS, as well as 15 second average FPS, which are more useful for judging performance.",
"ru_extras.display_fps.position.title": "FPS Display Position",
"ru_extras.display_fps.position.desc": "Offsets the FPS display a few pixels",
"ru_extras.fps_counter.position.title": "FPS Counter Distance",

"ru_extras.entity_dis.option.title": "Entity Distance",
"ru_extras.entity_dis.enable_dis_checks.title": "Enable Max Distance Checks",
"ru_extras.enable_max_entity_distance.title": "Enable Max Entity Distance",
"ru_extras.enable_max_entity_distance.desc": "Toggles off entity culling.",
"ru_extras.max_entity_distance.title": "Max Entity Distance",
Expand All @@ -60,50 +51,21 @@
"ru_extras.vertical_entity_distance.desc": "Hides and does not tick entities underneath this many blocks, improving performance above caves. This should ideally be set lower than the horizontal distance.",
"ru_extras.max_tile_distance.title": "Max Tile Distance",
"ru_extras.max_tile_distance.desc": "Hides block entities beyond this many blocks. Huge performance increase, especially around lots of modded machines.",
"ru_extras.entity_dis.max_TE_render_dis_S.title": "(TileEntity) Max Horizontal Render Distance [Squared, Default 64^2]",
"ru_extras.entity_distance.max_TE_render_dis_Y.title": "(TileEntity) Max Vertical Render Distance [Raw, Default 32]",
"ru_extras.entity_distance.max_entity_render_dis_S.title": "(Entity) Max Horizontal Render Distance [Squared, Default 64^2]",
"ru_extras.entity_distance.max_entity_render_dis_Y.title": "(Entity) Max Vertical Render Distance [Raw, Default 32]",

"ru_extras.zoom.lower_sensitivity.title": "Lower Zoom Sensitivity",
"ru_extras.zoom.lower_sensitivity.desc": "Lowers your sensitivity when zooming to make it feel more consistent.",
"ru_extras.zoom.scrolling_enable.title": "Zoom Scrolling Enabled",
"ru_extras.zoom.scrolling.title": "Zoom Scrolling",
"ru_extras.zoom.scrolling.desc": "Allows using scroll wheel to adjust zoom amount.",
"ru_extras.zoom.transition_mode.title": "Zoom Transition Mode (OFF, LINEAR, SMOOTH)",
"ru_extras.zoom.transition.title": "Zoom Transition Mode",
"ru_extras.zoom.transition.desc": "Controls how the game changes from normal to zoomed. Off will be an instant transition.",
"ru_extras.zoom.keybind_mode.title": "Zoom Transition Mode (TOGGLE, HOLD, PERSISTENT)",
"ru_extras.zoom.keybind.title": "Zoom Keybind Mode",
"ru_extras.zoom.keybind.desc": "Hold - Zoom only while the key is down.\nToggle - Lock zoom until you press the key again\nPersistent - Always zoom, if you want that, for some reason.",
"ru_extras.zoom.cinematic_cam_mode_.title": "Cinematic Camera Mode (OFF, VANILLA, MULTIPLIED)",
"ru_extras.zoom.cinematic_cam_mode.options_title": "Cinematic Camera Options",
"ru_extras.zoom.cinematic_cam_mode.title": "Cinematic Camera Mode",
"ru_extras.zoom.overlay_.title": "Zoom Overlay?",
"ru_extras.zoom.overlay.title": "Zoom Overlay",
"ru_extras.zoom.overlay.desc": "Renders a vignette overlay when zooming.",
"ru_extras.zoom.values.title": "Zoom Advanced Values",

"ru_extras.ture_darkness.option.title": "True Darkness",
"ru_extras.ture_darkness.enable_switch.title": "Use True Darkness",
"ru_extras.ture_darkness.options.title": "True Darkness",
"ru_extras.ture_darkness.options.desc": "Makes the rest of the world more realistically dark. Does not effect daytime or torch light.",
"ru_extras.ture_darkness.mode.title": "True Darkness Mode",
"ru_extras.ture_darkness.mode.desc": "Controls how dark is considered true darkness.",
"ru_extras.ture_darkness.setting.title": "Darkness Setting (PITCH_BLACK, REALLY_DARK, DARK, DIM)",

"ru_extras.advanced.option.title": "Advanced",
"ru_extras.advanced.block_light_only.title": "Only Effect Block Lighting",
"ru_extras.advanced.ignore_moon_light.title": "Ignore Moon Light",
"ru_extras.advanced.max_moon_light.title": "Maximum Moon Brightness (0->1)",
"ru_extras.advanced.mini_moon_light.title": "Minimum Moon Brightness (0->1)",

"ru_extras.dim_setting.option.title": "Dimension Settings",
"ru_extras.dim_setting.dark_overworld.title": "Dark Overworld?",
"ru_extras.dim_setting.dark_default.title": "Dark By Default?",
"ru_extras.dim_setting.dark_nether.title": "Dark Nether?",
"ru_extras.dim_setting.dark_nether_fog_configured.title": "Dark Nether Fog Brightness (0->1)",
"ru_extras.dim_setting.dark_end.title": "Dark End?",
"ru_extras.dim_setting.dark_end_fog_configured.title": "Dark End Fog Brightness (0->1)",
"ru_extras.dim_setting.dark_skylight.title": "Dark If No Skylight?"
"ru_extras.ture_darkness.mode.desc": "Controls how dark is considered true darkness."
}
Loading

0 comments on commit 105ee94

Please sign in to comment.