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

Commit

Permalink
Fix config
Browse files Browse the repository at this point in the history
  • Loading branch information
@TexBlock
TexBlock committed Jul 22, 2022
1 parent c7fcd3e commit e872da5
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 135 deletions.
4 changes: 0 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
### 这是干什么的？
Magnesium / Rubidium Extras 不支持本地化（硬编码），本Fork修改代码让其支持本地化。翻译问题请到issues反馈。

1.16.5 : [MagnesiumExtras-mc1.16.5_v1.3.2-i18n](https://github.com/ForgeModi18n/MgRb-Extras-i18n/releases/tag/mc1.16-v1.3.2-i18n)

1.18.2 : [RubidiumExtras-mc1.18.2_v1.3.2-i18n](https://github.com/ForgeModi18n/MgRb-Extras-i18n/releases/tag/mc1.18-v1.3.2-i18n)

### 友情链接
原Repo：[TeamDeusVult/MagnesiumExtras](https://github.com/TeamDeusVult/MagnesiumExtras)

Expand Down
Binary file modified build/libs/magnesium_extras-mc1.16.5_v1.3.2-i18n-Hotfix2.jar
View file
Binary file not shown.
92 changes: 46 additions & 46 deletions src/main/java/vice/magnesium_extras/config/MagnesiumExtrasConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import net.minecraftforge.common.ForgeConfigSpec;
import java.nio.file.Path;
import static net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
import net.minecraft.client.resources.I18n;
//import net.minecraft.client.resources.I18n;

public class MagnesiumExtrasConfig
{
Expand Down Expand Up @@ -65,59 +65,59 @@ public class MagnesiumExtrasConfig

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

builder.Block(I18n.get("mg_extra.misc.option.title"), b -> {
cloudHeight = b.define(I18n.get("mg_extra.misc.cloud_height.title"), 196);
fadeInQuality = b.define(I18n.get("mg_extra.misc.chunk_quality.title"), "FANCY");
fog = b.define(I18n.get("mg_extra.misc.render_fog.title"), true);
fullScreenMode = b.defineEnum(I18n.get("mg_extra.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("mg_extra.fps_counter.option.title"), b -> {
fpsCounterMode = b.define(I18n.get("mg_extra.fps_counter.mode.title"), "ADVANCED");
fpsCounterPosition = b.define(I18n.get("mg_extra.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("mg_extra.entity_dis.option.title"), b -> {
enableDistanceChecks = b.define(I18n.get("mg_extra.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("mg_extra.entity_dis.max_TE_render_dis_S.title"), 4096);
maxTileEntityRenderDistanceY = b.define(I18n.get("mg_extra.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("mg_extra.entity_distance.max_entity_render_dis_S.title"), 4096);
maxEntityRenderDistanceY = b.define(I18n.get("mg_extra.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("mg_extra.zoom.option.name"), b -> {
lowerZoomSensitivity = b.define(I18n.get("mg_extra.zoom.lower_sensitivity.title"), true);
zoomScrolling = b.define(I18n.get("mg_extra.zoom.scrolling.title"), true);
zoomTransition = b.define(I18n.get("mg_extra.zoom.transition.title"), ZoomTransitionOptions.SMOOTH.toString());
zoomMode = b.define(I18n.get("mg_extra.zoom.keybind_mode.title"), ZoomModes.HOLD.toString());
cinematicCameraMode = b.define(I18n.get("mg_extra.zoom.cinematic_cam_mode.title"), CinematicCameraOptions.OFF.toString());
zoomOverlay = b.define(I18n.get("mg_extra.zoom.overlay.title"), true);
//zoomValues = b.define(I18n.get("mg_extra.zoom.values.title"), new ZoomValues());
builder.Block("Zoom", b -> {
lowerZoomSensitivity = b.define("Lower Zoom Sensitivity", true);
zoomScrolling = b.define("Zoom Scrolling Enabled", 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("Zoom Advanced Values", new ZoomValues());
});

builder.Block(I18n.get("mg_extra.ture_darkness.option.title"), b -> {
trueDarknessEnabled = b.define(I18n.get("mg_extra.ture_darkness.enable_switch.title"), true);
darknessOption = b.defineEnum(I18n.get("mg_extra.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("mg_extra.advanced.option.title"), b2 -> {
blockLightOnly = b2.define(I18n.get("mg_extra.advanced.block_light_only.title"), false);
ignoreMoonPhase = b2.define(I18n.get("mg_extra.advanced.ignore_moon_light.title"), false);
minimumMoonLevel = b2.defineInRange(I18n.get("mg_extra.advanced.mini_moon_light.title"), 0, 0, 1d);
maximumMoonLevel = b2.defineInRange(I18n.get("mg_extra.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("Minimum Moon Brightness (0->1)", 0, 0, 1d);
maximumMoonLevel = b2.defineInRange("Maximum Moon Brightness (0->1)", 0.25d, 0, 1d);
});

builder.Block(I18n.get("mg_extra.dim_setting.option.title"), b2 -> {
darkOverworld = b2.define(I18n.get("mg_extra.dim_setting.dark_overworld.title"), true);
darkDefault = b2.define(I18n.get("mg_extra.dim_setting.dark_default.title"), false);
darkNether = b2.define(I18n.get("mg_extra.dim_setting.dark_nether.title"), false);
darkNetherFogConfigured = b2.defineInRange(I18n.get("mg_extra.dim_setting.dark_nether_fog_configured.title"), .5, 0, 1d);
darkEnd = b2.define(I18n.get("mg_extra.dim_setting.dark_end.title"), false);
darkEndFogConfigured = b.defineInRange(I18n.get("mg_extra.dim_setting.dark_end_fog_configured.title"), 0, 0, 1d);
darkSkyless = b2.define(I18n.get("mg_extra.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("mg_extra.option.off")),
SIMPLE(I18n.get("mg_extra.option.simple")),
ADVANCED(I18n.get("mg_extra.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("mg_extra.option.off")),
FAST(I18n.get("mg_extra.option.fast")),
FANCY(I18n.get("mg_extra.option.fancy"));
OFF("Off"),
FAST("Fast"),
FANCY("Fancy");

private final String name;

Expand Down
44 changes: 1 addition & 43 deletions src/main/resources/assets/magnesium_extras/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,24 @@
"mg_extra.option.unit.pixels": "Pixels",
"mg_extra.option.unit.blocks": "Blocks",

"mg_extra.misc.option.title": "Misc",

"mg_extra.zoom.option.name": "Zoom",
"mg_extra.extras.options.name": "Extras",
"mg_extra.experimental.options.name": "Experimental",
"mg_extra.display_fps.display.title": "Display FPS",

"mg_extra.dynamic_light.title":"Dynamic Lights Settings",
"mg_extra.misc.cloud_height.title": "Cloud Height [Raw, Default 196]",
"mg_extra.cloud_height.title": "Cloud Height",
"mg_extra.cloud_height.desc": "Raises cloud height.",
"mg_extra.misc.chunk_quality.title": "Chunk Fade In Quality (OFF, FAST, FANCY)",
"mg_extra.misc.chunk_fade_quality.title": "Chunk Fade In Quality",
"mg_extra.misc.chunk_fade_quality.desc": "Controls how fast chunks fade in. No performance hit, Fancy simply takes longer, but looks a bit cooler.",
"mg_extra.misc.render_fog.title": "Render Fog",
"mg_extra.fog.title": "Enable fog",
"mg_extra.fog.desc": "Toggles off all fog in the overworld.",
"mg_extra.misc.full_screen_mode.title": "Use Borderless Fullscreen",
"mg_extra.full_screen_mode.title": "Fullscreen Mode",
"mg_extra.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.",

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

"mg_extra.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.",
"mg_extra.display_fps.position.title": "FPS Display Position",
"mg_extra.display_fps.position.desc": "Offsets the FPS display a few pixels",
"mg_extra.fps_counter.position.title": "FPS Counter Distance",

"mg_extra.entity_dis.option.title": "Entity Distance",
"mg_extra.entity_dis.enable_dis_checks.title": "Enable Max Distance Checks",
"mg_extra.enable_max_entity_distance.title": "Enable Max Entity Distance",
"mg_extra.enable_max_entity_distance.desc": "Toggles off entity culling.",
"mg_extra.max_entity_distance.title": "Max Entity Distance",
Expand All @@ -62,50 +49,21 @@
"mg_extra.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.",
"mg_extra.max_tile_distance.title": "Max Tile Distance",
"mg_extra.max_tile_distance.desc": "Hides block entities beyond this many blocks. Huge performance increase, especially around lots of modded machines.",
"mg_extra.entity_dis.max_TE_render_dis_S.title": "(TileEntity) Max Horizontal Render Distance [Squared, Default 64^2]",
"mg_extra.entity_distance.max_TE_render_dis_Y.title": "(TileEntity) Max Vertical Render Distance [Raw, Default 32]",
"mg_extra.entity_distance.max_entity_render_dis_S.title": "(Entity) Max Horizontal Render Distance [Squared, Default 64^2]",
"mg_extra.entity_distance.max_entity_render_dis_Y.title": "(Entity) Max Vertical Render Distance [Raw, Default 32]",

"mg_extra.zoom.lower_sensitivity.title": "Lower Zoom Sensitivity",
"mg_extra.zoom.lower_sensitivity.desc": "Lowers your sensitivity when zooming to make it feel more consistent.",
"mg_extra.zoom.scrolling_enable.title": "Zoom Scrolling Enabled",
"mg_extra.zoom.scrolling.title": "Zoom Scrolling",
"mg_extra.zoom.scrolling.desc": "Allows using scroll wheel to adjust zoom amount.",
"mg_extra.zoom.transition_mode.title": "Zoom Transition Mode (OFF, LINEAR, SMOOTH)",
"mg_extra.zoom.transition.title": "Zoom Transition Mode",
"mg_extra.zoom.transition.desc": "Controls how the game changes from normal to zoomed. Off will be an instant transition.",
"mg_extra.zoom.keybind_mode.title": "Zoom Transition Mode (TOGGLE, HOLD, PERSISTENT)",
"mg_extra.zoom.keybind.title": "Zoom Keybind Mode",
"mg_extra.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.",
"mg_extra.zoom.cinematic_cam_mode_.title": "Cinematic Camera Mode (OFF, VANILLA, MULTIPLIED)",
"mg_extra.zoom.cinematic_cam_mode.options_title": "Cinematic Camera Options",
"mg_extra.zoom.cinematic_cam_mode.title": "Cinematic Camera Mode",
"mg_extra.zoom.overlay_.title": "Zoom Overlay?",
"mg_extra.zoom.overlay.title": "Zoom Overlay",
"mg_extra.zoom.overlay.desc": "Renders a vignette overlay when zooming.",
"mg_extra.zoom.values.title": "Zoom Advanced Values",

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

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

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

0 comments on commit e872da5

Please sign in to comment.