boba/evo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wave N+20: agb EF lambda copies (submit/submitPreview x4)

Browse source
This commit is contained in:
loki5512344 2026-10-03 16:12:39 +02:00
parent 74068b8e26
commit 8ea57a929c
Signed by: boba
GPG key ID: 253067914055423B
3 changed files with 301 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

105
build-logs/vfbuild36.log Normal file
View file

@ -0,0 +1,105 @@
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:164: error: local variables referenced from a lambda expression must be final or effectively final
var8,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:165: error: local variables referenced from a lambda expression must be final or effectively final
var10,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:166: error: local variables referenced from a lambda expression must be final or effectively final
var12,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:167: error: local variables referenced from a lambda expression must be final or effectively final
var14,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:168: error: local variables referenced from a lambda expression must be final or effectively final
var15,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:169: error: local variables referenced from a lambda expression must be final or effectively final
var16,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:172: error: local variables referenced from a lambda expression must be final or effectively final
var7,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:200: error: local variables referenced from a lambda expression must be final or effectively final
var8,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:201: error: local variables referenced from a lambda expression must be final or effectively final
var10,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:202: error: local variables referenced from a lambda expression must be final or effectively final
var12,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:203: error: local variables referenced from a lambda expression must be final or effectively final
var14,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:204: error: local variables referenced from a lambda expression must be final or effectively final
var15,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:205: error: local variables referenced from a lambda expression must be final or effectively final
var16 * 1.14F,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:208: error: local variables referenced from a lambda expression must be final or effectively final
var7,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:248: error: local variables referenced from a lambda expression must be final or effectively final
var12,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:249: error: local variables referenced from a lambda expression must be final or effectively final
var14,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:250: error: local variables referenced from a lambda expression must be final or effectively final
var16,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:251: error: local variables referenced from a lambda expression must be final or effectively final
var9,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:252: error: local variables referenced from a lambda expression must be final or effectively final
var10,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:253: error: local variables referenced from a lambda expression must be final or effectively final
var11,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:256: error: local variables referenced from a lambda expression must be final or effectively final
var18,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:313: error: local variables referenced from a lambda expression must be final or effectively final
var12,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:314: error: local variables referenced from a lambda expression must be final or effectively final
var14,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:315: error: local variables referenced from a lambda expression must be final or effectively final
var16,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:316: error: local variables referenced from a lambda expression must be final or effectively final
var9,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:317: error: local variables referenced from a lambda expression must be final or effectively final
var10,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:318: error: local variables referenced from a lambda expression must be final or effectively final
var11 * 1.14F,
^
/storage/aboba/evovis-client/src/main/java/defpackage/agb.java:321: error: local variables referenced from a lambda expression must be final or effectively final
var18,
^
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.
28 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/agb.java:164: error: local variables referenced from a lambda expression must be final or effectively final
var8,
^
28 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 14s

84
src/main/java/defpackage/agb.java
View file

@ -154,6 +154,13 @@ public final class agb {
while (true) {
switch (var17) {
case -1757856855:
final int var7f = var7;
final double var8f = var8;
final double var10f = var10;
final double var12f = var12;
final Direction var14f = var14;
final float var15f = var15;
final float var16f = var16;
var1.submitCustomGeometry(
var2,
RenderTypes.entityTranslucent(var6),
@ -161,15 +168,15 @@ public final class agb {
var11,
var12x,
var3,
var8,
var10,
var12,
var14,
var15,
var16,
var8f,
var10f,
var12f,
var14f,
var15f,
var16f,
0.02F,
1.0F,
var7,
var7f,
1.0F,
1.0F,
1.0F,
@ -190,6 +197,13 @@ public final class agb {
var14 = var4.face();
var15 = var4.roll();
var16 = var4.size();
final int var7f = var7;
final double var8f = var8;
final double var10f = var10;
final double var12f = var12;
final Direction var14f = var14;
final float var15f = var15;
final float var16f = var16;
var1.submitCustomGeometry(
var2,
RenderTypes.entityTranslucent(afk.SOLID),
@ -197,15 +211,15 @@ public final class agb {
var11,
var12x,
var3,
var8,
var10,
var12,
var14,
var15,
var16 * 1.14F,
var8f,
var10f,
var12f,
var14f,
var15f,
var16f * 1.14F,
0.014F,
1.0F,
var7,
var7f,
0.94F,
0.93F,
0.9F,
@ -238,6 +252,13 @@ public final class agb {
while (true) {
switch (var19) {
case -1818595167:
final double var12g = var12;
final double var14g = var14;
final double var16g = var16;
final Direction var9g = var9;
final float var10g = var10;
final float var11g = var11;
final int var18g = var18;
var1.submitCustomGeometry(
var2,
RenderTypes.entityTranslucent(var7),
@ -245,15 +266,15 @@ public final class agb {
var11x,
var12x,
var3,
var12,
var14,
var16,
var9,
var10,
var11,
var12g,
var14g,
var16g,
var9g,
var10g,
var11g,
0.02F,
0.6F,
var18,
var18g,
1.0F,
1.0F,
1.0F,
@ -303,6 +324,13 @@ public final class agb {
var14 = var8.getY() + 0.5 + var9.getStepY() * 0.5;
var16 = var8.getZ() + 0.5 + var9.getStepZ() * 0.5;
var18 = 15728880;
final double var12f = var12;
final double var14f = var14;
final double var16f = var16;
final Direction var9f = var9;
final float var10f = var10;
final float var11f = var11;
final int var18f = var18;
var1.submitCustomGeometry(
var2,
RenderTypes.entityTranslucent(afk.SOLID),
@ -310,15 +338,15 @@ public final class agb {
var11x,
var12x,
var3,
var12,
var14,
var16,
var9,
var10,
var11 * 1.14F,
var12f,
var14f,
var16f,
var9f,
var10f,
var11f * 1.14F,
0.014F,
0.6F,
var18,
var18f,
0.94F,
0.93F,
0.9F,

140
tools/waves_n20.py Normal file
View file

@ -0,0 +1,140 @@
"""Волна N+20: vfbuild36 — 28 EF в agb.java (submit/submitPreview lambdas ×4).
Запуск: python3 tools/waves_n20.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/agb.java")
L = open(p, encoding="utf-8", errors="replace").read().splitlines()
ok = True
def edit(ln, old, new):
global ok
i = ln - 1
if i < len(L) and old in L[i]:
L[i] = L[i].replace(old, new, 1)
elif i < len(L) and new in L[i]:
pass
else:
ok = False
print(f"MISS {ln}: {old!r} got {(L[i] if i < len(L) else '<oob>').strip()!r}")
def insert_before(ln, anchor_prev, anchor_next, lines):
global ok
ip = ln - 1
prev_ok = anchor_prev in L[ip - 1]
next_ok = anchor_next in L[ip]
done = any(s.strip() in "\n".join(L[ip : ip + 8]) for s in (lines[0].strip(),))
if prev_ok and next_ok and not done:
L[ip:ip] = lines
elif done or (prev_ok and next_ok):
pass
else:
ok = False
print(
f"INSERT-MISS {ln}: prev={L[ip - 1].strip()[:50]!r} next={L[ip].strip()[:50]!r}"
)
# --- line edits, descending ---
# block4 (case 987243760, f-suffix)
edit(321, "var18,", "var18f,")
edit(318, "var11 * 1.14F", "var11f * 1.14F")
edit(317, "var10,", "var10f,")
edit(316, "var9,", "var9f,")
edit(315, "var16,", "var16f,")
edit(314, "var14,", "var14f,")
edit(313, "var12,", "var12f,")
# block3 (case -1818595167, g-suffix — тот же switch, чтобы не было redefinition)
edit(256, "var18,", "var18g,")
edit(253, "var11,", "var11g,")
edit(252, "var10,", "var10g,")
edit(251, "var9,", "var9g,")
edit(250, "var16,", "var16g,")
edit(249, "var14,", "var14g,")
edit(248, "var12,", "var12g,")
# block2 (while-body после switch, f-suffix)
edit(208, "var7,", "var7f,")
edit(205, "var16 * 1.14F", "var16f * 1.14F")
edit(204, "var15,", "var15f,")
edit(203, "var14,", "var14f,")
edit(202, "var12,", "var12f,")
edit(201, "var10,", "var10f,")
edit(200, "var8,", "var8f,")
# block1 (case -1757856855, f-suffix)
edit(172, "var7,", "var7f,")
edit(169, "var16,", "var16f,")
edit(168, "var15,", "var15f,")
edit(167, "var14,", "var14f,")
edit(166, "var12,", "var12f,")
edit(165, "var10,", "var10f,")
edit(164, "var8,", "var8f,")
# --- inserts, descending by line ---
# insert B: before line306 (case 987243760, f)
insert_before(
306,
"var18 = 15728880;",
"var1.submitCustomGeometry(",
[
" final double var12f = var12;",
" final double var14f = var14;",
" final double var16f = var16;",
" final Direction var9f = var9;",
" final float var10f = var10;",
" final float var11f = var11;",
" final int var18f = var18;",
],
)
# insert A: before line241 (case -1818595167, g)
insert_before(
241,
"case -1818595167:",
"var1.submitCustomGeometry(",
[
" final double var12g = var12;",
" final double var14g = var14;",
" final double var16g = var16;",
" final Direction var9g = var9;",
" final float var10g = var10;",
" final float var11g = var11;",
" final int var18g = var18;",
],
)
# insert2: before line193 (while-body, f)
insert_before(
193,
"var16 = var4.size();",
"var1.submitCustomGeometry(",
[
" final int var7f = var7;",
" final double var8f = var8;",
" final double var10f = var10;",
" final double var12f = var12;",
" final Direction var14f = var14;",
" final float var15f = var15;",
" final float var16f = var16;",
],
)
# insert1: before line157 (case -1757856855, f)
insert_before(
157,
"case -1757856855:",
"var1.submitCustomGeometry(",
[
" final int var7f = var7;",
" final double var8f = var8;",
" final double var10f = var10;",
" final double var12f = var12;",
" final Direction var14f = var14;",
" final float var15f = var15;",
" final float var16f = var16;",
],
)
open(p, "w", encoding="utf-8").write("\n".join(L) + "\n")
print("OK" if ok else "PROBLEMS")
sys.exit(0 if ok else 1)