Skip to content

Commit 25f5c79

Browse files
LexManosLexManos
committed
Repackage class adaptors to cleanup smurf names, bump version.
1 parent 05aa80e commit 25f5c79

9 files changed

Lines changed: 53 additions & 29 deletions

File tree

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apply plugin: 'fatjar'
1313
apply plugin: 'maven'
1414

1515
group = 'de.oceanlabs.mcp'
16-
version = '3.2-SNAPSHOT'
16+
version = '3.3-SNAPSHOT'
1717
targetCompatibility = '1.6'
1818
sourceCompatibility = '1.6'
1919

‎src/main/java/de/oceanlabs/mcp/mcinjector/MCInjectorImpl.java‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@
3535

3636
import com.google.gson.*;
3737

38+
import de.oceanlabs.mcp.mcinjector.adaptors.AccessFixer;
39+
import de.oceanlabs.mcp.mcinjector.adaptors.AccessReader;
40+
import de.oceanlabs.mcp.mcinjector.adaptors.ApplyMap;
41+
import de.oceanlabs.mcp.mcinjector.adaptors.ApplyMarker;
42+
import de.oceanlabs.mcp.mcinjector.adaptors.GenerateMap;
43+
import de.oceanlabs.mcp.mcinjector.adaptors.JsonAttribute;
44+
import de.oceanlabs.mcp.mcinjector.adaptors.ReadMarker;
45+
3846
public class MCInjectorImpl
3947
{
4048
private final static Logger log = Logger.getLogger("MCInjector");
@@ -588,26 +596,26 @@ public byte[] processClass(byte[] cls, boolean readOnly)
588596
ClassVisitor ca = cn;
589597
if (readOnly)
590598
{
591-
ca = new ReadMarkerClassAdaptor(ca, this);
599+
ca = new ReadMarker(ca, this);
592600
}
593601
else
594602
{
595-
ca = new ApplyMapClassAdapter(cn, this);
596-
ca = new JsonAttributeClassAdaptor(ca, this);
603+
ca = new ApplyMap(cn, this);
604+
ca = new JsonAttribute(ca, this);
597605

598606
if (applyMarkers)
599607
{
600-
ca = new ApplyMarkerClassAdaptor(ca, this);
608+
ca = new ApplyMarker(ca, this);
601609
}
602610

603611
if (generate || genParams)
604612
{
605-
ca = new GenerateMapClassAdapter(ca, this);
613+
ca = new GenerateMap(ca, this);
606614
}
607615

608-
ca = new AccessFixerClassAdaptor(ca, this);
616+
ca = new AccessFixer(ca, this);
609617
}
610-
ca = new AccessReaderClassAdaptor(ca, this);
618+
ca = new AccessReader(ca, this);
611619

612620
cr.accept(ca, 0);
613621

src/main/java/de/oceanlabs/mcp/mcinjector/AccessFixerClassAdaptor.java renamed to src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/AccessFixer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.oceanlabs.mcp.mcinjector;
1+
package de.oceanlabs.mcp.mcinjector.adaptors;
22

33
import static org.objectweb.asm.Opcodes.*;
44

@@ -7,16 +7,18 @@
77
import org.objectweb.asm.ClassVisitor;
88
import org.objectweb.asm.MethodVisitor;
99

10+
import de.oceanlabs.mcp.mcinjector.InheratanceMap;
11+
import de.oceanlabs.mcp.mcinjector.MCInjectorImpl;
1012
import de.oceanlabs.mcp.mcinjector.InheratanceMap.Access;
1113

12-
public class AccessFixerClassAdaptor extends ClassVisitor
14+
public class AccessFixer extends ClassVisitor
1315
{
1416
private static final Logger log = Logger.getLogger("MCInjector");
1517
private MCInjectorImpl mci;
1618
private String className;
1719
private InheratanceMap.Class meta;
1820

19-
public AccessFixerClassAdaptor(ClassVisitor cv, MCInjectorImpl mci)
21+
public AccessFixer(ClassVisitor cv, MCInjectorImpl mci)
2022
{
2123
super(ASM4, cv);
2224
this.mci = mci;

src/main/java/de/oceanlabs/mcp/mcinjector/AccessReaderClassAdaptor.java renamed to src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/AccessReader.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.oceanlabs.mcp.mcinjector;
1+
package de.oceanlabs.mcp.mcinjector.adaptors;
22

33
import static org.objectweb.asm.Opcodes.*;
44

@@ -12,14 +12,16 @@
1212
import org.objectweb.asm.ClassVisitor;
1313
import org.objectweb.asm.MethodVisitor;
1414

15-
public class AccessReaderClassAdaptor extends ClassVisitor
15+
import de.oceanlabs.mcp.mcinjector.MCInjectorImpl;
16+
17+
public class AccessReader extends ClassVisitor
1618
{
1719
private static final Logger log = Logger.getLogger("MCInjector");
1820
//private MCInjectorImpl mci;
1921
private String className;
2022
private Map<String, AccessInfo> methods = new HashMap<String, AccessInfo>();
2123

22-
public AccessReaderClassAdaptor(ClassVisitor cv, MCInjectorImpl mci)
24+
public AccessReader(ClassVisitor cv, MCInjectorImpl mci)
2325
{
2426
super(ASM4, cv);
2527
//this.mci = mci;

src/main/java/de/oceanlabs/mcp/mcinjector/ApplyMapClassAdapter.java renamed to src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/ApplyMap.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.oceanlabs.mcp.mcinjector;
1+
package de.oceanlabs.mcp.mcinjector.adaptors;
22

33
import java.util.ArrayList;
44
import java.util.Arrays;
@@ -16,14 +16,17 @@
1616
import org.objectweb.asm.tree.LocalVariableNode;
1717
import org.objectweb.asm.tree.MethodNode;
1818

19-
public class ApplyMapClassAdapter extends ClassVisitor
19+
import de.oceanlabs.mcp.mcinjector.MCInjectorImpl;
20+
import de.oceanlabs.mcp.mcinjector.StringUtil;
21+
22+
public class ApplyMap extends ClassVisitor
2023
{
2124
private static final Logger log = Logger.getLogger("MCInjector");
2225
private MCInjectorImpl mci;
2326
String className;
2427
private ClassNode cn;
2528

26-
public ApplyMapClassAdapter(ClassNode cn, MCInjectorImpl mci)
29+
public ApplyMap(ClassNode cn, MCInjectorImpl mci)
2730
{
2831
super(Opcodes.ASM4, cn);
2932
this.mci = mci;

src/main/java/de/oceanlabs/mcp/mcinjector/ApplyMarkerClassAdaptor.java renamed to src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/ApplyMarker.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
package de.oceanlabs.mcp.mcinjector;
1+
package de.oceanlabs.mcp.mcinjector.adaptors;
22

33
import java.util.logging.Logger;
44

55
import org.objectweb.asm.ClassVisitor;
66
import org.objectweb.asm.Opcodes;
77
import org.objectweb.asm.Type;
88

9+
import de.oceanlabs.mcp.mcinjector.MCInjectorImpl;
910
import static org.objectweb.asm.Opcodes.*;
1011

11-
public class ApplyMarkerClassAdaptor extends ClassVisitor
12+
public class ApplyMarker extends ClassVisitor
1213
{
1314
private static final Logger log = Logger.getLogger("MCInjector");
1415
private MCInjectorImpl mci;
1516
private String className;
1617
private int FLAGS = ACC_PRIVATE | ACC_STATIC | ACC_FINAL;
1718

18-
public ApplyMarkerClassAdaptor(ClassVisitor cv, MCInjectorImpl mci)
19+
public ApplyMarker(ClassVisitor cv, MCInjectorImpl mci)
1920
{
2021
super(Opcodes.ASM4, cv);
2122
this.mci = mci;

src/main/java/de/oceanlabs/mcp/mcinjector/GenerateMapClassAdapter.java renamed to src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/GenerateMap.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.oceanlabs.mcp.mcinjector;
1+
package de.oceanlabs.mcp.mcinjector.adaptors;
22

33
import java.util.ArrayList;
44
import java.util.Arrays;
@@ -11,13 +11,16 @@
1111
import org.objectweb.asm.Opcodes;
1212
import org.objectweb.asm.Type;
1313

14-
public class GenerateMapClassAdapter extends ClassVisitor
14+
import de.oceanlabs.mcp.mcinjector.MCInjectorImpl;
15+
import de.oceanlabs.mcp.mcinjector.StringUtil;
16+
17+
public class GenerateMap extends ClassVisitor
1518
{
1619
private static final Logger log = Logger.getLogger("MCInjector");
1720
private MCInjectorImpl mci;
1821
String className;
1922

20-
public GenerateMapClassAdapter(ClassVisitor cv, MCInjectorImpl mci)
23+
public GenerateMap(ClassVisitor cv, MCInjectorImpl mci)
2124
{
2225
super(Opcodes.ASM4, cv);
2326
this.mci = mci;

src/main/java/de/oceanlabs/mcp/mcinjector/JsonAttributeClassAdaptor.java renamed to src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/JsonAttribute.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.oceanlabs.mcp.mcinjector;
1+
package de.oceanlabs.mcp.mcinjector.adaptors;
22

33
import java.util.HashSet;
44
import java.util.Set;
@@ -10,7 +10,10 @@
1010
import org.objectweb.asm.Opcodes;
1111
import org.objectweb.asm.Type;
1212

13-
public class JsonAttributeClassAdaptor extends ClassVisitor
13+
import de.oceanlabs.mcp.mcinjector.JsonStruct;
14+
import de.oceanlabs.mcp.mcinjector.MCInjectorImpl;
15+
16+
public class JsonAttribute extends ClassVisitor
1417
{
1518
private static final Logger log = Logger.getLogger("MCInjector");
1619
private MCInjectorImpl mci;
@@ -21,7 +24,7 @@ public class JsonAttributeClassAdaptor extends ClassVisitor
2124
private Set<String> refedInners = new HashSet<String>();
2225

2326

24-
public JsonAttributeClassAdaptor(ClassVisitor cv, MCInjectorImpl mci)
27+
public JsonAttribute(ClassVisitor cv, MCInjectorImpl mci)
2528
{
2629
super(Opcodes.ASM4, cv);
2730
this.mci = mci;

src/main/java/de/oceanlabs/mcp/mcinjector/ReadMarkerClassAdaptor.java renamed to src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/ReadMarker.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
package de.oceanlabs.mcp.mcinjector;
1+
package de.oceanlabs.mcp.mcinjector.adaptors;
22

33
import java.util.logging.Logger;
44

55
import org.objectweb.asm.ClassVisitor;
66
import org.objectweb.asm.FieldVisitor;
77
import org.objectweb.asm.Opcodes;
88

9-
public class ReadMarkerClassAdaptor extends ClassVisitor
9+
import de.oceanlabs.mcp.mcinjector.MCInjectorImpl;
10+
11+
public class ReadMarker extends ClassVisitor
1012
{
1113
private static final Logger log = Logger.getLogger("MCInjector");
1214
private String className;
1315

14-
public ReadMarkerClassAdaptor(ClassVisitor cv, MCInjectorImpl mci)
16+
public ReadMarker(ClassVisitor cv, MCInjectorImpl mci)
1517
{
1618
super(Opcodes.ASM4, cv);
1719
}

0 commit comments

Comments
 (0)