diff --git a/.run/Quiver [distZip].run.xml b/.run/Quiver [distZip].run.xml
new file mode 100644
index 0000000..3284b86
--- /dev/null
+++ b/.run/Quiver [distZip].run.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+
+
+
\ No newline at end of file
diff --git a/.run/Quiver [run].run.xml b/.run/Quiver [run].run.xml
new file mode 100644
index 0000000..55efd82
--- /dev/null
+++ b/.run/Quiver [run].run.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+
+
+
\ No newline at end of file
diff --git a/.run/Quiver [shadowJar].run.xml b/.run/Quiver [shadowJar].run.xml
new file mode 100644
index 0000000..bfd6d24
--- /dev/null
+++ b/.run/Quiver [shadowJar].run.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+
+
+
\ No newline at end of file
diff --git a/.run/Quiver [spotlessApply].run.xml b/.run/Quiver [spotlessApply].run.xml
new file mode 100644
index 0000000..8288c2d
--- /dev/null
+++ b/.run/Quiver [spotlessApply].run.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 88cdf19..cfdd92d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
plugins {
- id 'java'
- id 'org.jetbrains.kotlin.jvm'
- id 'org.jetbrains.kotlin.plugin.serialization'
+ id 'java'
+ id 'org.jetbrains.kotlin.jvm'
+ id 'org.jetbrains.kotlin.plugin.serialization'
- id 'distribution'
- id 'application'
+ id 'distribution'
+ id 'application'
- id 'com.diffplug.spotless'
- id 'de.undercouch.download'
+ id 'com.diffplug.spotless'
+ id 'de.undercouch.download'
}
group "$group"
@@ -16,171 +16,171 @@ version "$version"
sourceCompatibility = "$jvmTarget"
project.ext {
- licenseDir = new File('licenses', buildDir)
- toolDir = new File('tools', buildDir)
+ licenseDir = new File('licenses', buildDir)
+ toolDir = new File('tools', buildDir)
}
allprojects {
- apply plugin: 'distribution'
- apply plugin: 'org.jetbrains.kotlin.jvm'
- apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
- apply plugin: 'com.diffplug.spotless'
+ apply plugin: 'distribution'
+ apply plugin: 'org.jetbrains.kotlin.jvm'
+ apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
+ apply plugin: 'com.diffplug.spotless'
- repositories {
- jcenter()
- mavenCentral()
+ repositories {
+ jcenter()
+ mavenCentral()
- maven { url 'https://jitpack.io' }
- maven { url 'https://github.com/eugener/oxbow/raw/master/maven/repository' }
- }
+ maven { url 'https://jitpack.io' }
+ maven { url 'https://github.com/eugener/oxbow/raw/master/maven/repository' }
+ }
- spotless {
- ratchetFrom 'origin/rewrite'
+ spotless {
+ ratchetFrom 'origin/rewrite'
- java {
- importOrder()
- removeUnusedImports()
- googleJavaFormat()
+ java {
+ importOrder()
+ removeUnusedImports()
+ googleJavaFormat()
- licenseHeader "$licenseHeader\n\n"
- }
+ licenseHeader "$licenseHeader\n\n"
+ }
- groovyGradle {
- target '*.gradle'
- greclipse()
- }
+ groovyGradle {
+ target '*.gradle'
+ greclipse()
+ }
- kotlin {
- ktlint()
+ kotlin {
+ ktlint()
- licenseHeader "$licenseHeader\n\n"
- }
+ licenseHeader "$licenseHeader\n\n"
+ }
- format 'misc', {
- target '*.md', '.gitignore'
+ format 'misc', {
+ target '*.md', '.gitignore'
- trimTrailingWhitespace()
- indentWithTabs()
- endWithNewline()
- }
- }
+ trimTrailingWhitespace()
+ indentWithTabs()
+ endWithNewline()
+ }
+ }
- compileKotlin {
- kotlinOptions.jvmTarget = sourceCompatibility
- }
+ compileKotlin {
+ kotlinOptions.jvmTarget = sourceCompatibility
+ }
}
startScripts {
- executableDir = ""
+ executableDir = ""
}
distributions {
- //noinspection GroovyAssignabilityCheck
- main {
- contents {
- from files('README.MD', 'LICENSE')
- from startScripts
-
- into('data') {
- from files('data')
- }
-
- into('licenses') {
- from files("$buildDir/licenses")
- }
- into('tools') {
- from files("$buildDir/tools")
- }
-
- subprojects.each { p ->
- into('plugins') {
- from p.getTasksByName("jar", true)
- }
- }
- }
- }
+ //noinspection GroovyAssignabilityCheck
+ main {
+ contents {
+ from files('README.MD', 'LICENSE')
+ from startScripts
+
+ into('data') {
+ from files('data')
+ }
+
+ into('licenses') {
+ from files("$buildDir/licenses")
+ }
+ into('tools') {
+ from files("$buildDir/tools")
+ }
+
+ subprojects.each { p ->
+ into('plugins') {
+ from p.getTasksByName("jar", true)
+ }
+ }
+ }
+ }
}
distZip {
- eachFile { file ->
- def list = []
-
- // Collect a list of all the JARs produced by submodules
- subprojects.each { p ->
- if (
- !(p.name in ["master", "core", "launcher"]) &&
- p.getTasksByName("jar", true).archiveFile.size > 0
- ) {
- list.add(
- p.getTasksByName("jar", true)
- .archiveFile.first()
- .getAsFile().get()
- )
- }
- }
-
- // Files in /bin are copied to the main directory
- // so we can exclude them
- if (file.path.contains('bin')) {
- file.exclude()
- } else if (file.path.contains('lib') &&
- // Check if the current file is a submodule
- file.getFile() in list
- || file.name =~ /discordrpc*./
- || file.name =~ /pluginmanager*./
- || file.name =~ /Quiver-\d\.\d\.\d\.jar/
- || file.name =~ /settingsgui*./
- || file.name =~ /sniffle*./
- || file.name =~ /tipoftheday*./) {
- file.exclude()
- }
- }
+ def list = []
+
+ // Collect a list of all the JARs produced by submodules
+ subprojects.each { p ->
+ def jar = p.getTasksByName("jar", true).archiveFile
+
+ if (
+ !(p.name in ["master", "core", "launcher"]) &&
+ jar.size > 0
+ ) {
+ list.add(
+ jar.first().getAsFile().get()
+ )
+ }
+ }
+
+ eachFile { file ->
+ // Files in /bin are copied to the main directory
+ // so we can exclude them
+ if (file.path.contains('bin')) {
+ file.exclude()
+ } else if (file.path.contains('lib') &&
+ // Check if the current file is a submodule
+ file.getFile() in list
+ // || file.name =~ /discordrpc*./
+ // || file.name =~ /pluginmanager*./
+ // || file.name =~ /settingsgui*./
+ // || file.name =~ /sniffle*./
+ // || file.name =~ /tipoftheday*./
+ || file.name =~ /Quiver-\d\.\d\.\d\.jar/) {
+ file.exclude()
+ }
+ }
}
run {
- /*applicationDefaultJvmArgs = [
- "-XX:+UseG1GC"
- ]*/
-
- args = ['indev']
-
- doFirst {
- file('run').mkdirs()
-
- copy {
- from 'data'
- into 'run/data'
- }
- }
-
- workingDir 'run'
-
- dependencies {
- implementation project(':core')
- runtimeOnly project(':launcher')
-
- runtimeOnly project(':foldertree')
- runtimeOnly project(':filetable')
- runtimeOnly project(':filepanel')
-
- runtimeOnly project(':textviewer')
- runtimeOnly project(':tableviewer')
- runtimeOnly project(':imageviewer')
- runtimeOnly project(':treeviewer')
- runtimeOnly project(':markdownviewer')
- runtimeOnly project(':spritesheetviewer')
-
- runtimeOnly project(':packexport')
- runtimeOnly project(':packsquashstep')
- runtimeOnly project(':zipstep')
-
- runtimeOnly "sniffle:discordrpc"
- runtimeOnly "sniffle:pluginmanager"
- runtimeOnly "sniffle:settingsgui"
- runtimeOnly "sniffle:tipoftheday"
- }
-
- application {
- mainClassName = 'com.deflatedpickle.quiver.launcher.MainKt'
- }
+ /*applicationDefaultJvmArgs = [
+ "-XX:+UseG1GC"
+ ]*/
+
+ args = ['indev']
+
+ doFirst {
+ file('run').mkdirs()
+
+ copy {
+ from 'data'
+ into 'run/data'
+ }
+ }
+
+ workingDir 'run'
+
+ dependencies {
+ implementation project(':core')
+ runtimeOnly project(':launcher')
+
+ runtimeOnly project(':foldertree')
+ runtimeOnly project(':filetable')
+ runtimeOnly project(':filepanel')
+
+ runtimeOnly project(':textviewer')
+ runtimeOnly project(':tableviewer')
+ runtimeOnly project(':imageviewer')
+ runtimeOnly project(':treeviewer')
+ runtimeOnly project(':markdownviewer')
+ runtimeOnly project(':spritesheetviewer')
+
+ runtimeOnly project(':packexport')
+ runtimeOnly project(':packsquashstep')
+ runtimeOnly project(':zipstep')
+
+ // runtimeOnly project(':discordrpc')
+ runtimeOnly project(':pluginmanager')
+ runtimeOnly project(':settingsgui')
+ runtimeOnly project(':tipoftheday')
+ }
+
+ application {
+ mainClassName = 'com.deflatedpickle.quiver.launcher.MainKt'
+ }
}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/Quiver.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/Quiver.kt
index 963178b..453bf82 100644
--- a/core/src/main/kotlin/com/deflatedpickle/quiver/Quiver.kt
+++ b/core/src/main/kotlin/com/deflatedpickle/quiver/Quiver.kt
@@ -13,7 +13,7 @@ import java.io.File
@Plugin(
value = "quiver",
author = "DeflatedPickle",
- version = "1.7.0",
+ version = "1.9.1",
description = """
A program for creating Minecraft resource-packs
diff --git a/gradle.properties b/gradle.properties
index 3370571..51b6451 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ kotlin.code.style=official
name=Quiver
group=com.deflatedpickle
-version=1.7.0
+version=1.9.1
licenseFolder=licenses
diff --git a/libs/sniffle b/libs/sniffle
index d081971..f81ed5e 160000
--- a/libs/sniffle
+++ b/libs/sniffle
@@ -1 +1 @@
-Subproject commit d081971a7f93dfaf9e47d2f8fd3fa7fb99f4909f
+Subproject commit f81ed5e32756350b2e89dbf37d887822af0154d9
diff --git a/settings.gradle b/settings.gradle
index bc68ef0..a73b0d3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -33,9 +33,15 @@ include 'zipstep'
// Include the libraries I use and own
// This is so I can fix any issues easier
+// include 'libs:sniffle:discordrpc'
+
+[/*'discordrpc',*/ 'pluginmanager', 'settingsgui', 'tipoftheday'].each {
+ include it
+ project(":$it").projectDir = new File(settingsDir, "libs/sniffle/$it")
+}
+
includeBuild 'libs/haruhi'
includeBuild 'libs/marvin'
includeBuild 'libs/nagato'
includeBuild 'libs/tosuto'
includeBuild 'libs/undulation'
-includeBuild 'libs/sniffle'