Merge branch 'master' into mc-update

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

Author: MineGame159

gradle.properties

@@ -32,7 +32,7 @@ modmenu_version=15.0.0
 orbit_version=0.2.4
 
 # Starscript (https://github.com/MeteorDevelopment/starscript)
-starscript_version=0.2.4
+starscript_version=0.2.5
 
 # DiscordRPC (https://github.com/MeteorDevelopment/java-discord-rpc)
 discordipc_version=1.1

src/main/java/meteordevelopment/meteorclient/gui/WidgetScreen.java

@@ -250,8 +250,7 @@ public void renderBackground(DrawContext context, int mouseX, int mouseY, float
         }
     }
 
-    @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+    public void renderCustom(DrawContext context, int mouseX, int mouseY, float delta) {
         int s = mc.getWindow().getScaleFactor();
         mouseX *= s;
         mouseY *= s;

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

@@ -13,6 +13,7 @@
 import meteordevelopment.meteorclient.events.render.GetFovEvent;
 import meteordevelopment.meteorclient.events.render.Render3DEvent;
 import meteordevelopment.meteorclient.events.render.RenderAfterWorldEvent;
+import meteordevelopment.meteorclient.gui.WidgetScreen;
 import meteordevelopment.meteorclient.mixininterface.IVec3d;
 import meteordevelopment.meteorclient.renderer.MeteorRenderPipelines;
 import meteordevelopment.meteorclient.renderer.Renderer3D;
@@ -25,15 +26,14 @@
 import meteordevelopment.meteorclient.systems.modules.world.HighwayBuilder;
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.entity.fakeplayer.FakePlayerEntity;
-import meteordevelopment.meteorclient.utils.render.CustomBannerGuiElementRenderer;
 import meteordevelopment.meteorclient.utils.render.NametagUtils;
 import meteordevelopment.meteorclient.utils.render.RenderUtils;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.render.SpecialGuiElementRenderer;
-import net.minecraft.client.render.BufferBuilderStorage;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.RenderTickCounter;
+import net.minecraft.client.render.fog.FogRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
@@ -48,12 +48,8 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Mixin(GameRenderer.class)
 public abstract class GameRendererMixin {
     @Shadow
@@ -97,6 +93,18 @@ public abstract class GameRendererMixin {
         return List.of(list.toArray(new SpecialGuiElementRenderer<?>[0]));
     }
 
+    @Shadow
+    @Final
+    private GuiRenderer guiRenderer;
+
+    @Shadow
+    @Final
+    private FogRenderer fogRenderer;
+
+    @Shadow
+    @Final
+    private GuiRenderState guiState;
+
     @Inject(method = "renderWorld", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", args = {"ldc=hand"}))
     private void onRenderWorld(RenderTickCounter tickCounter, CallbackInfo ci, @Local(ordinal = 0) Matrix4f projection, @Local(ordinal = 1) Matrix4f position, @Local(ordinal = 1) float tickDelta, @Local MatrixStack matrixStack) {
         if (!Utils.canUpdate()) return;
@@ -144,6 +152,23 @@ private void onRenderWorldTail(CallbackInfo info) {
         MeteorClient.EVENT_BUS.post(RenderAfterWorldEvent.get());
     }
 
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/render/GuiRenderer;render(Lcom/mojang/blaze3d/buffers/GpuBufferSlice;)V", shift = At.Shift.AFTER))
+    private void onRenderGui(RenderTickCounter tickCounter, boolean tick, CallbackInfo info) {
+        if (client.currentScreen instanceof WidgetScreen widgetScreen) {
+            guiState.clear();
+            var context = new DrawContext(client, guiState);
+
+            var mouseX = (int) client.mouse.getScaledX(client.getWindow());
+            var mouseY = (int) client.mouse.getScaledY(client.getWindow());
+
+            widgetScreen.renderCustom(context, mouseX, mouseY, tickCounter.getDynamicDeltaTicks());
+
+            RenderSystem.getDevice().createCommandEncoder().clearDepthTexture(client.getFramebuffer().getDepthAttachment(), 1.0);
+            guiRenderer.render(fogRenderer.getFogBuffer(FogRenderer.FogType.NONE));
+            guiRenderer.incrementFrame();
+        }
+    }
+
     @ModifyReturnValue(method = "findCrosshairTarget", at = @At("RETURN"))
     private HitResult onUpdateTargetedEntity(HitResult original, @Local HitResult hitResult) {
         if (Modules.get().get(NoMiningTrace.class).canWork(original instanceof EntityHitResult ehr ? ehr.getEntity() : null) && hitResult.getType() == HitResult.Type.BLOCK) {

src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoBreed.java

@@ -16,6 +16,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.util.Hand;
+import net.minecraft.util.hit.EntityHitResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -85,6 +86,8 @@ private void onTick(TickEvent.Pre event) {
                 continue;
 
             Rotations.rotate(Rotations.getYaw(entity), Rotations.getPitch(entity), -100, () -> {
+                EntityHitResult location = new EntityHitResult(animal, animal.getBoundingBox().getCenter());
+                mc.interactionManager.interactEntityAtLocation(mc.player, animal, location, hand.get());
                 mc.interactionManager.interactEntity(mc.player, animal, hand.get());
                 mc.player.swingHand(hand.get());
                 animalsFed.add(animal);

src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoMount.java

@@ -21,9 +21,14 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.entity.mob.SkeletonHorseEntity;
+import net.minecraft.entity.mob.ZombieHorseEntity;
 import net.minecraft.entity.passive.LlamaEntity;
+import net.minecraft.entity.passive.PigEntity;
+import net.minecraft.entity.passive.StriderEntity;
 import net.minecraft.item.SpawnEggItem;
 import net.minecraft.util.Hand;
+import net.minecraft.util.hit.EntityHitResult;
 
 import java.util.Set;
 
@@ -64,15 +69,24 @@ private void onTick(TickEvent.Pre event) {
         for (Entity entity : mc.world.getEntities()) {
             if (!entities.get().contains(entity.getType())) continue;
             if (!PlayerUtils.isWithin(entity, 4)) continue;
-            if ((entity instanceof MobEntity mobEntity) && !(mobEntity.hasSaddleEquipped())) continue;
+            if ((entity instanceof PigEntity || entity instanceof SkeletonHorseEntity || entity instanceof StriderEntity || entity instanceof ZombieHorseEntity) && !((MobEntity) entity).hasSaddleEquipped()) continue;
             if (!(entity instanceof LlamaEntity) && entity instanceof MobEntity mobEntity && checkSaddle.get() && !mobEntity.hasSaddleEquipped()) continue;
-            interact(entity);
+            interact(entity, rotate.get());
             return;
         }
     }
 
+    private void interact(Entity entity, boolean rotate) {
+        if (rotate) {
+            Rotations.rotate(Rotations.getYaw(entity), Rotations.getPitch(entity), -100, () -> interact(entity));
+        } else {
+            interact(entity);
+        }
+    }
+
     private void interact(Entity entity) {
-        if (rotate.get()) Rotations.rotate(Rotations.getYaw(entity), Rotations.getPitch(entity), -100, () -> mc.interactionManager.interactEntity(mc.player, entity, Hand.MAIN_HAND));
-        else mc.interactionManager.interactEntity(mc.player, entity, Hand.MAIN_HAND);
+        EntityHitResult location = new EntityHitResult(entity, entity.getBoundingBox().getCenter());
+        mc.interactionManager.interactEntityAtLocation(mc.player, entity, location, Hand.MAIN_HAND);
+        mc.interactionManager.interactEntity(mc.player, entity, Hand.MAIN_HAND);
     }
 }

src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoNametag.java

@@ -22,6 +22,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.item.Items;
 import net.minecraft.util.Hand;
+import net.minecraft.util.hit.EntityHitResult;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -126,7 +127,10 @@ private void onTickPost(TickEvent.Post event) {
     }
 
     private void interact() {
-        mc.interactionManager.interactEntity(mc.player, target, offHand ? Hand.OFF_HAND : Hand.MAIN_HAND);
+        Hand hand = offHand ? Hand.OFF_HAND : Hand.MAIN_HAND;
+        EntityHitResult location = new EntityHitResult(target, target.getBoundingBox().getCenter());
+        mc.interactionManager.interactEntityAtLocation(mc.player, target, location, hand);
+        mc.interactionManager.interactEntity(mc.player, target, hand);
         InvUtils.swapBack();
 
         entityCooldowns.put(target, 20);

src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoShearer.java

@@ -21,6 +21,7 @@
 import net.minecraft.entity.passive.SheepEntity;
 import net.minecraft.item.Items;
 import net.minecraft.util.Hand;
+import net.minecraft.util.hit.EntityHitResult;
 
 public class AutoShearer extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -80,6 +81,8 @@ private void onTick(TickEvent.Pre event) {
     }
 
     private void interact() {
+        EntityHitResult location = new EntityHitResult(entity, entity.getBoundingBox().getCenter());
+        mc.interactionManager.interactEntityAtLocation(mc.player, entity, location, hand);
         mc.interactionManager.interactEntity(mc.player, entity, hand);
         InvUtils.swapBack();
     }