Update Mixin to 0.5.17

Mumfrey
1 parent ff13a62c
Showing 5 changed files with 187 additions and 7 deletions
build.gradle
src/main/java/com/mumfrey/liteloader/core/runtime/Obf.java
src/main/java/com/mumfrey/liteloader/core/runtime/SrgContainer.java
src/main/java/com/mumfrey/liteloader/core/runtime/SrgField.java
src/main/java/com/mumfrey/liteloader/core/runtime/SrgMethod.java
@@ -64,6 +64,7 @@ sourceCompatibility = &#39;1.6&#39;
 targetCompatibility = '1.6'
  
 repositories {
+    mavenLocal()
     maven {
         name = 'sponge'
         url = 'https://repo.spongepowered.org/maven/'
@@ -71,7 +72,7 @@ repositories {
 }
  
 dependencies {
-    compile('org.spongepowered:mixin:0.5.11-SNAPSHOT') {
+    compile('org.spongepowered:mixin:0.5.17-SNAPSHOT') {
         exclude module: 'asm-commons'
         exclude module: 'asm-tree'
         exclude module: 'launchwrapper'
@@ -10,9 +10,6 @@ import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
  
-import org.spongepowered.asm.obfuscation.SrgField;
-import org.spongepowered.asm.obfuscation.SrgMethod;
-
 /**
  * Centralised obfuscation table for LiteLoader
  *
@@ -12,9 +12,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
  
-import org.spongepowered.asm.obfuscation.SrgField;
-import org.spongepowered.asm.obfuscation.SrgMethod;
-
 import com.google.common.io.Files;
  
 import joptsimple.internal.Strings;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.core.runtime;
+
+import com.google.common.base.Objects;
+
+/**
+ * Stores information about an SRG field mapping during AP runs
+ */
+public final class SrgField
+{
+    
+    private final String mapping;
+    
+    public SrgField(String mapping)
+    {
+        this.mapping = mapping;
+    }
+    
+    public String getName()
+    {
+        if (this.mapping == null)
+        {
+            return null;
+        }
+        int pos = this.mapping.lastIndexOf('/');
+        return pos > -1 ? this.mapping.substring(pos + 1) : this.mapping;
+    }
+    
+    public String getOwner()
+    {
+        if (this.mapping == null)
+        {
+            return null;
+        }
+        int pos = this.mapping.lastIndexOf('/');
+        return pos > -1 ? this.mapping.substring(0, pos) : null;
+    }
+    
+    public String getMapping()
+    {
+        return this.mapping;
+    }
+    
+    public SrgField move(String newOwner)
+    {
+        return new SrgField((newOwner != null ? newOwner + "/" : "") + this.getName());
+    }
+    
+    public SrgField copy()
+    {
+        return new SrgField(this.mapping);
+    }
+    
+    @Override
+    public int hashCode()
+    {
+        return Objects.hashCode(this.mapping);
+    }
+    
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj instanceof SrgField)
+        {
+            return Objects.equal(this.mapping, ((SrgField)obj).mapping);
+        }
+        return false;
+    }
+    
+    @Override
+    public String toString()
+    {
+        return this.mapping;
+    }
+}
 \ No newline at end of file
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.core.runtime;
+
+import com.google.common.base.Objects;
+
+/**
+ * Stores information about an SRG method mapping during AP runs
+ */
+public final class SrgMethod
+{
+    
+    private final String name;
+    private final String desc;
+    
+    public SrgMethod(String name, String desc)
+    {
+        this.name = name;
+        this.desc = desc;
+    }
+    
+    public SrgMethod(String owner, String simpleName, String desc)
+    {
+        this.name = SrgMethod.createName(owner, simpleName);
+        this.desc = desc;
+    }
+    
+    public String getName()
+    {
+        return this.name;
+    }
+    
+    public String getSimpleName()
+    {
+        if (this.name == null)
+        {
+            return null;
+        }
+        int pos = this.name.lastIndexOf('/');
+        return pos > -1 ? this.name.substring(pos + 1) : this.name;
+    }
+    
+    public String getOwner()
+    {
+        if (this.name == null)
+        {
+            return null;
+        }
+        int pos = this.name.lastIndexOf('/');
+        return pos > -1 ? this.name.substring(0, pos) : null;
+    }
+    
+    public String getDesc()
+    {
+        return this.desc;
+    }
+    
+    public SrgMethod move(String newOwner)
+    {
+        return new SrgMethod(newOwner, this.getSimpleName(), this.desc);
+    }
+    
+    public SrgMethod copy()
+    {
+        return new SrgMethod(this.name, this.desc);
+    }
+    
+    @Override
+    public int hashCode()
+    {
+        return Objects.hashCode(this.name, this.desc);
+    }
+    
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj instanceof SrgMethod)
+        {
+            return Objects.equal(this.name, ((SrgMethod)obj).name) && Objects.equal(this.desc, ((SrgMethod)obj).desc);
+        }
+        return false;
+    }
+    
+    @Override
+    public String toString()
+    {
+        return String.format("%s %s", this.name, this.desc);
+    }
+    
+    private static String createName(String owner, String simpleName)
+    {
+        return (owner != null ? owner + "/" : "") + simpleName;
+    }
+    
+}