Merge branch 'master' into 25w09b

Wurst-Imperium · Mar 4, 2025 · e5672bf · e5672bf
2 parents 0fd733f + 3bc2bb4
commit e5672bf
Show file tree

Hide file tree

Showing 14 changed files with 478 additions and 38 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ loader_version=0.16.10
 fabric_version=0.118.2+1.21.5
 
 # Mod Properties
-mod_version=v7.46.6-MC25w09b
+mod_version=v7.47-MC25w09b
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 

diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java
@@ -50,7 +50,7 @@ public enum WurstClient
 	public static MinecraftClient MC;
 	public static IMinecraftClient IMC;
 
-	public static final String VERSION = "7.46.6";
+	public static final String VERSION = "7.47";
 	public static final String MC_VERSION = "25w09b";
 
 	private WurstAnalytics analytics;

diff --git a/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java b/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java
@@ -17,6 +17,7 @@
 import net.minecraft.entity.mob.Monster;
 import net.minecraft.entity.mob.WaterCreatureEntity;
 import net.minecraft.entity.passive.AnimalEntity;
+import net.minecraft.entity.passive.WaterAnimalEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -114,7 +115,8 @@ private int getEntityColor(Entity e)
 		if(e instanceof Monster)
 			return 0xFFFF8000;
 		if(e instanceof AnimalEntity || e instanceof AmbientEntity
-			|| e instanceof WaterCreatureEntity)
+			|| e instanceof WaterCreatureEntity
+			|| e instanceof WaterAnimalEntity)
 			return 0xFF00FF00;
 		return 0xFF808080;
 	}

diff --git a/src/main/java/net/wurstclient/events/RenderListener.java b/src/main/java/net/wurstclient/events/RenderListener.java
@@ -9,8 +9,6 @@
 
 import java.util.ArrayList;
 
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.util.math.MatrixStack;
 import net.wurstclient.event.Event;
 import net.wurstclient.event.Listener;
@@ -33,12 +31,8 @@ public RenderEvent(MatrixStack matrixStack, float partialTicks)
 		@Override
 		public void fire(ArrayList<RenderListener> listeners)
 		{
-			GL11.glEnable(GL11.GL_LINE_SMOOTH);
-
 			for(RenderListener listener : listeners)
 				listener.onRender(matrixStack, partialTicks);
-
-			GL11.glDisable(GL11.GL_LINE_SMOOTH);
 		}
 
 		@Override

diff --git a/src/main/java/net/wurstclient/hacks/TreeBotHack.java b/src/main/java/net/wurstclient/hacks/TreeBotHack.java
@@ -246,7 +246,6 @@ private boolean breakBlock(BlockPos pos)
 	@Override
 	public void onRender(MatrixStack matrixStack, float partialTicks)
 	{
-		// RenderSystem.setShader(ShaderProgramKeys.POSITION);
 		PathCmd pathCmd = WURST.getCmds().pathCmd;
 
 		if(treeFinder != null)

diff --git a/src/main/java/net/wurstclient/mixin/ChatHudMixin.java b/src/main/java/net/wurstclient/mixin/ChatHudMixin.java
@@ -39,12 +39,14 @@ public class ChatHudMixin
 	@Inject(at = @At("HEAD"),
 		method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;Lnet/minecraft/client/gui/hud/MessageIndicator;)V",
 		cancellable = true)
-	private void onAddMessage(Text message,
+	private void onAddMessage(Text messageDontUse,
 		@Nullable MessageSignatureData signature,
 		@Nullable MessageIndicator indicatorDontUse, CallbackInfo ci,
-		@Local LocalRef<MessageIndicator> indicator)
+		@Local(argsOnly = true) LocalRef<Text> message,
+		@Local(argsOnly = true) LocalRef<MessageIndicator> indicator)
 	{
-		ChatInputEvent event = new ChatInputEvent(message, visibleMessages);
+		ChatInputEvent event =
+			new ChatInputEvent(message.get(), visibleMessages);
 
 		EventManager.fire(event);
 		if(event.isCancelled())
@@ -53,8 +55,8 @@ private void onAddMessage(Text message,
 			return;
 		}
 
-		message = event.getComponent();
+		message.set(event.getComponent());
 		indicator.set(WurstClient.INSTANCE.getOtfs().noChatReportsOtf
-			.modifyIndicator(message, signature, indicator.get()));
+			.modifyIndicator(message.get(), signature, indicator.get()));
 	}
 }
diff --git a/src/main/java/net/wurstclient/mixin/GenericContainerScreenMixin.java b/src/main/java/net/wurstclient/mixin/GenericContainerScreenMixin.java
@@ -10,10 +10,10 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.GenericContainerScreenHandler;
@@ -26,14 +26,15 @@
 @Mixin(GenericContainerScreen.class)
 public abstract class GenericContainerScreenMixin
 	extends HandledScreen<GenericContainerScreenHandler>
-	implements ScreenHandlerProvider<GenericContainerScreenHandler>
 {
 	@Shadow
 	@Final
 	private int rows;
 
+	@Unique
 	private final AutoStealHack autoSteal =
 		WurstClient.INSTANCE.getHax().autoStealHack;
+	@Unique
 	private int mode;
 
 	public GenericContainerScreenMixin(WurstClient wurst,
@@ -44,7 +45,7 @@ public GenericContainerScreenMixin(WurstClient wurst,
 	}
 
 	@Override
-	protected void init()
+	public void init()
 	{
 		super.init();
 
@@ -66,16 +67,19 @@ protected void init()
 			steal();
 	}
 
+	@Unique
 	private void steal()
 	{
 		runInThread(() -> shiftClickSlots(0, rows * 9, 1));
 	}
 
+	@Unique
 	private void store()
 	{
 		runInThread(() -> shiftClickSlots(rows * 9, rows * 9 + 44, 2));
 	}
 
+	@Unique
 	private void runInThread(Runnable r)
 	{
 		new Thread(() -> {
@@ -90,6 +94,7 @@ private void runInThread(Runnable r)
 		}).start();
 	}
 
+	@Unique
 	private void shiftClickSlots(int from, int to, int mode)
 	{
 		this.mode = mode;
@@ -108,6 +113,7 @@ private void shiftClickSlots(int from, int to, int mode)
 		}
 	}
 
+	@Unique
 	private void waitForDelay()
 	{
 		try

diff --git a/src/main/java/net/wurstclient/mixin/ShulkerBoxScreenMixin.java b/src/main/java/net/wurstclient/mixin/ShulkerBoxScreenMixin.java
@@ -8,6 +8,7 @@
 package net.wurstclient.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.ShulkerBoxScreen;
@@ -24,10 +25,13 @@
 public abstract class ShulkerBoxScreenMixin
 	extends HandledScreen<ShulkerBoxScreenHandler>
 {
+	@Unique
 	private final int rows = 3;
 
+	@Unique
 	private final AutoStealHack autoSteal =
 		WurstClient.INSTANCE.getHax().autoStealHack;
+	@Unique
 	private int mode;
 
 	private ShulkerBoxScreenMixin(WurstClient wurst,
@@ -37,7 +41,7 @@ private ShulkerBoxScreenMixin(WurstClient wurst,
 	}
 
 	@Override
-	protected void init()
+	public void init()
 	{
 		super.init();
 
@@ -59,16 +63,19 @@ protected void init()
 			steal();
 	}
 
+	@Unique
 	private void steal()
 	{
 		runInThread(() -> shiftClickSlots(0, rows * 9, 1));
 	}
 
+	@Unique
 	private void store()
 	{
 		runInThread(() -> shiftClickSlots(rows * 9, rows * 9 + 44, 2));
 	}
 
+	@Unique
 	private void runInThread(Runnable r)
 	{
 		new Thread(() -> {
@@ -83,6 +90,7 @@ private void runInThread(Runnable r)
 		}).start();
 	}
 
+	@Unique
 	private void shiftClickSlots(int from, int to, int mode)
 	{
 		this.mode = mode;
@@ -101,6 +109,7 @@ private void shiftClickSlots(int from, int to, int mode)
 		}
 	}
 
+	@Unique
 	private void waitForDelay()
 	{
 		try

diff --git a/src/main/java/net/wurstclient/settings/filters/FilterPassiveSetting.java b/src/main/java/net/wurstclient/settings/filters/FilterPassiveSetting.java
@@ -14,6 +14,7 @@
 import net.minecraft.entity.mob.WaterCreatureEntity;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.PufferfishEntity;
+import net.minecraft.entity.passive.WaterAnimalEntity;
 
 public final class FilterPassiveSetting extends EntityFilterCheckbox
 {
@@ -37,7 +38,8 @@ public boolean test(Entity e)
 			return true;
 
 		return !(e instanceof AnimalEntity || e instanceof AmbientEntity
-			|| e instanceof WaterCreatureEntity);
+			|| e instanceof WaterCreatureEntity
+			|| e instanceof WaterAnimalEntity);
 	}
 
 	public static FilterPassiveSetting genericCombat(boolean checked)

diff --git a/src/main/java/net/wurstclient/settings/filters/FilterPassiveWaterSetting.java b/src/main/java/net/wurstclient/settings/filters/FilterPassiveWaterSetting.java
@@ -11,6 +11,7 @@
 import net.minecraft.entity.mob.WaterCreatureEntity;
 import net.minecraft.entity.passive.AxolotlEntity;
 import net.minecraft.entity.passive.PufferfishEntity;
+import net.minecraft.entity.passive.WaterAnimalEntity;
 
 public final class FilterPassiveWaterSetting extends EntityFilterCheckbox
 {
@@ -31,7 +32,7 @@ public boolean test(Entity e)
 			return true;
 
 		return !(e instanceof WaterCreatureEntity
-			|| e instanceof AxolotlEntity);
+			|| e instanceof WaterAnimalEntity || e instanceof AxolotlEntity);
 	}
 
 	public static FilterPassiveWaterSetting genericCombat(boolean checked)