From f046faf0305c294d1e9005dd465f243f8af1c9ba Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 26 Aug 2021 17:42:24 +0800
Subject: [PATCH] Update transformerVersion to 5.1.53

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .github/workflows/gradle.yml                              | 1 +
 gradle.properties                                         | 4 ++--
 .../kotlin/dev/architectury/plugin/ArchitecturyPlugin.kt  | 2 --
 .../architectury/plugin/ArchitecturyPluginExtension.kt    | 6 +++---
 .../dev/architectury/plugin/transformers/AddRefmapName.kt | 8 ++++----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6531461..a9ce7fd 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - 3.3
+      - 3.4
 
 jobs:
   build:
diff --git a/gradle.properties b/gradle.properties
index 1b5bc4d..8682628 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
 loom_version_old=0.6.96
 loom_version_new=0.9.0.158
-transformer_version=4.1.51
-base_version=3.3
\ No newline at end of file
+transformer_version=5.1.53
+base_version=3.4
\ No newline at end of file
diff --git a/src/main/kotlin/dev/architectury/plugin/ArchitecturyPlugin.kt b/src/main/kotlin/dev/architectury/plugin/ArchitecturyPlugin.kt
index 22848c3..8a0483e 100644
--- a/src/main/kotlin/dev/architectury/plugin/ArchitecturyPlugin.kt
+++ b/src/main/kotlin/dev/architectury/plugin/ArchitecturyPlugin.kt
@@ -1,7 +1,5 @@
 package dev.architectury.plugin
 
-import dev.architectury.plugin.transformers.AddRefmapName
-import dev.architectury.transformer.transformers.*
 import dev.architectury.transformer.util.LoggerFilter
 import org.gradle.api.Plugin
 import org.gradle.api.Project
diff --git a/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt b/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt
index d89c2d2..7127ece 100644
--- a/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt
+++ b/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt
@@ -5,7 +5,7 @@ package dev.architectury.plugin
 import dev.architectury.plugin.loom.LoomInterface
 import dev.architectury.plugin.transformers.AddRefmapName
 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.gson.Gson
 import dev.architectury.transformer.shadowed.impl.com.google.gson.JsonObject
@@ -28,7 +28,7 @@ import java.util.jar.JarOutputStream
 import java.util.jar.Manifest
 
 open class ArchitectPluginExtension(val project: Project) {
-    var transformerVersion = "4.1.51"
+    var transformerVersion = "5.1.53"
     var injectablesVersion = "1.0.10"
     var minecraft = ""
     var injectInjectables = true
@@ -283,7 +283,7 @@ open class ArchitectPluginExtension(val project: Project) {
                     val output = it.archiveFile.get().asFile
 
                     try {
-                        OpenedOutputInterface.ofJar(output.toPath()).use { inter ->
+                        OpenedFileAccess.ofJar(output.toPath()).use { inter ->
                             inter.addFile("architectury.common.marker", "")
                         }
                     } catch (t: Throwable) {
diff --git a/src/main/kotlin/dev/architectury/plugin/transformers/AddRefmapName.kt b/src/main/kotlin/dev/architectury/plugin/transformers/AddRefmapName.kt
index 54f5fdd..b579943 100644
--- a/src/main/kotlin/dev/architectury/plugin/transformers/AddRefmapName.kt
+++ b/src/main/kotlin/dev/architectury/plugin/transformers/AddRefmapName.kt
@@ -3,7 +3,7 @@ package dev.architectury.plugin.transformers
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
 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.base.AssetEditTransformer
 import dev.architectury.transformer.transformers.base.edit.TransformerContext
@@ -12,12 +12,12 @@ import java.io.ByteArrayInputStream
 
 class AddRefmapName : AssetEditTransformer {
     val gson = GsonBuilder().setPrettyPrinting().create()
-    override fun doEdit(context: TransformerContext, output: OutputInterface) {
+    override fun doEdit(context: TransformerContext, output: FileAccess) {
         val mixins = mutableSetOf<String>()
         output.handle { path, bytes ->
             // Check JSON file in root directory
-            if (path.endsWith(".json") && !Transform.stripLoadingSlash(path)
-                    .contains("/") && !Transform.stripLoadingSlash(path).contains("\\")
+            if (path.endsWith(".json") && !Transform.trimLeadingSlash(path)
+                    .contains("/") && !Transform.trimLeadingSlash(path).contains("\\")
             ) {
                 Logger.debug("Checking whether $path is a mixin config.")
                 try {