Vistas token

.tool-versions

@@ -1 +1 @@
-java openjdk-18.0.2.1
+java adoptopenjdk-8.0.332+9

dev-resources/bungee-test/plugins/.gitignore

@@ -0,0 +1,2 @@
+*.jar
+.jar

dev-resources/vistas-test/vistas/config.yml

@@ -75,7 +75,8 @@
     voicechat-hint-interval: 120,
     voicechat-hint-range: 135,
     redstone-tick-speakers: true,
-    redstone-tick-speakers-interval: 5
+    redstone-tick-speakers-interval: 5,
+    ignore-regions-on-vehicles: false
   },
   papi: {
     client-connected: Connected,

modules/jutils/dependency-reduced-pom.xml

@@ -84,8 +84,8 @@
     </plugins>
   </build>
   <properties>
-    <maven.compiler.target>8</maven.compiler.target>
     <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
   </properties>
 </project>
 

modules/vistas-client/src/main/java/com/craftmend/openaudiomc/vistas/client/client/VistasRedisClient.java

@@ -45,7 +45,8 @@ public VistasRedisClient(Configuration configuration) {
                         spigotAudioCommandEvent.setCanceled(true);
                         sendPacket(new UserExecuteAudioCommandPacket(
                                 spigotAudioCommandEvent.getCommandSender().getName(),
-                                ((Player) spigotAudioCommandEvent.getCommandSender()).getUniqueId()
+                                ((Player) spigotAudioCommandEvent.getCommandSender()).getUniqueId(),
+                                spigotAudioCommandEvent.getArgs()
                         ));
                     }
                 });

modules/vistas-client/src/main/java/com/craftmend/openaudiomc/vistas/client/redis/packets/UserExecuteAudioCommandPacket.java

@@ -14,5 +14,6 @@ public class UserExecuteAudioCommandPacket extends AbstractPacketPayload {
 
     private String playerName;
     private UUID playerUuid;
+    private String[] args = new String[0];
 
 }

modules/vistas-client/src/main/java/com/craftmend/openaudiomc/vistas/client/server/networking/VistasRedisServer.java

@@ -1,6 +1,8 @@
 package com.craftmend.openaudiomc.vistas.client.server.networking;
 
 import com.craftmend.openaudiomc.OpenAudioMc;
+import com.craftmend.openaudiomc.generic.authentication.driver.AuthenticationDriver;
+import com.craftmend.openaudiomc.generic.client.session.ClientAuth;
 import com.craftmend.openaudiomc.generic.commands.CommandService;
 import com.craftmend.openaudiomc.generic.commands.interfaces.SubCommand;
 import com.craftmend.openaudiomc.generic.environment.MagicValue;
@@ -52,8 +54,22 @@ public VistasRedisServer(Configuration configuration) {
         });
 
         packetEvents.registerPacket(UserExecuteAudioCommandPacket.class).setHandler(userExecuteAudioCommandPacket -> {
-            OpenAudioMc.getService(NetworkingService.class).getClient(userExecuteAudioCommandPacket.getPlayerUuid())
-                    .getAuth().publishSessionUrl();
+
+            // does the user have args?
+            ClientAuth authenticationDriver = OpenAudioMc.getService(NetworkingService.class).getClient(userExecuteAudioCommandPacket.getPlayerUuid())
+                    .getAuth();
+
+            if (userExecuteAudioCommandPacket.getArgs().length == 0) {
+                authenticationDriver.publishSessionUrl();
+            } else {
+                User sender = OpenAudioMc.resolveDependency(UserHooks.class).byUuid(userExecuteAudioCommandPacket.getPlayerUuid());
+
+                if (sender == null) {
+                    OpenAudioLogger.toConsole("User " + userExecuteAudioCommandPacket.getPlayerUuid() + " is not online, but tried to execute a command");
+                    return;
+                }
+                authenticationDriver.activateToken(sender, userExecuteAudioCommandPacket.getArgs()[0]);
+            }
         });
 
         packetEvents.registerPacket(UserLeavePacket.class).setHandler(leavePacket -> {

plugin/src/main/bash/data.bin

@@ -1 +1 @@
-BUILD_NUM="911"
+BUILD_NUM="916"

plugin/src/main/java/com/craftmend/openaudiomc/api/impl/event/events/SpigotAudioCommandEvent.java

@@ -17,9 +17,12 @@ public class SpigotAudioCommandEvent extends AudioEvent {
     private boolean canceled = false;
     @Getter
     private CommandSender commandSender;
+    @Getter
+    private String[] args;
 
-    public SpigotAudioCommandEvent(CommandSender commandSender) {
+    public SpigotAudioCommandEvent(CommandSender commandSender, String[] args) {
         this.commandSender = commandSender;
+        this.args = args;
     }
 
 }

plugin/src/main/java/com/craftmend/openaudiomc/generic/backups/BackupService.java

@@ -57,6 +57,14 @@ public void makeBackup(boolean force) {
             );
         } catch (IOException e) {}
 
+        try {
+            Files.copy(
+                    new File(MagicValue.STORAGE_DIRECTORY.get(File.class), "storm.db").toPath(),
+                    new File(backupDir, "storm.db").toPath(),
+                    StandardCopyOption.REPLACE_EXISTING
+            );
+        } catch (IOException e) {}
+
     }
 
 }

plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/command/SpigotAudioCommand.java

@@ -37,11 +37,13 @@ public class SpigotAudioCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
-        SpigotAudioCommandEvent event = AudioApi.getInstance().getEventDriver().fire(new SpigotAudioCommandEvent(commandSender));
+        SpigotAudioCommandEvent event = AudioApi.getInstance().getEventDriver().fire(new SpigotAudioCommandEvent(commandSender, args));
         if (event.isCanceled()) {
             return true;
         }
 
+
+
         User sua = OpenAudioMc.resolveDependency(UserHooks.class).fromCommandSender(commandSender);
 
         if (CommandMiddewareExecutor.shouldBeCanceled(sua, null, commandMiddleware))
@@ -71,7 +73,6 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
         }
 
         if (commandSender instanceof Player) {
-
             // do we have an argument called "token",  "bedrock" or "key"?
             if (args.length == 1) {
                 OpenAudioMc.getService(NetworkingService.class).getClient(sua.getUniqueId()).getAuth().activateToken(

plugin/src/main/resources/data.bin

@@ -1 +1 @@
-BUILD_NUM="911"
+BUILD_NUM="916"

plugin/src/main/resources/openaudiomc-build.properties

@@ -1,3 +1,3 @@
-BUILD_VERSION="911"
-BUILD_COMMIT="e52622900ffb0568a1633abb7970b4e08d829eed"
+BUILD_VERSION="916"
+BUILD_COMMIT="c502190aec61aedb320d2a8726819f3feb3266e3"
 BUILD_AUTHOR="Mats"