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

wave N: vfbuild14 fixes (83 errors: EF blanks, casts, generics, ctor access, imports)

Browse source
This commit is contained in:
loki5512344 2026-10-03 15:12:03 +02:00
parent dbb0fc0607
commit ab59aff082
Signed by: boba
GPG key ID: 253067914055423B
45 changed files with 872 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

404
build-logs/vfbuild14.log Normal file
View file

@ -0,0 +1,404 @@
/storage/aboba/evovis-client/src/main/java/defpackage/gq.java:69: error: local variables referenced from a lambda expression must be final or effectively final
if (var5.put(var4x.unicode(), new gs(var4x, var3, var4)) != null) {
^
/storage/aboba/evovis-client/src/main/java/defpackage/gq.java:69: error: local variables referenced from a lambda expression must be final or effectively final
if (var5.put(var4x.unicode(), new gs(var4x, var3, var4)) != null) {
^
/storage/aboba/evovis-client/src/main/java/defpackage/gq.java:69: error: local variables referenced from a lambda expression must be final or effectively final
if (var5.put(var4x.unicode(), new gs(var4x, var3, var4)) != null) {
^
/storage/aboba/evovis-client/src/main/java/defpackage/gq.java:92: error: local variables referenced from a lambda expression must be final or effectively final
var2x = (Int2FloatMap)var6.get(var1x.leftChar());
^
/storage/aboba/evovis-client/src/main/java/defpackage/gq.java:101: error: local variables referenced from a lambda expression must be final or effectively final
var6.put(var1x.leftChar(), var2x);
^
/storage/aboba/evovis-client/src/main/java/defpackage/mm.java:169: error: incompatible types: SoundInstance cannot be converted to ml
this.activeFadingSounds.put(var1, var8);
^
/storage/aboba/evovis-client/src/main/java/defpackage/ach.java:458: error: cannot find symbol
var6 = Comparator.comparing(var0 -> var0.stack().getHoverName().getString().toLowerCase(Locale.ROOT));
^
symbol: method stack()
location: variable var0 of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/acz.java:81: error: incompatible types: PerServerVersionScreen cannot be converted to k
var1 = (PerServerVersionScreen)var0;
^
/storage/aboba/evovis-client/src/main/java/defpackage/acz.java:83: error: cannot find symbol
return new acx(var1.prevScreen, var2.evo$selectionConsumer(), var2.evo$selectionSupplier());
^
symbol: variable prevScreen
location: variable var1 of type k
/storage/aboba/evovis-client/src/main/java/defpackage/acz.java:105: error: incompatible types: ViaFabricPlusScreen cannot be converted to k
var1 = (ViaFabricPlusScreen)var0;
^
/storage/aboba/evovis-client/src/main/java/defpackage/acz.java:106: error: incompatible types: k cannot be converted to ViaFabricPlusScreen
return new acx(((ViaFabricPlusScreen)var1).prevScreen);
^
/storage/aboba/evovis-client/src/main/java/defpackage/adc.java:448: error: incompatible types: EnumValue cannot be converted to T
var0.setValue(var2[Math.floorMod(var3 + var1, var2.length)]);
^
where T is a type-variable:
T extends EnumValue declared in method <T>cycle(EnumSetting<T>,int)
/storage/aboba/evovis-client/src/main/java/defpackage/ado.java:164: error: incompatible types: Object cannot be converted to Path
Path var16 = var15.filter(var0x -> var0x.toString().toLowerCase().endsWith(".png")).sorted().findFirst().orElse(null);
^
/storage/aboba/evovis-client/src/main/java/defpackage/aeh.java:140: error: bad operand types for binary operator '+'
+ (float)Math.toRadians(-var4[0])
^
first type: Object
second type: float
/storage/aboba/evovis-client/src/main/java/defpackage/aeh.java:144: error: bad operand types for binary operator '+'
+ (float)Math.toRadians(-var4[1])
^
first type: Object
second type: float
/storage/aboba/evovis-client/src/main/java/defpackage/aeh.java:148: error: bad operand types for binary operator '+'
+ (float)Math.toRadians(var4[2])
^
first type: Object
second type: float
/storage/aboba/evovis-client/src/main/java/defpackage/aeo.java:310: error: cannot find symbol
var10.append(Component.literal(var10x.substring(var13x)).setStyle(var9x));
^
symbol: method append(MutableComponent)
location: variable var10 of type Component
/storage/aboba/evovis-client/src/main/java/defpackage/aeo.java:328: error: cannot find symbol
var10.append(
^
symbol: method append(MutableComponent)
location: variable var10 of type Component
/storage/aboba/evovis-client/src/main/java/defpackage/aeo.java:345: error: cannot find symbol
var10.append(Component.literal(var10x.substring(var14x, var14x + var15x)).setStyle(var9x.withColor(var0.rgb(var16x, var4))));
^
symbol: method append(MutableComponent)
location: variable var10 of type Component
/storage/aboba/evovis-client/src/main/java/defpackage/aeo.java:382: error: cannot find symbol
var10.append(Component.literal(var10x).setStyle(var9x));
^
symbol: method append(MutableComponent)
location: variable var10 of type Component
/storage/aboba/evovis-client/src/main/java/defpackage/aeq.java:818: error: incompatible types: Object cannot be converted to Path
List var2 = var1.filter(var0x -> Files.isRegularFile(var0x)).sorted(Comparator.comparingLong(aeq::lastModified)).toList();
^
/storage/aboba/evovis-client/src/main/java/defpackage/agk.java:358: error: cannot find symbol
var3.sort((var0, var1x) -> Long.compare(var0.placedAt(), var1x.placedAt()));
^
symbol: method placedAt()
location: variable var0 of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/agk.java:358: error: cannot find symbol
var3.sort((var0, var1x) -> Long.compare(var0.placedAt(), var1x.placedAt()));
^
symbol: method placedAt()
location: variable var1x of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/ahw.java:175: error: incompatible types: bad type in conditional expression
? -1: var9.getOrDefault(var11.parent.name, (1226890724 | -1226890725) + (1226890724 & -1226890725));
^
Object cannot be converted to int
/storage/aboba/evovis-client/src/main/java/defpackage/aid.java:636: error: incompatible types: possible lossy conversion from int to byte
byte var33 = var18 ? 1 : 0;
^
/storage/aboba/evovis-client/src/main/java/defpackage/akx.java:154: error: cannot find symbol
var1.sort((var0x, var1x) -> Integer.compare(var1x.getIntValue(), var0x.getIntValue()));
^
symbol: method getIntValue()
location: variable var1x of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/akx.java:154: error: cannot find symbol
var1.sort((var0x, var1x) -> Integer.compare(var1x.getIntValue(), var0x.getIntValue()));
^
symbol: method getIntValue()
location: variable var0x of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/akz.java:160: error: incompatible types: invalid method reference
var1.sort(String::compareToIgnoreCase);
^
method compareToIgnoreCase in class String cannot be applied to given types
required: String
found: Object,Object
reason: actual and formal argument lists differ in length
/storage/aboba/evovis-client/src/main/java/defpackage/ald.java:128: error: incompatible types: Object[] cannot be converted to Direction[]
var7.toArray(new Direction[0]),
^
/storage/aboba/evovis-client/src/main/java/defpackage/ald.java:170: error: incompatible types: Object cannot be converted to BakedQuad
var2.add(var5);
^
/storage/aboba/evovis-client/src/main/java/defpackage/alp.java:54: error: cannot find symbol
id.warn(Cif.SECURITY, "secure string {} unavailable", id, failure);
^
symbol: method warn(Cif,String,String,Exception)
location: variable id of type String
/storage/aboba/evovis-client/src/main/java/defpackage/anl.java:823: error: incompatible types: Object cannot be converted to JsonElement
.ifPresent(var1x -> var7.add("d", var1x));
^
/storage/aboba/evovis-client/src/main/java/defpackage/anm.java:38: error: cannot find symbol
B var2 = null;
^
symbol: class B
location: class anm
/storage/aboba/evovis-client/src/main/java/defpackage/ans.java:176: error: cannot find symbol
var4.sort((var0, var1x) -> Long.compare(var0.offset(), var1x.offset()));
^
symbol: method offset()
location: variable var0 of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/ans.java:176: error: cannot find symbol
var4.sort((var0, var1x) -> Long.compare(var0.offset(), var1x.offset()));
^
symbol: method offset()
location: variable var1x of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/ans.java:470: error: cannot find symbol
B var3 = null;
^
symbol: class B
location: class ans
/storage/aboba/evovis-client/src/main/java/defpackage/ann.java:36: error: cannot find symbol
B var3 = null;
^
symbol: class B
location: class ann
/storage/aboba/evovis-client/src/main/java/defpackage/arb.java:9: error: incompatible types: cannot infer type-variable(s) S
private static final ThreadLocal<ara> SCRATCH = ThreadLocal.withInitial(ara::new);
^
(argument mismatch; invalid constructor reference
ara() has private access in ara)
where S is a type-variable:
S extends Object declared in method <S>withInitial(Supplier<? extends S>)
/storage/aboba/evovis-client/src/main/java/defpackage/aua.java:126: error: incompatible types: ModelPart cannot be converted to j
var5 = ((b.j)var0).evo$getChildren().values().iterator();
^
/storage/aboba/evovis-client/src/main/java/defpackage/aua.java:241: error: incompatible types: ModelPart cannot be converted to j
var10 = ((b.j)var0).evo$getCubes().iterator();
^
/storage/aboba/evovis-client/src/main/java/defpackage/auw.java:467: error: cannot find symbol
id.error(
^
symbol: method error(Cif,String,String,Throwable)
location: variable id of type String
/storage/aboba/evovis-client/src/main/java/defpackage/dq.java:56: error: incompatible types: Object cannot be converted to ams
((LiteralArgumentBuilder)literal(var6).executes(var1x -> start(var5, (-1504016657 ^ 1504016657) + ((-1504016657 & 1504016657) << 1))))
^
/storage/aboba/evovis-client/src/main/java/defpackage/dq.java:66: error: incompatible types: Object cannot be converted to ams
var5,
^
/storage/aboba/evovis-client/src/main/java/defpackage/gt.java:504: error: cannot find symbol
if (((Iterator)var21).hasNext()) {
^
symbol: class Iterator
location: class gt
/storage/aboba/evovis-client/src/main/java/defpackage/gt.java:513: error: cannot find symbol
var22 = (gm)((Iterator)var21).next();
^
symbol: class Iterator
location: class gt
/storage/aboba/evovis-client/src/main/java/defpackage/hl.java:82: error: incompatible types: invalid constructor reference
hh var6 = var1.computeIfAbsent(var5, hh::new);
^
incompatible types: Object cannot be converted to hk
/storage/aboba/evovis-client/src/main/java/defpackage/hl.java:89: error: incompatible types: cannot infer type-variable(s) T
var7.sort(Comparator.comparingDouble(hh::weight).reversed());
^
(argument mismatch; invalid method reference
method weight in class hh cannot be applied to given types
required: no arguments
found: Object
reason: actual and formal argument lists differ in length)
where T is a type-variable:
T extends Object declared in method <T>comparingDouble(ToDoubleFunction<? super T>)
/storage/aboba/evovis-client/src/main/java/defpackage/hn.java:634: error: incompatible types: invalid method reference
var1.merge(var3.getIdentifier(), var3.getCount(), Integer::sum);
^
incompatible types: Object cannot be converted to int
/storage/aboba/evovis-client/src/main/java/defpackage/hy.java:354: error: no suitable method found for thenComparing(hu::getName)
case 1 -> var1.thenComparing(hu::getName);
^
method Comparator.thenComparing(Comparator) is not applicable
(argument mismatch; invalid method reference
method getName in class hu cannot be applied to given types
required: no arguments
found: Object,Object
reason: actual and formal argument lists differ in length)
method Comparator.thenComparing(Function) is not applicable
(argument mismatch; invalid method reference
method getName in class hu cannot be applied to given types
required: no arguments
found: Object
reason: actual and formal argument lists differ in length)
/storage/aboba/evovis-client/src/main/java/defpackage/hy.java:355: error: cannot find symbol
case 2 -> var1.thenComparingInt(var0 -> -var0.getGroupCount());
^
symbol: method getGroupCount()
location: variable var0 of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/hy.java:356: error: cannot find symbol
case 3 -> var1.thenComparingInt(var0 -> -var0.getRarity());
^
symbol: method getRarity()
location: variable var0 of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/hy.java:359: error: no suitable method found for thenComparing(hu::getIdentifier)
return var1.thenComparing(hu::getIdentifier).thenComparingInt(var0 -> -var0.getCount());
^
method Comparator.thenComparing(Comparator) is not applicable
(argument mismatch; invalid method reference
method getIdentifier in class hu cannot be applied to given types
required: no arguments
found: Object,Object
reason: actual and formal argument lists differ in length)
method Comparator.thenComparing(Function) is not applicable
(argument mismatch; invalid method reference
method getIdentifier in class hu cannot be applied to given types
required: no arguments
found: Object
reason: actual and formal argument lists differ in length)
/storage/aboba/evovis-client/src/main/java/defpackage/j.java:230: error: cannot assign a value to final variable var3
var3 = new i(var1, var0, var0.getAnnotation(k.class).value());
^
/storage/aboba/evovis-client/src/main/java/defpackage/ld.java:289: error: incompatible types: cannot infer type-variable(s) U,T#2
.thenCompose(Function.identity());
^
(argument mismatch; Function<CompletableFuture,CompletableFuture> cannot be converted to Function<? super CompletableFuture,? extends CompletionStage<Object>>)
where U,T#1,T#2 are type-variables:
U extends Object declared in method <U>thenCompose(Function<? super T#1,? extends CompletionStage<U>>)
T#1 extends Object declared in class CompletableFuture
T#2 extends Object declared in method <T#2>identity()
/storage/aboba/evovis-client/src/main/java/defpackage/mr.java:57: error: incompatible types: invalid method reference
ItemStack.CODEC.encodeStart(var3, var16).result().ifPresent(var14::add);
^
no suitable method found for add(Object)
method JsonArray.add(Boolean) is not applicable
(argument mismatch; Object cannot be converted to Boolean)
method JsonArray.add(Character) is not applicable
(argument mismatch; Object cannot be converted to Character)
method JsonArray.add(Number) is not applicable
(argument mismatch; Object cannot be converted to Number)
method JsonArray.add(String) is not applicable
(argument mismatch; Object cannot be converted to String)
method JsonArray.add(JsonElement) is not applicable
(argument mismatch; Object cannot be converted to JsonElement)
/storage/aboba/evovis-client/src/main/java/defpackage/nj.java:1036: error: incompatible types: Object cannot be converted to nk
var1x.setBackdrop(new nl(var3, var3x, var2x.speed(), var2x.scale()));
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:274: error: incompatible types: nx[] cannot be converted to Constable
var3 = var0;
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:275: error: incompatible types: Constable cannot be converted to Object[]
var4 = ((Object[])var3).length;
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:280: error: incompatible types: Constable cannot be converted to Object[]
var6 = ((Object[])var3)[var5];
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:343: error: incompatible types: String[] cannot be converted to Constable
var3 = var1;
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:344: error: incompatible types: Constable cannot be converted to Object[]
var4 = ((Object[])var3).length;
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:349: error: incompatible types: Constable cannot be converted to Object[]
var6 = ((Object[])var3)[var5];
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:1203: error: incompatible types: Object cannot be converted to ob
var1x -> var1x.getMotion().duration(var4),
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:1204: error: incompatible types: Object cannot be converted to ob
(var1x, var2x) -> var1x.setMotion(var1x.getMotion().withDuration(var4, Math.round(var2x))),
^
/storage/aboba/evovis-client/src/main/java/defpackage/op.java:1205: error: incompatible types: Object cannot be converted to ob
var1x -> var1x.getDefaultMotion().duration(var4)
^
/storage/aboba/evovis-client/src/main/java/defpackage/ri.java:1235: error: cannot find symbol
return Integer.compare(var0.score(), var1x.score());
^
symbol: method score()
location: variable var0 of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/ri.java:1235: error: cannot find symbol
return Integer.compare(var0.score(), var1x.score());
^
symbol: method score()
location: variable var1x of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/ri.java:1237: error: cannot find symbol
return Integer.compare(var0.position(), var1x.position());
^
symbol: method position()
location: variable var0 of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/ri.java:1237: error: cannot find symbol
return Integer.compare(var0.position(), var1x.position());
^
symbol: method position()
location: variable var1x of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/ri.java:1241: error: cannot find symbol
if (var0.score() != var1x.score()) {
^
symbol: method score()
location: variable var0 of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/ri.java:1241: error: cannot find symbol
if (var0.score() != var1x.score()) {
^
symbol: method score()
location: variable var1x of type Object
/storage/aboba/evovis-client/src/main/java/defpackage/tf.java:258: error: incompatible types: Object cannot be converted to Vec3
var12 = var16.orElse(var2);
^
/storage/aboba/evovis-client/src/main/java/defpackage/tf.java:489: error: incompatible types: Object cannot be converted to Vec3
return var13.<EntityHitResult>map(var1x -> new EntityHitResult(var2, var1x)).orElse(null);
^
/storage/aboba/evovis-client/src/main/java/defpackage/tf.java:489: error: incompatible types: Object cannot be converted to EntityHitResult
return var13.<EntityHitResult>map(var1x -> new EntityHitResult(var2, var1x)).orElse(null);
^
/storage/aboba/evovis-client/src/main/java/defpackage/ux.java:281: error: incompatible types: int cannot be converted to boolean
this.particles.get(var12x).render(var11x, var10x, var13, var6, var8, var16, var17, var18, var19);
^
/storage/aboba/evovis-client/src/main/java/defpackage/vd.java:454: error: no suitable method found for distanceToSqr(Object)
var6.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr(var0)));
^
method Entity.distanceToSqr(Entity) is not applicable
(argument mismatch; Object cannot be converted to Entity)
method Entity.distanceToSqr(Vec3) is not applicable
(argument mismatch; Object cannot be converted to Vec3)
/storage/aboba/evovis-client/src/main/java/defpackage/vl.java:116: error: incompatible types: cannot infer type-variable(s) S
private static final ThreadLocal<vk> WORKSPACE_POOL = ThreadLocal.withInitial(vk::new);
^
(argument mismatch; invalid constructor reference
vk() has private access in vk)
where S is a type-variable:
S extends Object declared in method <S>withInitial(Supplier<? extends S>)
/storage/aboba/evovis-client/src/main/java/defpackage/vu.java:841: error: no suitable method found for distanceToSqr(Object)
var4.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr(var0)));
^
method Entity.distanceToSqr(Entity) is not applicable
(argument mismatch; Object cannot be converted to Entity)
method Entity.distanceToSqr(Vec3) is not applicable
(argument mismatch; Object cannot be converted to Vec3)
/storage/aboba/evovis-client/src/main/java/defpackage/ww.java:148: error: incompatible types: Object cannot be converted to xd
return var2.map(var1x -> new wv(var1x, extractName(var0)));
^
/storage/aboba/evovis-client/src/main/java/b/bx.java:27: error: cannot find symbol
.execute(message.substring(defpackage.bz.getInstance().getCommandManager().getPrefix().length()), bz.getInstance().getCommandManager().getSource());
^
symbol: method getInstance()
location: class bz
/storage/aboba/evovis-client/src/main/java/b/t.java:49: error: cannot find symbol
this.currentParse = defpackage.bz.getInstance().getCommandManager().getDispatcher().parse(reader, bz.getInstance().getCommandManager().getSource());
^
symbol: method getInstance()
location: class bz
/storage/aboba/evovis-client/src/main/java/b/t.java:54: error: incompatible types: ParseResults<ClientSuggestionProvider> cannot be converted to ParseResults<SharedSuggestionProvider>
this.pendingSuggestions = defpackage.bz.getInstance().getCommandManager().getDispatcher().getCompletionSuggestions(this.currentParse, cursor);
^
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.
Note: Some messages have been simplified; recompile with -Xdiags:verbose to get full output
82 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/gq.java:69: error: local variables referenced from a lambda expression must be final or effectively final
if (var5.put(var4x.unicode(), new gs(var4x, var3, var4)) != null) {
^
82 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 20s

2
src/main/java/b/bx.java
View file

@ -24,7 +24,7 @@ public class bx {
defpackage.bz.getInstance() defpackage.bz.getInstance()
.getCommandManager() .getCommandManager()
.getDispatcher() .getDispatcher()
.execute(message.substring(defpackage.bz.getInstance().getCommandManager().getPrefix().length()), bz.getInstance().getCommandManager().getSource()); .execute(message.substring(defpackage.bz.getInstance().getCommandManager().getPrefix().length()), defpackage.bz.getInstance().getCommandManager().getSource());
} catch (CommandSyntaxException var4) { } catch (CommandSyntaxException var4) {
} }

5
src/main/java/b/t.java
View file

@ -1,5 +1,6 @@
package b; package b;
import net.minecraft.commands.SharedSuggestionProvider;
import defpackage.*; import defpackage.*;
import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.ParseResults;
import com.mojang.brigadier.StringReader; import com.mojang.brigadier.StringReader;
@ -46,12 +47,12 @@ public abstract class t {
&& reader.getString().startsWith(defpackage.bz.getInstance().getCommandManager().getPrefix(), reader.getCursor())) { && reader.getString().startsWith(defpackage.bz.getInstance().getCommandManager().getPrefix(), reader.getCursor())) {
reader.setCursor(reader.getCursor() + 1); reader.setCursor(reader.getCursor() + 1);
if (this.currentParse == null) { if (this.currentParse == null) {
this.currentParse = defpackage.bz.getInstance().getCommandManager().getDispatcher().parse(reader, bz.getInstance().getCommandManager().getSource()); this.currentParse = defpackage.bz.getInstance().getCommandManager().getDispatcher().parse(reader, defpackage.bz.getInstance().getCommandManager().getSource());
} }
int cursor = this.input.getCursorPosition(); int cursor = this.input.getCursorPosition();
if (cursor >= 1 && (this.suggestions == null || !this.keepSuggestions)) { if (cursor >= 1 && (this.suggestions == null || !this.keepSuggestions)) {
this.pendingSuggestions = defpackage.bz.getInstance().getCommandManager().getDispatcher().getCompletionSuggestions(this.currentParse, cursor); this.pendingSuggestions = defpackage.bz.getInstance().getCommandManager().getDispatcher().getCompletionSuggestions((ParseResults<SharedSuggestionProvider>)this.currentParse, cursor);
this.pendingSuggestions.thenAccept(s -> { this.pendingSuggestions.thenAccept(s -> {
if (this.pendingSuggestions.isDone()) { if (this.pendingSuggestions.isDone()) {
this.updateUsageInfo(this.currentParse, s); this.updateUsageInfo(this.currentParse, s);

2
src/main/java/defpackage/ach.java
View file

@ -455,7 +455,7 @@ public final class ach extends api {
var4 = 734420006; var4 = 734420006;
break; break;
case -1343783297: case -1343783297:
var6 = Comparator.comparing(var0 -> var0.stack().getHoverName().getString().toLowerCase(Locale.ROOT)); var6 = Comparator.<mo>comparing(var0 -> var0.stack().getHoverName().getString().toLowerCase(Locale.ROOT));
var4 = 1334135620; var4 = 1334135620;
break; break;
case -577531470: case -577531470:

8
src/main/java/defpackage/acz.java
View file

@ -78,9 +78,9 @@ public final class acz {
} }
break; break;
case -541368600: case -541368600:
var1 = (PerServerVersionScreen)var0; var1 = (b.k)(Object)var0;
var2 = var1; var2 = var1;
return new acx(var1.prevScreen, var2.evo$selectionConsumer(), var2.evo$selectionSupplier()); return new acx(((PerServerVersionScreen)var0).prevScreen, var2.evo$selectionConsumer(), var2.evo$selectionSupplier());
case -481334439: case -481334439:
default: default:
if (var0 instanceof ViaFabricPlusScreen) { if (var0 instanceof ViaFabricPlusScreen) {
@ -102,8 +102,8 @@ public final class acz {
} }
break; break;
case 1416768364: case 1416768364:
var1 = (ViaFabricPlusScreen)var0; var1 = (b.k)(Object)var0;
return new acx(((ViaFabricPlusScreen)var1).prevScreen); return new acx(((ViaFabricPlusScreen)var0).prevScreen);
} }
} }
} }

2
src/main/java/defpackage/adc.java
View file

@ -445,7 +445,7 @@ public final class adc extends acy {
} }
break; break;
case -1408159528: case -1408159528:
var0.setValue(var2[Math.floorMod(var3 + var1, var2.length)]); var0.setValue((T)var2[Math.floorMod(var3 + var1, var2.length)]);
return; return;
case -1178052978: case -1178052978:
var3 = var4; var3 = var4;

2
src/main/java/defpackage/ado.java
View file

@ -160,7 +160,7 @@ public final class ado {
if (var0 && var1 != null) { if (var0 && var1 != null) {
adq.getInstance().setCape(var1, null); adq.getInstance().setCape(var1, null);
try (Stream var15 = Files.list(capesDir())) { try (Stream<Path> var15 = Files.list(capesDir())) {
Path var16 = var15.filter(var0x -> var0x.toString().toLowerCase().endsWith(".png")).sorted().findFirst().orElse(null); Path var16 = var15.filter(var0x -> var0x.toString().toLowerCase().endsWith(".png")).sorted().findFirst().orElse(null);
if (var16 != null) { if (var16 != null) {
adq.getInstance().setCapeFromBase64(var1, Base64.getEncoder().encodeToString(Files.readAllBytes(var16))); adq.getInstance().setCapeFromBase64(var1, Base64.getEncoder().encodeToString(Files.readAllBytes(var16)));

6
src/main/java/defpackage/aeh.java
View file

@ -136,15 +136,15 @@ public final class aeh {
case -1613491127: case -1613491127:
var6 = var2.getOrDefault(var3, DEFAULT_BASE); var6 = var2.getOrDefault(var3, DEFAULT_BASE);
var5.setRotX( var5.setRotX(
((Object[])var6)[0] ((float[])var6)[0]
+ (float)Math.toRadians(-var4[0]) + (float)Math.toRadians(-var4[0])
); );
var5.setRotY( var5.setRotY(
((Object[])var6)[1] ((float[])var6)[1]
+ (float)Math.toRadians(-var4[1]) + (float)Math.toRadians(-var4[1])
); );
var5.setRotZ( var5.setRotZ(
((Object[])var6)[2] ((float[])var6)[2]
+ (float)Math.toRadians(var4[2]) + (float)Math.toRadians(var4[2])
); );
return; return;

9
src/main/java/defpackage/aeo.java
View file

@ -1,5 +1,6 @@
package defpackage; package defpackage;
import net.minecraft.network.chat.MutableComponent;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -307,7 +308,7 @@ public final class aeo {
while (true) { while (true) {
switch (var17x) { switch (var17x) {
case -1675164980: case -1675164980:
var10.append(Component.literal(var10x.substring(var13x)).setStyle(var9x)); ((MutableComponent)var10).append(Component.literal(var10x.substring(var13x)).setStyle(var9x));
var17x = 363616346; var17x = 363616346;
break; break;
case -1591882668: case -1591882668:
@ -325,7 +326,7 @@ public final class aeo {
} }
break; break;
case -1318474814: case -1318474814:
var10.append( ((MutableComponent)var10).append(
Component.literal(var10x.substring(0, var12x)).setStyle(var9x) Component.literal(var10x.substring(0, var12x)).setStyle(var9x)
); );
var17x = 444915518; var17x = 444915518;
@ -342,7 +343,7 @@ public final class aeo {
break; break;
case -1153576793: case -1153576793:
var16x = var18x; var16x = var18x;
var10.append(Component.literal(var10x.substring(var14x, var14x + var15x)).setStyle(var9x.withColor(var0.rgb(var16x, var4)))); ((MutableComponent)var10).append(Component.literal(var10x.substring(var14x, var14x + var15x)).setStyle(var9x.withColor(var0.rgb(var16x, var4))));
var12[0] = var12[0] var12[0] = var12[0]
+ 1; + 1;
var14x += var15x; var14x += var15x;
@ -379,7 +380,7 @@ public final class aeo {
var17x = -1153576793; var17x = -1153576793;
break; break;
case 987313897: case 987313897:
var10.append(Component.literal(var10x).setStyle(var9x)); ((MutableComponent)var10).append(Component.literal(var10x).setStyle(var9x));
return Optional.empty(); return Optional.empty();
case 1487115970: case 1487115970:
if (var11x + var10x.length() > var7) { if (var11x + var10x.length() > var7) {

2
src/main/java/defpackage/aeq.java
View file

@ -814,7 +814,7 @@ public final class aeq {
if (!pruned) { if (!pruned) {
pruned = (boolean)(((1)) != 0); pruned = (boolean)(((1)) != 0);
try (Stream var1 = Files.list(var0)) { try (Stream<Path> var1 = Files.list(var0)) {
List var2 = var1.filter(var0x -> Files.isRegularFile(var0x)).sorted(Comparator.comparingLong(aeq::lastModified)).toList(); List var2 = var1.filter(var0x -> Files.isRegularFile(var0x)).sorted(Comparator.comparingLong(aeq::lastModified)).toList();
for (int var3 = 0; for (int var3 = 0;

2
src/main/java/defpackage/agk.java
View file

@ -343,7 +343,7 @@ public final class agk {
} }
public List<agh> ownedBy(String var1, String var2) { public List<agh> ownedBy(String var1, String var2) {
ArrayList var3 = null; ArrayList<agh> var3 = null;
Iterator var4 = null; Iterator var4 = null;
agh var5 = null; agh var5 = null;
int var6 = 1498213730; int var6 = 1498213730;

2
src/main/java/defpackage/ahw.java
View file

@ -172,7 +172,7 @@ public final class ahw {
aig var11 = (aig)var2.get(var14); aig var11 = (aig)var2.get(var14);
var13[var14] = var11.name; var13[var14] = var11.name;
var5[var14] = var11.parent == null var5[var14] = var11.parent == null
? -1: var9.getOrDefault(var11.parent.name, (1226890724 | -1226890725) + (1226890724 & -1226890725)); ? -1: ((Integer)var9.getOrDefault(var11.parent.name, (1226890724 | -1226890725) + (1226890724 & -1226890725)));
var6[var14 * (3)] = var11.pivotX; var6[var14 * (3)] = var11.pivotX;
var6[var14 * 4] = var11.pivotY; var6[var14 * 4] = var11.pivotY;
var6[var14 * 5] = var11.pivotZ; var6[var14 * 5] = var11.pivotZ;

2
src/main/java/defpackage/aid.java
View file

@ -633,7 +633,7 @@ public class aid {
var23 = (var29 + var27.get(1).getAsFloat()) / var17; var23 = (var29 + var27.get(1).getAsFloat()) / var17;
} else { } else {
String var30 = var0; String var30 = var0;
byte var33 = var18 ? 1 : 0; byte var33 = (byte)(var18 ? 1 : 0);
if (var19) { if (var19) {
var30 = "north"; var30 = "north";
var33 = (byte)(!var18 var33 = (byte)(!var18

2
src/main/java/defpackage/akx.java
View file

@ -151,7 +151,7 @@ public final class akx {
case -1936510821: case -1936510821:
default: default:
var1 = new ArrayList(var0.object2IntEntrySet()); var1 = new ArrayList(var0.object2IntEntrySet());
var1.sort((var0x, var1x) -> Integer.compare(var1x.getIntValue(), var0x.getIntValue())); var1.sort((var0x, var1x) -> Integer.compare(((Entry)var1x).getIntValue(), ((Entry)var0x).getIntValue()));
var2 = new Object2IntLinkedOpenHashMap(var1.size()); var2 = new Object2IntLinkedOpenHashMap(var1.size());
var3 = var1.iterator(); var3 = var1.iterator();
var5 = 1834889623; var5 = 1834889623;

2
src/main/java/defpackage/akz.java
View file

@ -157,7 +157,7 @@ public final class akz {
} }
break; break;
case 1525862489: case 1525862489:
var1.sort(String::compareToIgnoreCase); ((List<String>)var1).sort(String::compareToIgnoreCase);
return var1; return var1;
case 1870613825: case 1870613825:
var1.add(var5.getName()); var1.add(var5.getName());

4
src/main/java/defpackage/ald.java
View file

@ -125,7 +125,7 @@ public final class ald {
return new alc( return new alc(
(BakedQuad[])var6.toArray(new BakedQuad[0]), (BakedQuad[])var6.toArray(new BakedQuad[0]),
var7.toArray(new Direction[0]), (Direction[])var7.toArray(new Direction[0]),
var15 var15
); );
} catch (Exception var14) { } catch (Exception var14) {
@ -167,7 +167,7 @@ public final class ald {
break; break;
case -395078856: case -395078856:
var5 = (BakedQuad)var4.next(); var5 = (BakedQuad)var4.next();
var2.add(var5); var2.add((BakedQuad)var5);
var3.add(var1); var3.add(var1);
var6 = -1850049190; var6 = -1850049190;
break; break;

2
src/main/java/defpackage/alp.java
View file

@ -51,7 +51,7 @@ public final class alp {
CACHE.put(id, value); CACHE.put(id, value);
return value; return value;
} catch (Exception failure) { } catch (Exception failure) {
id.warn(Cif.SECURITY, "secure string {} unavailable", id, failure); defpackage.id.warn(Cif.SECURITY, "secure string {} unavailable", id, failure);
return null; return null;
} finally { } finally {
Arrays.fill(key, (byte)0); Arrays.fill(key, (byte)0);

2
src/main/java/defpackage/anl.java
View file

@ -820,7 +820,7 @@ public final class anl {
ItemStack.CODEC ItemStack.CODEC
.encodeStart(var1, var6) .encodeStart(var1, var6)
.result() .result()
.ifPresent(var1x -> var7.add("d", var1x)); .ifPresent(var1x -> var7.add("d", (JsonElement)var1x));
} }
var4.add(var7); var4.add(var7);

2
src/main/java/defpackage/anm.java
View file

@ -35,7 +35,7 @@ public final class anm implements ano {
@Override @Override
public byte[] next() throws IOException { public byte[] next() throws IOException {
anq var1 = null; anq var1 = null;
B var2 = null; byte[] var2 = null;
int var3 = 69155155; int var3 = 69155155;
while (true) { while (true) {

2
src/main/java/defpackage/ann.java
View file

@ -33,7 +33,7 @@ public final class ann implements ano {
public byte[] next() throws IOException { public byte[] next() throws IOException {
Packet var1 = null; Packet var1 = null;
ByteBuffer var2 = null; ByteBuffer var2 = null;
B var3 = null; byte[] var3 = null;
int var4 = 1034106877; int var4 = 1034106877;
while (true) { while (true) {

4
src/main/java/defpackage/ans.java
View file

@ -151,7 +151,7 @@ final class ans {
List<anq> readSegment(int var1) throws IOException { List<anq> readSegment(int var1) throws IOException {
anr var2 = null; anr var2 = null;
ByteBuffer var3 = null; ByteBuffer var3 = null;
ArrayList var4 = null; ArrayList<anr> var4 = null;
ByteBuffer var5 = null; ByteBuffer var5 = null;
int var6 = -1556286043; int var6 = -1556286043;
@ -467,7 +467,7 @@ final class ans {
private static byte[] audioSpecificConfig(ByteBuffer var0) throws IOException { private static byte[] audioSpecificConfig(ByteBuffer var0) throws IOException {
int var1 = 0; int var1 = 0;
int var2 = 0; int var2 = 0;
B var3 = null; byte[] var3 = null;
int var4 = -1096445122; int var4 = -1096445122;
while (true) { while (true) {

2
src/main/java/defpackage/ara.java
View file

@ -6,7 +6,7 @@ final class ara {
private final Matrix4f[] matrices = new Matrix4f[8]; private final Matrix4f[] matrices = new Matrix4f[8];
private int cursor; private int cursor;
private ara() { ara() {
for (int var1 = 0; var1 < 8; var1++) { for (int var1 = 0; var1 < 8; var1++) {
this.matrices[var1] = new Matrix4f(); this.matrices[var1] = new Matrix4f();
} }

4
src/main/java/defpackage/aua.java
View file

@ -123,7 +123,7 @@ public final class aua {
var4 = var2.size(); var4 = var2.size();
var2.add(var0); var2.add(var0);
var3.add(var1); var3.add(var1);
var5 = ((b.j)var0).evo$getChildren().values().iterator(); var5 = ((b.j)(Object)var0).evo$getChildren().values().iterator();
var7 = 1911049943; var7 = 1911049943;
break; break;
case -28767570: case -28767570:
@ -238,7 +238,7 @@ public final class aua {
var7 = -Float.MAX_VALUE; var7 = -Float.MAX_VALUE;
var8 = -Float.MAX_VALUE; var8 = -Float.MAX_VALUE;
var9 = 0; var9 = 0;
var10 = ((b.j)var0).evo$getCubes().iterator(); var10 = ((b.j)(Object)var0).evo$getCubes().iterator();
var23 = -396436057; var23 = -396436057;
break; break;
case 641446105: case 641446105:

2
src/main/java/defpackage/auw.java
View file

@ -464,7 +464,7 @@ public final class auw implements aqo {
break label143; break label143;
} catch (Throwable var18) { } catch (Throwable var18) {
this.failed = (boolean)(((1)) != 0); this.failed = (boolean)(((1)) != 0);
id.error( defpackage.id.error(
Cif.RENDER, Cif.RENDER,
"menu video decode failed for {}", "menu video decode failed for {}",
this.id, this.id,

4
src/main/java/defpackage/dq.java
View file

@ -38,8 +38,8 @@ public final class dq extends dh {
ams[] var2 = null; ams[] var2 = null;
int var3 = 0; int var3 = 0;
int var4 = 0; int var4 = 0;
Object var5 = null; ams var5;
String var6 = null; String var6;
int var7 = -993844548; int var7 = -993844548;
while (true) { while (true) {

8
src/main/java/defpackage/gq.java
View file

@ -34,10 +34,10 @@ public class gq {
public gr build() { public gr build() {
gk var1 = null; gk var1 = null;
AbstractTexture var2 = null; AbstractTexture var2 = null;
float var3 = 0.0F; float var3;
float var4 = 0.0F; float var4;
Int2ObjectMap var5 = null; Int2ObjectMap var5;
Int2ObjectMap var6 = null; Int2ObjectMap var6;
int var7 = 356199447; int var7 = 356199447;
while (true) { while (true) {

1
src/main/java/defpackage/gt.java
View file

@ -1,5 +1,6 @@
package defpackage; package defpackage;
import java.util.Iterator;
import com.mojang.blaze3d.PrimitiveTopology; import com.mojang.blaze3d.PrimitiveTopology;
import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.BufferBuilder;
import com.mojang.blaze3d.vertex.ByteBufferBuilder; import com.mojang.blaze3d.vertex.ByteBufferBuilder;

2
src/main/java/defpackage/hh.java
View file

@ -8,7 +8,7 @@ final class hh {
final List<hj> sources = new ArrayList<>(); final List<hj> sources = new ArrayList<>();
int count; int count;
private hh(hk var1) { hh(hk var1) {
this.key = var1; this.key = var1;
} }

4
src/main/java/defpackage/hl.java
View file

@ -73,7 +73,7 @@ public final class hl {
} }
private static List<hh> groupTypes(List<hf> var0) { private static List<hh> groupTypes(List<hf> var0) {
LinkedHashMap var1 = new LinkedHashMap(); LinkedHashMap<hk, hh> var1 = new LinkedHashMap();
for (hf var3 : var0) { for (hf var3 : var0) {
FoodProperties var4 = var3.properties(); FoodProperties var4 = var3.properties();
@ -85,7 +85,7 @@ public final class hl {
} }
} }
ArrayList var7 = new ArrayList(var1.values()); ArrayList<hh> var7 = new ArrayList(var1.values());
var7.sort(Comparator.comparingDouble(hh::weight).reversed()); var7.sort(Comparator.comparingDouble(hh::weight).reversed());
if (var7.size() > (-104671238 | 104671246) + (-104671238 & 104671246)) { if (var7.size() > (-104671238 | 104671246) + (-104671238 & 104671246)) {
var7 = new ArrayList(var7.subList(0, (-1298972115 | 1298972123) + (-1298972115 & 1298972123))); var7 = new ArrayList(var7.subList(0, (-1298972115 | 1298972123) + (-1298972115 & 1298972123)));

2
src/main/java/defpackage/hn.java
View file

@ -591,7 +591,7 @@ public final class hn {
} }
private static void groupTotals(List<hu> var0) { private static void groupTotals(List<hu> var0) {
HashMap var1 = null; HashMap<String, Integer> var1 = null;
Iterator var2 = null; Iterator var2 = null;
hu var3 = null; hu var3 = null;
int var4 = -1634404686; int var4 = -1634404686;

2
src/main/java/defpackage/hy.java
View file

@ -348,7 +348,7 @@ public final class hy {
// $VF: Unable to simplify switch on enum // $VF: Unable to simplify switch on enum
// Please report this to the Vineflower issue tracker, at https://github.com/Vineflower/vineflower/issues with a copy of the class file (if you have the rights to distribute it!) // Please report this to the Vineflower issue tracker, at https://github.com/Vineflower/vineflower/issues with a copy of the class file (if you have the rights to distribute it!)
public Comparator<hu> comparator() { public Comparator<hu> comparator() {
Comparator var1 = Comparator.comparingInt(hu::getRuleIndex).thenComparingInt(hu::getEquipmentRank); Comparator<hu> var1 = Comparator.comparingInt(hu::getRuleIndex).thenComparingInt(hu::getEquipmentRank);
var1 = switch (hx.$SwitchMap$evo$systems$base$inventory$SortKey[this.sortKey.ordinal()]) { var1 = switch (hx.$SwitchMap$evo$systems$base$inventory$SortKey[this.sortKey.ordinal()]) {
case 1 -> var1.thenComparing(hu::getName); case 1 -> var1.thenComparing(hu::getName);

2
src/main/java/defpackage/j.java
View file

@ -218,7 +218,7 @@ public final class j {
private static void register(Method var0, Object var1) { private static void register(Method var0, Object var1) {
Class var2 = null; Class var2 = null;
final i var3 = null; i var3 = null;
int var4 = 1488099691; int var4 = 1488099691;
while (true) { while (true) {

2
src/main/java/defpackage/ld.java
View file

@ -286,7 +286,7 @@ public final class ld {
} }
} }
) )
.thenCompose(Function.identity()); .thenCompose(var12x -> (java.util.concurrent.CompletionStage<HttpResponse<String>>)(Object)var12x);
case 1946856717: case 1946856717:
var8 = 0; var8 = 0;
var7 = 1855609648; var7 = 1855609648;

2
src/main/java/defpackage/mm.java
View file

@ -166,7 +166,7 @@ public class mm {
return; return;
case -159209441: case -159209441:
var8 = new ml(var6, clampPitch(var1.pitch() * var2), var5); var8 = new ml(var6, clampPitch(var1.pitch() * var2), var5);
this.activeFadingSounds.put(var1, var8); this.activeFadingSounds.put(var1, (ml)var8);
Minecraft.getInstance().getSoundManager().play(var8); Minecraft.getInstance().getSoundManager().play(var8);
return; return;
case 103479502: case 103479502:

4
src/main/java/defpackage/mr.java
View file

@ -54,7 +54,7 @@ public final class mr {
JsonArray var14 = new JsonArray(); JsonArray var14 = new JsonArray();
for (ItemStack var16 : var12.getItems()) { for (ItemStack var16 : var12.getItems()) {
ItemStack.CODEC.encodeStart(var3, var16).result().ifPresent(var14::add); ItemStack.CODEC.encodeStart(var3, var16).result().ifPresent(var17 -> var14.add((JsonElement)var17));
} }
var13.add("items", var14); var13.add("items", var14);
@ -107,7 +107,7 @@ public final class mr {
for (JsonElement var16 : var13.getAsJsonArray( for (JsonElement var16 : var13.getAsJsonArray(
"items" "items"
)) { )) {
ItemStack.CODEC.parse(var3, var16).result().ifPresent(var14::add); ItemStack.CODEC.parse(var3, var16).result().ifPresent(var17 -> var14.add((JsonElement)var17));
} }
} }

2
src/main/java/defpackage/nj.java
View file

@ -1033,7 +1033,7 @@ public final class nj {
switch (var4x) { switch (var4x) {
case -946274765: case -946274765:
var3x = var5x; var3x = var5x;
var1x.setBackdrop(new nl(var3, var3x, var2x.speed(), var2x.scale())); var1x.setBackdrop(new nl((nk)var3, var3x, var2x.speed(), var2x.scale()));
return; return;
case 154502056: case 154502056:
var5x = 0.5F; var5x = 0.5F;

6
src/main/java/defpackage/op.java
View file

@ -236,10 +236,10 @@ public final class op {
private static List<oo> collectQuick(nx[] var0, String[] var1) { private static List<oo> collectQuick(nx[] var0, String[] var1) {
ArrayList var2 = null; ArrayList var2 = null;
Constable var3 = null; Object var3 = null;
int var4 = 0; int var4 = 0;
int var5 = 0; int var5 = 0;
Constable var6 = null; Object var6 = null;
Iterator var7 = null; Iterator var7 = null;
oo var8 = null; oo var8 = null;
int var9 = -927380495; int var9 = -927380495;
@ -1176,7 +1176,7 @@ public final class op {
ob[] var1 = null; ob[] var1 = null;
int var2 = 0; int var2 = 0;
int var3 = 0; int var3 = 0;
Object var4 = null; ob var4 = null;
String var5 = null; String var5 = null;
int var6 = -190852280; int var6 = -190852280;

2
src/main/java/defpackage/ri.java
View file

@ -1203,7 +1203,7 @@ public final class ri implements aqg {
private void rebuild() { private void rebuild() {
this.results.clear(); this.results.clear();
String var1 = this.query.toString().trim().toLowerCase(Locale.ROOT); String var1 = this.query.toString().trim().toLowerCase(Locale.ROOT);
ArrayList var2 = new ArrayList(); ArrayList<rh> var2 = new ArrayList();
List var3 = bz.getInstance().getModuleManager().getModules(); List var3 = bz.getInstance().getModuleManager().getModules();
for (int var4 = 0; var4 < var3.size(); var4++) { for (int var4 = 0; var4 < var3.size(); var4++) {

8
src/main/java/defpackage/tf.java
View file

@ -236,7 +236,7 @@ public final class tf extends rm {
Iterator var13 = null; Iterator var13 = null;
Entity var14 = null; Entity var14 = null;
AABB var15 = null; AABB var15 = null;
Optional var16 = null; Optional<Vec3> var16 = null;
Vec3 var17 = null; Vec3 var17 = null;
double var18 = 0.0; double var18 = 0.0;
EntityHitResult var21 = null; EntityHitResult var21 = null;
@ -276,7 +276,7 @@ public final class tf extends rm {
case -525984328: case -525984328:
var14 = (Entity)var13.next(); var14 = (Entity)var13.next();
var15 = this.renderBox(var14, var7).inflate(var14.getPickRadius()); var15 = this.renderBox(var14, var7).inflate(var14.getPickRadius());
var16 = var15.clip(var2, var3); var16 = var15.clip(var2, var3).map(BlockHitResult::getLocation);
if (var15.contains(var2)) { if (var15.contains(var2)) {
var20 = 814856296; var20 = 814856296;
} else { } else {
@ -479,14 +479,14 @@ public final class tf extends rm {
Vec3 var10 = null; Vec3 var10 = null;
Vec3 var11 = null; Vec3 var11 = null;
BlockHitResult var12 = null; BlockHitResult var12 = null;
Optional var13 = null; Optional<BlockHitResult> var13 = null;
int var14 = -1643872642; int var14 = -1643872642;
while (true) { while (true) {
switch (var14) { switch (var14) {
case -1998940837: case -1998940837:
var13 = var7.clip(var10, var11); var13 = var7.clip(var10, var11);
return var13.<EntityHitResult>map(var1x -> new EntityHitResult(var2, var1x)).orElse(null); return var13.<EntityHitResult>map(var1x -> new EntityHitResult(var2, var1x.getLocation())).orElse(null);
case -1643872642: case -1643872642:
default: default:
var7 = this.renderBox(var2, var6); var7 = this.renderBox(var2, var6);

2
src/main/java/defpackage/ux.java
View file

@ -278,7 +278,7 @@ public final class ux extends rm {
var14x = -1175505723; var14x = -1175505723;
break; break;
case 1700319975: case 1700319975:
this.particles.get(var12x).render(var11x, var10x, var13, var6, var8, var16, var17, var18, var19); this.particles.get(var12x).render(var11x, var10x, var13, var6, var8, var16, var17 != 0, var18, var19);
var12x++; var12x++;
var14x = -1175505723; var14x = -1175505723;
} }

2
src/main/java/defpackage/vd.java
View file

@ -451,7 +451,7 @@ public final class vd extends rm {
var4 = this.distance.getCurrent(); var4 = this.distance.getCurrent();
var5 = (mc.options.getCameraType().isFirstPerson()) ? 1 : 0; var5 = (mc.options.getCameraType().isFirstPerson()) ? 1 : 0;
var6 = new ArrayList(mc.level.players()); var6 = new ArrayList(mc.level.players());
var6.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr(var0))); var6.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr((net.minecraft.world.entity.player.Player)var0)));
var7 = var6.iterator(); var7 = var6.iterator();
var18 = 578627668; var18 = 578627668;
break; break;

2
src/main/java/defpackage/vk.java
View file

@ -11,6 +11,6 @@ final class vk {
final float[] ringPyC = new float[264]; final float[] ringPyC = new float[264];
final float[] ringPzC = new float[264]; final float[] ringPzC = new float[264];
private vk() { vk() {
} }
} }

2
src/main/java/defpackage/vu.java
View file

@ -838,7 +838,7 @@ public final class vu extends rm {
var2 = var1.getContext(); var2 = var1.getContext();
var3 = bz.getInstance().getThemeManager().getCurrentTheme(); var3 = bz.getInstance().getThemeManager().getCurrentTheme();
var4 = new ArrayList(mc.level.players()); var4 = new ArrayList(mc.level.players());
var4.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr(var0))); var4.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr((net.minecraft.world.entity.player.Player)var0)));
var5 = var4.iterator(); var5 = var4.iterator();
var12 = -85551973; var12 = -85551973;
break; break;

2
src/main/java/defpackage/ww.java
View file

@ -144,7 +144,7 @@ public final class ww {
} }
public static Optional<wv> decodeShared(String var0, float var1) { public static Optional<wv> decodeShared(String var0, float var1) {
Optional var2 = decode(var0, var1); Optional<xd> var2 = decode(var0, var1);
return var2.map(var1x -> new wv(var1x, extractName(var0))); return var2.map(var1x -> new wv(var1x, extractName(var0)));
} }

400
tools/waves_n.py Normal file
View file

@ -0,0 +1,400 @@
"""Волна N поверх vfbuild14 (83 ошибки). Таблицы по file:line из vfbuild14.log.
Запуск: python3 tools/waves_n.py
"""
import os, sys, collections
ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
JAVA = os.path.join(ROOT, "src/main/java")
stats = collections.Counter()
files = {}
def get(rel):
p = rel if os.path.isabs(rel) else os.path.join(JAVA, rel)
if p not in files:
files[p] = open(p, encoding="utf-8", errors="replace").read().splitlines()
return files[p]
def edit_line(rel, ln, old, new, tag):
L = get(rel)
i = ln - 1
if i >= len(L):
stats[tag + "_MISS"] += 1
print(f"MISS {rel}:{ln} (oob {len(L)})")
return
if old in L[i]:
L[i] = L[i].replace(old, new, 1)
stats[tag] += 1
elif new in L[i]:
stats[tag + "_skip"] += 1
else:
stats[tag + "_MISS"] += 1
print(f"MISS {rel}:{ln}: {old!r}\n got: {L[i].strip()!r}")
def edit_all(rel, old, new, tag, expect=None):
L = get(rel)
c = 0
for i, l in enumerate(L):
if old in l:
L[i] = l.replace(old, new)
c += 1
if expect is not None and c != expect:
stats[tag + "_COUNT"] += 1
print(f"COUNT {rel}: {old!r} matched {c}, expected {expect}")
if c:
stats[tag] += c
else:
if any(new in l for l in L):
stats[tag + "_skip"] += 1
else:
stats[tag + "_MISS"] += 1
print(f"MISS-ALL {rel}: {old!r}")
def add_import(rel, imp, tag):
L = get(rel)
if imp in L:
stats[tag + "_skip"] += 1
return
for i, l in enumerate(L):
if l.startswith("import "):
L.insert(i, imp)
stats[tag] += 1
return
stats[tag + "_MISS"] += 1
print(f"IMPORT-MISS {rel}: {imp}")
# (rel, line, old, new)
EDITS = [
# --- gq: effectively-final (blank decls, single later assignment) ---
("defpackage/gq.java", 37, "float var3 = 0.0F;", "float var3;"),
("defpackage/gq.java", 38, "float var4 = 0.0F;", "float var4;"),
("defpackage/gq.java", 39, "Int2ObjectMap var5 = null;", "Int2ObjectMap var5;"),
("defpackage/gq.java", 40, "Int2ObjectMap var6 = null;", "Int2ObjectMap var6;"),
# --- mm ---
(
"defpackage/mm.java",
169,
"this.activeFadingSounds.put(var1, var8);",
"this.activeFadingSounds.put(var1, (ml)var8);",
),
# --- ach ---
(
"defpackage/ach.java",
458,
"var6 = Comparator.comparing(var0 ->",
"var6 = Comparator.<mo>comparing(var0 ->",
),
# --- acz: бриджи через Object ---
(
"defpackage/acz.java",
81,
"var1 = (PerServerVersionScreen)var0;",
"var1 = (b.k)(Object)var0;",
),
(
"defpackage/acz.java",
83,
"return new acx(var1.prevScreen,",
"return new acx(((PerServerVersionScreen)var0).prevScreen,",
),
(
"defpackage/acz.java",
105,
"var1 = (ViaFabricPlusScreen)var0;",
"var1 = (b.k)(Object)var0;",
),
(
"defpackage/acz.java",
106,
"return new acx(((ViaFabricPlusScreen)var1).prevScreen);",
"return new acx(((ViaFabricPlusScreen)var0).prevScreen);",
),
# --- adc ---
(
"defpackage/adc.java",
448,
"var0.setValue(var2[Math.floorMod(var3 + var1, var2.length)]);",
"var0.setValue((T)var2[Math.floorMod(var3 + var1, var2.length)]);",
),
# --- ado / aeq: typed Stream ---
(
"defpackage/ado.java",
163,
"try (Stream var15 = Files.list(capesDir()))",
"try (Stream<Path> var15 = Files.list(capesDir()))",
),
(
"defpackage/aeq.java",
817,
"try (Stream var1 = Files.list(var0))",
"try (Stream<Path> var1 = Files.list(var0))",
),
# --- aeo: usage casts ---
("defpackage/aeo.java", 310, "var10.append(", "((MutableComponent)var10).append("),
("defpackage/aeo.java", 328, "var10.append(", "((MutableComponent)var10).append("),
("defpackage/aeo.java", 345, "var10.append(", "((MutableComponent)var10).append("),
("defpackage/aeo.java", 382, "var10.append(", "((MutableComponent)var10).append("),
# --- ahw ---
(
"defpackage/ahw.java",
175,
"? -1: var9.getOrDefault(var11.parent.name, (1226890724 | -1226890725) + (1226890724 & -1226890725));",
"? -1: ((Integer)var9.getOrDefault(var11.parent.name, (1226890724 | -1226890725) + (1226890724 & -1226890725)));",
),
# --- aid ---
(
"defpackage/aid.java",
636,
"byte var33 = var18 ? 1 : 0;",
"byte var33 = (byte)(var18 ? 1 : 0);",
),
# --- akx ---
(
"defpackage/akx.java",
154,
"var1.sort((var0x, var1x) -> Integer.compare(var1x.getIntValue(), var0x.getIntValue()));",
"var1.sort((var0x, var1x) -> Integer.compare(((Entry)var1x).getIntValue(), ((Entry)var0x).getIntValue()));",
),
# --- akz ---
(
"defpackage/akz.java",
160,
"var1.sort(String::compareToIgnoreCase);",
"((List<String>)var1).sort(String::compareToIgnoreCase);",
),
# --- ald ---
(
"defpackage/ald.java",
128,
"var7.toArray(new Direction[0]),",
"(Direction[])var7.toArray(new Direction[0]),",
),
("defpackage/ald.java", 170, "var2.add(var5);", "var2.add((BakedQuad)var5);"),
# --- alp / auw: логгер defpackage.id ---
(
"defpackage/alp.java",
54,
"id.warn(Cif.SECURITY,",
"defpackage.id.warn(Cif.SECURITY,",
),
("defpackage/auw.java", 467, "id.error(", "defpackage.id.error("),
# --- B -> byte[] ---
("defpackage/anm.java", 38, "B var2 = null;", "byte[] var2 = null;"),
("defpackage/ann.java", 36, "B var3 = null;", "byte[] var3 = null;"),
("defpackage/ans.java", 470, "B var3 = null;", "byte[] var3 = null;"),
# --- ans: typed list for sort ---
(
"defpackage/ans.java",
154,
"ArrayList var4 = null;",
"ArrayList<anr> var4 = null;",
),
# --- anl ---
(
"defpackage/anl.java",
823,
'var7.add("d", var1x)',
'var7.add("d", (JsonElement)var1x)',
),
# --- aua: бридж mixin-интерфейса ---
("defpackage/aua.java", 126, "((b.j)var0)", "((b.j)(Object)var0)"),
("defpackage/aua.java", 241, "((b.j)var0)", "((b.j)(Object)var0)"),
# --- dq: ams var5, blank EF ---
("defpackage/dq.java", 41, "Object var5 = null;", "ams var5;"),
("defpackage/dq.java", 42, "String var6 = null;", "String var6;"),
# --- hy: typed comparator ---
(
"defpackage/hy.java",
351,
"Comparator var1 = Comparator.comparingInt(",
"Comparator<hu> var1 = Comparator.comparingInt(",
),
# --- hl ---
(
"defpackage/hl.java",
76,
"LinkedHashMap var1 = new LinkedHashMap();",
"LinkedHashMap<hk, hh> var1 = new LinkedHashMap();",
),
(
"defpackage/hl.java",
88,
"ArrayList var7 = new ArrayList(var1.values());",
"ArrayList<hh> var7 = new ArrayList(var1.values());",
),
# --- hn ---
(
"defpackage/hn.java",
594,
"HashMap var1 = null;",
"HashMap<String, Integer> var1 = null;",
),
# --- j ---
("defpackage/j.java", 221, "final i var3 = null;", "i var3 = null;"),
# --- ld ---
(
"defpackage/ld.java",
289,
".thenCompose(Function.identity());",
".thenCompose(var12x -> (java.util.concurrent.CompletionStage<HttpResponse<String>>)(Object)var12x);",
),
# --- mr: lambda вместо method ref (raw Optional) ---
(
"defpackage/mr.java",
57,
"ifPresent(var14::add);",
"ifPresent(var17 -> var14.add((JsonElement)var17));",
),
(
"defpackage/mr.java",
110,
"ifPresent(var14::add);",
"ifPresent(var17 -> var14.add((JsonElement)var17));",
),
# --- nj ---
("defpackage/nj.java", 1036, "new nl(var3, var3x,", "new nl((nk)var3, var3x,"),
# --- op: merged slots ---
("defpackage/op.java", 239, "Constable var3 = null;", "Object var3 = null;"),
("defpackage/op.java", 242, "Constable var6 = null;", "Object var6 = null;"),
("defpackage/op.java", 1179, "Object var4 = null;", "ob var4 = null;"),
# --- ri ---
(
"defpackage/ri.java",
1206,
"ArrayList var2 = new ArrayList();",
"ArrayList<rh> var2 = new ArrayList();",
),
# --- tf ---
(
"defpackage/tf.java",
239,
"Optional var16 = null;",
"Optional<Vec3> var16 = null;",
),
(
"defpackage/tf.java",
279,
"var16 = var15.clip(var2, var3);",
"var16 = var15.clip(var2, var3).map(BlockHitResult::getLocation);",
),
(
"defpackage/tf.java",
482,
"Optional var13 = null;",
"Optional<BlockHitResult> var13 = null;",
),
(
"defpackage/tf.java",
489,
"new EntityHitResult(var2, var1x)",
"new EntityHitResult(var2, var1x.getLocation())",
),
# --- ux: int -> boolean ---
(
"defpackage/ux.java",
281,
"var16, var17, var18, var19);",
"var16, var17 != 0, var18, var19);",
),
# --- vd / vu ---
(
"defpackage/vd.java",
454,
"var6.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr(var0)));",
"var6.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr((net.minecraft.world.entity.player.Player)var0)));",
),
(
"defpackage/vu.java",
841,
"var4.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr(var0)));",
"var4.sort(Comparator.comparingDouble(var0 -> -mc.player.distanceToSqr((net.minecraft.world.entity.player.Player)var0)));",
),
# --- ww ---
(
"defpackage/ww.java",
147,
"Optional var2 = decode(var0, var1);",
"Optional<xd> var2 = decode(var0, var1);",
),
# --- agk ---
(
"defpackage/agk.java",
346,
"ArrayList var3 = null;",
"ArrayList<agh> var3 = null;",
),
# --- b: bare bz + ParseResults ---
(
"b/bx.java",
27,
", bz.getInstance().getCommandManager().getSource());",
", defpackage.bz.getInstance().getCommandManager().getSource());",
),
(
"b/t.java",
49,
", bz.getInstance().getCommandManager().getSource());",
", defpackage.bz.getInstance().getCommandManager().getSource());",
),
(
"b/t.java",
54,
"getCompletionSuggestions(this.currentParse, cursor);",
"getCompletionSuggestions((ParseResults<SharedSuggestionProvider>)this.currentParse, cursor);",
),
]
# (rel, old, new, expect)
ALL_EDITS = [
("defpackage/aeh.java", "((Object[])var6)", "((float[])var6)", 3),
("defpackage/aua.java", "((b.j)var0)", "((b.j)(Object)var0)", 2),
]
# content-based (unprivate ctors)
CTOR_EDITS = [
("defpackage/ara.java", "private ara()", "ara()"),
("defpackage/vk.java", "private vk()", "vk()"),
("defpackage/hh.java", "private hh(hk var1)", "hh(hk var1)"),
]
IMPORTS = [
("defpackage/gt.java", "import java.util.Iterator;"),
("defpackage/aeo.java", "import net.minecraft.network.chat.MutableComponent;"),
("b/t.java", "import net.minecraft.commands.SharedSuggestionProvider;"),
]
def main():
by = collections.defaultdict(list)
for row in EDITS:
by[row[0]].append(row)
# aua строки из EDITS уже есть (126/241) — ALL_EDITS по aua дублирует, убираем оттуда
for rel, rows in by.items():
for row in sorted(rows, key=lambda r: -r[1]):
edit_line(rel, row[1], row[2], row[3], "n")
for rel, old, new, expect in ALL_EDITS:
if rel == "defpackage/aua.java":
continue
edit_all(rel, old, new, "n", expect)
for rel, old, new in CTOR_EDITS:
edit_all(rel, old, new, "ctor")
for rel, imp in IMPORTS:
add_import(rel, imp, "import")
for p, L in files.items():
with open(p, "w", encoding="utf-8") as f:
f.write("\n".join(L) + "\n")
print(dict(stats))
miss = {k: v for k, v in stats.items() if "MISS" in k or "COUNT" in k}
if miss:
print("PROBLEMS:", dict(miss))
sys.exit(1)
if __name__ == "__main__":
main()