fix/i18n-key-1.21.1-fabric

.github/workflows/publish-release.yml

@@ -2,34 +2,42 @@ name: publish-release
 on:
   workflow_dispatch:
     inputs:
-      bump:
-        description: 'The bump in version for this release'
+      forge:
+        description: 'Forge'
         required: true
-        type: choice
-        default: patch
-        options:
-          - major
-          - minor
-          - patch
+        type: boolean
+        default: true
+      fabric:
+        description: 'Fabric'
+        required: true
+        type: boolean
+        default: true
+      neoforge:
+        description: 'NeoForge'
+        required: true
+        type: boolean
+        default: true
 
 jobs:
   create-release:
     runs-on: ubuntu-latest
     outputs:
       ref: v${{ steps.bump-version.outputs.version }}
       version: ${{ steps.bump-version.outputs.version }}
+      build-matrix: ${{ steps.set-build-matrix.outputs.result }}
+      publish-matrix: ${{ steps.set-publish-matrix.outputs.result }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Extracting version from properties
         shell: bash
-        run: echo "version=$(cat gradle.properties | grep -w "\bversion" | cut -d= -f2)" >> $GITHUB_OUTPUT
+        run: echo "version=$(cat gradle.properties | grep -w "\bversion\s*=" | cut -d= -f2)" >> $GITHUB_OUTPUT
         id: extract-version
       - name: Bumping version
         uses: TwelveIterationMods/bump-version@v1
         with:
           version: ${{ steps.extract-version.outputs.version }}
-          bump: ${{ inputs.bump }}
+          bump: patch
         id: bump-version
       - name: Updating version properties
         run: |
@@ -43,36 +51,136 @@ jobs:
         shell: bash
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+      - name: Preparing build matrix
+        id: set-build-matrix
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const settingsGradle = fs.readFileSync('settings.gradle', 'utf8');
+            const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*(['"]([^'"]+)['"](?:,\s*['"]([^'"]+)['"])*\s*)\)/gm;
+            const includes = [...settingsGradle.matchAll(includePattern)].flatMap(match => match[0].match(/['"]([^'"]+)['"]/g).map(item => item.replace(/['"]/g, '')));
+            const includeFabric = includes.includes('fabric') && ${{inputs.fabric}};
+            const includeForge = includes.includes('forge') && ${{inputs.forge}};
+            const includeNeoForge = includes.includes('neoforge') && ${{inputs.neoforge}};
+            return {
+              loader: [includeFabric ? 'fabric' : false, includeForge ? 'forge' : false, includeNeoForge ? 'neoforge' : false].filter(Boolean),
+            }
+      - name: Preparing publish matrix
+        id: set-publish-matrix
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const settingsGradle = fs.readFileSync('settings.gradle', 'utf8');
+            const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*(['"]([^'"]+)['"](?:,\s*['"]([^'"]+)['"])*\s*)\)/gm;
+            const includes = [...settingsGradle.matchAll(includePattern)].flatMap(match => match[0].match(/['"]([^'"]+)['"]/g).map(item => item.replace(/['"]/g, '')));
+            const includeFabric = includes.includes('fabric') && ${{inputs.fabric}};
+            const includeForge = includes.includes('forge') && ${{inputs.forge}};
+            const includeNeoForge = includes.includes('neoforge') && ${{inputs.neoforge}};
+            const gradleProperties = fs.readFileSync('gradle.properties', 'utf8');
+            const curseForgeProjectId = gradleProperties.match(/^(?!#)curseforge_project_id\s*=\s*(.+)/m);
+            const modrinthProjectId = gradleProperties.match(/^(?!#)modrinth_project_id\s*=\s*(.+)/m);
+            const mavenReleases = gradleProperties.match(/^(?!#)maven_releases\s*=\s*(.+)/m);
+            return {
+              loader: ['common', includeFabric ? 'fabric' : false, includeForge ? 'forge' : false, includeNeoForge ? 'neoforge' : false].filter(Boolean),
+              site: [curseForgeProjectId ? 'curseforge' : '', modrinthProjectId ? 'modrinth' : '', mavenReleases ? 'publish' : ''].filter(Boolean),
+              exclude: [
+                {loader: 'common', site: 'curseforge'},
+                {loader: 'common', site: 'modrinth'}
+              ]
+            }
+  build-common:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.create-release.outputs.ref }}
+      - name: Validate gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+          cache: 'gradle'
+      - name: Make gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: Build common artifact
+        run: ./gradlew :common:build '-Pversion=${{needs.create-release.outputs.version}}'
+      - name: Upload common artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: common-artifact
+          path: common/build
+    needs: create-release
+  build-release:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix: ${{fromJson(needs.create-release.outputs.build-matrix)}}
+      fail-fast: false
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.create-release.outputs.ref }}
+      - name: Validate gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+          cache: 'gradle'
+      - name: Make gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: Download common artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: common-artifact
+          path: common/build
+      - name: Build ${{ matrix.loader }} artifact
+        run: ./gradlew :${{ matrix.loader }}:build '-Pversion=${{needs.create-release.outputs.version}}'
+      - name: Upload ${{ matrix.loader }} artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.loader }}-artifact
+          path: ${{ matrix.loader }}/build
+    needs:
+      - create-release
+      - build-common
   publish-release:
     runs-on: ubuntu-latest
-    permissions:
-      packages: write
     strategy:
-      matrix:
-        loader: [ common, fabric, forge, neoforge ]
-        site: [ curseforge, modrinth, publish ]
-        exclude:
-          - loader: common
-            site: curseforge
-          - loader: common
-            site: modrinth
+      matrix: ${{fromJson(needs.create-release.outputs.publish-matrix)}}
+      fail-fast: false
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.create-release.outputs.ref }}
+      - name: Download ${{ matrix.loader }} artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ matrix.loader }}-artifact
+          path: ${{ matrix.loader }}/build
       - name: Validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
+          cache: 'gradle'
       - name: Make gradle wrapper executable
         run: chmod +x ./gradlew
       - name: Publish
-        run: ./gradlew :${{ matrix.loader }}:${{ matrix.site }} '-Pversion=${{needs.create-release.outputs.version}}' '-PtwelveIterationsNexusUsername=${{ secrets.NEXUS_USER }}' '-PtwelveIterationsNexusPassword=${{ secrets.NEXUS_PASSWORD }}'
+        run: ./gradlew :${{ matrix.loader }}:${{ matrix.site }} '-Pversion=${{needs.create-release.outputs.version}}' '-PmavenUsername=${{ secrets.MAVEN_USER }}' '-PmavenPassword=${{ secrets.MAVEN_PASSWORD }}'
         env:
           CURSEFORGE_TOKEN: ${{secrets.CURSEFORGE_TOKEN}}
           MODRINTH_TOKEN: ${{secrets.MODRINTH_TOKEN}}
-    needs: create-release
+    needs:
+      - create-release
+      - build-common
+      - build-release

.github/workflows/publish-snapshot.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:

CHANGELOG.md

@@ -1,3 +1 @@
-- Reduced default rescueDistance to 3 instead of 5
-- Require Line of Sight for rescuing to initiate
-- Require the player to be looking towards the downed player for rescuing to initiate
+- Added stats for Players Revived and Times Revived

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT' apply(false)
+    id 'fabric-loom' version '1.9-SNAPSHOT' apply(false)
     id 'net.neoforged.moddev' version '0.1.110' apply(false)
     id 'net.darkhax.curseforgegradle' version '1.1.18' apply(false)
     id "com.modrinth.minotaur" version "2.+" apply(false)

common/src/generated/resources/data/hardcorerevival/tags/item/passthrough_death_when_held.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:totem_of_undying"
+  ]
+}

common/src/main/java/net/blay09/mods/hardcorerevival/HardcoreRevival.java

@@ -1,30 +1,23 @@
 package net.blay09.mods.hardcorerevival;
 
 import net.blay09.mods.balm.api.Balm;
-import net.blay09.mods.balm.api.proxy.SidedProxy;
-import net.blay09.mods.hardcorerevival.capability.HardcoreRevivalData;
-import net.blay09.mods.hardcorerevival.capability.HardcoreRevivalDataImpl;
-import net.blay09.mods.hardcorerevival.capability.InvalidHardcoreRevivalData;
+import net.blay09.mods.balm.common.config.ConfigLocalization;
 import net.blay09.mods.hardcorerevival.command.ReviveCommand;
 import net.blay09.mods.hardcorerevival.compat.Compat;
 import net.blay09.mods.hardcorerevival.config.HardcoreRevivalConfig;
 import net.blay09.mods.hardcorerevival.handler.*;
 import net.blay09.mods.hardcorerevival.network.ModNetworking;
 import net.blay09.mods.hardcorerevival.stats.ModStats;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 public class HardcoreRevival {
     public static final String MOD_ID = "hardcorerevival";
 
-    private static final SidedProxy<HardcoreRevivalManager> manager = Balm.sidedProxy("net.blay09.mods.hardcorerevival.HardcoreRevivalManager", "net.blay09.mods.hardcorerevival.client.HardcoreRevivalClientManager");
-    private static final HardcoreRevivalData clientRevivalData = new HardcoreRevivalDataImpl();
-
     public static final Logger logger = LogManager.getLogger();
 
     public static void initialize() {
+        ConfigLocalization.enableModernTranslationKeys(MOD_ID);
         HardcoreRevivalConfig.initialize();
 
         ModNetworking.initialize(Balm.getNetworking());
@@ -39,18 +32,7 @@ public static void initialize() {
         RescueHandler.initialize();
 
         Balm.initializeIfLoaded(Compat.MR_CRAYFISHS_GUN_MOD, "net.blay09.mods.hardcorerevival.compat.MrCrayfishsGunModAddon");
-    }
-
-    public static HardcoreRevivalManager getManager() {
-        return manager.get();
-    }
-
-    public static HardcoreRevivalData getRevivalData(Entity entity) {
-        return entity instanceof Player player ? getManager().getRevivalData(player) : InvalidHardcoreRevivalData.INSTANCE;
-    }
-
-    public static HardcoreRevivalData getClientRevivalData() {
-        return clientRevivalData;
+        Balm.initializeIfLoaded(Compat.INVENTORY_TOTEM, "new.blay09.mods.hardcorerevival.compat.InventoryTotemAddon");
     }
 
 }