Skip to content

Commit

Permalink
Merge branch '1.19.4' into 1.20.1
Browse files Browse the repository at this point in the history
* 1.19.4:
  Pass output to both file and console
  • Loading branch information
Faboslav committed Jan 21, 2024
2 parents c310f8f + 44a9f2b commit aae5764
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 4 deletions.
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
25 changes: 23 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help: ## Prints help for targets with comments
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

build-project: ## Builds project
./gradlew build --stacktrace --info
./gradlew build

refresh: ## Refresh dependencies
./gradlew --refresh-dependencies
Expand All @@ -13,5 +13,26 @@ clean-cache: ## Cleans cache
rm -rf $GRADLE_HOME/caches/build-cache-*
./gradlew clean

stop: ## Stops all deamons
./gradlew --stop

gen-sources: ## Generate sources
./gradlew genSources
./gradlew genSources

run-fabric-client: ## Runs fabric client
./gradlew fabric:runClient

run-forge-client: ## Runs forge client
./gradlew forge:runClient

run-neoforge-client: ## Runs neoforge client
./gradlew neoforge:runClient

run-fabric-server: ## Runs fabric server
./gradlew fabric:runServer

run-forge-server: ## Runs forge server
./gradlew forge:runServer

run-neoforge-server: ## Runs neoforge server
./gradlew neoforge:runServer

0 comments on commit aae5764

Please sign in to comment.