diff --git a/.gitignore b/.gitignore index 9442545b..3cfd7618 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .gradle **/build/ !src/**/build/ -**/remappedSrc/ # Ignore Gradle GUI config gradle-app.setting @@ -42,4 +41,7 @@ hs_err_pid* # run-* Gradle tasks **/loader/run/ **/velocity/run/ -**/fabric/run/ \ No newline at end of file +**/fabric/run + +# Fabric mapping migration +**/fabric/remappedSrc \ No newline at end of file diff --git a/buildscript/relocations.gradle b/buildscript/relocations.gradle index ee7e0389..58be7b2f 100644 --- a/buildscript/relocations.gradle +++ b/buildscript/relocations.gradle @@ -69,7 +69,6 @@ // Webhooks 'club.minnced', 'org.json', - ].each { tasks.shadowJar.relocate it, 'com.discordsrv.dependencies.' + it tasks.generateRuntimeDownloadResourceForRuntimeDownloadOnly.relocate it, 'com.discordsrv.dependencies.' + it @@ -78,6 +77,4 @@ shadowJar { // Unrelocate package, in case a platform uses something we normally relocate 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' } diff --git a/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/file/H2Storage.java b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/file/H2Storage.java index 19414773..03764652 100644 --- a/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/file/H2Storage.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/file/H2Storage.java @@ -52,7 +52,6 @@ public class H2Storage extends SQLStorage { try { Class clazz = classLoader.loadClass("org.h2.jdbc.JdbcConnection"); - Constructor constructor = clazz.getConstructor( String.class, // url Properties.class, // info