diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe6b3ad..4eb41a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,6 @@ deploy: only: - master -gradle-publish: +log_id: script: - - gradle publish + - echo "$CI_PIPELINE_IID et $CI_PIPELINE_ID" diff --git a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/AsmTransformer.java b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/AsmTransformer.java index dd53605..9fd7d5f 100644 --- a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/AsmTransformer.java +++ b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/AsmTransformer.java @@ -12,21 +12,20 @@ public class AsmTransformer extends FabricMixinTransformerProxy { public AsmConfig asmConfig; @Override - public byte[] transformClassBytes(String name, String transformedName, byte[] basicClass) { - byte[] data = delegate.transformClassBytes(name, transformedName, basicClass); - if (data == null || name == null) - return basicClass; - basicClass = data; + public byte[] transformClassBytes(String name, String transformedName, byte[] classBytes) { + classBytes = delegate.transformClassBytes(name, transformedName, classBytes); + if (classBytes == null || name == null) + return classBytes; if (name.startsWith("org.objectweb.asm") || name.startsWith("net.fabricmc.loader") || name.startsWith("net.minecraft") || name.startsWith("io.gitlab.jfronny.libjf.unsafe.asm") || name.startsWith("joptsimple") ) - return basicClass; + return classBytes; ClassNode klass = new ClassNode(); - ClassReader reader = new ClassReader(basicClass); + ClassReader reader = new ClassReader(classBytes); reader.accept(klass, ClassReader.EXPAND_FRAMES); for (Patch patch : asmConfig.getPatches()) { @@ -35,7 +34,7 @@ public class AsmTransformer extends FabricMixinTransformerProxy { ClassWriter writer = new MixinClassWriter(reader, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); klass.accept(writer); - basicClass = writer.toByteArray(); - return basicClass; + classBytes = writer.toByteArray(); + return classBytes; } }