diff --git a/build.gradle b/build.gradle index 02f00899df..69f89ae5a4 100644 --- a/build.gradle +++ b/build.gradle @@ -233,7 +233,7 @@ def allJar = tasks.register('allJar', Jar) {allJar -> manifest { attributes ( 'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler', - 'Implementation-Name': "Quiltflower", + 'Implementation-Name': "Vineflower", 'Implementation-Version': project.version ) } diff --git a/plugins/idea-not-null/build.gradle b/plugins/idea-not-null/build.gradle index 9dbf5ad213..4db1e4e6cd 100644 --- a/plugins/idea-not-null/build.gradle +++ b/plugins/idea-not-null/build.gradle @@ -1,4 +1,4 @@ -archivesBaseName = 'quiltflower-plugin-idea-not-null' +archivesBaseName = 'vineflower-idea-not-null' dependencies { implementation project(":") diff --git a/plugins/idea-not-null/src/main/java/org/quiltmc/quiltflower/plugin/ideanonnull/IdeaNotNullPass.java b/plugins/idea-not-null/src/main/java/org/vineflower/ideanotnull/IdeaNotNullPass.java similarity index 99% rename from plugins/idea-not-null/src/main/java/org/quiltmc/quiltflower/plugin/ideanonnull/IdeaNotNullPass.java rename to plugins/idea-not-null/src/main/java/org/vineflower/ideanotnull/IdeaNotNullPass.java index c36bc5c737..17e29465e6 100644 --- a/plugins/idea-not-null/src/main/java/org/quiltmc/quiltflower/plugin/ideanonnull/IdeaNotNullPass.java +++ b/plugins/idea-not-null/src/main/java/org/vineflower/ideanotnull/IdeaNotNullPass.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.plugin.ideanonnull; +package org.vineflower.ideanotnull; import org.jetbrains.java.decompiler.api.passes.Pass; import org.jetbrains.java.decompiler.api.passes.PassContext; diff --git a/plugins/idea-not-null/src/main/java/org/quiltmc/quiltflower/plugin/ideanonnull/IdeaNotNullPlugin.java b/plugins/idea-not-null/src/main/java/org/vineflower/ideanotnull/IdeaNotNullPlugin.java similarity index 84% rename from plugins/idea-not-null/src/main/java/org/quiltmc/quiltflower/plugin/ideanonnull/IdeaNotNullPlugin.java rename to plugins/idea-not-null/src/main/java/org/vineflower/ideanotnull/IdeaNotNullPlugin.java index 9faa0edf2b..fcffb005da 100644 --- a/plugins/idea-not-null/src/main/java/org/quiltmc/quiltflower/plugin/ideanonnull/IdeaNotNullPlugin.java +++ b/plugins/idea-not-null/src/main/java/org/vineflower/ideanotnull/IdeaNotNullPlugin.java @@ -1,10 +1,9 @@ -package org.quiltmc.quiltflower.plugin.ideanonnull; +package org.vineflower.ideanotnull; import org.jetbrains.java.decompiler.api.Plugin; import org.jetbrains.java.decompiler.api.java.JavaPassLocation; import org.jetbrains.java.decompiler.api.java.JavaPassRegistrar; import org.jetbrains.java.decompiler.api.passes.NamedPass; -import org.jetbrains.java.decompiler.api.passes.Pass; import java.util.List; diff --git a/plugins/idea-not-null/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin b/plugins/idea-not-null/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin index f38f8d0a48..9b1e901ede 100644 --- a/plugins/idea-not-null/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin +++ b/plugins/idea-not-null/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin @@ -1 +1 @@ -org.quiltmc.quiltflower.plugin.ideanonnull.IdeaNotNullPlugin \ No newline at end of file +org.vineflower.ideanotnull.IdeaNotNullPlugin \ No newline at end of file diff --git a/plugins/idea-not-null/src/test/java/org/quiltmc/quiltflower/plugin/ideanotnull/InnClassesTest.java b/plugins/idea-not-null/src/test/java/org/vineflower/ideanotnull/InnClassesTest.java similarity index 94% rename from plugins/idea-not-null/src/test/java/org/quiltmc/quiltflower/plugin/ideanotnull/InnClassesTest.java rename to plugins/idea-not-null/src/test/java/org/vineflower/ideanotnull/InnClassesTest.java index 6325d62807..cef4bf35fb 100644 --- a/plugins/idea-not-null/src/test/java/org/quiltmc/quiltflower/plugin/ideanotnull/InnClassesTest.java +++ b/plugins/idea-not-null/src/test/java/org/vineflower/ideanotnull/InnClassesTest.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.plugin.ideanotnull; +package org.vineflower.ideanotnull; import org.jetbrains.java.decompiler.SingleClassesTestBase; import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; diff --git a/plugins/kotlin/build.gradle b/plugins/kotlin/build.gradle index be90aac0c5..a744443f9c 100644 --- a/plugins/kotlin/build.gradle +++ b/plugins/kotlin/build.gradle @@ -6,9 +6,9 @@ plugins { apply plugin: 'maven-publish' -group = 'org.quiltmc' +group = 'org.vineflower' version = "0.1.0" -archivesBaseName = 'quiltflower-kotlin' +archivesBaseName = 'vineflower-kotlin' sourceSets { testDataKotlin.kotlin.srcDirs files("testData/src/kt/") @@ -44,12 +44,13 @@ shadowJar { build.dependsOn(shadowJar) -publishing { - publications { - mavenJava(MavenPublication) { - artifactId = "quiltflower-kotlin" - from components.java - artifact(shadowJar) - } - } -} \ No newline at end of file +// TODO: re-enable after we're publishing for this! +//publishing { +// publications { +// mavenJava(MavenPublication) { +// artifactId = "vineflower-kotlin" +// from components.java +// artifact(shadowJar) +// } +// } +//} \ No newline at end of file diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinChooser.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinChooser.java similarity index 96% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinChooser.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinChooser.java index c434244b61..017c3ea345 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinChooser.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinChooser.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin; +package org.vineflower.kotlin; import kotlin.reflect.jvm.internal.impl.metadata.ProtoBuf; import kotlin.reflect.jvm.internal.impl.metadata.jvm.JvmProtoBuf; @@ -7,7 +7,7 @@ import org.jetbrains.java.decompiler.main.DecompilerContext; import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; import org.jetbrains.java.decompiler.util.Key; -import org.quiltmc.quiltflower.kotlin.metadata.BitEncoding; +import org.vineflower.kotlin.metadata.BitEncoding; import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent; import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; @@ -15,7 +15,7 @@ import org.jetbrains.java.decompiler.struct.StructClass; import org.jetbrains.java.decompiler.struct.attr.StructAnnotationAttribute; import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; -import org.quiltmc.quiltflower.kotlin.metadata.MetadataNameResolver; +import org.vineflower.kotlin.metadata.MetadataNameResolver; import java.io.ByteArrayInputStream; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinDecompilationContext.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinDecompilationContext.java similarity index 94% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinDecompilationContext.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinDecompilationContext.java index 78213ffaaf..5be3339211 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinDecompilationContext.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinDecompilationContext.java @@ -1,9 +1,9 @@ -package org.quiltmc.quiltflower.kotlin; +package org.vineflower.kotlin; import kotlin.reflect.jvm.internal.impl.metadata.ProtoBuf; import org.jetbrains.java.decompiler.main.DecompilerContext; import org.jetbrains.java.decompiler.util.Key; -import org.quiltmc.quiltflower.kotlin.metadata.MetadataNameResolver; +import org.vineflower.kotlin.metadata.MetadataNameResolver; public class KotlinDecompilationContext { public enum KotlinType { diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinImportCollector.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinImportCollector.java similarity index 97% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinImportCollector.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinImportCollector.java index a578b36143..2cf27d887f 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinImportCollector.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinImportCollector.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin; +package org.vineflower.kotlin; import org.jetbrains.java.decompiler.main.collectors.ImportCollector; import org.jetbrains.java.decompiler.util.TextBuffer; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinPlugin.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinPlugin.java similarity index 98% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinPlugin.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinPlugin.java index f18e02442a..ac059d3e8a 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinPlugin.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinPlugin.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin; +package org.vineflower.kotlin; import org.jetbrains.java.decompiler.api.Plugin; import org.jetbrains.java.decompiler.api.language.LanguageSpec; @@ -8,7 +8,7 @@ import org.jetbrains.java.decompiler.api.passes.WrappedPass; import org.jetbrains.java.decompiler.modules.decompiler.*; import org.jetbrains.java.decompiler.modules.decompiler.decompose.DomHelper; -import org.quiltmc.quiltflower.kotlin.pass.*; +import org.vineflower.kotlin.pass.*; public class KotlinPlugin implements Plugin { private static final StackVarsProcessor.StackSimplifyOptions INLINE_ALL_VARS = new StackVarsProcessor.StackSimplifyOptions() diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinWriter.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinWriter.java similarity index 98% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinWriter.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinWriter.java index 5f48171789..f53efa765b 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/KotlinWriter.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinWriter.java @@ -1,5 +1,5 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.quiltmc.quiltflower.kotlin; +package org.vineflower.kotlin; import kotlin.reflect.jvm.internal.impl.metadata.ProtoBuf; import net.fabricmc.fernflower.api.IFabricJavadocProvider; @@ -37,10 +37,9 @@ import org.jetbrains.java.decompiler.util.TextBuffer; import org.jetbrains.java.decompiler.util.TextUtil; import org.jetbrains.java.decompiler.util.collections.VBStyleCollection; -import org.quiltmc.quiltflower.kotlin.expr.KAnnotationExprent; -import org.quiltmc.quiltflower.kotlin.metadata.MetadataNameResolver; -import org.quiltmc.quiltflower.kotlin.util.KTypes; -import org.quiltmc.quiltflower.kotlin.util.ProtobufFlags; +import org.vineflower.kotlin.expr.KAnnotationExprent; +import org.vineflower.kotlin.util.KTypes; +import org.vineflower.kotlin.util.ProtobufFlags; import java.io.IOException; import java.util.*; @@ -96,7 +95,7 @@ public KotlinWriter() { private static boolean invokeProcessors(TextBuffer buffer, ClassNode node) { ClassWrapper wrapper = node.getWrapper(); if (wrapper == null) { - buffer.append("/* $QF: Couldn't be decompiled. Class " + node.classStruct.qualifiedName + " wasn't processed yet! */"); + buffer.append("/* $VF: Couldn't be decompiled. Class " + node.classStruct.qualifiedName + " wasn't processed yet! */"); List lines = new ArrayList<>(); lines.addAll(KotlinWriter.getErrorComment()); for (String line : lines) { @@ -129,7 +128,7 @@ private static boolean invokeProcessors(TextBuffer buffer, ClassNode node) { DecompilerContext.getLogger().writeMessage("Class " + node.simpleName + " couldn't be written.", IFernflowerLogger.Severity.WARN, t); - buffer.append("// $QF: Couldn't be decompiled"); + buffer.append("// $VF: Couldn't be decompiled"); buffer.appendLineSeparator(); if (DecompilerContext.getOption(IFernflowerPreferences.DUMP_EXCEPTION_ON_ERROR)) { List lines = new ArrayList<>(); @@ -209,7 +208,7 @@ public void writeClass(ClassNode node, TextBuffer buffer, int indent) { buffer .appendIndent(indent) - .append("// $QF: Compiled from " + sourceFile) + .append("// $VF: Compiled from " + sourceFile) .appendLineSeparator(); } } @@ -1101,7 +1100,7 @@ else if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarT private static void dumpError(TextBuffer buffer, MethodWrapper wrapper, int indent) { List lines = new ArrayList<>(); - lines.add("$QF: Couldn't be decompiled"); + lines.add("$VF: Couldn't be decompiled"); boolean exceptions = DecompilerContext.getOption(IFernflowerPreferences.DUMP_EXCEPTION_ON_ERROR); boolean bytecode = DecompilerContext.getOption(IFernflowerPreferences.DUMP_BYTECODE_ON_ERROR); if (exceptions) { @@ -1345,7 +1344,7 @@ private static void appendRenameComment(TextBuffer buffer, String oldName, MType if (oldName == null) return; buffer.appendIndent(indent); - buffer.append("// $QF: renamed from: "); + buffer.append("// $VF: renamed from: "); switch (type) { case CLASS: @@ -1394,11 +1393,11 @@ public static List getErrorComment() { } private static void appendComment(TextBuffer buffer, String comment, int indent) { - buffer.appendIndent(indent).append("// $QF: ").append(comment).appendLineSeparator(); + buffer.appendIndent(indent).append("// $VF: ").append(comment).appendLineSeparator(); } private static void appendInlineComment(TextBuffer buffer, String comment) { - buffer.append("/* $QF: ").append(comment).append(" */"); + buffer.append("/* $VF: ").append(comment).append(" */"); } private static void appendJavadoc(TextBuffer buffer, String javaDoc, int indent) { diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KAnnotationExprent.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KAnnotationExprent.java similarity index 96% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KAnnotationExprent.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KAnnotationExprent.java index 540be64aca..c7432ca7b8 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KAnnotationExprent.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KAnnotationExprent.java @@ -1,11 +1,11 @@ -package org.quiltmc.quiltflower.kotlin.expr; +package org.vineflower.kotlin.expr; import org.jetbrains.java.decompiler.main.DecompilerContext; import org.jetbrains.java.decompiler.modules.decompiler.exps.*; import org.jetbrains.java.decompiler.struct.gen.VarType; import org.jetbrains.java.decompiler.util.TextBuffer; -import org.quiltmc.quiltflower.kotlin.util.KTypes; -import org.quiltmc.quiltflower.kotlin.util.KUtils; +import org.vineflower.kotlin.util.KTypes; +import org.vineflower.kotlin.util.KUtils; public class KAnnotationExprent extends AnnotationExprent implements KExprent { public enum UseSiteTarget { diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KConstExprent.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KConstExprent.java similarity index 95% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KConstExprent.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KConstExprent.java index f95df6f1a2..490ff2be0f 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KConstExprent.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KConstExprent.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.expr; +package org.vineflower.kotlin.expr; import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; import org.jetbrains.java.decompiler.modules.decompiler.exps.ExprUtil; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KExprent.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KExprent.java similarity index 64% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KExprent.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KExprent.java index 05ebb6e9f1..898d3d5cb5 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KExprent.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KExprent.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.expr; +package org.vineflower.kotlin.expr; /** * Marker interface for Kotlin exprents. diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KFieldExprent.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KFieldExprent.java similarity index 90% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KFieldExprent.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KFieldExprent.java index 7964eef50f..412729b3b7 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KFieldExprent.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KFieldExprent.java @@ -1,10 +1,10 @@ -package org.quiltmc.quiltflower.kotlin.expr; +package org.vineflower.kotlin.expr; import org.jetbrains.java.decompiler.modules.decompiler.exps.ExprUtil; import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent; import org.jetbrains.java.decompiler.struct.gen.VarType; import org.jetbrains.java.decompiler.util.TextBuffer; -import org.quiltmc.quiltflower.kotlin.util.KTypes; +import org.vineflower.kotlin.util.KTypes; public class KFieldExprent extends FieldExprent implements KExprent { public KFieldExprent(FieldExprent field) { diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KFunctionExprent.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KFunctionExprent.java similarity index 98% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KFunctionExprent.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KFunctionExprent.java index 001a043073..c18841d4dd 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KFunctionExprent.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KFunctionExprent.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.expr; +package org.vineflower.kotlin.expr; import org.jetbrains.java.decompiler.code.CodeConstants; import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; @@ -9,8 +9,8 @@ import org.jetbrains.java.decompiler.struct.gen.VarType; import org.jetbrains.java.decompiler.util.TextBuffer; import org.jetbrains.java.decompiler.util.Typed; -import org.quiltmc.quiltflower.kotlin.util.KTypes; -import org.quiltmc.quiltflower.kotlin.util.KUtils; +import org.vineflower.kotlin.util.KTypes; +import org.vineflower.kotlin.util.KUtils; import java.util.ArrayList; import java.util.BitSet; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KInvocationExprent.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KInvocationExprent.java similarity index 93% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KInvocationExprent.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KInvocationExprent.java index b4b0b47193..342509e396 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KInvocationExprent.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KInvocationExprent.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.expr; +package org.vineflower.kotlin.expr; import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KVarExprent.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KVarExprent.java similarity index 92% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KVarExprent.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KVarExprent.java index 141cbd7277..b6afd16e6e 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/expr/KVarExprent.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/expr/KVarExprent.java @@ -1,12 +1,12 @@ -package org.quiltmc.quiltflower.kotlin.expr; +package org.vineflower.kotlin.expr; import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; import org.jetbrains.java.decompiler.struct.gen.VarType; import org.jetbrains.java.decompiler.util.TextBuffer; -import org.quiltmc.quiltflower.kotlin.KotlinWriter; -import org.quiltmc.quiltflower.kotlin.util.KTypes; +import org.vineflower.kotlin.KotlinWriter; +import org.vineflower.kotlin.util.KTypes; import java.util.BitSet; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/metadata/BitEncoding.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/BitEncoding.java similarity index 98% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/metadata/BitEncoding.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/BitEncoding.java index 538dd7de6b..8ab5757f7f 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/metadata/BitEncoding.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/BitEncoding.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.quiltmc.quiltflower.kotlin.metadata; +package org.vineflower.kotlin.metadata; public class BitEncoding { diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/metadata/MetadataNameResolver.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/MetadataNameResolver.java similarity index 98% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/metadata/MetadataNameResolver.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/MetadataNameResolver.java index 95e5f09f5b..4bc0cbcfa8 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/metadata/MetadataNameResolver.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/MetadataNameResolver.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.metadata; +package org.vineflower.kotlin.metadata; import kotlin.reflect.jvm.internal.impl.metadata.jvm.JvmProtoBuf; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/EliminateDeadVarsPass.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/EliminateDeadVarsPass.java similarity index 98% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/EliminateDeadVarsPass.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/EliminateDeadVarsPass.java index 731e015265..0cc322ec23 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/EliminateDeadVarsPass.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/EliminateDeadVarsPass.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.pass; +package org.vineflower.kotlin.pass; import org.jetbrains.java.decompiler.api.passes.Pass; import org.jetbrains.java.decompiler.api.passes.PassContext; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/JavaFinallyPass.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/JavaFinallyPass.java similarity index 96% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/JavaFinallyPass.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/JavaFinallyPass.java index 496a161dda..b23b9b1d15 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/JavaFinallyPass.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/JavaFinallyPass.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.pass; +package org.vineflower.kotlin.pass; import org.jetbrains.java.decompiler.api.passes.Pass; import org.jetbrains.java.decompiler.api.passes.PassContext; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/KMergePass.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/KMergePass.java similarity index 99% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/KMergePass.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/KMergePass.java index ed5808c394..4e2feb83e3 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/KMergePass.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/KMergePass.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.pass; +package org.vineflower.kotlin.pass; import org.jetbrains.java.decompiler.api.passes.Pass; import org.jetbrains.java.decompiler.api.passes.PassContext; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/ReplaceExprentsPass.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/ReplaceExprentsPass.java similarity index 93% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/ReplaceExprentsPass.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/ReplaceExprentsPass.java index d936938985..c935dcae1d 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/ReplaceExprentsPass.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/ReplaceExprentsPass.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.pass; +package org.vineflower.kotlin.pass; import org.jetbrains.java.decompiler.api.passes.Pass; import org.jetbrains.java.decompiler.api.passes.PassContext; @@ -6,8 +6,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; -import org.quiltmc.quiltflower.kotlin.expr.*; -import org.quiltmc.quiltflower.kotlin.util.KUtils; +import org.vineflower.kotlin.util.KUtils; import java.util.List; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/ResugarKotlinMethodsPass.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/ResugarKotlinMethodsPass.java similarity index 97% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/ResugarKotlinMethodsPass.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/ResugarKotlinMethodsPass.java index e7826bc838..c6258399d0 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/ResugarKotlinMethodsPass.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/ResugarKotlinMethodsPass.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.pass; +package org.vineflower.kotlin.pass; import org.jetbrains.java.decompiler.api.passes.Pass; import org.jetbrains.java.decompiler.api.passes.PassContext; @@ -10,7 +10,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.flow.DirectNode; import org.jetbrains.java.decompiler.modules.decompiler.flow.FlattenStatementsHelper; import org.jetbrains.java.decompiler.struct.match.MatchEngine; -import org.quiltmc.quiltflower.kotlin.expr.KFunctionExprent; +import org.vineflower.kotlin.expr.KFunctionExprent; import java.util.List; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/StackVarInitialPass.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/StackVarInitialPass.java similarity index 96% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/StackVarInitialPass.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/StackVarInitialPass.java index d38bf8baaf..be999e44b2 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/pass/StackVarInitialPass.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/pass/StackVarInitialPass.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.pass; +package org.vineflower.kotlin.pass; import org.jetbrains.java.decompiler.api.passes.Pass; import org.jetbrains.java.decompiler.api.passes.PassContext; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/KTypes.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KTypes.java similarity index 99% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/KTypes.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KTypes.java index 88ef096edb..345b0051d0 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/KTypes.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KTypes.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.util; +package org.vineflower.kotlin.util; import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; import org.jetbrains.java.decompiler.struct.gen.VarType; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/KUtils.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KUtils.java similarity index 92% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/KUtils.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KUtils.java index 0e0410cad9..042546c9fc 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/KUtils.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KUtils.java @@ -1,7 +1,7 @@ -package org.quiltmc.quiltflower.kotlin.util; +package org.vineflower.kotlin.util; import org.jetbrains.java.decompiler.modules.decompiler.exps.*; -import org.quiltmc.quiltflower.kotlin.expr.*; +import org.vineflower.kotlin.expr.*; import java.util.ArrayList; import java.util.List; diff --git a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/ProtobufFlags.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/ProtobufFlags.java similarity index 99% rename from plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/ProtobufFlags.java rename to plugins/kotlin/src/main/java/org/vineflower/kotlin/util/ProtobufFlags.java index 309ef0985a..37a43dcf08 100644 --- a/plugins/kotlin/src/main/java/org/quiltmc/quiltflower/kotlin/util/ProtobufFlags.java +++ b/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/ProtobufFlags.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin.util; +package org.vineflower.kotlin.util; import kotlin.reflect.jvm.internal.impl.metadata.ProtoBuf; diff --git a/plugins/kotlin/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin b/plugins/kotlin/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin index f7037523c7..6a3a374077 100644 --- a/plugins/kotlin/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin +++ b/plugins/kotlin/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin @@ -1 +1 @@ -org.quiltmc.quiltflower.kotlin.KotlinPlugin \ No newline at end of file +org.vineflower.kotlin.KotlinPlugin \ No newline at end of file diff --git a/plugins/kotlin/src/test/java/org/quiltmc/quiltflower/kotlin/KotlinTests.java b/plugins/kotlin/src/test/java/org/vineflower/kotlin/KotlinTests.java similarity index 98% rename from plugins/kotlin/src/test/java/org/quiltmc/quiltflower/kotlin/KotlinTests.java rename to plugins/kotlin/src/test/java/org/vineflower/kotlin/KotlinTests.java index 4ff852f40e..4f0f5cd444 100644 --- a/plugins/kotlin/src/test/java/org/quiltmc/quiltflower/kotlin/KotlinTests.java +++ b/plugins/kotlin/src/test/java/org/vineflower/kotlin/KotlinTests.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.kotlin; +package org.vineflower.kotlin; import org.jetbrains.java.decompiler.DecompilerTestFixture; import org.jetbrains.java.decompiler.SingleClassesTestBase; diff --git a/plugins/kotlin/testData/results/pkg/TestSmartCasts.dec b/plugins/kotlin/testData/results/pkg/TestSmartCasts.dec index 4d84186be5..c3e0ef24f2 100644 --- a/plugins/kotlin/testData/results/pkg/TestSmartCasts.dec +++ b/plugins/kotlin/testData/results/pkg/TestSmartCasts.dec @@ -119,7 +119,7 @@ class TestSmartCasts { interface X { fun woo(var1: Iterable): String - // $QF: Class flags could not be determined + // $VF: Class flags could not be determined internal class DefaultImpls { @JvmStatic fun woo(var0: TestSmartCasts.X, receiver: Iterable): String { diff --git a/plugins/scala/build.gradle b/plugins/scala/build.gradle index 26d8194d0c..63a34b997c 100644 --- a/plugins/scala/build.gradle +++ b/plugins/scala/build.gradle @@ -2,7 +2,7 @@ plugins{ id 'scala' } -archivesBaseName = 'quiltflower-scala' +archivesBaseName = 'vineflower-scala' sourceSets { testDataScala.scala.srcDirs files("testData/src/scala/") } diff --git a/plugins/scala/src/main/java/org/quiltmc/quiltflower/scala/ScalaPlugin.java b/plugins/scala/src/main/java/org/vineflower/scala/ScalaPlugin.java similarity index 78% rename from plugins/scala/src/main/java/org/quiltmc/quiltflower/scala/ScalaPlugin.java rename to plugins/scala/src/main/java/org/vineflower/scala/ScalaPlugin.java index 3c61e0fc16..aadb96b97d 100644 --- a/plugins/scala/src/main/java/org/quiltmc/quiltflower/scala/ScalaPlugin.java +++ b/plugins/scala/src/main/java/org/vineflower/scala/ScalaPlugin.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.scala; +package org.vineflower.scala; import org.jetbrains.java.decompiler.api.Plugin; diff --git a/plugins/scala/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin b/plugins/scala/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin index 7c6dd44c92..80ff156331 100644 --- a/plugins/scala/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin +++ b/plugins/scala/src/main/resources/META-INF/services/org.jetbrains.java.decompiler.api.Plugin @@ -1 +1 @@ -org.quiltmc.quiltflower.scala.ScalaPlugin \ No newline at end of file +org.vineflower.scala.ScalaPlugin \ No newline at end of file diff --git a/plugins/scala/src/test/java/org/quiltmc/quiltflower/scala/ScalaTests.java b/plugins/scala/src/test/java/org/vineflower/scala/ScalaTests.java similarity index 97% rename from plugins/scala/src/test/java/org/quiltmc/quiltflower/scala/ScalaTests.java rename to plugins/scala/src/test/java/org/vineflower/scala/ScalaTests.java index abeafcef72..1c4d9d8d63 100644 --- a/plugins/scala/src/test/java/org/quiltmc/quiltflower/scala/ScalaTests.java +++ b/plugins/scala/src/test/java/org/vineflower/scala/ScalaTests.java @@ -1,4 +1,4 @@ -package org.quiltmc.quiltflower.scala; +package org.vineflower.scala; import org.jetbrains.java.decompiler.SingleClassesTestBase; import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; diff --git a/src/org/jetbrains/java/decompiler/main/plugins/JarPluginLoader.java b/src/org/jetbrains/java/decompiler/main/plugins/JarPluginLoader.java index 2c67ee8fe3..d863184693 100644 --- a/src/org/jetbrains/java/decompiler/main/plugins/JarPluginLoader.java +++ b/src/org/jetbrains/java/decompiler/main/plugins/JarPluginLoader.java @@ -7,7 +7,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -// Finds plugins included in the main Quiltflower Jar via Jar-In-Jar +// Finds plugins included in the main Vineflower Jar via Jar-In-Jar public class JarPluginLoader { static List> PLUGIN_CLASSES = new ArrayList<>(); diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java index d4983f7be9..ac9f38b864 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java @@ -713,7 +713,7 @@ private static void markExprOddities(RootStatement root, Statement stat) { if (stat instanceof BasicBlockStatement) { if (stat.isLabeled()) { - root.addComment("$QF: Made invalid labels!", true); + root.addComment("$VF: Made invalid labels!", true); } for (Exprent ex : stat.getExprents()) { diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java index 7eae9cd2a4..393af9fa14 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java @@ -84,7 +84,7 @@ public TextBuffer toJava(int indent) { TextBuffer tb = ExprProcessor.listToJava(varDefinitions, indent); boolean islabeled = isLabeled(); if (islabeled) { - tb.appendIndent(indent).append("label").append(id).append(':').append("// $QF: Invalid label!").appendLineSeparator(); + tb.appendIndent(indent).append("label").append(id).append(':').append("// $VF: Invalid label!").appendLineSeparator(); } tb.append(ExprProcessor.listToJava(exprents, indent));