Release 3.0.0

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0
 

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0
 
@@ -53,7 +53,7 @@ jobs:
         tag: ${{ inputs.version }}
       run: |
         gh release create "$tag" \
-            --target main \
+            --target "${{ github.ref_name }}" \
             --repo="$GITHUB_REPOSITORY" \
             --title="$tag" \
             --generate-notes \

build.gradle → build.gradle.kts

@@ -1,52 +1,67 @@
+import org.gradle.api.JavaVersion.VERSION_25
+
 plugins {
-    id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
-    id 'maven-publish'
+    id("net.fabricmc.fabric-loom")
+    `maven-publish`
 }
 
-version = project.mod_version
-group = project.maven_group
+version = providers.gradleProperty("mod_version").get()
+group = providers.gradleProperty("maven_group").get()
 
 repositories {
     // Add repositories to retrieve artifacts from in here.
     // You should only use this when depending on other mods because
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
+    mavenCentral()
+
+    maven {
+        name = "Terraformers"
+        url = uri("https://maven.terraformersmc.com/")
+    }
+
+    maven {
+        name = "Modrinth"
+        url = uri("https://api.modrinth.com/maven")
+    }
 }
 
 dependencies {
     // To change the versions see the gradle.properties file
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    minecraft("com.mojang:minecraft:${providers.gradleProperty("minecraft_version").get()}")
+
+    implementation("net.fabricmc:fabric-loader:${providers.gradleProperty("loader_version").get()}")
 
     // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+    implementation("net.fabricmc.fabric-api:fabric-api:${providers.gradleProperty("fabric_api_version").get()}")
 
     // https://mvnrepository.com/artifact/org.projectlombok/lombok
     compileOnly("org.projectlombok:lombok:1.18.46")
     annotationProcessor("org.projectlombok:lombok:1.18.46")
 
-    testCompileOnly("org.projectlombok:lombok:1.18.46")
-    testAnnotationProcessor("org.projectlombok:lombok:1.18.46")
+    // https://github.com/TerraformersMC/ModMenu
+    compileOnly("com.terraformersmc:modmenu:${providers.gradleProperty("modmenu_version").get()}")
 
     // https://github.com/atteo/classindex
     include("org.atteo.classindex:classindex:3.13")
     implementation("org.atteo.classindex:classindex:3.13")
-    annotationProcessor('org.atteo.classindex:classindex:3.13')
+    annotationProcessor("org.atteo.classindex:classindex:3.13")
+
+    compileOnly("maven.modrinth:the-rettington-companion:2.0.0")
 }
 
-processResources {
-    def version = project.version
-    inputs.property "version", version
+tasks.processResources {
+    val version = version
+    inputs.property("version", version)
 
     filesMatching("fabric.mod.json") {
-        expand "version": version
+        expand("version" to version)
     }
 }
 
-tasks.withType(JavaCompile).configureEach {
-    it.options.release = 21
+tasks.withType<JavaCompile>().configureEach {
+    options.release = 25
 }
 
 java {
@@ -55,13 +70,13 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = VERSION_25
+    targetCompatibility = VERSION_25
 }
 
-jar {
-    def projectName = project.name
-    inputs.property "projectName", projectName
+tasks.jar {
+    val projectName = project.name
+    inputs.property("projectName", projectName)
 
     from("LICENSE") {
         rename { "${it}_$projectName" }
@@ -71,8 +86,8 @@ jar {
 // configure the maven publication
 publishing {
     publications {
-        create("mavenJava", MavenPublication) {
-            from components.java
+        register<MavenPublication>("mavenJava") {
+            from(components["java"])
         }
     }
 
@@ -84,3 +99,12 @@ publishing {
         // retrieving dependencies.
     }
 }
+
+loom {
+    runs {
+        named("client") {
+            property("devauth.enabled", "1")
+            property("mixin.debug.export", "true")
+        }
+    }
+}

gradle.properties

@@ -7,14 +7,16 @@ org.gradle.configuration-cache=false
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.3
-loader_version=0.19.2
-loom_version=1.17.3
+minecraft_version=26.1.2
+loader_version=0.19.3
+loom_version=1.17.11
 
 # Mod Properties
 mod_version=0.0.0
 maven_group=de.rettichlp
 
 # Dependencies
-fabric_api_version=0.138.4+1.21.10
+fabric_api_version=0.151.0+26.1.2
+
+# External mods
+modmenu_version=18.0.0-beta.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

settings.gradle.kts

@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = "Fabric"
+            url = uri("https://maven.fabricmc.net/")
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    plugins {
+        id("net.fabricmc.fabric-loom") version providers.gradleProperty("loom_version")
+    }
+}
+
+// Should match your modid
+rootProject.name = "ucutils"

src/main/java/de/rettichlp/ucutils/UCUtils.java

@@ -9,20 +9,22 @@
 import de.rettichlp.ucutils.common.services.NameTagService;
 import de.rettichlp.ucutils.common.services.NotificationService;
 import de.rettichlp.ucutils.common.services.RenderService;
+import de.rettichlp.ucutils.common.services.ResyncableTimer;
 import de.rettichlp.ucutils.common.services.SyncService;
 import de.rettichlp.ucutils.common.services.UtilService;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.client.player.LocalPlayer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static java.lang.Boolean.getBoolean;
 import static java.lang.System.currentTimeMillis;
 import static java.util.Objects.isNull;
+import static java.util.concurrent.TimeUnit.MINUTES;
 
 public class UCUtils implements ModInitializer {
 
@@ -44,9 +46,10 @@ public class UCUtils implements ModInitializer {
     public static final Api api = new Api();
     public static final Storage storage = new Storage();
     public static final Configuration configuration = new Configuration().loadFromFile();
+    public static final ResyncableTimer synchronisedMinuteTimer = new ResyncableTimer(1, 1, MINUTES);
 
-    public static ClientPlayerEntity player;
-    public static ClientPlayNetworkHandler networkHandler;
+    public static LocalPlayer player;
+    public static ClientPacketListener networkHandler;
 
     private static final String NEOPROTECT_ENTRYPOINT = "c970141b-0cca-4ad2-894b-21ac9c171cbe.shield.neoprotect.ovh";
 
@@ -55,13 +58,44 @@ public class UCUtils implements ModInitializer {
     @Override
     public void onInitialize() {
         // This entrypoint is suitable for setting up client-specific logic, such as rendering.
+        synchronisedMinuteTimer.start();
 
         syncService.syncFactionMembers();
         syncService.syncTeamMembers();
 
         this.registry.registerSounds();
 
-        syncService.startRepeatingSync();
+        // add payday minute
+        synchronisedMinuteTimer.add(_ -> {
+            if (storage.isUnicaCity() && !nameTagService.isAfk(player.getPlainTextName())) {
+                configuration.setMinutesSinceLastPayDay(configuration.getMinutesSinceLastPayDay() + 1);
+            }
+        });
+
+        // show health for hydration bar sync
+        synchronisedMinuteTimer.add(currentTick -> {
+            // every 3 minutes starting from first (not third) minute
+            if ((currentTick + 2) % 3 != 0) {
+                return;
+            }
+
+            // delayed to wait for afk message if in same minute
+            utilService.delayedAction(() -> {
+                if (storage.isUnicaCity() && !nameTagService.isAfk(player.getPlainTextName()) && configuration.getOptions().showHydration()) {
+                    commandService.sendCommandWithHiddenOutput("health");
+                }
+            }, 50);
+        });
+
+        // asynchronously save every 10 minutes
+        synchronisedMinuteTimer.add(currentTick -> {
+            // every 10 minutes
+            if (currentTick % 10 != 0) {
+                return;
+            }
+
+            new Thread(configuration::saveToFile).start();
+        });
 
         ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
             player = client.player;
@@ -73,7 +107,6 @@ public void onInitialize() {
             if (isUnicaCity) {
                 client.execute(() -> {
                     this.registry.registerListeners();
-                    renderService.initializeWidgets();
                     utilService.delayedAction(syncService::syncFactionSpecificData, 10000);
                     utilService.delayedAction(syncService::checkForUpdates, 15000);
                 });
@@ -85,7 +118,7 @@ public void onInitialize() {
         ClientLifecycleEvents.CLIENT_STOPPING.register(client -> configuration.saveToFile());
     }
 
-    private boolean isUnicaCity(ClientPlayNetworkHandler networkHandler) {
+    private boolean isUnicaCity(ClientPacketListener networkHandler) {
         if (getBoolean("fabric.development") || !configuration.getOptions().checkUnicacityServer()) {
             return true;
         }
@@ -95,7 +128,7 @@ private boolean isUnicaCity(ClientPlayNetworkHandler networkHandler) {
             return false;
         }
 
-        String addressString = networkHandler.getConnection().getAddress().toString();
+        String addressString = networkHandler.getConnection().getRemoteAddress().toString();
         // for LabyMod players, there is no dot at the end of the domain
         if (!addressString.matches(NEOPROTECT_ENTRYPOINT + "\\.?/\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}:\\d+")) {
             LOGGER.warn("Not connected to UnicaCity: {}", addressString);