diff --git a/build-logs/vfbuild27.log b/build-logs/vfbuild27.log new file mode 100644 index 0000000..976480c --- /dev/null +++ b/build-logs/vfbuild27.log @@ -0,0 +1,114 @@ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:145: error: local variables referenced from a lambda expression must be final or effectively final + adf.getInstance().apply(var7, var8, var6); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:145: error: local variables referenced from a lambda expression must be final or effectively final + adf.getInstance().apply(var7, var8, var6); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:152: error: local variables referenced from a lambda expression must be final or effectively final + this.resetPose(var7, var8); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:152: error: local variables referenced from a lambda expression must be final or effectively final + this.resetPose(var7, var8); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:153: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[0], var10.head); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:153: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[0], var10.head); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:153: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[0], var10.head); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:153: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[0], var10.head); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:154: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[1], var10.body); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:154: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[1], var10.body); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:154: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[1], var10.body); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:154: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[1], var10.body); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:155: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[2], var10.leftArm); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:155: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[2], var10.leftArm); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:155: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[2], var10.leftArm); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:155: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[2], var10.leftArm); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:156: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[3], var10.rightArm); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:156: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[3], var10.rightArm); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:156: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[3], var10.rightArm); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:156: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[3], var10.rightArm); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:157: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[4], var10.leftLeg); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:157: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[4], var10.leftLeg); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:157: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[4], var10.leftLeg); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:157: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[4], var10.leftLeg); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:158: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[5], var10.rightLeg); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:158: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[5], var10.rightLeg); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:158: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[5], var10.rightLeg); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:158: error: local variables referenced from a lambda expression must be final or effectively final + this.applyLimb(var7, var8, var11[5], var10.rightLeg); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:159: error: local variables referenced from a lambda expression must be final or effectively final + aew.getInstance().apply(var7, var8, var12, var6); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:159: error: local variables referenced from a lambda expression must be final or effectively final + aew.getInstance().apply(var7, var8, var12, var6); + ^ +/storage/aboba/evovis-client/src/main/java/defpackage/afa.java:159: error: local variables referenced from a lambda expression must be final or effectively final + aew.getInstance().apply(var7, var8, var12, var6); + ^ +Note: Some input files use or override a deprecated API. +Note: Recompile with -Xlint:deprecation for details. +Note: Some input files use unchecked or unsafe operations. +Note: Recompile with -Xlint:unchecked for details. +31 errors + +FAILURE: Build failed with an exception. + +* What went wrong: +Execution failed for task ':compileJava' (registered by plugin class 'org.gradle.api.plugins.JavaBasePlugin'). +> Compilation failed; see the compiler output below. + /storage/aboba/evovis-client/src/main/java/defpackage/afa.java:145: error: local variables referenced from a lambda expression must be final or effectively final + adf.getInstance().apply(var7, var8, var6); + ^ + 31 errors + +* Try: +> Check your code and dependencies to fix the compilation error(s) +> Run with --scan to get full insights from a Build Scan (powered by Develocity). + +BUILD FAILED in 6s diff --git a/src/main/java/defpackage/afa.java b/src/main/java/defpackage/afa.java index 5052067..4072667 100644 --- a/src/main/java/defpackage/afa.java +++ b/src/main/java/defpackage/afa.java @@ -136,27 +136,32 @@ public class afa { this.stack.scale(1.0F, 1.0F, 1.0F); var11 = this.bonesFor(var1); var12 = aey.animation(skinKeyOf(var1)); + final aif var7f = var7; + final Map var8f = var8; + final aez var10f = var10; + final String[] var11f = var11; + final aeu var12f = var12; this.modelRenderer.submitRoots(var7, var2, var3, var1.getTexture(), var4, () -> { int var8x = 1994714251; while (true) { switch (var8x) { case -1796108765: - adf.getInstance().apply(var7, var8, var6); + adf.getInstance().apply(var7f, var8f, var6); var8x = 1205655172; break; case 1205655172: return; case 1994714251: default: - this.resetPose(var7, var8); - this.applyLimb(var7, var8, var11[0], var10.head); - this.applyLimb(var7, var8, var11[1], var10.body); - this.applyLimb(var7, var8, var11[2], var10.leftArm); - this.applyLimb(var7, var8, var11[3], var10.rightArm); - this.applyLimb(var7, var8, var11[4], var10.leftLeg); - this.applyLimb(var7, var8, var11[5], var10.rightLeg); - aew.getInstance().apply(var7, var8, var12, var6); + this.resetPose(var7f, var8f); + this.applyLimb(var7f, var8f, var11f[0], var10f.head); + this.applyLimb(var7f, var8f, var11f[1], var10f.body); + this.applyLimb(var7f, var8f, var11f[2], var10f.leftArm); + this.applyLimb(var7f, var8f, var11f[3], var10f.rightArm); + this.applyLimb(var7f, var8f, var11f[4], var10f.leftLeg); + this.applyLimb(var7f, var8f, var11f[5], var10f.rightLeg); + aew.getInstance().apply(var7f, var8f, var12f, var6); if (var15) { var8x = -1796108765; } else { diff --git a/tools/waves_n12.py b/tools/waves_n12.py new file mode 100644 index 0000000..9d91152 --- /dev/null +++ b/tools/waves_n12.py @@ -0,0 +1,61 @@ +"""Волна N+12: vfbuild27 — 31 EF в afa.java (submitRoots lambda). Запуск: python3 tools/waves_n12.py""" + +import os, sys + +ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +JAVA = os.path.join(ROOT, "src/main/java") +p = os.path.join(JAVA, "defpackage/afa.java") +L = open(p, encoding="utf-8", errors="replace").read().splitlines() +ok = True + + +def edit(ln, pairs): + global ok + i = ln - 1 + if i >= len(L): + ok = False + print(f"MISS {ln} oob") + return + line = L[i] + for old, new in pairs: + if old in line: + line = line.replace(old, new) + elif new not in line: + ok = False + print(f"MISS {ln}: {old!r} got {L[i].strip()!r}") + return + L[i] = line + + +edit(159, [("apply(var7, var8, var12, var6)", "apply(var7f, var8f, var12f, var6)")]) +for ln in range(153, 159): + edit( + ln, + [ + ("applyLimb(var7, var8, var11[", "applyLimb(var7f, var8f, var11f["), + (", var10.", ", var10f."), + ], + ) +edit(152, [("resetPose(var7, var8)", "resetPose(var7f, var8f)")]) +edit(145, [("apply(var7, var8, var6)", "apply(var7f, var8f, var6)")]) + +# insert before 139 (submitRoots) +INS = [ + " final aif var7f = var7;", + " final Map var8f = var8;", + " final aez var10f = var10;", + " final String[] var11f = var11;", + " final aeu var12f = var12;", +] +if ( + L[138].strip().startswith("this.modelRenderer.submitRoots(") + and "final aif var7f" not in L[133:139] +): + L[138:138] = INS +else: + ok = False + print(f"INSERT-MISS: L139 = {L[138].strip()[:60]!r}") + +open(p, "w", encoding="utf-8").write("\n".join(L) + "\n") +print("OK" if ok else "PROBLEMS") +sys.exit(0 if ok else 1)