1
mirror of https://github.com/CarmJos/MineConfiguration.git synced 2026-06-14 00:01:10 +08:00

Compare commits

..

8 Commits

Author SHA1 Message Date
carm 0c1026f37e feat: Updated to 3.1.2 2025-05-14 02:51:03 +08:00
carm 112e34e1b4 feat: Updated to 3.1.2 2025-05-14 02:49:35 +08:00
renovate[bot] ce4ceaef73 chore(deps): update dependency junit:junit to v4.14-20200802.183205-9 2025-05-14 02:48:12 +08:00
renovate[bot] 10ad1c8fcd fix(deps): update dependency net.md-5:bungeecord-api to v1.21-r0.2 2025-04-18 10:56:13 +08:00
dependabot[bot] abdbd88946 chore(deps): bump net.md-5:bungeecord-chat
Bumps [net.md-5:bungeecord-chat](https://github.com/SpigotMC/BungeeCord) from 1.20-R0.2-deprecated+build.19 to 1.21-R0.2.
- [Commits](https://github.com/SpigotMC/BungeeCord/commits)

---
updated-dependencies:
- dependency-name: net.md-5:bungeecord-chat
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-18 10:56:06 +08:00
dependabot[bot] 517b661a13 chore(deps): bump com.github.cryptomorin:XSeries from 13.1.0 to 13.2.0
Bumps [com.github.cryptomorin:XSeries](https://github.com/CryptoMorin/XSeries) from 13.1.0 to 13.2.0.
- [Release notes](https://github.com/CryptoMorin/XSeries/releases)
- [Commits](https://github.com/CryptoMorin/XSeries/compare/v13.1.0...v13.2.0)

---
updated-dependencies:
- dependency-name: com.github.cryptomorin:XSeries
  dependency-version: 13.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-18 10:55:50 +08:00
dependabot[bot] 4ddd2a3454 chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.2...surefire-3.5.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-version: 3.5.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-18 10:55:45 +08:00
carm 50f7eb31bb chore: Remove "resourcesPath" by default. 2025-03-29 03:09:36 +08:00
8 changed files with 24 additions and 16 deletions
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>3.1.1</version>
<version>3.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
@@ -60,7 +60,7 @@
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-chat</artifactId>
<version>1.20-R0.2-deprecated+build.19</version>
<version>1.21-R0.2</version>
<scope>provided</scope>
</dependency>
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>3.1.1</version>
<version>3.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>13.1.0</version>
<version>13.2.0</version>
<scope>compile</scope>
</dependency>
@@ -8,17 +8,25 @@ import cc.carm.lib.mineconfiguration.common.AbstractConfiguration;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
public class MineConfiguration extends AbstractConfiguration<ConfigurationHolder<BukkitSource>> {
public static ConfigurationHolder<BukkitSource> from(File file, String source) {
public static ConfigurationHolder<BukkitSource> from(@NotNull File file,
@Nullable String source) {
return BukkitConfigFactory.from(file).resourcePath(source).build();
}
public static ConfigurationHolder<BukkitSource> from(Plugin plugin, String fileName) {
return from(new File(plugin.getDataFolder(), fileName), fileName);
public static ConfigurationHolder<BukkitSource> from(@NotNull Plugin plugin,
@NotNull String fileName) {
return from(plugin, fileName, null);
}
public static ConfigurationHolder<BukkitSource> from(@NotNull Plugin plugin,
@NotNull String fileName, @Nullable String resource) {
return from(new File(plugin.getDataFolder(), fileName), resource);
}
public MineConfiguration(@NotNull JavaPlugin plugin) {
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>3.1.1</version>
<version>3.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -41,7 +41,7 @@
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.20-R0.2</version>
<version>1.21-R0.2</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
@@ -30,8 +30,8 @@ public class MineConfiguration extends AbstractConfiguration<ConfigurationHolder
public MineConfiguration(@NotNull File pluginDataFolder) {
super(
YAMLConfigFactory.from(pluginDataFolder, "config.yml").resourcePath("config.yml").build(),
YAMLConfigFactory.from(pluginDataFolder, "messages.yml").resourcePath("messages.yml").build()
YAMLConfigFactory.from(pluginDataFolder, "config.yml").build(),
YAMLConfigFactory.from(pluginDataFolder, "messages.yml").build()
);
}
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>3.1.1</version>
<version>3.1.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -13,8 +13,8 @@ public class MineConfiguration extends AbstractConfiguration<ConfigurationHolder
public MineConfiguration(@NotNull File pluginDataFolder) {
super(
YAMLConfigFactory.from(pluginDataFolder, "config.yml").resourcePath("config.yml").build(),
YAMLConfigFactory.from(pluginDataFolder, "messages.yml").resourcePath("messages.yml").build()
YAMLConfigFactory.from(pluginDataFolder, "config.yml").build(),
YAMLConfigFactory.from(pluginDataFolder, "messages.yml").build()
);
}
+2 -2
View File
@@ -17,7 +17,7 @@
<groupId>cc.carm.lib</groupId>
<artifactId>mineconfiguration-parent</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
<packaging>pom</packaging>
<modules>
<module>common</module>
@@ -128,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>