From 031b1e73fa7ffe0a954d4ee9eeb3287dce84ed52 Mon Sep 17 00:00:00 2001 From: ExMatics HydrogenC <33123710+HydrogenC@users.noreply.github.com> Date: Fri, 3 May 2019 21:47:03 +0800 Subject: [PATCH] Fix for #185 (#186) * Update LoadingConfig.java * Update ModConfig.java * Update VanillaFixLoadingPlugin.java * Update pt_br.lang * Update en_us.lang --- .../java/org/dimdev/vanillafix/LoadingConfig.java | 4 ++-- src/main/java/org/dimdev/vanillafix/ModConfig.java | 14 +++++++------- .../dimdev/vanillafix/VanillaFixLoadingPlugin.java | 2 +- .../resources/assets/vanillafix/lang/en_us.lang | 8 ++++---- .../resources/assets/vanillafix/lang/pt_br.lang | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/dimdev/vanillafix/LoadingConfig.java b/src/main/java/org/dimdev/vanillafix/LoadingConfig.java index 4c27bb8..5ec7d83 100644 --- a/src/main/java/org/dimdev/vanillafix/LoadingConfig.java +++ b/src/main/java/org/dimdev/vanillafix/LoadingConfig.java @@ -10,7 +10,7 @@ public class LoadingConfig { public boolean modSupport = true; public boolean profiler = true; public boolean textureFixes = true; - public boolean blockstates = true; + public boolean blockStates = true; public boolean dynamicResources = true; public boolean improvedLaunchWrapper = true; @@ -25,7 +25,7 @@ public LoadingConfig(File file) { modSupport = config.get("fixes", "modSupport", true).getBoolean(); profiler = config.get("fixes", "profiler", true).getBoolean(); textureFixes = config.get("fixes", "textureFixes", true).getBoolean(); - blockstates = config.get("fixes", "blockstates", true).getBoolean(); + blockStates = config.get("fixes", "blockStates", true).getBoolean(); dynamicResources = config.get("fixes", "dynamicResources", true).getBoolean(); improvedLaunchWrapper = config.get("fixes", "improvedLaunchWrapper", true).getBoolean(); } diff --git a/src/main/java/org/dimdev/vanillafix/ModConfig.java b/src/main/java/org/dimdev/vanillafix/ModConfig.java index 87da29c..fbb1296 100644 --- a/src/main/java/org/dimdev/vanillafix/ModConfig.java +++ b/src/main/java/org/dimdev/vanillafix/ModConfig.java @@ -46,15 +46,15 @@ public static class Fixes { @RequiresMcRestart public boolean textureFixes = true; - @Name("blockstates") - @LangKey("vanillafix.fixes.blockstates") + @Name("blockStates") + @LangKey("vanillafix.fixes.blockStates") @RequiresMcRestart - public boolean blockstates = true; + public boolean blockStates = true; - @Name("dynamicresources") - @LangKey("vanillafix.fixes.dynamicresources") + @Name("dynamicResources") + @LangKey("vanillafix.fixes.dynamicResources") @RequiresMcRestart - public boolean dynamicresources = true; + public boolean dynamicResources = true; } public static class Crashes { @@ -85,4 +85,4 @@ public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event ConfigManager.sync(event.getModID(), Type.INSTANCE); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/dimdev/vanillafix/VanillaFixLoadingPlugin.java b/src/main/java/org/dimdev/vanillafix/VanillaFixLoadingPlugin.java index 9712143..9b095aa 100644 --- a/src/main/java/org/dimdev/vanillafix/VanillaFixLoadingPlugin.java +++ b/src/main/java/org/dimdev/vanillafix/VanillaFixLoadingPlugin.java @@ -201,7 +201,7 @@ private static void initMixin() { if (config.profiler) Mixins.addConfiguration("mixins.vanillafix.profiler.json"); if (config.textureFixes) Mixins.addConfiguration("mixins.vanillafix.textures.json"); if (config.modSupport) Mixins.addConfiguration("mixins.vanillafix.modsupport.json"); - if (config.blockstates) Mixins.addConfiguration("mixins.vanillafix.blockstates.json"); + if (config.blockStates) Mixins.addConfiguration("mixins.vanillafix.blockstates.json"); if (config.dynamicResources) Mixins.addConfiguration("mixins.vanillafix.dynamicresources.json"); } diff --git a/src/main/resources/assets/vanillafix/lang/en_us.lang b/src/main/resources/assets/vanillafix/lang/en_us.lang index 3bf7240..42b49b3 100644 --- a/src/main/resources/assets/vanillafix/lang/en_us.lang +++ b/src/main/resources/assets/vanillafix/lang/en_us.lang @@ -75,10 +75,10 @@ vanillafix.fixes.profiler=Profiler improvements vanillafix.fixes.profiler.tooltip=Enable or disable improvements to the profiler (Alt + F3 pie chart): Split entities and tile entities by mod, add F3 + S for server profiler pie chart vanillafix.fixes.textureFixes=Texture optimizations vanillafix.fixes.textureFixes.tooltip=Enable or disable texture optimizations. This is the feature that increases the game's FPS, so it's not recommended to disable this. -vanillafix.fixes.blockstates=Blockstate optimizations -vanillafix.fixes.blockstates.tooltip=Enable or disable blockstate optimizations. This saves around 10 MB of memory per mod on average, but may cause incompatibilities with other mods. -vanillafix.fixes.dynamicresources=Dynamic resources -vanillafix.fixes.dynamicresources.tooltip=Enable or disable dynamic resources. This feature disables the loading of models, textures and sounds on init, and instead loads them during gameplay, resulting in a memory usage reduction of over 75%. It may cause incompatibility with other mods. +vanillafix.fixes.blockStates=Blockstate optimizations +vanillafix.fixes.blockStates.tooltip=Enable or disable blockstate optimizations. This saves around 10 MB of memory per mod on average, but may cause incompatibilities with other mods. +vanillafix.fixes.dynamicResources=Dynamic resources +vanillafix.fixes.dynamicResources.tooltip=Enable or disable dynamic resources. This feature disables the loading of models, textures and sounds on init, and instead loads them during gameplay, resulting in a memory usage reduction of over 75%. It may cause incompatibility with other mods. vanillafix.debug.switch_profiler.help=F3 + S = Cycle client <-> integrated server profiler vanillafix.debug.switch_profiler.server=Using server profiler diff --git a/src/main/resources/assets/vanillafix/lang/pt_br.lang b/src/main/resources/assets/vanillafix/lang/pt_br.lang index fc8a7d3..f03a3e3 100644 --- a/src/main/resources/assets/vanillafix/lang/pt_br.lang +++ b/src/main/resources/assets/vanillafix/lang/pt_br.lang @@ -75,10 +75,10 @@ vanillafix.fixes.profiler=Melhorias de análise vanillafix.fixes.profiler.tooltip=Ativar ou desativar melhorias para a análise de depuração (Alt + F3): Dividir entidades e tile entities por mod, adicionar a combinação F3 + S para a depuração do servidor. vanillafix.fixes.textureFixes=Otimizar textura vanillafix.fixes.textureFixes.tooltip=Ativar ou desativar otimizações de textura. Esta funcionalidade aumenta a taxa de quadros do jogo, portanto, não é recomendado desativá-lo. -vanillafix.fixes.blockstates=Otimizar estados de blocos -vanillafix.fixes.blockstates.tooltip=Ativar ou desativar otimizações de estados de blocos. Este recurso pode reduzir o consumo de 10 MB de memória por mod, em média. Porém pode provocar problemas de incompatibilidade com outros mods. -vanillafix.fixes.dynamicresources=Recursos dinâmicos -vanillafix.fixes.dynamicresources.tooltip=Ativar ou desativar recursos dinâmicos. Esta funcionalidade desativa o carregamento de modelos, texturas e sons em início; os recursos citados são carregados durante o jogo, e sua memória de uso reduz-se em 75%. Isso pode causar incompatibilidades com outros mods. +vanillafix.fixes.blockStates=Otimizar estados de blocos +vanillafix.fixes.blockStates.tooltip=Ativar ou desativar otimizações de estados de blocos. Este recurso pode reduzir o consumo de 10 MB de memória por mod, em média. Porém pode provocar problemas de incompatibilidade com outros mods. +vanillafix.fixes.dynamicResources=Recursos dinâmicos +vanillafix.fixes.dynamicResources.tooltip=Ativar ou desativar recursos dinâmicos. Esta funcionalidade desativa o carregamento de modelos, texturas e sons em início; os recursos citados são carregados durante o jogo, e sua memória de uso reduz-se em 75%. Isso pode causar incompatibilidades com outros mods. vanillafix.debug.switch_profiler.help=F3 + S = Alternar entre análise do cliente <-> servidor integrado vanillafix.debug.switch_profiler.server=Utilizando análise do servidor