Skip to content

optimize ChunkProviderSuperPatcher: don't create ClassNode in shouldTransformClass #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danyadev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

optimize ChunkProviderSuperPatcher: don't create ClassNode in shouldTransformClass #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion src/main/java/com/falsepattern/endlessids/EndlessIDs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
name = Tags.MODNAME,
acceptedMinecraftVersions = "[1.7.10]",
dependencies = "required-after:chunkapi@[0.8.0,);" +
"required-after:falsepatternlib@[1.9.0,);" +
"required-after:falsepatternlib@[1.11.0,);" +
"after:antiidconflict")
public class EndlessIDs {
public static final byte[] ZERO_LENGTH_BIOME_ARRAY_PLACEHOLDER = new byte[0];
Expand Down
53 changes: 15 additions & 38 deletions ...ain/java/com/falsepattern/endlessids/asm/transformer/chunk/ChunkProviderSuperPatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.falsepattern.endlessids.Tags;
import com.falsepattern.endlessids.asm.EndlessIDsCore;
import com.falsepattern.endlessids.asm.EndlessIDsTransformer;
import com.falsepattern.lib.turboasm.BytePatternMatcher;
import com.falsepattern.lib.turboasm.ClassNodeHandle;
import com.falsepattern.lib.turboasm.TurboClassTransformer;
import lombok.Data;
Expand Down Expand Up @@ -181,6 +182,9 @@ public class ChunkProviderSuperPatcher implements TurboClassTransformer {
private static State<AbstractInsnNode> STATE17 = null;
private static State<AbstractInsnNode> STATE_FINAL = null;

private static final BytePatternMatcher chunkClassMatcher;
private static final BytePatternMatcher getBiomeArrayMethodMatcher;

static {
if (EndlessIDsCore.deobfuscated) {
CLASS_BiomeGenBase = new String[]{"net/minecraft/world/biome/BiomeGenBase"};
Expand All @@ -197,6 +201,9 @@ public class ChunkProviderSuperPatcher implements TurboClassTransformer {
FIELD_biomeID = new String[]{"ay", "field_76756_M"};
METHOD_getBiomeArray = new String[]{"m", "func_76605_m"};
}

chunkClassMatcher = new BytePatternMatcher(CLASS_Chunk, BytePatternMatcher.Mode.Equals);
getBiomeArrayMethodMatcher = new BytePatternMatcher(METHOD_getBiomeArray, BytePatternMatcher.Mode.Equals);
}

static {
Expand Down Expand Up @@ -347,35 +354,6 @@ public class ChunkProviderSuperPatcher implements TurboClassTransformer {
});
}

private static boolean scanForBrokenCall(MethodNode method) {
val instructions = method.instructions;
val insnCount = instructions.size();
for (int i = 0; i < insnCount; i++) {
val insn = instructions.get(i);
if (insn.getOpcode() != Opcodes.INVOKEVIRTUAL) {
continue;
}
val invoke = (MethodInsnNode) insn;

if (anyMatch(invoke.owner, CLASS_Chunk) && anyMatch(invoke.name, METHOD_getBiomeArray) &&
invoke.desc.equals("()[B")) {
return true;
}
}
return false;
}

private static boolean anyMatch(List<String> str, String[] candidates) {
for (val s : str) {
for (val candidate : candidates) {
if (s.equals(candidate)) {
return true;
}
}
}
return false;
}

private static boolean anyMatch(String str, String[] candidates) {
for (val candidate : candidates) {
if (str.equals(candidate)) {
Expand Down Expand Up @@ -456,17 +434,16 @@ public String name() {

@Override
public boolean shouldTransformClass(@NotNull String className, @NotNull ClassNodeHandle classNode) {
if ("net.minecraft.world.chunk.storage.AnvilChunkLoader".equals(className))
if ("net.minecraft.world.chunk.storage.AnvilChunkLoader".equals(className)) {
return false;
val cn = classNode.getNode();
if (cn == null)
}

val metadata = classNode.getOriginalMetadata();
if (metadata == null) {
return false;
for (MethodNode method : cn.methods) {
if (scanForBrokenCall(method)) {
return true;
}
}
return false;

return metadata.matchesBytes(chunkClassMatcher) && metadata.matchesBytes(getBiomeArrayMethodMatcher);
}

@Override
Expand Down Expand Up @@ -664,4 +641,4 @@ public void updateLocalsState(FrameNode frame) {
}
}
}
}
}