Merge branch 'refs/heads/main' into update/1.20.5

# Conflicts:
#	gradle.properties
This commit is contained in:
FlorianMichael 2024-04-26 20:47:43 +02:00
commit ae2c6da14c
5 changed files with 14 additions and 8 deletions

View File

@ -14,14 +14,14 @@ maven_group=de.florianmichael
archives_base_name=ViaFabricPlus
# ViaVersion Libraries
viaversion_version=4.10.0-SNAPSHOT
viabackwards_version=4.10.0-24w09a-SNAPSHOT
vialegacy_version=2.2.22-SNAPSHOT
viaaprilfools_version=2.0.11-SNAPSHOT
vialoader_version=2.2.13-SNAPSHOT
viaversion_version=4.10.0
viabackwards_version=4.10.0
vialegacy_version=2.2.22
viaaprilfools_version=2.0.11
vialoader_version=2.2.13
# RaphiMC Libraries
minecraftauth_version=4.0.0-SNAPSHOT
minecraftauth_version=4.0.0
viabedrock_version=0.0.6-SNAPSHOT
raknet_transport_version=1.0.0.CR3-SNAPSHOT

View File

@ -23,6 +23,7 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import de.florianmichael.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2;
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
import net.minecraft.block.BlockState;
import net.minecraft.block.TrapdoorBlock;
import net.minecraft.entity.*;
@ -182,7 +183,7 @@ public abstract class MixinLivingEntity extends Entity {
@Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;abs(F)F"))
private float alwaysRotateWhenWalkingBackwards(float value) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_11_1)) {
if (VisualSettings.global().sidewaysBackwardsRunning.isEnabled()) {
return 0F;
} else {
return MathHelper.abs(value);

View File

@ -42,7 +42,10 @@ public class VisualSettings extends SettingGroup {
// 1.13 -> 1.12.2
public final VersionedBooleanSetting replacePetrifiedOakSlab = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.replace_petrified_oak_slab"), VersionRange.of(LegacyProtocolVersion.r1_3_1tor1_3_2, ProtocolVersion.v1_12_2));
public final VersionedBooleanSetting changeFontRendererBehaviour = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.change_font_renderer_behaviour"), VersionRange.andOlder(ProtocolVersion.v1_12_2));
// 1.12 -> 1.11.1
public final VersionedBooleanSetting sidewaysBackwardsRunning = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.sideways_backwards_walking"), VersionRange.andOlder(ProtocolVersion.v1_11_1));
// 1.9 -> 1.8.x
public final VersionedBooleanSetting emulateArmorHud = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.emulate_armor_hud"), VersionRange.andOlder(ProtocolVersion.v1_8));
public final VersionedBooleanSetting removeNewerFeaturesFromCommandBlockScreen = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.remove_newer_features_from_command_block_screen"), VersionRange.andOlder(ProtocolVersion.v1_8));

View File

@ -82,6 +82,7 @@
"visual_settings.viafabricplus.enable_sword_blocking": "Schwertblockierung aktivieren",
"visual_settings.viafabricplus.enable_block_hit_animation": "Block-Trefferanimation aktivieren",
"visual_settings.viafabricplus.disable_server_pinging": "Server-Ping deaktivieren",
"visual_settings.viafabricplus.sideways_backwards_walking": "Seitliches rückwärts laufen",
"bedrock.viafabricplus.login": "Dein Browser sollte sich geöffnet haben.\nDas Schließen dieses Bildschirms unterbricht den Vorgang!",
"bedrock.viafabricplus.confirm_transfer_server_prompt": "Möchtest du zu folgendem Server wechseln?\n%s\n\nDadurch wird deine Verbindung zum aktuellen Server getrennt und mit dem neuen Server verbunden.",

View File

@ -82,6 +82,7 @@
"visual_settings.viafabricplus.enable_sword_blocking": "Enable sword animation",
"visual_settings.viafabricplus.enable_block_hit_animation": "Enable block hit animation",
"visual_settings.viafabricplus.disable_server_pinging": "Disable server pinging",
"visual_settings.viafabricplus.sideways_backwards_walking": "Sideways backwards walking",
"bedrock.viafabricplus.login": "Your browser should have opened.\nClosing this screen will cancel the process!",
"bedrock.viafabricplus.confirm_transfer_server_prompt": "Do you want to transfer to the following server?\n%s\n\nThis will disconnect from the current server and connect to the new server.",