imports/architectury-plugin
1
0
Fork 0
mirror of https://github.com/architectury/architectury-plugin.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update transformerVersion to 5.1.53

Browse Source 
Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2021-08-26 17:42:24 +08:00
parent 79df571fa8
commit f046faf030
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/gradle.yml vendored
View File

@@ -5,6 +5,7 @@ on:
branches: branches:
- master - master
- 3.3 - 3.3
- 3.4
jobs: jobs:
build: build:

4
gradle.properties
View File

@@ -1,5 +1,5 @@
kotlin.code.style=official kotlin.code.style=official
loom_version_old=0.6.96 loom_version_old=0.6.96
loom_version_new=0.9.0.158 loom_version_new=0.9.0.158
transformer_version=4.1.51 transformer_version=5.1.53
base_version=3.3 base_version=3.4

2
src/main/kotlin/dev/architectury/plugin/ArchitecturyPlugin.kt
View File

@@ -1,7 +1,5 @@
package dev.architectury.plugin package dev.architectury.plugin
import dev.architectury.plugin.transformers.AddRefmapName
import dev.architectury.transformer.transformers.*
import dev.architectury.transformer.util.LoggerFilter import dev.architectury.transformer.util.LoggerFilter
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project

6
src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt
View File

@@ -5,7 +5,7 @@ package dev.architectury.plugin
import dev.architectury.plugin.loom.LoomInterface import dev.architectury.plugin.loom.LoomInterface
import dev.architectury.plugin.transformers.AddRefmapName import dev.architectury.plugin.transformers.AddRefmapName
import dev.architectury.transformer.Transformer import dev.architectury.transformer.Transformer
import dev.architectury.transformer.input.OpenedOutputInterface import dev.architectury.transformer.input.OpenedFileAccess
import dev.architectury.transformer.shadowed.impl.com.google.common.hash.Hashing import dev.architectury.transformer.shadowed.impl.com.google.common.hash.Hashing
import dev.architectury.transformer.shadowed.impl.com.google.gson.Gson import dev.architectury.transformer.shadowed.impl.com.google.gson.Gson
import dev.architectury.transformer.shadowed.impl.com.google.gson.JsonObject import dev.architectury.transformer.shadowed.impl.com.google.gson.JsonObject
@@ -28,7 +28,7 @@ import java.util.jar.JarOutputStream
import java.util.jar.Manifest import java.util.jar.Manifest
open class ArchitectPluginExtension(val project: Project) { open class ArchitectPluginExtension(val project: Project) {
var transformerVersion = "4.1.51" var transformerVersion = "5.1.53"
var injectablesVersion = "1.0.10" var injectablesVersion = "1.0.10"
var minecraft = "" var minecraft = ""
var injectInjectables = true var injectInjectables = true
@@ -283,7 +283,7 @@ open class ArchitectPluginExtension(val project: Project) {
val output = it.archiveFile.get().asFile val output = it.archiveFile.get().asFile
try { try {
OpenedOutputInterface.ofJar(output.toPath()).use { inter -> OpenedFileAccess.ofJar(output.toPath()).use { inter ->
inter.addFile("architectury.common.marker", "") inter.addFile("architectury.common.marker", "")
} }
} catch (t: Throwable) { } catch (t: Throwable) {

8
src/main/kotlin/dev/architectury/plugin/transformers/AddRefmapName.kt
View File

@@ -3,7 +3,7 @@ package dev.architectury.plugin.transformers
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import com.google.gson.JsonObject import com.google.gson.JsonObject
import dev.architectury.transformer.Transform import dev.architectury.transformer.Transform
import dev.architectury.transformer.input.OutputInterface import dev.architectury.transformer.input.FileAccess
import dev.architectury.transformer.transformers.BuiltinProperties import dev.architectury.transformer.transformers.BuiltinProperties
import dev.architectury.transformer.transformers.base.AssetEditTransformer import dev.architectury.transformer.transformers.base.AssetEditTransformer
import dev.architectury.transformer.transformers.base.edit.TransformerContext import dev.architectury.transformer.transformers.base.edit.TransformerContext
@@ -12,12 +12,12 @@ import java.io.ByteArrayInputStream
class AddRefmapName : AssetEditTransformer { class AddRefmapName : AssetEditTransformer {
val gson = GsonBuilder().setPrettyPrinting().create() val gson = GsonBuilder().setPrettyPrinting().create()
override fun doEdit(context: TransformerContext, output: OutputInterface) { override fun doEdit(context: TransformerContext, output: FileAccess) {
val mixins = mutableSetOf<String>() val mixins = mutableSetOf<String>()
output.handle { path, bytes -> output.handle { path, bytes ->
// Check JSON file in root directory // Check JSON file in root directory
if (path.endsWith(".json") && !Transform.stripLoadingSlash(path) if (path.endsWith(".json") && !Transform.trimLeadingSlash(path)
.contains("/") && !Transform.stripLoadingSlash(path).contains("\\") .contains("/") && !Transform.trimLeadingSlash(path).contains("\\")
) { ) {
Logger.debug("Checking whether $path is a mixin config.") Logger.debug("Checking whether $path is a mixin config.")
try { try {