Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-11 00:52:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up the pull request from random changes

Browse Source
This commit is contained in:
IxPrumxI 2025-01-16 12:24:22 +03:00
parent baa19fad22
commit 6bd6ed2c7c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -2,7 +2,6 @@
.gradle .gradle
**/build/ **/build/
!src/**/build/ !src/**/build/
**/remappedSrc/
# Ignore Gradle GUI config # Ignore Gradle GUI config
gradle-app.setting gradle-app.setting
@ -42,4 +41,7 @@ hs_err_pid*
# run-* Gradle tasks # run-* Gradle tasks
**/loader/run/ **/loader/run/
**/velocity/run/ **/velocity/run/
**/fabric/run/ **/fabric/run
# Fabric mapping migration
**/fabric/remappedSrc

3
buildscript/relocations.gradle
View File

@ -69,7 +69,6 @@
// Webhooks // Webhooks
'club.minnced', 'club.minnced',
'org.json', 'org.json',
].each { ].each {
tasks.shadowJar.relocate it, 'com.discordsrv.dependencies.' + it tasks.shadowJar.relocate it, 'com.discordsrv.dependencies.' + it
tasks.generateRuntimeDownloadResourceForRuntimeDownloadOnly.relocate it, 'com.discordsrv.dependencies.' + it tasks.generateRuntimeDownloadResourceForRuntimeDownloadOnly.relocate it, 'com.discordsrv.dependencies.' + it
@ -78,6 +77,4 @@
shadowJar { shadowJar {
// Unrelocate package, in case a platform uses something we normally relocate // Unrelocate package, in case a platform uses something we normally relocate
relocate('com.discordsrv.unrelocate.', '') relocate('com.discordsrv.unrelocate.', '')
// relocate 'com.discordsrv.dependencies.net.kyori.adventure.platform.fabric.', 'net.kyori.adventure.platform.fabric'
// relocate 'com.discordsrv.dependencies.net.kyori.adventure.platform.modcommon.', 'net.kyori.adventure.platform.modcommon'
} }

1
common/src/main/java/com/discordsrv/common/core/storage/impl/sql/file/H2Storage.java
View File

@ -52,7 +52,6 @@ public class H2Storage extends SQLStorage {
try { try {
Class<?> clazz = classLoader.loadClass("org.h2.jdbc.JdbcConnection"); Class<?> clazz = classLoader.loadClass("org.h2.jdbc.JdbcConnection");
Constructor<?> constructor = clazz.getConstructor( Constructor<?> constructor = clazz.getConstructor(
String.class, // url String.class, // url
Properties.class, // info Properties.class, // info