From b222990467d09301da23abb20b9ea6bcfd48219c Mon Sep 17 00:00:00 2001 From: Pugzy Date: Thu, 23 Mar 2023 16:01:49 +0000 Subject: [PATCH] Set player UUID in config of private server request --- .../java/rip/bolt/nerve/privateserver/PrivateCommand.java | 4 ++-- .../bolt/nerve/privateserver/PrivateServerRequester.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/rip/bolt/nerve/privateserver/PrivateCommand.java b/src/main/java/rip/bolt/nerve/privateserver/PrivateCommand.java index f706854..f74fc82 100644 --- a/src/main/java/rip/bolt/nerve/privateserver/PrivateCommand.java +++ b/src/main/java/rip/bolt/nerve/privateserver/PrivateCommand.java @@ -72,7 +72,7 @@ public void execute(CommandContext args, CommandSource sender) { } player.sendMessage(Messages.colour(NamedTextColor.GOLD, "Requesting private server...")); - if (!requester.request(player.getUsername())) + if (!requester.request(player)) player.sendMessage(Messages.colour(NamedTextColor.RED, "An error occured while requesting your private server!")); return; @@ -96,7 +96,7 @@ public void execute(CommandContext args, CommandSource sender) { } sender.sendMessage(Messages.colour(NamedTextColor.GOLD, "Requesting private server for " + target.getUsername() + "...")); - if (!requester.request(target.getUsername())) + if (!requester.request(target)) sender.sendMessage(Messages.colour(NamedTextColor.RED, "An error occured while requesting a private server!")); return; diff --git a/src/main/java/rip/bolt/nerve/privateserver/PrivateServerRequester.java b/src/main/java/rip/bolt/nerve/privateserver/PrivateServerRequester.java index fb2ff36..ee28b95 100644 --- a/src/main/java/rip/bolt/nerve/privateserver/PrivateServerRequester.java +++ b/src/main/java/rip/bolt/nerve/privateserver/PrivateServerRequester.java @@ -49,12 +49,15 @@ private Map generateTemplate() { return null; } - public boolean request(String name) { + public boolean request(Player player) { try { KubernetesClient client = new DefaultKubernetesClient(); CustomResourceDefinitionContext context = new CustomResourceDefinitionContext.Builder().withName("helmcharts.helm.cattle.io").withGroup("helm.cattle.io").withScope("Namespaced").withVersion("v1").withPlural("helmcharts").build(); + String name = player.getUsername(); + String uuid = player.getUniqueId().toString(); + Map template = generateTemplate(); JSONObject helmChartJSONObject = new JSONObject(template); @@ -65,6 +68,7 @@ public boolean request(String name) { metadata.put("name", "private-" + name.toLowerCase().replaceAll("_", "-") + "-server"); setValues.put("config.serverName", name); setValues.put("config.operators", name); + setValues.put("config.operatorsUuids", uuid); client.customResource(context).create("minecraft", helmChartJSONObject.toString()); client.close();