diff --git a/.github/images/bedrock.png b/.github/images/bedrock.png new file mode 100644 index 00000000..2265aa2a Binary files /dev/null and b/.github/images/bedrock.png differ diff --git a/.github/images/multiplayer.png b/.github/images/multiplayer.png new file mode 100644 index 00000000..d682d035 Binary files /dev/null and b/.github/images/multiplayer.png differ diff --git a/.github/images/protocol.png b/.github/images/protocol.png new file mode 100644 index 00000000..9297caa8 Binary files /dev/null and b/.github/images/protocol.png differ diff --git a/.github/images/settings.png b/.github/images/settings.png index ee15b41e..a8c43027 100644 Binary files a/.github/images/settings.png and b/.github/images/settings.png differ diff --git a/LICENSE b/LICENSE index c2e892a0..e72bfdda 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,3 @@ -The GPL v3 License below applies to all files and code parts that are not marked with a special copyright. -For all these specially marked code parts, the license stated there applies. - GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/LICENSE_GENERAL_MIT b/LICENSE_GENERAL_MIT deleted file mode 100644 index 4dac4292..00000000 --- a/LICENSE_GENERAL_MIT +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2023 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/LICENSE_multiconnect b/LICENSE_multiconnect deleted file mode 100644 index 24bc5b64..00000000 --- a/LICENSE_multiconnect +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Joseph Burton (Earthcomputer) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index b27eee6a..3f9ba390 100644 --- a/README.md +++ b/README.md @@ -85,17 +85,33 @@ ViaFabricPlus uses Gradle, to make sure that it is installed properly you can ch 3. Run `./gradlew genSources`. 4. Open the folder as a Gradle project in your preferred IDE. 5. Run the mod. -## Settings -Settings are optional settings that can turn fixes on and off, originally they were used for debugging
+## Settings and GUI +In the multiplayer screen you will find the ViaFabricPlus button in the upper left corner by default, it is the main button,
+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. + +![](/.github/images/multiplayer.png) +![](/.github/images/protocol.png) + +### Settings are optional settings that can turn fixes on and off, originally they were used for debugging
![](/.github/images/settings.png) -# Classic stuff -## Custom protocol extensions +## Bedrock edition +Keep in mind that the Java -> Bedrock support is still in beta phase, and therefore many things are not implemented
+yet and there is no guarantee that everything will work as it should. + +![](/.github/images/bedrock.png) + +To log in to a Bedrock account you can press the button **"Click to set account for Bedrock edition"** in the settings,
+then you can log in via device login, the account logged in there will be stored in **~/ViaFabricPlus/bedrock.account**. + +## Classic stuff +### Custom protocol extensions ViaFabricPlus implements new Classic Extensions into the CPE protocol of ViaLegacy which are rather client side.
- **WeatherType** extension (version **1**) -## Protocol commands +### Protocol commands To better control the Classic Protocol, there are a few clientside commands, the command prefix is **/v**:
- **/vhelp** - Displays all commands, available from: **c0.28-c0.30** - **/vsettime