1
mirror of https://github.com/CarmJos/MineSQL.git synced 2026-06-13 21:01:08 +08:00

Compare commits

...

67 Commits

Author SHA1 Message Date
renovate[bot] 645402bd67 fix(deps): update dependency org.mariadb.jdbc:mariadb-java-client to v3.5.8 2026-05-04 01:11:49 +00:00
renovate[bot] d67984f5a1 fix(deps): update dependency com.github.chris2018998:beecp to v5.2.1 2026-02-21 00:57:27 +08:00
renovate[bot] d3d92415c8 chore(deps): update actions/checkout action to v6 2026-02-21 00:57:20 +08:00
renovate[bot] 657fbb200e chore(deps): update actions/upload-artifact action to v6 2026-02-21 00:57:13 +08:00
renovate[bot] 3d72f3c82b fix(deps): update dependency com.mysql:mysql-connector-j to v9.6.0 (#63)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-15 17:59:42 +00:00
renovate[bot] 912462c5b7 chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.15.0 (#62)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-15 13:07:03 +00:00
renovate[bot] ead4ec2c3f fix(deps): update dependency org.spigotmc:spigot-api to v1.19-r0.1-20220725.090125-47 (#59)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-05 02:00:57 +00:00
renovate[bot] 3e7aa791a1 fix(deps): update dependency com.mysql:mysql-connector-j to v9.5.0 (#58)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-04 23:48:41 +00:00
renovate[bot] 92ed6f7a78 chore(deps): update dependency org.apache.maven.plugins:maven-source-plugin to v3.4.0 (#56)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-12-29 14:18:01 +00:00
renovate[bot] d885ecd086 chore(deps): update dependency org.apache.maven.plugins:maven-resources-plugin to v3.4.0 (#55)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-12-29 08:59:52 +00:00
renovate[bot] f9abf54c55 chore(deps): update dependency org.apache.maven.plugins:maven-release-plugin to v3.3.1 (#54)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-12-29 05:37:41 +00:00
renovate[bot] a4be406e3e chore(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.5.0 (#53)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-12-29 01:42:03 +00:00
renovate[bot] f5715ccddb fix(deps): update dependency org.mariadb.jdbc:mariadb-java-client to v3.5.7 (#52)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-12-28 22:01:42 +00:00
renovate[bot] fe602fc7eb chore(deps): update dependency org.apache.maven.plugins:maven-clean-plugin to v3 2025-10-23 10:37:54 +08:00
renovate[bot] f2b3c9853b chore(deps): update dependency org.apache.maven.plugins:maven-release-plugin to v3 2025-10-23 10:37:49 +08:00
renovate[bot] 1c9685b317 chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3 2025-10-23 10:37:43 +08:00
renovate[bot] 9dcaba0d2b fix(deps): update dependency com.google.guava:guava to v33 2025-10-23 10:37:37 +08:00
renovate[bot] 1942fa74f6 fix(deps): update dependency com.mysql:mysql-connector-j to v9 2025-10-23 10:37:32 +08:00
renovate[bot] 2a21ef4fdd fix(deps): update dependency org.jetbrains:annotations to v26 2025-10-23 10:37:25 +08:00
renovate[bot] 992d4dcfb9 chore(deps): update actions/checkout action to v5 2025-10-23 10:37:20 +08:00
renovate[bot] 05458aca87 chore(deps): update actions/setup-java action to v5 2025-10-23 10:37:14 +08:00
renovate[bot] d35b1bba97 fix(deps): update dependency com.github.chris2018998:beecp to v5 2025-10-23 10:37:07 +08:00
renovate[bot] c9a91f81b1 chore(deps): update github/codeql-action action to v4 2025-10-23 10:37:01 +08:00
renovate[bot] 48df780b7d fix(deps): update deps.bstats.version to v3.1.0 (#32)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-05 21:51:50 +00:00
renovate[bot] e209fcc2ae fix(deps): update dependency com.h2database:h2 to v2.4.240 (#41)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-05 17:55:12 +00:00
renovate[bot] 258c4924b4 fix(deps): update dependency cc.carm.lib:configured-yaml to v4.2.0 (#47)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-05 12:30:20 +00:00
renovate[bot] 736e65ae31 chore(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.12.0 (#46)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-05 09:41:53 +00:00
renovate[bot] 9dcd61fd04 fix(deps): update dependency org.mariadb.jdbc:mariadb-java-client to v3.5.6 (#45)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-05 04:29:02 +00:00
renovate[bot] 4449a879b8 fix(deps): update dependency io.github.waterfallmc:waterfall-api to v1.21-r0.5-snapshot (#44)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-05 01:26:50 +00:00
renovate[bot] ce0f694004 chore(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.1 (#43)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-04 21:16:37 +00:00
renovate[bot] 6c9231bd45 chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.1 (#42)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-04 17:36:35 +00:00
renovate[bot] 4834d79c96 fix(deps): update deps.easyplugin.version to v1.5.14 (#40)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-04 12:29:43 +00:00
renovate[bot] e17f9ddce0 chore(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.8 (#31)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-04 09:08:45 +00:00
renovate[bot] e6521b9791 chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.1 (#30)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-04 06:02:10 +00:00
carm 26124a1b5e ci: Update renovate.json [skipci] 2025-09-12 08:25:38 +08:00
renovate[bot] db5ea87b13 fix(deps): update dependency io.github.waterfallmc:waterfall-api to v1.21-r0.3-snapshot 2025-06-04 13:04:46 +08:00
renovate[bot] b67ef84b82 fix(deps): update dependency com.github.chris2018998:beecp to v4.2.0 2025-06-04 13:04:37 +08:00
renovate[bot] af9c6a42f2 fix(deps): update dependency com.google.guava:guava to v32.1.3-jre 2025-06-04 13:04:32 +08:00
renovate[bot] 385eaa5d27 fix(deps): update dependency org.jetbrains:annotations to v24.1.0 2025-06-04 13:04:23 +08:00
renovate[bot] 87c3d520f4 fix(deps): update dependency org.mariadb.jdbc:mariadb-java-client to v3.5.3 2025-06-04 13:04:17 +08:00
renovate[bot] 0b9403631b fix(deps): update dependency io.github.waterfallmc:waterfall-api to v1.21-r0.2-snapshot 2025-06-02 15:05:16 +08:00
renovate[bot] a7c70aba80 chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.0 2025-04-23 01:28:43 +08:00
carm e877792fbf chore(deps): 适配上游更新。 2025-04-23 00:52:00 +08:00
renovate[bot] 628de160a6 chore(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.7 2025-02-08 16:47:48 +08:00
renovate[bot] b55cce9310 chore(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.2 2025-02-08 16:47:27 +08:00
renovate[bot] 5ce1bf149a chore(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.11.2 2025-02-08 16:47:23 +08:00
renovate[bot] 35ae98b3af chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.0 2025-02-08 16:47:04 +08:00
renovate[bot] 9963348467 chore(deps): update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 2025-02-08 16:46:43 +08:00
renovate[bot] ca6e6e4944 fix(deps): update dependency cc.carm.lib:easyconfiguration-yaml to v3.9.1 2025-02-08 16:46:37 +08:00
renovate[bot] d871644322 chore(deps): update dependency org.apache.maven.plugins:maven-clean-plugin to v2.6.1 2025-02-07 02:29:25 +08:00
renovate[bot] bb7906fd8d chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 2025-02-07 02:29:15 +08:00
renovate[bot] c2c5e0656d chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v2.22.2 2025-02-07 01:49:27 +08:00
renovate[bot] e6bbe36cb1 fix(deps): update deps.easyplugin.version to v1.5.12 2025-02-07 01:49:08 +08:00
carm b49c46ffe8 ci(upload): Update actions 2025-02-07 01:13:16 +08:00
renovate[bot] 06f7a2607b Add renovate.json 2025-02-06 16:36:26 +08:00
carm 66396c0c27 chore(info): Remove info for velocity version 2025-01-26 10:40:48 +08:00
carm e3ef67e342 refactor(lib): Removed libby and simple shaded all libraries. 2025-01-26 10:37:42 +08:00
carm 9ba9b1f5d1 revert(vc): Revert load orders due to unable to load libraries. 2025-01-26 08:46:26 +08:00
carm 31aa49a60b feat(cp): Update to newest beecp 2025-01-26 08:37:05 +08:00
carm 1e2b18026a feat: Make velocity api usable when initialize 2025-01-26 08:24:01 +08:00
carm 1013501fda chore(deps): Change "bungee" to "waterfall" 2025-01-26 08:22:48 +08:00
carm 3e30a83484 chore: 令 Velocity 版本的初始化提前。 2025-01-26 08:21:47 +08:00
carm 83936ee53e chore: 令 Velocity 版本的初始化提前。 2025-01-26 08:19:08 +08:00
dependabot[bot] 7a1216e624 build(deps): bump com.mysql:mysql-connector-j from 8.0.31 to 8.2.0 (#7)
Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.0.31 to 8.2.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.31...8.2.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-01 02:19:57 +08:00
dependabot[bot] 24530e1f50 build(deps): bump h2 from 2.1.214 to 2.2.220 (#6)
Bumps [h2](https://github.com/h2database/h2database) from 2.1.214 to 2.2.220.
- [Release notes](https://github.com/h2database/h2database/releases)
- [Commits](https://github.com/h2database/h2database/compare/version-2.1.214...version-2.2.220)

---
updated-dependencies:
- dependency-name: com.h2database:h2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-07-08 12:33:30 +08:00
dependabot[bot] a22d9bd797 build(deps): bump guava from 31.0.1-jre to 32.0.0-jre (#5)
Bumps [guava](https://github.com/google/guava) from 31.0.1-jre to 32.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-16 16:16:56 +08:00
carm 62a8bc4629 fix(init): 修复SQL配置的Initializer未被调用的问题。 2023-04-17 00:49:46 +08:00
25 changed files with 195 additions and 534 deletions
+4 -4
View File
@@ -38,11 +38,11 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v6
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v1 uses: github/codeql-action/init@v4
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file. # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below) # If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@v1 uses: github/codeql-action/autobuild@v4
# ️ Command-line programs to run using the OS shell. # ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
# make release # make release
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1 uses: github/codeql-action/analyze@v4
+6 -6
View File
@@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v6
- name: "Set up JDK" - name: "Set up JDK"
uses: actions/setup-java@v2 uses: actions/setup-java@v5
with: with:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
@@ -47,9 +47,9 @@ jobs:
name: "Deploy Project (GitHub Repo)" name: "Deploy Project (GitHub Repo)"
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v6
- name: "Set up JDK" - name: "Set up JDK"
uses: actions/setup-java@v2 uses: actions/setup-java@v5
with: with:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
@@ -122,9 +122,9 @@ jobs:
name: "Deploy Project (Central)" name: "Deploy Project (Central)"
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v6
- name: "Set up JDK" - name: "Set up JDK"
uses: actions/setup-java@v2 uses: actions/setup-java@v5
with: with:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
+9 -5
View File
@@ -19,9 +19,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v6
- name: "Set up JDK" - name: "Set up JDK"
uses: actions/setup-java@v2 uses: actions/setup-java@v5
with: with:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
@@ -29,13 +29,17 @@ jobs:
run: mvn -B package --file pom.xml -Dgpg.skip run: mvn -B package --file pom.xml -Dgpg.skip
- name: "Upload artifacts" - name: "Upload artifacts"
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v6
with: with:
name: artifacts name: artifacts
path: "**/target/" path: "**/target/"
retention-days: 5
include-hidden-files: true
- name: "Upload assets" - name: "Upload assets"
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v6
with: with:
name: assets name: assets
path: ".asset/" path: ".asset/"
retention-days: 5
include-hidden-files: true
+2 -2
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>minesql-parent</artifactId> <artifactId>minesql-parent</artifactId>
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<version>1.4.0</version> <version>1.4.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -81,7 +81,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version> <version>3.12.0</version>
<configuration> <configuration>
<classifier>javadoc</classifier> <classifier>javadoc</classifier>
<detectJavaApiLink>false</detectJavaApiLink> <detectJavaApiLink>false</detectJavaApiLink>
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.Nullable;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.io.File; import java.io.File;
import java.sql.SQLException;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.UUID; import java.util.UUID;
@@ -6,6 +6,7 @@ import cc.carm.plugin.minesql.api.SQLRegistry;
import cc.carm.plugin.minesql.api.source.SQLSourceConfig; import cc.carm.plugin.minesql.api.source.SQLSourceConfig;
import cc.carm.plugin.minesql.api.table.SQLTablesRoot; import cc.carm.plugin.minesql.api.table.SQLTablesRoot;
import cc.carm.plugin.minesql.api.table.SimpleSQLTable; import cc.carm.plugin.minesql.api.table.SimpleSQLTable;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -19,9 +20,15 @@ import java.util.logging.Logger;
public class MineSQL { public class MineSQL {
private MineSQL() {
throw new UnsupportedOperationException("API Instance");
}
private static IMineSQL instance; private static IMineSQL instance;
protected static void initializeAPI(IMineSQL api) { @ApiStatus.Internal
@SuppressWarnings("ClassEscapesDefinedScope")
protected static void initializeAPI(@NotNull IMineSQL api) {
MineSQL.instance = api; MineSQL.instance = api;
} }
+62 -10
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>minesql-parent</artifactId> <artifactId>minesql-parent</artifactId>
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<version>1.4.0</version> <version>1.4.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -68,17 +68,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>net.byteflux</groupId>
<artifactId>libby-core</artifactId>
<version>${deps.libby.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>com.github.chris2018998</groupId> <groupId>com.github.chris2018998</groupId>
<artifactId>beecp</artifactId> <artifactId>beecp</artifactId>
<scope>provided</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -87,6 +80,24 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-githubchecker</artifactId> <artifactId>easyplugin-githubchecker</artifactId>
@@ -103,7 +114,7 @@
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easyconfiguration-yaml</artifactId> <artifactId>configured-yaml</artifactId>
<version>${deps.easyconf.version}</version> <version>${deps.easyconf.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@@ -116,6 +127,47 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
</plugin> </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.4.0</version>
<executions>
<execution>
<id>filter-version</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
<resources>
<resource>
<directory>src/main/templates</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@@ -1,7 +1,7 @@
package cc.carm.plugin.minesql; package cc.carm.plugin.minesql;
import cc.carm.lib.configuration.EasyConfiguration; import cc.carm.lib.configuration.source.ConfigurationHolder;
import cc.carm.lib.configuration.yaml.YAMLConfigProvider; import cc.carm.lib.configuration.source.yaml.YAMLConfigFactory;
import cc.carm.lib.easyplugin.utils.JarResourceUtils; import cc.carm.lib.easyplugin.utils.JarResourceUtils;
import cc.carm.lib.easysql.api.SQLManager; import cc.carm.lib.easysql.api.SQLManager;
import cc.carm.lib.easysql.api.SQLQuery; import cc.carm.lib.easysql.api.SQLQuery;
@@ -14,16 +14,14 @@ import cc.carm.plugin.minesql.command.MineSQLCommand;
import cc.carm.plugin.minesql.command.MineSQLHelpFormatter; import cc.carm.plugin.minesql.command.MineSQLHelpFormatter;
import cc.carm.plugin.minesql.conf.PluginConfiguration; import cc.carm.plugin.minesql.conf.PluginConfiguration;
import cc.carm.plugin.minesql.conf.SQLSourceGroup; import cc.carm.plugin.minesql.conf.SQLSourceGroup;
import cc.carm.plugin.minesql.lib.PluginLibraries;
import cc.carm.plugin.minesql.util.DBPropertiesUtil; import cc.carm.plugin.minesql.util.DBPropertiesUtil;
import cn.beecp.BeeDataSource;
import cn.beecp.BeeDataSourceConfig;
import co.aikar.commands.CommandManager; import co.aikar.commands.CommandManager;
import co.aikar.commands.InvalidCommandArgument; import co.aikar.commands.InvalidCommandArgument;
import co.aikar.commands.Locales; import co.aikar.commands.Locales;
import net.byteflux.libby.Library;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.stone.beecp.BeeDataSource;
import org.stone.beecp.BeeDataSourceConfig;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.io.File; import java.io.File;
@@ -37,32 +35,19 @@ public class MineSQLCore implements IMineSQL {
protected static MineSQLCore instance; protected static MineSQLCore instance;
public static final String REPO_OWNER = "CarmJos";
public static final String REPO_NAME = "MineSQL";
protected final MineSQLPlatform platform; protected final MineSQLPlatform platform;
protected final MineSQLRegistry registry; protected final MineSQLRegistry registry;
protected final YAMLConfigProvider configProvider; protected final ConfigurationHolder<?> configProvider;
protected final PluginConfiguration config; protected final PluginConfiguration config;
public MineSQLCore(MineSQLPlatform platform) { public MineSQLCore(MineSQLPlatform platform) {
instance = this; instance = this;
this.platform = platform; this.platform = platform;
getLogger().info("加载数据库依赖文件...");
getPlatform().getLibraryManager().addMavenLocal();
getPlatform().getLibraryManager().addMavenCentral();
getPlatform().getLibraryManager().addSonatype();
for (PluginLibraries value : PluginLibraries.values()) {
Library lib = value.getLibrary();
getLogger().info(" 加载 " + lib.getArtifactId() + " (" + lib.getVersion() + ") ...");
getPlatform().getLibraryManager().loadLibrary(value.getLibrary());
}
getLogger().info("加载配置文件..."); getLogger().info("加载配置文件...");
this.configProvider = EasyConfiguration.from(new File(platform.getPluginFolder(), "config.yml")); this.configProvider = YAMLConfigFactory.from(new File(platform.getPluginFolder(), "config.yml")).build();
this.config = new PluginConfiguration(); this.config = new PluginConfiguration();
this.configProvider.initialize(this.config); this.configProvider.initialize(this.config);
@@ -124,7 +109,7 @@ public class MineSQLCore implements IMineSQL {
} }
@Override @Override
public @NotNull SQLManagerImpl create(@NotNull String name, @NotNull SQLSourceConfig conf) { public @NotNull SQLManagerImpl create(@NotNull String name, @NotNull SQLSourceConfig conf) throws Exception {
BeeDataSourceConfig config = new BeeDataSourceConfig(); BeeDataSourceConfig config = new BeeDataSourceConfig();
config.setDriverClassName(conf.getDriverClassName()); config.setDriverClassName(conf.getDriverClassName());
config.setJdbcUrl(conf.getJdbcURL()); config.setJdbcUrl(conf.getJdbcURL());
@@ -143,11 +128,16 @@ public class MineSQLCore implements IMineSQL {
Optional.ofNullable(conf.getSettings().getReadOnly()).ifPresent(config::setDefaultReadOnly); Optional.ofNullable(conf.getSettings().getReadOnly()).ifPresent(config::setDefaultReadOnly);
Optional.ofNullable(conf.getSettings().getSchema()).ifPresent(config::setDefaultSchema); Optional.ofNullable(conf.getSettings().getSchema()).ifPresent(config::setDefaultSchema);
Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setValidTestSql); Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setAliveTestSql);
Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setValidTestTimeout); Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setAliveTestTimeout);
Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setValidAssumeTime); Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setTimerCheckInterval);
return create(name, config); SQLManagerImpl manager = create(name, config);
if (conf.getInitializer() != null) {
conf.getInitializer().accept(manager);
}
return manager;
} }
@Override @Override
@@ -247,7 +237,7 @@ public class MineSQLCore implements IMineSQL {
return config; return config;
} }
public YAMLConfigProvider getConfigProvider() { public ConfigurationHolder<?> getConfigProvider() {
return configProvider; return configProvider;
} }
@@ -308,8 +298,8 @@ public class MineSQLCore implements IMineSQL {
public void checkUpdate(String currentVersion) { public void checkUpdate(String currentVersion) {
Logger logger = getLogger(); Logger logger = getLogger();
Integer behindVersions = GithubReleases4J.getVersionBehind(REPO_OWNER, REPO_NAME, currentVersion); Integer behindVersions = GithubReleases4J.getVersionBehind(References.REPO_OWNER, References.REPO_NAME, currentVersion);
String downloadURL = GithubReleases4J.getReleasesURL(REPO_OWNER, REPO_NAME); String downloadURL = GithubReleases4J.getReleasesURL(References.REPO_OWNER, References.REPO_NAME);
if (behindVersions == null) { if (behindVersions == null) {
logger.severe("检查更新失败,请您定期查看插件是否更新,避免安全问题。"); logger.severe("检查更新失败,请您定期查看插件是否更新,避免安全问题。");
logger.severe("下载地址 " + downloadURL); logger.severe("下载地址 " + downloadURL);
@@ -1,7 +1,6 @@
package cc.carm.plugin.minesql; package cc.carm.plugin.minesql;
import co.aikar.commands.CommandManager; import co.aikar.commands.CommandManager;
import net.byteflux.libby.LibraryManager;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -16,6 +15,4 @@ public interface MineSQLPlatform {
@Nullable CommandManager<?, ?, ?, ?, ?, ?> getCommandManager(); @Nullable CommandManager<?, ?, ?, ?, ?, ?> getCommandManager();
@NotNull LibraryManager getLibraryManager();
} }
@@ -1,69 +1,70 @@
package cc.carm.plugin.minesql.conf; package cc.carm.plugin.minesql.conf;
import cc.carm.lib.configuration.core.ConfigurationRoot; import cc.carm.lib.configuration.Configuration;
import cc.carm.lib.configuration.core.annotation.HeaderComment; import cc.carm.lib.configuration.annotation.ConfigPath;
import cc.carm.lib.configuration.core.value.ConfigValue; import cc.carm.lib.configuration.annotation.HeaderComments;
import cc.carm.lib.configuration.core.value.type.ConfiguredValue; import cc.carm.lib.configuration.value.standard.ConfiguredValue;
public class PluginConfiguration extends ConfigurationRoot { @ConfigPath(root = true)
public class PluginConfiguration implements Configuration {
@HeaderComment("排错模式,一般留给开发者检查问题,平常使用无需开启。") @HeaderComments("排错模式,一般留给开发者检查问题,平常使用无需开启。")
public final ConfigValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false); public final ConfiguredValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false);
@HeaderComment({"", @HeaderComments({"",
"统计数据设定", "统计数据设定",
"该选项用于帮助开发者统计插件版本与使用情况,且绝不会影响性能与使用体验。", "该选项用于帮助开发者统计插件版本与使用情况,且绝不会影响性能与使用体验。",
"当然,您也可以选择在这里关闭,或在plugins/bStats下的配置文件中关闭所有插件的统计信息。" "当然,您也可以选择在这里关闭,或在plugins/bStats下的配置文件中关闭所有插件的统计信息。"
}) })
public final ConfigValue<Boolean> METRICS = ConfiguredValue.of(Boolean.class, true); public final ConfiguredValue<Boolean> METRICS = ConfiguredValue.of(Boolean.class, true);
@HeaderComment({"", @HeaderComments({"",
"检查更新设定", "检查更新设定",
"该选项用于插件判断是否要检查更新,若您不希望插件检查更新并提示您,可以选择关闭。", "该选项用于插件判断是否要检查更新,若您不希望插件检查更新并提示您,可以选择关闭。",
"检查更新为异步操作,绝不会影响性能与使用体验。" "检查更新为异步操作,绝不会影响性能与使用体验。"
}) })
public ConfigValue<Boolean> UPDATE_CHECKER = ConfiguredValue.of(Boolean.class, true); public final ConfiguredValue<Boolean> UPDATE_CHECKER = ConfiguredValue.of(Boolean.class, true);
@HeaderComment({"插件注册池配置"}) @HeaderComments({"插件注册池配置"})
public final SettingsConfig SETTINGS = new SettingsConfig(); public final SettingsConfig SETTINGS = new SettingsConfig();
@HeaderComment({"", @HeaderComments({"",
"Properties 数据库配置文件配置", "Properties 数据库配置文件配置",
"相关配置介绍(BeeCP) https://github.com/Chris2018998/BeeCP/wiki/Configuration--List#配置列表" "相关配置介绍(BeeCP) https://github.com/Chris2018998/BeeCP/wiki/Configuration--List#配置列表"
}) })
public final PropertiesConfig PROPERTIES = new PropertiesConfig(); public final PropertiesConfig PROPERTIES = new PropertiesConfig();
@HeaderComment({"", @HeaderComments({"",
"数据库源配置", "数据库源配置",
"目前支持的驱动类型(type)有 mariadb、mysql、h2-file(文件数据库) 与 h2-mem(内存临时数据库)。", "目前支持的驱动类型(type)有 mariadb、mysql、h2-file(文件数据库) 与 h2-mem(内存临时数据库)。",
"详细配置介绍请查看 https://github.com/CarmJos/MineSQL/.doc/README.md" "详细配置介绍请查看 https://github.com/CarmJos/MineSQL/.doc/README.md"
}) })
public ConfigValue<SQLSourceGroup> SOURCES = ConfigValue.builder() public final ConfiguredValue<SQLSourceGroup> SOURCES = ConfiguredValue.builderOf(SQLSourceGroup.class)
.asValue(SQLSourceGroup.class).fromSection() .fromSection()
.parseValue((w, d) -> SQLSourceGroup.parse(w)) .parse((w, sec) -> SQLSourceGroup.parse(sec))
.serializeValue(SQLSourceGroup::serialize) .serialize(SQLSourceGroup::serialize)
.defaults(SQLSourceGroup.defaults()) .defaults(SQLSourceGroup.defaults())
.build(); .build();
public static class PropertiesConfig extends ConfigurationRoot { public static class PropertiesConfig implements Configuration {
@HeaderComment({"该选项用于启用 Properties 配置读取。", "若您不希望插件启用 Properties 文件配置功能,可以选择关闭。"}) @HeaderComments({"该选项用于启用 Properties 配置读取。", "若您不希望插件启用 Properties 文件配置功能,可以选择关闭。"})
public ConfigValue<Boolean> ENABLE = ConfiguredValue.of(Boolean.class, true); public ConfiguredValue<Boolean> ENABLE = ConfiguredValue.of(Boolean.class, true);
@HeaderComment({ @HeaderComments({
"文件夹路径,将读取该文件夹下的所有 .properties 文件,并以文件名为数据管理器名称。", "文件夹路径,将读取该文件夹下的所有 .properties 文件,并以文件名为数据管理器名称。",
"读取时,将排除以 “.” 开头的文件与非 .properties 文件。", "读取时,将排除以 “.” 开头的文件与非 .properties 文件。",
"默认为 \"db-properties/\" 相对路径,指向“plugins/MineSQL/db-properties/”;", "默认为 \"db-properties/\" 相对路径,指向“plugins/MineSQL/db-properties/”;",
"该选项也支持绝对路径,但使用绝对路径时,请务必注意权限问题。" "该选项也支持绝对路径,但使用绝对路径时,请务必注意权限问题。"
}) })
public ConfigValue<String> FOLDER = ConfiguredValue.of(String.class, "db-properties/"); public ConfiguredValue<String> FOLDER = ConfiguredValue.of(String.class, "db-properties/");
} }
public static class SettingsConfig extends ConfigurationRoot { public static class SettingsConfig implements Configuration {
@HeaderComment({"在插件卸载时是否强制关闭活跃链接"}) @HeaderComments({"在插件卸载时是否强制关闭活跃链接"})
public ConfigValue<Boolean> FORCE_CLOSE = ConfiguredValue.of(Boolean.class, true); public ConfiguredValue<Boolean> FORCE_CLOSE = ConfiguredValue.of(Boolean.class, true);
} }
@@ -1,6 +1,6 @@
package cc.carm.plugin.minesql.conf; package cc.carm.plugin.minesql.conf;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper; import cc.carm.lib.configuration.source.section.ConfigureSection;
import cc.carm.plugin.minesql.MineSQL; import cc.carm.plugin.minesql.MineSQL;
import cc.carm.plugin.minesql.api.SQLDriverType; import cc.carm.plugin.minesql.api.SQLDriverType;
import cc.carm.plugin.minesql.api.conf.SQLDriverConfig; import cc.carm.plugin.minesql.api.conf.SQLDriverConfig;
@@ -44,11 +44,11 @@ public class SQLSourceGroup {
return new SQLSourceGroup(configs); return new SQLSourceGroup(configs);
} }
public static @NotNull SQLSourceGroup parse(ConfigurationWrapper<?> rootSection) { public static @NotNull SQLSourceGroup parse(ConfigureSection rootSection) {
LinkedHashMap<String, SQLDriverConfig> configs = new LinkedHashMap<>(); LinkedHashMap<String, SQLDriverConfig> configs = new LinkedHashMap<>();
for (String name : rootSection.getKeys(false)) { for (String name : rootSection.getKeys(false)) {
if (!rootSection.isConfigurationSection(name)) continue; if (!rootSection.isSection(name)) continue;
ConfigurationWrapper<?> section = rootSection.getConfigurationSection(name); ConfigureSection section = rootSection.getSection(name);
if (section == null) continue; if (section == null) continue;
SQLDriverConfig conf = parse(name, section); SQLDriverConfig conf = parse(name, section);
if (conf != null) configs.put(name, conf); if (conf != null) configs.put(name, conf);
@@ -56,7 +56,7 @@ public class SQLSourceGroup {
return new SQLSourceGroup(configs); return new SQLSourceGroup(configs);
} }
public static @Nullable SQLDriverConfig parse(String name, ConfigurationWrapper<?> section) { public static @Nullable SQLDriverConfig parse(String name, ConfigureSection section) {
@Nullable String driverString = section.getString("type"); @Nullable String driverString = section.getString("type");
@Nullable SQLDriverType driverType = SQLDriverType.parse(driverString); @Nullable SQLDriverType driverType = SQLDriverType.parse(driverString);
if (driverType == null) { if (driverType == null) {
@@ -1,7 +1,6 @@
package cc.carm.plugin.minesql.lib; package cc.carm.plugin.minesql.lib;
import cc.carm.plugin.minesql.util.VersionReader; import cc.carm.plugin.minesql.util.VersionReader;
import net.byteflux.libby.Library;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public enum PluginLibraries { public enum PluginLibraries {
@@ -21,16 +20,8 @@ public enum PluginLibraries {
this.artifactID = artifactID; this.artifactID = artifactID;
} }
public @NotNull Library getLibrary() {
return Library.builder().id(name())
.groupId(this.groupID).artifactId(this.artifactID)
.version(getVersion())
.build();
}
public @NotNull String getVersion() { public @NotNull String getVersion() {
return READER.get(name().toLowerCase().replace('_', '-')); return READER.get(name().toLowerCase().replace('_', '-'));
} }
} }
@@ -0,0 +1,9 @@
package cc.carm.plugin.minesql;
public interface References {
String REPO_OWNER = "CarmJos";
String REPO_NAME = "MineSQL";
String VERSION = "${project.version}";
}
+2 -9
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>minesql-parent</artifactId> <artifactId>minesql-parent</artifactId>
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<version>1.4.0</version> <version>1.4.3</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -75,17 +75,10 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.16.3-R0.1-SNAPSHOT</version> <version>1.19-R0.1-20220725.090125-47</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>net.byteflux</groupId>
<artifactId>libby-bukkit</artifactId>
<version>${deps.libby.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.bstats</groupId> <groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId> <artifactId>bstats-bukkit</artifactId>
@@ -4,8 +4,6 @@ import cc.carm.lib.easyplugin.EasyPlugin;
import cc.carm.plugin.minesql.conf.PluginConfiguration; import cc.carm.plugin.minesql.conf.PluginConfiguration;
import co.aikar.commands.CommandManager; import co.aikar.commands.CommandManager;
import co.aikar.commands.PaperCommandManager; import co.aikar.commands.PaperCommandManager;
import net.byteflux.libby.BukkitLibraryManager;
import net.byteflux.libby.LibraryManager;
import org.bstats.bukkit.Metrics; import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie; import org.bstats.charts.SimplePie;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -16,8 +14,6 @@ public class MineSQLBukkit extends EasyPlugin implements MineSQLPlatform {
protected static MineSQLBukkit instance; protected static MineSQLBukkit instance;
protected BukkitLibraryManager libraryManager;
protected MineSQLCore core; protected MineSQLCore core;
protected PaperCommandManager commandManager; protected PaperCommandManager commandManager;
@@ -25,9 +21,6 @@ public class MineSQLBukkit extends EasyPlugin implements MineSQLPlatform {
protected void load() { protected void load() {
MineSQLBukkit.instance = this; MineSQLBukkit.instance = this;
log("加载依赖管理器...");
this.libraryManager = new BukkitLibraryManager(this);
log("加载基础核心..."); log("加载基础核心...");
this.core = new MineSQLCore(this); this.core = new MineSQLCore(this);
} }
@@ -85,11 +78,6 @@ public class MineSQLBukkit extends EasyPlugin implements MineSQLPlatform {
return commandManager; return commandManager;
} }
@Override
public @NotNull LibraryManager getLibraryManager() {
return this.libraryManager;
}
@Override @Override
public @NotNull File getPluginFolder() { public @NotNull File getPluginFolder() {
return getDataFolder(); return getDataFolder();
+4 -29
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>minesql-parent</artifactId> <artifactId>minesql-parent</artifactId>
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<version>1.4.0</version> <version>1.4.3</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -56,15 +56,6 @@
<url>https://github.com/CarmJos/MineSQL/actions/workflows/maven.yml</url> <url>https://github.com/CarmJos/MineSQL/actions/workflows/maven.yml</url>
</ciManagement> </ciManagement>
<repositories>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
@@ -75,28 +66,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.md-5</groupId> <groupId>io.github.waterfallmc</groupId>
<artifactId>bungeecord-api</artifactId> <artifactId>waterfall-api</artifactId>
<version>1.16-R0.5-SNAPSHOT</version> <version>1.21-R0.5-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.16-R0.5-SNAPSHOT</version>
<type>javadoc</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.byteflux</groupId>
<artifactId>libby-bungee</artifactId>
<version>${deps.libby.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.bstats</groupId> <groupId>org.bstats</groupId>
<artifactId>bstats-bungeecord</artifactId> <artifactId>bstats-bungeecord</artifactId>
@@ -5,8 +5,6 @@ import cc.carm.lib.easyplugin.utils.JarResourceUtils;
import cc.carm.plugin.minesql.conf.PluginConfiguration; import cc.carm.plugin.minesql.conf.PluginConfiguration;
import co.aikar.commands.BungeeCommandManager; import co.aikar.commands.BungeeCommandManager;
import co.aikar.commands.CommandManager; import co.aikar.commands.CommandManager;
import net.byteflux.libby.BungeeLibraryManager;
import net.byteflux.libby.LibraryManager;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import org.bstats.bungeecord.Metrics; import org.bstats.bungeecord.Metrics;
@@ -22,8 +20,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform {
protected static MineSQLBungee instance; protected static MineSQLBungee instance;
protected BungeeLibraryManager libraryManager;
protected MineSQLCore core; protected MineSQLCore core;
protected BungeeCommandManager commandManager; protected BungeeCommandManager commandManager;
@@ -31,9 +27,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform {
public void onLoad() { public void onLoad() {
MineSQLBungee.instance = this; MineSQLBungee.instance = this;
getLogger().info("加载依赖管理器...");
this.libraryManager = new BungeeLibraryManager(this);
getLogger().info("加载基础核心..."); getLogger().info("加载基础核心...");
this.core = new MineSQLCore(this); this.core = new MineSQLCore(this);
} }
@@ -99,11 +92,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform {
return this.commandManager; return this.commandManager;
} }
@Override
public @NotNull LibraryManager getLibraryManager() {
return this.libraryManager;
}
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public void outputInfo() { public void outputInfo() {
Optional.ofNullable(JarResourceUtils.readResource(this.getResourceAsStream("PLUGIN_INFO"))) Optional.ofNullable(JarResourceUtils.readResource(this.getResourceAsStream("PLUGIN_INFO")))
-127
View File
@@ -1,127 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>minesql-parent</artifactId>
<groupId>cc.carm.plugin</groupId>
<version>1.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<artifactId>minesql-platform-sponge</artifactId>
<name>MineSQL-Sponge</name>
<description>轻松(用)SQL的独立运行库Sponge版本插件。</description>
<url>https://github.com/CarmJos/MineSQL</url>
<developers>
<developer>
<id>huanmeng</id>
<name>huanmeng-qwq</name>
<email>huanmeng@huanmeng-qwq.com</email>
<roles>
<role>Contributor</role>
</roles>
</developer>
</developers>
<licenses>
<license>
<name>GNU General Public License v3.0</name>
<url>https://opensource.org/licenses/GPL-3.0</url>
</license>
</licenses>
<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/CarmJos/EasySQL-Plugin/issues</url>
</issueManagement>
<ciManagement>
<system>GitHub Actions</system>
<url>https://github.com/CarmJos/EasySQL-Plugin/actions/workflows/maven.yml</url>
</ciManagement>
<repositories>
<repository>
<id>sponge</id>
<url>https://repo.spongepowered.org/maven</url>
</repository>
</repositories>
<dependencies>
<!--suppress VulnerableLibrariesLocal -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>minesql-core</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<!--suppress VulnerableLibrariesLocal -->
<dependency>
<groupId>org.spongepowered</groupId>
<artifactId>spongeapi</artifactId>
<version>8.0.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>ninja.leaping.configurate</groupId>
<artifactId>configurate-hocon</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.byteflux</groupId>
<artifactId>libby-sponge</artifactId>
<version>${deps.libby.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-sponge</artifactId>
<version>${deps.bstats.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>co.aikar</groupId>
<artifactId>acf-sponge</artifactId>
<version>${deps.acf.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
@@ -1,133 +0,0 @@
package cc.carm.plugin.minesql;
import cc.carm.lib.easyplugin.utils.ColorParser;
import cc.carm.lib.easyplugin.utils.JarResourceUtils;
import cc.carm.plugin.minesql.conf.PluginConfiguration;
import co.aikar.commands.CommandManager;
import com.google.inject.Inject;
import net.byteflux.libby.LibraryManager;
import net.byteflux.libby.SpongeLibraryManager;
import net.kyori.adventure.text.Component;
import org.bstats.charts.SimplePie;
import org.bstats.sponge.Metrics;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.api.Server;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.config.ConfigDir;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.Order;
import org.spongepowered.api.event.lifecycle.StartingEngineEvent;
import org.spongepowered.api.event.lifecycle.StoppingEngineEvent;
import org.spongepowered.plugin.PluginContainer;
import org.spongepowered.plugin.builtin.jvm.Plugin;
import java.io.File;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Optional;
/**
* @author huanmeng_qwq, CarmJos
*/
@Plugin("minesql")
public class MineSQLSponge implements MineSQLPlatform {
@Inject
@ConfigDir(sharedRoot = false)
private Path configDirectory;
@Inject
private org.apache.logging.log4j.Logger logger;
private final PluginContainer pluginContainer;
private final Metrics.Factory metricsFactory;
protected final SpongeLibraryManager<MineSQLSponge> libraryManager;
protected final MineSQLCore core;
// protected SpongeCommandManager commandManager;
@Inject
public MineSQLSponge(Metrics.Factory factory,
PluginContainer pluginContainer,
SpongeLibraryManager<MineSQLSponge> libraryManager) {
this.pluginContainer = pluginContainer;
this.metricsFactory = factory;
this.libraryManager = libraryManager;
getLogger().info("加载基础核心...");
this.core = new MineSQLCore(this);
}
@Listener(order = Order.PRE)
public void starting(StartingEngineEvent<Server> e) {
outputInfo();
// getLogger().info("初始化指令管理器...");
// this.commandManager = new SpongeCommandManager(pluginContainer);
//
// getLogger().info("注册相关指令...");
// this.core.initializeCommands(getCommandManager());
if (getConfiguration().METRICS.getNotNull()) {
getLogger().info("启用统计数据...");
Metrics metrics = this.metricsFactory.make(14078);
metrics.addCustomChart(new SimplePie("update_check",
() -> getConfiguration().UPDATE_CHECKER.getNotNull() ? "ENABLED" : "DISABLED")
);
metrics.addCustomChart(new SimplePie("properties_configuration",
() -> getConfiguration().PROPERTIES.ENABLE.getNotNull() ? "ENABLED" : "DISABLED")
);
}
if (getConfiguration().UPDATE_CHECKER.getNotNull()) {
getLogger().info("开始检查更新,可能需要一小段时间...");
getLogger().info(" 如不希望检查更新,可在配置文件中关闭。");
Sponge.asyncScheduler().executor(pluginContainer)
.execute(() -> this.core.checkUpdate(getVersion()));
} else {
getLogger().info("已禁用检查更新,跳过。");
}
}
@Listener
public void disable(StoppingEngineEvent<Server> e) {
outputInfo();
logger.info("终止全部数据库连接...");
this.core.shutdownAll();
}
@Override
public @NotNull File getPluginFolder() {
return configDirectory.toFile();
}
public @NotNull PluginConfiguration getConfiguration() {
return this.core.getConfig();
}
public @NotNull java.util.logging.Logger getLogger() {
return java.util.logging.Logger.getLogger("MineSQL");
}
//fixme acf-sponge是基于sponge5编写的 无法使用
@Override
public @Nullable CommandManager<?, ?, ?, ?, ?, ?> getCommandManager() {
return null;
}
@Override
public @NotNull LibraryManager getLibraryManager() {
return this.libraryManager;
}
public String getVersion() {
return pluginContainer.metadata().version().toString();
}
public void outputInfo() {
Optional.ofNullable(JarResourceUtils.readResource(this.getClass().getResourceAsStream("PLUGIN_INFO")))
.map(v -> ColorParser.parse(Arrays.asList(v)))
.ifPresent(list -> list.forEach(s -> Sponge.server().sendMessage(Component.text(s))));
}
}
@@ -1,39 +0,0 @@
{
"loader": {
"name": "java_plain",
"version": "1.0"
},
"license": "GPL-3.0-or-later",
"global": {
"version": "8.0.0",
"links": {
"homepage": "${project.url}",
"source": "${project.url}",
"issues": "${project.url}/issues"
},
"contributors": [
{
"name": "huanmeng",
"description": "ContributorContributor"
},
{
"name": "CarmJos",
"description": "Lead Developer"
}
],
"dependencies": [
{
"id": "spongeapi",
"version": "8.0.0"
}
]
},
"plugins": [
{
"id": "minesql",
"name": "MineSQL (EasySQL-Plugin)",
"entrypoint": "cc.carm.plugin.minesql.MineSQLSponge",
"description": "${project.description}"
}
]
}
+1 -8
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>minesql-parent</artifactId> <artifactId>minesql-parent</artifactId>
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<version>1.4.0</version> <version>1.4.3</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -82,13 +82,6 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>net.byteflux</groupId>
<artifactId>libby-velocity</artifactId>
<version>${deps.libby.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.bstats</groupId> <groupId>org.bstats</groupId>
<artifactId>bstats-velocity</artifactId> <artifactId>bstats-velocity</artifactId>
@@ -1,8 +1,5 @@
package cc.carm.plugin.minesql; package cc.carm.plugin.minesql;
import cc.carm.lib.easyplugin.utils.ColorParser;
import cc.carm.lib.easyplugin.utils.JarResourceUtils;
import cc.carm.plugin.minesql.conf.PluginConfiguration; import cc.carm.plugin.minesql.conf.PluginConfiguration;
import co.aikar.commands.CommandManager; import co.aikar.commands.CommandManager;
import co.aikar.commands.VelocityCommandManager; import co.aikar.commands.VelocityCommandManager;
@@ -16,22 +13,17 @@ import com.velocitypowered.api.plugin.PluginContainer;
import com.velocitypowered.api.plugin.PluginDescription; import com.velocitypowered.api.plugin.PluginDescription;
import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ProxyServer;
import net.byteflux.libby.LibraryManager;
import net.byteflux.libby.VelocityLibraryManager;
import net.kyori.adventure.text.Component;
import org.bstats.charts.SimplePie; import org.bstats.charts.SimplePie;
import org.bstats.velocity.Metrics; import org.bstats.velocity.Metrics;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Arrays;
import java.util.Optional;
import java.util.logging.Logger; import java.util.logging.Logger;
@Plugin(id = "minesql", name = "MineSQL (EasySQL-Plugin)", version = "1.4.0", @Plugin(id = "minesql", name = "MineSQL (EasySQL-Plugin)",
version = References.VERSION,
description = "EasySQL Plugin For Velocity", description = "EasySQL Plugin For Velocity",
url = "https://github.com/CarmJos/MineSQL", url = "https://github.com/CarmJos/MineSQL",
authors = {"CarmJos", "GhostChu"} authors = {"CarmJos", "GhostChu"}
@@ -43,7 +35,6 @@ public class MineSQLVelocity implements MineSQLPlatform {
private final File dataFolder; private final File dataFolder;
private final Metrics.Factory metricsFactory; private final Metrics.Factory metricsFactory;
protected VelocityLibraryManager<MineSQLVelocity> libraryManager;
protected MineSQLCore core; protected MineSQLCore core;
protected VelocityCommandManager commandManager; protected VelocityCommandManager commandManager;
@@ -56,18 +47,14 @@ public class MineSQLVelocity implements MineSQLPlatform {
this.logger = logger; this.logger = logger;
this.dataFolder = dataDirectory.toFile(); this.dataFolder = dataDirectory.toFile();
this.metricsFactory = metricsFactory; this.metricsFactory = metricsFactory;
this.libraryManager = new VelocityLibraryManager<>(
LoggerFactory.getLogger("minesql"), dataDirectory, getLogger().info("加载基础核心...");
server.getPluginManager(), this this.core = new MineSQLCore(this);
);
} }
@Subscribe(order = PostOrder.FIRST) @Subscribe(order = PostOrder.FIRST)
public void onInitialize(ProxyInitializeEvent event) { public void onInitialize(ProxyInitializeEvent event) {
outputInfo();
getLogger().info("加载基础核心...");
this.core = new MineSQLCore(this);
getLogger().info("初始化指令管理器..."); getLogger().info("初始化指令管理器...");
this.commandManager = new VelocityCommandManager(server, this); this.commandManager = new VelocityCommandManager(server, this);
@@ -98,7 +85,6 @@ public class MineSQLVelocity implements MineSQLPlatform {
@Subscribe(order = PostOrder.LAST) @Subscribe(order = PostOrder.LAST)
public void onShutdown(ProxyShutdownEvent event) { public void onShutdown(ProxyShutdownEvent event) {
outputInfo();
getLogger().info("终止全部数据库连接..."); getLogger().info("终止全部数据库连接...");
this.core.shutdownAll(); this.core.shutdownAll();
} }
@@ -122,25 +108,12 @@ public class MineSQLVelocity implements MineSQLPlatform {
return this.dataFolder; return this.dataFolder;
} }
@Override @Override
public @NotNull CommandManager<?, ?, ?, ?, ?, ?> getCommandManager() { public @NotNull CommandManager<?, ?, ?, ?, ?, ?> getCommandManager() {
return commandManager; return commandManager;
} }
@Override
public @NotNull LibraryManager getLibraryManager() {
return this.libraryManager;
}
public @NotNull PluginConfiguration getConfiguration() { public @NotNull PluginConfiguration getConfiguration() {
return this.core.getConfig(); return this.core.getConfig();
} }
public void outputInfo() {
Optional.ofNullable(JarResourceUtils.readResource(this.getClass().getResourceAsStream("PLUGIN_INFO")))
.map(v -> ColorParser.parse(Arrays.asList(v)))
.ifPresent(list -> list.forEach(s -> getServer().getConsoleCommandSource().sendMessage(Component.text(s))));
}
} }
+2 -9
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>minesql-parent</artifactId> <artifactId>minesql-parent</artifactId>
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<version>1.4.0</version> <version>1.4.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
@@ -34,13 +34,6 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>minesql-platform-sponge</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>${project.parent.groupId}</groupId> <groupId>${project.parent.groupId}</groupId>
<artifactId>minesql-platform-velocity</artifactId> <artifactId>minesql-platform-velocity</artifactId>
@@ -63,7 +56,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.3</version> <version>3.6.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
+17 -23
View File
@@ -12,17 +12,17 @@
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<deps.easysql.version>0.4.7</deps.easysql.version> <deps.easysql.version>0.4.7</deps.easysql.version>
<deps.easyconf.version>3.3.1</deps.easyconf.version> <deps.easyconf.version>4.2.0</deps.easyconf.version>
<deps.easyplugin.version>1.4.18</deps.easyplugin.version> <deps.easyplugin.version>1.5.14</deps.easyplugin.version>
<deps.beecp.version>3.3.9</deps.beecp.version> <deps.beecp.version>5.2.1</deps.beecp.version>
<deps.libby.version>1.1.5</deps.libby.version> <deps.libby.version>1.1.5</deps.libby.version>
<deps.acf.version>0.5.1-SNAPSHOT</deps.acf.version> <deps.acf.version>0.5.1-SNAPSHOT</deps.acf.version>
<deps.bstats.version>3.0.0</deps.bstats.version> <deps.bstats.version>3.1.0</deps.bstats.version>
<deps.mysql-driver.version>8.0.31</deps.mysql-driver.version> <deps.mysql-driver.version>9.6.0</deps.mysql-driver.version>
<deps.mariadb-driver.version>3.1.0</deps.mariadb-driver.version> <deps.mariadb-driver.version>3.5.8</deps.mariadb-driver.version>
<deps.h2-driver.version>2.1.214</deps.h2-driver.version> <deps.h2-driver.version>2.4.240</deps.h2-driver.version>
<code.package>cc.carm.plugin.minesql</code.package> <code.package>cc.carm.plugin.minesql</code.package>
</properties> </properties>
@@ -30,7 +30,7 @@
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<artifactId>minesql-parent</artifactId> <artifactId>minesql-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.4.0</version> <version>1.4.3</version>
<modules> <modules>
<module>api</module> <module>api</module>
<module>core</module> <module>core</module>
@@ -38,7 +38,6 @@
<module>platforms/bukkit</module> <module>platforms/bukkit</module>
<module>platforms/bungee</module> <module>platforms/bungee</module>
<module>platforms/velocity</module> <module>platforms/velocity</module>
<module>platforms/sponge8</module>
<module>plugin</module> <module>plugin</module>
</modules> </modules>
@@ -105,11 +104,6 @@
<url>https://repo.aikar.co/content/groups/aikar/</url> <url>https://repo.aikar.co/content/groups/aikar/</url>
</repository> </repository>
<repository>
<id>AlessioDP</id>
<url>https://repo.alessiodp.com/releases/</url>
</repository>
<repository> <repository>
<id>central</id> <id>central</id>
<url>https://repo1.maven.org/maven2/</url> <url>https://repo1.maven.org/maven2/</url>
@@ -128,7 +122,7 @@
<dependency> <dependency>
<groupId>org.jetbrains</groupId> <groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
<version>23.1.0</version> <version>26.0.2-1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -161,7 +155,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>31.0.1-jre</version> <version>33.5.0-jre</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client --> <!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
@@ -193,7 +187,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>2.5</version> <version>3.5.0</version>
<configuration> <configuration>
<filesets> <filesets>
<fileset> <fileset>
@@ -209,7 +203,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version> <version>3.5.4</version>
<configuration> <configuration>
<useSystemClassLoader>false</useSystemClassLoader> <useSystemClassLoader>false</useSystemClassLoader>
</configuration> </configuration>
@@ -217,7 +211,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version> <version>3.2.8</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
@@ -237,7 +231,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version> <version>3.3.1</version>
<configuration> <configuration>
<autoVersionSubmodules>true</autoVersionSubmodules> <autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile> <useReleaseProfile>false</useReleaseProfile>
@@ -251,7 +245,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.15.0</version>
<configuration> <configuration>
<source>${project.jdk.version}</source> <source>${project.jdk.version}</source>
<target>${project.jdk.version}</target> <target>${project.jdk.version}</target>
@@ -262,12 +256,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>3.5.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version> <version>3.4.0</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
+13
View File
@@ -0,0 +1,13 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch"],
"matchCurrentVersion": "!/^0/",
"automerge": true
}
]
}