Merge branch 'main' into develop
Some checks failed
spigotresourcesync/pipeline/head There was a failure building this commit

This commit is contained in:
2025-07-29 23:44:45 +00:00
6 changed files with 81 additions and 66 deletions

View File

@@ -7,19 +7,10 @@
"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "none",
"version": "21",
"installMaven": "true",
"installGradle": "false"
}
},
"customizations": {
"vscode": {
"extensions": [
"redhat.java",
"redhat.vscode-xml",
"piotrpalarz.vscode-gitignore-generator",
"Gruntfuggly.todo-tree"
]
"installGradle": "false",
"mavenVersion": "3.9.10"
}
}

6
.vscode/extensions.json vendored Normal file
View File

@@ -0,0 +1,6 @@
{
"recommendations": [
"vscjava.vscode-java-pack",
"redhat.vscode-xml"
]
}

0
devserver/loadplugin.sh Normal file → Executable file
View File

122
pom.xml
View File

@@ -6,61 +6,32 @@
<groupId>systems.reslate.entertainment.spigotresourcesync</groupId>
<artifactId>spigotresourcesync</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>org.hive2hive</groupId>
<artifactId>org.hive2hive.core</artifactId>
<version>1.2.4</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.11.0-M2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<artifactSet>
<excludes>
<exclude>org.junit.jupiter:junit-jupiter-engine</exclude>
<exclude>org.apache.maven:lib:tests</exclude>
<exclude>org.spigotmc:spigot-api</exclude>
</excludes>
</artifactSet>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -92,4 +63,51 @@
</plugin>
</plugins>
</build>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.19.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.19.2</version>
</dependency>
<dependency>
<groupId>org.hive2hive</groupId>
<artifactId>org.hive2hive.core</artifactId>
<version>1.2.4</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.11.0-M2</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

View File

@@ -6,4 +6,4 @@ api-version: '1.20'
commands:
spigotresourcesync:
description: Tool suite for synchronisation resources across directories.
usage: See "/spigotresourcesync help" for help.
usage: See "/spigotresourcesync help" for help.

View File

@@ -28,6 +28,6 @@ public class TestConfigManager {
assumeTrue(dummyConfig.exists());
ConfigManager finalConfigManager = new ConfigManager(dummyConfig, dummySerialiser, logger);
finalConfigManager.load();
assertEquals(dummySyncPair, new ArrayList<>(finalConfigManager.getConfiguration().getSyncList().gatherAllSyncPairs()).get(1));
assertEquals(dummySyncPair, finalConfigManager.getConfiguration().getSyncList().gatherAllSyncPairs().getLast());
}
}