Skip to content

Fix missing init methods due to __init__ mixin "bug" workaround #73

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

Merged
CursedFlames merged 2 commits into from
Jun 16, 2025
Merged

Fix missing init methods due to __init__ mixin "bug" workaround #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
902ec98
Fix missing init methods due to __init__ mixin bug workaround
NotStirred Jun 16, 2025
2a8a1b8
Fix spotless
NotStirred Jun 16, 2025
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
4 changes: 3 additions & 1 deletion src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ record PrefixMethodPair(MethodNode dasmAddedMethod, MethodNode mixinAddedMethod)
List<PrefixMethodPair> methodPairs = new ArrayList<>();
for (MethodNode methodNode : targetClass.methods) {
if (methodNode.name.contains("cc_dasm$")) {
var methodNameWithoutPrefix = methodNode.name.substring(methodNode.name.indexOf("$") + 1);
var methodNameWithoutPrefix = methodNode.name.substring(methodNode.name.indexOf("$") + 1).replace("__init__", "<init>")
.replace("__clinit__", "<clinit>");

var mixinAddedMethod = targetClass.methods.stream()
.filter(m -> m.name.equals(methodNameWithoutPrefix) && m.desc.equals(methodNode.desc)).findFirst();

Expand Down
19 changes: 4 additions & 15 deletions src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,14 @@ public static class Builder {
@AddFieldToSets(containers = ChunkToCubeSet.ChunkStep$Builder_to_CubeStep$Builder_redirects.class, field = @FieldSig(type = @Ref(ChunkStatusTask.class), name = "task"))
private CubeStatusTask task = (worldGenContext, step, cache, cube) -> CompletableFuture.completedFuture(cube);

// TODO these should be dasm-copied but for some reason it didn't work when I tried
@TransformFromMethod(owner = @Ref(ChunkStep.Builder.class), value = @MethodSig("<init>(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
protected Builder(ChunkStatus status) {
if (status.getParent() != status) {
throw new IllegalArgumentException("Not starting with the first status: " + status);
} else {
this.status = status;
this.parent = null;
this.directDependenciesByRadius = new ChunkStatus[0];
}
throw new DasmFailedToApply();
}

@TransformFromMethod(owner = @Ref(ChunkStep.Builder.class), value = @MethodSig("<init>(Lnet/minecraft/world/level/chunk/status/ChunkStatus;Lnet/minecraft/world/level/chunk/status/ChunkStep;)V"))
protected Builder(ChunkStatus status, CubeStep parent) {
if (parent.targetStatus.getIndex() != status.getIndex() - 1) {
throw new IllegalArgumentException("Out of order status: " + status);
} else {
this.status = status;
this.parent = parent;
this.directDependenciesByRadius = new ChunkStatus[] { parent.targetStatus };
}
throw new DasmFailedToApply();
}

// TODO could be mixin + DASM
Expand Down