Merge v7.51 into 1.21.4

Author: Alexander01998

.github/workflows/auto_snapshot_update.yml

@@ -59,17 +59,10 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         cache-read-only: ${{ github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/heads/1.') }}
 
-    - name: Migrate mappings for main source set
+    - name: Migrate mappings
       run: |
-        ./gradlew migrateMappings --mappings ${{ inputs.yarn_mappings }} --input "src/main/java" --output "src/main/java_"
-        rm -rf ./src/main/java
-        mv ./src/main/java_ ./src/main/java
-
-    - name: Migrate mappings for test source set
-      run: |
-        ./gradlew migrateMappings --mappings ${{ inputs.yarn_mappings }} --input "src/test/java" --output "src/test/java_"
-        rm -rf ./src/test/java
-        mv ./src/test/java_ ./src/test/java
+        ./gradlew migrateMappings --mappings ${{ inputs.yarn_mappings }} --overrideInputsIHaveABackup
+        ./gradlew migrateTestMappings --mappings ${{ inputs.yarn_mappings }} --overrideInputsIHaveABackup
 
     - name: Update version constants
       run: |

.github/workflows/gradle.yml

@@ -92,15 +92,15 @@ jobs:
       run: xvfb-run --auto-servernum ./gradlew runEndToEndTest --stacktrace --warning-mode=fail --no-configuration-cache
 
     - name: Upload screenshots.zip artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       if: ${{ success() || failure() }}
       with:
         name: screenshots
         path: run/screenshots
         compression-level: 0
 
     - name: Upload crash-reports.zip artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       if: ${{ failure() }}
       with:
         name: crash-reports

build.gradle

@@ -2,6 +2,13 @@ buildscript {
 	dependencies {
 		classpath "org.kohsuke:github-api:1.330"
 	}
+	
+	configurations.classpath {
+		resolutionStrategy {
+			// v28.0-jre, used by fabric-loom 1.13.3, is vulnerable to CVE-2020-8908 and CVE-2023-2976
+			force "com.google.guava:guava:32.0.1-jre"
+		}
+	}
 }
 
 plugins {
@@ -65,8 +72,8 @@ dependencies {
 	// In other words, Wurst won't compile without this library,
 	// even though it's Minecraft that actually uses it.
 	modImplementation "com.google.code.findbugs:jsr305:3.0.2"
-	}
-	
+}
+
 loom {
 	accessWidenerPath = file("src/main/resources/wurst.accesswidener")
 }

gradle.properties

@@ -1,27 +1,27 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-org.gradle.parallel=true
-org.gradle.configuration-cache=true
-
-# Fabric Properties
-# check these at https://fabricmc.net/develop/ and
-# https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
-loader_version=0.17.3
-loom_version=1.11-SNAPSHOT
-
-# Fabric API
-fabric_version=0.119.4+1.21.4
-
-# Mod Properties
-mod_version=v7.50.3-MC1.21.4
-maven_group=net.wurstclient
-archives_base_name=Wurst-Client
-mod_loader=Fabric
-
-# GitHub
-gh_repo_id=Wurst-Imperium/Wurst7
-mcx_repo_id=Wurst-Imperium/Wurst-MCX2
-
-# Dependencies
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+org.gradle.configuration-cache=true
+
+# Fabric Properties
+# check these at https://fabricmc.net/develop/ and
+# https://modrinth.com/mod/fabric-api/versions
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.17.3
+loom_version=1.13-SNAPSHOT
+
+# Fabric API
+fabric_version=0.119.4+1.21.4
+
+# Mod Properties
+mod_version=v7.51-MC1.21.4
+maven_group=net.wurstclient
+archives_base_name=Wurst-Client
+mod_loader=Fabric
+
+# GitHub
+gh_repo_id=Wurst-Imperium/Wurst7
+mcx_repo_id=Wurst-Imperium/Wurst-MCX2
+
+# Dependencies

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.50.3";
+	public static final String VERSION = "7.51";
 	public static final String MC_VERSION = "1.21.4";
 
 	private PlausibleAnalytics plausible;

src/main/java/net/wurstclient/clickgui/ClickGuiIcons.java

@@ -174,6 +174,24 @@ public static void drawCheck(DrawContext context, float x1, float y1,
 		RenderUtils.drawLineStrip2D(context, outlineVertices, outlineColor);
 	}
 
+	public static void drawIndeterminateCheck(DrawContext context, float x1,
+		float y1, float x2, float y2, boolean hovering, boolean grayedOut)
+	{
+		float xc1 = x1 + 2.5F;
+		float xc2 = x2 - 2.5F;
+		float yc1 = y1 + 2.5F;
+		float yc2 = y2 - 2.5F;
+		
+		// fill
+		int checkColor =
+			grayedOut ? 0xC0808080 : hovering ? 0xFF00FF00 : 0xFF00D900;
+		RenderUtils.fill2D(context, xc1, yc1, xc2, yc2, checkColor);
+		
+		// outline
+		int outlineColor = 0x80101010;
+		RenderUtils.drawBorder2D(context, xc1, yc1, xc2, yc2, outlineColor);
+	}
+	
 	public static void drawCross(DrawContext context, float x1, float y1,
 		float x2, float y2, boolean hovering)
 	{

src/main/java/net/wurstclient/clickgui/components/BlockComponent.java

@@ -25,7 +25,7 @@ public final class BlockComponent extends Component
 {
 	private static final ClickGui GUI = WURST.getGui();
 	private static final TextRenderer TR = MC.textRenderer;
-	private static final int BLOCK_WITDH = 24;
+	private static final int BLOCK_WIDTH = 24;
 
 	private final BlockSetting setting;
 
@@ -39,7 +39,7 @@ public BlockComponent(BlockSetting setting)
 	@Override
 	public void handleMouseClick(double mouseX, double mouseY, int mouseButton)
 	{
-		if(mouseX < getX() + getWidth() - BLOCK_WITDH)
+		if(mouseX < getX() + getWidth() - BLOCK_WIDTH)
 			return;
 
 		switch(mouseButton)
@@ -60,7 +60,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 	{
 		int x1 = getX();
 		int x2 = x1 + getWidth();
-		int x3 = x2 - BLOCK_WITDH;
+		int x3 = x2 - BLOCK_WIDTH;
 		int y1 = getY();
 		int y2 = y1 + getHeight();
 
@@ -124,12 +124,12 @@ private String getBlockTooltip()
 	@Override
 	public int getDefaultWidth()
 	{
-		return TR.getWidth(setting.getName() + ":") + BLOCK_WITDH + 4;
+		return TR.getWidth(setting.getName() + ":") + BLOCK_WIDTH + 4;
 	}
 
 	@Override
 	public int getDefaultHeight()
 	{
-		return BLOCK_WITDH;
+		return BLOCK_WIDTH;
 	}
 }

src/main/java/net/wurstclient/clickgui/components/PlantTypeComponent.java

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2014-2025 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.clickgui.components;
+
+import org.lwjgl.glfw.GLFW;
+
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawContext;
+import net.wurstclient.clickgui.ClickGui;
+import net.wurstclient.clickgui.ClickGuiIcons;
+import net.wurstclient.clickgui.Component;
+import net.wurstclient.settings.PlantTypeSetting;
+import net.wurstclient.util.RenderUtils;
+import net.wurstclient.util.text.WText;
+
+public final class PlantTypeComponent extends Component
+{
+	private static final ClickGui GUI = WURST.getGui();
+	private static final TextRenderer TR = MC.textRenderer;
+	private static final int BOX_SIZE = 11;
+	private static final int ICON_SIZE = 24;
+	private static final String HARVEST = "Harvest";
+	private static final String REPLANT = "Replant";
+	
+	private final PlantTypeSetting setting;
+	
+	public PlantTypeComponent(PlantTypeSetting setting)
+	{
+		this.setting = setting;
+		setWidth(getDefaultWidth());
+		setHeight(getDefaultHeight());
+	}
+	
+	@Override
+	public void handleMouseClick(double mouseX, double mouseY, int mouseButton)
+	{
+		if(mouseX < getX() + ICON_SIZE)
+			return;
+		
+		if(mouseY < getY() + getHeight() - BOX_SIZE)
+			return;
+		
+		boolean hHarvest =
+			mouseX < getX() + ICON_SIZE + BOX_SIZE + TR.getWidth(HARVEST) + 4;
+		
+		switch(mouseButton)
+		{
+			case GLFW.GLFW_MOUSE_BUTTON_LEFT:
+			if(hHarvest)
+				setting.toggleHarvestingEnabled();
+			else
+				setting.toggleReplantingEnabled();
+			break;
+			
+			case GLFW.GLFW_MOUSE_BUTTON_RIGHT:
+			if(hHarvest)
+				setting.resetHarvestingEnabled();
+			else
+				setting.resetReplantingEnabled();
+			break;
+		}
+	}
+	
+	@Override
+	public void render(DrawContext context, int mouseX, int mouseY,
+		float partialTicks)
+	{
+		int harvestWidth = TR.getWidth(HARVEST);
+		
+		int x1 = getX();
+		int x2 = x1 + getWidth();
+		int x3 = x1 + ICON_SIZE;
+		int x4 = x3 + BOX_SIZE;
+		int x5 = x4 + harvestWidth + 4;
+		int x6 = x5 + BOX_SIZE;
+		int y1 = getY();
+		int y2 = y1 + getHeight();
+		int y3 = y2 - BOX_SIZE;
+		
+		boolean hovering = isHovering(mouseX, mouseY);
+		boolean hIcon = hovering && mouseX < x3;
+		boolean hName = hovering && mouseX >= x3 && mouseY < y3;
+		boolean hHarvest =
+			hovering && mouseX >= x3 && mouseX < x5 && mouseY >= y3;
+		boolean hReplant = hovering && mouseX >= x5 && mouseY >= y3;
+		
+		if(hIcon)
+			GUI.setTooltip(setting.getIcon().getName().getString());
+		else if(hName)
+			GUI.setTooltip(setting.getWrappedDescription(200));
+		else if(hHarvest)
+			GUI.setTooltip("" + WText.translated("gui.wurst.autofarm.harvest"));
+		else if(hReplant)
+			GUI.setTooltip("" + WText.translated("gui.wurst.autofarm.replant"));
+		
+		// background
+		int bgColor = getFillColor(false);
+		context.fill(x1, y1, x2, y3, bgColor);
+		context.fill(x1, y3, x3, y2, bgColor);
+		context.fill(x4, y3, x5, y2, bgColor);
+		context.fill(x6, y3, x2, y2, bgColor);
+		
+		// icon
+		RenderUtils.drawItem(context, setting.getIcon(), x1, y1, true);
+		
+		// boxes
+		context.fill(x3, y3, x4, y2, getFillColor(hHarvest));
+		context.fill(x5, y3, x6, y2, getFillColor(hReplant));
+		int outlineColor = RenderUtils.toIntColor(GUI.getAcColor(), 0.5F);
+		RenderUtils.drawBorder2D(context, x3, y3, x4, y2, outlineColor);
+		RenderUtils.drawBorder2D(context, x5, y3, x6, y2, outlineColor);
+		
+		// checks
+		if(setting.isHarvestingEnabled())
+			ClickGuiIcons.drawCheck(context, x3, y3, x4, y2, hHarvest, false);
+		if(setting.isReplantingEnabled())
+			ClickGuiIcons.drawCheck(context, x5, y3, x6, y2, hReplant, false);
+		
+		// text
+		String name = setting.getName();
+		context.drawText(TR, name, x3 + 2, y1 + 3, GUI.getTxtColor(), false);
+		context.drawText(TR, HARVEST, x4 + 2, y3 + 2, GUI.getTxtColor(), false);
+		context.drawText(TR, REPLANT, x6 + 2, y3 + 2, GUI.getTxtColor(), false);
+	}
+	
+	private int getFillColor(boolean hovering)
+	{
+		float opacity = GUI.getOpacity() * (hovering ? 1.5F : 1);
+		return RenderUtils.toIntColor(GUI.getBgColor(), opacity);
+	}
+	
+	@Override
+	public int getDefaultWidth()
+	{
+		int nameWidth = TR.getWidth(setting.getName());
+		int boxesWidth =
+			2 * BOX_SIZE + TR.getWidth(HARVEST) + TR.getWidth(REPLANT) + 6;
+		return ICON_SIZE + Math.max(nameWidth, boxesWidth);
+	}
+	
+	@Override
+	public int getDefaultHeight()
+	{
+		return ICON_SIZE;
+	}
+}