From c62aa7516c18f3ea0f211be1bcd0d0f56263f97b Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 27 Nov 2023 20:10:00 +0100 Subject: [PATCH] Move setting to correct place --- README.md | 4 ++-- {documentation => docs}/DEVELOPER_API.md | 0 {documentation => docs}/USAGE.md | 14 +++++++------- .../images => docs/preview}/betacraft.png | Bin .../images => docs/preview}/classicube-login.png | Bin .../images => docs/preview}/classicube.png | Bin {documentation/images => docs/preview}/force.png | Bin .../images => docs/preview}/multiplayer.png | Bin .../images => docs/preview}/protocol.png | Bin .../images => docs/preview}/settings.png | Bin gradle/wrapper/gradle-wrapper.properties | 2 +- .../settings/impl/VisualSettings.java | 2 +- 12 files changed, 11 insertions(+), 11 deletions(-) rename {documentation => docs}/DEVELOPER_API.md (100%) rename {documentation => docs}/USAGE.md (91%) rename {documentation/images => docs/preview}/betacraft.png (100%) rename {documentation/images => docs/preview}/classicube-login.png (100%) rename {documentation/images => docs/preview}/classicube.png (100%) rename {documentation/images => docs/preview}/force.png (100%) rename {documentation/images => docs/preview}/multiplayer.png (100%) rename {documentation/images => docs/preview}/protocol.png (100%) rename {documentation/images => docs/preview}/settings.png (100%) diff --git a/README.md b/README.md index b07022c3..d16fe7b5 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ At the time of writing, VFP is the only protocol translation platform for the cl - Bedrock (1.20.0) # For users -### Detailed instructions for use are available [here](documentation/USAGE.md) +### Detailed instructions for use are available [here](docs/USAGE.md) ### If you encounter any issues, please report them on the [issue tracker](https://github.com/ViaVersion/ViaFabricPlus/issues) or on the ViaVersion [Discord](https://discord.gg/viaversion) ## Known incompatibilities @@ -135,7 +135,7 @@ dependencies { ``` -### To learn more about the API and about addons, you can simply click [here](documentation/DEVELOPER_API.md) +### To learn more about the API and about addons, you can simply click [here](docs/DEVELOPER_API.md) ## Disclaimer diff --git a/documentation/DEVELOPER_API.md b/docs/DEVELOPER_API.md similarity index 100% rename from documentation/DEVELOPER_API.md rename to docs/DEVELOPER_API.md diff --git a/documentation/USAGE.md b/docs/USAGE.md similarity index 91% rename from documentation/USAGE.md rename to docs/USAGE.md index 3c64d18f..93180e5a 100644 --- a/documentation/USAGE.md +++ b/docs/USAGE.md @@ -3,13 +3,13 @@ In the multiplayer screen you will find the ViaFabricPlus button in the upper le click on it, and you will see the Protocol selection, there you can choose the Minecraft version you want to connect to, in the upper left corner you can go to the Settings. -![](images/multiplayer.png) -![](images/protocol.png) +![](preview/multiplayer.png) +![](preview/protocol.png) In the Add/Edit Server screen there is a button where you can select a specific version for this server, when you ping or connect to this server, ViaFabricPlus will use the version set there, the versions are stored in the servers.dat too -![](images/force.png) +![](preview/force.png) If you don't want to specify a specific version anymore, you can simply press the button and select **"Cancel and reset"**. @@ -20,7 +20,7 @@ You can use the ViaVersion commands with **/viafabricplus** or **/viaversion**, ### Settings are optional settings that can turn fixes on and off, originally they were used for debugging
-![](images/settings.png) +![](preview/settings.png) ## Bedrock edition Keep in mind that the Java -> Bedrock support is still in beta phase, and therefore many things are not implemented @@ -32,10 +32,10 @@ then you can log in via device login, the account logged in there will be stored ## ClassiCube and BetaCraft integration In the main GUI there is an extra button for ClassiCube and BetaCraft, both buttons send API requests to the respective platforms to get the respective server list. ## BetaCraft -![](images/betacraft.png) +![](preview/betacraft.png) ## ClassiCube -![](images/classicube.png) +![](preview/classicube.png) For ClassiCube you need an account, which you can make on the official website (https://www.classicube.net/), in case ClassiCube requires MultiFactor, an extra GUI will open in ViaFabricPlus. -![](images/classicube-login.png) +![](preview/classicube-login.png) diff --git a/documentation/images/betacraft.png b/docs/preview/betacraft.png similarity index 100% rename from documentation/images/betacraft.png rename to docs/preview/betacraft.png diff --git a/documentation/images/classicube-login.png b/docs/preview/classicube-login.png similarity index 100% rename from documentation/images/classicube-login.png rename to docs/preview/classicube-login.png diff --git a/documentation/images/classicube.png b/docs/preview/classicube.png similarity index 100% rename from documentation/images/classicube.png rename to docs/preview/classicube.png diff --git a/documentation/images/force.png b/docs/preview/force.png similarity index 100% rename from documentation/images/force.png rename to docs/preview/force.png diff --git a/documentation/images/multiplayer.png b/docs/preview/multiplayer.png similarity index 100% rename from documentation/images/multiplayer.png rename to docs/preview/multiplayer.png diff --git a/documentation/images/protocol.png b/docs/preview/protocol.png similarity index 100% rename from documentation/images/protocol.png rename to docs/preview/protocol.png diff --git a/documentation/images/settings.png b/docs/preview/settings.png similarity index 100% rename from documentation/images/settings.png rename to docs/preview/settings.png diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 870dc359..0bfe5adf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -4,4 +4,4 @@ distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dist 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 96ce3b9b..e5508c66 100644 --- a/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java @@ -45,9 +45,9 @@ public class VisualSettings extends SettingGroup { public final VersionedBooleanSetting emulateArmorHud = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.emulate_armor_hud"), VersionRange.andOlder(VersionEnum.r1_8)); public final VersionedBooleanSetting removeNewerFeaturesFromCommandBlockScreen = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.remove_newer_features_from_command_block_screen"), VersionRange.andOlder(VersionEnum.r1_8)); public final VersionedBooleanSetting showSuperSecretSettings = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.show_super_secret_settings"), VersionRange.andOlder(VersionEnum.r1_8)); + public final VersionedBooleanSetting enableSwordBlocking = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.enable_sword_blocking"), VersionRange.andOlder(VersionEnum.r1_8)); // 1.8.x -> 1.7.6 - 1.7.10 - public final VersionedBooleanSetting enableSwordBlocking = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.enable_sword_blocking"), VersionRange.andOlder(VersionEnum.r1_7_6tor1_7_10)); public final VersionedBooleanSetting enableBlockHitAnimation = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.enable_block_hit_animation"), VersionRange.andOlder(VersionEnum.r1_7_6tor1_7_10)); // 1.0.0-1.0.1 -> b1.8-b1.8.1