From ca0e52e9b1fc810a2d62635b20cdd727501ae242 Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Sun, 8 Dec 2024 21:17:54 +0100 Subject: [PATCH] Rename villager setting, german translations --- .../entity/MixinVillagerClothingFeatureRenderer.java | 4 +--- .../viafabricplus/settings/impl/VisualSettings.java | 5 +---- src/main/resources/assets/viafabricplus/lang/de_de.json | 3 +++ src/main/resources/assets/viafabricplus/lang/en_us.json | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java index 1d02b297..ac9636f0 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java @@ -19,8 +19,6 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import net.minecraft.client.render.entity.feature.VillagerClothingFeatureRenderer; import net.minecraft.village.VillagerData; @@ -34,7 +32,7 @@ public abstract class MixinVillagerClothingFeatureRenderer { @Redirect(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/LivingEntityRenderState;FF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/village/VillagerData;getProfession()Lnet/minecraft/village/VillagerProfession;")) private VillagerProfession revertVillagerVisual(VillagerData instance) { - if (VisualSettings.global().revertVillagerSkins.getValue()) { + if (VisualSettings.global().hideVillagerProfession.getValue()) { return VillagerProfession.NONE; } else { return instance.getProfession(); diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java index 6794e216..6dcf9f18 100644 --- a/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java @@ -52,12 +52,9 @@ public class VisualSettings extends SettingGroup { } }; public final BooleanSetting hideModernJigsawScreenFeatures = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.hide_modern_jigsaw_screen_features"), true); - public final BooleanSetting removeBubblePopSound = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.remove_bubble_pop_sound"), false); - public final BooleanSetting hideEmptyBubbleIcons = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.hide_empty_bubble_icons"), false); - - public final BooleanSetting revertVillagerSkins = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.revert_villager_skins"), false); + public final BooleanSetting hideVillagerProfession = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.hide_villager_profession"), false); // 1.21 -> 1.20.5 public final VersionedBooleanSetting hideDownloadTerrainScreenTransitionEffects = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.hide_download_terrain_screen_transition_effects"), VersionRange.andOlder(ProtocolVersion.v1_20_5)); diff --git a/src/main/resources/assets/viafabricplus/lang/de_de.json b/src/main/resources/assets/viafabricplus/lang/de_de.json index 6c00a157..6b376336 100644 --- a/src/main/resources/assets/viafabricplus/lang/de_de.json +++ b/src/main/resources/assets/viafabricplus/lang/de_de.json @@ -86,6 +86,9 @@ "visual_settings.viafabricplus.change_game_menu_screen_layout": "Bildschirmlayout des Spielmenüs ändern", "visual_settings.viafabricplus.disable_secure_chat_warning": "Warnung für sicheren Chat deaktivieren", "visual_settings.viafabricplus.hide_signature_indicator": "Signaturanzeige ausblenden", + "visual_settings.viafabricplus.remove_bubble_pop_sound": "Wasserblasen-Pop-Sound entfernen", + "visual_settings.viafabricplus.hide_empty_bubble_icons": "Leere Wasserblasensymbole ausblenden", + "visual_settings.viafabricplus.hide_villager_profession": "Dorfbewohner-Beruf verstecken", "visual_settings.viafabricplus.hide_download_terrain_screen_transition_effects": "Übergangseffekte des Download-Geländebildschirms ausblenden", "visual_settings.viafabricplus.replace_petrified_oak_slab": "Versteinerte Eichenplattentextur durch die 'unbekannte' Textur ersetzen", "visual_settings.viafabricplus.always_render_crosshair": "Fadenkreuz immer anzeigen", diff --git a/src/main/resources/assets/viafabricplus/lang/en_us.json b/src/main/resources/assets/viafabricplus/lang/en_us.json index 6615ded8..110f862d 100644 --- a/src/main/resources/assets/viafabricplus/lang/en_us.json +++ b/src/main/resources/assets/viafabricplus/lang/en_us.json @@ -88,7 +88,7 @@ "visual_settings.viafabricplus.hide_signature_indicator": "Hide signature indicator", "visual_settings.viafabricplus.remove_bubble_pop_sound": "Remove bubble pop sound", "visual_settings.viafabricplus.hide_empty_bubble_icons": "Hide empty bubble icons", - "visual_settings.viafabricplus.revert_villager_skins": "Revert villager skins", + "visual_settings.viafabricplus.hide_villager_profession": "Hide villager profession", "visual_settings.viafabricplus.hide_download_terrain_screen_transition_effects": "Hide download terrain screen transition effects", "visual_settings.viafabricplus.replace_petrified_oak_slab": "Replace petrified oak slab texture with the 'unknown' texture", "visual_settings.viafabricplus.always_render_crosshair": "Always render crosshair",