From 9cfe7f5b0b3c718208d688447bf150ee55c2d83f Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 24 Aug 2026 09:26:31 +0000 Subject: [PATCH 1/4] Add Minecraft 26.1 Fabric and NeoForge ports. Port Advanced Backups to the popular 26.1 line, compiled against 26.1.2 with Fabric API 0.155.2 and NeoForge 26.1.2.97. Co-authored-by: Aravind --- .github/workflows/build.yml | 84 +++++- .github/workflows/publish.yml | 55 ++++ README.md | 22 +- fabric/26.1/README.md | 14 + fabric/26.1/build.gradle | 78 ++++++ fabric/26.1/gradle.properties | 21 ++ fabric/26.1/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 + fabric/26.1/gradlew | 252 ++++++++++++++++++ fabric/26.1/gradlew.bat | 94 +++++++ fabric/26.1/settings.gradle | 16 ++ .../advancedbackups/AdvancedBackups.java | 126 +++++++++ .../AdvancedBackupsCommand.java | 64 +++++ .../client/AdvancedBackupsClientCommand.java | 57 ++++ .../advancedbackups/client/BackupToast.java | 138 ++++++++++ .../client/ClientContactor.java | 50 ++++ .../advancedbackups/client/ClientWrapper.java | 61 +++++ .../advancedbackups/client/ColourHelper.java | 29 ++ .../network/NetworkHandler.java | 11 + .../network/PacketBackupStatus.java | 34 +++ .../network/PacketToastSubscribe.java | 34 +++ .../26.1/src/main/resources/fabric.mod.json | 30 +++ fabric/26.1/src/main/resources/pack.mcmeta | 6 + neoforge/26.1/README.md | 13 + neoforge/26.1/build.gradle | 122 +++++++++ neoforge/26.1/gradle.properties | 19 ++ .../26.1/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + neoforge/26.1/gradlew | 252 ++++++++++++++++++ neoforge/26.1/gradlew.bat | 94 +++++++ neoforge/26.1/settings.gradle | 12 + .../advancedbackups/AdvancedBackups.java | 139 ++++++++++ .../AdvancedBackupsCommand.java | 65 +++++ .../client/AdvancedBackupsClientCommand.java | 62 +++++ .../advancedbackups/client/BackupToast.java | 136 ++++++++++ .../client/ClientContactor.java | 50 ++++ .../advancedbackups/client/ClientWrapper.java | 55 ++++ .../advancedbackups/client/ColourHelper.java | 28 ++ .../network/NetworkHandler.java | 25 ++ .../network/PacketBackupStatus.java | 40 +++ .../network/PacketToastSubscribe.java | 34 +++ .../resources/META-INF/neoforge.mods.toml | 22 ++ neoforge/26.1/src/main/resources/pack.mcmeta | 6 + 43 files changed, 2454 insertions(+), 12 deletions(-) create mode 100644 fabric/26.1/README.md create mode 100644 fabric/26.1/build.gradle create mode 100644 fabric/26.1/gradle.properties create mode 100644 fabric/26.1/gradle/wrapper/gradle-wrapper.jar create mode 100644 fabric/26.1/gradle/wrapper/gradle-wrapper.properties create mode 100755 fabric/26.1/gradlew create mode 100644 fabric/26.1/gradlew.bat create mode 100644 fabric/26.1/settings.gradle create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackups.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackupsCommand.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/client/AdvancedBackupsClientCommand.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/client/BackupToast.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ClientContactor.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ClientWrapper.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ColourHelper.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/network/NetworkHandler.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/network/PacketBackupStatus.java create mode 100644 fabric/26.1/src/main/java/computer/heather/advancedbackups/network/PacketToastSubscribe.java create mode 100644 fabric/26.1/src/main/resources/fabric.mod.json create mode 100644 fabric/26.1/src/main/resources/pack.mcmeta create mode 100644 neoforge/26.1/README.md create mode 100644 neoforge/26.1/build.gradle create mode 100644 neoforge/26.1/gradle.properties create mode 100644 neoforge/26.1/gradle/wrapper/gradle-wrapper.jar create mode 100644 neoforge/26.1/gradle/wrapper/gradle-wrapper.properties create mode 100755 neoforge/26.1/gradlew create mode 100644 neoforge/26.1/gradlew.bat create mode 100644 neoforge/26.1/settings.gradle create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackups.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackupsCommand.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/AdvancedBackupsClientCommand.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/BackupToast.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ClientContactor.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ClientWrapper.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ColourHelper.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/NetworkHandler.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/PacketBackupStatus.java create mode 100644 neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/PacketToastSubscribe.java create mode 100644 neoforge/26.1/src/main/resources/META-INF/neoforge.mods.toml create mode 100644 neoforge/26.1/src/main/resources/pack.mcmeta diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 934baf29..a1f79461 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -716,6 +716,41 @@ jobs: path: fabric/1.21.2/build/libs/AdvancedBackups-fabric-1.21.2-${{ inputs.version }}.jar + fabric-26-1: + runs-on: ubuntu-latest + needs: core + + steps: + + - uses: actions/checkout@v3 + with: + ref: main + + - name: Download corelib + uses: actions/download-artifact@v4 + with: + name: advancedbackups-corelib.jar + path: core/build/libs/ + + - name: Set up JDK 25 + uses: actions/setup-java@v4 + with: + java-version: 25 + distribution: 'temurin' + + - name: Build Mod + run: | + cd fabric/26.1 + ./gradlew -Pversion=${{ inputs.version }} build + + + - name: Upload Mod + uses: actions/upload-artifact@v4 + with: + name: AdvancedBackups-fabric-26.1-${{ inputs.version }}.jar + path: fabric/26.1/build/libs/AdvancedBackups-fabric-26.1-${{ inputs.version }}.jar + + fabric-26-2: runs-on: ubuntu-latest needs: core @@ -935,6 +970,41 @@ jobs: + neoforge-26-1: + runs-on: ubuntu-latest + needs: core + + steps: + + - uses: actions/checkout@v3 + with: + ref: main + + - name: Download corelib + uses: actions/download-artifact@v4 + with: + name: advancedbackups-corelib.jar + path: core/build/libs/ + + - name: Set up JDK 25 + uses: actions/setup-java@v4 + with: + java-version: 25 + distribution: 'temurin' + + - name: Build Mod + run: | + cd neoforge/26.1 + ./gradlew -Pversion=${{ inputs.version }} build + + + - name: Upload Mod + uses: actions/upload-artifact@v4 + with: + name: AdvancedBackups-neoforge-26.1-${{ inputs.version }}.jar + path: neoforge/26.1/build/libs/AdvancedBackups-neoforge-26.1-${{ inputs.version }}.jar + + neoforge-26-2: runs-on: ubuntu-latest needs: core @@ -1015,7 +1085,7 @@ jobs: runs-on: ubuntu-latest needs: [core, forge-1-7-10, forge-1-12-2, forge-1-16, forge-1-18, fabric-1-18, forge-1-19-2, forge-1-19-3, fabric-1-19-2, fabric-1-19-3, forge-1-20, forge-1-20-2, fabric-1-20, fabric-1-20-2, neoforge-1-20-2, - forge-1-20-4, forge-1-20-6, fabric-1-20-4, fabric-1-21, fabric-1-21-2, fabric-26-2, neoforge-1-20-4, fabric-1-20-6, neoforge-1-20-6, neoforge-1-21, neoforge-1-21-2, neoforge-26-2, + forge-1-20-4, forge-1-20-6, fabric-1-20-4, fabric-1-21, fabric-1-21-2, fabric-26-1, fabric-26-2, neoforge-1-20-4, fabric-1-20-6, neoforge-1-20-6, neoforge-1-21, neoforge-1-21-2, neoforge-26-1, neoforge-26-2, spigot-1-21] steps: @@ -1135,6 +1205,12 @@ jobs: name: AdvancedBackups-fabric-1.21.2-${{ inputs.version }}.jar path: archives/ + - name: Download Fabric-26-1 + uses: actions/download-artifact@v4 + with: + name: AdvancedBackups-fabric-26.1-${{ inputs.version }}.jar + path: archives/ + - name: Download Fabric-26-2 uses: actions/download-artifact@v4 with: @@ -1171,6 +1247,12 @@ jobs: name: AdvancedBackups-neoforge-1.21.2-${{ inputs.version }}.jar path: archives/ + - name: Download Neoforge-26-1 + uses: actions/download-artifact@v4 + with: + name: AdvancedBackups-neoforge-26.1-${{ inputs.version }}.jar + path: archives/ + - name: Download Neoforge-26-2 uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a70587ee..e4b6cce2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,12 +37,14 @@ on: - Fabric 1.20.6 - Fabric 1.21 - Fabric 1.21.2 + - Fabric 26.1 - Fabric 26.2 - Neoforge 1.20.2 - Neoforge 1.20.4 - Neoforge 1.20.6 - Neoforge 1.21 - Neoforge 1.21.2 + - Neoforge 26.1 - Neoforge 26.2 - Spigot 1.21 @@ -631,6 +633,33 @@ jobs: changelog: ${{ vars.CHANGELOG }} + - name: Upload Fabric 26.1 + + if: inputs.version == 'Fabric 26.1' || inputs.version == 'All' + uses: Kir-Antipov/mc-publish@v3.3 + with: + curseforge-id: 876284 + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + modrinth-id: Jrmoreqs + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + modrinth-featured: false + files: | + **/AdvancedBackups-fabric-26.1-${{ steps.version.outputs.VERSION }}.jar + name: Fabric 26.1 - ${{ steps.version.outputs.VERSION }} + version: ${{ steps.version.outputs.VERSION }} + version-type: release + loaders: | + fabric + quilt + game-versions: | + 26.1 + 26.1.1 + 26.1.2 + java: | + Java 25 + changelog: ${{ vars.CHANGELOG }} + + - name: Upload Fabric 26.2 if: inputs.version == 'Fabric 26.2' || inputs.version == 'All' @@ -798,6 +827,32 @@ jobs: changelog: ${{ vars.CHANGELOG }} + - name: Upload Neoforge 26.1 + + if: inputs.version == 'Neoforge 26.1' || inputs.version == 'All' + uses: Kir-Antipov/mc-publish@v3.3 + with: + curseforge-id: 876284 + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + modrinth-id: Jrmoreqs + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + modrinth-featured: false + files: | + **/AdvancedBackups-neoforge-26.1-${{ steps.version.outputs.VERSION }}.jar + name: Neoforge 26.1 - ${{ steps.version.outputs.VERSION }} + version: ${{ steps.version.outputs.VERSION }} + version-type: release + loaders: | + neoforge + game-versions: | + 26.1 + 26.1.1 + 26.1.2 + java: | + Java 25 + changelog: ${{ vars.CHANGELOG }} + + - name: Upload Neoforge 26.2 if: inputs.version == 'Neoforge 26.2' || inputs.version == 'All' diff --git a/README.md b/README.md index 2cfe92d3..c7f8be39 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,15 @@ A powerful backup mod for Minecraft, supporting Neoforge, Forge and Fabric. Many Minecraft versions are supported - request more if the one you want isn't yet supported. -### Minecraft 26.2 Support -**Version 3.8-26.2** adds Fabric and NeoForge support for Minecraft 26.2 (Chaos Cubed). +### Minecraft 26.1 and 26.2 Support +**Version 3.8-26.1** and **3.8-26.2** add Fabric and NeoForge support for Minecraft 26.1 (including 26.1.2) and 26.2 (Chaos Cubed). -| Requirement | Version | -|-------------|---------| -| Fabric Loader | 0.19.3+ | -| Fabric API | 0.157.0+26.2 | -| NeoForge | 26.2.0.59+ | -| Java | 25+ | +| Requirement | 26.1 | 26.2 | +|-------------|------|------| +| Fabric Loader | 0.19.3+ | 0.19.3+ | +| Fabric API | 0.155.2+26.1.2 | 0.157.0+26.2 | +| NeoForge | 26.1.2.97+ | 26.2.0.59+ | +| Java | 25+ | 25+ | Toast notifications render with the advancement toast background, text, item icon, and progress bar. @@ -40,12 +40,12 @@ The latest Minecraft release supported here is **26.2**. | Loader | Minecraft versions | |--------|--------------------| -| Fabric | 1.18, 1.19.2, 1.19.3, 1.20, 1.20.2, 1.20.6, 1.21, 1.21.2, 1.21.10, **26.2** | -| NeoForge | 1.20.2, 1.20.4, 1.20.6, 1.21, 1.21.2, **26.2** | +| Fabric | 1.18, 1.19.2, 1.19.3, 1.20, 1.20.2, 1.20.6, 1.21, 1.21.2, 1.21.10, **26.1**, **26.2** | +| NeoForge | 1.20.2, 1.20.4, 1.20.6, 1.21, 1.21.2, **26.1**, **26.2** | | Forge | 1.7.10, 1.12, 1.16, 1.18, 1.19.2, 1.19.3, 1.20, 1.20.2, 1.20.6 | | Spigot | 1.21 | -Minecraft 26.2 requires **Java 25**. Older ports keep their original Java requirements. +Minecraft 26.1 and 26.2 require **Java 25**. Older ports keep their original Java requirements. ## Features: - Command-line restoration tool built into the jar, with helper scripts to run it diff --git a/fabric/26.1/README.md b/fabric/26.1/README.md new file mode 100644 index 00000000..c8df509f --- /dev/null +++ b/fabric/26.1/README.md @@ -0,0 +1,14 @@ +# Fabric - 26.1 + +This is the port for Fabric Minecraft 26.1, compiled against 26.1.2. + +## Build Information +- **Version**: 3.8-26.1 +- **Minecraft**: 26.1 / 26.1.1 / 26.1.2 +- **Fabric Loader**: 0.19.3+ +- **Fabric API**: 0.155.2+26.1.2 +- **Java**: 25+ + +Toast background rendering uses `GuiGraphicsExtractor.blitSprite` and `RenderPipelines.GUI_TEXTURED`. + +For full documentation, see the main repository README. diff --git a/fabric/26.1/build.gradle b/fabric/26.1/build.gradle new file mode 100644 index 00000000..8879ec24 --- /dev/null +++ b/fabric/26.1/build.gradle @@ -0,0 +1,78 @@ +plugins { + id 'net.fabricmc.fabric-loom' version "${loom_version}" + id 'maven-publish' +} + +apply from: '../../global.properties' + +group = project.maven_group +version = project.version + +base { + archivesName = 'AdvancedBackups-' + modloaderName + "-" + minecraftVersion +} + +repositories { +} + +configurations { + extraLibs +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + + implementation files(abCoreLibPath) + extraLibs files(abCoreLibPath) +} + +processResources { + def version = project.version + inputs.property "version", version + + filesMatching("fabric.mod.json") { + expand "version": version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 25 + it.options.encoding = 'UTF-8' +} + +java { + withSourcesJar() + toolchain { + languageVersion = JavaLanguageVersion.of(25) + } +} + +jar { + manifest { + attributes([ + "Main-Class" : "computer.heather.advancedbackups.cli.AdvancedBackupsCLI", + "Specification-Title" : "advancedbackups", + "Specification-Vendor" : "Heather White", + "Specification-Version" : "1", + "Implementation-Title" : project.name, + "Implementation-Version" : project.jar.archiveVersion, + "Implementation-Vendor" : "Heather White", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } + from { + configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) } + } +} + +publishing { + publications { + create("mavenJava", MavenPublication) { + from components.java + } + } + repositories { + } +} diff --git a/fabric/26.1/gradle.properties b/fabric/26.1/gradle.properties new file mode 100644 index 00000000..056fec26 --- /dev/null +++ b/fabric/26.1/gradle.properties @@ -0,0 +1,21 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=26.1.2 +loader_version=0.19.3 +loom_version=1.17-SNAPSHOT + +# Mod Properties +version=3.8-26.1 +mod_version=3.8-26.1 +maven_group=computer.heather.advancedbackups +archives_base_name=advancedbackups +modloaderName=fabric +minecraftVersion=26.1 + +# Dependencies +fabric_api_version=0.155.2+26.1.2 diff --git a/fabric/26.1/gradle/wrapper/gradle-wrapper.jar b/fabric/26.1/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/fabric/26.1/gradle/wrapper/gradle-wrapper.properties b/fabric/26.1/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..df6a6ad7 --- /dev/null +++ b/fabric/26.1/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,9 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/fabric/26.1/gradlew b/fabric/26.1/gradlew new file mode 100755 index 00000000..f5feea6d --- /dev/null +++ b/fabric/26.1/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/fabric/26.1/gradlew.bat b/fabric/26.1/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/fabric/26.1/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/fabric/26.1/settings.gradle b/fabric/26.1/settings.gradle new file mode 100644 index 00000000..cba66f29 --- /dev/null +++ b/fabric/26.1/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} + +rootProject.name = 'fabric-26.1' diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackups.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackups.java new file mode 100644 index 00000000..6d8045c3 --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackups.java @@ -0,0 +1,126 @@ +package computer.heather.advancedbackups; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import computer.heather.advancedbackups.client.ClientContactor; +import computer.heather.advancedbackups.core.ABCore; +import computer.heather.advancedbackups.core.backups.BackupTimer; +import computer.heather.advancedbackups.core.backups.BackupWrapper; +import computer.heather.advancedbackups.core.config.ConfigManager; +import computer.heather.advancedbackups.network.PacketBackupStatus; +import computer.heather.advancedbackups.network.PacketToastSubscribe; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.level.storage.LevelResource; + +public class AdvancedBackups implements ModInitializer { + + public static final Logger LOGGER = LoggerFactory.getLogger("advanced-backups"); + + public static final Consumer infoLogger = LOGGER::info; + public static final Consumer warningLogger = LOGGER::warn; + public static final Consumer errorLogger = LOGGER::error; + + public static final ArrayList players = new ArrayList<>(); + + public static MinecraftServer server; + + @Override + public void onInitialize() { + + ServerLifecycleEvents.SERVER_STARTING.register((server) -> { + AdvancedBackups.server = server; + ABCore.worldName = server.getWorldData().getLevelName(); + ABCore.worldDir = server.getWorldPath(LevelResource.ROOT); + + ABCore.disableSaving = AdvancedBackups::disableSaving; + ABCore.enableSaving = AdvancedBackups::enableSaving; + ABCore.saveOnce = AdvancedBackups::saveOnce; + + ABCore.infoLogger = infoLogger; + ABCore.warningLogger = warningLogger; + ABCore.errorLogger = errorLogger; + + ABCore.resetActivity = AdvancedBackups::resetActivity; + + ABCore.clientContactor = new ClientContactor(); + ABCore.modJar = FabricLoader.getInstance() + .getModContainer("advancedbackups") + .get() + .getOrigin() + .getPaths() + .get(0) + .toFile(); + + ConfigManager.loadOrCreateConfig(); + LOGGER.info("Config loaded!!"); + }); + + ServerLifecycleEvents.SERVER_STARTED.register((server) -> { + BackupWrapper.checkStartupBackups(); + }); + ServerLifecycleEvents.SERVER_STOPPING.register((server) -> { + BackupWrapper.checkShutdownBackups(); + }); + + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> { + ABCore.setActivity(true); + }); + + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> { + AdvancedBackupsCommand.register(dispatcher); + }); + + ServerTickEvents.END_SERVER_TICK.register((server) -> { + BackupTimer.check(); + }); + + PayloadTypeRegistry.clientboundPlay().register(PacketBackupStatus.TYPE, PacketBackupStatus.CODEC); + PayloadTypeRegistry.serverboundPlay().register(PacketToastSubscribe.TYPE, PacketToastSubscribe.CODEC); + + ServerPlayNetworking.registerGlobalReceiver(PacketToastSubscribe.TYPE, PacketToastSubscribe::handle); + } + + public static void disableSaving() { + MinecraftServer server = AdvancedBackups.server; + for (ServerLevel level : server.getAllLevels()) { + if (level != null && !level.noSave) { + level.noSave = true; + } + } + } + + public static void enableSaving() { + MinecraftServer server = AdvancedBackups.server; + for (ServerLevel level : server.getAllLevels()) { + if (level != null && level.noSave) { + level.noSave = false; + } + } + } + + public static void saveOnce(boolean flush) { + MinecraftServer server = AdvancedBackups.server; + server.saveEverything(true, flush, true); + } + + public static void resetActivity() { + List players = server.getPlayerList().getPlayers(); + ABCore.setActivity(!players.isEmpty()); + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackupsCommand.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackupsCommand.java new file mode 100644 index 00000000..28eb0e8a --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackupsCommand.java @@ -0,0 +1,64 @@ +package computer.heather.advancedbackups; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; + +import computer.heather.advancedbackups.core.CoreCommandSystem; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.network.chat.Component; + +public class AdvancedBackupsCommand { + public static void register(CommandDispatcher stack) { + stack.register(Commands.literal("backup").requires((runner) -> { + return !AdvancedBackups.server.isDedicatedServer() || Commands.LEVEL_GAMEMASTERS.check(runner.permissions()); + }).then(Commands.literal("start").executes((runner) -> { + CoreCommandSystem.startBackup((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + .then(Commands.literal("reload-config").executes((runner) -> { + CoreCommandSystem.reloadConfig((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + .then(Commands.literal("reset-chain").executes((runner) -> { + CoreCommandSystem.resetChainLength((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + .then(Commands.literal("snapshot").executes((runner) -> { + CoreCommandSystem.snapshot((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }, "snapshot"); + return 1; + }) + .then(Commands.argument("name", StringArgumentType.greedyString()).executes((runner) -> { + String snapshotName = StringArgumentType.getString(runner, "name"); + CoreCommandSystem.snapshot((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }, snapshotName); + return 1; + }))) + + .then(Commands.literal("cancel").executes((runner) -> { + CoreCommandSystem.cancelBackup((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + .then(Commands.literal("reload-client-config").executes((runner) -> { + runner.getSource().sendSuccess(() -> Component.literal("This command can only be ran on the client!"), true); + return 1; + })) + + ); + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/AdvancedBackupsClientCommand.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/AdvancedBackupsClientCommand.java new file mode 100644 index 00000000..b6f1d311 --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/AdvancedBackupsClientCommand.java @@ -0,0 +1,57 @@ +package computer.heather.advancedbackups.client; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; + +import computer.heather.advancedbackups.core.CoreCommandSystem; +import net.fabricmc.fabric.api.client.command.v2.ClientCommands; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import net.minecraft.client.Minecraft; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ServerboundChatCommandPacket; + +public class AdvancedBackupsClientCommand { + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(ClientCommands.literal("backup").requires((runner) -> { + return true; + }).then(ClientCommands.literal("start").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup start")); + return 1; + })) + + .then(ClientCommands.literal("reload-config").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup reload-config")); + return 1; + })) + + .then(ClientCommands.literal("reset-chain").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup reset-chain")); + return 1; + })) + + .then(ClientCommands.literal("snapshot").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup snapshot")); + return 1; + }) + + .then(ClientCommands.argument("name", StringArgumentType.greedyString()).executes((runner) -> { + String snapshotName = StringArgumentType.getString(runner, "name"); + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup snapshot " + snapshotName)); + return 1; + }))) + + .then(ClientCommands.literal("cancel").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup cancel")); + return 1; + })) + + .then(ClientCommands.literal("reload-client-config").executes((runner) -> { + CoreCommandSystem.reloadClientConfig((response) -> { + runner.getSource().sendFeedback(Component.literal(response)); + }); + return 1; + })) + + ); + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/BackupToast.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/BackupToast.java new file mode 100644 index 00000000..c54bcb20 --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/BackupToast.java @@ -0,0 +1,138 @@ +package computer.heather.advancedbackups.client; + +import computer.heather.advancedbackups.core.config.ClientConfigManager; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphicsExtractor; +import net.minecraft.client.gui.components.toasts.Toast; +import net.minecraft.client.gui.components.toasts.ToastManager; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; + +public class BackupToast implements Toast { + + public static boolean starting; + public static boolean started; + public static boolean failed; + public static boolean finished; + public static boolean cancelled; + + public static int progress; + public static int max; + + public static boolean exists = false; + + private static long time; + private static boolean timeSet = false; + + public static final ItemStack stack = new ItemStack(Items.PAPER); + private static final Identifier TEXTURE = Identifier.withDefaultNamespace("toast/advancement"); + + public static String title = "You shouldn't see this!"; + public static int textColour = 0; + + private Visibility visibility = Visibility.SHOW; + + @Override + public void extractRenderState(GuiGraphicsExtractor graphics, Font font, long fullyVisibleForMs) { + graphics.blitSprite(RenderPipelines.GUI_TEXTURED, TEXTURE, 0, ClientConfigManager.darkMode.get() ? 0 : this.height(), this.width(), this.height()); + graphics.fakeItem(stack, 8, 8); + + float percent = finished ? 100 : (float) progress / (float) max; + + graphics.fill(4, 28, 156, 29, ColourHelper.colour( + 255, + (int) ClientConfigManager.progressBackgroundRed.get(), + (int) ClientConfigManager.progressBackgroundGreen.get(), + (int) ClientConfigManager.progressBackgroundBlue.get())); + + float f = Math.min(156, (156 * percent)); + + if (!exists) { + if (title.equals(I18n.get("advancedbackups.backup_finished"))) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.progressTextRed.get(), (int) ClientConfigManager.progressTextGreen.get(), (int) ClientConfigManager.progressTextBlue.get()); + graphics.text(font, I18n.get(title), 25, 11, textColour, false); + graphics.fill(4, 28, 156, 29, ColourHelper.colour( + 255, + (int) ClientConfigManager.progressBarRed.get(), + (int) ClientConfigManager.progressBarGreen.get(), + (int) ClientConfigManager.progressBarBlue.get())); + } else { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.errorTextRed.get(), (int) ClientConfigManager.errorTextGreen.get(), (int) ClientConfigManager.errorTextBlue.get()); + graphics.text(font, I18n.get(title), 25, 11, textColour, false); + } + visibility = Visibility.HIDE; + return; + } + + title = "You shouldn't see this!"; + + if (starting) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.progressTextRed.get(), (int) ClientConfigManager.progressTextGreen.get(), (int) ClientConfigManager.progressTextBlue.get()); + title = I18n.get("advancedbackups.backup_starting"); + } else if (started) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.progressTextRed.get(), (int) ClientConfigManager.progressTextGreen.get(), (int) ClientConfigManager.progressTextBlue.get()); + title = I18n.get("advancedbackups.progress", round(percent * 100)); + } else if (failed) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.errorTextRed.get(), (int) ClientConfigManager.errorTextGreen.get(), (int) ClientConfigManager.errorTextBlue.get()); + title = I18n.get("advancedbackups.backup_failed"); + if (!timeSet) { + time = System.currentTimeMillis(); + timeSet = true; + } + } else if (finished) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.progressTextRed.get(), (int) ClientConfigManager.progressTextGreen.get(), (int) ClientConfigManager.progressTextBlue.get()); + title = I18n.get("advancedbackups.backup_finished"); + if (!timeSet) { + time = System.currentTimeMillis(); + timeSet = true; + } + } else if (cancelled) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.errorTextRed.get(), (int) ClientConfigManager.errorTextGreen.get(), (int) ClientConfigManager.errorTextBlue.get()); + title = I18n.get("advancedbackups.backup_cancelled"); + if (!timeSet) { + time = System.currentTimeMillis(); + timeSet = true; + } + } + + graphics.text(font, title, 25, 11, textColour, false); + + if (timeSet && System.currentTimeMillis() >= time + 5000) { + starting = false; + started = false; + failed = false; + finished = false; + progress = 0; + max = 0; + timeSet = false; + exists = false; + visibility = Visibility.HIDE; + return; + } + + graphics.fill(4, 28, Math.max(4, (int) f), 29, ColourHelper.colour( + 255, + (int) ClientConfigManager.progressBarRed.get(), + (int) ClientConfigManager.progressBarGreen.get(), + (int) ClientConfigManager.progressBarBlue.get())); + + visibility = Visibility.SHOW; + } + + private static String round(float value) { + return String.format("%.1f", value); + } + + @Override + public Visibility getWantedVisibility() { + return visibility; + } + + @Override + public void update(ToastManager manager, long fullyVisibleForMs) { + // Toast lifetime is tracked in extractRenderState. + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ClientContactor.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ClientContactor.java new file mode 100644 index 00000000..e420f4da --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ClientContactor.java @@ -0,0 +1,50 @@ +package computer.heather.advancedbackups.client; + +import java.util.List; + +import computer.heather.advancedbackups.AdvancedBackups; +import computer.heather.advancedbackups.interfaces.IClientContactor; +import computer.heather.advancedbackups.network.NetworkHandler; +import computer.heather.advancedbackups.network.PacketBackupStatus; +import net.minecraft.commands.Commands; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; + +public class ClientContactor implements IClientContactor { + + @Override + public void backupComplete(boolean all) { + send(new PacketBackupStatus(false, false, false, true, false, 0, 0), all); + } + + @Override + public void backupFailed(boolean all) { + send(new PacketBackupStatus(false, false, true, false, false, 0, 0), all); + } + + @Override + public void backupProgress(int progress, int max, boolean all) { + send(new PacketBackupStatus(false, true, false, false, false, progress, max), all); + } + + @Override + public void backupStarting(boolean all) { + send(new PacketBackupStatus(true, false, false, false, false, 0, 0), all); + } + + @Override + public void backupCancelled(boolean all) { + send(new PacketBackupStatus(false, false, false, false, true, 0, 0), all); + } + + private void send(PacketBackupStatus packet, boolean all) { + MinecraftServer server = AdvancedBackups.server; + List players = server.getPlayerList().getPlayers(); + for (ServerPlayer player : players) { + if (!AdvancedBackups.players.contains(player.getStringUUID())) continue; + if (!server.isDedicatedServer() || Commands.LEVEL_ADMINS.check(player.permissions()) || all) { + NetworkHandler.sendToClient(player, packet); + } + } + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ClientWrapper.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ClientWrapper.java new file mode 100644 index 00000000..d193c361 --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ClientWrapper.java @@ -0,0 +1,61 @@ +package computer.heather.advancedbackups.client; + +import computer.heather.advancedbackups.AdvancedBackups; +import computer.heather.advancedbackups.core.ABCore; +import computer.heather.advancedbackups.core.config.ClientConfigManager; +import computer.heather.advancedbackups.network.PacketBackupStatus; +import computer.heather.advancedbackups.network.PacketToastSubscribe; +import net.fabricmc.api.ClientModInitializer; +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.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.minecraft.client.Minecraft; + +public class ClientWrapper implements ClientModInitializer { + + @Override + public void onInitializeClient() { + + ABCore.infoLogger = AdvancedBackups.infoLogger; + ABCore.warningLogger = AdvancedBackups.warningLogger; + ABCore.errorLogger = AdvancedBackups.errorLogger; + + ClientLifecycleEvents.CLIENT_STARTED.register((client) -> { + ClientConfigManager.loadOrCreateConfig(); + }); + + ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> { + PacketToastSubscribe packet = new PacketToastSubscribe(ClientConfigManager.showProgress.get()); + if (ClientPlayNetworking.canSend(PacketToastSubscribe.TYPE)) { + ClientPlayNetworking.send(packet); + } else { + ABCore.warningLogger.accept("Refusing to send packet " + packet + " as the server cannot accept it!"); + } + }); + + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> { + AdvancedBackupsClientCommand.register(dispatcher); + }); + + ClientPlayNetworking.registerGlobalReceiver(PacketBackupStatus.TYPE, ClientWrapper::handle); + } + + public static void handle(PacketBackupStatus message, ClientPlayNetworking.Context context) { + Minecraft.getInstance().execute(() -> { + BackupToast.starting = message.starting(); + BackupToast.started = message.started(); + BackupToast.failed = message.failed(); + BackupToast.finished = message.finished(); + BackupToast.cancelled = message.cancelled(); + + BackupToast.progress = message.progress(); + BackupToast.max = message.max(); + + if (!BackupToast.exists) { + BackupToast.exists = true; + Minecraft.getInstance().getToastManager().addToast(new BackupToast()); + } + }); + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ColourHelper.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ColourHelper.java new file mode 100644 index 00000000..9da12efd --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/client/ColourHelper.java @@ -0,0 +1,29 @@ +package computer.heather.advancedbackups.client; + +//A colour helper, loosely based on that of vanilla 1.16. +public class ColourHelper { + + public static int alpha(int in) { + return in >>> 24; + } + + public static int red(int in) { + return in >> 16 & 255; + } + + public static int green(int in) { + return in >> 8 & 255; + } + + public static int blue(int in) { + return in & 255; + } + + public static int colour(int a, int r, int g, int b) { + return a << 24 | r << 16 | g << 8 | b; + } + + public static int colour(int a, long r, long g, long b) { + return colour(a, (int) r, (int) g, (int) b); + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/NetworkHandler.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/NetworkHandler.java new file mode 100644 index 00000000..b9f70dff --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/NetworkHandler.java @@ -0,0 +1,11 @@ +package computer.heather.advancedbackups.network; + +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.server.level.ServerPlayer; + +public class NetworkHandler { + + public static void sendToClient(ServerPlayer player, PacketBackupStatus packet) { + ServerPlayNetworking.send(player, packet); + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/PacketBackupStatus.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/PacketBackupStatus.java new file mode 100644 index 00000000..280477d7 --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/PacketBackupStatus.java @@ -0,0 +1,34 @@ +package computer.heather.advancedbackups.network; + +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.Identifier; + +public record PacketBackupStatus(boolean starting, boolean started, boolean failed, boolean finished, boolean cancelled, int progress, int max) implements CustomPacketPayload { + + public static final Type TYPE = new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath("advancedbackups", "backup_status")); + + public static final StreamCodec CODEC = StreamCodec.of((buf, packet) -> { + buf.writeBoolean(packet.starting); + buf.writeBoolean(packet.started); + buf.writeBoolean(packet.failed); + buf.writeBoolean(packet.finished); + buf.writeBoolean(packet.cancelled); + buf.writeInt(packet.progress); + buf.writeInt(packet.max); + }, buf -> new PacketBackupStatus( + buf.readBoolean(), + buf.readBoolean(), + buf.readBoolean(), + buf.readBoolean(), + buf.readBoolean(), + buf.readInt(), + buf.readInt() + )); + + @Override + public Type type() { + return TYPE; + } +} diff --git a/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/PacketToastSubscribe.java b/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/PacketToastSubscribe.java new file mode 100644 index 00000000..4a90ba93 --- /dev/null +++ b/fabric/26.1/src/main/java/computer/heather/advancedbackups/network/PacketToastSubscribe.java @@ -0,0 +1,34 @@ +package computer.heather.advancedbackups.network; + +import computer.heather.advancedbackups.AdvancedBackups; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.Identifier; +import net.minecraft.server.level.ServerPlayer; + +public record PacketToastSubscribe(boolean enable) implements CustomPacketPayload { + + public static final Type TYPE = new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath("advancedbackups", "toast_subscribe")); + + public static final StreamCodec CODEC = StreamCodec.of( + (buf, packet) -> buf.writeBoolean(packet.enable), + buf -> new PacketToastSubscribe(buf.readBoolean()) + ); + + public static void handle(PacketToastSubscribe message, ServerPlayNetworking.Context context) { + ServerPlayer player = context.player(); + + if (message.enable() && !AdvancedBackups.players.contains(player.getStringUUID())) { + AdvancedBackups.players.add(player.getStringUUID()); + } else if (!message.enable()) { + AdvancedBackups.players.remove(player.getStringUUID()); + } + } + + @Override + public Type type() { + return TYPE; + } +} diff --git a/fabric/26.1/src/main/resources/fabric.mod.json b/fabric/26.1/src/main/resources/fabric.mod.json new file mode 100644 index 00000000..bc54a123 --- /dev/null +++ b/fabric/26.1/src/main/resources/fabric.mod.json @@ -0,0 +1,30 @@ +{ + "schemaVersion": 1, + "id": "advancedbackups", + "version": "${version}", + "name": "Advanced Backups", + "description": "An extremely advanced backup mod.\n\nSupports many backup types.\n\nConfig file and github contain documentation.", + "authors": [ + "Mommy Heather" + ], + "contact": { + "homepage": "https://github.com/HeatherComputer/advancedbackups" + }, + "license": "BSD", + "icon": "assets/advanced-backups/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "computer.heather.advancedbackups.AdvancedBackups" + ], + "client": [ + "computer.heather.advancedbackups.client.ClientWrapper" + ] + }, + "depends": { + "fabricloader": ">=0.19.3", + "minecraft": "~26.1", + "java": ">=25", + "fabric-api": "*" + } +} diff --git a/fabric/26.1/src/main/resources/pack.mcmeta b/fabric/26.1/src/main/resources/pack.mcmeta new file mode 100644 index 00000000..16c80270 --- /dev/null +++ b/fabric/26.1/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "advancedbackups resources", + "pack_format": 81 + } +} diff --git a/neoforge/26.1/README.md b/neoforge/26.1/README.md new file mode 100644 index 00000000..569f39e0 --- /dev/null +++ b/neoforge/26.1/README.md @@ -0,0 +1,13 @@ +# NeoForge - 26.1 + +This is the port for NeoForge Minecraft 26.1, compiled against 26.1.2. + +## Build Information +- **Version**: 3.8-26.1 +- **Minecraft**: 26.1 / 26.1.1 / 26.1.2 +- **NeoForge**: 26.1.2.97+ +- **Java**: 25+ + +Toast background rendering uses `GuiGraphicsExtractor.blitSprite` and `RenderPipelines.GUI_TEXTURED`. + +For full documentation, see the main repository README. diff --git a/neoforge/26.1/build.gradle b/neoforge/26.1/build.gradle new file mode 100644 index 00000000..85134724 --- /dev/null +++ b/neoforge/26.1/build.gradle @@ -0,0 +1,122 @@ +plugins { + id 'java-library' + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.neoforged.gradle.userdev' version '7.1.38' +} + +tasks.named('wrapper', Wrapper).configure { + distributionType = Wrapper.DistributionType.BIN +} + +apply from: '../../global.properties' + +group = mod_group_id +version = "${project.version == 'unspecified' ? mod_version : project.version}" + +configurations { + extraLibs +} + +repositories { + mavenLocal() +} + +base { + archivesName = 'AdvancedBackups-' + modloaderName + "-" + minecraftVersion +} + +java.toolchain.languageVersion = JavaLanguageVersion.of(25) + +runs { + configureEach { + systemProperty 'forge.logging.markers', 'REGISTRIES' + systemProperty 'forge.logging.console.level', 'debug' + workingDirectory project.layout.projectDirectory.dir('run').dir(name) + modSource project.sourceSets.main + } + + client { + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + server { + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + argument '--nogui' + } + + gameTestServer { + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } +} + +sourceSets.main.resources { srcDir 'src/generated/resources' } + +dependencies { + implementation "net.neoforged:neoforge:${neo_version}" + implementation files(abCoreLibPath) + extraLibs files(abCoreLibPath) +} + +tasks.withType(ProcessResources).configureEach { + var replaceProperties = [ + minecraft_version : minecraft_version, + minecraft_version_range : minecraft_version_range, + neo_version : neo_version, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : version, + mod_authors : mod_authors, + mod_description : mod_description + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/neoforge.mods.toml']) { + expand replaceProperties + [project: project] + } +} + +tasks.named('jar', Jar).configure { + manifest { + attributes([ + "Main-Class" : "computer.heather.advancedbackups.cli.AdvancedBackupsCLI", + "Specification-Title" : "advancedbackups", + "Specification-Vendor" : "Heather White", + "Specification-Version" : "1", + "Implementation-Title" : project.name, + "Implementation-Version" : project.jar.archiveVersion, + "Implementation-Vendor" : "Heather White", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } + from { + configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) } + } +} + +publishing { + publications { + register('mavenJava', MavenPublication) { + from components.java + } + } + repositories { + maven { + url "file://${project.projectDir}/repo" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + options.release = 25 +} + +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} diff --git a/neoforge/26.1/gradle.properties b/neoforge/26.1/gradle.properties new file mode 100644 index 00000000..eda24d3b --- /dev/null +++ b/neoforge/26.1/gradle.properties @@ -0,0 +1,19 @@ +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false +org.gradle.parallel=true +org.gradle.configuration-cache=false + +minecraft_version=26.1.2 +minecraft_version_range=[26.1,26.2) +neo_version=26.1.2.97 + +mod_id=advancedbackups +mod_name=Advanced Backups +mod_license=BSD +mod_version=3.8-26.1 +mod_group_id=computer.heather.advancedbackups +mod_authors=Heather White +mod_description=A highly advanced and configurable backup mod. Github contains documentation. + +modloaderName=neoforge +minecraftVersion=26.1 diff --git a/neoforge/26.1/gradle/wrapper/gradle-wrapper.jar b/neoforge/26.1/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/neoforge/26.1/gradle/wrapper/gradle-wrapper.properties b/neoforge/26.1/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..5dd3c012 --- /dev/null +++ b/neoforge/26.1/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/neoforge/26.1/gradlew b/neoforge/26.1/gradlew new file mode 100755 index 00000000..f5feea6d --- /dev/null +++ b/neoforge/26.1/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/neoforge/26.1/gradlew.bat b/neoforge/26.1/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/neoforge/26.1/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/neoforge/26.1/settings.gradle b/neoforge/26.1/settings.gradle new file mode 100644 index 00000000..d5ec427f --- /dev/null +++ b/neoforge/26.1/settings.gradle @@ -0,0 +1,12 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { url = 'https://maven.neoforged.net/releases' } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} + +rootProject.name = 'neoforge-26.1' diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackups.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackups.java new file mode 100644 index 00000000..b5702e43 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackups.java @@ -0,0 +1,139 @@ +package computer.heather.advancedbackups; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +import org.slf4j.Logger; + +import com.mojang.logging.LogUtils; + +import computer.heather.advancedbackups.client.ClientContactor; +import computer.heather.advancedbackups.client.ClientWrapper; +import computer.heather.advancedbackups.core.ABCore; +import computer.heather.advancedbackups.core.backups.BackupTimer; +import computer.heather.advancedbackups.core.backups.BackupWrapper; +import computer.heather.advancedbackups.core.config.ConfigManager; +import computer.heather.advancedbackups.network.NetworkHandler; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.level.storage.LevelResource; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.ModList; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.event.RegisterCommandsEvent; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.event.server.ServerStartedEvent; +import net.neoforged.neoforge.event.server.ServerStartingEvent; +import net.neoforged.neoforge.event.server.ServerStoppingEvent; +import net.neoforged.neoforge.event.tick.ServerTickEvent; + +@Mod("advancedbackups") +public class AdvancedBackups { + + private static final Logger LOGGER = LogUtils.getLogger(); + + public static final Consumer infoLogger = LOGGER::info; + public static final Consumer warningLogger = LOGGER::warn; + public static final Consumer errorLogger = LOGGER::error; + + public static final ArrayList players = new ArrayList<>(); + + public static MinecraftServer server; + + public AdvancedBackups(IEventBus modEventBus) { + NeoForge.EVENT_BUS.register(this); + modEventBus.addListener(NetworkHandler::onRegisterPayloadHandler); + + if (FMLEnvironment.getDist() == Dist.CLIENT) { + modEventBus.addListener(NetworkHandler::onRegisterClientPayloadHandler); + modEventBus.addListener(this::clientSetup); + } + + ABCore.infoLogger = infoLogger; + ABCore.warningLogger = warningLogger; + ABCore.errorLogger = errorLogger; + } + + @SubscribeEvent + public void onServerStarting(ServerStartingEvent event) { + AdvancedBackups.server = event.getServer(); + ABCore.worldName = event.getServer().getWorldData().getLevelName(); + ABCore.worldDir = event.getServer().getWorldPath(LevelResource.ROOT); + + ABCore.disableSaving = AdvancedBackups::disableSaving; + ABCore.enableSaving = AdvancedBackups::enableSaving; + ABCore.saveOnce = AdvancedBackups::saveOnce; + + ABCore.resetActivity = AdvancedBackups::resetActivity; + + ABCore.clientContactor = new ClientContactor(); + ABCore.modJar = ModList.get().getModFileById("advancedbackups").getFile().getFilePath().toFile(); + + ConfigManager.loadOrCreateConfig(); + LOGGER.info("Config loaded!!"); + } + + public void clientSetup(FMLClientSetupEvent e) { + ClientWrapper.init(e); + } + + @SubscribeEvent + public void onServerStarted(ServerStartedEvent event) { + BackupWrapper.checkStartupBackups(); + } + + @SubscribeEvent + public void onServerStopping(ServerStoppingEvent event) { + BackupWrapper.checkShutdownBackups(); + } + + @SubscribeEvent + public void onPlayerJoined(PlayerEvent.PlayerLoggedInEvent event) { + ABCore.setActivity(true); + } + + @SubscribeEvent + public void registerCommands(RegisterCommandsEvent event) { + AdvancedBackupsCommand.register(event.getDispatcher()); + } + + @SubscribeEvent + public void onPostTick(ServerTickEvent.Post event) { + BackupTimer.check(); + } + + public static void disableSaving() { + MinecraftServer server = AdvancedBackups.server; + for (ServerLevel level : server.getAllLevels()) { + if (level != null && !level.noSave) { + level.noSave = true; + } + } + } + + public static void enableSaving() { + MinecraftServer server = AdvancedBackups.server; + for (ServerLevel level : server.getAllLevels()) { + if (level != null && level.noSave) { + level.noSave = false; + } + } + } + + public static void saveOnce(boolean flush) { + MinecraftServer server = AdvancedBackups.server; + server.saveEverything(true, flush, true); + } + + public static void resetActivity() { + List players = server.getPlayerList().getPlayers(); + ABCore.setActivity(!players.isEmpty()); + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackupsCommand.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackupsCommand.java new file mode 100644 index 00000000..aad867d7 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/AdvancedBackupsCommand.java @@ -0,0 +1,65 @@ +package computer.heather.advancedbackups; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; + +import computer.heather.advancedbackups.core.CoreCommandSystem; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.network.chat.Component; + +public class AdvancedBackupsCommand { + public static void register(CommandDispatcher stack) { + stack.register(Commands.literal("backup").requires((runner) -> { + return AdvancedBackups.server == null || !AdvancedBackups.server.isDedicatedServer() || Commands.LEVEL_GAMEMASTERS.check(runner.permissions()); + }).then(Commands.literal("start").executes((runner) -> { + CoreCommandSystem.startBackup((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + .then(Commands.literal("reload-config").executes((runner) -> { + CoreCommandSystem.reloadConfig((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + .then(Commands.literal("reset-chain").executes((runner) -> { + CoreCommandSystem.resetChainLength((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + .then(Commands.literal("snapshot").executes((runner) -> { + CoreCommandSystem.snapshot((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }, "snapshot"); + return 1; + }) + + .then(Commands.argument("name", StringArgumentType.greedyString()).executes((runner) -> { + String name = StringArgumentType.getString(runner, "name"); + CoreCommandSystem.snapshot((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }, name); + return 1; + }))) + + .then(Commands.literal("cancel").executes((runner) -> { + CoreCommandSystem.cancelBackup((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + .then(Commands.literal("reload-client-config").executes((runner) -> { + runner.getSource().sendSuccess(() -> Component.literal("This command can only be ran on the client!"), true); + return 1; + })) + + ); + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/AdvancedBackupsClientCommand.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/AdvancedBackupsClientCommand.java new file mode 100644 index 00000000..7db9f5f0 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/AdvancedBackupsClientCommand.java @@ -0,0 +1,62 @@ +package computer.heather.advancedbackups.client; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; + +import computer.heather.advancedbackups.core.CoreCommandSystem; +import net.minecraft.client.Minecraft; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ServerboundChatCommandPacket; + +public class AdvancedBackupsClientCommand { + public static void register(CommandDispatcher commandDispatcher) { + commandDispatcher.register(literal("backup").requires((runner) -> { + return true; + }).then(literal("start").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup start")); + return 1; + })) + + .then(literal("reload-config").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup reload-config")); + return 1; + })) + + .then(literal("reset-chain").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup reset-chain")); + return 1; + })) + + .then(literal("snapshot").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup snapshot")); + return 1; + }) + + .then(Commands.argument("name", StringArgumentType.greedyString()).executes((runner) -> { + String name = StringArgumentType.getString(runner, "name"); + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup snapshot " + name)); + return 1; + }))) + + .then(literal("cancel").executes((runner) -> { + Minecraft.getInstance().player.connection.send(new ServerboundChatCommandPacket("backup cancel")); + return 1; + })) + + .then(literal("reload-client-config").executes((runner) -> { + CoreCommandSystem.reloadClientConfig((response) -> { + runner.getSource().sendSuccess(() -> Component.literal(response), true); + }); + return 1; + })) + + ); + } + + public static LiteralArgumentBuilder literal(String literal) { + return LiteralArgumentBuilder.literal(literal); + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/BackupToast.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/BackupToast.java new file mode 100644 index 00000000..556b34c2 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/BackupToast.java @@ -0,0 +1,136 @@ +package computer.heather.advancedbackups.client; + +import computer.heather.advancedbackups.core.config.ClientConfigManager; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphicsExtractor; +import net.minecraft.client.gui.components.toasts.Toast; +import net.minecraft.client.gui.components.toasts.ToastManager; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; + +public class BackupToast implements Toast { + + public static boolean starting; + public static boolean started; + public static boolean failed; + public static boolean finished; + public static boolean cancelled; + + public static int progress; + public static int max; + + public static boolean exists = false; + + private static long time; + private static boolean timeSet = false; + + public static final ItemStack stack = new ItemStack(Items.PAPER); + private static final Identifier TEXTURE = Identifier.withDefaultNamespace("toast/advancement"); + + private int textColour; + private String title = "You shouldn't see this!"; + + private Visibility visibility = Visibility.SHOW; + + @Override + public void extractRenderState(GuiGraphicsExtractor graphics, Font font, long fullyVisibleForMs) { + graphics.blitSprite(RenderPipelines.GUI_TEXTURED, TEXTURE, 0, ClientConfigManager.darkMode.get() ? 0 : this.height(), this.width(), this.height()); + graphics.fakeItem(stack, 8, 8); + + float percent = finished ? 100 : (float) progress / (float) max; + + graphics.fill(4, 28, 156, 29, ColourHelper.colour( + 255, + (int) ClientConfigManager.progressBackgroundRed.get(), + (int) ClientConfigManager.progressBackgroundGreen.get(), + (int) ClientConfigManager.progressBackgroundBlue.get())); + + float f = Math.min(156, (156 * percent)); + + if (!exists) { + if (title.equals(I18n.get("advancedbackups.backup_finished"))) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.progressTextRed.get(), (int) ClientConfigManager.progressTextGreen.get(), (int) ClientConfigManager.progressTextBlue.get()); + graphics.text(font, I18n.get(title), 25, 11, textColour, false); + graphics.fill(4, 28, 156, 29, ColourHelper.colour( + 255, + (int) ClientConfigManager.progressBarRed.get(), + (int) ClientConfigManager.progressBarGreen.get(), + (int) ClientConfigManager.progressBarBlue.get())); + } else { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.errorTextRed.get(), (int) ClientConfigManager.errorTextGreen.get(), (int) ClientConfigManager.errorTextBlue.get()); + graphics.text(font, I18n.get(title), 25, 11, textColour, false); + } + visibility = Visibility.HIDE; + return; + } + + if (starting) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.progressTextRed.get(), (int) ClientConfigManager.progressTextGreen.get(), (int) ClientConfigManager.progressTextBlue.get()); + title = I18n.get("advancedbackups.backup_starting"); + } else if (started) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.progressTextRed.get(), (int) ClientConfigManager.progressTextGreen.get(), (int) ClientConfigManager.progressTextBlue.get()); + title = I18n.get("advancedbackups.progress", round(percent * 100)); + } else if (failed) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.errorTextRed.get(), (int) ClientConfigManager.errorTextGreen.get(), (int) ClientConfigManager.errorTextBlue.get()); + title = I18n.get("advancedbackups.backup_failed"); + if (!timeSet) { + time = System.currentTimeMillis(); + timeSet = true; + } + } else if (finished) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.progressTextRed.get(), (int) ClientConfigManager.progressTextGreen.get(), (int) ClientConfigManager.progressTextBlue.get()); + title = I18n.get("advancedbackups.backup_finished"); + if (!timeSet) { + time = System.currentTimeMillis(); + timeSet = true; + } + } else if (cancelled) { + textColour = ColourHelper.colour(255, (int) ClientConfigManager.errorTextRed.get(), (int) ClientConfigManager.errorTextGreen.get(), (int) ClientConfigManager.errorTextBlue.get()); + title = I18n.get("advancedbackups.backup_cancelled"); + if (!timeSet) { + time = System.currentTimeMillis(); + timeSet = true; + } + } + + graphics.text(font, title, 25, 11, textColour, false); + + if (timeSet && System.currentTimeMillis() >= time + 5000) { + starting = false; + started = false; + failed = false; + finished = false; + progress = 0; + max = 0; + timeSet = false; + exists = false; + visibility = Visibility.HIDE; + return; + } + + graphics.fill(4, 28, Math.max(4, (int) f), 29, ColourHelper.colour( + 255, + (int) ClientConfigManager.progressBarRed.get(), + (int) ClientConfigManager.progressBarGreen.get(), + (int) ClientConfigManager.progressBarBlue.get())); + + visibility = Visibility.SHOW; + } + + private static String round(float value) { + return String.format("%.1f", value); + } + + @Override + public Visibility getWantedVisibility() { + return visibility; + } + + @Override + public void update(ToastManager manager, long fullyVisibleForMs) { + // Toast lifetime is tracked in extractRenderState. + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ClientContactor.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ClientContactor.java new file mode 100644 index 00000000..e420f4da --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ClientContactor.java @@ -0,0 +1,50 @@ +package computer.heather.advancedbackups.client; + +import java.util.List; + +import computer.heather.advancedbackups.AdvancedBackups; +import computer.heather.advancedbackups.interfaces.IClientContactor; +import computer.heather.advancedbackups.network.NetworkHandler; +import computer.heather.advancedbackups.network.PacketBackupStatus; +import net.minecraft.commands.Commands; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; + +public class ClientContactor implements IClientContactor { + + @Override + public void backupComplete(boolean all) { + send(new PacketBackupStatus(false, false, false, true, false, 0, 0), all); + } + + @Override + public void backupFailed(boolean all) { + send(new PacketBackupStatus(false, false, true, false, false, 0, 0), all); + } + + @Override + public void backupProgress(int progress, int max, boolean all) { + send(new PacketBackupStatus(false, true, false, false, false, progress, max), all); + } + + @Override + public void backupStarting(boolean all) { + send(new PacketBackupStatus(true, false, false, false, false, 0, 0), all); + } + + @Override + public void backupCancelled(boolean all) { + send(new PacketBackupStatus(false, false, false, false, true, 0, 0), all); + } + + private void send(PacketBackupStatus packet, boolean all) { + MinecraftServer server = AdvancedBackups.server; + List players = server.getPlayerList().getPlayers(); + for (ServerPlayer player : players) { + if (!AdvancedBackups.players.contains(player.getStringUUID())) continue; + if (!server.isDedicatedServer() || Commands.LEVEL_ADMINS.check(player.permissions()) || all) { + NetworkHandler.sendToClient(player, packet); + } + } + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ClientWrapper.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ClientWrapper.java new file mode 100644 index 00000000..4dc32124 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ClientWrapper.java @@ -0,0 +1,55 @@ +package computer.heather.advancedbackups.client; + +import computer.heather.advancedbackups.core.ABCore; +import computer.heather.advancedbackups.core.config.ClientConfigManager; +import computer.heather.advancedbackups.network.PacketBackupStatus; +import computer.heather.advancedbackups.network.PacketToastSubscribe; +import net.minecraft.client.Minecraft; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; +import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent; +import net.neoforged.neoforge.client.network.ClientPacketDistributor; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.network.handling.IPayloadContext; + +public class ClientWrapper { + + public static void handle(PacketBackupStatus packet, IPayloadContext context) { + BackupToast.starting = packet.starting(); + BackupToast.started = packet.started(); + BackupToast.failed = packet.failed(); + BackupToast.finished = packet.finished(); + BackupToast.cancelled = packet.cancelled(); + + BackupToast.progress = packet.progress(); + BackupToast.max = packet.max(); + + if (!BackupToast.exists) { + BackupToast.exists = true; + Minecraft.getInstance().getToastManager().addToast(new BackupToast()); + } + } + + public static void init(FMLClientSetupEvent e) { + NeoForge.EVENT_BUS.addListener(ClientWrapper::registerClientCommands); + NeoForge.EVENT_BUS.addListener(ClientWrapper::onServerConnected); + ClientConfigManager.loadOrCreateConfig(); + } + + public static void registerClientCommands(RegisterClientCommandsEvent event) { + AdvancedBackupsClientCommand.register(event.getDispatcher()); + } + + public static void onServerConnected(ClientPlayerNetworkEvent.LoggingIn event) { + sendToServer(new PacketToastSubscribe(ClientConfigManager.showProgress.get())); + } + + public static void sendToServer(MSG message) { + try { + ClientPacketDistributor.sendToServer(message); + } catch (UnsupportedOperationException e) { + ABCore.warningLogger.accept("Refusing to send packet " + message + " to server as the server cannot receive it."); + } + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ColourHelper.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ColourHelper.java new file mode 100644 index 00000000..bc1e22b1 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/client/ColourHelper.java @@ -0,0 +1,28 @@ +package computer.heather.advancedbackups.client; + +public class ColourHelper { + + public static int alpha(int in) { + return in >>> 24; + } + + public static int red(int in) { + return in >> 16 & 255; + } + + public static int green(int in) { + return in >> 8 & 255; + } + + public static int blue(int in) { + return in & 255; + } + + public static int colour(int a, int r, int g, int b) { + return a << 24 | r << 16 | g << 8 | b; + } + + public static int colour(int a, long r, long g, long b) { + return colour(a, (int) r, (int) g, (int) b); + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/NetworkHandler.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/NetworkHandler.java new file mode 100644 index 00000000..d96c6227 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/NetworkHandler.java @@ -0,0 +1,25 @@ +package computer.heather.advancedbackups.network; + +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; +import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent; +import net.neoforged.neoforge.network.PacketDistributor; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; +import net.neoforged.neoforge.network.registration.PayloadRegistrar; + +public class NetworkHandler { + + public static void onRegisterPayloadHandler(RegisterPayloadHandlersEvent event) { + final PayloadRegistrar registrar = event.registrar("1").optional(); + registrar.playToClient(PacketBackupStatus.TYPE, PacketBackupStatus.CODEC); + registrar.playToServer(PacketToastSubscribe.TYPE, PacketToastSubscribe.CODEC, PacketToastSubscribe::handle); + } + + public static void onRegisterClientPayloadHandler(RegisterClientPayloadHandlersEvent event) { + event.register(PacketBackupStatus.TYPE, PacketBackupStatus::handle); + } + + public static void sendToClient(ServerPlayer player, MSG message) { + PacketDistributor.sendToPlayer(player, message); + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/PacketBackupStatus.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/PacketBackupStatus.java new file mode 100644 index 00000000..06c8d3e0 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/PacketBackupStatus.java @@ -0,0 +1,40 @@ +package computer.heather.advancedbackups.network; + +import computer.heather.advancedbackups.client.ClientWrapper; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.Identifier; +import net.neoforged.neoforge.network.handling.IPayloadContext; + +public record PacketBackupStatus(boolean starting, boolean started, boolean failed, boolean finished, boolean cancelled, int progress, int max) implements CustomPacketPayload { + + public static final Type TYPE = new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath("advancedbackups", "backup_status")); + + public static final StreamCodec CODEC = StreamCodec.of((buf, packet) -> { + buf.writeBoolean(packet.starting); + buf.writeBoolean(packet.started); + buf.writeBoolean(packet.failed); + buf.writeBoolean(packet.finished); + buf.writeBoolean(packet.cancelled); + buf.writeInt(packet.progress); + buf.writeInt(packet.max); + }, buf -> new PacketBackupStatus( + buf.readBoolean(), + buf.readBoolean(), + buf.readBoolean(), + buf.readBoolean(), + buf.readBoolean(), + buf.readInt(), + buf.readInt() + )); + + @Override + public Type type() { + return TYPE; + } + + public static void handle(PacketBackupStatus packet, IPayloadContext context) { + ClientWrapper.handle(packet, context); + } +} diff --git a/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/PacketToastSubscribe.java b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/PacketToastSubscribe.java new file mode 100644 index 00000000..b00122e2 --- /dev/null +++ b/neoforge/26.1/src/main/java/computer/heather/advancedbackups/network/PacketToastSubscribe.java @@ -0,0 +1,34 @@ +package computer.heather.advancedbackups.network; + +import computer.heather.advancedbackups.AdvancedBackups; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.Identifier; +import net.minecraft.world.entity.player.Player; +import net.neoforged.neoforge.network.handling.IPayloadContext; + +public record PacketToastSubscribe(boolean enable) implements CustomPacketPayload { + + public static final Type TYPE = new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath("advancedbackups", "toast_subscribe")); + + public static final StreamCodec CODEC = StreamCodec.of( + (buf, packet) -> buf.writeBoolean(packet.enable), + buf -> new PacketToastSubscribe(buf.readBoolean()) + ); + + public static void handle(PacketToastSubscribe message, IPayloadContext context) { + Player player = context.player(); + + if (message.enable() && !AdvancedBackups.players.contains(player.getStringUUID())) { + AdvancedBackups.players.add(player.getStringUUID()); + } else if (!message.enable()) { + AdvancedBackups.players.remove(player.getStringUUID()); + } + } + + @Override + public Type type() { + return TYPE; + } +} diff --git a/neoforge/26.1/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/26.1/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 00000000..ffb2a21b --- /dev/null +++ b/neoforge/26.1/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,22 @@ +license="${mod_license}" + +[[mods]] +modId="${mod_id}" +version="${mod_version}" +displayName="${mod_name}" +authors="${mod_authors}" +description='''${mod_description}''' + +[[dependencies.${mod_id}]] + modId="neoforge" + type="required" + versionRange="[${neo_version},)" + ordering="NONE" + side="BOTH" + +[[dependencies.${mod_id}]] + modId="minecraft" + type="required" + versionRange="${minecraft_version_range}" + ordering="NONE" + side="BOTH" diff --git a/neoforge/26.1/src/main/resources/pack.mcmeta b/neoforge/26.1/src/main/resources/pack.mcmeta new file mode 100644 index 00000000..0ec6b6a8 --- /dev/null +++ b/neoforge/26.1/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "advancedbackups resources", + "pack_format": 81 + } +} From 14de70e35977a253ec7c26fb0e1c64a7fca5e2bc Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 25 Aug 2026 10:06:06 +0000 Subject: [PATCH 2/4] Add a dedicated Minecraft server harness for 26.1 and 26.2. Boot Fabric or NeoForge headless, run /backup start over RCON, and assert a zip backup is written. Co-authored-by: Aravind --- .github/workflows/minecraft-harness.yml | 55 +++ .gitignore | 2 + fabric/26.1/build.gradle | 11 + fabric/26.2/build.gradle | 11 + neoforge/26.1/build.gradle | 1 + neoforge/26.2/build.gradle | 1 + scripts/minecraft-harness/README.md | 37 ++ .../__pycache__/run_harness.cpython-312.pyc | Bin 0 -> 21652 bytes scripts/minecraft-harness/run.sh | 4 + scripts/minecraft-harness/run_harness.py | 385 ++++++++++++++++++ 10 files changed, 507 insertions(+) create mode 100644 .github/workflows/minecraft-harness.yml create mode 100644 scripts/minecraft-harness/README.md create mode 100644 scripts/minecraft-harness/__pycache__/run_harness.cpython-312.pyc create mode 100755 scripts/minecraft-harness/run.sh create mode 100755 scripts/minecraft-harness/run_harness.py diff --git a/.github/workflows/minecraft-harness.yml b/.github/workflows/minecraft-harness.yml new file mode 100644 index 00000000..f537cdd4 --- /dev/null +++ b/.github/workflows/minecraft-harness.yml @@ -0,0 +1,55 @@ +# Run Advanced Backups against a live dedicated Minecraft server. +name: Minecraft harness + +on: + workflow_dispatch: + inputs: + loader: + description: Mod loader + type: choice + required: true + default: fabric + options: + - fabric + - neoforge + mc: + description: Minecraft line + type: choice + required: true + default: '26.1' + options: + - '26.1' + - '26.2' + +jobs: + harness: + runs-on: ubuntu-latest + timeout-minutes: 40 + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 21 (core) + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: temurin + + - name: Set up JDK 25 (Minecraft 26.x) + uses: actions/setup-java@v4 + with: + java-version: 25 + distribution: temurin + + - name: Run dedicated-server harness + run: python3 scripts/minecraft-harness/run_harness.py --loader ${{ inputs.loader }} --mc ${{ inputs.mc }} + + - name: Upload harness logs + if: always() + uses: actions/upload-artifact@v4 + with: + name: harness-${{ inputs.loader }}-${{ inputs.mc }} + path: | + ${{ inputs.loader }}/${{ inputs.mc }}/harness-gradle.log + ${{ inputs.loader }}/${{ inputs.mc }}/run-harness/logs/ + if-no-files-found: ignore diff --git a/.gitignore b/.gitignore index 52146f49..190e6fb1 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,6 @@ build # other run runs +run-harness +harness-gradle.log forge*changelog.txt diff --git a/fabric/26.1/build.gradle b/fabric/26.1/build.gradle index 8879ec24..84780780 100644 --- a/fabric/26.1/build.gradle +++ b/fabric/26.1/build.gradle @@ -12,6 +12,17 @@ base { archivesName = 'AdvancedBackups-' + modloaderName + "-" + minecraftVersion } +loom { + runs { + harnessServer { + server() + runDir = "run-harness" + vmArg "-Xmx2G" + programArg "nogui" + } + } +} + repositories { } diff --git a/fabric/26.2/build.gradle b/fabric/26.2/build.gradle index 8879ec24..84780780 100644 --- a/fabric/26.2/build.gradle +++ b/fabric/26.2/build.gradle @@ -12,6 +12,17 @@ base { archivesName = 'AdvancedBackups-' + modloaderName + "-" + minecraftVersion } +loom { + runs { + harnessServer { + server() + runDir = "run-harness" + vmArg "-Xmx2G" + programArg "nogui" + } + } +} + repositories { } diff --git a/neoforge/26.1/build.gradle b/neoforge/26.1/build.gradle index 85134724..23f5d6da 100644 --- a/neoforge/26.1/build.gradle +++ b/neoforge/26.1/build.gradle @@ -44,6 +44,7 @@ runs { server { systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id argument '--nogui' + jvmArgument '-Xmx2G' } gameTestServer { diff --git a/neoforge/26.2/build.gradle b/neoforge/26.2/build.gradle index 85134724..23f5d6da 100644 --- a/neoforge/26.2/build.gradle +++ b/neoforge/26.2/build.gradle @@ -44,6 +44,7 @@ runs { server { systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id argument '--nogui' + jvmArgument '-Xmx2G' } gameTestServer { diff --git a/scripts/minecraft-harness/README.md b/scripts/minecraft-harness/README.md new file mode 100644 index 00000000..6249dab3 --- /dev/null +++ b/scripts/minecraft-harness/README.md @@ -0,0 +1,37 @@ +# Minecraft dedicated-server harness + +Boots a headless Fabric or NeoForge dedicated server with Advanced Backups, runs `/backup start` over RCON, and checks that a zip backup is written. + +This is an in-game environment test, not a unit test. It needs Java 25 (via the Gradle toolchain), network access to download Minecraft, and several minutes for first-time world generation. + +## Usage + +From the repository root: + +```bash +python3 scripts/minecraft-harness/run_harness.py --loader fabric --mc 26.1 +python3 scripts/minecraft-harness/run_harness.py --loader neoforge --mc 26.1 +python3 scripts/minecraft-harness/run_harness.py --loader fabric --mc 26.2 +``` + +Or `scripts/minecraft-harness/run.sh --loader fabric --mc 26.1`. + +The script: + +1. Builds `core` (if needed) and compiles the selected loader project +2. Prepares the run directory with `eula=true`, a flat offline world, RCON, and zip-backup config +3. Starts Fabric `runHarnessServer` or NeoForge `runServer` +4. Waits for `Config loaded!!` and `Done (` +5. Sends `backup start`, then `stop` +6. Asserts a non-empty zip exists under the run directory's `backups/` folder + +## Options + +| Flag | Meaning | +|------|---------| +| `--skip-build` | Do not compile; use the current project output | +| `--keep-world` | Reuse the run directory instead of wiping it | +| `--start-timeout` | Seconds to wait for the server to become ready (default 300) | +| `--backup-timeout` | Seconds to wait for backup completion (default 180) | + +Gradle/server output is written to `//harness-gradle.log`. Worlds and backups live in `fabric//run-harness/` or `neoforge//run/server/` (gitignored). diff --git a/scripts/minecraft-harness/__pycache__/run_harness.cpython-312.pyc b/scripts/minecraft-harness/__pycache__/run_harness.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ae83e6bf68b1abffa47719c8906836287b7bc440 GIT binary patch literal 21652 zcmcJ132+-{c4jxwxKG}Pcz_}$3Y0+Ik|m3>C{dDik+Mi%^g%=DCJ7P*INhKq!k|Mt zt}}#T#N-G_3BD4RNd*&W0E^4FhGBZir>qu)521+-Xj9yv&JCsr(&` z3tin6VuR>WyqsW^oiwoZWf!x3Owt@onj@P4dO0w6P{bd-C`AujeGoz!UknD%`-y zUEMyUYZmJy-@vn9#`qQ|ZpN4A*8B3hfO=g1@|WB7T0b$GT(_?4mzJyblbopU_C4hr z)2q)>ew4eaf07&Jz58O1ACE+$9=}JF#9+W5l|;{lU|0&s{@$oZk>o3q>=_M4`#r7V z6@NH@&&U0N!I5Fb;}44-zXFt~XXj-W=TV}5yp2ZWL8bXqYKxao+5F*fBmzvhbZ13s$#)vX&tWh#!h)8+>_~<=HW4!_#X?14Jif$FLO(RS*E(N_*GRmA{O(JU-_Q^ zZgSB~Q#ft_?`yAUHew(%AF~kv^1cfB@hYrQ=6-IRi*o}RE}f4j@;NGuTC^{~wP|qf zsm(S~N4!%@7to2|_adj2#dDopJ-3@v_)&2FCpjK}V;VK<+r7H`mfd>}Ht)jUZkby2 zDK+0~Oc|9(U{H#tOs%JS&a|KGO4&L)PMquM?7DQa^+HOx91M#oeJ~tN+4`g?;nKJf zy%MZYCLY;=Fy-t8YEQ2$Nj<|6IVzVUvL3h6gq-b@xq%|78?&G z8xPG}4yQStq3MpeWVT3PwdRUL zwB8nSSYw>m(B6ePU>f$zQaGxl%+l4M677i$-ZzXydwma}%gjaxikC7B z4T?cIWgV4+QK=^?U5z3WVHmt1We!BbQOZl9hI!O(mOX%3;02&iFhMl`%DETMEea(` zp=3t9)s+xR7KA+%-SJ|_^ux2G6CHPjoorqN^4m-;W4)9DfCU6Ukew8W$XtD#sJnso z;udfla2s)(aGP;ka9eTPaNBV^a656kaJz9A;4Z{ngu57b3GPzdWw^_6SKzM1y$N>} z?rPjMxNGCOZ*i|v$(}f$f$HL12HK4HdfW}Tx8UB2yAk&`++N&GH?mW#lk;wGzt3A^ zW&S`w0%P$-Wq(-dm1L!**B?@(SfM`@ij4YtL&3iOXeO@uvJ6%l@GDUt#zBdMBwsY* ziwr9*QF%m)Rpvg+_`d2}kr?dl4F*O+(Xp0c2^_6=BowQZ!v4$11pIgiBEok$g!z*x zYg6Xiz|d9SP$V3TMr2TlR=Lc_Z;VLtSSHS$iKC*``V?hiAZnr`TDz*GaBoBoNIpdh zjL4F2SdR1tLsBM_GVSYVKWHxmYR!BoRulDMqJwE`=$m>+!T}OjzF|oo3MvYLA?b<~ zYS|Mj$RY=12}13P6szcy!jcTh=~K{Sfha1V)yoMUE(Rj9mUVf5P?UU;a0m?FHyrYh z(a^ANcC!L}#B*98AVOlSP>oR}No>)CWQ7_>anauD2WVzxd-;eYKHwIisT#Zm%=`2XgE4XogN8` zO3MQW_U+mgD^c6!3yMTZC_FL}ZP^vG3||?}bi0#Avw0Y62eeddiCNWm@Y0r;U0rhc zh_klDN|fNx2wF!YAY$BT0fIp&QilDbVV^%790FNugQ-S>tdwYu;@xU&csQWp6{;~H zk*LIm8I>zj#=-$#pnoJh=wl2@Lv~#WN~8HjyBQ7nazvEk-iC}Ahy=r6b{3)zCKXZ^ zYLp6^wWcb>k~|p(mnu-3+Jl;a(4s*}k+QGwOWU(&Ux1{xW zeq#5e4S1%FoMT7YM39+tc+(bwtej(W+D4F_;v57yIY(34MUb0w)TIjuD&!os=^}!P zDMblErJQ4Xx{RQ5&apLJK~N>o?IWm}@OBcki)yf&pgmN^UV`>kkXBd1Ia9#QwgUVC75@1)lli(Ho4!beU?JyWs;gk_M?2#4WP)WX0IDI#t)$7~k2H<;ZWA&gk zEQy=_nH9Ra7+0EAPARGk2J7Q>kre+GNyXT@0Y)^^*B6pC3Sw(Qv#+wrxCBg2eo zGr`dOwb)9aUm}g8W%psQ-<@BN-#-!+BctI==l%u-kXARMac}R}79dKHY%P0t#kOyN z8UjT@?l%WQL0a~;grWMy_WVZ3+1_l~kH&s&0qTNArSFZXC|es9d36aJwH5@Vpy!5$ zA?%6rT6S+p0D*pgFsw9(q;MYyYyZZz&LC>JsLAPX(l_89cin&o|WH7NHfS3uO z!>JAp8)Q2?BKJwnN-!o7)<&E~#S;Bv3JCwJvkF8;P~xuGMr5XD6%1oJHH5m6JZE&j z>nkgmhp#rTWw*Qq+)ySvn@swWsv9$ftw3dn`GVF53^LFtq`YMX?PodhwV`ZyQ3a9N4w|{1z4+$qEj@$+GG-4q7hHC=oU?QTEqg;jHgvB z6fJn##3Ip(r+v)kElxSI#+OUz0H(moq`Z7eMF;W~w5-(l6IPczEk9p9#5cO)d|cP7 ziwn1TO_hstJy|@cew5pqYdw8FE@*l=tgbrbkxjS0P9N9j@S!^D+p$Y&k9UpwTcs(SlDdqj;+#MKky*E91D(HG^Wx*n??{HJ1VUxfJS63H=cz3Vo6k z@+Ksd_ab1H60Enh6&K7jK`0$PJ+abN-Q29jPf?7 z*X$x>=cwnR*&c_zQBM|-F;27Qz0JcIrS_X45Q->L%GA-xj8tA;et_DRGh@g{@g6H$ z-486$bwX@JFu|pDdP~8Q-F^Mc)S2rYQyq8h)t@iBNcUq6n0+F@TM$PVIwMPrY7C3b66-ifZ9VIR)-_LKc8u%Cg>ge% zAJ+{Y#P}CPv*sv~kLzK2)j_+~y`ClDm-x5=8neDVR`h6C0&fhE?eo%!j&@H_^u!z< zD2HTJBqi446;g&CMS_XQ-u2|glRdB`UTAG^L!>MPt}qiED4DuAC6H}H#tsITGRx9% zXpG2}?;(T97#S@U>Jdhi8GDi`Q%J02&0wfy{}IrYiwMA`N-A!4-{_td7CpO@p51f% z=1U%!v@X@we<$|M*tg;!$Vu~b-Sp#2wxa3SN4C1ty<&Uc(X(=MMtggQJ1HaseGpwW>}Qg8~v8a5$= ze7IQg>cLRi&9@1glH`rWTdp@;bLI0ThcOZr)!(W7X63i4rkrdb9-)DdUp+eW#I4GY zs`t`x)IK<0cqCyzlGbxI`_vK02o>bYac10j=T}NGOK1eH^6T02L_P+|7SQ#uL=>#g zPR8}oZ0_r^c+3fXoYyvQ;=1)%zL;gr`Xj-hTm^`k4H2O`67-tXnP*f@F=Sv245p0C9x17u(L~c2 zcCeHlD>AQ26)79xNzoos4&>9wQ_V)W91+LXk_XY)TE@wE!*{7Jg9tz!5C*PST{F8e zCx6dH^S0+k&!lzPRdW6Lspn_*&o1J)U7i%O zBBml~uK4!W?`;3(_F3`vi8O_t&QSJY&c^*?{A z;~QOIjq5U2F+2IRp%C?Cl^@>#A4HU4>*KnwUWtf8oGki=%B)5IY1E6DH{uPVv2y)= z1e0jKZPDt&*t`%o^b$E(+vRrD>{DW1>U!w{y%KeP`hUPN7>T4z#EM~|gmu~|(YB2O zZqWgplyM}?h{VQNd5?4z%4fi}#cu`k@Ok?m@{H>zi%vt5f@_9wUOpYzXed0@Wa(4D$u!I4ShlB;OZRhx9x&Kl=k zjg!Li=525J-tf&C=Aw6w-+5&2>ip(oNptO_b^6>=Vd?ZYW(ud977Oc>h4r(i=guSw z>*ouPPMSa>GY{S}C0sib=8RE1p9Zp&l182KDMb^j7|SgCh-WDx&JQ9NxeJs-eZJ;e zkA=kf_40{XbGtm_`nX=P<#vd2`$iDcy7kyf{>pN_+%vW0uXW`ym~0zBH@fy%DU&6+ zC8vk2e?+e-Ww|^SmHe{oACo)LK$UX{Sy>Mnx{4hOF=Ze;A|+MylirjvGCQJ@G7JZ$ zfTU0#k+^4@NAfdxi&d%0z`CckW<05ry>9Be^w>15}{j&`hvkJE>9 z6g)@)ErjKVDImemmJsT)fyQc$E-CM%I0|0It?XmKQgO+|g{7k6iStVZg%fA*34)bwfbchqc5rTfl}5al?9hg<3kf2;U7_Zn>wZ z%ikrup}W>7aO1{tgJ@Wn9T+uX@v14Vm%VZQ0JVJ0HI;Rbk;|ht?W1S}HYpryF4`^A za(#)9y0p)ere5sey=;#2ZJgE$4NulhnL6{g$7xxy<`T0mID9_l8Z3I%a*wNh%U^pp zuhy1mk(MOKNTHKhMcaBkB-&qw%KqgVqm_C3O8^_-0o}M^6eQoSnm=ecBzGftTPIf& z{1gQZ2x3K@{!zA2#{QHCR--{Ub_6m)8{avOC=v6UUpWTgkN9&O&sLz%V0J<5ue)P9 zmF@FC=5O*mcdbl-I{I(*qrBXLOi0)&V55P4?2YJ}caaVh#pX;nWeH)wk?jI!_CzKa zd%SNsLYrwE{*VL;+PSrT2%& zQU)a?NyCh(dd-kxFo$E8UmFBf1UOZVOB)+J^Kg1AEJ-Qcx7M zZTV$_kC@Ao~5Dnyu0cm3Z&&|rKm-u`GT$C2j z?CRCQ7*{uLj6>$-)r;D==E`Z)WV#a}C0{Ux&FVAfmY0{un)LLV9Z*fuM6NyOHMP^E z!-aXa2an8K`k`3$iO5Ju^uP&^_5jJc>WM~FLsum1xz8WIuRH94B0P#z>iUK(pek2* z9uRbDS`@15LAHbgC*Qv>z_NiqDIg`yJ)`-yvI%&$bnfw|~h@152=;+@Cd z+wdK& z3DY-AQK&=aie{;3z^cXNo|;O`t0rX<32QD!=b0&=F(GHyPf@3a9L=tMdi9{?BG_8E zfgt&P@P z`7H|zTFcN2>-DJ~o^#ng%{Re&h4xQtkTaWupVEMNU9>F$dy_7rq>O{XP-wU>r5~m} z3?lY&NHXGPF}i@D!eF1pfM`vBN2GmGQ)k!busIN#3E#xoGA-dEknUDoQ_fg z$y2cIk;`x-q0}iSEpM>6IeB$BC`%&C|J<4L=TicejzyV3n0b2vDZ3Jl4AcG?rI%kv z3IB*&`5^+Zc9ZRuu@}dF_xXgWX36Zto`9iZ*=!{*#_5Ke+iq<8_Nni*f3tnTygh9+ z8GynZ9A`F9TCfvB^UzWIrtAA<3ELs;8yG6+yK~CsC+#^*i#Pjk^uK9*%lU@$u6^g{%kIr@c6|TwgsX+NAj&g46Tg3sHX_RJ zf08Tt=jQ6P4Vm3nPNNNf*i5roSJ?Ux=5#~r5&e%I>$-gE1o` zxO4QpDviK$G_aIe{Y#_RTpHNPjqNeB1fQwq=+$V> z5rFp#&dJf4%A~7)_L&7?FMCZ?>`1zHEHpp#p5=o>iN~IuZ|+$To>MW)ldif%!?C36 z*uwG7`Qwk?6&_Pp6|^?jt}IX9%2pL|UIyQ#g{XRIBg1-=jRWl27!B+%>Aq^|q%=pf zy-r5T+ooKfM@i(dYdwoNd`ivV<-b$|BaE4u5r~zzD1h6vOzJ9_LM+AiZEu41Vds<2n8=Iu}y2diQvyE!*}v>^MGHDl^-We(v~RJ zgJ{_=k2Ns^uy&c3>RR1 zU=(IFxUd8UW7ZRJs0d=k+2@JrksFBb7P=y3BbNy5@SOEu@yq`PF>vR$TsnENqvujb zN0)q+a16t6C5_561nWU^DI2QG95j2P5vZRw(ER|`K18_SmV?3J9<{mfJ_eDZRja-8 z3fWieN8=-Q0LiOg{&Qr0AGb1rV1oPDQ~-Xs>?)r*0NR{Aopf!#)thwfOB^I?K9m+) z(e;O>9$K(LQ*b1l+vbG3=Kag&LSla(l^uIOn7H&r^3)TF=ft~aX<4vLo}GSvv8*{+ z)_i+xzU)w<^zfbfg!Slq;$7h!=D;iMFSdVFbo9M*iN~M%x$yK?SpE~J9xX^za^FaK z*Vu;w^G_$1#OqCf+&%ydMY@ckXjf*!WXTrAWiBmGxkkiB?0U5pwa7{}N~h@Djxj0J6|oGGj?P>n2Vw z*$S^8ojST;+qC2=n6y9}EvdSB;l_p8#`)qVsHJw}Cw4bEa2}aDa_#6$Xs+Q0-tT#T zu=9I6=l7gQ)|~jvz*!uh>468$l$1XXAXEO{+22~fTKOYRftz1x2A~csJHBM1J#AH< z^rEw%xxj0k@irrc6bHQ^W$g7|mV<$m8`I)p_2fz?JJ=JmAx1lM0^7hySdEwGP!5@H z==2Y>fMTK=*@+uj{!@Hgr4N>=le{PDR|eTsK|V}8ybnw_^&QzuX&vF1F8|0>v4pwu z;9PaG{%FE=G=YsQTj`8#R!Wv{ztx{CKaj8;NC*d1>PEWkMbySRp$l2&3*7Zw2XbB# z@OS|}T^pWJf$>rlZX0q88B93K)YY^Uibhf0g~~GS4e(&pyKT=2hz+nDqD^$(c71KB z?wkT37ThlUTKu9s{NgqEAd0n@Hupd(C3HN?CQ9nDB)H(j%s!tw>M#e;VlZV6OA(ml z`Xu%WsxSrmBSEYhQzlXB_2VQ!Oz`=J0x@CFf#%(@?b(eE$Os(o0`J8Hi^yX;JW_LC zvxks8aI?U34~qC(Dng*MUNO7RM?Bi6@@Om8r{Kfn7)CZlat}rAfHMe7l~47TZ)l4! z9d|T1EP3+i+H+Y#jV1ML8VdOkg~-vt|MH7s575|0W=>04SrUp=s2%K0 z&RdAfWKm%O?f)y^#Tyn%j*>-3L(D>1EH;pfb>51zs3WVRj`y?JU^X^U?)|?04peAl+L{;J^!=hc0Tz3F$yTsv zt4i9c=4~|zq2|kiC_7ab(14AMRiX|yZtOp31el$sWNXe$F(l7k8lHSCZ@r|?*NyvIkJBVHx39dI4l@#8@7GodCwJ%DOGaHhJC& ztuQ!!#;Uv>R%L;#?2vj{i@zK}v1}Irhv1knl*bSQm>HYv0Ozx9c?1!$Dsg0Jn0#B- zGp=tY8r%moW@P@1(^rs8gXhXaC-@%@{>9*b9GVnpEi-GHvrIY{%!dZtl103do)JJYXN6N;Q9e8`-uK5sNuZhzSycT|Q?^}o8IQ(;SGpx(z@-K@fVymiX zg4oCxO&ZOPbJ47p0&yS!f6Ybm8ei72|1kZ8=7eQU61-~pE6yBE!=;0rBGcv*cEfTW zHtUv+S&*q6bH&hMGaiTQS-C=PCrv907EYH|lWd$37EDu|Ji79s6EzztMZh*A(H5W=Qe24fIu5lCi4E}O8p@aC* z?dn%hr8&AogL`QVX%V{S$}LLrdZ=i1`&Q*h7HW3=7WtK|$#1`whgh0FT4LGla&5%M zt#Gup4jj}lb5F5C>(_BxUY#rBwgEDBuemfDyvi$3NW@LF+q|YW`TccROODnZ(cs)O zN*)L7x?QE!l-Y0BuW7YbQ_K+SzzHpF?y1!d^m$T?&C&U|J#JS@qr0&ZoT8oX_@q-E6ZI4D9+^Vhmi~OxYXvj1GAt$ z?nKz|x*@Oh+#K72(#V->&6R6geh#b01LJOb(Hp)e z#%VO`*zRp=k5yivqqr~)WehnvWx^9H%p7C&sj4WBf%UV_Q@$-4j$iw4FcJ?CFw&ebC9MC91jt?UxgP~b>00?&EeaIjDdQg*IdFw>#~TTJ}Q0RUgOfwrEO-^r_;bajZO7l1zMvR*SSenc!}9z5C?bPrmciqVHJJ zcWgpEN(6mPKPZiT$^kD{k?9R;Dn=n1iFj}jD-=5HiRnDsVkVF378o;LZ0+nk>|t)H zG2^M$Gw1QLh(eeLv$sjr_x>G4{1`z>Hxx)2VY(vYI$0p(_bDJz&TNnJpAp3DTvpP2 zdzj|SY@Wgh^YCPU?sZCv63)lb%rwkX_!`Ru?*70bU zJVB`nFLbo^obPCDJK2UbUD%XrPdQXl&K$yFE9;aKznRhYq=wSTwsln(x{oQFa`gvQ z=#&Key_GCt%Bd1UPbRliNd}X;Ca+A($*c4O26PIDWF@o0rSv$#CVxt=|AT_>Q9xT& za*6_)c3yW%Al;hTsPH=;%=pagQq1s|vSwmHu6cVG-=^ft2(X(C4Wl2{UNRiges#*g z=0Zv!TVTo*Lgrv5s?*^VQYdZ&neFcELv?czh|FX%9d0Meis_juZ!3B2$VA(6;ieh! zJA>aGOcr`?wY_`#?bFG^y%XnP2wSvOCvDXWw%TQ9Wup4v9oyV^V$;ca=c$DG)Gs&f zncMe+2fz2=d$##a=aWMD#JTCRrGlzN?cQX;UhJE@Yv$b^xXEOmOWSu&v@I2Ent6Qo zO0wEFXHQncHMC{o%rAw~>E~zL-s*UxV?o&WiOHE!e`bZZT;FwN4Ae8ijPz#bt+IcO zJ@q|z8t$4OS{90?PtQDg%d)Wd;ROM?SeC3s(``4;-8eVhGRx04yw&(d<7`Eu>DYS} z@7ZwLr0bbP=d+1tdlKg7mYjwEWY8Oo(6+3_*K4P0XNu=7HEGUdu+BCuyDC&?=Ost^ z%=X#wgnj>#d(%=;^>R`5Vo^h~s9~vQ^F5o>U9tDpmUp+mz5N~E zM@^^ipuC3@g=Z3vJbKsu80xU(u2^<&TXGjKy6cnf`sLbv|70;ZoN1@tQG(c;_8az@ z#}?cTFcZT)2|ftd&i~T2dG_GEYx|_|v8!m=UNRkouP!?x(l=k&pRo7;van=YOnQzj z6tQ+c{s@m9TgH z((ITvPLD2@H6_cMZXKL2+nXreH+P)5Oq@nMSfMSc(5bvJyzT!g&xQ0~K~Kt1w%=fAjD#o5bYXD}3Cgiv>7TAIu#-*?T; z%jSY+h2o@;V zOhJ$W_B{m1YgYLk;i?<93~E}9NollPS^5@=u*z{f?px`c{ZkiVetAY7M?`Fs>X9u= z&4?tY&Zo#Fdxr;0k7t;ZpgaIHwuXq6uEFxeJ>)d5R*)6Te@e?ww4;p@vC@B+AXZP- z4u+=sr>oyd%TmAR+5!6;rH$Ji+63tBXJ;j9dGkLvaWnx0@MYgy7 z)&0eK*2sj7nuf$Pen~143FT!f+j5% z;MaRHHs|JcY--_WOmLhA1`D@Ao-VM`mfs__uUb_&S1K=nSGAn0WZUZsGE_%{gpa|-^Fg7+zy zr+^H7Ov*B!|CB(}Bvp6uxQ_rwC}j}NYcJ@!m?D}kl;!_5u6jpUpf2Y*~!?vP`RYN;k3@YunT;% zP&eU(ye#!hU!qf=3D2JSlD!G8Fquz_u7?G6Tfq%xSi)~)0cJF0G*6|q_0Tp1Vi1D**&ShZk{sV zDE`CJyYLk-@KE}Sfd&_L#t?(P+1P)PMx}*Q0=`T!kV+m*L z2l~Ia{;l<{xig#9bkWV48#Rk&Ptxom?>|G`eT7Vi?>CmgZt@e(b*f(f6IZMCRE_?x IYYce#zufwb_y7O^ literal 0 HcmV?d00001 diff --git a/scripts/minecraft-harness/run.sh b/scripts/minecraft-harness/run.sh new file mode 100755 index 00000000..fdc02715 --- /dev/null +++ b/scripts/minecraft-harness/run.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" +exec python3 "${repo_root}/scripts/minecraft-harness/run_harness.py" "$@" diff --git a/scripts/minecraft-harness/run_harness.py b/scripts/minecraft-harness/run_harness.py new file mode 100755 index 00000000..b781c4ba --- /dev/null +++ b/scripts/minecraft-harness/run_harness.py @@ -0,0 +1,385 @@ +#!/usr/bin/env python3 +"""Boot a dedicated Minecraft server with Advanced Backups and assert /backup start works.""" + +from __future__ import annotations + +import argparse +import os +import re +import signal +import socket +import struct +import subprocess +import sys +import time +from pathlib import Path + +REPO_ROOT = Path(__file__).resolve().parents[2] +DEFAULT_RCON_PASSWORD = "ab-harness" +READY_PATTERNS = ( + re.compile(r"Done \("), + re.compile(r'For help, type ["\']help["\']'), +) +MOD_LOADED_PATTERN = re.compile(r"Config loaded!!") +BACKUP_COMPLETE_PATTERNS = ( + re.compile(r"Backup complete!"), + re.compile(r"SAVING ENABLED - BACKUP COMPLETE!"), +) +BACKUP_FAILED_PATTERN = re.compile(r"ERROR MAKING BACKUP!") + + +class HarnessError(RuntimeError): + pass + + +def find_free_port() -> int: + with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: + sock.bind(("127.0.0.1", 0)) + return int(sock.getsockname()[1]) + + +def write_text(path: Path, contents: str) -> None: + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(contents, encoding="utf-8") + + +def server_properties(game_port: int, rcon_port: int, password: str) -> str: + return "\n".join( + [ + "accepts-transfers=false", + "allow-flight=false", + "broadcast-console-to-ops=true", + "broadcast-rcon-to-ops=true", + "difficulty=peaceful", + "enable-command-block=false", + "enable-jmx-monitoring=false", + "enable-query=false", + "enable-rcon=true", + "enable-status=false", + "enforce-secure-profile=false", + "enforce-whitelist=false", + "force-gamemode=false", + "function-permission-level=2", + "gamemode=creative", + "generate-structures=false", + "hardcore=false", + "hide-online-players=true", + "level-name=world", + "level-seed=harness", + "level-type=minecraft:flat", + "max-players=1", + "max-tick-time=-1", + "motd=AdvancedBackups harness", + "online-mode=false", + "op-permission-level=4", + "pause-when-empty-seconds=86400", + "player-idle-timeout=0", + "pvp=false", + f"rcon.password={password}", + f"rcon.port={rcon_port}", + f"server-port={game_port}", + "simulation-distance=2", + "spawn-animals=false", + "spawn-monsters=false", + "spawn-npcs=false", + "spawn-protection=0", + "sync-chunk-writes=false", + "view-distance=2", + "white-list=false", + "", + ] + ) + + +def backup_properties() -> str: + return "\n".join( + [ + "config.advancedbackups.enabled=true", + "config.advancedbackups.save=true", + "config.advancedbackups.togglesave=true", + "config.advancedbackups.buffer=1048576", + "config.advancedbackups.flush=false", + "config.advancedbackups.activity=false", + "config.advancedbackups.blacklist=session.lock,*_old", + "config.advancedbackups.type=zip", + "config.advancedbackups.path=./backups", + "config.advancedbackups.frequency.min=0", + "config.advancedbackups.frequency.max=24", + "config.advancedbackups.frequency.uptime=true", + "config.advancedbackups.frequency.schedule=1:00", + "config.advancedbackups.frequency.shutdown=false", + "config.advancedbackups.frequency.startup=false", + "config.advancedbackups.frequency.delay=30", + "config.advancedbackups.logging.clients=none", + "config.advancedbackups.logging.clientfrequency=500", + "config.advancedbackups.logging.console=true", + "config.advancedbackups.logging.consolefrequency=500", + "config.advancedbackups.zips.compression=1", + "config.advancedbackups.chains.length=50", + "config.advancedbackups.chains.compress=true", + "config.advancedbackups.chains.smart=true", + "config.advancedbackups.chains.maxpercent=50", + "config.advancedbackups.purge.size=50", + "config.advancedbackups.purge.days=0", + "config.advancedbackups.purge.count=0", + "config.advancedbackups.purge.incrementals=true", + "config.advancedbackups.purge.incrementalchains=1", + "", + ] + ) + + +class MinecraftRcon: + TYPE_RESPONSE = 0 + TYPE_COMMAND = 2 + TYPE_LOGIN = 3 + + def __init__(self, host: str, port: int, password: str, timeout: float = 10.0) -> None: + self.sock = socket.create_connection((host, port), timeout=timeout) + self.sock.settimeout(timeout) + self.request_id = 0 + self._login(password) + + def close(self) -> None: + try: + self.sock.close() + except OSError: + pass + + def command(self, text: str) -> str: + request_id = self._send(self.TYPE_COMMAND, text) + reply_id, _, payload = self._recv() + if reply_id != request_id: + raise HarnessError(f"Unexpected RCON id {reply_id} for command {text!r}") + return payload + + def _login(self, password: str) -> None: + request_id = self._send(self.TYPE_LOGIN, password) + reply_id, _, _ = self._recv() + if reply_id == -1 or reply_id != request_id: + raise HarnessError("RCON authentication failed") + + def _send(self, packet_type: int, payload: str) -> int: + self.request_id += 1 + request_id = self.request_id + body = struct.pack(" tuple[int, int, str]: + length = struct.unpack(" bytes: + chunks = bytearray() + while len(chunks) < size: + piece = self.sock.recv(size - len(chunks)) + if not piece: + raise HarnessError("RCON connection closed") + chunks.extend(piece) + return bytes(chunks) + + +def wait_for_patterns( + paths: list[Path], + patterns: tuple[re.Pattern[str], ...], + timeout: float, + failed_pattern: re.Pattern[str] | None = None, +) -> str: + deadline = time.time() + timeout + last_text = "" + while time.time() < deadline: + chunks = [ + path.read_text(encoding="utf-8", errors="replace") + for path in paths + if path.exists() + ] + last_text = "\n".join(chunks) + if failed_pattern and failed_pattern.search(last_text): + raise HarnessError(f"Saw failure marker {failed_pattern.pattern}") + if any(pattern.search(last_text) for pattern in patterns): + return last_text + time.sleep(0.5) + raise HarnessError( + f"Timed out after {int(timeout)}s waiting for {', '.join(pattern.pattern for pattern in patterns)}" + ) + + +def tail(text: str, lines: int = 80) -> str: + return "\n".join(text.splitlines()[-lines:]) + + +def connect_rcon(host: str, port: int, password: str, timeout: float) -> MinecraftRcon: + deadline = time.time() + timeout + last_error: Exception | None = None + while time.time() < deadline: + try: + return MinecraftRcon(host, port, password, timeout=8.0) + except (OSError, HarnessError) as exc: + last_error = exc + time.sleep(1.0) + raise HarnessError(f"Could not connect to RCON on {host}:{port}: {last_error}") + + +def stop_process(proc: subprocess.Popen[bytes]) -> None: + if proc.poll() is not None: + return + try: + os.killpg(proc.pid, signal.SIGTERM) + except (ProcessLookupError, PermissionError, OSError): + proc.terminate() + try: + proc.wait(timeout=30) + except subprocess.TimeoutExpired: + try: + os.killpg(proc.pid, signal.SIGKILL) + except (ProcessLookupError, PermissionError, OSError): + proc.kill() + proc.wait(timeout=10) + + +def prepare_run_dir(run_dir: Path, game_port: int, rcon_port: int, password: str) -> None: + write_text(run_dir / "eula.txt", "eula=true\n") + write_text(run_dir / "server.properties", server_properties(game_port, rcon_port, password)) + write_text(run_dir / "config" / "AdvancedBackups.properties", backup_properties()) + + +def build_core_and_mod(project_dir: Path, skip_build: bool) -> None: + if skip_build: + return + core_jar = REPO_ROOT / "core" / "build" / "libs" / "advancedbackups-corelib.jar" + if not core_jar.exists(): + print("Building core library...", flush=True) + subprocess.run(["./gradlew", "shadowJar", "--no-daemon"], cwd=REPO_ROOT / "core", check=True) + print(f"Compiling {project_dir.relative_to(REPO_ROOT)}...", flush=True) + subprocess.run(["./gradlew", "compileJava", "--no-daemon"], cwd=project_dir, check=True) + + +def collect_backup_zips(run_dir: Path) -> list[Path]: + backups = run_dir / "backups" + if not backups.exists(): + return [] + return [ + path + for path in backups.rglob("*.zip") + if path.is_file() and "incomplete" not in path.name.lower() + ] + + +def gradle_task_and_run_dir(loader: str, project_dir: Path) -> tuple[str, Path]: + if loader == "fabric": + return "runHarnessServer", project_dir / "run-harness" + return "runServer", project_dir / "run" / "server" + + +def parse_args() -> argparse.Namespace: + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--loader", choices=("fabric", "neoforge"), default="fabric") + parser.add_argument("--mc", default="26.1", help="Minecraft line directory, e.g. 26.1 or 26.2") + parser.add_argument("--skip-build", action="store_true") + parser.add_argument("--keep-world", action="store_true", help="Do not wipe run-harness before start") + parser.add_argument("--start-timeout", type=int, default=300) + parser.add_argument("--backup-timeout", type=int, default=180) + return parser.parse_args() + + +def dump_logs(log_paths: list[Path]) -> None: + combined = "\n".join( + path.read_text(encoding="utf-8", errors="replace") if path.exists() else "" + for path in log_paths + ) + if combined.strip(): + print("--- server log tail ---", file=sys.stderr) + print(tail(combined), file=sys.stderr) + + +def main() -> int: + args = parse_args() + project_dir = REPO_ROOT / args.loader / args.mc + if not project_dir.is_dir(): + raise HarnessError(f"Missing project directory {project_dir}") + + gradle_task, run_dir = gradle_task_and_run_dir(args.loader, project_dir) + gradle_log = project_dir / "harness-gradle.log" + game_port = find_free_port() + rcon_port = find_free_port() + proc: subprocess.Popen[bytes] | None = None + log_paths = [gradle_log, run_dir / "logs" / "latest.log"] + + build_core_and_mod(project_dir, args.skip_build) + + if run_dir.exists() and not args.keep_world: + subprocess.run(["rm", "-rf", str(run_dir)], check=True) + prepare_run_dir(run_dir, game_port, rcon_port, DEFAULT_RCON_PASSWORD) + + print( + f"Starting {args.loader} {args.mc} dedicated server on :{game_port} (RCON :{rcon_port})", + flush=True, + ) + with gradle_log.open("wb") as log_handle: + proc = subprocess.Popen( + ["./gradlew", gradle_task, "--no-daemon"], + cwd=project_dir, + stdout=log_handle, + stderr=subprocess.STDOUT, + start_new_session=True, + ) + + try: + try: + wait_for_patterns(log_paths, (MOD_LOADED_PATTERN,), args.start_timeout) + print("Advanced Backups loaded.", flush=True) + except HarnessError: + dump_logs(log_paths) + raise HarnessError("Advanced Backups did not log 'Config loaded!!'") from None + + wait_for_patterns(log_paths, READY_PATTERNS, args.start_timeout) + print("Server is ready. Triggering backup...", flush=True) + + rcon = connect_rcon("127.0.0.1", rcon_port, DEFAULT_RCON_PASSWORD, timeout=30) + try: + reply = rcon.command("backup start") + print(f"RCON backup start -> {reply.strip() or '(no reply)'}", flush=True) + wait_for_patterns( + log_paths, + BACKUP_COMPLETE_PATTERNS, + args.backup_timeout, + failed_pattern=BACKUP_FAILED_PATTERN, + ) + finally: + try: + rcon.command("stop") + except Exception: + pass + rcon.close() + + zips = collect_backup_zips(run_dir) + if not zips: + dump_logs(log_paths) + raise HarnessError("Backup finished according to logs, but no zip was found under backups/") + + largest = max(zips, key=lambda path: path.stat().st_size) + size = largest.stat().st_size + if size < 256: + raise HarnessError(f"Backup zip is too small: {largest} ({size} bytes)") + + print(f"PASS: {largest.relative_to(run_dir)} ({size} bytes)", flush=True) + return 0 + except HarnessError as exc: + print(f"FAIL: {exc}", file=sys.stderr) + dump_logs(log_paths) + return 1 + finally: + if proc is not None: + stop_process(proc) + + +if __name__ == "__main__": + try: + sys.exit(main()) + except subprocess.CalledProcessError as exc: + print(f"FAIL: command exited {exc.returncode}: {exc.cmd}", file=sys.stderr) + sys.exit(exc.returncode) From c3a54d89c046b2cd142c398c974f01c55ee9f9bc Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 25 Aug 2026 10:06:15 +0000 Subject: [PATCH 3/4] Stop tracking harness Python bytecode. Co-authored-by: Aravind --- .../__pycache__/run_harness.cpython-312.pyc | Bin 21652 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 scripts/minecraft-harness/__pycache__/run_harness.cpython-312.pyc diff --git a/scripts/minecraft-harness/__pycache__/run_harness.cpython-312.pyc b/scripts/minecraft-harness/__pycache__/run_harness.cpython-312.pyc deleted file mode 100644 index ae83e6bf68b1abffa47719c8906836287b7bc440..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21652 zcmcJ132+-{c4jxwxKG}Pcz_}$3Y0+Ik|m3>C{dDik+Mi%^g%=DCJ7P*INhKq!k|Mt zt}}#T#N-G_3BD4RNd*&W0E^4FhGBZir>qu)521+-Xj9yv&JCsr(&` z3tin6VuR>WyqsW^oiwoZWf!x3Owt@onj@P4dO0w6P{bd-C`AujeGoz!UknD%`-y zUEMyUYZmJy-@vn9#`qQ|ZpN4A*8B3hfO=g1@|WB7T0b$GT(_?4mzJyblbopU_C4hr z)2q)>ew4eaf07&Jz58O1ACE+$9=}JF#9+W5l|;{lU|0&s{@$oZk>o3q>=_M4`#r7V z6@NH@&&U0N!I5Fb;}44-zXFt~XXj-W=TV}5yp2ZWL8bXqYKxao+5F*fBmzvhbZ13s$#)vX&tWh#!h)8+>_~<=HW4!_#X?14Jif$FLO(RS*E(N_*GRmA{O(JU-_Q^ zZgSB~Q#ft_?`yAUHew(%AF~kv^1cfB@hYrQ=6-IRi*o}RE}f4j@;NGuTC^{~wP|qf zsm(S~N4!%@7to2|_adj2#dDopJ-3@v_)&2FCpjK}V;VK<+r7H`mfd>}Ht)jUZkby2 zDK+0~Oc|9(U{H#tOs%JS&a|KGO4&L)PMquM?7DQa^+HOx91M#oeJ~tN+4`g?;nKJf zy%MZYCLY;=Fy-t8YEQ2$Nj<|6IVzVUvL3h6gq-b@xq%|78?&G z8xPG}4yQStq3MpeWVT3PwdRUL zwB8nSSYw>m(B6ePU>f$zQaGxl%+l4M677i$-ZzXydwma}%gjaxikC7B z4T?cIWgV4+QK=^?U5z3WVHmt1We!BbQOZl9hI!O(mOX%3;02&iFhMl`%DETMEea(` zp=3t9)s+xR7KA+%-SJ|_^ux2G6CHPjoorqN^4m-;W4)9DfCU6Ukew8W$XtD#sJnso z;udfla2s)(aGP;ka9eTPaNBV^a656kaJz9A;4Z{ngu57b3GPzdWw^_6SKzM1y$N>} z?rPjMxNGCOZ*i|v$(}f$f$HL12HK4HdfW}Tx8UB2yAk&`++N&GH?mW#lk;wGzt3A^ zW&S`w0%P$-Wq(-dm1L!**B?@(SfM`@ij4YtL&3iOXeO@uvJ6%l@GDUt#zBdMBwsY* ziwr9*QF%m)Rpvg+_`d2}kr?dl4F*O+(Xp0c2^_6=BowQZ!v4$11pIgiBEok$g!z*x zYg6Xiz|d9SP$V3TMr2TlR=Lc_Z;VLtSSHS$iKC*``V?hiAZnr`TDz*GaBoBoNIpdh zjL4F2SdR1tLsBM_GVSYVKWHxmYR!BoRulDMqJwE`=$m>+!T}OjzF|oo3MvYLA?b<~ zYS|Mj$RY=12}13P6szcy!jcTh=~K{Sfha1V)yoMUE(Rj9mUVf5P?UU;a0m?FHyrYh z(a^ANcC!L}#B*98AVOlSP>oR}No>)CWQ7_>anauD2WVzxd-;eYKHwIisT#Zm%=`2XgE4XogN8` zO3MQW_U+mgD^c6!3yMTZC_FL}ZP^vG3||?}bi0#Avw0Y62eeddiCNWm@Y0r;U0rhc zh_klDN|fNx2wF!YAY$BT0fIp&QilDbVV^%790FNugQ-S>tdwYu;@xU&csQWp6{;~H zk*LIm8I>zj#=-$#pnoJh=wl2@Lv~#WN~8HjyBQ7nazvEk-iC}Ahy=r6b{3)zCKXZ^ zYLp6^wWcb>k~|p(mnu-3+Jl;a(4s*}k+QGwOWU(&Ux1{xW zeq#5e4S1%FoMT7YM39+tc+(bwtej(W+D4F_;v57yIY(34MUb0w)TIjuD&!os=^}!P zDMblErJQ4Xx{RQ5&apLJK~N>o?IWm}@OBcki)yf&pgmN^UV`>kkXBd1Ia9#QwgUVC75@1)lli(Ho4!beU?JyWs;gk_M?2#4WP)WX0IDI#t)$7~k2H<;ZWA&gk zEQy=_nH9Ra7+0EAPARGk2J7Q>kre+GNyXT@0Y)^^*B6pC3Sw(Qv#+wrxCBg2eo zGr`dOwb)9aUm}g8W%psQ-<@BN-#-!+BctI==l%u-kXARMac}R}79dKHY%P0t#kOyN z8UjT@?l%WQL0a~;grWMy_WVZ3+1_l~kH&s&0qTNArSFZXC|es9d36aJwH5@Vpy!5$ zA?%6rT6S+p0D*pgFsw9(q;MYyYyZZz&LC>JsLAPX(l_89cin&o|WH7NHfS3uO z!>JAp8)Q2?BKJwnN-!o7)<&E~#S;Bv3JCwJvkF8;P~xuGMr5XD6%1oJHH5m6JZE&j z>nkgmhp#rTWw*Qq+)ySvn@swWsv9$ftw3dn`GVF53^LFtq`YMX?PodhwV`ZyQ3a9N4w|{1z4+$qEj@$+GG-4q7hHC=oU?QTEqg;jHgvB z6fJn##3Ip(r+v)kElxSI#+OUz0H(moq`Z7eMF;W~w5-(l6IPczEk9p9#5cO)d|cP7 ziwn1TO_hstJy|@cew5pqYdw8FE@*l=tgbrbkxjS0P9N9j@S!^D+p$Y&k9UpwTcs(SlDdqj;+#MKky*E91D(HG^Wx*n??{HJ1VUxfJS63H=cz3Vo6k z@+Ksd_ab1H60Enh6&K7jK`0$PJ+abN-Q29jPf?7 z*X$x>=cwnR*&c_zQBM|-F;27Qz0JcIrS_X45Q->L%GA-xj8tA;et_DRGh@g{@g6H$ z-486$bwX@JFu|pDdP~8Q-F^Mc)S2rYQyq8h)t@iBNcUq6n0+F@TM$PVIwMPrY7C3b66-ifZ9VIR)-_LKc8u%Cg>ge% zAJ+{Y#P}CPv*sv~kLzK2)j_+~y`ClDm-x5=8neDVR`h6C0&fhE?eo%!j&@H_^u!z< zD2HTJBqi446;g&CMS_XQ-u2|glRdB`UTAG^L!>MPt}qiED4DuAC6H}H#tsITGRx9% zXpG2}?;(T97#S@U>Jdhi8GDi`Q%J02&0wfy{}IrYiwMA`N-A!4-{_td7CpO@p51f% z=1U%!v@X@we<$|M*tg;!$Vu~b-Sp#2wxa3SN4C1ty<&Uc(X(=MMtggQJ1HaseGpwW>}Qg8~v8a5$= ze7IQg>cLRi&9@1glH`rWTdp@;bLI0ThcOZr)!(W7X63i4rkrdb9-)DdUp+eW#I4GY zs`t`x)IK<0cqCyzlGbxI`_vK02o>bYac10j=T}NGOK1eH^6T02L_P+|7SQ#uL=>#g zPR8}oZ0_r^c+3fXoYyvQ;=1)%zL;gr`Xj-hTm^`k4H2O`67-tXnP*f@F=Sv245p0C9x17u(L~c2 zcCeHlD>AQ26)79xNzoos4&>9wQ_V)W91+LXk_XY)TE@wE!*{7Jg9tz!5C*PST{F8e zCx6dH^S0+k&!lzPRdW6Lspn_*&o1J)U7i%O zBBml~uK4!W?`;3(_F3`vi8O_t&QSJY&c^*?{A z;~QOIjq5U2F+2IRp%C?Cl^@>#A4HU4>*KnwUWtf8oGki=%B)5IY1E6DH{uPVv2y)= z1e0jKZPDt&*t`%o^b$E(+vRrD>{DW1>U!w{y%KeP`hUPN7>T4z#EM~|gmu~|(YB2O zZqWgplyM}?h{VQNd5?4z%4fi}#cu`k@Ok?m@{H>zi%vt5f@_9wUOpYzXed0@Wa(4D$u!I4ShlB;OZRhx9x&Kl=k zjg!Li=525J-tf&C=Aw6w-+5&2>ip(oNptO_b^6>=Vd?ZYW(ud977Oc>h4r(i=guSw z>*ouPPMSa>GY{S}C0sib=8RE1p9Zp&l182KDMb^j7|SgCh-WDx&JQ9NxeJs-eZJ;e zkA=kf_40{XbGtm_`nX=P<#vd2`$iDcy7kyf{>pN_+%vW0uXW`ym~0zBH@fy%DU&6+ zC8vk2e?+e-Ww|^SmHe{oACo)LK$UX{Sy>Mnx{4hOF=Ze;A|+MylirjvGCQJ@G7JZ$ zfTU0#k+^4@NAfdxi&d%0z`CckW<05ry>9Be^w>15}{j&`hvkJE>9 z6g)@)ErjKVDImemmJsT)fyQc$E-CM%I0|0It?XmKQgO+|g{7k6iStVZg%fA*34)bwfbchqc5rTfl}5al?9hg<3kf2;U7_Zn>wZ z%ikrup}W>7aO1{tgJ@Wn9T+uX@v14Vm%VZQ0JVJ0HI;Rbk;|ht?W1S}HYpryF4`^A za(#)9y0p)ere5sey=;#2ZJgE$4NulhnL6{g$7xxy<`T0mID9_l8Z3I%a*wNh%U^pp zuhy1mk(MOKNTHKhMcaBkB-&qw%KqgVqm_C3O8^_-0o}M^6eQoSnm=ecBzGftTPIf& z{1gQZ2x3K@{!zA2#{QHCR--{Ub_6m)8{avOC=v6UUpWTgkN9&O&sLz%V0J<5ue)P9 zmF@FC=5O*mcdbl-I{I(*qrBXLOi0)&V55P4?2YJ}caaVh#pX;nWeH)wk?jI!_CzKa zd%SNsLYrwE{*VL;+PSrT2%& zQU)a?NyCh(dd-kxFo$E8UmFBf1UOZVOB)+J^Kg1AEJ-Qcx7M zZTV$_kC@Ao~5Dnyu0cm3Z&&|rKm-u`GT$C2j z?CRCQ7*{uLj6>$-)r;D==E`Z)WV#a}C0{Ux&FVAfmY0{un)LLV9Z*fuM6NyOHMP^E z!-aXa2an8K`k`3$iO5Ju^uP&^_5jJc>WM~FLsum1xz8WIuRH94B0P#z>iUK(pek2* z9uRbDS`@15LAHbgC*Qv>z_NiqDIg`yJ)`-yvI%&$bnfw|~h@152=;+@Cd z+wdK& z3DY-AQK&=aie{;3z^cXNo|;O`t0rX<32QD!=b0&=F(GHyPf@3a9L=tMdi9{?BG_8E zfgt&P@P z`7H|zTFcN2>-DJ~o^#ng%{Re&h4xQtkTaWupVEMNU9>F$dy_7rq>O{XP-wU>r5~m} z3?lY&NHXGPF}i@D!eF1pfM`vBN2GmGQ)k!busIN#3E#xoGA-dEknUDoQ_fg z$y2cIk;`x-q0}iSEpM>6IeB$BC`%&C|J<4L=TicejzyV3n0b2vDZ3Jl4AcG?rI%kv z3IB*&`5^+Zc9ZRuu@}dF_xXgWX36Zto`9iZ*=!{*#_5Ke+iq<8_Nni*f3tnTygh9+ z8GynZ9A`F9TCfvB^UzWIrtAA<3ELs;8yG6+yK~CsC+#^*i#Pjk^uK9*%lU@$u6^g{%kIr@c6|TwgsX+NAj&g46Tg3sHX_RJ zf08Tt=jQ6P4Vm3nPNNNf*i5roSJ?Ux=5#~r5&e%I>$-gE1o` zxO4QpDviK$G_aIe{Y#_RTpHNPjqNeB1fQwq=+$V> z5rFp#&dJf4%A~7)_L&7?FMCZ?>`1zHEHpp#p5=o>iN~IuZ|+$To>MW)ldif%!?C36 z*uwG7`Qwk?6&_Pp6|^?jt}IX9%2pL|UIyQ#g{XRIBg1-=jRWl27!B+%>Aq^|q%=pf zy-r5T+ooKfM@i(dYdwoNd`ivV<-b$|BaE4u5r~zzD1h6vOzJ9_LM+AiZEu41Vds<2n8=Iu}y2diQvyE!*}v>^MGHDl^-We(v~RJ zgJ{_=k2Ns^uy&c3>RR1 zU=(IFxUd8UW7ZRJs0d=k+2@JrksFBb7P=y3BbNy5@SOEu@yq`PF>vR$TsnENqvujb zN0)q+a16t6C5_561nWU^DI2QG95j2P5vZRw(ER|`K18_SmV?3J9<{mfJ_eDZRja-8 z3fWieN8=-Q0LiOg{&Qr0AGb1rV1oPDQ~-Xs>?)r*0NR{Aopf!#)thwfOB^I?K9m+) z(e;O>9$K(LQ*b1l+vbG3=Kag&LSla(l^uIOn7H&r^3)TF=ft~aX<4vLo}GSvv8*{+ z)_i+xzU)w<^zfbfg!Slq;$7h!=D;iMFSdVFbo9M*iN~M%x$yK?SpE~J9xX^za^FaK z*Vu;w^G_$1#OqCf+&%ydMY@ckXjf*!WXTrAWiBmGxkkiB?0U5pwa7{}N~h@Djxj0J6|oGGj?P>n2Vw z*$S^8ojST;+qC2=n6y9}EvdSB;l_p8#`)qVsHJw}Cw4bEa2}aDa_#6$Xs+Q0-tT#T zu=9I6=l7gQ)|~jvz*!uh>468$l$1XXAXEO{+22~fTKOYRftz1x2A~csJHBM1J#AH< z^rEw%xxj0k@irrc6bHQ^W$g7|mV<$m8`I)p_2fz?JJ=JmAx1lM0^7hySdEwGP!5@H z==2Y>fMTK=*@+uj{!@Hgr4N>=le{PDR|eTsK|V}8ybnw_^&QzuX&vF1F8|0>v4pwu z;9PaG{%FE=G=YsQTj`8#R!Wv{ztx{CKaj8;NC*d1>PEWkMbySRp$l2&3*7Zw2XbB# z@OS|}T^pWJf$>rlZX0q88B93K)YY^Uibhf0g~~GS4e(&pyKT=2hz+nDqD^$(c71KB z?wkT37ThlUTKu9s{NgqEAd0n@Hupd(C3HN?CQ9nDB)H(j%s!tw>M#e;VlZV6OA(ml z`Xu%WsxSrmBSEYhQzlXB_2VQ!Oz`=J0x@CFf#%(@?b(eE$Os(o0`J8Hi^yX;JW_LC zvxks8aI?U34~qC(Dng*MUNO7RM?Bi6@@Om8r{Kfn7)CZlat}rAfHMe7l~47TZ)l4! z9d|T1EP3+i+H+Y#jV1ML8VdOkg~-vt|MH7s575|0W=>04SrUp=s2%K0 z&RdAfWKm%O?f)y^#Tyn%j*>-3L(D>1EH;pfb>51zs3WVRj`y?JU^X^U?)|?04peAl+L{;J^!=hc0Tz3F$yTsv zt4i9c=4~|zq2|kiC_7ab(14AMRiX|yZtOp31el$sWNXe$F(l7k8lHSCZ@r|?*NyvIkJBVHx39dI4l@#8@7GodCwJ%DOGaHhJC& ztuQ!!#;Uv>R%L;#?2vj{i@zK}v1}Irhv1knl*bSQm>HYv0Ozx9c?1!$Dsg0Jn0#B- zGp=tY8r%moW@P@1(^rs8gXhXaC-@%@{>9*b9GVnpEi-GHvrIY{%!dZtl103do)JJYXN6N;Q9e8`-uK5sNuZhzSycT|Q?^}o8IQ(;SGpx(z@-K@fVymiX zg4oCxO&ZOPbJ47p0&yS!f6Ybm8ei72|1kZ8=7eQU61-~pE6yBE!=;0rBGcv*cEfTW zHtUv+S&*q6bH&hMGaiTQS-C=PCrv907EYH|lWd$37EDu|Ji79s6EzztMZh*A(H5W=Qe24fIu5lCi4E}O8p@aC* z?dn%hr8&AogL`QVX%V{S$}LLrdZ=i1`&Q*h7HW3=7WtK|$#1`whgh0FT4LGla&5%M zt#Gup4jj}lb5F5C>(_BxUY#rBwgEDBuemfDyvi$3NW@LF+q|YW`TccROODnZ(cs)O zN*)L7x?QE!l-Y0BuW7YbQ_K+SzzHpF?y1!d^m$T?&C&U|J#JS@qr0&ZoT8oX_@q-E6ZI4D9+^Vhmi~OxYXvj1GAt$ z?nKz|x*@Oh+#K72(#V->&6R6geh#b01LJOb(Hp)e z#%VO`*zRp=k5yivqqr~)WehnvWx^9H%p7C&sj4WBf%UV_Q@$-4j$iw4FcJ?CFw&ebC9MC91jt?UxgP~b>00?&EeaIjDdQg*IdFw>#~TTJ}Q0RUgOfwrEO-^r_;bajZO7l1zMvR*SSenc!}9z5C?bPrmciqVHJJ zcWgpEN(6mPKPZiT$^kD{k?9R;Dn=n1iFj}jD-=5HiRnDsVkVF378o;LZ0+nk>|t)H zG2^M$Gw1QLh(eeLv$sjr_x>G4{1`z>Hxx)2VY(vYI$0p(_bDJz&TNnJpAp3DTvpP2 zdzj|SY@Wgh^YCPU?sZCv63)lb%rwkX_!`Ru?*70bU zJVB`nFLbo^obPCDJK2UbUD%XrPdQXl&K$yFE9;aKznRhYq=wSTwsln(x{oQFa`gvQ z=#&Key_GCt%Bd1UPbRliNd}X;Ca+A($*c4O26PIDWF@o0rSv$#CVxt=|AT_>Q9xT& za*6_)c3yW%Al;hTsPH=;%=pagQq1s|vSwmHu6cVG-=^ft2(X(C4Wl2{UNRiges#*g z=0Zv!TVTo*Lgrv5s?*^VQYdZ&neFcELv?czh|FX%9d0Meis_juZ!3B2$VA(6;ieh! zJA>aGOcr`?wY_`#?bFG^y%XnP2wSvOCvDXWw%TQ9Wup4v9oyV^V$;ca=c$DG)Gs&f zncMe+2fz2=d$##a=aWMD#JTCRrGlzN?cQX;UhJE@Yv$b^xXEOmOWSu&v@I2Ent6Qo zO0wEFXHQncHMC{o%rAw~>E~zL-s*UxV?o&WiOHE!e`bZZT;FwN4Ae8ijPz#bt+IcO zJ@q|z8t$4OS{90?PtQDg%d)Wd;ROM?SeC3s(``4;-8eVhGRx04yw&(d<7`Eu>DYS} z@7ZwLr0bbP=d+1tdlKg7mYjwEWY8Oo(6+3_*K4P0XNu=7HEGUdu+BCuyDC&?=Ost^ z%=X#wgnj>#d(%=;^>R`5Vo^h~s9~vQ^F5o>U9tDpmUp+mz5N~E zM@^^ipuC3@g=Z3vJbKsu80xU(u2^<&TXGjKy6cnf`sLbv|70;ZoN1@tQG(c;_8az@ z#}?cTFcZT)2|ftd&i~T2dG_GEYx|_|v8!m=UNRkouP!?x(l=k&pRo7;van=YOnQzj z6tQ+c{s@m9TgH z((ITvPLD2@H6_cMZXKL2+nXreH+P)5Oq@nMSfMSc(5bvJyzT!g&xQ0~K~Kt1w%=fAjD#o5bYXD}3Cgiv>7TAIu#-*?T; z%jSY+h2o@;V zOhJ$W_B{m1YgYLk;i?<93~E}9NollPS^5@=u*z{f?px`c{ZkiVetAY7M?`Fs>X9u= z&4?tY&Zo#Fdxr;0k7t;ZpgaIHwuXq6uEFxeJ>)d5R*)6Te@e?ww4;p@vC@B+AXZP- z4u+=sr>oyd%TmAR+5!6;rH$Ji+63tBXJ;j9dGkLvaWnx0@MYgy7 z)&0eK*2sj7nuf$Pen~143FT!f+j5% z;MaRHHs|JcY--_WOmLhA1`D@Ao-VM`mfs__uUb_&S1K=nSGAn0WZUZsGE_%{gpa|-^Fg7+zy zr+^H7Ov*B!|CB(}Bvp6uxQ_rwC}j}NYcJ@!m?D}kl;!_5u6jpUpf2Y*~!?vP`RYN;k3@YunT;% zP&eU(ye#!hU!qf=3D2JSlD!G8Fquz_u7?G6Tfq%xSi)~)0cJF0G*6|q_0Tp1Vi1D**&ShZk{sV zDE`CJyYLk-@KE}Sfd&_L#t?(P+1P)PMx}*Q0=`T!kV+m*L z2l~Ia{;l<{xig#9bkWV48#Rk&Ptxom?>|G`eT7Vi?>CmgZt@e(b*f(f6IZMCRE_?x IYYce#zufwb_y7O^ From 3d62047d38ac8ed137289ae4016ae2496834acb4 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 25 Aug 2026 10:06:39 +0000 Subject: [PATCH 4/4] Ignore harness logs and Python bytecode. Co-authored-by: Aravind --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 190e6fb1..36c26326 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,6 @@ run runs run-harness harness-gradle.log +__pycache__/ +*.pyc forge*changelog.txt