Test

Author: cev-api

build.gradle

@@ -180,9 +180,18 @@ tasks.register("generateBuildConfig") {
 	def template =
 		file("src/main/templates/net/wurstclient/config/BuildConfig.java.in")
 	def modVersionValue = project.mod_version
+	def forkReleaseVersion =
+		(project.findProperty("fork_release_version") ?: "0.0").toString()
+	def ghRepoId = project.gh_repo_id.toString()
+	def ghRepoUrl = "https://github.com/${ghRepoId}"
+	def buildDate = java.time.Instant.now().toString()
 
 	inputs.file(template)
 	inputs.property("niceWurstEnabled", niceWurstEnabled)
+	inputs.property("forkReleaseVersion", forkReleaseVersion)
+	inputs.property("ghRepoId", ghRepoId)
+	inputs.property("ghRepoUrl", ghRepoUrl)
+	inputs.property("buildDate", buildDate)
 	outputs.dir(buildConfigOutput)
 
 	doLast {
@@ -194,6 +203,10 @@ tasks.register("generateBuildConfig") {
 		def content = template.getText("UTF-8")
 			.replace('${NICE_WURST}', String.valueOf(niceWurstEnabled))
 			.replace('${MOD_VERSION}', modVersionValue)
+			.replace('${FORK_RELEASE_VERSION}', forkReleaseVersion)
+			.replace('${BUILD_DATE}', buildDate)
+			.replace('${GH_REPO_ID}', ghRepoId)
+			.replace('${GH_REPO_URL}', ghRepoUrl)
 
 		def targetFile = new File(targetDir, "BuildConfig.java")
 		targetFile.setText(content, "UTF-8")

gradle.properties

@@ -16,6 +16,7 @@ fabric_api_version=0.140.2+1.21.11
 
 # Mod Properties
 mod_version=v7.51.4-CevAPI-MC1.21.11
+fork_release_version=0.39
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

src/main/java/net/wurstclient/WurstClient.java

@@ -40,6 +40,7 @@
 import net.wurstclient.presets.PresetManager;
 import net.wurstclient.settings.SettingsFile;
 import net.wurstclient.update.ProblematicResourcePackDetector;
+import net.wurstclient.update.ForkUpdateChecker;
 import net.wurstclient.update.WurstUpdater;
 import net.wurstclient.util.PlayerRangeAlertManager;
 import net.wurstclient.util.SetbackDetector;
@@ -85,6 +86,7 @@ public enum WurstClient
 	private boolean enabled = true;
 	private static boolean guiInitialized;
 	private WurstUpdater updater;
+	private ForkUpdateChecker forkUpdateChecker;
 	private ProblematicResourcePackDetector problematicPackDetector;
 	private Path wurstFolder;
 
@@ -167,6 +169,9 @@ public void initialize()
 		updater = new WurstUpdater();
 		eventManager.add(UpdateListener.class, updater);
 
+		forkUpdateChecker = new ForkUpdateChecker();
+		eventManager.add(UpdateListener.class, forkUpdateChecker);
+		
 		problematicPackDetector = new ProblematicResourcePackDetector();
 		problematicPackDetector.start();
 
@@ -392,6 +397,11 @@ public WurstUpdater getUpdater()
 		return updater;
 	}
 
+	public ForkUpdateChecker getForkUpdateChecker()
+	{
+		return forkUpdateChecker;
+	}
+	
 	public ProblematicResourcePackDetector getProblematicPackDetector()
 	{
 		return problematicPackDetector;

src/main/java/net/wurstclient/hacks/SpearAssistHack.java

@@ -220,10 +220,10 @@ public void update()
 	private int spearKillFlushCooldown;
 	private AssistMode lastAssistMode;
 
-	public SpearAssistHack()
-	{
-		super("SpearAssist");
-		setCategory(Category.COMBAT);
+	public SpearAssistHack()
+	{
+		super("SpearAssist");
+		setCategory(Category.COMBAT);
 		addSetting(assistMode);
 		addSetting(boostMode);
 		addSetting(boostSpeed);
@@ -257,17 +257,16 @@ public SpearAssistHack()
 		addSetting(spearKillLungeDelayModifier);
 		addSetting(spearKillChatFeedback);
 
-		spearKillTargetEntities.clear();
-		updateModeVisibility();
-	}
-	
-	@Override
-	public String getRenderName()
-	{
-		return assistMode.getSelected() == AssistMode.SPEARKILL
-			? getName() + " [Kill]"
-			: getName();
-	}
+		spearKillTargetEntities.clear();
+		updateModeVisibility();
+	}
+	
+	@Override
+	public String getRenderName()
+	{
+		return assistMode.getSelected() == AssistMode.SPEARKILL
+			? getName() + " [Kill]" : getName();
+	}
 
 	@Override
 	protected void onEnable()

src/main/java/net/wurstclient/mixin/TitleScreenMixin.java

@@ -32,6 +32,8 @@ public abstract class TitleScreenMixin extends Screen
 {
 	private AbstractWidget realmsButton = null;
 	private Button wurstOptionsButton;
+	private int forkInfoX = 4;
+	private int forkInfoY = 4;
 
 	private TitleScreenMixin(WurstClient wurst, Component title)
 	{
@@ -80,6 +82,9 @@ private void onAddNormalWidgets(int y, int spacingY,
 	@Inject(at = @At("RETURN"), method = "tick()V")
 	private void onTick(CallbackInfo ci)
 	{
+		if(WurstClient.INSTANCE.getForkUpdateChecker() != null)
+			WurstClient.INSTANCE.getForkUpdateChecker().startIfNeeded();
+		
 		if(realmsButton == null || wurstOptionsButton == null)
 			return;
 
@@ -95,9 +100,15 @@ private void onRender(GuiGraphics graphics, int mouseX, int mouseY,
 	{
 		Font font = minecraft.font;
 		String brand = NiceWurstModule.isActive() ? "NiceWurst" : "Wurst";
-		String text = brand + " " + BuildConfig.MOD_VERSION;
-		graphics.drawString(font, Component.literal(text).getVisualOrderText(),
-			4, 4, 0xFFFFFFFF, true);
+		String baseText = brand + " " + BuildConfig.MOD_VERSION + " v"
+			+ BuildConfig.FORK_RELEASE_VERSION;
+		String suffix = WurstClient.INSTANCE.getForkUpdateChecker() == null ? ""
+			: WurstClient.INSTANCE.getForkUpdateChecker().getStatusSuffix();
+		String text = baseText + suffix;
+		
+		Component component = Component.literal(text);
+		graphics.drawString(font, component.getVisualOrderText(), forkInfoX,
+			forkInfoY, 0xFFFFFFFF, true);
 	}
 
 	/**

src/main/templates/net/wurstclient/config/BuildConfig.java.in

@@ -6,4 +6,8 @@ public final class BuildConfig
 
 	public static final boolean NICE_WURST = ${NICE_WURST};
 	public static final String MOD_VERSION = "${MOD_VERSION}";
+	public static final String FORK_RELEASE_VERSION = "${FORK_RELEASE_VERSION}";
+	public static final String BUILD_DATE = "${BUILD_DATE}";
+	public static final String GH_REPO_ID = "${GH_REPO_ID}";
+	public static final String GH_REPO_URL = "${GH_REPO_URL}";
 }