Make sure that deob entries are detected for JavaDocfeature/javadoc

2 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java b/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java
index 7f8779fc..fa0e07a9 100644
--- a/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java
+++ b/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java
@@ -79,7 +79,7 @@ public class ClassTranslator {
 
         ClassEntry classEntry = new ClassEntry(Descriptor.toJvmName(c.getName()));
 
-        // Try to add javadoc to constructor
+        // Try to add javadoc to class
         docMapping.tryToAddJavaDoc(c, classEntry);
         // translate all the fields
         for (CtField field : c.getDeclaredFields()) {
@@ -94,7 +94,7 @@ public class ClassTranslator {
                 field.setName(translatedName);
 
                 // Try to add javadoc as ob
-                docMapping.tryToAddJavaDoc(field, entry);
+                docMapping.tryToAddJavaDoc(field, EntryFactory.getFieldEntry(field));
             }
 
             // translate the type
@@ -115,10 +115,9 @@ public class ClassTranslator {
                 // translate the name
                 String translatedName = this.translator.translate(entry);
                 if (translatedName != null) {
-                    MethodEntry deObfuscatedMethod = new MethodEntry(entry.getClassEntry(), translatedName, entry.getSignature());
                     method.setName(translatedName);
                     // Try to add javadoc as ob
-                    docMapping.tryToAddJavaDoc(method, entry, deObfuscatedMethod);
+                    docMapping.tryToAddJavaDoc(method, entry, EntryFactory.getMethodEntry(method));
                 }
             }
             else
@@ -170,6 +169,8 @@ public class ClassTranslator {
         if (deobfClassEntry != null) {
             String sourceFile = Descriptor.toJvmName(deobfClassEntry.getOutermostClassEntry().getSimpleName()) + ".java";
             c.getClassFile().addAttribute(new SourceFileAttribute(constants, sourceFile));
+            // Try to add javadoc to class as deobfuscated
+            docMapping.tryToAddJavaDoc(c, deobfClassEntry);
         }
     }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/javadoc/JavaDocMapping.java b/src/main/java/cuchaz/enigma/mapping/javadoc/JavaDocMapping.java
index 8b68a12d..cdc78501 100644
--- a/src/main/java/cuchaz/enigma/mapping/javadoc/JavaDocMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/javadoc/JavaDocMapping.java
@@ -34,9 +34,9 @@ public class JavaDocMapping
         this.behaviorByID = new ArrayList<>();
 
         // TODO: File format
-        addField("a", "none/akw", "Lnone/kp;", "Hello from Enigma");
+        addField("id", "none/akw", "Lnone/kp;", "Hello from Enigma");
         addMethod("<init>", "none/akw", "(Lnone/ayo;)V", "You know what? I love constructors!", null, new String[]{ "The material of the block!" });
-        addClass("none/akw", "HEY I'M A BLOCK YOU KNOW THAT?!");
+        addClass("net/minecraft/block/Block", "HEY I'M A BLOCK YOU KNOW THAT?!");
     }
 
     private void addClass(String className, String comment)