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

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

View file

@ -24,7 +24,7 @@ public class bx {
defpackage.bz.getInstance()
.getCommandManager()
.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) {
}

View file

@ -1,5 +1,6 @@
package b;
import net.minecraft.commands.SharedSuggestionProvider;
import defpackage.*;
import com.mojang.brigadier.ParseResults;
import com.mojang.brigadier.StringReader;
@ -46,12 +47,12 @@ public abstract class t {
&& reader.getString().startsWith(defpackage.bz.getInstance().getCommandManager().getPrefix(), reader.getCursor())) {
reader.setCursor(reader.getCursor() + 1);
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();
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 -> {
if (this.pendingSuggestions.isDone()) {
this.updateUsageInfo(this.currentParse, s);

View file

@ -455,7 +455,7 @@ public final class ach extends api {
var4 = 734420006;
break;
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;
break;
case -577531470:

View file

@ -78,9 +78,9 @@ public final class acz {
}
break;
case -541368600:
var1 = (PerServerVersionScreen)var0;
var1 = (b.k)(Object)var0;
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:
default:
if (var0 instanceof ViaFabricPlusScreen) {
@ -102,8 +102,8 @@ public final class acz {
}
break;
case 1416768364:
var1 = (ViaFabricPlusScreen)var0;
return new acx(((ViaFabricPlusScreen)var1).prevScreen);
var1 = (b.k)(Object)var0;
return new acx(((ViaFabricPlusScreen)var0).prevScreen);
}
}
}

View file

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

View file

@ -160,7 +160,7 @@ public final class ado {
if (var0 && 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);
if (var16 != null) {
adq.getInstance().setCapeFromBase64(var1, Base64.getEncoder().encodeToString(Files.readAllBytes(var16)));

View file

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

View file

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

View file

@ -814,7 +814,7 @@ public final class aeq {
if (!pruned) {
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();
for (int var3 = 0;

View file

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

View file

@ -172,7 +172,7 @@ public final class ahw {
aig var11 = (aig)var2.get(var14);
var13[var14] = var11.name;
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 * 4] = var11.pivotY;
var6[var14 * 5] = var11.pivotZ;

View file

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

View file

@ -151,7 +151,7 @@ public final class akx {
case -1936510821:
default:
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());
var3 = var1.iterator();
var5 = 1834889623;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -73,7 +73,7 @@ public final class hl {
}
private static List<hh> groupTypes(List<hf> var0) {
LinkedHashMap var1 = new LinkedHashMap();
LinkedHashMap<hk, hh> var1 = new LinkedHashMap();
for (hf var3 : var0) {
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());
if (var7.size() > (-104671238 | 104671246) + (-104671238 & 104671246)) {
var7 = new ArrayList(var7.subList(0, (-1298972115 | 1298972123) + (-1298972115 & 1298972123)));

View file

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

View file

@ -348,7 +348,7 @@ public final class hy {
// $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!)
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()]) {
case 1 -> var1.thenComparing(hu::getName);

View file

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

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:
var8 = 0;
var7 = 1855609648;

View file

@ -166,7 +166,7 @@ public class mm {
return;
case -159209441:
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);
return;
case 103479502:

View file

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

View file

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

View file

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

View file

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

View file

@ -236,7 +236,7 @@ public final class tf extends rm {
Iterator var13 = null;
Entity var14 = null;
AABB var15 = null;
Optional var16 = null;
Optional<Vec3> var16 = null;
Vec3 var17 = null;
double var18 = 0.0;
EntityHitResult var21 = null;
@ -276,7 +276,7 @@ public final class tf extends rm {
case -525984328:
var14 = (Entity)var13.next();
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)) {
var20 = 814856296;
} else {
@ -479,14 +479,14 @@ public final class tf extends rm {
Vec3 var10 = null;
Vec3 var11 = null;
BlockHitResult var12 = null;
Optional var13 = null;
Optional<BlockHitResult> var13 = null;
int var14 = -1643872642;
while (true) {
switch (var14) {
case -1998940837:
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:
default:
var7 = this.renderBox(var2, var6);

View file

@ -278,7 +278,7 @@ public final class ux extends rm {
var14x = -1175505723;
break;
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++;
var14x = -1175505723;
}

View file

@ -451,7 +451,7 @@ public final class vd extends rm {
var4 = this.distance.getCurrent();
var5 = (mc.options.getCameraType().isFirstPerson()) ? 1 : 0;
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();
var18 = 578627668;
break;

View file

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

View file

@ -838,7 +838,7 @@ public final class vu extends rm {
var2 = var1.getContext();
var3 = bz.getInstance().getThemeManager().getCurrentTheme();
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();
var12 = -85551973;
break;

View file

@ -144,7 +144,7 @@ public final class ww {
}
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)));
}