Skip to content

Commit 5f740d9

Browse files
FalsePatternFalsePattern
committed
shuffle classes around
1 parent 3438b55 commit 5f740d9

File tree

10 files changed

+36
-53
lines changed

10 files changed

+36
-53
lines changed

‎src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,22 @@
11
package com.falsepattern.lib.internal;
22

3-
import com.falsepattern.lib.config.ConfigException;
4-
import com.falsepattern.lib.config.ConfigurationManager;
53
import com.falsepattern.lib.internal.proxy.CommonProxy;
6-
import com.falsepattern.lib.text.FormattedText;
7-
import com.falsepattern.lib.updates.ModUpdateInfo;
8-
import com.falsepattern.lib.updates.UpdateChecker;
4+
95
import cpw.mods.fml.common.*;
10-
import cpw.mods.fml.common.event.FMLConstructionEvent;
116
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
127
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
13-
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
14-
import cpw.mods.fml.relauncher.Side;
15-
import cpw.mods.fml.relauncher.SideOnly;
8+
169
import lombok.Getter;
17-
import lombok.val;
18-
import net.minecraft.client.entity.EntityPlayerSP;
19-
import net.minecraft.client.resources.I18n;
20-
import net.minecraft.event.ClickEvent;
10+
2111
import net.minecraft.launchwrapper.Launch;
22-
import net.minecraft.util.ChatComponentText;
23-
import net.minecraft.util.ChatStyle;
24-
import net.minecraft.util.EnumChatFormatting;
25-
import net.minecraft.util.IChatComponent;
26-
import net.minecraftforge.common.MinecraftForge;
27-
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
12+
2813
import org.apache.logging.log4j.LogManager;
2914
import org.apache.logging.log4j.Logger;
3015

31-
import java.util.ArrayList;
32-
import java.util.List;
33-
import java.util.concurrent.ExecutionException;
34-
import java.util.concurrent.ExecutorService;
35-
import java.util.concurrent.Executors;
36-
import java.util.concurrent.Future;
37-
import java.util.concurrent.atomic.AtomicBoolean;
38-
3916
/**
4017
* Utility class used by FalsePatternLib's internal code. This can change between versions without notice, so do not use
4118
* this in your code!
4219
*/
43-
@SuppressWarnings("UnstableApiUsage")
4420
@Mod(modid = Tags.MODID,
4521
name = Tags.MODNAME,
4622
version = Tags.VERSION,

‎src/main/java/com/falsepattern/lib/reflection/MappingManager.java renamed to ‎src/main/java/com/falsepattern/lib/mapping/MappingManager.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.falsepattern.lib.reflection;
1+
package com.falsepattern.lib.mapping;
22

33
import com.falsepattern.lib.internal.CoreLoadingPlugin;
44
import com.falsepattern.lib.internal.FalsePatternLib;
5-
import com.falsepattern.lib.reflection.storage.Lookup;
6-
import com.falsepattern.lib.reflection.types.MappingType;
7-
import com.falsepattern.lib.reflection.types.NameType;
8-
import com.falsepattern.lib.reflection.types.UniversalClass;
9-
import com.falsepattern.lib.reflection.types.UniversalField;
10-
import com.falsepattern.lib.reflection.types.UniversalMethod;
5+
import com.falsepattern.lib.mapping.storage.Lookup;
6+
import com.falsepattern.lib.mapping.types.MappingType;
7+
import com.falsepattern.lib.mapping.types.NameType;
8+
import com.falsepattern.lib.mapping.types.UniversalClass;
9+
import com.falsepattern.lib.mapping.types.UniversalField;
10+
import com.falsepattern.lib.mapping.types.UniversalMethod;
1111
import com.falsepattern.lib.util.ResourceUtil;
1212
import lombok.SneakyThrows;
1313
import lombok.val;
@@ -27,6 +27,7 @@ public class MappingManager {
2727
private static synchronized void initialize() {
2828
if (initialized) return;
2929
initialized = true;
30+
long start = System.nanoTime();
3031
val stringPool = new HashMap<String, String>();
3132
{
3233
val classMappings = ResourceUtil.getResourceStringFromJar("/classes.csv", FalsePatternLib.class).split("\n");
@@ -53,6 +54,8 @@ private static synchronized void initialize() {
5354
new UniversalMethod(clazz, line, stringPool);
5455
}
5556
}
57+
long end = System.nanoTime();
58+
System.out.println("Parsed in " + (end - start) / 1000000 + "ms");
5659
}
5760

5861
public static UniversalClass classForName(NameType nameType, MappingType mappingType, String className) throws ClassNotFoundException {

‎src/main/java/com/falsepattern/lib/reflection/storage/Lookup.java renamed to ‎src/main/java/com/falsepattern/lib/mapping/storage/Lookup.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.falsepattern.lib.reflection.storage;
1+
package com.falsepattern.lib.mapping.storage;
22

3-
import com.falsepattern.lib.reflection.types.MappingType;
3+
import com.falsepattern.lib.mapping.types.MappingType;
44
import lombok.EqualsAndHashCode;
55
import lombok.NonNull;
66
import lombok.experimental.Accessors;

‎src/main/java/com/falsepattern/lib/reflection/storage/MappedString.java renamed to ‎src/main/java/com/falsepattern/lib/mapping/storage/MappedString.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.falsepattern.lib.reflection.storage;
1+
package com.falsepattern.lib.mapping.storage;
22

3-
import com.falsepattern.lib.reflection.types.MappingType;
3+
import com.falsepattern.lib.mapping.types.MappingType;
44
import lombok.AccessLevel;
55
import lombok.EqualsAndHashCode;
66
import lombok.Getter;

‎src/main/java/com/falsepattern/lib/reflection/types/MappingType.java renamed to ‎src/main/java/com/falsepattern/lib/mapping/types/MappingType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.falsepattern.lib.reflection.types;
1+
package com.falsepattern.lib.mapping.types;
22

33
public enum MappingType {
44
Notch,

‎src/main/java/com/falsepattern/lib/reflection/types/NameType.java renamed to ‎src/main/java/com/falsepattern/lib/mapping/types/NameType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.falsepattern.lib.reflection.types;
1+
package com.falsepattern.lib.mapping.types;
22

33
public enum NameType {
44
Internal,

‎src/main/java/com/falsepattern/lib/reflection/types/UniversalClass.java renamed to ‎src/main/java/com/falsepattern/lib/mapping/types/UniversalClass.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.falsepattern.lib.reflection.types;
1+
package com.falsepattern.lib.mapping.types;
22

33
import com.falsepattern.lib.internal.CoreLoadingPlugin;
4-
import com.falsepattern.lib.reflection.storage.Lookup;
5-
import com.falsepattern.lib.reflection.storage.MappedString;
4+
import com.falsepattern.lib.mapping.storage.Lookup;
5+
import com.falsepattern.lib.mapping.storage.MappedString;
66
import lombok.EqualsAndHashCode;
77
import lombok.Getter;
88
import lombok.ToString;
@@ -84,6 +84,10 @@ public String getName(NameType nameType, MappingType mappingType) {
8484
}
8585
}
8686

87+
public String getNameAsDescriptor(MappingType mappingType) {
88+
return "L" + getName(NameType.Internal, mappingType) + ";";
89+
}
90+
8791
public UniversalField getField(MappingType mappingType, String fieldName) throws NoSuchFieldException {
8892
try {
8993
return fields.get(mappingType, fieldName);

‎src/main/java/com/falsepattern/lib/reflection/types/UniversalField.java renamed to ‎src/main/java/com/falsepattern/lib/mapping/types/UniversalField.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.falsepattern.lib.reflection.types;
1+
package com.falsepattern.lib.mapping.types;
22

3-
import com.falsepattern.lib.reflection.ReflectionUtil;
4-
import com.falsepattern.lib.reflection.storage.MappedString;
3+
import com.falsepattern.lib.util.ReflectionUtil;
4+
import com.falsepattern.lib.mapping.storage.MappedString;
55
import lombok.EqualsAndHashCode;
66
import lombok.Getter;
77
import lombok.NonNull;
@@ -29,8 +29,8 @@ public class UniversalField {
2929

3030
public UniversalField(@NonNull UniversalClass parent, String[] names, Map<String, String> stringPool) {
3131
this.parent = parent;
32-
parent.addField(this);
3332
name = new MappedString(names, 0, 1, (str) -> str.substring(str.lastIndexOf('/') + 1), stringPool);
33+
parent.addField(this);
3434
}
3535

3636
public String getName(MappingType mappingType) {

‎src/main/java/com/falsepattern/lib/reflection/types/UniversalMethod.java renamed to ‎src/main/java/com/falsepattern/lib/mapping/types/UniversalMethod.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.falsepattern.lib.reflection.types;
1+
package com.falsepattern.lib.mapping.types;
22

3-
import com.falsepattern.lib.reflection.ReflectionUtil;
4-
import com.falsepattern.lib.reflection.storage.MappedString;
3+
import com.falsepattern.lib.util.ReflectionUtil;
4+
import com.falsepattern.lib.mapping.storage.MappedString;
55
import lombok.EqualsAndHashCode;
66
import lombok.Getter;
77
import lombok.NonNull;
@@ -35,10 +35,10 @@ public class UniversalMethod {
3535

3636
public UniversalMethod(@NonNull UniversalClass parent, String[] names, Map<String, String> stringPool) {
3737
this.parent = parent;
38-
parent.addMethod(this);
3938
name = new MappedString(names, 0, 2, (str) -> str.substring(str.lastIndexOf('/') + 1), stringPool);
4039
descriptor = new MappedString(names, 1, 2, (str) -> str, stringPool);
4140
fusedNameDescriptor = MappedString.fuse(name, descriptor, "", stringPool);
41+
parent.addMethod(this);
4242
}
4343

4444
public String getName(MappingType mappingType) {

‎src/main/java/com/falsepattern/lib/reflection/ReflectionUtil.java renamed to ‎src/main/java/com/falsepattern/lib/util/ReflectionUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.falsepattern.lib.reflection;
1+
package com.falsepattern.lib.util;
22

33
import lombok.SneakyThrows;
44

0 commit comments

Comments
 (0)