-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
v2.0.4
- Loading branch information
Showing
108 changed files
with
504 additions
and
328 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,10 @@ plugins { | |
| `kotlin-dsl` | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(libs.guava) | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| dependencyResolutionManagement { | ||
| versionCatalogs { | ||
| create("libs") { | ||
| from(files("../gradle/libs.versions.toml")) | ||
| } | ||
| } | ||
| } |
107 changes: 107 additions & 0 deletions
107
buildSrc/src/main/kotlin/gg/essential/util/prebundleNow.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package gg.essential.util | ||
|
|
||
| import com.google.common.base.Stopwatch | ||
| import org.gradle.api.Project | ||
| import org.gradle.api.artifacts.Configuration | ||
| import org.gradle.api.file.FileCollection | ||
| import org.gradle.api.logging.Logger | ||
| import org.gradle.api.tasks.util.PatternFilterable | ||
| import org.gradle.api.tasks.util.PatternSet | ||
| import java.io.File | ||
| import java.io.OutputStream | ||
| import java.security.MessageDigest | ||
| import java.util.* | ||
| import java.util.jar.JarOutputStream | ||
| import java.util.zip.ZipEntry | ||
|
|
||
| val CONSTANT_TIME_FOR_ZIP_ENTRIES = GregorianCalendar(1980, Calendar.FEBRUARY, 1, 0, 0, 0).timeInMillis | ||
|
|
||
| /** | ||
| * Bundles all dependencies from the given [configuration] into a single, dedicated jar and returns a file collection | ||
| * containing that jar. | ||
| * Primarily for use in dependency declarations, so fat jars of certain dependencies (with potentially relocated | ||
| * transitive dependencies) can be created and then depended upon as usual. Compared to simply relocating in a later | ||
| * shadow task, this has the advantage that IDEA will see the relocated dependency rather than the original, which e.g. | ||
| * allows one to use two different versions of the same dependency at dev time. | ||
| * | ||
| * If [jijName] is provided, the fat jar will additionally be wrapped in an outer jar, such that the classes are not | ||
| * actually visible if the file collection is put onto the classpath. This may be useful when the jar is never meant to | ||
| * directly be on the classpath but rather only in a dedicated class loader or JVM. | ||
| * The given [jijName] determines the path+name of the inner jar within the outer jar. | ||
| */ | ||
| fun Project.prebundleNow(configuration: Configuration, jijName: String? = null, configure: PatternFilterable.() -> Unit = {}): FileCollection { | ||
| val output = projectDir | ||
| .resolve(".gradle") | ||
| .resolve("prebundled-jars") | ||
| .resolve("${configuration.name}.jar") | ||
|
|
||
| val filter = PatternSet().apply(configure) | ||
|
|
||
| bundle(configuration, filter, jijName, output, logger) | ||
|
|
||
| return files(output) | ||
| } | ||
|
|
||
| private fun Project.bundle(configuration: Configuration, filter: PatternSet, jijName: String?, output: File, logger: Logger) { | ||
| output.parentFile.mkdirs() | ||
|
|
||
| val hash = configuration.computeHash().apply { | ||
| update(filter.hashCode().toBigInteger().toByteArray()) | ||
| update(jijName?.toByteArray() ?: byteArrayOf()) | ||
| update(byteArrayOf(0, 0, 0, 2)) // code version, incremented with each semantic change | ||
| }.digest() | ||
| val hashFile = output.resolveSibling(output.name + ".md5") | ||
| if (hashFile.exists() && hashFile.readBytes().contentEquals(hash) && output.exists()) { | ||
| return | ||
| } | ||
| hashFile.delete() | ||
| output.delete() | ||
|
|
||
| val stopwatch = Stopwatch.createStarted() | ||
| logger.lifecycle(":preparing ${configuration.name} jar") | ||
|
|
||
| val spec = filter.asSpec | ||
| val visitedEntries = mutableSetOf<String>() | ||
| output.outputStream().use { fileOut_ -> | ||
| var fileOut: OutputStream = fileOut_ | ||
| if (jijName != null) { | ||
| fileOut = JarOutputStream(fileOut).apply { | ||
| putNextEntry(ZipEntry(jijName)) | ||
| } | ||
| } | ||
| JarOutputStream(fileOut).use { jarOut -> | ||
| for (sourceFile in configuration.files) { | ||
| project.zipTree(sourceFile).visit { | ||
| if (!visitedEntries.add(path)) return@visit | ||
| if (!spec.isSatisfiedBy(this)) return@visit | ||
|
|
||
| jarOut.putNextEntry(ZipEntry(if (isDirectory) "$path/" else path).apply { time = CONSTANT_TIME_FOR_ZIP_ENTRIES }) | ||
| open().use { copyTo(jarOut) } | ||
| jarOut.closeEntry() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| hashFile.writeBytes(hash) | ||
|
|
||
| logger.lifecycle(":prepared ${configuration.name} jar in $stopwatch") | ||
| } | ||
|
|
||
| private fun Configuration.computeHash(): MessageDigest = files | ||
| .sortedBy { it.name } | ||
| .fold(MessageDigest.getInstance("MD5")) { digest, file -> | ||
| // if the file path already contains a hash, that's good enough, otherwise we need to read its contents | ||
| digest.update(file.findHashInPath()?.toByteArray() ?: file.readBytes()) | ||
| digest | ||
| } | ||
|
|
||
| private fun File.findHashInPath(): String? { | ||
| val path = absolutePath.replace('\\', '/') | ||
| if ("/caches/modules-2/files-2.1/" in path && parentFile.name.length == 40) { | ||
| return parentFile.name | ||
| } | ||
| if ("/caches/transforms-3/" in path && parentFile.parentFile.name.length == 32) { | ||
| return parentFile.parentFile.name | ||
| } | ||
| return null | ||
| } |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
client/src/main/java/su/plo/lib/mod/client/chat/ClientChatUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
client/src/main/java/su/plo/lib/mod/client/chat/ClientTextConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractButton.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractScrollbar.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractSlider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
client/src/main/java/su/plo/lib/mod/client/gui/components/Button.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
client/src/main/java/su/plo/lib/mod/client/gui/components/IconButton.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
client/src/main/java/su/plo/lib/mod/client/gui/components/TextFieldWidget.java
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.