shuffle classes around

This commit is contained in:
FalsePattern committed 2022-07-25 19:33:39 +02:00
1 parent 3438b556b3
commit 5f740d9097
10 files changed
+36 -53

No files matched your search

@@ -1,46 +1,22 @@
package com.falsepattern.lib.internal;
import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.ConfigurationManager;
import com.falsepattern.lib.internal.proxy.CommonProxy;
import com.falsepattern.lib.text.FormattedText;
import com.falsepattern.lib.updates.ModUpdateInfo;
import com.falsepattern.lib.updates.UpdateChecker;
import cpw.mods.fml.common.*;
import cpw.mods.fml.common.event.FMLConstructionEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import lombok.Getter;
import lombok.val;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.resources.I18n;
import net.minecraft.event.ClickEvent;
import net.minecraft.launchwrapper.Launch;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatStyle;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* Utility class used by FalsePatternLib's internal code. This can change between versions without notice, so do not use
* this in your code!
*/
@SuppressWarnings("UnstableApiUsage")
@Mod(modid = Tags.MODID,
name = Tags.MODNAME,
version = Tags.VERSION,
@@ -1,13 +1,13 @@
package com.falsepattern.lib.reflection;
package com.falsepattern.lib.mapping;
import com.falsepattern.lib.internal.CoreLoadingPlugin;
import com.falsepattern.lib.internal.FalsePatternLib;
import com.falsepattern.lib.reflection.storage.Lookup;
import com.falsepattern.lib.reflection.types.MappingType;
import com.falsepattern.lib.reflection.types.NameType;
import com.falsepattern.lib.reflection.types.UniversalClass;
import com.falsepattern.lib.reflection.types.UniversalField;
import com.falsepattern.lib.reflection.types.UniversalMethod;
import com.falsepattern.lib.mapping.storage.Lookup;
import com.falsepattern.lib.mapping.types.MappingType;
import com.falsepattern.lib.mapping.types.NameType;
import com.falsepattern.lib.mapping.types.UniversalClass;
import com.falsepattern.lib.mapping.types.UniversalField;
import com.falsepattern.lib.mapping.types.UniversalMethod;
import com.falsepattern.lib.util.ResourceUtil;
import lombok.SneakyThrows;
import lombok.val;
@@ -27,6 +27,7 @@ public class MappingManager {
private static synchronized void initialize() {
if (initialized) return;
initialized = true;
long start = System.nanoTime();
val stringPool = new HashMap<String, String>();
{
val classMappings = ResourceUtil.getResourceStringFromJar("/classes.csv", FalsePatternLib.class).split("\n");
@@ -53,6 +54,8 @@ public class MappingManager {
new UniversalMethod(clazz, line, stringPool);
}
}
long end = System.nanoTime();
System.out.println("Parsed in " + (end - start) / 1000000 + "ms");
}
public static UniversalClass classForName(NameType nameType, MappingType mappingType, String className) throws ClassNotFoundException {
@@ -1,6 +1,6 @@
package com.falsepattern.lib.reflection.storage;
package com.falsepattern.lib.mapping.storage;
import com.falsepattern.lib.reflection.types.MappingType;
import com.falsepattern.lib.mapping.types.MappingType;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.experimental.Accessors;
@@ -1,6 +1,6 @@
package com.falsepattern.lib.reflection.storage;
package com.falsepattern.lib.mapping.storage;
import com.falsepattern.lib.reflection.types.MappingType;
import com.falsepattern.lib.mapping.types.MappingType;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -1,4 +1,4 @@
package com.falsepattern.lib.reflection.types;
package com.falsepattern.lib.mapping.types;
public enum MappingType {
Notch,
@@ -1,4 +1,4 @@
package com.falsepattern.lib.reflection.types;
package com.falsepattern.lib.mapping.types;
public enum NameType {
Internal,
@@ -1,8 +1,8 @@
package com.falsepattern.lib.reflection.types;
package com.falsepattern.lib.mapping.types;
import com.falsepattern.lib.internal.CoreLoadingPlugin;
import com.falsepattern.lib.reflection.storage.Lookup;
import com.falsepattern.lib.reflection.storage.MappedString;
import com.falsepattern.lib.mapping.storage.Lookup;
import com.falsepattern.lib.mapping.storage.MappedString;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
@@ -84,6 +84,10 @@ public class UniversalClass {
}
}
public String getNameAsDescriptor(MappingType mappingType) {
return "L" + getName(NameType.Internal, mappingType) + ";";
}
public UniversalField getField(MappingType mappingType, String fieldName) throws NoSuchFieldException {
try {
return fields.get(mappingType, fieldName);
@@ -1,7 +1,7 @@
package com.falsepattern.lib.reflection.types;
package com.falsepattern.lib.mapping.types;
import com.falsepattern.lib.reflection.ReflectionUtil;
import com.falsepattern.lib.reflection.storage.MappedString;
import com.falsepattern.lib.util.ReflectionUtil;
import com.falsepattern.lib.mapping.storage.MappedString;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
@@ -29,8 +29,8 @@ public class UniversalField {
public UniversalField(@NonNull UniversalClass parent, String[] names, Map<String, String> stringPool) {
this.parent = parent;
parent.addField(this);
name = new MappedString(names, 0, 1, (str) -> str.substring(str.lastIndexOf('/') + 1), stringPool);
parent.addField(this);
}
public String getName(MappingType mappingType) {
@@ -1,7 +1,7 @@
package com.falsepattern.lib.reflection.types;
package com.falsepattern.lib.mapping.types;
import com.falsepattern.lib.reflection.ReflectionUtil;
import com.falsepattern.lib.reflection.storage.MappedString;
import com.falsepattern.lib.util.ReflectionUtil;
import com.falsepattern.lib.mapping.storage.MappedString;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
@@ -35,10 +35,10 @@ public class UniversalMethod {
public UniversalMethod(@NonNull UniversalClass parent, String[] names, Map<String, String> stringPool) {
this.parent = parent;
parent.addMethod(this);
name = new MappedString(names, 0, 2, (str) -> str.substring(str.lastIndexOf('/') + 1), stringPool);
descriptor = new MappedString(names, 1, 2, (str) -> str, stringPool);
fusedNameDescriptor = MappedString.fuse(name, descriptor, "", stringPool);
parent.addMethod(this);
}
public String getName(MappingType mappingType) {
@@ -1,4 +1,4 @@
package com.falsepattern.lib.reflection;
package com.falsepattern.lib.util;
import lombok.SneakyThrows;