pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>the.bytecode.club</groupId>
     <artifactId>Bytecode-Viewer</artifactId>
-    <version>2.11.2-vineflower</version>
+    <version>2.11.2</version>
 
     <properties>
         <!-- Project settings -->
@@ -13,42 +13,42 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Dependency versions -->
-        <annotations.version>24.0.1</annotations.version>
+        <annotations.version>24.0.0</annotations.version>
         <antlr4.version>4.9.3</antlr4.version>
-        <apktool.version>2.8.0</apktool.version>
+        <apktool.version>2.7.0</apktool.version>
-        <asm.version>9.5</asm.version>
+        <asm.version>9.4</asm.version>
         <bined.version>0.2.0</bined.version>
         <byteanalysis.version>1.0bcv</byteanalysis.version>
         <cfr.version>0.152</cfr.version>
         <cloning.version>1.9.12</cloning.version>
         <commons-cli.version>1.5.0</commons-cli.version>
-        <commons-codec.version>1.16.0</commons-codec.version>
+        <commons-codec.version>1.15</commons-codec.version>
-        <commons-compiler.version>3.1.10</commons-compiler.version>
+        <commons-compiler.version>3.1.9</commons-compiler.version>
-        <commons-compress.version>1.23.0</commons-compress.version>
+        <commons-compress.version>1.22</commons-compress.version>
-        <commons-io.version>2.13.0</commons-io.version>
+        <commons-io.version>2.11.0</commons-io.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-text.version>1.10.0</commons-text.version>
         <darklaf.version>3.0.2</darklaf.version>
         <darklaf-extensions-rsta.version>0.4.1</darklaf-extensions-rsta.version>
-        <decompiler-fernflower.version>6.2.5.Final</decompiler-fernflower.version>
+        <decompiler-fernflower.version>6.1.2.Final</decompiler-fernflower.version>
-        <dex2jar.version>v64</dex2jar.version>
+        <dex2jar.version>v59</dex2jar.version>
-        <fernflower.version>1.9.2</fernflower.version>
+        <fernflower.version>e0d44f4</fernflower.version>
         <gson.version>2.10.1</gson.version>
-        <guava.version>32.1.1-jre</guava.version>
+        <guava.version>31.1-jre</guava.version>
-        <httprequest.version>2.2.0</httprequest.version>
+        <httprequest.version>2.1.0</httprequest.version>
         <imgscalr-lib.version>4.2</imgscalr-lib.version>
-        <jadx.version>1.4.7</jadx.version>
+        <jadx.version>1.4.5</jadx.version>
         <jd-gui.version>1.6.6bcv</jd-gui.version>
         <jgraphx.version>3.4.1.3</jgraphx.version>
         <js.version>21.2.0</js.version>
         <objenesis.version>3.3</objenesis.version>
         <paged-data.version>0.2.0</paged-data.version>
         <procyon.version>0.6.0</procyon.version>
-        <rsyntaxtextarea.version>3.3.3</rsyntaxtextarea.version>
+        <rsyntaxtextarea.version>3.3.2</rsyntaxtextarea.version>
         <semantic-version.version>2.1.1</semantic-version.version>
-        <slf4j.version>2.0.7</slf4j.version>
+        <slf4j.version>2.0.6</slf4j.version>
-        <smali.version>3.0.3</smali.version>
+        <smali.version>403e90375e</smali.version>
-        <safeyaml.version>1.34.1</safeyaml.version>
+        <safeyaml.version>1.33.0</safeyaml.version>
         <treelayout.version>1.0.3</treelayout.version>
         <webp-imageio.version>0.2.2</webp-imageio.version>
         <xpp3.version>1.1.4c</xpp3.version>
@@ -197,8 +197,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.vineflower</groupId>
+            <groupId>com.github.ThexXTURBOXx</groupId>
-            <artifactId>vineflower</artifactId>
+            <artifactId>fernflower</artifactId>
             <version>${fernflower.version}</version>
         </dependency>
         <dependency>
@@ -277,13 +277,13 @@
             <version>${slf4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.android.tools.smali</groupId>
+            <groupId>com.github.iBotPeaches.smali</groupId>
             <artifactId>smali</artifactId>
             <version>${smali.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.android.tools.smali</groupId>
+            <groupId>com.github.iBotPeaches.smali</groupId>
-            <artifactId>smali-baksmali</artifactId>
+            <artifactId>baksmali</artifactId>
             <version>${smali.version}</version>
         </dependency>
         <dependency>
@@ -398,7 +398,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
@@ -408,7 +408,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.4.0</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                 </configuration>
@@ -416,7 +416,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -437,7 +437,6 @@
                                 <exclude>META-INF/*LICENSE*</exclude>
                                 <exclude>META-INF/*NOTICE*</exclude>
                                 <exclude>META-INF/MANIFEST.MF</exclude>
-                                <exclude>LICENSE</exclude>
                             </excludes>
                         </filter>
                         <!-- Ignore all ASM-related files from d2j-external but MCTLE fix -->

src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java

@@ -196,7 +196,7 @@ public class BytecodeViewer
             
             //setup swing components
             viewer = new MainViewerGUI();
-            //SwingUtilities.updateComponentTreeUI(viewer);
+            SwingUtilities.updateComponentTreeUI(viewer);
             
             //load settings and set swing components state
             SettingsSerializer.loadSettings();

src/main/java/the/bytecode/club/bytecodeviewer/CommandLineInput.java

@@ -246,7 +246,7 @@ public class CommandLineInput {
                     }
                 }
             } else if (decompiler.equalsIgnoreCase("fernflower")) {
-                System.out.println("Decompiling " + input.getAbsolutePath() + " with Vineflower");
+                System.out.println("Decompiling " + input.getAbsolutePath() + " with FernFlower");
                 BytecodeViewer.openFiles(new File[]{input}, false);
 
                 Thread.sleep(5 * 1000);

src/main/java/the/bytecode/club/bytecodeviewer/bootloader/UpdateCheck.java

@@ -128,7 +128,6 @@ public class UpdateCheck implements Runnable
 	@Override
 	public void run()
 	{
-		if (Integer.valueOf(4) == 4) return;
 		try {
 			HTTPRequest r = new HTTPRequest(new URL("https://raw.githubusercontent.com/Konloch/bytecode-viewer/master/VERSION"));
 			final Version version = Version.parseVersion(r.readSingle());

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/Decompiler.java

@@ -32,7 +32,7 @@ public enum Decompiler
     NONE("None", "", null),
     PROCYON_DECOMPILER("Procyon Decompiler", "proycon", new ProcyonDecompiler()),
     CFR_DECOMPILER("CFR Decompiler", "cfr", new CFRDecompiler()),
-    FERNFLOWER_DECOMPILER("Vineflower Decompiler", "fernflower", new FernFlowerDecompiler()),
+    FERNFLOWER_DECOMPILER("FernFlower Decompiler", "fernflower", new FernFlowerDecompiler()),
     BYTECODE_DISASSEMBLER("Bytecode Disassembler", "bcvbd", new BytecodeDisassembler()),
     HEXCODE_VIEWER("Hexcode Viewer", "bcvhex", null),
     SMALI_DISASSEMBLER("Smali Disassembler", "smali", new SmaliDisassembler()),

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java

@@ -166,21 +166,7 @@ public class FernFlowerDecompiler extends InternalDecompiler
                 "-rer=" + r(BytecodeViewer.viewer.rer.isSelected()),
                 "-fdi=" + r(BytecodeViewer.viewer.fdi.isSelected()),
                 "-asc=" + r(BytecodeViewer.viewer.asc.isSelected()),
-                "-ren=" + r(BytecodeViewer.viewer.ren.isSelected()),
+                "-ren=" + r(BytecodeViewer.viewer.ren.isSelected()), className,
-                "-lit=" + r(BytecodeViewer.viewer.lit.isSelected()),
-                "-inn=" + r(BytecodeViewer.viewer.inn.isSelected()),
-                "-lac=" + r(BytecodeViewer.viewer.lac.isSelected()),
-                "-bsm=" + r(BytecodeViewer.viewer.bsm.isSelected()),
-                "-iib=" + r(BytecodeViewer.viewer.iib.isSelected()),
-                "-vac=" + r(BytecodeViewer.viewer.vac.isSelected()),
-                "-tcs=" + r(BytecodeViewer.viewer.tcs.isSelected()),
-                "-pam=" + r(BytecodeViewer.viewer.pam.isSelected()),
-                "-tlf=" + r(BytecodeViewer.viewer.tlf.isSelected()),
-                "-tco=" + r(BytecodeViewer.viewer.tco.isSelected()),
-                "-isl=" + r(BytecodeViewer.viewer.isl.isSelected()),
-                "-jvn=" + r(BytecodeViewer.viewer.jvn.isSelected()),
-                "-jrt=" + r(BytecodeViewer.viewer.jrt.isSelected()),
-                className,
                 folder};
     }
 

src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java

@@ -215,8 +215,8 @@ public class MainViewerGUI extends JFrame
     public final JCheckBoxMenuItem printLineNumbers = new TranslatedJCheckBoxMenuItem("Print Line Numbers", TranslatedComponents.PRINT_LINE_NUMBERS);
     
     //FernFlower settings
-    public final JMenu fernFlowerSettingsSecondaryMenu = new TranslatedJMenu("Vineflower Settings", TranslatedComponents.FERNFLOWER_SETTINGS);
+    public final JMenu fernFlowerSettingsSecondaryMenu = new TranslatedJMenu("FernFlower Settings", TranslatedComponents.FERNFLOWER_SETTINGS);
-    public final JMenuItem fernFlowerSettings = new TranslatedJMenuItem("Vineflower Settings", TranslatedComponents.FERNFLOWER_SETTINGS);
+    public final JMenuItem fernFlowerSettings = new TranslatedJMenuItem("FernFlower Settings", TranslatedComponents.FERNFLOWER_SETTINGS);
     public SettingsDialog fernFlowerSettingsDialog;
     public TranslatedJCheckBoxMenuItem rbr = new TranslatedJCheckBoxMenuItem("Hide bridge methods", TranslatedComponents.HIDE_BRIDGE_METHODS);
     public TranslatedJCheckBoxMenuItem rsy = new TranslatedJCheckBoxMenuItem("Hide synthetic class members", TranslatedComponents.HIDE_SYNTHETIC_CLASS_MEMBERS);
@@ -238,21 +238,6 @@ public class MainViewerGUI extends JFrame
     public TranslatedJCheckBoxMenuItem asc = new TranslatedJCheckBoxMenuItem("Allow only ASCII characters in strings", TranslatedComponents.ALLOW_ONLY_ASCII_CHARACTERS_IN_STRINGS);
     public TranslatedJCheckBoxMenuItem ren = new TranslatedJCheckBoxMenuItem("Rename ambiguous classes and class elements", TranslatedComponents.RENAME_AMBIGUOUS_CLASSES_AND_CLASS_ELEMENTS);
     
-    //Vineflower settings
-    public JCheckBoxMenuItem lit = new JCheckBoxMenuItem("Output numeric literals as-is");
-    public JCheckBoxMenuItem inn = new JCheckBoxMenuItem("Remove IntelliJ IDEA-specific @NotNull inserted code");
-    public JCheckBoxMenuItem lac = new JCheckBoxMenuItem("Decompile lambda expressions to anonymous classes");
-    public JCheckBoxMenuItem bsm = new JCheckBoxMenuItem("Add mappings for source bytecode insns to decompiled lines");
-    public JCheckBoxMenuItem iib = new JCheckBoxMenuItem("Ignore invalid bytecode");
-    public JCheckBoxMenuItem vac = new JCheckBoxMenuItem("Verify anonymous classes");
-    public JCheckBoxMenuItem tcs = new JCheckBoxMenuItem("Simplify boolean constants in ternary operations");
-    public JCheckBoxMenuItem pam = new JCheckBoxMenuItem("Decompile pattern matching");
-    public JCheckBoxMenuItem tlf = new JCheckBoxMenuItem("Experimental try loop enhancements");
-    public JCheckBoxMenuItem tco = new JCheckBoxMenuItem("Allow ternaries in if and loop");
-    public JCheckBoxMenuItem isl = new JCheckBoxMenuItem("Inline simple lambdas");
-    public JCheckBoxMenuItem jvn = new JCheckBoxMenuItem("Use JAD variable naming");
-    public JCheckBoxMenuItem jrt = new JCheckBoxMenuItem("Add currently used Java runtime as library");
-    
     //Procyon
     public final JMenu procyonSettingsSecondaryMenu = new TranslatedJMenu("Procyon Settings", TranslatedComponents.PROCYON_SETTINGS);
     public final JMenuItem procyonSettings = new TranslatedJMenuItem("Procyon Settings", TranslatedComponents.PROCYON_SETTINGS);
@@ -340,7 +325,7 @@ public class MainViewerGUI extends JFrame
     public MainViewerGUI()
     {
         setIconImages(IconResources.iconList);
-        setSize(new Dimension(1280, 960));
+        setSize(new Dimension(800, 488));
     
         setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
         KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(new KeyEventDispatch());
@@ -367,11 +352,8 @@ public class MainViewerGUI extends JFrame
         searchBoxPane.setMinimumSize(new Dimension(200, 50));
         searchBoxPane.setMaximumSize(new Dimension(200, 2147483647));
         
-        workPane.setPreferredSize(new Dimension(1500, 1000));
-
         splitPane1 = new JSplitPane(JSplitPane.VERTICAL_SPLIT, resourcePane, searchBoxPane);
         splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, splitPane1, workPane);
-
         getContentPane().add(splitPane2);
         splitPane2.setResizeWeight(0.05);
         splitPane1.setResizeWeight(0.5);
@@ -379,7 +361,6 @@ public class MainViewerGUI extends JFrame
         uiComponents.add(resourcePane);
         uiComponents.add(searchBoxPane);
         uiComponents.add(workPane);
-//        uiComponents.add(hierarchy);
 
         viewPane1.setDefault();
         viewPane2.setDefault();
@@ -671,21 +652,6 @@ public class MainViewerGUI extends JFrame
         fernFlowerSettingsSecondaryMenu.add(udv);
         fernFlowerSettingsSecondaryMenu.add(fdi);
         fernFlowerSettingsSecondaryMenu.add(asc);
-
-        fernFlowerSettingsSecondaryMenu.add(lit);
-        fernFlowerSettingsSecondaryMenu.add(inn);
-        fernFlowerSettingsSecondaryMenu.add(lac);
-        fernFlowerSettingsSecondaryMenu.add(bsm);
-        fernFlowerSettingsSecondaryMenu.add(iib);
-        fernFlowerSettingsSecondaryMenu.add(vac);
-        fernFlowerSettingsSecondaryMenu.add(tcs);
-        fernFlowerSettingsSecondaryMenu.add(pam);
-        fernFlowerSettingsSecondaryMenu.add(tlf);
-        fernFlowerSettingsSecondaryMenu.add(tco);
-        fernFlowerSettingsSecondaryMenu.add(isl);
-        fernFlowerSettingsSecondaryMenu.add(jvn);
-        fernFlowerSettingsSecondaryMenu.add(jrt);
-
         fernFlowerSettingsDialog = new SettingsDialog(fernFlowerSettingsSecondaryMenu, new JPanel());
         fernFlowerSettings.addActionListener((e)-> fernFlowerSettingsDialog.showDialog());
         
@@ -870,20 +836,6 @@ public class MainViewerGUI extends JFrame
         hes.setSelected(true);
         hdc.setSelected(true);
         
-        lit.setSelected(false);
-        inn.setSelected(true);
-        lac.setSelected(false);
-        bsm.setSelected(false);
-        iib.setSelected(false);
-        vac.setSelected(false);
-        tcs.setSelected(false);
-        pam.setSelected(false);
-        tlf.setSelected(false);
-        tco.setSelected(true);
-        isl.setSelected(true);
-        jvn.setSelected(false);
-        jrt.setSelected(false);
-        
         //CFIDE
         debugHelpers.setSelected(true);
         appendBracketsToLabels.setSelected(true);

src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java

@@ -5,7 +5,6 @@ import java.awt.Color;
 import java.awt.Font;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -14,7 +13,6 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 import javax.swing.text.BadLocationException;
-
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rtextarea.RTextScrollPane;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
@@ -52,9 +50,9 @@ import the.bytecode.club.bytecodeviewer.util.JTextAreaUtils;
  * @author Konloch
  * @since 6/25/2021
  */
-public class SearchableRSyntaxTextArea extends RSyntaxTextArea {
+public class SearchableRSyntaxTextArea extends RSyntaxTextArea
-
+{
-	private RTextScrollPane scrollPane = new RTextScrollPane(this);
+	private final RTextScrollPane scrollPane = new RTextScrollPane(this);
 	private final JPanel searchPanel = new JPanel(new BorderLayout());
 	private final JTextField searchInput = new JTextField();
 	private final JCheckBox caseSensitiveSearch = new TranslatedJCheckBox("Match case", TranslatedComponents.MATCH_CASE);
@@ -65,14 +63,18 @@ public class SearchableRSyntaxTextArea extends RSyntaxTextArea {
 	private final Color blackScrollForeground = new Color(0x575859);
 	private Runnable onCtrlS;
 	
-	public SearchableRSyntaxTextArea() {
+	public SearchableRSyntaxTextArea()
-		if (Configuration.lafTheme == LAFTheme.HIGH_CONTRAST_DARK) {
+	{
+		if(Configuration.lafTheme == LAFTheme.HIGH_CONTRAST_DARK)
+		{
 			//this fixes the white border on the jScrollBar panes
 			scrollPane.getHorizontalScrollBar().setBackground(blackScrollBackground);
 			scrollPane.getHorizontalScrollBar().setForeground(blackScrollForeground);
 			scrollPane.getVerticalScrollBar().setBackground(blackScrollBackground);
 			scrollPane.getVerticalScrollBar().setForeground(blackScrollForeground);
-		} else if (Configuration.lafTheme.isDark()) {
+		}
+		else if(Configuration.lafTheme.isDark())
+		{
 			//this fixes the white border on the jScrollBar panes
 			scrollPane.getHorizontalScrollBar().setBackground(darkScrollBackground);
 			scrollPane.getHorizontalScrollBar().setForeground(darkScrollForeground);
@@ -109,7 +111,8 @@ public class SearchableRSyntaxTextArea extends RSyntaxTextArea {
 			if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
 				searchInput.requestFocus();
 			
-			if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0)) {
+			if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0))
+			{
 				onCtrlS.run();
 				return;
 			}
@@ -132,44 +135,49 @@ public class SearchableRSyntaxTextArea extends RSyntaxTextArea {
 		
 	}
 	
-	public void search(String search, boolean forwardSearchDirection, boolean caseSensitiveSearch) {
+	public void search(String search, boolean forwardSearchDirection, boolean caseSensitiveSearch)
+	{
 		JTextAreaUtils.search(this, search, forwardSearchDirection, caseSensitiveSearch);
 	}
 	
-	public void highlight(String pattern, boolean caseSensitiveSearch) {
+	public void highlight(String pattern, boolean caseSensitiveSearch)
+	{
 		JTextAreaUtils.highlight(this, pattern, caseSensitiveSearch);
 	}
 	
-	public void attachCtrlMouseWheelZoom() {
+	public void attachCtrlMouseWheelZoom()
-		scrollPane.addMouseWheelListener(e -> {
+	{
-			if (getText().isEmpty()) return;
+		//get the existing scroll event
-			if ((e.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0) {
+		MouseWheelListener ogListener = scrollPane.getMouseWheelListeners().length > 0 ?
+				scrollPane.getMouseWheelListeners()[0] : null;
+		
+		//remove the existing event
+		if(ogListener != null)
+			scrollPane.removeMouseWheelListener(ogListener);
+		
+		//add a new event
+		scrollPane.addMouseWheelListener(e ->
+		{
+			if (getText().isEmpty())
+				return;
+			
+			if ((e.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0)
+			{
 				Font font = getFont();
 				int size = font.getSize();
-				if (e.getWheelRotation() > 0)
+				
+				if (e.getWheelRotation() > 0) //Up
 					setFont(new Font(font.getName(), font.getStyle(), --size >= 2 ? --size : 2));
-				else
+				else //Down
 					setFont(new Font(font.getName(), font.getStyle(), ++size));
 				
 				e.consume();
 			}
+			else if(ogListener != null)
+			{
+				ogListener.mouseWheelMoved(e);
+			}
 		});
-
-		scrollPane = new RTextScrollPane() {
-			@Override
-			protected void processMouseWheelEvent(MouseWheelEvent event) {
-				if (!isWheelScrollingEnabled()) {
-					if (getParent() != null) {
-						getParent().dispatchEvent(SwingUtilities.convertMouseEvent(this, event, getParent()));
-						return;
-					}
-				}
-
-				super.processMouseWheelEvent(event);
-			}
-		};
-
-		scrollPane.setWheelScrollingEnabled(false);
 	}
 	
 	public String getLineText(int line) {
@@ -179,36 +187,42 @@ public class SearchableRSyntaxTextArea extends RSyntaxTextArea {
 				int end = getLineEndOffset(line);
 				return getText(start, end - start).trim();
 			}
-		} catch (BadLocationException ignored) {
+		} catch (BadLocationException ignored) { }
-		}
 		return "";
 	}
 	
-	public void setOnCtrlS(Runnable onCtrlS) {
+	public void setOnCtrlS(Runnable onCtrlS)
+	{
 		this.onCtrlS = onCtrlS;
 	}
 	
-	public RTextScrollPane getScrollPane() {
+	public RTextScrollPane getScrollPane()
+	{
 		return scrollPane;
 	}
 	
-	public JPanel getSearchPanel() {
+	public JPanel getSearchPanel()
+	{
 		return searchPanel;
 	}
 	
-	public JTextField getSearchInput() {
+	public JTextField getSearchInput()
+	{
 		return searchInput;
 	}
 	
-	public JCheckBox getCaseSensitiveSearch() {
+	public JCheckBox getCaseSensitiveSearch()
+	{
 		return caseSensitiveSearch;
 	}
 	
-	public JLabel getTitleHeader() {
+	public JLabel getTitleHeader()
+	{
 		return titleHeader;
 	}
 	
-	public Runnable getOnCtrlS() {
+	public Runnable getOnCtrlS()
+	{
 		return onCtrlS;
 	}
 }

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java

@@ -1,16 +1,24 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
+import com.android.tools.r8.internal.Cl;
 import com.github.weisj.darklaf.components.CloseButton;
+import com.github.weisj.darklaf.listener.MouseClickListener;
 import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 
 public class CloseButtonComponent extends JPanel {
 
 	private final JTabbedPane pane;
 
+	String title = "";
+
 	public CloseButtonComponent(final JTabbedPane pane) {
 		super(new FlowLayout(FlowLayout.LEFT, 0, 0));
 		if (pane == null) {

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DecompilerSelectionPane.java

@@ -53,7 +53,7 @@ public class DecompilerSelectionPane
 	private final DecompilerViewComponent CFR = new DecompilerViewComponent("CFR", JAVA, Decompiler.CFR_DECOMPILER);
 	private final DecompilerViewComponent JADX = new DecompilerViewComponent("JADX", JAVA, Decompiler.JADX_DECOMPILER);
 	private final DecompilerViewComponent JD = new DecompilerViewComponent("JD-GUI", JAVA, Decompiler.JD_DECOMPILER);
-	private final DecompilerViewComponent fern = new DecompilerViewComponent("Vineflower", JAVA, Decompiler.FERNFLOWER_DECOMPILER);
+	private final DecompilerViewComponent fern = new DecompilerViewComponent("FernFlower", JAVA, Decompiler.FERNFLOWER_DECOMPILER);
 	private final DecompilerViewComponent krakatau = new DecompilerViewComponent( "Krakatau", JAVA_AND_BYTECODE, Decompiler.KRAKATAU_DECOMPILER, Decompiler.KRAKATAU_DISASSEMBLER);
 	private final DecompilerViewComponent smali = new DecompilerViewComponent("Smali", BYTECODE, Decompiler.SMALI_DISASSEMBLER);
 	private final DecompilerViewComponent bytecode = new DecompilerViewComponent("Bytecode", BYTECODE_NON_EDITABLE, Decompiler.BYTECODE_DISASSEMBLER);

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java

@@ -1,6 +1,5 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
-import com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
 import javax.swing.*;
@@ -17,19 +16,17 @@ public class DraggableTabbedPane extends JTabbedPane {
 	private static final int LINEWIDTH = 3;
 	private static final String NAME = "TabTransferData";
 	private final DataFlavor FLAVOR = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType, NAME);
-	private static final GhostGlassPane s_glassPane = new GhostGlassPane();
+	private static GhostGlassPane s_glassPane = new GhostGlassPane();
 
 	private boolean m_isDrawRect = false;
 	private final Rectangle2D m_lineRect = new Rectangle2D.Double();
 
 	private final Color m_lineColor = new Color(0, 100, 255);
-	private TabAcceptor m_acceptor;
+	private TabAcceptor m_acceptor = null;
 
 	public DraggableTabbedPane() {
 		super(SwingConstants.TOP, SCROLL_TAB_LAYOUT);
-		this.putClientProperty(DarkTabbedPaneUI.KEY_DND, true);
 
-		/*if (!Configuration.showDarkLAFComponentIcons) {
 		final DragSourceListener dsl = new DragSourceListener() {
 			public void dragEnter(DragSourceDragEvent e) {
 				e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
@@ -44,19 +41,47 @@ public class DraggableTabbedPane extends JTabbedPane {
 			}
 
 			public void dragOver(DragSourceDragEvent e) {
+				//e.getLocation()
+				//This method returns a Point indicating the cursor location in screen coordinates at the moment
+
 				TabTransferData data = getTabTransferData(e);
 				if (data == null) {
 					e.getDragSourceContext().setCursor(
 							DragSource.DefaultMoveNoDrop);
 					return;
-					}
+				} // if
 
-					e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
+                /*
+                Point tabPt = e.getLocation();
+                SwingUtilities.convertPointFromScreen(tabPt, DnDTabbedPane.this);
+                if (DnDTabbedPane.this.contains(tabPt)) {
+                    int targetIdx = getTargetTabIndex(tabPt);
+                    int sourceIndex = data.getTabIndex();
+                    if (getTabAreaBound().contains(tabPt)
+                            && (targetIdx >= 0)
+                            && (targetIdx != sourceIndex)
+                            && (targetIdx != sourceIndex + 1)) {
+                        e.getDragSourceContext().setCursor(
+                                DragSource.DefaultMoveDrop);
+
+                        return;
+                    } // if
+
+                    e.getDragSourceContext().setCursor(
+                            DragSource.DefaultMoveNoDrop);
+                    return;
+                } // if
+                */
+
+				e.getDragSourceContext().setCursor(
+						DragSource.DefaultMoveDrop);
 			}
 
 			public void dragDropEnd(DragSourceDropEvent e) {
 				m_isDrawRect = false;
 				m_lineRect.setRect(0, 0, 0, 0);
+				// m_dragTabIndex = -1;
+
 				if (hasGhost()) {
 					s_glassPane.setVisible(false);
 					s_glassPane.setImage(null);
@@ -68,24 +93,29 @@ public class DraggableTabbedPane extends JTabbedPane {
 		};
 
 		final DragGestureListener dgl = e -> {
+			// System.out.println("dragGestureRecognized");
+
 			Point tabPt = e.getDragOrigin();
 			int dragTabIndex = indexAtLocation(tabPt.x, tabPt.y);
 			if (dragTabIndex < 0) {
 				return;
-				}
+			} // if
 
 			initGlassPane(e.getComponent(), e.getDragOrigin(), dragTabIndex);
 			try {
-					e.startDrag(DragSource.DefaultMoveDrop, new TabTransferable(DraggableTabbedPane.this, dragTabIndex), dsl);
+				e.startDrag(DragSource.DefaultMoveDrop,
+						new TabTransferable(DraggableTabbedPane.this, dragTabIndex), dsl);
 			} catch (InvalidDnDOperationException idoe) {
 				idoe.printStackTrace();
 			}
 		};
 
-			new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, new CDropTargetListener(), true);
+		//dropTarget =
-			new DragSource().createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, dgl);
+		new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE,
+				new CDropTargetListener(), true);
+		new DragSource().createDefaultDragGestureRecognizer(this,
+				DnDConstants.ACTION_COPY_OR_MOVE, dgl);
 		m_acceptor = (a_component, a_index) -> true;
-		}*/
 	}
 
 	public TabAcceptor getAcceptor() {
@@ -101,7 +131,7 @@ public class DraggableTabbedPane extends JTabbedPane {
 		if (!t.isDataFlavorSupported(FLAVOR)) return null;
 
 		try {
-			return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR);
+			return (TabTransferData) t.getTransferData(FLAVOR);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -114,7 +144,7 @@ public class DraggableTabbedPane extends JTabbedPane {
 		if (!t.isDataFlavorSupported(FLAVOR)) return null;
 
 		try {
-			return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR);
+			return (TabTransferData) t.getTransferData(FLAVOR);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -127,7 +157,7 @@ public class DraggableTabbedPane extends JTabbedPane {
 		if (!t.isDataFlavorSupported(FLAVOR)) return null;
 
 		try {
-			return (TabTransferData) a_event.getDragSourceContext().getTransferable().getTransferData(FLAVOR);
+			return (TabTransferData) t.getTransferData(FLAVOR);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -145,6 +175,7 @@ public class DraggableTabbedPane extends JTabbedPane {
 
 		public Object getTransferData(DataFlavor flavor) {
 			return m_data;
+			// return DnDTabbedPane.this;
 		}
 
 		public DataFlavor[] getTransferDataFlavors() {
@@ -215,23 +246,27 @@ public class DraggableTabbedPane extends JTabbedPane {
 				retval.y -= s_glassPane.getGhostHeight() / 2;
 			}
 			break;
-		}
+		} // switch
 
-		retval = SwingUtilities.convertPoint(DraggableTabbedPane.this, retval, s_glassPane);
+		retval = SwingUtilities.convertPoint(DraggableTabbedPane.this,
+				retval, s_glassPane);
 		return retval;
 	}
 
 	class CDropTargetListener implements DropTargetListener {
 
 		public void dragEnter(DropTargetDragEvent e) {
+			// System.out.println("DropTarget.dragEnter: " + DnDTabbedPane.this);
+
 			if (isDragAcceptable(e)) {
 				e.acceptDrag(e.getDropAction());
 			} else {
 				e.rejectDrag();
-			}
+			} // if
 		}
 
 		public void dragExit(DropTargetEvent e) {
+			// System.out.println("DropTarget.dragExit: " + DnDTabbedPane.this);
 			m_isDrawRect = false;
 		}
 
@@ -247,7 +282,7 @@ public class DraggableTabbedPane extends JTabbedPane {
 				initTargetLeftRightLine(getTargetTabIndex(e.getLocation()), data);
 			} else {
 				initTargetTopBottomLine(getTargetTabIndex(e.getLocation()), data);
-			}
+			} // if-else
 
 			repaint();
 			if (hasGhost()) {
@@ -257,12 +292,14 @@ public class DraggableTabbedPane extends JTabbedPane {
 		}
 
 		public void drop(DropTargetDropEvent a_event) {
+			// System.out.println("DropTarget.drop: " + DnDTabbedPane.this);
+
 			if (isDropAcceptable(a_event)) {
 				convertTab(getTabTransferData(a_event), getTargetTabIndex(a_event.getLocation()));
 				a_event.dropComplete(true);
 			} else {
 				a_event.dropComplete(false);
-			}
+			} // if-else
 
 			m_isDrawRect = false;
 			repaint();
@@ -274,12 +311,12 @@ public class DraggableTabbedPane extends JTabbedPane {
 			Transferable t = e.getTransferable();
 			if (t == null) {
 				return false;
-			}
+			} // if
 
 			DataFlavor[] flavor = e.getCurrentDataFlavors();
 			if (!t.isDataFlavorSupported(flavor[0])) {
 				return false;
-			}
+			} // if
 
 			TabTransferData data = getTabTransferData(e);
 			if (data == null) return false;
@@ -287,13 +324,13 @@ public class DraggableTabbedPane extends JTabbedPane {
 			if (DraggableTabbedPane.this == data.getTabbedPane()
 					&& data.getTabIndex() >= 0) {
 				return true;
-			}
+			} // if
 
 			if (DraggableTabbedPane.this != data.getTabbedPane()) {
 				if (m_acceptor != null) {
 					return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex());
-				}
+				} // if
-			}
+			} // if
 
 			return false;
 		}
@@ -302,12 +339,12 @@ public class DraggableTabbedPane extends JTabbedPane {
 			Transferable t = e.getTransferable();
 			if (t == null) {
 				return false;
-			}
+			} // if
 
 			DataFlavor[] flavor = e.getCurrentDataFlavors();
 			if (!t.isDataFlavorSupported(flavor[0])) {
 				return false;
-			}
+			} // if
 
 			TabTransferData data = getTabTransferData(e);
 			if (data == null) return false;
@@ -315,13 +352,13 @@ public class DraggableTabbedPane extends JTabbedPane {
 			if (DraggableTabbedPane.this == data.getTabbedPane()
 					&& data.getTabIndex() >= 0) {
 				return true;
-			}
+			} // if
 
 			if (DraggableTabbedPane.this != data.getTabbedPane()) {
 				if (m_acceptor != null) {
 					return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex());
-				}
+				} // if
-			}
+			} // if
 
 			return false;
 		}
@@ -350,20 +387,20 @@ public class DraggableTabbedPane extends JTabbedPane {
 		// if the pane is empty, the target index is always zero.
 		if (getTabCount() == 0) {
 			return 0;
-		}
+		} // if
 
 		for (int i = 0; i < getTabCount(); i++) {
 			Rectangle r = getBoundsAt(i);
 			if (isTopOrBottom) {
-				r.setRect(r.x - r.width / 2D, r.y, r.width, r.height);
+				r.setRect(r.x - r.width / 2, r.y, r.width, r.height);
 			} else {
-				r.setRect(r.x, r.y - r.height / 2D, r.width, r.height);
+				r.setRect(r.x, r.y - r.height / 2, r.width, r.height);
-			}
+			} // if-else
 
 			if (r.contains(a_point)) {
 				return i;
-			}
+			} // if
-		}
+		} // for
 
 		Rectangle r = getBoundsAt(getTabCount() - 1);
 		if (isTopOrBottom) {
@@ -372,19 +409,18 @@ public class DraggableTabbedPane extends JTabbedPane {
 		} else {
 			int y = r.y + r.height / 2;
 			r.setRect(r.x, y, r.width, getHeight() - y);
-		}
+		} // if-else
 
 		return r.contains(a_point) ? getTabCount() : -1;
 	}
 
 	private void convertTab(TabTransferData a_data, int a_targetIndex) {
 		if (a_data == null) return;
-
 		DraggableTabbedPane source = a_data.getTabbedPane();
 		int sourceIndex = a_data.getTabIndex();
 		if (sourceIndex < 0) {
 			return;
-		}
+		} // if
 
 		Component cmp = source.getComponentAt(sourceIndex);
 		String str = source.getTitleAt(sourceIndex);
@@ -396,28 +432,34 @@ public class DraggableTabbedPane extends JTabbedPane {
 			} else {
 				if (a_targetIndex < 0) {
 					a_targetIndex = 0;
-				}
+				} // if
 
 				insertTab(str, null, cmp, null, a_targetIndex);
-			}
+
+			} // if
 
 			setSelectedComponent(cmp);
+			// System.out.println("press="+sourceIndex+" next="+a_targetIndex);
 			return;
-		}
+		} // if
 
 		if (a_targetIndex < 0 || sourceIndex == a_targetIndex) {
+			//System.out.println("press="+prev+" next="+next);
 			return;
-		}
+		} // if
 
 		if (a_targetIndex == getTabCount()) {
+			//System.out.println("last: press="+prev+" next="+next);
 			source.remove(sourceIndex);
 			addTab(str, cmp);
 			setSelectedIndex(getTabCount() - 1);
 		} else if (sourceIndex > a_targetIndex) {
+			//System.out.println("   >: press="+prev+" next="+next);
 			source.remove(sourceIndex);
 			insertTab(str, null, cmp, null, a_targetIndex);
 			setSelectedIndex(a_targetIndex);
 		} else {
+			//System.out.println("   <: press="+prev+" next="+next);
 			source.remove(sourceIndex);
 			insertTab(str, null, cmp, null, a_targetIndex - 1);
 			setSelectedIndex(a_targetIndex - 1);
@@ -429,27 +471,31 @@ public class DraggableTabbedPane extends JTabbedPane {
 			m_lineRect.setRect(0, 0, 0, 0);
 			m_isDrawRect = false;
 			return;
-		}
+		} // if
-
         if (a_data == null) return;
 
-		if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next || next - a_data.getTabIndex() == 1)) {
+		if ((a_data.getTabbedPane() == this)
+				&& (a_data.getTabIndex() == next
+				|| next - a_data.getTabIndex() == 1)) {
 			m_lineRect.setRect(0, 0, 0, 0);
 			m_isDrawRect = false;
 		} else if (getTabCount() == 0) {
 			m_lineRect.setRect(0, 0, 0, 0);
 			m_isDrawRect = false;
+			return;
 		} else if (next == 0) {
 			Rectangle rect = getBoundsAt(0);
-			m_lineRect.setRect(-LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
+			m_lineRect.setRect(-LINEWIDTH / 2, rect.y, LINEWIDTH, rect.height);
 			m_isDrawRect = true;
 		} else if (next == getTabCount()) {
 			Rectangle rect = getBoundsAt(getTabCount() - 1);
-			m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
+			m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2, rect.y,
+					LINEWIDTH, rect.height);
 			m_isDrawRect = true;
 		} else {
 			Rectangle rect = getBoundsAt(next - 1);
-			m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height);
+			m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2, rect.y,
+					LINEWIDTH, rect.height);
 			m_isDrawRect = true;
 		}
 	}
@@ -459,11 +505,12 @@ public class DraggableTabbedPane extends JTabbedPane {
 			m_lineRect.setRect(0, 0, 0, 0);
 			m_isDrawRect = false;
 			return;
-		}
+		} // if
-
 		if (a_data == null) return;
 
-		if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next || next - a_data.getTabIndex() == 1)) {
+		if ((a_data.getTabbedPane() == this)
+				&& (a_data.getTabIndex() == next
+				|| next - a_data.getTabIndex() == 1)) {
 			m_lineRect.setRect(0, 0, 0, 0);
 			m_isDrawRect = false;
 		} else if (getTabCount() == 0) {
@@ -472,29 +519,33 @@ public class DraggableTabbedPane extends JTabbedPane {
 			return;
 		} else if (next == getTabCount()) {
 			Rectangle rect = getBoundsAt(getTabCount() - 1);
-			m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2D, rect.width, LINEWIDTH);
+			m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2,
+					rect.width, LINEWIDTH);
 			m_isDrawRect = true;
 		} else if (next == 0) {
 			Rectangle rect = getBoundsAt(0);
-			m_lineRect.setRect(rect.x, -LINEWIDTH / 2D, rect.width, LINEWIDTH);
+			m_lineRect.setRect(rect.x, -LINEWIDTH / 2, rect.width, LINEWIDTH);
 			m_isDrawRect = true;
 		} else {
 			Rectangle rect = getBoundsAt(next - 1);
-			m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2D, rect.width, LINEWIDTH);
+			m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2,
+					rect.width, LINEWIDTH);
 			m_isDrawRect = true;
 		}
 	}
 
 	private void initGlassPane(Component c, Point tabPt, int a_tabIndex) {
+		//Point p = (Point) pt.clone();
 		getRootPane().setGlassPane(s_glassPane);
 		if (hasGhost()) {
 			Rectangle rect = getBoundsAt(a_tabIndex);
-			BufferedImage image = new BufferedImage(c.getWidth(), c.getHeight(), BufferedImage.TYPE_INT_ARGB);
+			BufferedImage image = new BufferedImage(c.getWidth(),
+					c.getHeight(), BufferedImage.TYPE_INT_ARGB);
 			Graphics g = image.getGraphics();
 			c.paint(g);
 			image = image.getSubimage(rect.x, rect.y, rect.width, rect.height);
 			s_glassPane.setImage(image);
-		}
+		} // if
 
 		s_glassPane.setPoint(buildGhostLocation(tabPt));
 		s_glassPane.setVisible(true);
@@ -512,7 +563,7 @@ public class DraggableTabbedPane extends JTabbedPane {
 			Graphics2D g2 = (Graphics2D) g;
 			g2.setPaint(m_lineColor);
 			g2.fill(m_lineRect);
-		}
+		} // if
 	}
 
 	public interface TabAcceptor {
@@ -526,7 +577,7 @@ class GhostGlassPane extends JPanel {
 	public static final long serialVersionUID = 1L;
 	private final AlphaComposite m_composite;
 
-	private final Point m_location = new Point(0, 0);
+	private Point m_location = new Point(0, 0);
 
 	private BufferedImage m_draggingGhost = null;
 
@@ -547,7 +598,7 @@ class GhostGlassPane extends JPanel {
 	public int getGhostWidth() {
 		if (m_draggingGhost == null) {
 			return 0;
-		}
+		} // if
 
 		return m_draggingGhost.getWidth(this);
 	}
@@ -555,7 +606,7 @@ class GhostGlassPane extends JPanel {
 	public int getGhostHeight() {
 		if (m_draggingGhost == null) {
 			return 0;
-		}
+		} // if
 
 		return m_draggingGhost.getHeight(this);
 	}
@@ -563,7 +614,7 @@ class GhostGlassPane extends JPanel {
 	public void paintComponent(Graphics g) {
 		if (m_draggingGhost == null) {
 			return;
-		}
+		} // if
 
 		Graphics2D g2 = (Graphics2D) g;
 		g2.setComposite(m_composite);

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java

@@ -1,13 +1,22 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import javax.swing.*;
+
+import com.github.weisj.darklaf.components.CloseButton;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.components.ButtonHoverAnimation;
 import the.bytecode.club.bytecodeviewer.gui.components.MaxWidthJLabel;
+import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
 import the.bytecode.club.bytecodeviewer.gui.util.DelayTabbedPaneThread;
-
+import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.MouseListener;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -47,7 +56,7 @@ public class TabbedPane extends JPanel {
 	public final static MouseListener buttonHoverAnimation = new ButtonHoverAnimation();
 	public static final Color BLANK_COLOR = new Color(0, 0, 0, 0);
 
-	public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName, String name, final JTabbedPane existingTabs, ResourceViewer resource) {
+	public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName, String name, final DraggableTabbedPane existingTabs, ResourceViewer resource) {
 		// unset default FlowLayout' gaps
 		super(new FlowLayout(FlowLayout.LEFT, 0, 0));
 
@@ -71,5 +80,33 @@ public class TabbedPane extends JPanel {
 		setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
 	}
 
-	private static final long serialVersionUID = -4774885688297538774L;
+    public void onMousePressed(MouseEvent e)
+    {
+        BytecodeViewer.viewer.workPane.tabs.dispatchEvent(e);
+    
+        if(e.getButton() == 1)
+        {
+            startedDragging = System.currentTimeMillis();
+            //dragging = true;
+            if (probablyABadIdea != null)
+                probablyABadIdea.stopped = true;
+            
+            probablyABadIdea = new DelayTabbedPaneThread(TabbedPane.this);
+            probablyABadIdea.start();
+            repaint();
+            Rectangle bounds = new Rectangle(e.getX(), e.getY(), e.getX() + this.getX(), e.getY());
+            for(int i = 0; i < BytecodeViewer.viewer.workPane.tabs.getTabCount(); i++)
+            {
+                Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i);
+                if(c != null && bounds.intersects(c.getBounds()))
+                    BytecodeViewer.viewer.workPane.tabs.setSelectedIndex(i);
+            }
+        }
+    }
+
+	private static final long serialVersionUID = -4774885688297538774L;
+
+	/*public int getTabIndex() {
+		return tabs.indexOfTabComponent(this);
+	}*/
 }

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java

@@ -1,5 +1,16 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.HashSet;
+import java.util.Set;
+import javax.swing.JButton;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+
+import com.github.weisj.darklaf.components.CloseButton;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
@@ -11,13 +22,6 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedVisibleComponent;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.HashSet;
-import java.util.Set;
-
 import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU;
 
 /***************************************************************************
@@ -48,7 +52,7 @@ import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU;
 
 public class Workspace extends TranslatedVisibleComponent {
 
-	public JTabbedPane tabs;
+	public final DraggableTabbedPane tabs;
 	public final JPanel buttonPanel;
 	public final JButton refreshClass;
 	public final Set<String> openedTabs = new HashSet<>();

src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MemberWithAnnotationSearch.java

@@ -14,7 +14,6 @@ import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJLabel;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.Arrays;
 import java.util.List;
 
 /***************************************************************************
@@ -68,13 +67,11 @@ public class MemberWithAnnotationSearch implements SearchPanel {
 
     if (srchText.isEmpty()) return;
 
-    node.fields.stream().filter(fn -> hasAnnotation(srchText, Arrays.asList(fn.invisibleAnnotations, fn.visibleAnnotations)))
+    node.fields.stream().filter(fn -> hasAnnotation(srchText, fn.invisibleAnnotations, fn.visibleAnnotations)).forEach(fn -> BytecodeViewer.viewer.searchBoxPane.treeRoot.add(new LDCSearchTreeNodeResult(container, resourceWorkingName, node, null, fn, fn.name + " " + fn.desc, "")));
-            .forEach(fn -> BytecodeViewer.viewer.searchBoxPane.treeRoot.add(new LDCSearchTreeNodeResult(container, resourceWorkingName, node, null, fn, fn.name + " " + fn.desc, "")));
+    node.methods.stream().filter(mn -> hasAnnotation(srchText, mn.invisibleAnnotations, mn.visibleAnnotations)).forEach(mn -> BytecodeViewer.viewer.searchBoxPane.treeRoot.add(new LDCSearchTreeNodeResult(container, resourceWorkingName, node, mn, null, mn.name + mn.desc, "")));
-    node.methods.stream().filter(mn -> hasAnnotation(srchText, Arrays.asList(mn.invisibleAnnotations, mn.visibleAnnotations)))
-            .forEach(mn -> BytecodeViewer.viewer.searchBoxPane.treeRoot.add(new LDCSearchTreeNodeResult(container, resourceWorkingName, node, mn, null, mn.name + mn.desc, "")));
   }
 
-  public static boolean hasAnnotation(String annotation, List<List<AnnotationNode>> annoLists) {
+  public static boolean hasAnnotation(String annotation, List<AnnotationNode>... annoLists) {
     if (annoLists == null) return false;
     for (List<AnnotationNode> annos : annoLists) {
       if (annos == null) continue;

src/main/java/the/bytecode/club/bytecodeviewer/util/Dex2Jar.java

@@ -1,10 +1,6 @@
 package the.bytecode.club.bytecodeviewer.util;
 
 import com.googlecode.d2j.dex.Dex2jar;
-import com.googlecode.d2j.dex.DexExceptionHandler;
-import com.googlecode.d2j.Method;
-import com.googlecode.d2j.node.DexMethodNode;
-import org.objectweb.asm.MethodVisitor;
 import java.io.File;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
@@ -42,16 +38,7 @@ public class Dex2Jar {
      */
     public static synchronized void dex2Jar(File input, File output) {
         try {
-            Dex2jar d2Jar = Dex2jar.from(input)
+            Dex2jar d2Jar = Dex2jar.from(input);
-                                   .withExceptionHandler(new DexExceptionHandler() {
-                                       public void handleFileException(Exception e) {
-                                           e.printStackTrace();
-                                       }
-                                       
-                                       public void handleMethodTranslateException(Method method, DexMethodNode methodNode, MethodVisitor mv, Exception e) {
-                                           e.printStackTrace();
-                                       }
-                                   });
             d2Jar.to(output.toPath());
         } catch (com.googlecode.d2j.DexException e) {
             e.printStackTrace();

src/main/resources/translations/arabic.json

@@ -84,7 +84,7 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "إعدادات Procyon",
   "CFR_SETTINGS": "إعدادات CFR",
-  "FERNFLOWER_SETTINGS": "إعدادات Vineflower",
+  "FERNFLOWER_SETTINGS": "إعدادات FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
   "FERNFLOWER": "Fernflower",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "مجمع بايت كود",

src/main/resources/translations/bengali.json

@@ -84,7 +84,7 @@
   "JAVA": "জাভা",
   "PROCYON_SETTINGS": "Procyon Settings",
   "CFR_SETTINGS": "CFR Settings",
-  "FERNFLOWER_SETTINGS": "Vineflower Settings",
+  "FERNFLOWER_SETTINGS": "FernFlower Settings",
   "PROCYON": "প্রোসিওন",
   "CFR": "সিএফআর",
   "FERNFLOWER": "ফার্নফ্লোয়ার",

src/main/resources/translations/bulgarian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Настройки на Procyon",
   "CFR_SETTINGS": "Настройки на CFR",
-  "FERNFLOWER_SETTINGS": "Настройки на Vineflower",
+  "FERNFLOWER_SETTINGS": "Настройки на FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Кракатау",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Декомпилатор Procyon",
   "CFR_DECOMPILER": "Декомпилатор на CFR",
-  "FERNFLOWER_DECOMPILER": "Декомпилатор Vineflower",
+  "FERNFLOWER_DECOMPILER": "Декомпилатор FernFlower",
   "JADX_DECOMPILER": "Декомпилатор на JADX",
   "JD_DECOMPILER": "Декомпилатор на JD-GUI",
   "BYTECODE_DISASSEMBLER": "Дезасемблер на байткод",

src/main/resources/translations/croatian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon postavke",
   "CFR_SETTINGS": "CFR postavke",
-  "FERNFLOWER_SETTINGS": "Vineflower postavke",
+  "FERNFLOWER_SETTINGS": "FernFlower postavke",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR dekompilator",
-  "FERNFLOWER_DECOMPILER": "Vineflower dekompilator",
+  "FERNFLOWER_DECOMPILER": "FernFlower dekompilator",
   "JADX_DECOMPILER": "JADX dekompilator",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/czech.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Nastavení systému Procyon",
   "CFR_SETTINGS": "Nastavení CFR",
-  "FERNFLOWER_SETTINGS": "Nastavení Vineflower",
+  "FERNFLOWER_SETTINGS": "Nastavení FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "Dekompilátor CFR",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "Dekompilátor JADX",
   "JD_DECOMPILER": "Dekompilátor JD-GUI",
   "BYTECODE_DISASSEMBLER": "Disassembler bytového kódu",

src/main/resources/translations/danish.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon-indstillinger",
   "CFR_SETTINGS": "CFR-indstillinger",
-  "FERNFLOWER_SETTINGS": "Vineflower-indstillinger",
+  "FERNFLOWER_SETTINGS": "FernFlower-indstillinger",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR-dekompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX-dekompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Disassembler af bytekode",

src/main/resources/translations/english.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon Settings",
   "CFR_SETTINGS": "CFR Settings",
-  "FERNFLOWER_SETTINGS": "Vineflower Settings",
+  "FERNFLOWER_SETTINGS": "FernFlower Settings",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -122,7 +122,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "QuiltFlower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/estonian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyoni seaded",
   "CFR_SETTINGS": "CFR seaded",
-  "FERNFLOWER_SETTINGS": "Vineflower seaded",
+  "FERNFLOWER_SETTINGS": "FernFlower seaded",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR dekompilaator",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX dekompilaator",
   "JD_DECOMPILER": "JD-GUI dekompilaator",
   "BYTECODE_DISASSEMBLER": "Baitkoodi lahtimonteerija",

src/main/resources/translations/farsi.json

@@ -84,10 +84,10 @@
   "JAVA": "جاوا",
   "PROCYON_SETTINGS": "تنظیمات Procyon",
   "CFR_SETTINGS": "تنظیمات CFR",
-  "FERNFLOWER_SETTINGS": "تنظیمات Vineflower",
+  "FERNFLOWER_SETTINGS": "تنظیمات FernFlower",
   "PROCYON": "پروسیون",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "کراکتائو",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "جداکننده Bytecode",

src/main/resources/translations/finnish.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyonin asetukset",
   "CFR_SETTINGS": "CFR-asetukset",
-  "FERNFLOWER_SETTINGS": "Vineflower asetukset",
+  "FERNFLOWER_SETTINGS": "FernFlower asetukset",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Bytekoodin purkuohjelma",

src/main/resources/translations/french.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Paramètres de Procyon",
   "CFR_SETTINGS": "Paramètres du CFR",
-  "FERNFLOWER_SETTINGS": "Paramètres de Vineflower",
+  "FERNFLOWER_SETTINGS": "Paramètres de FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Décompilateur Procyon",
   "CFR_DECOMPILER": "Décompilateur CFR",
-  "FERNFLOWER_DECOMPILER": "Décompilateur Vineflower",
+  "FERNFLOWER_DECOMPILER": "Décompilateur FernFlower",
   "JADX_DECOMPILER": "Décompilateur JADX",
   "JD_DECOMPILER": "Décompilateur JD-GUI",
   "BYTECODE_DISASSEMBLER": "Désassembleur de bytecode",

src/main/resources/translations/georgian.json

@@ -84,10 +84,10 @@
   "JAVA": "ჯავა",
   "PROCYON_SETTINGS": "Procyon პარამეტრები",
   "CFR_SETTINGS": "CFR პარამეტრები",
-  "FERNFLOWER_SETTINGS": "Vineflower პარამეტრები",
+  "FERNFLOWER_SETTINGS": "FernFlower პარამეტრები",
   "PROCYON": "პროციონი",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "კრაკატაუ",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon დეკომპილერი",
   "CFR_DECOMPILER": "CFR დეკომპილერი",
-  "FERNFLOWER_DECOMPILER": "Vineflower დეკომპილერი",
+  "FERNFLOWER_DECOMPILER": "FernFlower დეკომპილერი",
   "JADX_DECOMPILER": "JADX დეკომპილერი",
   "JD_DECOMPILER": "JD-GUI დეკომპილერი",
   "BYTECODE_DISASSEMBLER": "Bytecode დემონტაჟი",

src/main/resources/translations/german.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon-Einstellungen",
   "CFR_SETTINGS": "CFR-Einstellungen",
-  "FERNFLOWER_SETTINGS": "Vineflower Einstellungen",
+  "FERNFLOWER_SETTINGS": "FernFlower Einstellungen",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon-Dekompilierer",
   "CFR_DECOMPILER": "CFR-Dekompilierer",
-  "FERNFLOWER_DECOMPILER": "Vineflower-Dekompilierer",
+  "FERNFLOWER_DECOMPILER": "FernFlower-Dekompilierer",
   "JADX_DECOMPILER": "JADX-Dekompilierer",
   "JD_DECOMPILER": "JD-GUI-Dekompilierer",
   "BYTECODE_DISASSEMBLER": "Bytecode-Disassembler",

src/main/resources/translations/greek.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Ρυθμίσεις Procyon",
   "CFR_SETTINGS": "Ρυθμίσεις CFR",
-  "FERNFLOWER_SETTINGS": "Ρυθμίσεις Vineflower",
+  "FERNFLOWER_SETTINGS": "Ρυθμίσεις FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Αποσυμπιεστής Procyon",
   "CFR_DECOMPILER": "Αποσυμπιεστής CFR",
-  "FERNFLOWER_DECOMPILER": "Αποσυμπιεστής Vineflower",
+  "FERNFLOWER_DECOMPILER": "Αποσυμπιεστής FernFlower",
   "JADX_DECOMPILER": "Αποσυμπιεστής JADX",
   "JD_DECOMPILER": "Αποσυμπιεστής JD-GUI",
   "BYTECODE_DISASSEMBLER": "Αποσυναρμολογητής bytecode",

src/main/resources/translations/hausa.json

@@ -84,7 +84,7 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Saitunan Procyon",
   "CFR_SETTINGS": "Saitunan CFR",
-  "FERNFLOWER_SETTINGS": "Saitunan Vineflower",
+  "FERNFLOWER_SETTINGS": "Saitunan FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
   "FERNFLOWER": "MaidaM",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Rarraba Procyon",
   "CFR_DECOMPILER": "CFR Rarrabawa",
-  "FERNFLOWER_DECOMPILER": "Rarraba Vineflower",
+  "FERNFLOWER_DECOMPILER": "Rarraba FernFlower",
   "JADX_DECOMPILER": "JADX Rarrabawa",
   "JD_DECOMPILER": "Rarraba JD-GUI",
   "BYTECODE_DISASSEMBLER": "Bytecode Mai Rarrabawa",

src/main/resources/translations/hebrew.json

@@ -84,7 +84,7 @@
   "JAVA": "ג'אווה",
   "PROCYON_SETTINGS": "הגדרות Procyon",
   "CFR_SETTINGS": "הגדרות CFR",
-  "FERNFLOWER_SETTINGS": "הגדרות Vineflower",
+  "FERNFLOWER_SETTINGS": "הגדרות FernFlower",
   "PROCYON": "פרוקיון",
   "CFR": "CFR",
   "FERNFLOWER": "פרנפלור",

src/main/resources/translations/hindi.json

@@ -84,7 +84,7 @@
   "JAVA": "जावा",
   "PROCYON_SETTINGS": "Procyon Settings",
   "CFR_SETTINGS": "CFR Settings",
-  "FERNFLOWER_SETTINGS": "Vineflower Settings",
+  "FERNFLOWER_SETTINGS": "FernFlower Settings",
   "PROCYON": "प्रोसिओन",
   "CFR": "सीएफआर",
   "FERNFLOWER": "फर्नफ्लावर",

src/main/resources/translations/hungarian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon beállítások",
   "CFR_SETTINGS": "CFR beállítások",
-  "FERNFLOWER_SETTINGS": "Vineflower beállítások",
+  "FERNFLOWER_SETTINGS": "FernFlower beállítások",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon dekompilátor",
   "CFR_DECOMPILER": "CFR dekompilátor",
-  "FERNFLOWER_DECOMPILER": "Vineflower dekompilátor",
+  "FERNFLOWER_DECOMPILER": "FernFlower dekompilátor",
   "JADX_DECOMPILER": "JADX dekompilátor",
   "JD_DECOMPILER": "JD-GUI dekompilátor",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/indonesian.json

@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Dekompiler Procyon",
   "CFR_DECOMPILER": "Dekompiler CFR",
-  "FERNFLOWER_DECOMPILER": "Dekompiler Vineflower",
+  "FERNFLOWER_DECOMPILER": "Dekompiler FernFlower",
   "JADX_DECOMPILER": "Dekompiler JADX",
   "JD_DECOMPILER": "Dekompiler JD-GUI",
   "BYTECODE_DISASSEMBLER": "Pembongkaran Bytecode",

src/main/resources/translations/italian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Impostazioni Procyon",
   "CFR_SETTINGS": "Impostazioni CFR",
-  "FERNFLOWER_SETTINGS": "Impostazioni di Vineflower",
+  "FERNFLOWER_SETTINGS": "Impostazioni di FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Decompilatore Procyon",
   "CFR_DECOMPILER": "Decompilatore CFR",
-  "FERNFLOWER_DECOMPILER": "Decompilatore Vineflower",
+  "FERNFLOWER_DECOMPILER": "Decompilatore FernFlower",
   "JADX_DECOMPILER": "Decompilatore JADX",
   "JD_DECOMPILER": "Decompilatore JD-GUI",
   "BYTECODE_DISASSEMBLER": "Disassemblatore di bytecode",

src/main/resources/translations/japanese.json

@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "プロキオンデコンパイラ",
   "CFR_DECOMPILER": "CFRデコンパイラー",
-  "FERNFLOWER_DECOMPILER": "Vineflowerデコンパイラ",
+  "FERNFLOWER_DECOMPILER": "FernFlowerデコンパイラ",
   "JADX_DECOMPILER": "JADXデコンパイラー",
   "JD_DECOMPILER": "JD-GUIデコンパイラー",
   "BYTECODE_DISASSEMBLER": "バイトコード・ディスアセンブラ",

src/main/resources/translations/javanese.json

@@ -84,7 +84,7 @@
   "JAVA": "Jawa",
   "PROCYON_SETTINGS": "Procyon Settings",
   "CFR_SETTINGS": "CFR Settings",
-  "FERNFLOWER_SETTINGS": "Vineflower Settings",
+  "FERNFLOWER_SETTINGS": "FernFlower Settings",
   "PROCYON": "Procyon",
   "CFR": "CFR",
   "FERNFLOWER": "KembangBunga",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Decompiler Vineflower",
+  "FERNFLOWER_DECOMPILER": "Decompiler FernFlower",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/korean.json

@@ -84,7 +84,7 @@
   "JAVA": "자바",
   "PROCYON_SETTINGS": "Procyon Settings",
   "CFR_SETTINGS": "CFR Settings",
-  "FERNFLOWER_SETTINGS": "Vineflower Settings",
+  "FERNFLOWER_SETTINGS": "FernFlower Settings",
   "PROCYON": "프로키온",
   "CFR": "CFR",
   "FERNFLOWER": "고사리꽃",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "프로키온 디컴파일러",
   "CFR_DECOMPILER": "CFR 디컴파일러",
-  "FERNFLOWER_DECOMPILER": "Vineflower 디컴파일러",
+  "FERNFLOWER_DECOMPILER": "FernFlower 디컴파일러",
   "JADX_DECOMPILER": "JADX 디컴파일러",
   "JD_DECOMPILER": "JD-GUI 디컴파일러",
   "BYTECODE_DISASSEMBLER": "바이트코드 디스어셈블러",

src/main/resources/translations/lativan.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon iestatījumi",
   "CFR_SETTINGS": "CFR iestatījumi",
-  "FERNFLOWER_SETTINGS": "Vineflower iestatījumi",
+  "FERNFLOWER_SETTINGS": "FernFlower iestatījumi",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon dekompilētājs",
   "CFR_DECOMPILER": "CFR dekompilētājs",
-  "FERNFLOWER_DECOMPILER": "Vineflower dekompilētājs",
+  "FERNFLOWER_DECOMPILER": "FernFlower dekompilētājs",
   "JADX_DECOMPILER": "JADX dekompilētājs",
   "JD_DECOMPILER": "JD-GUI dekompilētājs",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/lithuanian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon nustatymai",
   "CFR_SETTINGS": "CFR nustatymai",
-  "FERNFLOWER_SETTINGS": "Vineflower nustatymai",
+  "FERNFLOWER_SETTINGS": "FernFlower nustatymai",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR dekompiliatorius",
-  "FERNFLOWER_DECOMPILER": "Vineflower dekompiliatorius",
+  "FERNFLOWER_DECOMPILER": "FernFlower dekompiliatorius",
   "JADX_DECOMPILER": "JADX dekompiliatorius",
   "JD_DECOMPILER": "JD-GUI dekompiliatorius",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/malay.json

@@ -84,10 +84,10 @@
   "JAVA": "Jawa",
   "PROCYON_SETTINGS": "Tetapan Procyon",
   "CFR_SETTINGS": "Tetapan CFR",
-  "FERNFLOWER_SETTINGS": "Tetapan Vineflower",
+  "FERNFLOWER_SETTINGS": "Tetapan FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "Pengurai CFR",
-  "FERNFLOWER_DECOMPILER": "Pengurai Vineflower",
+  "FERNFLOWER_DECOMPILER": "Pengurai FernFlower",
   "JADX_DECOMPILER": "Pengurai JADX",
   "JD_DECOMPILER": "Pengurai JD-GUI",
   "BYTECODE_DISASSEMBLER": "Pembongkaran Bytecode",

src/main/resources/translations/mandarin.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon 设置",
   "CFR_SETTINGS": "CFR 设置",
-  "FERNFLOWER_SETTINGS": "Vineflower 设置",
+  "FERNFLOWER_SETTINGS": "FernFlower 设置",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon 反编译器",
   "CFR_DECOMPILER": "CFR 反编译器",
-  "FERNFLOWER_DECOMPILER": "Vineflower 反编译器",
+  "FERNFLOWER_DECOMPILER": "FernFlower 反编译器",
   "JADX_DECOMPILER": "JADX 反编译器",
   "JD_DECOMPILER": "JD-GUI 反编译器",
   "BYTECODE_DISASSEMBLER": "字节码反汇编",

src/main/resources/translations/nederlands.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon Instellingen",
   "CFR_SETTINGS": "CFR-instellingen",
-  "FERNFLOWER_SETTINGS": "Vineflower Instellingen",
+  "FERNFLOWER_SETTINGS": "FernFlower Instellingen",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Bytecode disassembler",

src/main/resources/translations/norwegian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon-innstillinger",
   "CFR_SETTINGS": "CFR-innstillinger",
-  "FERNFLOWER_SETTINGS": "Vineflower-innstillinger",
+  "FERNFLOWER_SETTINGS": "FernFlower-innstillinger",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX dekompilator",
   "JD_DECOMPILER": "JD-GUI dekompilator",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/polish.json

@@ -87,7 +87,7 @@
   "FERNFLOWER_SETTINGS": "Ustawienia kwiatu paproci",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Dekompilator Procyon",
   "CFR_DECOMPILER": "Dekompilator CFR",
-  "FERNFLOWER_DECOMPILER": "Dekompilator Vineflower",
+  "FERNFLOWER_DECOMPILER": "Dekompilator FernFlower",
   "JADX_DECOMPILER": "Dekompilator JADX",
   "JD_DECOMPILER": "Dekompilator JD-GUI",
   "BYTECODE_DISASSEMBLER": "Dezasembler bajtkodu",

src/main/resources/translations/portuguese.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Definições de Procyon",
   "CFR_SETTINGS": "Definições do CFR",
-  "FERNFLOWER_SETTINGS": "Definições Vineflower",
+  "FERNFLOWER_SETTINGS": "Definições FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Descompilador Procyon",
   "CFR_DECOMPILER": "Descompilador CFR",
-  "FERNFLOWER_DECOMPILER": "Descompilador Vineflower",
+  "FERNFLOWER_DECOMPILER": "Descompilador FernFlower",
   "JADX_DECOMPILER": "Descompilador JADX",
   "JD_DECOMPILER": "Descompilador JD-GUI",
   "BYTECODE_DISASSEMBLER": "Bytecode Desassembler",

src/main/resources/translations/romanian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Setări Procyon",
   "CFR_SETTINGS": "Setări CFR",
-  "FERNFLOWER_SETTINGS": "Vineflower Setări",
+  "FERNFLOWER_SETTINGS": "FernFlower Setări",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Descompilatorul Procyon",
   "CFR_DECOMPILER": "Descompilator CFR",
-  "FERNFLOWER_DECOMPILER": "Descompilatorul Vineflower",
+  "FERNFLOWER_DECOMPILER": "Descompilatorul FernFlower",
   "JADX_DECOMPILER": "Descompilator JADX",
   "JD_DECOMPILER": "Decompilator JD-GUI",
   "BYTECODE_DISASSEMBLER": "Dezasamblatorul de bytecode",

src/main/resources/translations/russian.json

@@ -87,7 +87,7 @@
   "FERNFLOWER_SETTINGS": "Параметры цветка папоротника",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Декомпилятор Procyon",
   "CFR_DECOMPILER": "Декомпилятор CFR",
-  "FERNFLOWER_DECOMPILER": "Декомпилятор Vineflower",
+  "FERNFLOWER_DECOMPILER": "Декомпилятор FernFlower",
   "JADX_DECOMPILER": "Декомпилятор JADX",
   "JD_DECOMPILER": "Декомпилятор JD-GUI",
   "BYTECODE_DISASSEMBLER": "Дизассемблер байт-кода",

src/main/resources/translations/slovak.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Nastavenia Procyonu",
   "CFR_SETTINGS": "Nastavenia CFR",
-  "FERNFLOWER_SETTINGS": "Nastavenia Vineflower",
+  "FERNFLOWER_SETTINGS": "Nastavenia FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Dekompilátor Procyon",
   "CFR_DECOMPILER": "Dekompilátor CFR",
-  "FERNFLOWER_DECOMPILER": "Dekompilátor Vineflower",
+  "FERNFLOWER_DECOMPILER": "Dekompilátor FernFlower",
   "JADX_DECOMPILER": "Dekompilátor JADX",
   "JD_DECOMPILER": "Dekompilátor JD-GUI",
   "BYTECODE_DISASSEMBLER": "Disassembler bytového kódu",

src/main/resources/translations/slovenian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Nastavitve Procyona",
   "CFR_SETTINGS": "Nastavitve CFR",
-  "FERNFLOWER_SETTINGS": "Nastavitve Vineflower",
+  "FERNFLOWER_SETTINGS": "Nastavitve FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Razčlenjevalnik bajtkode",

src/main/resources/translations/spanish.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Configuración de Procyon",
   "CFR_SETTINGS": "Ajustes del CFR",
-  "FERNFLOWER_SETTINGS": "Configuración de Vineflower",
+  "FERNFLOWER_SETTINGS": "Configuración de FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Descompilador Procyon",
   "CFR_DECOMPILER": "Descompilador CFR",
-  "FERNFLOWER_DECOMPILER": "Descompilador Vineflower",
+  "FERNFLOWER_DECOMPILER": "Descompilador FernFlower",
   "JADX_DECOMPILER": "Descompilador JADX",
   "JD_DECOMPILER": "Descompilador JD-GUI",
   "BYTECODE_DISASSEMBLER": "Desensamblador de Bytecode",

src/main/resources/translations/swahili.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Mipangilio ya Procyon",
   "CFR_SETTINGS": "Mipangilio ya CFR",
-  "FERNFLOWER_SETTINGS": "Mipangilio ya Vineflower",
+  "FERNFLOWER_SETTINGS": "Mipangilio ya FernFlower",
   "PROCYON": "Prokon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Mtenganishaji wa Procyon",
   "CFR_DECOMPILER": "Mchanganyiko wa CFR",
-  "FERNFLOWER_DECOMPILER": "Mkusanyaji wa Vineflower",
+  "FERNFLOWER_DECOMPILER": "Mkusanyaji wa FernFlower",
   "JADX_DECOMPILER": "JADX Mtenganishaji",
   "JD_DECOMPILER": "JD-GUI Mtenganishaji",
   "BYTECODE_DISASSEMBLER": "Kutenganisha kwa Bytecode",

src/main/resources/translations/swedish.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Inställningar för Procyon",
   "CFR_SETTINGS": "Inställningar för CFR",
-  "FERNFLOWER_SETTINGS": "Inställningar för Vineflower",
+  "FERNFLOWER_SETTINGS": "Inställningar för FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR-dekompilering",
-  "FERNFLOWER_DECOMPILER": "Vineflower-dekompilering",
+  "FERNFLOWER_DECOMPILER": "FernFlower-dekompilering",
   "JADX_DECOMPILER": "JADX-dekompilering",
   "JD_DECOMPILER": "JD-GUI-dekompilering",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/thai.json

@@ -84,7 +84,7 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon Settings",
   "CFR_SETTINGS": "CFR Settings",
-  "FERNFLOWER_SETTINGS": "Vineflower Settings",
+  "FERNFLOWER_SETTINGS": "FernFlower Settings",
   "PROCYON": "Procyon",
   "CFR": "CFR",
   "FERNFLOWER": "เฟิร์นฟลาวเวอร์",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",

src/main/resources/translations/turkish.json

@@ -84,7 +84,7 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Procyon Ayarları",
   "CFR_SETTINGS": "CFR Ayarları",
-  "FERNFLOWER_SETTINGS": "Vineflower Ayarları",
+  "FERNFLOWER_SETTINGS": "FernFlower Ayarları",
   "PROCYON": "Procyon",
   "CFR": "CFR",
   "FERNFLOWER": "EğreltiotuÇiçek",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "CFR Decompiler",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "JADX Decompiler",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Bayt Kodu Çözücü",

src/main/resources/translations/ukrainian.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Налаштування Procyon",
   "CFR_SETTINGS": "Налаштування CFR",
-  "FERNFLOWER_SETTINGS": "Налаштування Vineflower",
+  "FERNFLOWER_SETTINGS": "Налаштування FernFlower",
   "PROCYON": "Процій",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Кракатау",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Декомпілятор проціонів",
   "CFR_DECOMPILER": "CFR-декомпілятор",
-  "FERNFLOWER_DECOMPILER": "Декомпілятор Vineflower",
+  "FERNFLOWER_DECOMPILER": "Декомпілятор FernFlower",
   "JADX_DECOMPILER": "Декомпілятор JADX",
   "JD_DECOMPILER": "Декомпілятор JD-GUI",
   "BYTECODE_DISASSEMBLER": "Розбірник байт-кодів",

src/main/resources/translations/vietnamese.json

@@ -84,10 +84,10 @@
   "JAVA": "Java",
   "PROCYON_SETTINGS": "Cài đặt Procyon",
   "CFR_SETTINGS": "Cài đặt CFR",
-  "FERNFLOWER_SETTINGS": "Cài đặt Vineflower",
+  "FERNFLOWER_SETTINGS": "Cài đặt FernFlower",
   "PROCYON": "Procyon",
   "CFR": "CFR",
-  "FERNFLOWER": "Vineflower",
+  "FERNFLOWER": "FernFlower",
   "KRAKATAU": "Krakatau",
   "JDGUI": "JD-GUI",
   "JADX": "JADX",
@@ -121,7 +121,7 @@
 
   "PROCYON_DECOMPILER": "Procyon Decompiler",
   "CFR_DECOMPILER": "Trình biên dịch CFR",
-  "FERNFLOWER_DECOMPILER": "Vineflower Decompiler",
+  "FERNFLOWER_DECOMPILER": "FernFlower Decompiler",
   "JADX_DECOMPILER": "Trình biên dịch JADX",
   "JD_DECOMPILER": "JD-GUI Decompiler",
   "BYTECODE_DISASSEMBLER": "Bytecode Disassembler",