BlocksMod/SpecialSource
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to use asm-debug-all so we can get line numbers and generic sigs.

Browse Source
This commit is contained in:
md_5 2013-07-15 09:45:16 +10:00
parent 11d057e669
commit 8d4cabb8d0
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -43,28 +43,26 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId> <artifactId>asm-debug-all</artifactId>
<version>4.1</version> <version>4.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>0.11.6</version> <version>0.11.8</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.jopt-simple</groupId> <groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId> <artifactId>jopt-simple</artifactId>
<version>4.4</version> <version>4.5</version>
<type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>14.0.1</version> <version>14.0.1</version>
<type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -100,7 +98,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>2.5.1</version>
<configuration> <configuration>
<source>1.6</source> <source>1.6</source>
<target>1.6</target> <target>1.6</target>
@ -121,7 +119,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.0</version> <version>2.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

6
src/main/java/net/md_5/specialsource/RemapperPreprocessor.java
View File

@ -125,7 +125,7 @@ public class RemapperPreprocessor {
// Get inheritance // Get inheritance
ArrayList<String> parents = new ArrayList<String>(); ArrayList<String> parents = new ArrayList<String>();
for (String iface : (List<String>) classNode.interfaces) { for (String iface : classNode.interfaces) {
parents.add(iface); parents.add(iface);
} }
parents.add(classNode.superName); parents.add(classNode.superName);
@ -144,12 +144,12 @@ public class RemapperPreprocessor {
// Field access // Field access
if (accessMap != null) { if (accessMap != null) {
for (FieldNode fieldNode : (List<FieldNode>) classNode.fields) { for (FieldNode fieldNode : classNode.fields) {
fieldNode.access = accessMap.applyFieldAccess(className, fieldNode.name, fieldNode.access); fieldNode.access = accessMap.applyFieldAccess(className, fieldNode.name, fieldNode.access);
} }
} }
for (MethodNode methodNode : (List<MethodNode>) classNode.methods) { for (MethodNode methodNode : classNode.methods) {
// Method access // Method access
if (accessMap != null) { if (accessMap != null) {
methodNode.access = accessMap.applyMethodAccess(className, methodNode.name, methodNode.desc, methodNode.access); methodNode.access = accessMap.applyMethodAccess(className, methodNode.name, methodNode.desc, methodNode.access);

2
src/main/java/net/md_5/specialsource/provider/ClassLoaderProvider.java
View File

@ -62,7 +62,7 @@ public class ClassLoaderProvider implements InheritanceProvider {
cr.accept(node, 0); cr.accept(node, 0);
Collection<String> parents = new HashSet<String>(); Collection<String> parents = new HashSet<String>();
for (String iface : (List<String>) node.interfaces) { for (String iface : node.interfaces) {
parents.add(iface); parents.add(iface);
} }
if (node.superName != null) { if (node.superName != null) {

2
src/main/java/net/md_5/specialsource/provider/JarProvider.java
View File

@ -55,7 +55,7 @@ public class JarProvider implements InheritanceProvider {
} }
Collection<String> parents = new ArrayList<String>(); Collection<String> parents = new ArrayList<String>();
for (String iface : (List<String>) node.interfaces) { for (String iface : node.interfaces) {
parents.add(iface); parents.add(iface);
} }
if (node.superName != null) { if (node.superName != null) {