diff --git a/src/pages/utilities/config-editor.tsx b/src/pages/utilities/config-editor.tsx index 4839c81..2ae4dea 100644 --- a/src/pages/utilities/config-editor.tsx +++ b/src/pages/utilities/config-editor.tsx @@ -70,6 +70,26 @@ const ConfigEditorPage: React.FC = () => { // Check if we are in a comment if (line.startsWith('#')) { + if (!line.includes('# ') && line.includes(': ')) { + const splitLine = line.split(':'); + splitLine[0] = splitLine[0].trim(); + splitLine[1] = splitLine[1].trim(); + if (splitLine[0] === '#proxy-protocol-whitelisted-ips') { + currentComment = ''; + return; + } + currentComment += 'Note: This option is commented on, and if you change it, it will be automatically uncommented.' + '
'; + // Add the config option to the config object + newConfig[currentSection] = newConfig[currentSection] || {}; + newConfig[currentSection][splitLine[0]] = { + desc: currentComment, + value: splitLine[1] + }; + + // Reset the comment + currentComment = ''; + return; + } currentComment += line.replace(/^# ?/i, '') + '
'; return; } @@ -118,10 +138,10 @@ const ConfigEditorPage: React.FC = () => { {Object.keys(config[configKey]).map(configOption => { const configOptionInfo = config[configKey][configOption]; const configOptionKey = configKey === '' ? configOption : `${configKey}.${configOption}`; - + const showOptionName = configOption.replace('#','') return (
-

{configOption}

+

{showOptionName}

{getInput(configOptionKey, configOptionInfo.value)}

@@ -143,7 +163,12 @@ const ConfigEditorPage: React.FC = () => { if (currentObj.hasOwnProperty(nestedKey)) { if (index === keys.length - 1) { const oldValue = currentObj[nestedKey].value; - newConfig = newConfig.replace(` ${nestedKey}: ${oldValue}`, ` ${nestedKey}: ${value}`); + if (nestedKey.startsWith('#')) { + const newKey = nestedKey.replace('#',''); + newConfig = newConfig.replace(` ${nestedKey}: ${oldValue}`, ` ${newKey}: ${value}`); + } else { + newConfig = newConfig.replace(` ${nestedKey}: ${oldValue}`, ` ${nestedKey}: ${value}`); + } } else { currentObj = currentObj[nestedKey]; } @@ -202,16 +227,19 @@ const ConfigEditorPage: React.FC = () => { // Boolean return (
- +
); } else if (!isNaN(value)) { // Number - return ; + return ; } else { // String - return ; + return ; } } } diff --git a/src/pages/utilities/utilities.module.scss b/src/pages/utilities/utilities.module.scss index b33b836..b337175 100644 --- a/src/pages/utilities/utilities.module.scss +++ b/src/pages/utilities/utilities.module.scss @@ -141,7 +141,7 @@ } .checkbox { - display: none; + display: inline-block; } .hidden { diff --git a/wiki/floodgate/api.md b/wiki/floodgate/api.md index da320b1..b96b8d1 100644 --- a/wiki/floodgate/api.md +++ b/wiki/floodgate/api.md @@ -26,7 +26,7 @@ Most [API methods have a simple explanation](https://github.com/GeyserMC/Floodga :::note -To see full, detailed documentation, see the [javadocs](https://repo.opencollab.dev/javadoc/maven-snapshots/org/geysermc/floodgate/api/2.2.2-SNAPSHOT). +To see full, detailed documentation, see the [javadocs](https://repo.opencollab.dev/javadoc/maven-snapshots/org/geysermc/floodgate/api/latest). ::: diff --git a/wiki/floodgate/linking.md b/wiki/floodgate/linking.md index b5866ec..20ff222 100644 --- a/wiki/floodgate/linking.md +++ b/wiki/floodgate/linking.md @@ -30,7 +30,7 @@ player-link: enabled: true # Whether to use global linking. Global linking uses a central server to request link # accounts, allowing people to link once, join everywhere (on servers with global linking). - use-global-linking: true + enable-global-linking: true ``` ([see the default config](https://github.com/GeyserMC/Floodgate/blob/master/core/src/main/resources/config.yml)) diff --git a/wiki/geyser/api.md b/wiki/geyser/api.md index b955e8c..18f5e33 100644 --- a/wiki/geyser/api.md +++ b/wiki/geyser/api.md @@ -92,7 +92,7 @@ The network package contains basic information about the remote server via the interface, such as the server's IP address and port, and the protocol version of the remote server. Or the auth type. You can also get the port/IP that Geyser listens to via the [BedrockListener](https://github.com/GeyserMC/Geyser/blob/master/api/src/main/java/org/geysermc/geyser/api/network/BedrockListener.java) interface. -### [Skin](https://github.com/GeyserMC/Geyser/tree/master/api/src/main/java/org/geysermc/geyser/api/skin) {#skin} +#### [Skin](https://github.com/GeyserMC/Geyser/tree/master/api/src/main/java/org/geysermc/geyser/api/skin) {#skin} The skin package contains some records representing skin data. If you want to change the skin of players, you can listen to the [SessionSkinApplyEvent](https://github.com/GeyserMC/Geyser/blob/master/api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionSkinApplyEvent.java), and set a new skin, skin geometry or cape there. #### [Pack](https://github.com/GeyserMC/Geyser/tree/master/api/src/main/java/org/geysermc/geyser/api/pack) {#pack} diff --git a/wiki/geyser/getting-started-with-the-api.md b/wiki/geyser/getting-started-with-the-api.md index b318858..3880636 100644 --- a/wiki/geyser/getting-started-with-the-api.md +++ b/wiki/geyser/getting-started-with-the-api.md @@ -32,7 +32,7 @@ Add Geyser's API codebase as a dependency: org.geysermc.geyser api - 2.4.1-SNAPSHOT + 2.4.2-SNAPSHOT provided ``` @@ -40,7 +40,7 @@ Add Geyser's API codebase as a dependency: **Gradle** ```groovy dependencies { - compileOnly('org.geysermc.geyser:api:2.4.1-SNAPSHOT') + compileOnly('org.geysermc.geyser:api:2.4.2-SNAPSHOT') } ``` diff --git a/wiki/geyser/understanding-the-config.md b/wiki/geyser/understanding-the-config.md index 24ff55b..ee75934 100644 --- a/wiki/geyser/understanding-the-config.md +++ b/wiki/geyser/understanding-the-config.md @@ -22,6 +22,8 @@ The options for Geyser on the Bedrock-facing end. Mostly contains options for ho **`compression-level`**: An number value that represents how much to compress outgoing traffic. Can be any number from -1 to 9; any other value will be replaced with the nearest acceptable value. The higher the number, the more CPU processing that is used but with less bandwidth used. Default is 6. +**`broadcast-port`**: The port to broadcast to Bedrock clients with the MOTD that they should use to connect to the server. DO NOT uncomment and change this unless Geyser runs on a different internal port than the one that is used to connect. + **`enable-proxy-protocol`**: Whether to enable PROXY protocol or not for clients. You DO NOT WANT this feature unless you run UDP reverse proxy in front of your Geyser instance. You do NOT need this for BungeeCord (and forks), Velocity, or Waterfall. **`proxy-protocol-whitelisted-ips`**: Disabled by default, and only enable this if you use "enable-proxy-protocol". A list of allowed PROXY protocol speaking proxy IP addresses/subnets. Should really only be used when you are not able to use a proper firewall (usually true with shared hosting providers etc.). Keeping this list empty means there is no IP address whitelist. IP addresses, subnets, and links to plain text files containing either are supported. @@ -37,6 +39,8 @@ Options for the remote (Java) server. **Please keep in mind, what you specify in the Geyser `auth-type` option MUST be the same as what the remote server has (with the exception of Geyser being in online mode and remote being in offline mode). You simply cannot join an online mode server without a genuine account. If you want to allow Minecraft: Bedrock Edition accounts to join without a Minecraft: Java Edition account, see the [Floodgate](/wiki/floodgate/) wiki page.** +**`allow-password-authentication`**: Allow for password-based authentication methods through Geyser. Only useful in online mode. If this is false, users must authenticate to Microsoft using a code provided by Geyser on their desktop. + **`use-proxy-protocol`**: Whether to enable PROXY/HAProxy protocol or not while connecting to the server. This is useful only when: - Your server supports PROXY protocol (it probably doesn't) - You run Velocity or BungeeCord with its respective option enabled. @@ -68,8 +72,6 @@ saved-user-logins: **`passthrough-motd`**: If the MOTD should be relayed from the remote server. Causes the `motd1` and `motd2` options in the bedrock section to no longer have a use. -**`passthrough-protocol-name`**: Relay the protocol name (e.g. BungeeCord [X.X], Paper 1.X) - this is only really useful when using a custom protocol name! This will also show up on sites like MCSrvStatus. \ - **`passthrough-player-count`**: If the current and max player counts should be relayed from the remote server. **`legacy-ping-passthrough`**: If enabled, manually pings the server by impersonating a Minecraft client instead of using the server's API. **This option should *only* be enabled if your MOTD or player count is not accurate,** as it can cause errors especially on BungeeCord. This option does nothing on Geyser Standalone. diff --git a/wiki/other/geyserconnect.md b/wiki/other/geyserconnect.md index 7b19f46..e448ad5 100644 --- a/wiki/other/geyserconnect.md +++ b/wiki/other/geyserconnect.md @@ -8,7 +8,7 @@ GeyserConnect is a extension for Geyser that allows you to join multiple servers ## Setup {#setup} (For GeyserConnect to work you need an open UDP port, by default it's `19132`). 1. Download the latest Geyser build from the [downloads page](https://geysermc.org/download#standalone) -2. Download the latest build from [Github Actions](https://github.com/GeyserMC/GeyserConnect/actions) +2. Download the latest build from [here](https://geysermc.org/download/?project=other-projects&geyserconnect=expanded) 3. Extract the downloaded ZIP file, and put the extracted JAR file into the `extensions` folder in your GeyserMC standalone installation. 4. Start Geyser standalone as you do with a normal Geyser install. EG: `java -Xms1024M -jar Geyser.jar` (More info on [Creating a Startup Script](/wiki/geyser/creating-a-startup-script/)) 5. Shutdown the standalone Geyser instance, and make you're desired changes to the GeyserConnect configuration in `GeyserConnect` in the `extensions` folder. diff --git a/wiki/other/hydraulic.md b/wiki/other/hydraulic.md index 1e44d15..39ba083 100644 --- a/wiki/other/hydraulic.md +++ b/wiki/other/hydraulic.md @@ -15,6 +15,10 @@ This project is still in very early development and should not be used on produc ::: +## Download {#download} + +You can download Hydraulic [here](https://geysermc.org/download/?project=other-projects&hydraulic=expanded). + ## Contributing {#contributing} Any contributions are appreciated. Please feel free to reach out to us on [Discord](https://discord.gg/geysermc) if @@ -25,4 +29,4 @@ you're interested in helping out with Hydraulic. 1. Clone the repo to your computer. 2. Navigate to the Hydraulic root directory and run `git submodule update --init --recursive`. This command downloads all the needed submodules for Hydraulic and is a crucial step in this process. 3. The project should import into your IDE after the loom setup is complete. For more detailed information, see the [Fabric setup](https://fabricmc.net/wiki/tutorial:setup) -4. Use `./gradlew build` to compile a jar file, or use `./gradlew :fabric:runServer` or `./gradlew :neoforge:runServer` to run a server with Hydraulic installed. Make sure to install Geyser into your `mods` folder! \ No newline at end of file +4. Use `./gradlew build` to compile a jar file, or use `./gradlew :fabric:runServer` or `./gradlew :neoforge:runServer` to run a server with Hydraulic installed. Make sure to install Geyser into your `mods` folder!