Skip to content

Commit

Permalink
1.19.2 glare rework (#185)
Browse files Browse the repository at this point in the history
* old texture

* glare brain

* wip

* wip

* translation fix

* wip

* Cleanup

* cleanup

* wip

* Improved glare animations

* Fixed brain logic for baby glare

* Added new workflows

* Bumped version

* Removed script
  • Loading branch information
Faboslav authored Jan 30, 2024
1 parent 73e190a commit be1c9d1
Show file tree
Hide file tree
Showing 44 changed files with 1,592 additions and 1,337 deletions.
20 changes: 0 additions & 20 deletions .github/actions/setup-environment/action.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/scripts/run-client.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

./gradlew $1:runClient > gradle_client_output.txt 2>&1 &
./gradlew $1:runClient --no-daemon 2>&1 | tee gradle_client_output.txt &

SUCCESS_PATTERN='minecraft:textures/atlas/mob_effects\.png-atlas'
ERROR_PATTERNS=(
Expand Down
4 changes: 3 additions & 1 deletion .github/scripts/run-server.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash

./gradlew $1:runServer --args="nogui" > gradle_server_output.txt 2>&1 &
mkdir -p $1/run && echo "eula=true" > $1/run/eula.txt

./gradlew $1:runServer --no-daemon --args="nogui" 2>&1 | tee gradle_server_output.txt &

SUCCESS_PATTERN='For help, type "help"'
ERROR_PATTERNS=(
Expand Down
87 changes: 32 additions & 55 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,77 +12,54 @@ on:
jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
mod_loader: [fabric, forge, neoforge]
script: [client, server]

name: "Build"
timeout-minutes: 10
name: Run ${{ matrix.mod_loader }} ${{ matrix.script }}
timeout-minutes: 15

steps:
- name: "Checkout repository"
uses: actions/[email protected]
with:
fetch-depth: 0

- name: "Check if the mod loader is supported"
id: check-mod-loader
run: |
if [ -d ${{ matrix.mod_loader }} ]; then
echo "Mod loader is supported"
echo "is_mod_loader_supported=true" >> $GITHUB_OUTPUT
else
echo "Mod loader is not supported"
echo "is_mod_loader_supported=false" >> $GITHUB_OUTPUT
fi
- name: "Set up JDK"
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
uses: actions/[email protected]
with:
java-version: 17
distribution: temurin

- name: "Setup Gradle"
uses: gradle/[email protected]
with:
cache-read-only: false

- name: "Run Gradle build"
run: ./gradlew build --no-daemon

run-client:
needs: build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
mod_loader: [ "fabric", "forge" ]
name: Run ${{ matrix.mod_loader }} client
timeout-minutes: 10

steps:
- name: "Checkout repository"
uses: actions/[email protected]
- name: "Setup Gradle and run build"
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
uses: gradle/[email protected]
with:
fetch-depth: 0

- name: "Setup environment"
uses: ./.github/actions/setup-environment

- name: Run ${{ matrix.mod_loader }} client
uses: modmuss50/xvfb-action@v1
with:
run: ./.github/scripts/run-client.sh ${{ matrix.mod_loader }}
shell: bash

run-server:
needs: build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
mod_loader: [ "fabric", "forge" ]
name: Run ${{ matrix.mod_loader }} server
timeout-minutes: 10

steps:
- name: "Checkout repository"
uses: actions/[email protected]
with:
fetch-depth: 0

- name: "Setup environment"
uses: ./.github/actions/setup-environment
cache-read-only: false
gradle-version: wrapper
arguments: ${{ matrix.mod_loader }}:build

- name: "Accept eula"
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
run: mkdir -p ${{ matrix.mod_loader }}/run && echo "eula=true" > ${{ matrix.mod_loader }}/run/eula.txt

- name: Run ${{ matrix.mod_loader }} server
run: ./.github/scripts/run-server.sh ${{ matrix.mod_loader }}
shell: bash
- name: Run ${{ matrix.mod_loader }} ${{ matrix.script }}
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
uses: modmuss50/xvfb-action@v1
with:
run: ./.github/scripts/run-${{ matrix.script }}.sh ${{ matrix.mod_loader }}
shell: bash
Loading

0 comments on commit be1c9d1

Please sign in to comment.