Skip to content

Commit

Permalink
2.2.1
Browse files Browse the repository at this point in the history
12/13/2014 - Fixed an issue with the Bytecode Decompiler. - Thanks bibl
  • Loading branch information
Konloch committed Dec 14, 2014
1 parent 0a81d69 commit 949a78b
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
Binary file not shown.
11 changes: 6 additions & 5 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ FernFlower by Stiver
Procyon by Mstrobel
CFR by Lee Benfield

Video of Beta 1.5.2: https://the.bytecode.club/pages.php?page=bytecode-viewer

Download the latest version here: https://github.com/Konloch/bytecode-viewer/releases if you're looking for an older copy, check out https://the.bytecode.club/bcv-archive/

Video: http://the.bytecode.club/bytecodeviewer-video/
Source Code: https://github.com/konloch/bytecode-viewer
Bin/Archive: https://github.com/konloch/bytecode-viewer/releases
Java Docs: https://the.bytecode.club/docs/bytecode-viewer/

Features:
Expand Down Expand Up @@ -175,4 +174,6 @@ Changelog:
12/09/2014 - When you press enter in the text search bar, it will now search.
12/13/2014 - The Bytecode Decompiler now shows the method's description in a comment.
12/13/2014 - Fixed an issue with the text search function.
12/13/2014 - Search results are now clickable.
12/13/2014 - Search results are now clickable.
--- 2.2.1 ---:
12/13/2014 - Fixed an issue with the Bytecode Decompiler. - Thanks bibl
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.0
2.2.1
4 changes: 3 additions & 1 deletion src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@
* 12/13/2014 - The Bytecode Decompiler now shows the method's description in a comment.
* 12/13/2014 - Fixed an issue with the text search function.
* 12/13/2014 - Search results are now clickable.
* -----2.2.1-----:
* 12/13/2014 - Fixed an issue with the Bytecode Decompiler. - Thanks bibl
*
* @author Konloch
*
Expand All @@ -229,7 +231,7 @@ public class BytecodeViewer {
private static ArrayList<String> recentPlugins = DiskReader.loadArrayList(pluginsName, false);
public static boolean runningObfuscation = false;

public static String version = "2.2.0";
public static String version = "2.2.1";

public static void main(String[] args) {
iconList = new ArrayList<BufferedImage>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,20 +163,21 @@ protected String printIntInsnNode(IntInsnNode iin, ListIterator<?> it) {
}

protected String printFieldInsnNode(FieldInsnNode fin, ListIterator<?> it) {
return nameOpcode(fin.getOpcode()) + " " + fin.owner + "." + fin.name + ":" + Type.getType(fin.desc).getClassName();
String desc = Type.getType(fin.desc).getClassName();
if(desc == null || desc.equals("null"))
desc = fin.desc;
return nameOpcode(fin.getOpcode()) + " " + fin.owner + "." + fin.name + ":" + desc;
}

protected String printMethodInsnNode(MethodInsnNode min, ListIterator<?> it) {
StringBuilder sb = new StringBuilder();
sb.append(nameOpcode(min.getOpcode()) + " " + min.owner + " " + min.name + "(");

if(Type.getType(min.desc).getClassName() == null ||
Type.getType(min.desc).getClassName().equalsIgnoreCase("null"))
{
//sb.append(min.desc);
} else {
sb.append(Type.getType(min.desc).getClassName());
}
String desc = Type.getType(min.desc).getClassName();
if(desc == null || desc.equals("null"))
desc = min.desc;
sb.append(desc);

sb.append(");");

return sb.toString();
Expand Down Expand Up @@ -216,7 +217,10 @@ protected String printLabelnode(LabelNode label) {

protected String printTypeInsnNode(TypeInsnNode tin) {
try {
return nameOpcode(tin.getOpcode()) + " " + Type.getType(tin.desc).getClassName();
String desc = Type.getType(tin.desc).getClassName();
if(desc == null || desc.equals("null"))
desc = tin.desc;
return nameOpcode(tin.getOpcode()) + " " + desc;
} catch(Exception e) {
new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e);
}
Expand Down

0 comments on commit 949a78b

Please sign in to comment.