Merge branch 'master' into mc-update

# Conflicts:
#	src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayerEntityMixin.java

Author: MineGame159

src/main/java/meteordevelopment/meteorclient/commands/commands/FovCommand.java

@@ -18,7 +18,7 @@ public FovCommand() {
 
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
-        builder.then(argument("fov", IntegerArgumentType.integer(0, 180)).executes(context -> {
+        builder.then(argument("fov", IntegerArgumentType.integer(1, 180)).executes(context -> {
             ((ISimpleOption) (Object) mc.options.getFov()).meteor$set(context.getArgument("fov", Integer.class));
             return SINGLE_SUCCESS;
         }));

src/main/java/meteordevelopment/meteorclient/mixin/BlockMixin.java

@@ -9,13 +9,10 @@
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.systems.modules.movement.NoSlow;
 import meteordevelopment.meteorclient.systems.modules.movement.Slippy;
-import meteordevelopment.meteorclient.systems.modules.render.Xray;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.item.ItemConvertible;
-import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
@@ -25,17 +22,6 @@ public BlockMixin(Settings settings) {
         super(settings);
     }
 
-    @ModifyReturnValue(method = "shouldDrawSide", at = @At("RETURN"))
-    private static boolean onShouldDrawSide(boolean original, BlockState state, BlockState otherState, Direction side) {
-        Xray xray = Modules.get().get(Xray.class);
-
-        if (xray.isActive()) {
-            return xray.modifyDrawSide(state, otherState, side, original);
-        }
-
-        return original;
-    }
-
     @ModifyReturnValue(method = "getSlipperiness", at = @At("RETURN"))
     public float getSlipperiness(float original) {
         // For some retarded reason Tweakeroo calls this method before meteor is initialized

src/main/java/meteordevelopment/meteorclient/mixin/BlockModelRendererMixin.java

@@ -5,13 +5,16 @@
 
 package meteordevelopment.meteorclient.mixin;
 
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.systems.modules.render.Xray;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.block.BlockModelRenderer;
 import net.minecraft.client.render.model.BlockModelPart;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockRenderView;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -41,4 +44,15 @@ private void modifyXrayAlpha(final Args args) {
         final int alpha = alphas.get();
         args.set(6, alpha == -1 ? args.get(6) : alpha / 255f);
     }
+
+    @ModifyReturnValue(method = "shouldDrawFace", at = @At("RETURN"))
+    private static boolean modifyShouldDrawFace(boolean original, BlockRenderView world, BlockState state, boolean cull, Direction side, BlockPos pos) {
+        Xray xray = Modules.get().get(Xray.class);
+
+        if (xray.isActive()) {
+            return xray.modifyDrawSide(state, world, pos.offset(side.getOpposite()), side, original); // thanks mojang
+        }
+
+        return original;
+    }
 }

src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayerEntityMixin.java

@@ -20,6 +20,7 @@
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.PlayerInput;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -80,6 +81,22 @@ private float onHunger(float constant) {
         return constant;
     }
 
+    @ModifyExpressionValue(method = "tick", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/Input;playerInput:Lnet/minecraft/util/PlayerInput;"))
+    private PlayerInput isSneaking(PlayerInput original) {
+        if (Modules.get().get(Sneak.class).doPacket() || Modules.get().get(NoSlow.class).airStrict()) {
+            return new PlayerInput(
+                original.forward(),
+                original.backward(),
+                original.left(),
+                original.right(),
+                original.jump(),
+                true,
+                original.sprint()
+            );
+        }
+        return original;
+    }
+
     @Inject(method = "tickMovement", at = @At("HEAD"))
     private void preTickMovement(CallbackInfo ci) {
         MeteorClient.EVENT_BUS.post(PlayerTickMovementEvent.get());

src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumBlockOcclusionCacheMixin.java

@@ -32,7 +32,7 @@ private void onInit(CallbackInfo info) {
     @ModifyReturnValue(method = "shouldDrawSide", at = @At("RETURN"))
     private boolean shouldDrawSide(boolean original, BlockState state, BlockView view, BlockPos pos, Direction facing) {
         if (xray.isActive()) {
-            return xray.modifyDrawSide(state, view.getBlockState(pos.offset(facing)), facing, original);
+            return xray.modifyDrawSide(state, view, pos, facing, original);
         }
 
         return original;