From dbb0fc0607f0e39c66c47e84f461d87a996e11b0 Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Sat, 3 Oct 2026 14:27:08 +0200 Subject: [PATCH] waves G-K: retype/casts/foreach/int-bool, nb+Cif enums, kotlin.Pair shim --- src/main/java/a/f.java | 2 +- src/main/java/a/l.java | 2 +- src/main/java/a/o.java | 3 +- src/main/java/b/ag.java | 2 +- src/main/java/b/ap.java | 2 +- src/main/java/b/bd.java | 2 +- src/main/java/b/be.java | 2 +- src/main/java/b/bg.java | 2 +- src/main/java/b/bm.java | 2 +- src/main/java/b/bp.java | 6 +- src/main/java/b/br.java | 2 +- src/main/java/b/bt.java | 6 +- src/main/java/b/bu.java | 6 +- src/main/java/b/bx.java | 2 +- src/main/java/b/cb.java | 2 +- src/main/java/b/cr.java | 2 +- src/main/java/b/cv.java | 2 +- src/main/java/b/dd.java | 6 +- src/main/java/b/q.java | 2 +- src/main/java/b/t.java | 2 +- src/main/java/b/z.java | 8 +- src/main/java/defpackage/Cif.java | 64 +-- src/main/java/defpackage/aab.java | 2 +- src/main/java/defpackage/aah.java | 110 ++-- src/main/java/defpackage/aaj.java | 10 +- src/main/java/defpackage/abs.java | 2 +- src/main/java/defpackage/acf.java | 5 +- src/main/java/defpackage/adf.java | 6 +- src/main/java/defpackage/ado.java | 2 +- src/main/java/defpackage/adv.java | 24 +- src/main/java/defpackage/afp.java | 12 +- src/main/java/defpackage/agt.java | 2 +- src/main/java/defpackage/agx.java | 4 +- src/main/java/defpackage/ahf.java | 2 +- src/main/java/defpackage/ahi.java | 6 +- src/main/java/defpackage/ahn.java | 14 +- src/main/java/defpackage/aid.java | 26 +- src/main/java/defpackage/aiq.java | 4 +- src/main/java/defpackage/ajm.java | 2 +- src/main/java/defpackage/ajn.java | 10 +- src/main/java/defpackage/ajq.java | 2 +- src/main/java/defpackage/ajx.java | 2 +- src/main/java/defpackage/akd.java | 2 +- src/main/java/defpackage/akt.java | 2 +- src/main/java/defpackage/akz.java | 10 +- src/main/java/defpackage/ald.java | 4 +- src/main/java/defpackage/an.java | 2 +- src/main/java/defpackage/anb.java | 10 +- src/main/java/defpackage/anh.java | 2 +- src/main/java/defpackage/anl.java | 4 +- src/main/java/defpackage/ans.java | 2 +- src/main/java/defpackage/anu.java | 2 +- src/main/java/defpackage/aod.java | 4 +- src/main/java/defpackage/apm.java | 2 +- src/main/java/defpackage/atf.java | 2 +- src/main/java/defpackage/aua.java | 6 +- src/main/java/defpackage/auk.java | 2 +- src/main/java/defpackage/aul.java | 2 +- src/main/java/defpackage/auv.java | 2 +- src/main/java/defpackage/bn.java | 12 +- src/main/java/defpackage/bt.java | 2 +- src/main/java/defpackage/bx.java | 2 +- src/main/java/defpackage/cc.java | 2 +- src/main/java/defpackage/cm.java | 2 +- src/main/java/defpackage/ed.java | 2 +- src/main/java/defpackage/gq.java | 2 +- src/main/java/defpackage/gt.java | 4 +- src/main/java/defpackage/hl.java | 4 +- src/main/java/defpackage/hn.java | 2 +- src/main/java/defpackage/im.java | 4 +- src/main/java/defpackage/j.java | 4 +- src/main/java/defpackage/jb.java | 2 +- src/main/java/defpackage/je.java | 6 +- src/main/java/defpackage/jt.java | 6 +- src/main/java/defpackage/jz.java | 6 +- src/main/java/defpackage/ka.java | 2 +- src/main/java/defpackage/kk.java | 2 +- src/main/java/defpackage/ko.java | 4 +- src/main/java/defpackage/ld.java | 2 +- src/main/java/defpackage/mk.java | 2 +- src/main/java/defpackage/mr.java | 2 +- src/main/java/defpackage/ms.java | 28 +- src/main/java/defpackage/mw.java | 2 +- src/main/java/defpackage/nb.java | 68 +-- src/main/java/defpackage/op.java | 2 +- src/main/java/defpackage/ql.java | 2 +- src/main/java/defpackage/qs.java | 2 +- src/main/java/defpackage/ri.java | 2 +- src/main/java/defpackage/sh.java | 2 +- src/main/java/defpackage/ue.java | 2 +- src/main/java/defpackage/up.java | 2 +- src/main/java/defpackage/uq.java | 4 +- src/main/java/defpackage/vl.java | 14 +- src/main/java/defpackage/vp.java | 2 +- src/main/java/defpackage/vr.java | 2 +- src/main/java/defpackage/ww.java | 2 +- src/main/java/defpackage/yy.java | 2 +- src/main/java/defpackage/zk.java | 4 +- src/main/java/defpackage/zm.java | 8 +- src/main/java/defpackage/zr.java | 4 +- src/main/java/kotlin/Pair.java | 19 + tools/waves_ghik.py | 885 ++++++++++++++++++++++++++++++ 102 files changed, 1194 insertions(+), 376 deletions(-) create mode 100644 src/main/java/kotlin/Pair.java create mode 100644 tools/waves_ghik.py diff --git a/src/main/java/a/f.java b/src/main/java/a/f.java index c8e8e01..3b06b11 100644 --- a/src/main/java/a/f.java +++ b/src/main/java/a/f.java @@ -134,6 +134,6 @@ public abstract class f implements y { @ModifyConstant(method = "getCurrentSwingDuration()I", constant = @Constant(intValue = 6)) private int modifySwingDuration(int original) { - return this == Minecraft.getInstance().player ? aj.swingSpeed : original; + return (Object)this == Minecraft.getInstance().player ? aj.swingSpeed : original; } } diff --git a/src/main/java/a/l.java b/src/main/java/a/l.java index 6bafc4c..b9bfbd1 100644 --- a/src/main/java/a/l.java +++ b/src/main/java/a/l.java @@ -382,7 +382,7 @@ public abstract class l { ) throws ScriptException, NoSuchMethodException { if (ve.active() && !sz.rendersFirstPerson(item) && !sz.attachesHandItem(player, hand, item)) { if (!player.isScoping()) { - ((x)item).hMI5_0$setTransform(-1); + ((x)(Object)item).hMI5_0$setTransform(-1); boolean bl = hand == InteractionHand.MAIN_HAND; boolean interact = false; boolean blockBreaking = false; diff --git a/src/main/java/a/o.java b/src/main/java/a/o.java index e029a57..79903d1 100644 --- a/src/main/java/a/o.java +++ b/src/main/java/a/o.java @@ -1,6 +1,7 @@ package a; import defpackage.*; +import b.l; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.QuadInstance; import com.mojang.blaze3d.vertex.PoseStack.Pose; @@ -59,7 +60,7 @@ public abstract class o { posed.last().set(basePose); af.modelPartAnimator.applyPoses(index, posed); Pose pose = posed.last(); - ((b.l)this).evo$getVertexBuilder(renderType).putBakedQuad(pose, quad, quadInstance); + ((l)this).evo$getVertexBuilder(renderType).putBakedQuad(pose, quad, quadInstance); posed.popPose(); index++; } diff --git a/src/main/java/b/ag.java b/src/main/java/b/ag.java index 2ba4a0a..8257553 100644 --- a/src/main/java/b/ag.java +++ b/src/main/java/b/ag.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public abstract class ag { @Inject(method = "raycastHitResult(FLnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/phys/HitResult;", at = @At("HEAD"), cancellable = true) private void evo$frameAccurateRaycast(float partialTicks, Entity cameraEntity, CallbackInfoReturnable callback) { - HitResult hitResult = tf.INSTANCE.raycast((LocalPlayer)this, cameraEntity, partialTicks); + HitResult hitResult = tf.INSTANCE.raycast((LocalPlayer)(Object)this, cameraEntity, partialTicks); if (hitResult != null) { callback.setReturnValue(hitResult); } diff --git a/src/main/java/b/ap.java b/src/main/java/b/ap.java index c32c42a..beecb00 100644 --- a/src/main/java/b/ap.java +++ b/src/main/java/b/ap.java @@ -24,7 +24,7 @@ public abstract class ap extends Screen { private void evolution$installMenuEntries(CallbackInfo ci) { aci.ensureRegistered(); acj.installInto(this, widget -> this.addRenderableWidget(widget)); - xk toast = new xk((TitleScreen)this, this.font); + xk toast = new xk((TitleScreen)(Object)this, this.font); acj.exclude(toast); this.addRenderableWidget(toast); } diff --git a/src/main/java/b/bd.java b/src/main/java/b/bd.java index 1c70eea..22a41b5 100644 --- a/src/main/java/b/bd.java +++ b/src/main/java/b/bd.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public abstract class bd { @Inject(method = "prepareGroup(Lnet/minecraft/client/renderer/feature/FeatureFrameContext;Ljava/util/List;Z)V", at = @At("HEAD")) private void evo$captureStagedBuffer(FeatureFrameContext context, List submits, boolean strictlyOrdered, CallbackInfo ci) { - if (this instanceof ModelFeatureRenderer) { + if (((Object)this) instanceof ModelFeatureRenderer) { atz.captureFrameContext(context.stagedVertexBuffer(), context.lightmap()); } } diff --git a/src/main/java/b/be.java b/src/main/java/b/be.java index 0a1c61a..683d060 100644 --- a/src/main/java/b/be.java +++ b/src/main/java/b/be.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class be { @Inject(method = "extractPanorama(Lnet/minecraft/client/gui/GuiGraphicsExtractor;F)V", at = @At("HEAD"), cancellable = true) private void evolution$menuVideoBackground(GuiGraphicsExtractor context, float delta, CallbackInfo ci) { - Screen self = (Screen)this; + Screen self = (Screen)(Object)this; if (Minecraft.getInstance().level == null && !(self instanceof api)) { if (!(self instanceof TitleScreen)) { aqr.renderExtracted(context, self.width, self.height); diff --git a/src/main/java/b/bg.java b/src/main/java/b/bg.java index 9edba45..5a78d32 100644 --- a/src/main/java/b/bg.java +++ b/src/main/java/b/bg.java @@ -80,7 +80,7 @@ public abstract class bg { @ModifyVariable(method = "forEachLine", at = @At("STORE"), ordinal = 0) private float evo$fadeMessage(float alpha, @Local Line line) { return tq.INSTANCE.fadeChatMessages() && !tq.INSTANCE.chatAnimationFinished(this.evo$lastMessageAt) - ? alpha * tq.INSTANCE.chatMessageAlpha(((aqe)line.parent()).evo$addedAt()) + ? alpha * tq.INSTANCE.chatMessageAlpha(((aqe)(Object)line.parent()).evo$addedAt()) : alpha; } diff --git a/src/main/java/b/bm.java b/src/main/java/b/bm.java index d45bf8f..2320567 100644 --- a/src/main/java/b/bm.java +++ b/src/main/java/b/bm.java @@ -86,7 +86,7 @@ public abstract class bm extends Screen implements aqd { @Unique private boolean evo$isInventory() { - return this instanceof InventoryScreen; + return ((Object)this) instanceof InventoryScreen; } @Unique diff --git a/src/main/java/b/bp.java b/src/main/java/b/bp.java index 6ff0499..d054936 100644 --- a/src/main/java/b/bp.java +++ b/src/main/java/b/bp.java @@ -52,7 +52,7 @@ public abstract class bp { @Inject(method = "mouseClicked(Lnet/minecraft/client/input/MouseButtonEvent;Z)Z", at = @At("HEAD"), cancellable = true) private void onSortButtonClicked(MouseButtonEvent event, boolean doubled, CallbackInfoReturnable cir) { - AbstractContainerScreen screen = (AbstractContainerScreen)this; + AbstractContainerScreen screen = (AbstractContainerScreen)(Object)this; if (xr.click(screen, event.x(), event.y(), event.button(), event.hasShiftDown())) { cir.setReturnValue(true); } else { @@ -64,14 +64,14 @@ public abstract class bp { @Inject(method = "mouseScrolled(DDDD)Z", at = @At("HEAD"), cancellable = true) private void onItemScrollerScrolled(double mouseX, double mouseY, double horizontal, double vertical, CallbackInfoReturnable cir) { - if (th.INSTANCE.onScroll((AbstractContainerScreen)this, mouseX, mouseY, vertical)) { + if (th.INSTANCE.onScroll((AbstractContainerScreen)(Object)this, mouseX, mouseY, vertical)) { cir.setReturnValue(true); } } @Inject(method = "mouseDragged(Lnet/minecraft/client/input/MouseButtonEvent;DD)Z", at = @At("HEAD"), cancellable = true) private void onItemScrollerDragged(MouseButtonEvent event, double deltaX, double deltaY, CallbackInfoReturnable cir) { - if (th.INSTANCE.onDrag((AbstractContainerScreen)this, event.x(), event.y())) { + if (th.INSTANCE.onDrag((AbstractContainerScreen)(Object)this, event.x(), event.y())) { cir.setReturnValue(true); } } diff --git a/src/main/java/b/br.java b/src/main/java/b/br.java index a13571e..19db158 100644 --- a/src/main/java/b/br.java +++ b/src/main/java/b/br.java @@ -29,7 +29,7 @@ public abstract class br { @Inject(method = "extractSlots(Lnet/minecraft/client/gui/GuiGraphicsExtractor;II)V", at = @At("HEAD")) private void evo$updateSwaps(GuiGraphicsExtractor context, int mouseX, int mouseY, CallbackInfo ci) { - xt.INSTANCE.update((AbstractContainerScreen)this, mouseX, mouseY, this.leftPos, this.topPos); + xt.INSTANCE.update((AbstractContainerScreen)(Object)this, mouseX, mouseY, this.leftPos, this.topPos); } @Inject(method = "extractSlots(Lnet/minecraft/client/gui/GuiGraphicsExtractor;II)V", at = @At("TAIL")) diff --git a/src/main/java/b/bt.java b/src/main/java/b/bt.java index 4164ec1..98afd33 100644 --- a/src/main/java/b/bt.java +++ b/src/main/java/b/bt.java @@ -14,19 +14,19 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class bt implements aqg { @Redirect(method = "jumpFromGround", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;getYRot()F")) public float replaceMovePacketPitch(LivingEntity instance) { - return this != mc.player ? instance.getYRot() : defpackage.bz.getInstance().getRotationManager().getCurrentRotation().getYaw(); + return (Object)this != mc.player ? instance.getYRot() : defpackage.bz.getInstance().getRotationManager().getCurrentRotation().getYaw(); } @Inject(method = "jumpFromGround", at = @At("HEAD")) private void trackJumpResetJump(CallbackInfo ci) { - if (this == mc.player) { + if ((Object)this == mc.player) { apl.INSTANCE.onJump(mc.player.tickCount); } } @Inject(method = "handleDamageEvent(Lnet/minecraft/world/damagesource/DamageSource;)V", at = @At("HEAD")) private void trackJumpResetDamage(DamageSource damageSource, CallbackInfo ci) { - if (this == mc.player) { + if ((Object)this == mc.player) { if (damageSource.getEntity() != null && !damageSource.is(DamageTypeTags.NO_KNOCKBACK)) { apl.INSTANCE.onHurt(mc.player.tickCount, mc.player.onGround()); } diff --git a/src/main/java/b/bu.java b/src/main/java/b/bu.java index 2d83722..6dd2e89 100644 --- a/src/main/java/b/bu.java +++ b/src/main/java/b/bu.java @@ -25,7 +25,7 @@ public class bu { @Inject(method = "travel", at = @At("HEAD")) public void fixElytra(CallbackInfo ci) { - if (this instanceof LocalPlayer player) { + if (((Object)this) instanceof LocalPlayer player) { apz currentRotation = defpackage.bz.getInstance().getRotationManager().getCurrentRotation(); this.savedYaw = aqg.mc.player.getYRot(); this.savedPitch = aqg.mc.player.getXRot(); @@ -36,7 +36,7 @@ public class bu { @Inject(method = "travel", at = @At("RETURN")) public void fixElytraEnd(CallbackInfo ci) { - if (this instanceof LocalPlayer player) { + if (((Object)this) instanceof LocalPlayer player) { player.setYRot(this.savedYaw); player.setXRot(this.savedPitch); } @@ -45,7 +45,7 @@ public class bu { @Inject(method = "getDisplayName()Lnet/minecraft/network/chat/Component;", at = @At("RETURN"), cancellable = true) public void modifyDisplayNameForTotems(CallbackInfoReturnable cir) { if (wh.INSTANCE.isEnabled()) { - Player player = (Player)this; + Player player = (Player)(Object)this; int pops = wh.INSTANCE.getPops(player.getGameProfile().name()); if (pops > 0) { cir.setReturnValue( diff --git a/src/main/java/b/bx.java b/src/main/java/b/bx.java index aba6dbf..b0a9485 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.defpackage.bz.getInstance().getCommandManager().getPrefix().length()), bz.getInstance().getCommandManager().getSource()); + .execute(message.substring(defpackage.bz.getInstance().getCommandManager().getPrefix().length()), bz.getInstance().getCommandManager().getSource()); } catch (CommandSyntaxException var4) { } diff --git a/src/main/java/b/cb.java b/src/main/java/b/cb.java index 2278220..d8491b4 100644 --- a/src/main/java/b/cb.java +++ b/src/main/java/b/cb.java @@ -27,7 +27,7 @@ public abstract class cb { if (client.level != null) { if (client.level.getEntity(state.id) instanceof AbstractClientPlayer player) { if (adm.shouldRender(player) && !player.getItemBySlot(EquipmentSlot.CHEST).has(DataComponents.GLIDER)) { - RenderLayer self = (RenderLayer)this; + RenderLayer self = (RenderLayer)(Object)this; Identifier capeTexture = adm.resolve(player); if (adm.isShaderCape(capeTexture)) { ags.getInstance().enqueue(matrices, player, (PlayerModel)self.getParentModel()); diff --git a/src/main/java/b/cr.java b/src/main/java/b/cr.java index f06395b..35c032f 100644 --- a/src/main/java/b/cr.java +++ b/src/main/java/b/cr.java @@ -15,6 +15,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public abstract class cr { @Inject(method = "", at = @At("TAIL")) private void evo$addCosmeticFeature(Context context, boolean slim, CallbackInfo ci) { - ((defpackage.b.ck)this).evo$addFeature(new adp((RenderLayerParent)this)); + ((ck)this).evo$addFeature(new adp((RenderLayerParent)this)); } } diff --git a/src/main/java/b/cv.java b/src/main/java/b/cv.java index 8816247..f26bde8 100644 --- a/src/main/java/b/cv.java +++ b/src/main/java/b/cv.java @@ -12,6 +12,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class cv { @Inject(method = "setupAnim(Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;)V", at = @At("TAIL")) private void evo$holdGuiPose(AvatarRenderState state, CallbackInfo ci) { - vd.applyPose((PlayerModel)this, state); + vd.applyPose((PlayerModel)(Object)this, state); } } diff --git a/src/main/java/b/dd.java b/src/main/java/b/dd.java index 5925697..8f8ba32 100644 --- a/src/main/java/b/dd.java +++ b/src/main/java/b/dd.java @@ -15,11 +15,11 @@ public class dd { @Unique private long evo$lastRealTime = -1L; @Unique - private final ct evo$smoothSkipAnim = defpackage.ct.layoutMillis(6000.0F, 0.0F); + private final defpackage.ct evo$smoothSkipAnim = defpackage.ct.layoutMillis(6000.0F, 0.0F); @Inject(method = "getDefaultClockTime", at = @At("RETURN"), cancellable = true) public void getTimeOfDayHook(CallbackInfoReturnable cir) { - if (this instanceof ClientLevel) { + if (((Object)this) instanceof ClientLevel) { long realTime = (Long)cir.getReturnValue(); wq tweaks = wq.INSTANCE; if (tweaks.isEnabled() && tweaks.smoothMorning.isEnabled()) { @@ -80,7 +80,7 @@ public class dd { @Unique private float evo$weatherProgress() { - if (!(this instanceof ClientLevel)) { + if (!(((Object)this) instanceof ClientLevel)) { return 0.0F; } diff --git a/src/main/java/b/q.java b/src/main/java/b/q.java index 2db9393..2357bf4 100644 --- a/src/main/java/b/q.java +++ b/src/main/java/b/q.java @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public abstract class q { @Inject(method = "getSkin", at = @At("RETURN"), cancellable = true) private void evo$customCosmeticSkin(CallbackInfoReturnable cir) { - AbstractClientPlayer player = (AbstractClientPlayer)this; + AbstractClientPlayer player = (AbstractClientPlayer)(Object)this; PlayerSkin original = (PlayerSkin)cir.getReturnValue(); if (original != null) { Identifier capeTexture = adm.shouldRender(player) ? adm.resolve(player) : null; diff --git a/src/main/java/b/t.java b/src/main/java/b/t.java index 6db86e8..6f41be7 100644 --- a/src/main/java/b/t.java +++ b/src/main/java/b/t.java @@ -46,7 +46,7 @@ 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.defpackage.bz.getInstance().getCommandManager().getDispatcher().parse(reader, bz.getInstance().getCommandManager().getSource()); + this.currentParse = defpackage.bz.getInstance().getCommandManager().getDispatcher().parse(reader, bz.getInstance().getCommandManager().getSource()); } int cursor = this.input.getCursorPosition(); diff --git a/src/main/java/b/z.java b/src/main/java/b/z.java index e28ee7e..28d3429 100644 --- a/src/main/java/b/z.java +++ b/src/main/java/b/z.java @@ -17,7 +17,7 @@ public class z implements aqg { at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;isLocalInstanceAuthoritative()Z", ordinal = 1) ) public boolean fixFalldistanceValue(boolean original) { - return this == mc.player ? true : original; + return (Object)this == mc.player ? true : original; } @Redirect(method = "moveRelative", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;getYRot()F")) @@ -27,17 +27,17 @@ public class z implements aqg { @ModifyVariable(method = "calculateViewVector(FF)Lnet/minecraft/world/phys/Vec3;", at = @At("HEAD"), ordinal = 0, argsOnly = true) private float modifyPitch(float pitch) { - return this instanceof LocalPlayer && evo$rotationOverridden() ? defpackage.bz.getInstance().getRotationManager().getCurrentRotation().getPitch() : pitch; + return ((Object)this) instanceof LocalPlayer && evo$rotationOverridden() ? defpackage.bz.getInstance().getRotationManager().getCurrentRotation().getPitch() : pitch; } @ModifyVariable(method = "calculateViewVector(FF)Lnet/minecraft/world/phys/Vec3;", at = @At("HEAD"), ordinal = 1, argsOnly = true) private float modifyYaw(float yaw) { - return this instanceof LocalPlayer && evo$rotationOverridden() ? defpackage.bz.getInstance().getRotationManager().getCurrentRotation().getYaw() : yaw; + return ((Object)this) instanceof LocalPlayer && evo$rotationOverridden() ? defpackage.bz.getInstance().getRotationManager().getCurrentRotation().getYaw() : yaw; } @Unique private static boolean evo$rotationOverridden() { - bz evolution = defpackage.bz.getInstance(); + defpackage.bz evolution = defpackage.bz.getInstance(); return evolution != null && evolution.getRotationManager() != null && evolution.getRotationManager().isRotationOverridden(); } } diff --git a/src/main/java/defpackage/Cif.java b/src/main/java/defpackage/Cif.java index 7bd1669..b833efe 100644 --- a/src/main/java/defpackage/Cif.java +++ b/src/main/java/defpackage/Cif.java @@ -6,29 +6,28 @@ import java.util.Locale; /* JADX WARN: Unknown enum class pattern. Please report as an issue! */ /* JADX INFO: renamed from: if, reason: invalid class name */ /* JADX INFO: loaded from: evovis-dec.jar:if.class */ -public final class Cif { +public enum Cif { + GENERAL("GENERAL", (1921291259 ^ (-1921291259)) + ((1921291259 & (-1921291259)) << 1)), + MODULE("MODULE", ((-691220310) | 691220311) + ((-691220310) & 691220311)), + RENDER("RENDER", (985517866 | (-985517864)) + (985517866 & (-985517864))), + SHADER("SHADER", ((-94908406) | 94908409) + ((-94908406) & 94908409)), + GUI("GUI", ((-1491706391) | 1491706395) + ((-1491706391) & 1491706395)), + CONFIG("CONFIG", ((-1613212341) | 1613212346) + ((-1613212341) & 1613212346)), + STORAGE("STORAGE", (648025519 | (-648025513)) + (648025519 & (-648025513))), + COSMETIC("COSMETIC", ((-537055264) ^ 537055271) + (((-537055264) & 537055271) << 1)), + MEDIA("MEDIA", ((-2093865589) | 2093865597) + ((-2093865589) & 2093865597)), + NETWORK("NETWORK", (1212026385 ^ (-1212026376)) + ((1212026385 & (-1212026376)) << 1)), + AUTH("AUTH", ((-1424280418) | 1424280428) + ((-1424280418) & 1424280428)), + SOCIAL("SOCIAL", (385942394 ^ (-385942383)) + ((385942394 & (-385942383)) << 1)), + UPDATE("UPDATE", (982044831 | (-982044819)) + (982044831 & (-982044819))), + COMPAT("COMPAT", (997875594 ^ (-997875581)) + ((997875594 & (-997875581)) << 1)), + SECURITY("SECURITY", ((-402772907) | 402772921) + ((-402772907) & 402772921)); private static final String OVERRIDE_PROPERTY = "evovis.log"; private static final String ENTRY_SEPARATOR = ","; private static final String VALUE_SEPARATOR = "="; private static final String OVERRIDE_SEPARATOR = " "; private static final String EMPTY = ""; private volatile ii consoleLevel; - public static final Cif GENERAL = new Cif("GENERAL", (1921291259 ^ (-1921291259)) + ((1921291259 & (-1921291259)) << 1)); - public static final Cif MODULE = new Cif("MODULE", ((-691220310) | 691220311) + ((-691220310) & 691220311)); - public static final Cif RENDER = new Cif("RENDER", (985517866 | (-985517864)) + (985517866 & (-985517864))); - public static final Cif SHADER = new Cif("SHADER", ((-94908406) | 94908409) + ((-94908406) & 94908409)); - public static final Cif GUI = new Cif("GUI", ((-1491706391) | 1491706395) + ((-1491706391) & 1491706395)); - public static final Cif CONFIG = new Cif("CONFIG", ((-1613212341) | 1613212346) + ((-1613212341) & 1613212346)); - public static final Cif STORAGE = new Cif("STORAGE", (648025519 | (-648025513)) + (648025519 & (-648025513))); - public static final Cif COSMETIC = new Cif("COSMETIC", ((-537055264) ^ 537055271) + (((-537055264) & 537055271) << 1)); - public static final Cif MEDIA = new Cif("MEDIA", ((-2093865589) | 2093865597) + ((-2093865589) & 2093865597)); - public static final Cif NETWORK = new Cif("NETWORK", (1212026385 ^ (-1212026376)) + ((1212026385 & (-1212026376)) << 1)); - public static final Cif AUTH = new Cif("AUTH", ((-1424280418) | 1424280428) + ((-1424280418) & 1424280428)); - public static final Cif SOCIAL = new Cif("SOCIAL", (385942394 ^ (-385942383)) + ((385942394 & (-385942383)) << 1)); - public static final Cif UPDATE = new Cif("UPDATE", (982044831 | (-982044819)) + (982044831 & (-982044819))); - public static final Cif COMPAT = new Cif("COMPAT", (997875594 ^ (-997875581)) + ((997875594 & (-997875581)) << 1)); - public static final Cif SECURITY = new Cif("SECURITY", ((-402772907) | 402772921) + ((-402772907) & 402772921)); - private static final /* synthetic */ Cif[] $VALUES = $values(); public void consoleLevel(ii iiVar) { int i = -1637682122; @@ -190,39 +189,12 @@ public final class Cif { } } - public static Cif[] values() { - return (Cif[]) $VALUES.clone(); - } - public static Cif valueOf(String str) { - return (Cif) Enum.valueOf(Cif.class, str); - } private Cif(String str, int i) { - super(str, i); this.consoleLevel = ii.DEFAULT_CONSOLE; } - private static /* synthetic */ Cif[] $values() { - Cif[] cifArr = new Cif[15]; - cifArr[0] = GENERAL; - cifArr[1] = MODULE; - cifArr[2] = RENDER; - cifArr[3] = SHADER; - cifArr[4] = GUI; - cifArr[5] = CONFIG; - cifArr[6] = STORAGE; - cifArr[7] = COSMETIC; - cifArr[8] = MEDIA; - cifArr[9] = NETWORK; - cifArr[10] = AUTH; - cifArr[11] = SOCIAL; - cifArr[12] = UPDATE; - cifArr[13] = COMPAT; - cifArr[14] = SECURITY; - return cifArr; - } - static { applyOverrides(System.getProperty("evovis.log", "")); } @@ -243,7 +215,7 @@ public final class Cif { /* JADX WARN: Type inference failed for: r0v3, types: [boolean, int] */ public static boolean applyOverrides(String str) { if (str == null || str.isBlank()) { - return 0; + return false; } int i = 0; String[] strArrSplit = str.split(","); @@ -272,6 +244,6 @@ public final class Cif { } } } - return i; + return i != 0; } } diff --git a/src/main/java/defpackage/aab.java b/src/main/java/defpackage/aab.java index 274abf1..8038391 100644 --- a/src/main/java/defpackage/aab.java +++ b/src/main/java/defpackage/aab.java @@ -148,7 +148,7 @@ public class aab extends zu { var2 = -990648879; break; case 1617787793: - if (var1 != this.lastEnabled) { + if ((var1 != 0) != this.lastEnabled) { var2 = 1351074363; } else { var2 = -990648879; diff --git a/src/main/java/defpackage/aah.java b/src/main/java/defpackage/aah.java index ed216f4..28d50bf 100644 --- a/src/main/java/defpackage/aah.java +++ b/src/main/java/defpackage/aah.java @@ -187,7 +187,7 @@ public class aah { String var18 = var13.trim().toLowerCase(); var17 = new ArrayList(); - for (aeb var20 : var16) { + for (aeb var20 : (Iterable)var16) { if (var20.getName().toLowerCase().contains(var18)) { var17.add(var20); } @@ -1082,7 +1082,7 @@ public class aah { private List getCachedHat(aej var1) { aif var2 = null; - ArrayList var3 = null; + ArrayList var3 = null; Matrix4fStack var4 = null; Vector3f var5 = null; Iterator var6 = null; @@ -1172,46 +1172,46 @@ public class aah { var15 = (float[])var14.next(); var11.addVertex( var12, - var3 - ((Object[])var15)[0] * var9, - var10 + ((Object[])var15)[1] * var9, + var3 - ((float[])var15)[0] * var9, + var10 + ((float[])var15)[1] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[2], - (float)((Object[])var15)[3] + (float)((float[])var15)[2], + (float)((float[])var15)[3] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[4] * var9, - var10 + ((Object[])var15)[5] * var9, + var3 - ((float[])var15)[4] * var9, + var10 + ((float[])var15)[5] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[6], - (float)((Object[])var15)[7] + (float)((float[])var15)[6], + (float)((float[])var15)[7] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[8] * var9, - var10 + ((Object[])var15)[9] * var9, + var3 - ((float[])var15)[8] * var9, + var10 + ((float[])var15)[9] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[10], - (float)((Object[])var15)[11] + (float)((float[])var15)[10], + (float)((float[])var15)[11] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[12] * var9, - var10 + ((Object[])var15)[13] * var9, + var3 - ((float[])var15)[12] * var9, + var10 + ((float[])var15)[13] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[14], - (float)((Object[])var15)[15] + (float)((float[])var15)[14], + (float)((float[])var15)[15] ) .setColor(var13); var16 = 368844180; @@ -1247,7 +1247,7 @@ public class aah { private List getCachedBackpack(adk var1) { aif var2 = null; - ArrayList var3 = null; + ArrayList var3 = null; Matrix4fStack var4 = null; Vector3f var5 = null; Iterator var6 = null; @@ -1397,46 +1397,46 @@ public class aah { var15 = (float[])var14.next(); var11.addVertex( var12, - var3 - ((Object[])var15)[0] * var9, - var10 + ((Object[])var15)[1] * var9, + var3 - ((float[])var15)[0] * var9, + var10 + ((float[])var15)[1] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[2], - (float)((Object[])var15)[3] + (float)((float[])var15)[2], + (float)((float[])var15)[3] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[4] * var9, - var10 + ((Object[])var15)[5] * var9, + var3 - ((float[])var15)[4] * var9, + var10 + ((float[])var15)[5] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[6], - (float)((Object[])var15)[7] + (float)((float[])var15)[6], + (float)((float[])var15)[7] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[8] * var9, - var10 + ((Object[])var15)[9] * var9, + var3 - ((float[])var15)[8] * var9, + var10 + ((float[])var15)[9] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[10], - (float)((Object[])var15)[11] + (float)((float[])var15)[10], + (float)((float[])var15)[11] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[12] * var9, - var10 + ((Object[])var15)[13] * var9, + var3 - ((float[])var15)[12] * var9, + var10 + ((float[])var15)[13] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[14], - (float)((Object[])var15)[15] + (float)((float[])var15)[14], + (float)((float[])var15)[15] ) .setColor(var13); var16 = -1924401322; @@ -1453,7 +1453,7 @@ public class aah { private List getCachedSkin(aex var1) { aif var2 = null; - ArrayList var3 = null; + ArrayList var3 = null; Matrix4fStack var4 = null; Vector3f var5 = null; Iterator var6 = null; @@ -1561,46 +1561,46 @@ public class aah { var15 = (float[])var14.next(); var11.addVertex( var12, - var3 - ((Object[])var15)[0] * var9, - var10 + ((Object[])var15)[1] * var9, + var3 - ((float[])var15)[0] * var9, + var10 + ((float[])var15)[1] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[2], - (float)((Object[])var15)[3] + (float)((float[])var15)[2], + (float)((float[])var15)[3] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[4] * var9, - var10 + ((Object[])var15)[5] * var9, + var3 - ((float[])var15)[4] * var9, + var10 + ((float[])var15)[5] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[6], - (float)((Object[])var15)[7] + (float)((float[])var15)[6], + (float)((float[])var15)[7] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[8] * var9, - var10 + ((Object[])var15)[9] * var9, + var3 - ((float[])var15)[8] * var9, + var10 + ((float[])var15)[9] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[10], - (float)((Object[])var15)[11] + (float)((float[])var15)[10], + (float)((float[])var15)[11] ) .setColor(var13); var11.addVertex( var12, - var3 - ((Object[])var15)[12] * var9, - var10 + ((Object[])var15)[13] * var9, + var3 - ((float[])var15)[12] * var9, + var10 + ((float[])var15)[13] * var9, 0.0F ) .setUv( - (float)((Object[])var15)[14], - (float)((Object[])var15)[15] + (float)((float[])var15)[14], + (float)((float[])var15)[15] ) .setColor(var13); var16 = 984002060; @@ -1798,7 +1798,7 @@ public class aah { return null; } - ArrayList var3 = new ArrayList(); + ArrayList var3 = new ArrayList(); Matrix4fStack var4 = new Matrix4fStack((-1340840869 ^ 1340840933) + ((-1340840869 & 1340840933) << 1)); var4.translate(0.0F, var1.getPreviewOffsetY(), var1.getOffsetZ()); var4.scale(var1.getScale()); @@ -1816,7 +1816,7 @@ public class aah { float var11 = 0.0F; float var12 = 0.0F; - for (float[] var9 : var3) { + for (float[] var9 : (Iterable)var3) { for (int var10 = 0; var10 < 4; var10++) { var11 = Math.max(var11, Math.abs(var9[var10 * (4)] * 16.0F * 0.5F)); var12 = Math.max( @@ -2437,7 +2437,7 @@ public class aah { float var10 = var9 > var8 ? 1.0F : -1.0F; this.selectedSlot = var7; this.releaseCardState(); - ArrayList var11 = new ArrayList<>(aed.getInstance().bySlot(this.selectedSlot)); + ArrayList var11 = new ArrayList<>(aed.getInstance().bySlot(this.selectedSlot)); if (var5 != null && !var5.trim().isEmpty()) { String var12 = var5.toLowerCase(); var11.removeIf(var1x -> { diff --git a/src/main/java/defpackage/aaj.java b/src/main/java/defpackage/aaj.java index fe95d8d..245256a 100644 --- a/src/main/java/defpackage/aaj.java +++ b/src/main/java/defpackage/aaj.java @@ -656,11 +656,11 @@ public class aaj { var1.drawText(var11, "REQUESTS", var2 + 2.0F, var21, var16); var21 += var11.height() + 5.0F; - for (amy var26 : var22) { + for (amy var26 : (Iterable)var22) { var21 = this.renderIncomingRow(var1, var2, var21, var4, var7, var8, var9, var10, var26, var12, var13, var14, var15, var16, var18, var19); } - for (amy var39 : var23) { + for (amy var39 : (Iterable)var23) { var21 = this.renderOutgoingRow(var1, var2, var21, var4, var7, var8, var9, var10, var39, var12, var13, var14, var15, var16, var18, var19); } @@ -1967,7 +1967,7 @@ public class aaj { float var34 = 4.0F; float var35 = var12.height() + 2.5F; - for (amw var37 : var29) { + for (amw var37 : (Iterable)var29) { String var38 = agf.decode(var37.text()); if (var38 != null) { var31 += this.renderPhotoBubble(var1, var7, var37, var38, var2, var31, var4, var6, var8, var9) + 4.0F; @@ -1975,7 +1975,7 @@ public class aaj { List var39 = this.wrapText(var12, var37.text() == null ? "" : var37.text(), var32 - var33 * 2.0F); float var40 = 0.0F; - for (String var42 : var39) { + for (String var42 : (Iterable)var39) { var40 = Math.max(var40, var12.width(var42)); } @@ -1986,7 +1986,7 @@ public class aaj { var1.drawRoundedRect(var43, var31, var57, var59, asj.all(oc.ROW), var44); float var45 = var31 + var34; - for (String var47 : var39) { + for (String var47 : (Iterable)var39) { var1.drawText(var12, var47, var43 + var33, var45, var14); var45 += var35; } diff --git a/src/main/java/defpackage/abs.java b/src/main/java/defpackage/abs.java index b3da7b5..f795723 100644 --- a/src/main/java/defpackage/abs.java +++ b/src/main/java/defpackage/abs.java @@ -138,7 +138,7 @@ public class abs extends aax { var1.clipScroll(var6, var7 + 18.0F + var15, var6 + var8, var7 + var9 - var15, ars.edgeFade()); int var23 = 0; - for (Block var25 : var13) { + for (Block var25 : (Iterable)var13) { if (var25 != Blocks.AIR) { var23++; if (var16 < var7) { diff --git a/src/main/java/defpackage/acf.java b/src/main/java/defpackage/acf.java index dcca11f..2df761b 100644 --- a/src/main/java/defpackage/acf.java +++ b/src/main/java/defpackage/acf.java @@ -23,6 +23,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Optional; import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; import net.minecraft.client.gui.render.TextureSetup; import net.minecraft.client.renderer.BindGroupLayouts; import net.minecraft.client.renderer.texture.DynamicTexture; @@ -173,7 +174,7 @@ final class acf { String[] var5 = null; int var6 = 0; int var7 = 0; - Object var8 = null; + String var8 = null; String var9 = null; String var10 = null; Identifier var11 = null; @@ -582,7 +583,7 @@ final class acf { } private static Optional resolve(String var0) { - Optional var1 = FabricLoader.getInstance().getModContainer("evolutiondlc"); + Optional var1 = FabricLoader.getInstance().getModContainer("evolutiondlc"); return var1.flatMap(var1x -> var1x.findPath(var0)).filter(var0x -> Files.isRegularFile(var0x)); } } diff --git a/src/main/java/defpackage/adf.java b/src/main/java/defpackage/adf.java index 38b5a8d..b8c81da 100644 --- a/src/main/java/defpackage/adf.java +++ b/src/main/java/defpackage/adf.java @@ -295,9 +295,9 @@ public final class adf { switch (var9) { case 261590112: var8 = var2.getOrDefault(var3, DEFAULT_BASE); - var7.setRotX(((Object[])var8)[0] + (float)Math.toRadians(-var4)); - var7.setRotY(((Object[])var8)[1] + (float)Math.toRadians(-var5)); - var7.setRotZ(((Object[])var8)[2] + (float)Math.toRadians(var6)); + var7.setRotX(((float[])var8)[0] + (float)Math.toRadians(-var4)); + var7.setRotY(((float[])var8)[1] + (float)Math.toRadians(-var5)); + var7.setRotZ(((float[])var8)[2] + (float)Math.toRadians(var6)); return; case 448653730: default: diff --git a/src/main/java/defpackage/ado.java b/src/main/java/defpackage/ado.java index 504b7f2..0bc89ae 100644 --- a/src/main/java/defpackage/ado.java +++ b/src/main/java/defpackage/ado.java @@ -144,7 +144,7 @@ public final class ado { int var2 = 0; try (Stream var3 = Files.list(cosmeticsDir())) { - for (Path var6 : var3.filter(var0x -> var0x.toString().toLowerCase().endsWith(".json")).sorted().collect(Collectors.toList())) { + for (Path var6 : (Iterable)var3.filter(var0x -> var0x.toString().toLowerCase().endsWith(".json")).sorted().collect(Collectors.toList())) { try { adr var7 = adq.getInstance().register(Files.readString(var6)); if (var7 != null && var1 != null) { diff --git a/src/main/java/defpackage/adv.java b/src/main/java/defpackage/adv.java index a4968f9..2a7444e 100644 --- a/src/main/java/defpackage/adv.java +++ b/src/main/java/defpackage/adv.java @@ -780,15 +780,15 @@ public class adv { case -1902985971: var12 = this.interpolate(var10.scale, var6); var9.setScaleX( - var11[6] * ((Object[])var12)[0] + var11[6] * ((float[])var12)[0] ); var9.setScaleY( var11[7] - * ((Object[])var12)[1] + * ((float[])var12)[1] ); var9.setScaleZ( var11[8] - * ((Object[])var12)[2] + * ((float[])var12)[2] ); var13 = 1452085331; break; @@ -834,15 +834,15 @@ public class adv { var12 = this.interpolate(var10.rotation, var6); var9.setRotX( var11[0] - + (float)Math.toRadians(-((Object[])var12)[0]) + + (float)Math.toRadians(-((float[])var12)[0]) ); var9.setRotY( var11[1] - + (float)Math.toRadians(-((Object[])var12)[1]) + + (float)Math.toRadians(-((float[])var12)[1]) ); var9.setRotZ( var11[2] - + (float)Math.toRadians(((Object[])var12)[2]) + + (float)Math.toRadians(((float[])var12)[2]) ); var13 = -1278537934; break; @@ -853,15 +853,15 @@ public class adv { case -603703171: var12 = this.interpolate(var10.position, var6); var9.setOffsetX( - var11[3] + ((Object[])var12)[0] + var11[3] + ((float[])var12)[0] ); var9.setOffsetY( var11[4] - + ((Object[])var12)[1] + + ((float[])var12)[1] ); var9.setOffsetZ( var11[5] - + ((Object[])var12)[2] + + ((float[])var12)[2] ); var13 = -156622144; break; @@ -904,8 +904,8 @@ public class adv { var13 = -86797898; break; case 424189295: - var10 = (adt)var8.getValue(); - var11 = (float[])var4.get(var8.getKey()); + var10 = (adt)((Entry)var8).getValue(); + var11 = (float[])var4.get(((Entry)var8).getKey()); if (var11 == null) { var13 = -1767076087; } else { @@ -935,7 +935,7 @@ public class adv { break; case 1578411129: var8 = (Entry)var7.next(); - var9 = var1.findPart((String)var8.getKey()).orElse(null); + var9 = var1.findPart((String)((Entry)var8).getKey()).orElse(null); if (var9 == null) { var13 = 1056374449; } else { diff --git a/src/main/java/defpackage/afp.java b/src/main/java/defpackage/afp.java index 62c31de..e914e58 100644 --- a/src/main/java/defpackage/afp.java +++ b/src/main/java/defpackage/afp.java @@ -544,7 +544,7 @@ public final class afp { if (!var2.isEmpty()) { JsonArray var3 = new JsonArray(); - for (agh var5 : var2) { + for (agh var5 : (Iterable)var2) { var3.add(toJson(var5)); } @@ -555,7 +555,7 @@ public final class afp { if (!var15.isEmpty()) { JsonArray var16 = new JsonArray(); - for (String var6 : var15) { + for (String var6 : (Iterable)var15) { var16.add(var6); } @@ -578,7 +578,7 @@ public final class afp { if (!var21.isEmpty()) { JsonArray var7 = new JsonArray(); - for (aga var9 : var21) { + for (aga var9 : (Iterable)var21) { var7.add(toJson(var9)); } @@ -589,7 +589,7 @@ public final class afp { if (!var22.isEmpty()) { JsonArray var23 = new JsonArray(); - for (String var10 : var22) { + for (String var10 : (Iterable)var22) { var23.add(var10); } @@ -634,7 +634,7 @@ public final class afp { try { JsonObject var25 = JsonParser.parseString(var11.body()).getAsJsonObject(); long var14 = longOf(var25.get("at")); - int var16x = var29 && booleanOf(var25.get("full")) + int var16x = var29 != 0 && booleanOf(var25.get("full")) ? 1: 0; JsonArray var17x = arrayOf(var25.get("tripods")); JsonArray var18 = arrayOf(var25.get("gone")); @@ -644,7 +644,7 @@ public final class afp { JsonArray var22x = arrayOf(var25.get("goneFrames")); wantedPhotos.removeAll(var27); var0.execute(() -> { - apply(var30, var13, var31, var16x, var14, var17x, var18, var19x, var21x, var22x); + apply(var30, var13, var31, (var16x != 0), var14, var17x, var18, var19x, var21x, var22x); requestInFlight = (boolean)(((0)) != 0); }); acceptPhotos(var20x); diff --git a/src/main/java/defpackage/agt.java b/src/main/java/defpackage/agt.java index c13005c..6931234 100644 --- a/src/main/java/defpackage/agt.java +++ b/src/main/java/defpackage/agt.java @@ -66,7 +66,7 @@ public class agt { break; case -917800904: var11 = RenderTypes.entityTranslucent(var7); - var2.submitCustomGeometry(var1, var11, (var5x, var6x) -> this.renderMesh(var5x, var6x, var8, var9, var3, var10)); + var2.submitCustomGeometry(var1, var11, (var5x, var6x) -> this.renderMesh(var5x, var6x, var8, var9, var3, var10 != 0)); var1.popPose(); return; case -677573405: diff --git a/src/main/java/defpackage/agx.java b/src/main/java/defpackage/agx.java index b0fb379..eb4549c 100644 --- a/src/main/java/defpackage/agx.java +++ b/src/main/java/defpackage/agx.java @@ -395,10 +395,10 @@ public final class agx { JsonArray var15 = var13 != null && var13.isJsonArray() ? var13.getAsJsonArray() : new JsonArray(); JsonArray var16 = var14 != null && var14.isJsonArray() ? var14.getAsJsonArray() : new JsonArray(); JsonElement var17 = var9x.get("full"); - int var18 = var10 && var17 != null && var17.isJsonPrimitive() && var17.getAsBoolean() + int var18 = var10 != 0 && var17 != null && var17.isJsonPrimitive() && var17.getAsBoolean() ? 1: 0; var0.execute(() -> { - apply(var11, var7, var6, var18, var11x, var15, var16); + apply(var11, var7, var6, (var18 != 0), var11x, var15, var16); requestInFlight = (boolean)(((0)) != 0); }); } catch (RuntimeException var19) { diff --git a/src/main/java/defpackage/ahf.java b/src/main/java/defpackage/ahf.java index da962ab..224df2f 100644 --- a/src/main/java/defpackage/ahf.java +++ b/src/main/java/defpackage/ahf.java @@ -433,7 +433,7 @@ public final class ahf { if (!((Set)var4.getValue()).isEmpty()) { JsonArray var5 = new JsonArray(); - for (String var7 : (Set)var4.getValue()) { + for (String var7 : (Iterable)(Set)var4.getValue()) { var5.add(var7); } diff --git a/src/main/java/defpackage/ahi.java b/src/main/java/defpackage/ahi.java index ba45988..bde0196 100644 --- a/src/main/java/defpackage/ahi.java +++ b/src/main/java/defpackage/ahi.java @@ -128,7 +128,7 @@ final class ahi { ? var1.get("animation_length").getAsFloat() : var4; return new ahq( - var0, Math.max(var13, 0.0F), var3.toArray(new aho[0]), soundTimes(var1), soundNames(var1) + var0, Math.max(var13, 0.0F), (aho[])var3.toArray(new aho[0]), soundTimes(var1), soundNames(var1) ); } @@ -214,7 +214,7 @@ final class ahi { boolean[] var7 = new boolean[var13]; int var8 = 0; - for (Entry var10 : var2.entrySet()) { + for (Entry var10 : (Iterable)var2.entrySet()) { var14[var8] = (Float)var10.getKey(); readKeyframe((JsonElement)var10.getValue(), var1, var5, var6, var7, var8); var8++; @@ -324,7 +324,7 @@ final class ahi { private static String[] soundNames(JsonObject var0) { TreeMap var1 = soundCues(var0); - return var1.values().toArray(new String[0]); + return (String[])var1.values().toArray(new String[0]); } private static TreeMap soundCues(JsonObject var0) { diff --git a/src/main/java/defpackage/ahn.java b/src/main/java/defpackage/ahn.java index a425c1a..ea2eef5 100644 --- a/src/main/java/defpackage/ahn.java +++ b/src/main/java/defpackage/ahn.java @@ -269,19 +269,19 @@ public final class ahn { while (true) { switch (var5) { case -2014019186: - if (var2.hasNext()) { + if (((Iterator)var2).hasNext()) { var5 = -1181043532; } else { var5 = -835192643; } break; case -1181043532: - var3 = (String)var2.next(); + var3 = (String)((Iterator)var2).next(); var0.findPart((String)var3).ifPresent(var0x -> var0x.setHidden((boolean)((((-1483769049 ^ 1483769050) + ((-1483769049 & 1483769050) << 1))) != 0))); var5 = -2014019186; break; case -1150538732: - if (var3.hasNext()) { + if (((Iterator)var3).hasNext()) { var5 = 1668534084; } else { var5 = 430657741; @@ -289,7 +289,7 @@ public final class ahn { break; case -835192643: var2 = var1.getVariants(); - if (var2.isEmpty()) { + if (((List)var2).isEmpty()) { var5 = -719553385; } else { var5 = -89224764; @@ -298,7 +298,7 @@ public final class ahn { case -719553385: return; case -89224764: - var3 = ((aht)var2.get((-506941109 ^ 506941109) + ((-506941109 & 506941109) << 1))).hiddenBones().iterator(); + var3 = ((aht)((List)var2).get((-506941109 ^ 506941109) + ((-506941109 & 506941109) << 1))).hiddenBones().iterator(); var5 = -1150538732; break; case 430657741: @@ -309,7 +309,7 @@ public final class ahn { var5 = -2014019186; break; case 1668534084: - var4 = (String)var3.next(); + var4 = (String)((Iterator)var3).next(); var0.findPart(var4).ifPresent(var0x -> var0x.setHidden((boolean)((((1410750931 | -1410750930) + (1410750931 & -1410750930))) != 0))); var5 = -1150538732; } @@ -722,7 +722,7 @@ public final class ahn { float var19 = var11 * var13; float var20 = -var10 * var13; float var21 = var12; - ArrayList var22 = new ArrayList(var0.size()); + ArrayList var22 = new ArrayList(var0.size()); for (float[] var24 : var0) { float[] var25 = new float[17]; diff --git a/src/main/java/defpackage/aid.java b/src/main/java/defpackage/aid.java index 3ab0bf0..d18fd32 100644 --- a/src/main/java/defpackage/aid.java +++ b/src/main/java/defpackage/aid.java @@ -277,14 +277,14 @@ public class aid { } break; case -847000344: - var6 = (JsonElement)var5.next(); + var6 = (JsonElement)((Iterator)var5).next(); var4.cubes.add(parseCube(var6.getAsJsonObject(), var1, var2, var3)); var7 = -588446941; break; case -681686443: return var4; case -588446941: - if (var5.hasNext()) { + if (((Iterator)var5).hasNext()) { var7 = -847000344; } else { var7 = -681686443; @@ -299,16 +299,16 @@ public class aid { break; case 1000403449: var5 = var0.getAsJsonArray("rotation"); - var4.setRotX((float)Math.toRadians(-var5.get(0).getAsFloat())); - var4.setRotY((float)Math.toRadians(-var5.get(1).getAsFloat())); - var4.setRotZ((float)Math.toRadians(var5.get(2).getAsFloat())); + var4.setRotX((float)Math.toRadians(-((JsonArray)var5).get(0).getAsFloat())); + var4.setRotY((float)Math.toRadians(-((JsonArray)var5).get(1).getAsFloat())); + var4.setRotZ((float)Math.toRadians(((JsonArray)var5).get(2).getAsFloat())); var7 = -1979139140; break; case 1406150778: var5 = var0.getAsJsonArray("pivot"); - var4.pivotX = -var5.get(0).getAsFloat(); - var4.pivotY = var5.get(1).getAsFloat(); - var4.pivotZ = var5.get(2).getAsFloat(); + var4.pivotX = -((JsonArray)var5).get(0).getAsFloat(); + var4.pivotY = ((JsonArray)var5).get(1).getAsFloat(); + var4.pivotZ = ((JsonArray)var5).get(2).getAsFloat(); var7 = 449761475; break; case 1776790773: @@ -633,14 +633,14 @@ public class aid { var23 = (var29 + var27.get(1).getAsFloat()) / var17; } else { String var30 = var0; - byte var33 = var18; + byte var33 = var18 ? 1 : 0; if (var19) { var30 = "north"; - var33 = (byte)(var18 == 0 - ? 1: (1597328994 | -1597328994) + (1597328994 & -1597328994)); - } else if (var18 != 0 && "east".equals(var0)) { + var33 = (byte)(!var18 + ? 1: 0); + } else if (var18 && "east".equals(var0)) { var30 = "west"; - } else if (var18 != 0 && "west".equals(var0)) { + } else if (var18 && "west".equals(var0)) { var30 = "east"; } diff --git a/src/main/java/defpackage/aiq.java b/src/main/java/defpackage/aiq.java index ce6f821..8cfe358 100644 --- a/src/main/java/defpackage/aiq.java +++ b/src/main/java/defpackage/aiq.java @@ -178,7 +178,7 @@ public final class aiq { if (!var9.isEmpty()) { JsonArray var10 = new JsonArray(); - for (String var12 : var9) { + for (String var12 : (Iterable)var9) { var10.add(var12); } @@ -187,7 +187,7 @@ public final class aiq { JsonArray var17 = new JsonArray(); - for (String var20 : var4.keySet()) { + for (String var20 : (Iterable)var4.keySet()) { var17.add(var20); } diff --git a/src/main/java/defpackage/ajm.java b/src/main/java/defpackage/ajm.java index 2b01cb4..a2d1d07 100644 --- a/src/main/java/defpackage/ajm.java +++ b/src/main/java/defpackage/ajm.java @@ -19,6 +19,6 @@ class ajm implements ajv { /* JADX WARN: Type inference failed for: r0v2, types: [boolean, int] */ @Override // defpackage.ajv public boolean cancelled() { - return 0; + return false; } } diff --git a/src/main/java/defpackage/ajn.java b/src/main/java/defpackage/ajn.java index 60d80c4..e018a2f 100644 --- a/src/main/java/defpackage/ajn.java +++ b/src/main/java/defpackage/ajn.java @@ -321,29 +321,29 @@ public final class ajn implements aji, ajk { this.io .execute( () -> { - if (!var2 && this.systemAudio != null) { + if (var2 == 0 && this.systemAudio != null) { this.systemAudio.close(); this.systemAudio = null; } - if (!var3 && this.microphoneAudio != null) { + if (var3 == 0 && this.microphoneAudio != null) { this.microphoneAudio.close(); this.microphoneAudio = null; } - if (var3 && this.microphoneAudio == null) { + if (var3 != 0 && this.microphoneAudio == null) { this.microphoneAudio = this.openAudio(1, var5); this.microphoneFailed = (boolean)(((this.microphoneAudio == null ? 1: (1683764292 ^ -1683764292) + ((1683764292 & -1683764292) << 1))) != 0); } - if (var2 && this.systemAudio == null) { + if (var2 != 0 && this.systemAudio == null) { if (var4 == null) { this.systemAudioFailed = (boolean)(((1)) != 0); notifyStatus( "game audio needs a loopback device" ); - } else if (var6 && this.microphoneAudio != null) { + } else if (var6 != 0 && this.microphoneAudio != null) { this.systemAudioFailed = (boolean)(((1)) != 0); notifyStatus("game audio needs a loopback device"); } else { diff --git a/src/main/java/defpackage/ajq.java b/src/main/java/defpackage/ajq.java index aaa6668..4cba7f5 100644 --- a/src/main/java/defpackage/ajq.java +++ b/src/main/java/defpackage/ajq.java @@ -110,7 +110,7 @@ public final class ajq implements AutoCloseable { Info[] var1 = null; int var2 = 0; int var3 = 0; - Object var4 = null; + Info var4 = null; int var5 = 1553993991; while (true) { diff --git a/src/main/java/defpackage/ajx.java b/src/main/java/defpackage/ajx.java index 006344c..5dc2d95 100644 --- a/src/main/java/defpackage/ajx.java +++ b/src/main/java/defpackage/ajx.java @@ -102,7 +102,7 @@ public final class ajx { break; } - for (ByteBuffer var25 : await(var32)) { + for (ByteBuffer var25 : (Iterable)await(var32)) { var16.addFrame( Packet.createPacket( var25, diff --git a/src/main/java/defpackage/akd.java b/src/main/java/defpackage/akd.java index adf4d71..0084cb6 100644 --- a/src/main/java/defpackage/akd.java +++ b/src/main/java/defpackage/akd.java @@ -41,7 +41,7 @@ public final class akd { ArrayList var1 = new ArrayList(); try (Stream var2 = Files.list(this.root)) { - for (Path var4 : var2.toList()) { + for (Path var4 : (Iterable)var2.toList()) { if (var4.getFileName().toString().endsWith(".evoclip")) { try { var1.add(aka.readMeta(var4)); diff --git a/src/main/java/defpackage/akt.java b/src/main/java/defpackage/akt.java index f8590c3..164806b 100644 --- a/src/main/java/defpackage/akt.java +++ b/src/main/java/defpackage/akt.java @@ -825,7 +825,7 @@ public final class akt { List var1 = tickets; ArrayList var2 = new ArrayList(var1.size()); - for (akw var4 : var1) { + for (akw var4 : (Iterable)var1) { var2.add(var4.id().equals(var0.id()) ? var0 : var4); } diff --git a/src/main/java/defpackage/akz.java b/src/main/java/defpackage/akz.java index b6c7908..bd8d78e 100644 --- a/src/main/java/defpackage/akz.java +++ b/src/main/java/defpackage/akz.java @@ -107,7 +107,7 @@ public final class akz { File[] var2 = null; int var3 = 0; int var4 = 0; - Object var5 = null; + File var5 = null; int var6 = 84688211; while (true) { @@ -446,7 +446,7 @@ public final class akz { var40, var41, var42, - var44.toArray(new BlockState[0]), + (BlockState[])var44.toArray(new BlockState[0]), var43, var45.unknown, var45.example @@ -519,7 +519,7 @@ public final class akz { var3, var4, var5, - var20.toArray(new BlockState[0]), + (BlockState[])var20.toArray(new BlockState[0]), var22, var21.unknown, var21.example @@ -583,7 +583,7 @@ public final class akz { var3, var4, var5, - var7.toArray(new BlockState[0]), + (BlockState[])var7.toArray(new BlockState[0]), var19, var8.unknown, var8.example @@ -790,7 +790,7 @@ public final class akz { String[] var6 = null; int var7 = 0; int var8 = 0; - Object var9 = null; + String var9 = null; int var10 = 0; Property var11 = null; int var12 = 1038524668; diff --git a/src/main/java/defpackage/ald.java b/src/main/java/defpackage/ald.java index 961cdd1..6e72bdf 100644 --- a/src/main/java/defpackage/ald.java +++ b/src/main/java/defpackage/ald.java @@ -102,7 +102,7 @@ public final class ald { ArrayList var6 = new ArrayList(); ArrayList var7 = new ArrayList(); - for (BlockStateModelPart var9 : var5) { + for (BlockStateModelPart var9 : (Iterable)var5) { collect(var9.getQuads(null), null, var6, var7); Direction[] var10 = Direction.values(); int var11 = var10.length; @@ -124,7 +124,7 @@ public final class ald { } return new alc( - var6.toArray(new BakedQuad[0]), + (BakedQuad[])var6.toArray(new BakedQuad[0]), var7.toArray(new Direction[0]), var15 ); diff --git a/src/main/java/defpackage/an.java b/src/main/java/defpackage/an.java index 4a5a932..84b3345 100644 --- a/src/main/java/defpackage/an.java +++ b/src/main/java/defpackage/an.java @@ -73,7 +73,7 @@ public class an implements SimpleSynchronousResourceReloadListener { if (!var4.isEmpty()) { var5.append("\n-- PERSIST VARIABLES\n"); - for (String var17 : var4) { + for (String var17 : (Iterable)var4) { var5.append("registry:put('") .append(var17) .append("', ") diff --git a/src/main/java/defpackage/anb.java b/src/main/java/defpackage/anb.java index dd67cf6..1f6965d 100644 --- a/src/main/java/defpackage/anb.java +++ b/src/main/java/defpackage/anb.java @@ -571,7 +571,7 @@ public final class anb { List var14 = requestsOf(var0.getAsJsonArray("outgoing")); HashSet var15 = new HashSet(); - for (amy var6 : var13) { + for (amy var6 : (Iterable)var13) { String var7 = var6.username().toLowerCase(Locale.ROOT); var15.add(var7); if (!knownIncoming.contains(var7)) { @@ -620,7 +620,7 @@ public final class anb { var16.add(var22.username().toLowerCase(Locale.ROOT)); } - for (amx var23 : var1) { + for (amx var23 : (Iterable)var1) { String var8 = var23.username().toLowerCase(Locale.ROOT); if (!var16.contains(var8) && knownOutgoing.contains(var8)) { popups.addLast(new amz(var23.username(), var23.uid(), ana.ACCEPTED)); @@ -629,11 +629,11 @@ public final class anb { knownOutgoing.clear(); - for (amy var24 : var14) { + for (amy var24 : (Iterable)var14) { knownOutgoing.add(var24.username().toLowerCase(Locale.ROOT)); } - for (amx var25 : var1) { + for (amx var25 : (Iterable)var1) { String var27 = var25.username().toLowerCase(Locale.ROOT); int var9 = knownUnread.getOrDefault(var27, (-1366122340 | 1366122340) + (-1366122340 & 1366122340)); if (unreadSeeded && var25.unread() > var9) { @@ -684,7 +684,7 @@ public final class anb { knownUnread.clear(); - for (amx var26 : var1) { + for (amx var26 : (Iterable)var1) { knownUnread.put(var26.username().toLowerCase(Locale.ROOT), var26.unread()); } diff --git a/src/main/java/defpackage/anh.java b/src/main/java/defpackage/anh.java index 05b34ee..a3260f2 100644 --- a/src/main/java/defpackage/anh.java +++ b/src/main/java/defpackage/anh.java @@ -186,7 +186,7 @@ public final class anh { long var3 = System.currentTimeMillis(); int var5 = !var2.closed && var3 - var2.freshAt < (-5357116138896366260L ^ 5357116138896368760L) + ((-5357116138896366260L & 5357116138896368760L) << 1) ? 1: 0; - if (var5 != var2.visible) { + if ((var5 != 0) != var2.visible) { var2.visible = (boolean)((var5) != 0); if (var5 != 0) { var2.shownAt = var3; diff --git a/src/main/java/defpackage/anl.java b/src/main/java/defpackage/anl.java index 7b6524b..4b09703 100644 --- a/src/main/java/defpackage/anl.java +++ b/src/main/java/defpackage/anl.java @@ -142,8 +142,8 @@ public final class anl { while (true) { switch (var4x) { case -987885831: - sharing = var1; - if (!var1) { + sharing = var1 != 0; + if (var1 == 0) { var4x = 1151430026; } else { var4x = 209770207; diff --git a/src/main/java/defpackage/ans.java b/src/main/java/defpackage/ans.java index 8fa3268..aebb174 100644 --- a/src/main/java/defpackage/ans.java +++ b/src/main/java/defpackage/ans.java @@ -756,7 +756,7 @@ final class ans { } } - for (ByteBuffer var29 : var12) { + for (ByteBuffer var29 : (Iterable)var12) { int var31 = var29.getInt(); int var16 = var31 & 16777215; int var17 = var29.getInt(); diff --git a/src/main/java/defpackage/anu.java b/src/main/java/defpackage/anu.java index 13c063e..3f07d91 100644 --- a/src/main/java/defpackage/anu.java +++ b/src/main/java/defpackage/anu.java @@ -37,7 +37,7 @@ class anu extends LinkedHashMap { i3 = 67660160; break; case 2114087835: - return i; + return i != 0; } } } diff --git a/src/main/java/defpackage/aod.java b/src/main/java/defpackage/aod.java index 3298d71..047646d 100644 --- a/src/main/java/defpackage/aod.java +++ b/src/main/java/defpackage/aod.java @@ -726,7 +726,7 @@ public final class aod { var6 = var8; this.texture = null; this.display = null; - daemon(() -> this.reap(var4, var5, var3, var6), "EvoWatchReaper-" + this.serial); + daemon(() -> this.reap(var4, var5, var3, var6 != 0), "EvoWatchReaper-" + this.serial); return; } } @@ -792,7 +792,7 @@ public final class aod { } break; case 1840619191: - if (!var5) { + if (var5 == 0) { var6x = 578258790; } else { var6x = -339008966; diff --git a/src/main/java/defpackage/apm.java b/src/main/java/defpackage/apm.java index cc8a8d5..62810e1 100644 --- a/src/main/java/defpackage/apm.java +++ b/src/main/java/defpackage/apm.java @@ -168,7 +168,7 @@ public final class apm implements aqg { } break; case 938843723: - return new Input((boolean)var4, (boolean)var5, (boolean)(((var6) != 0)), (boolean)((var7) != 0), var0.jump(), var0.shift(), var0.sprint()); + return new Input((var4 != 0), (var5 != 0), (boolean)(((var6) != 0)), (boolean)((var7) != 0), var0.jump(), var0.shift(), var0.sprint()); case 1368526186: if (var1 <= 0.0F - var3) { var8 = -870694256; diff --git a/src/main/java/defpackage/atf.java b/src/main/java/defpackage/atf.java index 83c5c8f..190d045 100644 --- a/src/main/java/defpackage/atf.java +++ b/src/main/java/defpackage/atf.java @@ -915,7 +915,7 @@ public final class atf { var10.setUniform("DynamicTransforms", var12); } - if (uniformOffsets[var20] != var13 || shapeCommands[var20] != var14) { + if (uniformOffsets[var20] != var13 || (shapeCommands[var20] ? 1 : 0) != var14) { var13 = uniformOffsets[var20]; var14 = (shapeCommands[var20]) ? 1 : 0; if (var14 != 0) { diff --git a/src/main/java/defpackage/aua.java b/src/main/java/defpackage/aua.java index 1d7adf6..9cc1124 100644 --- a/src/main/java/defpackage/aua.java +++ b/src/main/java/defpackage/aua.java @@ -98,7 +98,7 @@ public final class aua { var2 = new ArrayList(); collect(var0, -1, var1, var2); var3 = var1.size(); - var4 = var1.toArray(new ModelPart[0]); + var4 = (ModelPart[])var1.toArray(new ModelPart[0]); var5 = new int[var3]; var6 = new boolean[var3]; var7 = new float[var3 * (6)]; @@ -154,11 +154,11 @@ public final class aua { Polygon[] var12 = null; int var13 = 0; int var14 = 0; - Object var15 = null; + Polygon var15 = null; Vertex[] var16 = null; int var17 = 0; int var18 = 0; - Object var19 = null; + Vertex var19 = null; float var20 = 0.0F; float var21 = 0.0F; float var22 = 0.0F; diff --git a/src/main/java/defpackage/auk.java b/src/main/java/defpackage/auk.java index e3a1a5c..ac546e3 100644 --- a/src/main/java/defpackage/auk.java +++ b/src/main/java/defpackage/auk.java @@ -41,7 +41,7 @@ public final class auk implements aqg { public static void onEventRender3D(PoseStack var0) { Pose var1 = null; - Set var2 = null; + Set var2 = null; RenderType var3 = null; int var4 = 1248530243; diff --git a/src/main/java/defpackage/aul.java b/src/main/java/defpackage/aul.java index acffbbe..1f8f46e 100644 --- a/src/main/java/defpackage/aul.java +++ b/src/main/java/defpackage/aul.java @@ -245,7 +245,7 @@ public class aul { return; case -1482513476: var0 = var2; - if (var0 == shaderPackConflict) { + if ((var0 != 0) == shaderPackConflict) { var1 = -1629943270; } else { var1 = 1489168569; diff --git a/src/main/java/defpackage/auv.java b/src/main/java/defpackage/auv.java index 731b89c..33edd9c 100644 --- a/src/main/java/defpackage/auv.java +++ b/src/main/java/defpackage/auv.java @@ -328,7 +328,7 @@ final class auv { Direction[] var5 = null; int var6 = 0; int var7 = 0; - Object var8 = null; + Direction var8 = null; VoxelShape var9 = null; int var10 = 1045582906; diff --git a/src/main/java/defpackage/bn.java b/src/main/java/defpackage/bn.java index f0649f5..2bfe63c 100644 --- a/src/main/java/defpackage/bn.java +++ b/src/main/java/defpackage/bn.java @@ -238,7 +238,7 @@ public class bn { break; case -285046518: default: - var2 = ((x)var1).hMI5_0$getTransform(); + var2 = ((x)(Object)var1).hMI5_0$getTransform(); if (var2 == 0) { var3 = -1920500867; } else { @@ -292,7 +292,7 @@ public class bn { @ab public void setTranslate(ItemStack var1, boolean var2) { - ((x)var1).hMI5_0$setTransform(var2); + ((x)(Object)var1).hMI5_0$setTransform(var2); } @ab @@ -302,7 +302,7 @@ public class bn { while (true) { switch (var3) { case -1332912432: - ((x)var1).hMI5_0$setRenderAsBlock(var2); + ((x)(Object)var1).hMI5_0$setRenderAsBlock(var2); var3 = 1518619957; break; case -831656360: @@ -355,7 +355,7 @@ public class bn { var3 = -459968272; break; case 2058373701: - var2 = ((x)var1).hMI5_0$getRenderAsBlock(); + var2 = ((x)(Object)var1).hMI5_0$getRenderAsBlock(); if (var2 != (1348085360 ^ -1348085359) + ((1348085360 & -1348085359) << 1)) { var3 = 1329985302; } else { @@ -407,7 +407,7 @@ public class bn { @ab public void setSwingSpeed(ItemStack var1, double var2) { - ((x)var1).hMI5_0$setSwingSpeed((int)var2); + ((x)(Object)var1).hMI5_0$setSwingSpeed((int)var2); } @ab @@ -530,7 +530,7 @@ public class bn { break; case -1381029911: var9 = var14; - return new ad((boolean)var8, (boolean)var7, (boolean)(((var6) != 0)), (boolean)((var9) != 0)); + return new ad((var8 != 0), (var7 != 0), (boolean)(((var6) != 0)), (boolean)((var9) != 0)); case -1305649085: var11 = 0; var10 = -1691378727; diff --git a/src/main/java/defpackage/bt.java b/src/main/java/defpackage/bt.java index b3827e9..a9fb9e1 100644 --- a/src/main/java/defpackage/bt.java +++ b/src/main/java/defpackage/bt.java @@ -10,7 +10,7 @@ public class bt { Method[] var1 = null; int var2 = 0; int var3 = 0; - Object var4 = null; + Method var4 = null; int var5 = 1261856253; while (true) { diff --git a/src/main/java/defpackage/bx.java b/src/main/java/defpackage/bx.java index 3ad4da0..de61613 100644 --- a/src/main/java/defpackage/bx.java +++ b/src/main/java/defpackage/bx.java @@ -10,7 +10,7 @@ public class bx { Method[] var2 = null; int var3 = 0; int var4 = 0; - Object var5 = null; + Method var5 = null; int var6 = 1325595316; while (true) { diff --git a/src/main/java/defpackage/cc.java b/src/main/java/defpackage/cc.java index a969ef6..dfaf1b2 100644 --- a/src/main/java/defpackage/cc.java +++ b/src/main/java/defpackage/cc.java @@ -8,7 +8,7 @@ public class cc { Field[] var1 = null; int var2 = 0; int var3 = 0; - Object var4 = null; + Field var4 = null; int var5 = -1501017338; while (true) { diff --git a/src/main/java/defpackage/cm.java b/src/main/java/defpackage/cm.java index 1148c6e..c8831c1 100644 --- a/src/main/java/defpackage/cm.java +++ b/src/main/java/defpackage/cm.java @@ -158,7 +158,7 @@ public final class cm implements Closeable { String[] var2 = null; int var3 = 0; int var4 = 0; - Object var5 = null; + String var5 = null; int var6 = 0; int var7 = 1105909696; diff --git a/src/main/java/defpackage/ed.java b/src/main/java/defpackage/ed.java index 0b1de79..f191f41 100644 --- a/src/main/java/defpackage/ed.java +++ b/src/main/java/defpackage/ed.java @@ -314,7 +314,7 @@ public class ed { File[] var4 = null; int var5 = 0; int var6 = 0; - Object var7 = null; + File var7 = null; String var8 = null; int var9 = -1491024630; diff --git a/src/main/java/defpackage/gq.java b/src/main/java/defpackage/gq.java index 20660c2..1256e85 100644 --- a/src/main/java/defpackage/gq.java +++ b/src/main/java/defpackage/gq.java @@ -79,7 +79,7 @@ public class gq { }); var6 = new Int2ObjectOpenHashMap(); var1.kernings().forEach(var1x -> { - Object var2x = null; + Int2FloatMap var2x = null; int var3x = 1404889885; while (true) { diff --git a/src/main/java/defpackage/gt.java b/src/main/java/defpackage/gt.java index a1a4fa2..994f313 100644 --- a/src/main/java/defpackage/gt.java +++ b/src/main/java/defpackage/gt.java @@ -501,7 +501,7 @@ public final class gt { var23 = 301801451; break; case -1438412070: - if (var21.hasNext()) { + if (((Iterator)var21).hasNext()) { var23 = 238928799; } else { var23 = 977001368; @@ -510,7 +510,7 @@ public final class gt { case -1057890108: return; case 238928799: - var22 = (gm)var21.next(); + var22 = (gm)((Iterator)var21).next(); var0.applyGlyphs( var4, var20, var22.text(), var2, var12 * 0.5F * var2, var14 - 0.3F, var19 - 0.75F, var6 + var2 * 0.7F, var7, scaleAlpha(var22.color(), var18) ); diff --git a/src/main/java/defpackage/hl.java b/src/main/java/defpackage/hl.java index 37690a4..d893070 100644 --- a/src/main/java/defpackage/hl.java +++ b/src/main/java/defpackage/hl.java @@ -91,7 +91,7 @@ public final class hl { var7 = new ArrayList(var7.subList(0, (-1298972115 | 1298972123) + (-1298972115 & 1298972123))); } - for (hh var9 : var7) { + for (hh var9 : (Iterable)var7) { var9.count = Math.min(var9.count, usableCount(var9.key.nutrition())); } @@ -167,7 +167,7 @@ public final class hl { ArrayList var22 = new ArrayList(var20.size()); - for (he var25 : var20) { + for (he var25 : (Iterable)var20) { var22.add(var25.toStep()); } diff --git a/src/main/java/defpackage/hn.java b/src/main/java/defpackage/hn.java index cb82421..3483a7d 100644 --- a/src/main/java/defpackage/hn.java +++ b/src/main/java/defpackage/hn.java @@ -562,7 +562,7 @@ public final class hn { var9 = 0; - for (hu var18 : var6) { + for (hu var18 : (Iterable)var6) { if (!var18.isAssigned()) { while (var9 < var8.length && var8[var9] != (-1544858472 ^ 1544858471) + ((-1544858472 & 1544858471) << 1)) { var9++; diff --git a/src/main/java/defpackage/im.java b/src/main/java/defpackage/im.java index 9e7a7af..dbdde2b 100644 --- a/src/main/java/defpackage/im.java +++ b/src/main/java/defpackage/im.java @@ -47,7 +47,7 @@ final class im { StackTraceElement[] var2 = null; int var3 = 0; int var4 = 0; - Object var5 = null; + StackTraceElement var5 = null; String var7 = null; int var6 = -2097196902; @@ -184,7 +184,7 @@ final class im { break; case 1227166750: var0.append("\n at ").append(var9); - var4 |= var9.getClassName().startsWith("evo."); + var4 |= var9.getClassName().startsWith("evo.") ? 1 : 0; var5++; var8++; var10 = -791550697; diff --git a/src/main/java/defpackage/j.java b/src/main/java/defpackage/j.java index c30ce3c..1c9fdac 100644 --- a/src/main/java/defpackage/j.java +++ b/src/main/java/defpackage/j.java @@ -492,14 +492,14 @@ public final class j { List var1 = REGISTRY_MAP.get(var0.getClass()); if (var1 != null) { if (var0 instanceof n var2) { - for (i var4 : var1) { + for (i var4 : (Iterable)var1) { invoke(var4, var0); if (var2.isStopped()) { break; } } } else { - for (i var6 : var1) { + for (i var6 : (Iterable)var1) { invoke(var6, var0); } } diff --git a/src/main/java/defpackage/jb.java b/src/main/java/defpackage/jb.java index bffb680..13e498e 100644 --- a/src/main/java/defpackage/jb.java +++ b/src/main/java/defpackage/jb.java @@ -18,7 +18,7 @@ class jb extends LinkedHashMap { while (true) { switch (i2 + (i3 & i4)) { case -1668384651: - return i; + return i != 0; case 1703429858: default: if (size() <= ((-1314746602) | 1314746650) + ((-1314746602) & 1314746650)) { diff --git a/src/main/java/defpackage/je.java b/src/main/java/defpackage/je.java index 2225ac2..2145d5a 100644 --- a/src/main/java/defpackage/je.java +++ b/src/main/java/defpackage/je.java @@ -409,7 +409,7 @@ public final class je { return null; } - ArrayList var1 = new ArrayList(); + ArrayList var1 = new ArrayList(); ArrayList var2 = new ArrayList(); String[] var3 = var0.split("\n"); int var4 = var3.length; @@ -418,7 +418,7 @@ public final class je { String var6 = var3[var5]; Matcher var7 = TIMESTAMP.matcher(var6); int var8 = 0; - ArrayList var9 = new ArrayList((-1779895536 | 1779895537) + (-1779895536 & 1779895537)); + ArrayList var9 = new ArrayList((-1779895536 | 1779895537) + (-1779895536 & 1779895537)); while (var7.find() && var7.start() == var8) { var9.add(toMillis(var7)); @@ -428,7 +428,7 @@ public final class je { if (!var9.isEmpty()) { String var10 = clean(var6.substring(var8)); - for (long var12 : var9) { + for (long var12 : (Iterable)var9) { long[] var10001 = new long[2]; var10001[0] = var12; var10001[1] = var2.size(); diff --git a/src/main/java/defpackage/jt.java b/src/main/java/defpackage/jt.java index 161bfac..654d4cc 100644 --- a/src/main/java/defpackage/jt.java +++ b/src/main/java/defpackage/jt.java @@ -252,7 +252,7 @@ final class jt implements iy { js var2 = null; js var3 = null; - for (js var5 : var1) { + for (js var5 : (Iterable)var1) { if (var2 == null && var5.source().equals(this.lastSource)) { var2 = var5; } @@ -273,7 +273,7 @@ final class jt implements iy { Pointer var9 = var8 != null ? var8.session() : null; - for (js var7 : var1) { + for (js var7 : (Iterable)var1) { if (var7 != var8) { jp.release(var7.session()); } @@ -339,7 +339,7 @@ final class jt implements iy { } } } catch (RuntimeException var12) { - for (js var5 : var2) { + for (js var5 : (Iterable)var2) { jp.release(var5.session()); } diff --git a/src/main/java/defpackage/jz.java b/src/main/java/defpackage/jz.java index 7deebd9..fb3c01d 100644 --- a/src/main/java/defpackage/jz.java +++ b/src/main/java/defpackage/jz.java @@ -28,7 +28,7 @@ final class jz { static kp parse(String var0) { if (var0 != null && !var0.isBlank()) { - ArrayList var1 = new ArrayList(); + ArrayList var1 = new ArrayList(); ArrayList var2 = new ArrayList(); String[] var3 = var0.split("\\R"); int var4 = var3.length; @@ -37,7 +37,7 @@ final class jz { String var6 = var3[var5]; Matcher var7 = TIMESTAMP.matcher(var6); int var8 = 0; - ArrayList var9 = new ArrayList((-1524364098 ^ 1524364099) + ((-1524364098 & 1524364099) << 1)); + ArrayList var9 = new ArrayList((-1524364098 ^ 1524364099) + ((-1524364098 & 1524364099) << 1)); while (var7.find() && var7.start() == var8) { var9.add(toMillis(var7)); @@ -47,7 +47,7 @@ final class jz { if (!var9.isEmpty()) { String var10 = clean(var6.substring(var8)); - for (long var12 : var9) { + for (long var12 : (Iterable)var9) { long[] var10001 = new long[2]; var10001[0] = var12; var10001[1] = var2.size(); diff --git a/src/main/java/defpackage/ka.java b/src/main/java/defpackage/ka.java index d134b5d..b199e04 100644 --- a/src/main/java/defpackage/ka.java +++ b/src/main/java/defpackage/ka.java @@ -75,7 +75,7 @@ final class ka { JsonObject var17 = null; double var18 = 0.6; - for (String var7 : var16) { + for (String var7 : (Iterable)var16) { String var8 = var1.get(var7, HEADERS); if (var8 != null) { JsonElement var9 = JsonParser.parseString(var8); diff --git a/src/main/java/defpackage/kk.java b/src/main/java/defpackage/kk.java index 68815d3..9204f5c 100644 --- a/src/main/java/defpackage/kk.java +++ b/src/main/java/defpackage/kk.java @@ -22,7 +22,7 @@ class kk extends LinkedHashMap { i3 = 2327432; break; case -1084522617: - return i; + return i != 0; case 587742112: i = 1; i2 = 1050374215; diff --git a/src/main/java/defpackage/ko.java b/src/main/java/defpackage/ko.java index 852d6f0..797087f 100644 --- a/src/main/java/defpackage/ko.java +++ b/src/main/java/defpackage/ko.java @@ -45,14 +45,14 @@ final class ko { ); long var10 = (2916234754845133482L | -2916234754845133482L) + (2916234754845133482L & -2916234754845133482L); - for (String var13 : var3) { + for (String var13 : (Iterable)var3) { var10 += Math.max(6, var13.length()); } ArrayList var22 = new ArrayList(var3.size()); long var23 = var20; - for (String var16 : var3) { + for (String var16 : (Iterable)var3) { long var17 = var21 * Math.max(6, var16.length()) / var10; var22.add(new kb(var23, var23 + var17, var16)); var23 += var17; diff --git a/src/main/java/defpackage/ld.java b/src/main/java/defpackage/ld.java index 752cd9d..c5e42c0 100644 --- a/src/main/java/defpackage/ld.java +++ b/src/main/java/defpackage/ld.java @@ -278,7 +278,7 @@ public final class ld { var9x == null ? var7x.statusCode() : var9x.toString() ); HttpResponse var10 = var9x == null ? var7x : var4; - if (!var6) { + if (var6 == 0) { return attempt(var0, var1, var2, var3 + 1, var10); } else { return var10 != null ? CompletableFuture.completedFuture(var10) : CompletableFuture.failedFuture(var9x); diff --git a/src/main/java/defpackage/mk.java b/src/main/java/defpackage/mk.java index 99932d8..767e02c 100644 --- a/src/main/java/defpackage/mk.java +++ b/src/main/java/defpackage/mk.java @@ -129,7 +129,7 @@ public final class mk { ArrayList var1 = new ArrayList(); try (DirectoryStream var2 = Files.newDirectoryStream(var0)) { - for (Path var4 : var2) { + for (Path var4 : (Iterable)var2) { if (Files.isRegularFile(var4) && hasOggSuffix(var4)) { var1.add(var4); } diff --git a/src/main/java/defpackage/mr.java b/src/main/java/defpackage/mr.java index ebeb709..a12cc08 100644 --- a/src/main/java/defpackage/mr.java +++ b/src/main/java/defpackage/mr.java @@ -45,7 +45,7 @@ public final class mr { for (Entry var7 : var0.getDimensions().entrySet()) { JsonObject var8 = new JsonObject(); - for (Entry var10 : ((Map)var7.getValue()).entrySet()) { + for (Entry var10 : (Iterable)((Map)var7.getValue()).entrySet()) { BlockPos var11 = (BlockPos)var10.getKey(); mp var12 = (mp)var10.getValue(); JsonObject var13 = new JsonObject(); diff --git a/src/main/java/defpackage/ms.java b/src/main/java/defpackage/ms.java index bbc4247..7d55860 100644 --- a/src/main/java/defpackage/ms.java +++ b/src/main/java/defpackage/ms.java @@ -165,39 +165,39 @@ public enum ms implements aqg { Object var5 = null; Object var6 = null; Object var7 = null; - ItemStack var8 = null; + Object var8 = null; Object var9 = null; int var10 = 202854816; while (true) { switch (var10) { case -1998494812: - if (var5.hasNext()) { + if (((Iterator)var5).hasNext()) { var10 = 1154006208; } else { var10 = 1631438160; } break; case -1689496013: - if (var7.hasNext()) { + if (((Iterator)var7).hasNext()) { var10 = 1066493299; } else { var10 = -70614920; } break; case -1462535934: - if (var6.hasNext()) { + if (((Iterator)var6).hasNext()) { var10 = -153298246; } else { var10 = 1722227515; } break; case -153298246: - var7 = (Entry)var6.next(); - var8 = (String)var7.getKey(); - var5.add( + var7 = (Entry)((Iterator)var6).next(); + var8 = (String)((Entry)var7).getKey(); + ((List)var5).add( new mo( - (ItemStack)var7.getValue(), + (ItemStack)((Entry)var7).getValue(), ((long[])var3.get(var8))[0], this.countContainers(var1, (Item)var4.get(var8)) ) @@ -216,17 +216,17 @@ public enum ms implements aqg { var10 = -1998494812; break; case 1066493299: - var8 = (ItemStack)var7.next(); - var9 = stackKey(var8); + var8 = (ItemStack)((Iterator)var7).next(); + var9 = stackKey((ItemStack)var8); var2.putIfAbsent(var9, var8); - var4.putIfAbsent(var9, var8.getItem()); - long[] var10000 = var3.computeIfAbsent(var9, var0 -> new long[1]); + var4.putIfAbsent(var9, ((ItemStack)var8).getItem()); + long[] var10000 = (long[])var3.computeIfAbsent(var9, var0 -> new long[1]); var10000[0] = var10000[0] - + var8.getCount(); + + ((ItemStack)var8).getCount(); var10 = -1689496013; break; case 1154006208: - var6 = (mp)var5.next(); + var6 = (mp)((Iterator)var5).next(); var7 = ((mp)var6).getItems().iterator(); var10 = -1689496013; break; diff --git a/src/main/java/defpackage/mw.java b/src/main/java/defpackage/mw.java index 0717ff0..0743adf 100644 --- a/src/main/java/defpackage/mw.java +++ b/src/main/java/defpackage/mw.java @@ -561,7 +561,7 @@ public final class mw { Enum[] var6 = null; int var7 = 0; int var8 = 0; - Object var9 = null; + Enum var9 = null; int var10 = -167817297; while (true) { diff --git a/src/main/java/defpackage/nb.java b/src/main/java/defpackage/nb.java index d62c9f1..7fdbca8 100644 --- a/src/main/java/defpackage/nb.java +++ b/src/main/java/defpackage/nb.java @@ -2,10 +2,10 @@ package defpackage; public enum nb { NORMAL("Normal", null), - PROTANOPIA, - DEUTERANOPIA, - TRITANOPIA, - ACHROMATOPSIA; + PROTANOPIA("Protanopia", new float[]{0.152286F, 1.052583F, -0.204868F, 0.114503F, 0.786281F, 0.099216F, -0.003882F, -0.048116F, 1.051998F}), + DEUTERANOPIA("Deuteranopia", new float[]{0.367322F, 0.860646F, -0.227968F, 0.280085F, 0.672501F, 0.047413F, -0.01182F, 0.04294F, 0.968881F}), + TRITANOPIA("Tritanopia", new float[]{1.255528F, -0.076749F, -0.178779F, 0.147602F, 0.930809F, -0.078411F, 0.004733F, 0.691367F, 0.3039F}), + ACHROMATOPSIA("Achromatopsia", new float[]{0.2126F, 0.7152F, 0.0722F, 0.2126F, 0.7152F, 0.0722F, 0.2126F, 0.7152F, 0.0722F}); private static final float CHANNEL_MAX = 255.0F; private static final float SRGB_LINEAR_THRESHOLD = 0.04045F; @@ -166,64 +166,4 @@ public enum nb { } } - // $VF: Failed to inline enum fields - // 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!) - static { - String var10002 = "PROTANOPIA"; - int var10003 = 1; - String var10004 = "Protanopia"; - float[] var10005 = new float[9]; - var10005[0] = 0.152286F; - var10005[1] = 1.052583F; - var10005[2] = -0.204868F; - var10005[3] = 0.114503F; - var10005[4] = 0.786281F; - var10005[5] = 0.099216F; - var10005[6] = -0.003882F; - var10005[7] = -0.048116F; - var10005[8] = 1.051998F; - PROTANOPIA = new nb(var10004, var10005); - var10002 = "DEUTERANOPIA"; - var10003 = 2; - var10004 = "Deuteranopia"; - var10005 = new float[9]; - var10005[0] = 0.367322F; - var10005[1] = 0.860646F; - var10005[2] = -0.227968F; - var10005[3] = 0.280085F; - var10005[4] = 0.672501F; - var10005[5] = 0.047413F; - var10005[6] = -0.01182F; - var10005[7] = 0.04294F; - var10005[8] = 0.968881F; - DEUTERANOPIA = new nb(var10004, var10005); - var10002 = "TRITANOPIA"; - var10003 = 3; - var10004 = "Tritanopia"; - var10005 = new float[9]; - var10005[0] = 1.255528F; - var10005[1] = -0.076749F; - var10005[2] = -0.178779F; - var10005[3] = -0.078411F; - var10005[4] = 0.930809F; - var10005[5] = 0.147602F; - var10005[6] = 0.004733F; - var10005[7] = 0.691367F; - var10005[8] = 0.3039F; - TRITANOPIA = new nb(var10004, var10005); - var10002 = "ACHROMATOPSIA"; - var10003 = 4; - var10004 = "Achromatopsia"; - var10005 = new float[9]; - var10005[0] = 0.2126F; - var10005[1] = 0.7152F; - var10005[2] = 0.0722F; - var10005[3] = 0.2126F; - var10005[4] = 0.7152F; - var10005[5] = 0.0722F; - var10005[6] = 0.2126F; - var10005[7] = 0.7152F; - var10005[8] = 0.0722F; - ACHROMATOPSIA = new nb(var10004, var10005); - } } diff --git a/src/main/java/defpackage/op.java b/src/main/java/defpackage/op.java index 30640e7..8dc9d35 100644 --- a/src/main/java/defpackage/op.java +++ b/src/main/java/defpackage/op.java @@ -1316,7 +1316,7 @@ public final class op { od[] var1 = null; int var2 = 0; int var3 = 0; - Object var4 = null; + od var4 = null; int var5 = 793280408; while (true) { diff --git a/src/main/java/defpackage/ql.java b/src/main/java/defpackage/ql.java index 7411d22..fc2e15a 100644 --- a/src/main/java/defpackage/ql.java +++ b/src/main/java/defpackage/ql.java @@ -29,7 +29,7 @@ public class ql extends qx { if (mc.player != null) { this.currentKeys.clear(); - for (MobEffectInstance var4 : new ArrayList(mc.player.getActiveEffectsMap().values())) { + for (MobEffectInstance var4 : (Iterable)new ArrayList(mc.player.getActiveEffectsMap().values())) { String var5 = ((MobEffect)var4.getEffect().value()).getDescriptionId() + var4.getAmplifier(); this.currentKeys.add(var5); if (!this.modules.containsKey(var5)) { diff --git a/src/main/java/defpackage/qs.java b/src/main/java/defpackage/qs.java index 3a2103a..33c5807 100644 --- a/src/main/java/defpackage/qs.java +++ b/src/main/java/defpackage/qs.java @@ -1244,7 +1244,7 @@ public class qs extends qx { ItemStack[] var2 = null; int var3 = 0; int var4 = 0; - Object var5 = null; + ItemStack var5 = null; int var6 = 1908326835; while (true) { diff --git a/src/main/java/defpackage/ri.java b/src/main/java/defpackage/ri.java index 5c97895..5ab21d8 100644 --- a/src/main/java/defpackage/ri.java +++ b/src/main/java/defpackage/ri.java @@ -1246,7 +1246,7 @@ public final class ri implements aqg { } }); - for (rh var11 : var2) { + for (rh var11 : (Iterable)var2) { if (this.results.size() >= (-79016432 ^ 79016480) + ((-79016432 & 79016480) << 1)) { break; } diff --git a/src/main/java/defpackage/sh.java b/src/main/java/defpackage/sh.java index 60f754f..eb983fc 100644 --- a/src/main/java/defpackage/sh.java +++ b/src/main/java/defpackage/sh.java @@ -11,7 +11,7 @@ public class sh { private String description = null; public sh(String var1, boolean var2) { - this(var1, var2); + this(var1, var2, new String[0]); } public sh(String var1, boolean var2, String... var3) { diff --git a/src/main/java/defpackage/ue.java b/src/main/java/defpackage/ue.java index bc41aa0..3a07074 100644 --- a/src/main/java/defpackage/ue.java +++ b/src/main/java/defpackage/ue.java @@ -1446,7 +1446,7 @@ public final class ue extends rm implements aav { return var2; } - for (amx var5 : var3) { + for (amx var5 : (Iterable)var3) { var2.add( rs.action( var5.username(), diff --git a/src/main/java/defpackage/up.java b/src/main/java/defpackage/up.java index 8fbb997..5442892 100644 --- a/src/main/java/defpackage/up.java +++ b/src/main/java/defpackage/up.java @@ -441,7 +441,7 @@ public final class up extends rm { var1 = -1303753076; break; case -1303753076: - return var2; + return var2 != 0; case 798413488: if (this.modeSetting.is("Lightning")) { var1 = 882100356; diff --git a/src/main/java/defpackage/uq.java b/src/main/java/defpackage/uq.java index e73a574..a2ef285 100644 --- a/src/main/java/defpackage/uq.java +++ b/src/main/java/defpackage/uq.java @@ -249,7 +249,7 @@ public final class uq extends rm { HashSet var26 = new HashSet<>(this.prevSections); HashSet var28 = new HashSet(); - for (Entry var31 : var9.entrySet()) { + for (Entry var31 : (Iterable)var9.entrySet()) { long var16 = (Long)var31.getKey(); int var18 = (Integer)var31.getValue(); int var19 = BlockPos.getX(var16); @@ -266,7 +266,7 @@ public final class uq extends rm { var26.addAll(var28); snapshot = var23; if (var2.level != null) { - for (long var32 : var26) { + for (long var32 : (Iterable)var26) { int var17 = SectionPos.x(var32); int var33 = SectionPos.y(var32); int var34 = SectionPos.z(var32); diff --git a/src/main/java/defpackage/vl.java b/src/main/java/defpackage/vl.java index 504d4d4..d0282bb 100644 --- a/src/main/java/defpackage/vl.java +++ b/src/main/java/defpackage/vl.java @@ -1841,7 +1841,7 @@ public final class vl extends rm { : var19; int var26 = var24.overrideColor != -1? forceAlpha(var24.overrideColor, (-2097570455 ^ 2097570710) + ((-2097570455 & 2097570710) << 1)) : var20; - var22 |= emitGlowSeedForMesh(var21, var16, var13, var24, var14, var15, var11, var12, var18, var25, var26, var6, var7, var8); + var22 |= emitGlowSeedForMesh(var21, var16, var13, var24, var14, var15, var11, var12, var18, var25, var26, var6, var7, var8) ? 1 : 0; } if (var22 == 0) { @@ -1994,7 +1994,7 @@ public final class vl extends rm { var14, var9, var10 - ); + ) ? 1 : 0; var15 |= emitGlowCurve( var0, var1, @@ -2017,7 +2017,7 @@ public final class vl extends rm { var14, var9, var10 - ); + ) ? 1 : 0; var15 |= emitGlowCurve( var0, var1, @@ -2040,7 +2040,7 @@ public final class vl extends rm { var14, var9, var10 - ); + ) ? 1 : 0; } } @@ -2063,7 +2063,7 @@ public final class vl extends rm { var16, var9, var10 - ); + ) ? 1 : 0; } } @@ -2092,7 +2092,7 @@ public final class vl extends rm { var34, var6, var7 - ); + ) ? 1 : 0; } return (boolean)((var15) != 0); @@ -2219,7 +2219,7 @@ public final class vl extends rm { var30 = var15 + (var9 - var15) * var28 * var28 + (var12 - var15) * var27 * var27; var31 = var16 + (var10 - var16) * var28 * var28 + (var13 - var16) * var27 * var27; var32 = getColorAtY(var30, var17, var18, var19, var20); - var25 |= emitGlowWorldLine(var0, var1, var2, var3, var4, var5, var6, var21, var22, var23, var29, var30, var31, var7, var24, var32); + var25 |= emitGlowWorldLine(var0, var1, var2, var3, var4, var5, var6, var21, var22, var23, var29, var30, var31, var7, var24, var32) ? 1 : 0; var21 = var29; var22 = var30; var23 = var31; diff --git a/src/main/java/defpackage/vp.java b/src/main/java/defpackage/vp.java index 2d30ed9..9d67fbb 100644 --- a/src/main/java/defpackage/vp.java +++ b/src/main/java/defpackage/vp.java @@ -882,7 +882,7 @@ public final class vp extends rm { if (var9) { RenderType var36 = arj.lines(); - for (vo var38 : var14) { + for (vo var38 : (Iterable)var14) { var1.pushPose(); var1.translate(var38.pos().getX() - var3.x, var38.pos().getY() - var3.y, var38.pos().getZ() - var3.z); var2.submitShapeOutline( diff --git a/src/main/java/defpackage/vr.java b/src/main/java/defpackage/vr.java index aed9c99..8443b6e 100644 --- a/src/main/java/defpackage/vr.java +++ b/src/main/java/defpackage/vr.java @@ -98,7 +98,7 @@ public final class vr extends rm { } break; case 400294859: - return var2; + return var2 != 0; case 430113709: var2 = 1; var1 = 400294859; diff --git a/src/main/java/defpackage/ww.java b/src/main/java/defpackage/ww.java index 71ff6e8..d87fefa 100644 --- a/src/main/java/defpackage/ww.java +++ b/src/main/java/defpackage/ww.java @@ -555,7 +555,7 @@ public final class ww { var19 ); } else { - var27 = new xd(xh.CROSS, var2, var14, var13, var15, (boolean)var6, var7, var8, var16, (boolean)(((var9) != 0)), (boolean)((var17) != 0), var18, var19); + var27 = new xd(xh.CROSS, var2, var14, var13, var15, (var6 != 0), var7, var8, var16, (boolean)(((var9) != 0)), (boolean)((var17) != 0), var18, var19); } return Optional.of(var27.sanitized()); diff --git a/src/main/java/defpackage/yy.java b/src/main/java/defpackage/yy.java index 70d62a9..b21fe38 100644 --- a/src/main/java/defpackage/yy.java +++ b/src/main/java/defpackage/yy.java @@ -353,7 +353,7 @@ public final class yy { } break; case -421299240: - if (var4 != var6) { + if (var4 != (var6 != 0)) { var8 = 1553119279; } else { var8 = 1237392186; diff --git a/src/main/java/defpackage/zk.java b/src/main/java/defpackage/zk.java index ac42ce2..1bfa82c 100644 --- a/src/main/java/defpackage/zk.java +++ b/src/main/java/defpackage/zk.java @@ -51,8 +51,8 @@ class zk implements zq { public void pull() { float f = this.val$token.readFloat((mv) this.val$target.get()); this.val$pushed[0] = f; - this.val$syncing[0] = 1; + this.val$syncing[0] = true; this.val$setting.setCurrent(f); - this.val$syncing[0] = 0; + this.val$syncing[0] = false; } } diff --git a/src/main/java/defpackage/zm.java b/src/main/java/defpackage/zm.java index 2e144e8..dd2c8ac 100644 --- a/src/main/java/defpackage/zm.java +++ b/src/main/java/defpackage/zm.java @@ -43,8 +43,8 @@ class zm implements zq { case -1890831546: return; case -1554842003: - this.val$pushed[0] = (IsEnabled == true ? 1 : 0) == true ? 1 : 0; - this.val$token.writeFlag((mv) this.val$target.get(), IsEnabled == true ? 1 : 0); + this.val$pushed[0] = IsEnabled; + this.val$token.writeFlag((mv) this.val$target.get(), IsEnabled); return; case -1036201976: default: @@ -58,8 +58,8 @@ class zm implements zq { } break; case 3599530: - this.val$pushed[0] = (flag == true ? 1 : 0) == true ? 1 : 0; - this.val$setting.setEnabled(flag == true ? 1 : 0); + this.val$pushed[0] = flag; + this.val$setting.setEnabled(flag); i = 205769910; i2 = -2096601456; break; diff --git a/src/main/java/defpackage/zr.java b/src/main/java/defpackage/zr.java index 582d00d..3fa4ab9 100644 --- a/src/main/java/defpackage/zr.java +++ b/src/main/java/defpackage/zr.java @@ -212,7 +212,7 @@ public final class zr { case -1036201976: default: var1x = (var3.isEnabled()) ? 1 : 0; - if (var1x != var2[0]) { + if ((var1x != 0) != var2[0]) { var3x = -1554842003; } else { var3x = 2070646602; @@ -225,7 +225,7 @@ public final class zr { break; case 2070646602: var2x = (var0.readFlag((mv)var1.get())) ? 1 : 0; - if (var2x != var2[0]) { + if ((var2x != 0) != var2[0]) { var3x = 3599530; } else { var3x = -1890831546; diff --git a/src/main/java/kotlin/Pair.java b/src/main/java/kotlin/Pair.java new file mode 100644 index 0000000..f869288 --- /dev/null +++ b/src/main/java/kotlin/Pair.java @@ -0,0 +1,19 @@ +package kotlin; + +public class Pair { + private final A first; + private final B second; + + public Pair(A var1, B var2) { + this.first = var1; + this.second = var2; + } + + public A getFirst() { + return this.first; + } + + public B getSecond() { + return this.second; + } +} diff --git a/tools/waves_ghik.py b/tools/waves_ghik.py new file mode 100644 index 0000000..87ea77a --- /dev/null +++ b/tools/waves_ghik.py @@ -0,0 +1,885 @@ +"""Волны поверх vfbuild13: G=retype+usage-cast, H=for-each/toArray, I=this-cast+text, +J=(Object[])→float[], K=int/boolean, M=структурные (nb, Cif, sh, Pair, импорты). + +Таблицы жёстко привязаны к номерам строк vfbuild13. Все line-правки применяются +по убыванию номера строки внутри файла. Запуск: python3 tools/waves_ghik.py +""" + +import re, 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} (file has {len(L)} lines)") + 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): + L = get(rel) + c = 0 + for i, l in enumerate(L): + if old in l: + L[i] = l.replace(old, new) + c += 1 + 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}") + + +DECL_PAT = lambda var: re.compile( + r"^\s*[A-Za-z_][\w.\[\]<>]*\s+%s\s*=" % re.escape(var) +) + + +def find_decl(rel, ln, var): + """Индекс строки-декларации `Type var = ...` выше ln в пределах метода.""" + L = get(rel) + i = ln - 2 + pat = DECL_PAT(var) + while i >= 0: + l = L[i] + if l.strip() and (len(l) - len(l.lstrip())) <= 3: + return None + if pat.match(l): + return i + i -= 1 + return None + + +def retype(rel, err_ln, var, newtype, tag): + idx = find_decl(rel, err_ln, var) + if idx is None: + stats[tag + "_MISS"] += 1 + print(f"DECL-MISS {rel}:{err_ln} var={var}") + return + L = get(rel) + old = L[idx] + L[idx] = re.sub( + r"^(\s*)[A-Za-z_][\w.\[\]<>]*\s+%s\s*=" % re.escape(var), + r"\g<1>%s %s =" % (newtype, var), + old, + count=1, + ) + if L[idx] == old and ("%s %s =" % (newtype, var)) in old: + stats[tag + "_skip"] += 1 + elif L[idx] == old: + stats[tag + "_MISS"] += 1 + print(f"RETYPE-MISS {rel}:{idx + 1}: {old!r}") + else: + stats[tag] += 1 + + +def cast_usage(rel, ln, var, ctype, tag): + L = get(rel) + i = ln - 1 + if i >= len(L): + stats[tag + "_MISS"] += 1 + print(f"CAST-MISS {rel}:{ln} (oob)") + return + needle = "%s." % var + already = "((%s)%s)." % (ctype, var) + if already in L[i]: + stats[tag + "_skip"] += 1 + return + if needle not in L[i]: + stats[tag + "_MISS"] += 1 + print(f"CAST-MISS {rel}:{ln}: {needle!r}\n got: {L[i].strip()!r}") + return + L[i] = L[i].replace(needle, "((%s)%s)." % (ctype, var)) + stats[tag] += 1 + + +FOREACH_PAT = re.compile(r"^(.*\bfor \()([A-Za-z_][\w.\[\]]*) (\w+) : (.*)$") +PRIM = { + "long": "Long", + "int": "Integer", + "double": "Double", + "float": "Float", + "boolean": "Boolean", + "char": "Character", + "byte": "Byte", + "short": "Short", +} + + +def foreach_cast(rel, ln, tag): + L = get(rel) + i = ln - 1 + if i >= len(L): + stats[tag + "_MISS"] += 1 + print(f"FE-MISS {rel}:{ln} (oob)") + return + l = L[i] + if "(Iterable<" in l: + stats[tag + "_skip"] += 1 + return + m = FOREACH_PAT.match(l) + if not m: + stats[tag + "_MISS"] += 1 + print(f"FE-MISS {rel}:{ln}: {l.strip()!r}") + return + pfx, typ, var, rest = m.groups() + ityp = PRIM.get(typ, typ) + L[i] = f"{pfx}{typ} {var} : (Iterable<{ityp}>){rest}" + stats[tag] += 1 + + +def wrap_assign_rhs(rel, ln, tag): + """Обернуть RHS бинарного присваивающего оператора в `(EXPR) ? 1 : 0` перед `;`.""" + L = get(rel) + i = ln - 1 + if i >= len(L) or "? 1 : 0" in L[i]: + if i < len(L) and "? 1 : 0" in L[i]: + stats[tag + "_skip"] += 1 + return + depth = 0 + for j in range(i, len(L)): + for k, ch in enumerate(L[j]): + if ch in "([{": + depth += 1 + elif ch in ")]}": + depth -= 1 + elif ch == ";" and depth == 0: + L[j] = L[j][:k] + " ? 1 : 0" + L[j][k:] + stats[tag] += 1 + return + stats[tag + "_MISS"] += 1 + print(f"WRAP-MISS {rel}:{ln}") + + +def insert_after(rel, anchor, newline, tag): + L = get(rel) + if newline in L: + stats[tag + "_skip"] += 1 + return + for i, l in enumerate(L): + if l.strip() == anchor: + L.insert(i + 1, newline) + stats[tag] += 1 + return + stats[tag + "_MISS"] += 1 + print(f"IMPORT-MISS {rel}: anchor {anchor!r}") + + +# ============================ G: retype ============================ +# (rel, err_line, var, newtype) +RETYPE = [ + ("defpackage/gq.java", 88, "var2x", "Int2FloatMap"), + ("defpackage/ed.java", 345, "var7", "File"), + ("defpackage/acf.java", 187, "var8", "String"), + ("defpackage/acf.java", 586, "var1", "Optional"), + ("defpackage/ajq.java", 135, "var4", "Info"), + ("defpackage/akz.java", 126, "var5", "File"), + ("defpackage/akz.java", 802, "var9", "String"), + ("defpackage/aua.java", 251, "var19", "Vertex"), + ("defpackage/aua.java", 276, "var15", "Polygon"), + ("defpackage/auv.java", 359, "var8", "Direction"), + ("defpackage/bt.java", 20, "var4", "Method"), + ("defpackage/bx.java", 19, "var5", "Method"), + ("defpackage/cc.java", 18, "var4", "Field"), + ("defpackage/op.java", 1334, "var4", "od"), + ("defpackage/qs.java", 1269, "var5", "ItemStack"), + ("defpackage/im.java", 66, "var5", "StackTraceElement"), + ("defpackage/cm.java", 178, "var5", "String"), + ("defpackage/mw.java", 573, "var9", "Enum"), + ("defpackage/aah.java", 2471, "var11", "ArrayList"), + ("defpackage/aah.java", 1115, "var3", "ArrayList"), + ("defpackage/aah.java", 1291, "var3", "ArrayList"), + ("defpackage/aah.java", 1504, "var3", "ArrayList"), + ("defpackage/aah.java", 1813, "var3", "ArrayList"), + ("defpackage/ahn.java", 751, "var22", "ArrayList"), + ("defpackage/je.java", 447, "var1", "ArrayList"), + ("defpackage/je.java", 431, "var9", "ArrayList"), + ("defpackage/jz.java", 60, "var1", "ArrayList"), + ("defpackage/jz.java", 50, "var9", "ArrayList"), + ("defpackage/ms.java", 197, "var8", "Object"), + ("defpackage/auk.java", 65, "var2", "Set"), + ("defpackage/auk.java", 114, "var2", "Set"), +] + +# ======================= G2: usage-casts ======================= +# (rel, line, var, casttype) +CASTS = [ + # ms (merged slots; var8 retype to Object + ItemStack casts) + ("defpackage/ms.java", 175, "var5", "Iterator"), + ("defpackage/ms.java", 182, "var7", "Iterator"), + ("defpackage/ms.java", 189, "var6", "Iterator"), + ("defpackage/ms.java", 196, "var6", "Iterator"), + ("defpackage/ms.java", 197, "var7", "Entry"), + ("defpackage/ms.java", 198, "var5", "List"), + ("defpackage/ms.java", 200, "var7", "Entry"), + ("defpackage/ms.java", 219, "var7", "Iterator"), + ("defpackage/ms.java", 229, "var5", "Iterator"), + # ahn + ("defpackage/ahn.java", 272, "var2", "Iterator"), + ("defpackage/ahn.java", 279, "var2", "Iterator"), + ("defpackage/ahn.java", 284, "var3", "Iterator"), + ("defpackage/ahn.java", 292, "var2", "List"), + ("defpackage/ahn.java", 301, "var2", "List"), + ("defpackage/ahn.java", 312, "var3", "Iterator"), + # aid (JsonArray | Iterator) + ("defpackage/aid.java", 280, "var5", "Iterator"), + ("defpackage/aid.java", 287, "var5", "Iterator"), + ("defpackage/aid.java", 302, "var5", "JsonArray"), + ("defpackage/aid.java", 303, "var5", "JsonArray"), + ("defpackage/aid.java", 304, "var5", "JsonArray"), + ("defpackage/aid.java", 309, "var5", "JsonArray"), + ("defpackage/aid.java", 310, "var5", "JsonArray"), + ("defpackage/aid.java", 311, "var5", "JsonArray"), + # adv (Entry) + ("defpackage/adv.java", 907, "var8", "Entry"), + ("defpackage/adv.java", 908, "var8", "Entry"), + ("defpackage/adv.java", 938, "var8", "Entry"), + # gt (Iterator) + ("defpackage/gt.java", 504, "var21", "Iterator"), + ("defpackage/gt.java", 513, "var21", "Iterator"), +] + +# ms: профилактические касты после retype var8→Object (строки не в логе ошибок) +MS_EXTRA = [ + (220, "stackKey(var8)", "stackKey((ItemStack)var8)"), + (222, "var8.getItem()", "((ItemStack)var8).getItem()"), + (223, "= var3.computeIfAbsent(var9,", "= (long[])var3.computeIfAbsent(var9,"), + (225, "var8.getCount()", "((ItemStack)var8).getCount()"), +] + +# ============================ H: for-each ============================ +# (rel, line) +FOREACH = [ + ("defpackage/aah.java", 190), + ("defpackage/aah.java", 1819), + ("defpackage/aaj.java", 659), + ("defpackage/aaj.java", 663), + ("defpackage/aaj.java", 1970), + ("defpackage/aaj.java", 1978), + ("defpackage/aaj.java", 1989), + ("defpackage/abs.java", 141), + ("defpackage/afp.java", 547), + ("defpackage/afp.java", 558), + ("defpackage/afp.java", 581), + ("defpackage/afp.java", 592), + ("defpackage/ahf.java", 436), + ("defpackage/ahi.java", 217), + ("defpackage/aiq.java", 181), + ("defpackage/aiq.java", 190), + ("defpackage/akd.java", 44), + ("defpackage/ajx.java", 105), + ("defpackage/akt.java", 828), + ("defpackage/ald.java", 105), + ("defpackage/an.java", 76), + ("defpackage/anb.java", 574), + ("defpackage/anb.java", 623), + ("defpackage/anb.java", 632), + ("defpackage/anb.java", 636), + ("defpackage/anb.java", 687), + ("defpackage/ans.java", 759), + ("defpackage/hl.java", 94), + ("defpackage/hl.java", 170), + ("defpackage/hn.java", 565), + ("defpackage/j.java", 495), + ("defpackage/j.java", 502), + ("defpackage/je.java", 431), + ("defpackage/jt.java", 255), + ("defpackage/jt.java", 276), + ("defpackage/jt.java", 342), + ("defpackage/jz.java", 50), + ("defpackage/ka.java", 78), + ("defpackage/ko.java", 48), + ("defpackage/ko.java", 55), + ("defpackage/mk.java", 132), + ("defpackage/mr.java", 48), + ("defpackage/ql.java", 32), + ("defpackage/ri.java", 1249), + ("defpackage/ue.java", 1449), + ("defpackage/uq.java", 252), + ("defpackage/uq.java", 269), + ("defpackage/vp.java", 885), + ("defpackage/ado.java", 147), +] + +# ==================== H2: toArray cast result ==================== +# (rel, line, old, new) +TOARRAY = [ + ( + "defpackage/ahi.java", + 131, + "var3.toArray(new aho[0])", + "(aho[])var3.toArray(new aho[0])", + ), + ( + "defpackage/ahi.java", + 327, + "var1.values().toArray(new String[0])", + "(String[])var1.values().toArray(new String[0])", + ), + ( + "defpackage/akz.java", + 449, + "var44.toArray(new BlockState[0])", + "(BlockState[])var44.toArray(new BlockState[0])", + ), + ( + "defpackage/akz.java", + 522, + "var20.toArray(new BlockState[0])", + "(BlockState[])var20.toArray(new BlockState[0])", + ), + ( + "defpackage/akz.java", + 586, + "var7.toArray(new BlockState[0])", + "(BlockState[])var7.toArray(new BlockState[0])", + ), + ( + "defpackage/ald.java", + 127, + "var6.toArray(new BakedQuad[0])", + "(BakedQuad[])var6.toArray(new BakedQuad[0])", + ), + ( + "defpackage/aua.java", + 101, + "var1.toArray(new ModelPart[0])", + "(ModelPart[])var1.toArray(new ModelPart[0])", + ), +] + +# ====================== I: this-cast миксины ====================== +# (rel, line, old, new) +THISCAST = [ + ("b/ag.java", 16, "(LocalPlayer)this", "(LocalPlayer)(Object)this"), + ("b/ap.java", 27, "(TitleScreen)this", "(TitleScreen)(Object)this"), + ( + "b/bd.java", + 17, + "this instanceof ModelFeatureRenderer", + "((Object)this) instanceof ModelFeatureRenderer", + ), + ("b/be.java", 17, "(Screen)this", "(Screen)(Object)this"), + ( + "b/bm.java", + 89, + "this instanceof InventoryScreen", + "((Object)this) instanceof InventoryScreen", + ), + ( + "b/bp.java", + 55, + "(AbstractContainerScreen)this", + "(AbstractContainerScreen)(Object)this", + ), + ( + "b/bp.java", + 67, + "(AbstractContainerScreen)this", + "(AbstractContainerScreen)(Object)this", + ), + ( + "b/bp.java", + 74, + "(AbstractContainerScreen)this", + "(AbstractContainerScreen)(Object)this", + ), + ( + "b/br.java", + 32, + "(AbstractContainerScreen)this", + "(AbstractContainerScreen)(Object)this", + ), + ("b/bt.java", 17, "this != mc.player", "(Object)this != mc.player"), + ("b/bt.java", 22, "this == mc.player", "(Object)this == mc.player"), + ("b/bt.java", 29, "this == mc.player", "(Object)this == mc.player"), + ( + "b/bu.java", + 28, + "this instanceof LocalPlayer player", + "((Object)this) instanceof LocalPlayer player", + ), + ( + "b/bu.java", + 39, + "this instanceof LocalPlayer player", + "((Object)this) instanceof LocalPlayer player", + ), + ("b/bu.java", 48, "(Player)this", "(Player)(Object)this"), + ( + "b/cb.java", + 30, + "(RenderLayer)this", + "(RenderLayer)(Object)this", + ), + ("b/cv.java", 15, "(PlayerModel)this", "(PlayerModel)(Object)this"), + ( + "b/dd.java", + 22, + "this instanceof ClientLevel", + "((Object)this) instanceof ClientLevel", + ), + ( + "b/dd.java", + 83, + "!(this instanceof ClientLevel)", + "!(((Object)this) instanceof ClientLevel)", + ), + ( + "b/q.java", + 18, + "(AbstractClientPlayer)this", + "(AbstractClientPlayer)(Object)this", + ), + ("b/z.java", 20, "this == mc.player", "(Object)this == mc.player"), + ( + "b/z.java", + 30, + "this instanceof LocalPlayer", + "((Object)this) instanceof LocalPlayer", + ), + ( + "b/z.java", + 35, + "this instanceof LocalPlayer", + "((Object)this) instanceof LocalPlayer", + ), + ("b/bg.java", 83, "((aqe)line.parent())", "((aqe)(Object)line.parent())"), + ("a/f.java", 137, "this == Minecraft.getInstance().player", "(Object)this == Minecraft.getInstance().player"), +] + +# =================== I2: квалификации/одиночные =================== +# (rel, line, old, new) +TEXTC = [ + ("b/bx.java", 27, "defpackage.defpackage.bz", "defpackage.bz"), + ("b/t.java", 49, "defpackage.defpackage.bz", "defpackage.bz"), + ("b/cr.java", 18, "((defpackage.b.ck)this)", "((ck)this)"), + ( + "b/dd.java", + 18, + "private final ct evo$smoothSkipAnim", + "private final defpackage.ct evo$smoothSkipAnim", + ), + ( + "b/z.java", + 40, + "bz evolution = defpackage.bz.getInstance()", + "defpackage.bz evolution = defpackage.bz.getInstance()", + ), + ("a/o.java", 62, "((b.l)this)", "((l)this)"), + ("defpackage/sh.java", 14, "this(var1, var2);", "this(var1, var2, new String[0]);"), + ("a/l.java", 385, "((x)item)", "((x)(Object)item)"), + ("defpackage/bn.java", 241, "((x)var1)", "((x)(Object)var1)"), + ("defpackage/bn.java", 295, "((x)var1)", "((x)(Object)var1)"), + ("defpackage/bn.java", 305, "((x)var1)", "((x)(Object)var1)"), + ("defpackage/bn.java", 358, "((x)var1)", "((x)(Object)var1)"), + ("defpackage/bn.java", 410, "((x)var1)", "((x)(Object)var1)"), +] + +# ======================== J: (Object[])→float[] ======================== +ARRAYS = [ + ("defpackage/aah.java", "((Object[])var15)", "((float[])var15)"), + ("defpackage/adf.java", "((Object[])var8)", "((float[])var8)"), + ("defpackage/adv.java", "((Object[])var12)", "((float[])var12)"), +] + +# ======================== K: int/boolean ======================== +# (rel, line, old, new) +INTBOOL = [ + ("defpackage/ajn.java", 324, "if (!var2 &&", "if (var2 == 0 &&"), + ("defpackage/ajn.java", 329, "if (!var3 &&", "if (var3 == 0 &&"), + ("defpackage/ajn.java", 334, "if (var3 &&", "if (var3 != 0 &&"), + ("defpackage/ajn.java", 340, "if (var2 &&", "if (var2 != 0 &&"), + ("defpackage/ajn.java", 346, "} else if (var6 &&", "} else if (var6 != 0 &&"), + ("defpackage/afp.java", 637, "int var16x = var29 &&", "int var16x = var29 != 0 &&"), + ( + "defpackage/afp.java", + 647, + "apply(var30, var13, var31, var16x,", + "apply(var30, var13, var31, (var16x != 0),", + ), + ("defpackage/agx.java", 398, "int var18 = var10 &&", "int var18 = var10 != 0 &&"), + ( + "defpackage/agx.java", + 401, + "apply(var11, var7, var6, var18,", + "apply(var11, var7, var6, (var18 != 0),", + ), + ("defpackage/anl.java", 145, "sharing = var1;", "sharing = var1 != 0;"), + ("defpackage/anl.java", 146, "if (!var1) {", "if (var1 == 0) {"), + ("defpackage/vr.java", 101, "return var2;", "return var2 != 0;"), + ("defpackage/up.java", 444, "return var2;", "return var2 != 0;"), + ("defpackage/ajm.java", 22, "return 0;", "return false;"), + ( + "defpackage/zk.java", + 54, + "this.val$syncing[0] = 1;", + "this.val$syncing[0] = true;", + ), + ( + "defpackage/zk.java", + 56, + "this.val$syncing[0] = 0;", + "this.val$syncing[0] = false;", + ), + ( + "defpackage/zm.java", + 46, + "this.val$pushed[0] = (IsEnabled == true ? 1 : 0) == true ? 1 : 0;", + "this.val$pushed[0] = IsEnabled;", + ), + ("defpackage/zm.java", 47, ", IsEnabled == true ? 1 : 0);", ", IsEnabled);"), + ( + "defpackage/zm.java", + 61, + "this.val$pushed[0] = (flag == true ? 1 : 0) == true ? 1 : 0;", + "this.val$pushed[0] = flag;", + ), + ("defpackage/zm.java", 62, "setEnabled(flag == true ? 1 : 0)", "setEnabled(flag)"), + ( + "defpackage/zr.java", + 215, + "if (var1x != var2[0]) {", + "if ((var1x != 0) != var2[0]) {", + ), + ( + "defpackage/zr.java", + 228, + "if (var2x != var2[0]) {", + "if ((var2x != 0) != var2[0]) {", + ), + ( + "defpackage/aab.java", + 151, + "if (var1 != this.lastEnabled) {", + "if ((var1 != 0) != this.lastEnabled) {", + ), + ( + "defpackage/anh.java", + 189, + "if (var5 != var2.visible) {", + "if ((var5 != 0) != var2.visible) {", + ), + ("defpackage/yy.java", 356, "if (var4 != var6) {", "if (var4 != (var6 != 0)) {"), + ( + "defpackage/atf.java", + 918, + "shapeCommands[var20] != var14", + "(shapeCommands[var20] ? 1 : 0) != var14", + ), + ( + "defpackage/aul.java", + 248, + "if (var0 == shaderPackConflict) {", + "if ((var0 != 0) == shaderPackConflict) {", + ), + ("defpackage/aid.java", 636, "byte var33 = var18;", "byte var33 = var18 ? 1 : 0;"), + ("defpackage/aid.java", 639, "var33 = (byte)(var18 == 0", "var33 = (byte)(!var18"), + ( + "defpackage/aid.java", + 640, + "? 1: (1597328994 | -1597328994) + (1597328994 & -1597328994));", + "? 1: 0);", + ), + ( + "defpackage/aid.java", + 641, + '} else if (var18 != 0 && "east".equals(var0)) {', + '} else if (var18 && "east".equals(var0)) {', + ), + ( + "defpackage/aid.java", + 643, + '} else if (var18 != 0 && "west".equals(var0)) {', + '} else if (var18 && "west".equals(var0)) {', + ), + ("defpackage/ww.java", 558, " (boolean)var6,", " (var6 != 0),"), + ( + "defpackage/bn.java", + 533, + "new ad((boolean)var8, (boolean)var7,", + "new ad((var8 != 0), (var7 != 0),", + ), + ( + "defpackage/apm.java", + 171, + "new Input((boolean)var4, (boolean)var5,", + "new Input((var4 != 0), (var5 != 0),", + ), + ( + "defpackage/im.java", + 187, + 'var4 |= var9.getClassName().startsWith("evo.");', + 'var4 |= var9.getClassName().startsWith("evo.") ? 1 : 0;', + ), + ( + "defpackage/aod.java", + 729, + "this.reap(var4, var5, var3, var6)", + "this.reap(var4, var5, var3, var6 != 0)", + ), + ("defpackage/aod.java", 795, "if (!var5) {", "if (var5 == 0) {"), + ( + "defpackage/agt.java", + 69, + "var8, var9, var3, var10)", + "var8, var9, var3, var10 != 0)", + ), + ("defpackage/ld.java", 281, "if (!var6) {", "if (var6 == 0) {"), + ("defpackage/jb.java", 21, "return i;", "return i != 0;"), + ("defpackage/anu.java", 40, "return i;", "return i != 0;"), + ("defpackage/kk.java", 25, "return i;", "return i != 0;"), +] + +# многострочные `|= boolean` (vl): обёртка RHS +VL_WRAP = [ + ("defpackage/vl.java", 1844), + ("defpackage/vl.java", 1975), + ("defpackage/vl.java", 1998), + ("defpackage/vl.java", 2021), + ("defpackage/vl.java", 2049), + ("defpackage/vl.java", 2086), + ("defpackage/vl.java", 2222), +] + +# ==================== M: структурные фиксы ==================== + +NB_CONSTS = """ NORMAL("Normal", null), + PROTANOPIA("Protanopia", new float[]{0.152286F, 1.052583F, -0.204868F, 0.114503F, 0.786281F, 0.099216F, -0.003882F, -0.048116F, 1.051998F}), + DEUTERANOPIA("Deuteranopia", new float[]{0.367322F, 0.860646F, -0.227968F, 0.280085F, 0.672501F, 0.047413F, -0.01182F, 0.04294F, 0.968881F}), + TRITANOPIA("Tritanopia", new float[]{1.255528F, -0.076749F, -0.178779F, 0.147602F, 0.930809F, -0.078411F, 0.004733F, 0.691367F, 0.3039F}), + ACHROMATOPSIA("Achromatopsia", new float[]{0.2126F, 0.7152F, 0.0722F, 0.2126F, 0.7152F, 0.0722F, 0.2126F, 0.7152F, 0.0722F});""" + + +def fix_nb(): + rel = "defpackage/nb.java" + L = get(rel) + # 1) константы в заголовке + try: + i0 = next(i for i, l in enumerate(L) if l.strip().startswith("NORMAL(")) + i1 = next(i for i, l in enumerate(L) if l.strip().startswith("ACHROMATOPSIA;")) + except StopIteration: + if any("0.152286F" in l for l in L): + stats["nb_skip"] += 1 + else: + stats["nb_MISS"] += 1 + print("NB-MISS: constants header not found") + return + L[i0 : i1 + 1] = NB_CONSTS.splitlines() + stats["nb"] += 1 + # 2) удалить static-блок с присваиваниями + try: + s = next(i for i, l in enumerate(L) if "Failed to inline enum fields" in l) + except StopIteration: + stats["nb_block_MISS"] += 1 + print("NB-MISS: static block not found") + return + # конец блока: строка ` }` после ACHROMATOPSIA = new nb(...) + e = next(i for i in range(s, len(L)) if "ACHROMATOPSIA = new nb(" in L[i]) + e2 = next(i for i in range(e, len(L)) if L[i].strip() == "}") + del L[s : e2 + 1] + stats["nb_block"] += 1 + + +CIF_CONST_RE = re.compile(r"^\s*public static final Cif (\w+) = new Cif\((.*)\);\s*$") + + +def fix_cif(): + rel = "defpackage/Cif.java" + L = get(rel) + if not any(l.strip().startswith("public final class Cif") for l in L): + if any(l.strip().startswith("public enum Cif") for l in L): + stats["Cif_skip"] += 1 + else: + stats["Cif_MISS"] += 1 + print("CIF-MISS: class decl not found") + return + # собрать константы + consts = [] + keep = [] + for l in L: + m = CIF_CONST_RE.match(l) + if m: + consts.append((m.group(1), m.group(2))) + else: + keep.append(l) + if len(consts) != 15: + stats["Cif_MISS"] += 1 + print(f"CIF-MISS: found {len(consts)} constants") + return + L = keep + # class → enum + for i, l in enumerate(L): + if l.strip().startswith("public final class Cif"): + L[i] = l.replace("public final class Cif", "public enum Cif") + break + # вставить константы сразу после заголовка enum + hi = next(i for i, l in enumerate(L) if l.strip().startswith("public enum Cif")) + lines = [] + for n, (name, args) in enumerate(consts): + sep = "," if n < len(consts) - 1 else ";" + lines.append(f" {name}({args}){sep}") + L[hi + 1 : hi + 1] = lines + stats["Cif"] += 1 + out = [] + skip_until = None + mode = None + i = 0 + while i < len(L): + l = L[i] + s = l.strip() + if s.startswith("private static final /* synthetic */ Cif[] $VALUES"): + i += 1 + continue + if s.startswith("public static Cif[] values()") or s.startswith( + "public static Cif valueOf(" + ): + # пропустить до закрывающей скобки метода (уровень отступа метода) + ind = len(l) - len(l.lstrip()) + i += 1 + while i < len(L) and not ( + L[i].strip() == "}" and (len(L[i]) - len(L[i].lstrip())) == ind + ): + i += 1 + i += 1 + continue + if s.startswith("private static /* synthetic */ Cif[] $values()"): + ind = len(l) - len(l.lstrip()) + i += 1 + while i < len(L) and not ( + L[i].strip() == "}" and (len(L[i]) - len(L[i].lstrip())) == ind + ): + i += 1 + i += 1 + # и пустая строка после + if i < len(L) and not L[i].strip(): + i += 1 + continue + if s == "super(str, i);": + i += 1 + continue + if s == "return 0;": + out.append(l.replace("return 0;", "return false;")) + i += 1 + continue + if s == "return i;": + out.append(l.replace("return i;", "return i != 0;")) + i += 1 + continue + out.append(l) + i += 1 + files[os.path.join(JAVA, rel)] = out + stats["Cif_cleanup"] += 1 + + +PAIR_SRC = """package kotlin; + +public class Pair { + private final A first; + private final B second; + + public Pair(A var1, B var2) { + this.first = var1; + this.second = var2; + } + + public A getFirst() { + return this.first; + } + + public B getSecond() { + return this.second; + } +} +""" + + +def write_pair(): + p = os.path.join(JAVA, "kotlin/Pair.java") + os.makedirs(os.path.dirname(p), exist_ok=True) + if os.path.exists(p): + stats["Pair_skip"] += 1 + return + with open(p, "w", encoding="utf-8") as f: + f.write(PAIR_SRC) + stats["Pair"] += 1 + + +def main(): + # line-правки по убыванию внутри файла + def apply_line_edits(table, tag): + by = collections.defaultdict(list) + for row in table: + by[row[0]].append(row) + 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], tag) + + for rel, ln, var, nt in sorted(RETYPE, key=lambda r: -r[1]): + retype(rel, ln, var, nt, "retype") + for rel, ln, var, ct in sorted(CASTS, key=lambda r: -r[1]): + cast_usage(rel, ln, var, ct, "cast") + for ln, old, new in sorted(MS_EXTRA, key=lambda r: -r[0]): + edit_line("defpackage/ms.java", ln, old, new, "ms_extra") + for rel, ln in sorted(FOREACH, key=lambda r: -r[1]): + foreach_cast(rel, ln, "foreach") + apply_line_edits(TOARRAY, "toarray") + apply_line_edits(THISCAST, "thiscast") + apply_line_edits(TEXTC, "text") + for rel, old, new in ARRAYS: + edit_all(rel, old, new, "array") + apply_line_edits(INTBOOL, "intbool") + for rel, ln in VL_WRAP: + wrap_assign_rhs(rel, ln, "vlwrap") + + # структурные + fix_nb() + fix_cif() + write_pair() + + # импорты + insert_after( + "defpackage/acf.java", + "import net.fabricmc.loader.api.FabricLoader;", + "import net.fabricmc.loader.api.ModContainer;", + "import", + ) + insert_after("a/o.java", "import defpackage.*;", "import b.l;", "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 k.endswith("_MISS")} + if miss: + print("MISSES:", dict(miss)) + sys.exit(1) + + +if __name__ == "__main__": + main()