diff --git a/build-logs/vfbuild14.log b/build-logs/vfbuild14.log new file mode 100644 index 0000000..d0d7ba2 --- /dev/null +++ b/build-logs/vfbuild14.log @@ -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 cycle(EnumSetting,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 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 withInitial(Supplier) +/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 comparingDouble(ToDoubleFunction) +/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 cannot be converted to Function>) + where U,T#1,T#2 are type-variables: + U extends Object declared in method thenCompose(Function>) + T#1 extends Object declared in class CompletableFuture + T#2 extends Object declared in method 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.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.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 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 withInitial(Supplier) +/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 cannot be converted to ParseResults + 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 diff --git a/src/main/java/b/bx.java b/src/main/java/b/bx.java index b0a9485..68fa4c7 100644 --- a/src/main/java/b/bx.java +++ b/src/main/java/b/bx.java @@ -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) { } diff --git a/src/main/java/b/t.java b/src/main/java/b/t.java index 6f41be7..370b493 100644 --- a/src/main/java/b/t.java +++ b/src/main/java/b/t.java @@ -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)this.currentParse, cursor); this.pendingSuggestions.thenAccept(s -> { if (this.pendingSuggestions.isDone()) { this.updateUsageInfo(this.currentParse, s); diff --git a/src/main/java/defpackage/ach.java b/src/main/java/defpackage/ach.java index 15f9815..99ee954 100644 --- a/src/main/java/defpackage/ach.java +++ b/src/main/java/defpackage/ach.java @@ -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.comparing(var0 -> var0.stack().getHoverName().getString().toLowerCase(Locale.ROOT)); var4 = 1334135620; break; case -577531470: diff --git a/src/main/java/defpackage/acz.java b/src/main/java/defpackage/acz.java index 6fd0b24..0a5f8e0 100644 --- a/src/main/java/defpackage/acz.java +++ b/src/main/java/defpackage/acz.java @@ -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); } } } diff --git a/src/main/java/defpackage/adc.java b/src/main/java/defpackage/adc.java index 8361ada..fdcf74b 100644 --- a/src/main/java/defpackage/adc.java +++ b/src/main/java/defpackage/adc.java @@ -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; diff --git a/src/main/java/defpackage/ado.java b/src/main/java/defpackage/ado.java index 0bc89ae..519eedb 100644 --- a/src/main/java/defpackage/ado.java +++ b/src/main/java/defpackage/ado.java @@ -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 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))); diff --git a/src/main/java/defpackage/aeh.java b/src/main/java/defpackage/aeh.java index 556cbe7..387aae6 100644 --- a/src/main/java/defpackage/aeh.java +++ b/src/main/java/defpackage/aeh.java @@ -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; diff --git a/src/main/java/defpackage/aeo.java b/src/main/java/defpackage/aeo.java index 0de29f4..68d71f8 100644 --- a/src/main/java/defpackage/aeo.java +++ b/src/main/java/defpackage/aeo.java @@ -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) { diff --git a/src/main/java/defpackage/aeq.java b/src/main/java/defpackage/aeq.java index fc36594..9e7b9d8 100644 --- a/src/main/java/defpackage/aeq.java +++ b/src/main/java/defpackage/aeq.java @@ -814,7 +814,7 @@ public final class aeq { if (!pruned) { pruned = (boolean)(((1)) != 0); - try (Stream var1 = Files.list(var0)) { + try (Stream var1 = Files.list(var0)) { List var2 = var1.filter(var0x -> Files.isRegularFile(var0x)).sorted(Comparator.comparingLong(aeq::lastModified)).toList(); for (int var3 = 0; diff --git a/src/main/java/defpackage/agk.java b/src/main/java/defpackage/agk.java index eafb643..be5d8d4 100644 --- a/src/main/java/defpackage/agk.java +++ b/src/main/java/defpackage/agk.java @@ -343,7 +343,7 @@ public final class agk { } public List ownedBy(String var1, String var2) { - ArrayList var3 = null; + ArrayList var3 = null; Iterator var4 = null; agh var5 = null; int var6 = 1498213730; diff --git a/src/main/java/defpackage/ahw.java b/src/main/java/defpackage/ahw.java index 756915a..d1f84c2 100644 --- a/src/main/java/defpackage/ahw.java +++ b/src/main/java/defpackage/ahw.java @@ -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; diff --git a/src/main/java/defpackage/aid.java b/src/main/java/defpackage/aid.java index d18fd32..0515153 100644 --- a/src/main/java/defpackage/aid.java +++ b/src/main/java/defpackage/aid.java @@ -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 diff --git a/src/main/java/defpackage/akx.java b/src/main/java/defpackage/akx.java index 0995e5e..e814141 100644 --- a/src/main/java/defpackage/akx.java +++ b/src/main/java/defpackage/akx.java @@ -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; diff --git a/src/main/java/defpackage/akz.java b/src/main/java/defpackage/akz.java index bd8d78e..bf23739 100644 --- a/src/main/java/defpackage/akz.java +++ b/src/main/java/defpackage/akz.java @@ -157,7 +157,7 @@ public final class akz { } break; case 1525862489: - var1.sort(String::compareToIgnoreCase); + ((List)var1).sort(String::compareToIgnoreCase); return var1; case 1870613825: var1.add(var5.getName()); diff --git a/src/main/java/defpackage/ald.java b/src/main/java/defpackage/ald.java index 6e72bdf..9c22d39 100644 --- a/src/main/java/defpackage/ald.java +++ b/src/main/java/defpackage/ald.java @@ -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; diff --git a/src/main/java/defpackage/alp.java b/src/main/java/defpackage/alp.java index 09a02b7..a222f73 100644 --- a/src/main/java/defpackage/alp.java +++ b/src/main/java/defpackage/alp.java @@ -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); diff --git a/src/main/java/defpackage/anl.java b/src/main/java/defpackage/anl.java index 4b09703..082188c 100644 --- a/src/main/java/defpackage/anl.java +++ b/src/main/java/defpackage/anl.java @@ -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); diff --git a/src/main/java/defpackage/anm.java b/src/main/java/defpackage/anm.java index 1cb4ad1..5ac0070 100644 --- a/src/main/java/defpackage/anm.java +++ b/src/main/java/defpackage/anm.java @@ -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) { diff --git a/src/main/java/defpackage/ann.java b/src/main/java/defpackage/ann.java index c34e935..ceba6a2 100644 --- a/src/main/java/defpackage/ann.java +++ b/src/main/java/defpackage/ann.java @@ -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) { diff --git a/src/main/java/defpackage/ans.java b/src/main/java/defpackage/ans.java index aebb174..2ea6ec7 100644 --- a/src/main/java/defpackage/ans.java +++ b/src/main/java/defpackage/ans.java @@ -151,7 +151,7 @@ final class ans { List readSegment(int var1) throws IOException { anr var2 = null; ByteBuffer var3 = null; - ArrayList var4 = null; + ArrayList 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) { diff --git a/src/main/java/defpackage/ara.java b/src/main/java/defpackage/ara.java index 326efa3..88deb4d 100644 --- a/src/main/java/defpackage/ara.java +++ b/src/main/java/defpackage/ara.java @@ -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(); } diff --git a/src/main/java/defpackage/aua.java b/src/main/java/defpackage/aua.java index 9cc1124..18b4e36 100644 --- a/src/main/java/defpackage/aua.java +++ b/src/main/java/defpackage/aua.java @@ -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: diff --git a/src/main/java/defpackage/auw.java b/src/main/java/defpackage/auw.java index 7443b5b..24dc53f 100644 --- a/src/main/java/defpackage/auw.java +++ b/src/main/java/defpackage/auw.java @@ -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, diff --git a/src/main/java/defpackage/dq.java b/src/main/java/defpackage/dq.java index c463720..ed6568e 100644 --- a/src/main/java/defpackage/dq.java +++ b/src/main/java/defpackage/dq.java @@ -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) { diff --git a/src/main/java/defpackage/gq.java b/src/main/java/defpackage/gq.java index 1256e85..fa2146f 100644 --- a/src/main/java/defpackage/gq.java +++ b/src/main/java/defpackage/gq.java @@ -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) { diff --git a/src/main/java/defpackage/gt.java b/src/main/java/defpackage/gt.java index 994f313..aa6e1c3 100644 --- a/src/main/java/defpackage/gt.java +++ b/src/main/java/defpackage/gt.java @@ -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; diff --git a/src/main/java/defpackage/hh.java b/src/main/java/defpackage/hh.java index c729e9c..e70bff0 100644 --- a/src/main/java/defpackage/hh.java +++ b/src/main/java/defpackage/hh.java @@ -8,7 +8,7 @@ final class hh { final List sources = new ArrayList<>(); int count; - private hh(hk var1) { + hh(hk var1) { this.key = var1; } diff --git a/src/main/java/defpackage/hl.java b/src/main/java/defpackage/hl.java index d893070..9e45eb2 100644 --- a/src/main/java/defpackage/hl.java +++ b/src/main/java/defpackage/hl.java @@ -73,7 +73,7 @@ public final class hl { } private static List groupTypes(List var0) { - LinkedHashMap var1 = new LinkedHashMap(); + LinkedHashMap 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 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))); diff --git a/src/main/java/defpackage/hn.java b/src/main/java/defpackage/hn.java index 3483a7d..77d1f63 100644 --- a/src/main/java/defpackage/hn.java +++ b/src/main/java/defpackage/hn.java @@ -591,7 +591,7 @@ public final class hn { } private static void groupTotals(List var0) { - HashMap var1 = null; + HashMap var1 = null; Iterator var2 = null; hu var3 = null; int var4 = -1634404686; diff --git a/src/main/java/defpackage/hy.java b/src/main/java/defpackage/hy.java index 0745ba3..03e21f5 100644 --- a/src/main/java/defpackage/hy.java +++ b/src/main/java/defpackage/hy.java @@ -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 comparator() { - Comparator var1 = Comparator.comparingInt(hu::getRuleIndex).thenComparingInt(hu::getEquipmentRank); + Comparator 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); diff --git a/src/main/java/defpackage/j.java b/src/main/java/defpackage/j.java index 1c9fdac..721d019 100644 --- a/src/main/java/defpackage/j.java +++ b/src/main/java/defpackage/j.java @@ -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) { diff --git a/src/main/java/defpackage/ld.java b/src/main/java/defpackage/ld.java index c5e42c0..45ae962 100644 --- a/src/main/java/defpackage/ld.java +++ b/src/main/java/defpackage/ld.java @@ -286,7 +286,7 @@ public final class ld { } } ) - .thenCompose(Function.identity()); + .thenCompose(var12x -> (java.util.concurrent.CompletionStage>)(Object)var12x); case 1946856717: var8 = 0; var7 = 1855609648; diff --git a/src/main/java/defpackage/mm.java b/src/main/java/defpackage/mm.java index 86f279d..f149afc 100644 --- a/src/main/java/defpackage/mm.java +++ b/src/main/java/defpackage/mm.java @@ -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: diff --git a/src/main/java/defpackage/mr.java b/src/main/java/defpackage/mr.java index a12cc08..b3410da 100644 --- a/src/main/java/defpackage/mr.java +++ b/src/main/java/defpackage/mr.java @@ -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)); } } diff --git a/src/main/java/defpackage/nj.java b/src/main/java/defpackage/nj.java index 814b2f5..a44396d 100644 --- a/src/main/java/defpackage/nj.java +++ b/src/main/java/defpackage/nj.java @@ -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; diff --git a/src/main/java/defpackage/op.java b/src/main/java/defpackage/op.java index 8dc9d35..71715b2 100644 --- a/src/main/java/defpackage/op.java +++ b/src/main/java/defpackage/op.java @@ -236,10 +236,10 @@ public final class op { private static List 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; diff --git a/src/main/java/defpackage/ri.java b/src/main/java/defpackage/ri.java index 5ab21d8..894913f 100644 --- a/src/main/java/defpackage/ri.java +++ b/src/main/java/defpackage/ri.java @@ -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 var2 = new ArrayList(); List var3 = bz.getInstance().getModuleManager().getModules(); for (int var4 = 0; var4 < var3.size(); var4++) { diff --git a/src/main/java/defpackage/tf.java b/src/main/java/defpackage/tf.java index d95e327..6e6fdf5 100644 --- a/src/main/java/defpackage/tf.java +++ b/src/main/java/defpackage/tf.java @@ -236,7 +236,7 @@ public final class tf extends rm { Iterator var13 = null; Entity var14 = null; AABB var15 = null; - Optional var16 = null; + Optional 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 var13 = null; int var14 = -1643872642; while (true) { switch (var14) { case -1998940837: var13 = var7.clip(var10, var11); - return var13.map(var1x -> new EntityHitResult(var2, var1x)).orElse(null); + return var13.map(var1x -> new EntityHitResult(var2, var1x.getLocation())).orElse(null); case -1643872642: default: var7 = this.renderBox(var2, var6); diff --git a/src/main/java/defpackage/ux.java b/src/main/java/defpackage/ux.java index 6c12653..8168490 100644 --- a/src/main/java/defpackage/ux.java +++ b/src/main/java/defpackage/ux.java @@ -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; } diff --git a/src/main/java/defpackage/vd.java b/src/main/java/defpackage/vd.java index 5cc8981..e77f258 100644 --- a/src/main/java/defpackage/vd.java +++ b/src/main/java/defpackage/vd.java @@ -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; diff --git a/src/main/java/defpackage/vk.java b/src/main/java/defpackage/vk.java index 3d78624..04df83b 100644 --- a/src/main/java/defpackage/vk.java +++ b/src/main/java/defpackage/vk.java @@ -11,6 +11,6 @@ final class vk { final float[] ringPyC = new float[264]; final float[] ringPzC = new float[264]; - private vk() { + vk() { } } diff --git a/src/main/java/defpackage/vu.java b/src/main/java/defpackage/vu.java index 8bd3940..88f17b1 100644 --- a/src/main/java/defpackage/vu.java +++ b/src/main/java/defpackage/vu.java @@ -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; diff --git a/src/main/java/defpackage/ww.java b/src/main/java/defpackage/ww.java index d87fefa..b6356b1 100644 --- a/src/main/java/defpackage/ww.java +++ b/src/main/java/defpackage/ww.java @@ -144,7 +144,7 @@ public final class ww { } public static Optional decodeShared(String var0, float var1) { - Optional var2 = decode(var0, var1); + Optional var2 = decode(var0, var1); return var2.map(var1x -> new wv(var1x, extractName(var0))); } diff --git a/tools/waves_n.py b/tools/waves_n.py new file mode 100644 index 0000000..f63c744 --- /dev/null +++ b/tools/waves_n.py @@ -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.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 var15 = Files.list(capesDir()))", + ), + ( + "defpackage/aeq.java", + 817, + "try (Stream var1 = Files.list(var0))", + "try (Stream 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)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 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 var1 = Comparator.comparingInt(", + ), + # --- hl --- + ( + "defpackage/hl.java", + 76, + "LinkedHashMap var1 = new LinkedHashMap();", + "LinkedHashMap var1 = new LinkedHashMap();", + ), + ( + "defpackage/hl.java", + 88, + "ArrayList var7 = new ArrayList(var1.values());", + "ArrayList var7 = new ArrayList(var1.values());", + ), + # --- hn --- + ( + "defpackage/hn.java", + 594, + "HashMap var1 = null;", + "HashMap 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>)(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 var2 = new ArrayList();", + ), + # --- tf --- + ( + "defpackage/tf.java", + 239, + "Optional var16 = null;", + "Optional 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 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 var2 = decode(var0, var1);", + ), + # --- agk --- + ( + "defpackage/agk.java", + 346, + "ArrayList var3 = null;", + "ArrayList 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)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()