Mirror von
https://github.com/PaperMC/Velocity.git
synchronisiert 2024-12-24 15:20:35 +01:00
Allow using a '\n' in config. Create a method to generate a random string.
Dieser Commit ist enthalten in:
Ursprung
b201d82a31
Commit
57ccb6eec2
@ -163,7 +163,7 @@ public class AnnotatedConfig {
|
|||||||
if (stringValue.isEmpty()) {
|
if (stringValue.isEmpty()) {
|
||||||
return "\"\"";
|
return "\"\"";
|
||||||
}
|
}
|
||||||
return "\"" + stringValue + "\"";
|
return "\"" + stringValue.replace("\n", "\\n") + "\"";
|
||||||
}
|
}
|
||||||
return value != null ? value.toString() : "null";
|
return value != null ? value.toString() : "null";
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,6 @@ import com.moandjiezana.toml.Toml;
|
|||||||
import com.velocitypowered.api.util.Favicon;
|
import com.velocitypowered.api.util.Favicon;
|
||||||
import com.velocitypowered.proxy.util.AddressUtil;
|
import com.velocitypowered.proxy.util.AddressUtil;
|
||||||
import com.velocitypowered.api.util.LegacyChatColorUtils;
|
import com.velocitypowered.api.util.LegacyChatColorUtils;
|
||||||
import com.velocitypowered.proxy.VelocityServer;
|
|
||||||
import io.netty.buffer.ByteBufUtil;
|
import io.netty.buffer.ByteBufUtil;
|
||||||
import net.kyori.text.Component;
|
import net.kyori.text.Component;
|
||||||
import net.kyori.text.serializer.ComponentSerializers;
|
import net.kyori.text.serializer.ComponentSerializers;
|
||||||
@ -61,8 +60,7 @@ public class VelocityConfiguration extends AnnotatedConfig {
|
|||||||
@StringAsBytes
|
@StringAsBytes
|
||||||
@Comment("If you are using modern IP forwarding, configure an unique secret here.")
|
@Comment("If you are using modern IP forwarding, configure an unique secret here.")
|
||||||
@ConfigKey("forwarding-secret")
|
@ConfigKey("forwarding-secret")
|
||||||
private byte[] forwardingSecret = new Random().ints(48, 123).filter(i -> (i < 58) || (i > 64 && i < 91) || (i > 96)).limit(12)
|
private byte[] forwardingSecret = generateRandomString(12).getBytes(StandardCharsets.UTF_8);
|
||||||
.collect(StringBuilder::new, (sb, i) -> sb.append((char) i), StringBuilder::append).toString().getBytes(StandardCharsets.UTF_8); //One line string generation
|
|
||||||
|
|
||||||
@Table("[servers]")
|
@Table("[servers]")
|
||||||
private final Servers servers;
|
private final Servers servers;
|
||||||
@ -357,6 +355,16 @@ public class VelocityConfiguration extends AnnotatedConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String generateRandomString(int lenght) {
|
||||||
|
String chars = "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz1234567890";
|
||||||
|
StringBuilder builder = new StringBuilder();
|
||||||
|
Random rnd = new Random();
|
||||||
|
for (int i = 0; i < lenght; i++) {
|
||||||
|
builder.append(chars.charAt(rnd.nextInt(chars.length())));
|
||||||
|
}
|
||||||
|
return builder.toString();
|
||||||
|
}
|
||||||
|
|
||||||
private static class Servers {
|
private static class Servers {
|
||||||
|
|
||||||
@IsMap
|
@IsMap
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren