From a7aa0638d1697ce5f31e40f42fc414cc32337a70 Mon Sep 17 00:00:00 2001 From: Olivia Date: Fri, 9 Apr 2021 23:34:29 -0500 Subject: [PATCH] Update grammar, links, deprecations, etc in various text files (#2000) --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 +++--- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yml | 4 ++-- CONTRIBUTING.md | 8 ++++---- README.md | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index ca83c83f8..f4a0e21ff 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,5 +1,5 @@ name: Bug report -about: Create a report to help us improve +description: Create a report to help us improve body: - type: markdown attributes: @@ -41,11 +41,11 @@ body: If you're running a multi-server instance or using Geyser Standalone: * Give us the exact output from `/version` on all servers involved. Saying "latest" does not help us at all. * Please list all plugins on all servers involved. - If this bug occurs on a server you do not control, please full this in to the best of your knowledge. + If this bug occurs on a server you do not control, please fill this in to the best of your knowledge. - type: input attributes: label: Geyser Dump - description: If Geyser starts correctly, please also include the link to a dump by using `/geyser dump`. If you're using the Standalone GUI, the option can be found under `Commands` => `Dump`. This provides us information about your server that we can use to debug your issue. + description: If Geyser starts correctly, please include the link to a dump using `/geyser dump`. If you're using the Standalone GUI, you can find the option under `Commands` => `Dump`. Doing this provides us information about your server that we can use to debug your issue. - type: input attributes: label: Geyser Version diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index a8a5bf95d..862e9c0be 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -5,7 +5,7 @@ contact_links: about: Check the common issues to see if you are not alone with that issue and see how you can fix them. - name: Frequently Asked Questions url: https://github.com/GeyserMC/Geyser/wiki/FAQ - about: Look at the FAQ page for answers for frequently asked questions. + about: Look at the FAQ page for answers to frequently asked questions. - name: Get help on the GeyserMC Discord server url: https://discord.gg/geysermc about: If your issue seems like it could possibly be an easy fix due to configuration, please hop on our Discord. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 64ad937a5..d0e42478b 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,11 +1,11 @@ name: Feature request -about: Suggest an idea for this project +description: Suggest an idea for this project labels: "Feature Request" body: - type: markdown attributes: value: | - Thanks for taking the time to fill out this feature request for Geyser! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added. + Thanks for taking the time to fill out this feature request for Geyser! Please fill out the following form to your best ability to help us understand your feature request and significantly improve the chance of getting added. For anything else than a feature request, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://github.com/GeyserMC/Geyser/wiki/FAQ) or [the Common Issues](https://github.com/GeyserMC/Geyser/wiki/Common-Issues). - type: textarea attributes: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 527471bae..ce6894845 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,11 @@ -Thank for for considering a contribution! Generally, Geyser welcomes PRs from everyone. There are some guidelines about what features should go where: +Thank you for considering a contribution! Generally, Geyser welcomes PRs from everyone. There are some guidelines about what features should go where: -*Pull requests that may not get accepted:* Niche features that apply to a specific group, for example integration with a specific plugin. For now, please create a separate plugin if possible. +*Pull requests that may not get accepted:* Niche features that apply to a specific group, for example, integration with a specific plugin. For now, please create a separate plugin if possible. *Pull requests for Floodgate:* Anything that opens up information within the game for developers to use. -*Pull requests for Geyser:* Anything that fixes compatibility between Java or Bedrock, or improves the quality of play for Bedrock players. The exception is wherever direct server access is required; in this case it may be better for Floodgate. +*Pull requests for Geyser:* Anything that fixes compatibility between Java or Bedrock or improves the quality of play for Bedrock players. The exception is wherever direct server access is required; in this case, it may be better for Floodgate. We have some general style guides that should be applied throughout the code: @@ -48,4 +48,4 @@ Make sure to comment your code where possible. The nature of our software requires a lot of arrays and maps to be stored - where possible, use Fastutil's specialized maps. For example, if you're storing block state translations, use an `Int2IntMap`. -We have a rundown of all the tools you need to develop over on our [wiki](https://github.com/GeyserMC/Geyser/wiki/Developer-Guide). If you have any questions, please feel free to reach out to our [Discord](https://discord.geysermc.org)! +We have a rundown of all the tools you need to develop over on our [wiki](https://github.com/GeyserMC/Geyser/wiki/Developer-Guide). If you have any questions, please feel free to reach out to our [Discord](https://discord.gg/geysermc)! diff --git a/README.md b/README.md index 4a522f21f..bc267f06f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ Geyser -[![forthebadge made-with-java](http://ForTheBadge.com/images/badges/made-with-java.svg)](https://java.com/) +[![forthebadge made-with-java](https://ForTheBadge.com/images/badges/made-with-java.svg)](https://java.com/) [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![Build Status](https://ci.opencollab.dev/job/Geyser/job/master/badge/icon)](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/) -[![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](http://discord.geysermc.org/) +[![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](https://discord.gg/geysermc/) [![HitCount](http://hits.dwyl.com/Geyser/GeyserMC.svg)](http://hits.dwyl.com/Geyser/GeyserMC) [![Crowdin](https://badges.crowdin.net/geyser/localized.svg)](https://translate.geysermc.org/) @@ -16,7 +16,7 @@ Geyser is an open collaboration project by [CubeCraft Games](https://cubecraft.n Geyser is a proxy, bridging the gap between Minecraft: Bedrock Edition and Minecraft: Java Edition servers. The ultimate goal of this project is to allow Minecraft: Bedrock Edition users to join Minecraft: Java Edition servers as seamlessly as possible. **Please note, this project is still a work in progress and should not be used on production. Expect bugs!** -Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have now joined us here! +Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here! ### Currently supporting Minecraft Bedrock v1.16.100 - v1.16.220 and Minecraft Java v1.16.4 - v1.16.5. @@ -28,8 +28,8 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set ## Links: - Website: https://geysermc.org - Docs: https://github.com/GeyserMC/Geyser/wiki -- Download: http://ci.geysermc.org -- Discord: http://discord.geysermc.org/ +- Download: https://ci.geysermc.org +- Discord: https://discord.gg/geysermc - ~~Donate: https://patreon.com/GeyserMC~~ Currently disabled. - Test Server: `test.geysermc.org` port `25565` for Java and `19132` for Bedrock @@ -40,7 +40,7 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set - Structure block UI ## What can't be fixed -The following things can't be fixed because of Bedrock limitations. They might be fixable in the future, but not as of now. +The following things cannot be fixed without changes to Bedrock. As of now, they are not fixable in Geyser. - Custom heads in inventories - Clickable links in chat @@ -50,7 +50,7 @@ The following things can't be fixed because of Bedrock limitations. They might b ## Compiling 1. Clone the repo to your computer 2. [Install Maven](https://maven.apache.org/install.html) -3. Navigate to the Geyser root directory and run `git submodule update --init --recursive`. This downloads all the needed submodules for Geyser and is a crucial step in this process. +3. Navigate to the Geyser root directory and run `git submodule update --init --recursive`. This command downloads all the needed submodules for Geyser and is a crucial step in this process. 4. Run `mvn clean install` and locate to the `target` folder. ## Contributing