diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 0e1bb30..54e96f1 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -7,26 +7,37 @@ on: jobs: build: - strategy: - matrix: - java: [ 21 ] - os: [ubuntu-latest, macos-latest, windows-latest] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v4 - - name: Set up JDK ${{ matrix.java }} + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: ${{ matrix.java }} + java-version: 21 distribution: 'temurin' - - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + - name: Initialize caches + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/loom-cache + ~/.gradle/wrapper + key: ${{ runner.os }}-build-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-build- + ${{ runner.os }}- + + - name: Make gradlew executable + run: chmod +x ./gradlew - name: Build with Gradle - run: ./gradlew build --stacktrace + run: ./gradlew build - uses: actions/upload-artifact@v4 with: name: Artifacts - path: build/libs/ + path: build/libs/*.jar diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml new file mode 100644 index 0000000..33c3029 --- /dev/null +++ b/.github/workflows/gradle_release.yml @@ -0,0 +1,85 @@ +name: Gradle Release + +on: + workflow_dispatch: + inputs: + version: + description: 'Version' + required: true + type: string + +jobs: + build: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: 'temurin' + + - name: Initialize caches + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/loom-cache + ~/.gradle/wrapper + key: ${{ runner.os }}-build-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-build- + ${{ runner.os }}- + + - name: Make gradlew executable + run: chmod +x ./gradlew + + - name: Build with Gradle + run: ./gradlew build + + - uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/*.jar + + - name: Publish release + uses: Kir-Antipov/mc-publish@v3.3 + with: + modrinth-id: m5T5xmUy + modrinth-featured: false + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + + curseforge-id: 1026394 + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + + github-tag: ${{ inputs.version }} + github-generate-changelog: false + github-draft: false + github-prerelease: false + github-token: ${{ secrets.GITHUB_TOKEN }} + + files: | + build/libs/!(*-@(sources)).jar + build/libs/*-@(sources).jar + + name: FabricBetterGrass ${{ inputs.version }} + version: ${{ inputs.version }} + version-type: release + changelog-file: CHANGELOG.md + + loaders: | + fabric + game-versions: | + [1.21,) + game-version-filter: releases + dependencies: | + fabric-api(required){modrinth:P7dR8mSH}{curseforge:306612}#(ignore:github) + midnightlib(required){modrinth:codAaoxh}{curseforge:488090}#(ignore:github) + + retry-attempts: 2 + retry-delay: 10000 + fail-mode: fail diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6137f03 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +**Full Changelog: [1.0.4+1.20.6...1.0.4+1.21](https://github.com/UltimatChamp/FabricBetterGrass/compare/1.0.4+1.20.6...1.0.4+1.21)** + +### 1.0.4+1.21 +- Port to `1.21`! diff --git a/README.md b/README.md index 9887ea4..135450f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@
-[![Discord](https://img.shields.io/discord/1186925300236427264?style=for-the-badge&logo=discord&logoColor=%23fff&color=%235865F2)](https://discord.gg/kfKjjhv3pn) [![Recommended Launcher: Modrinth Theseus](https://img.shields.io/badge/Recommended%20Launcher-Modrinth%20App-%2300AF5C?style=for-the-badge&logo=modrinth)](https://modrinth.com/app) [![Website](https://img.shields.io/badge/modpack-%2300AF5C?style=for-the-badge&logo=modrinth&label=my)](https://modrinth.com/modpack/optimum-fuse) +[![Discord](https://img.shields.io/discord/1186925300236427264?style=for-the-badge&logo=discord&logoColor=%23fff&color=%235865F2)](https://discord.gg/kfKjjhv3pn) [![Modrinth](https://img.shields.io/badge/On-Modrinth-%2300AF5C?style=for-the-badge&logo=modrinth)](https://modrinth.com/mod/fabricbettergrass) [![CurseForge](https://img.shields.io/badge/On-CurseForge-%23f16436?style=for-the-badge&logo=curseforge)](https://www.curseforge.com/minecraft/mc-mods/fabricbettergrass) [![Modpack](https://img.shields.io/badge/modpack-%2300AF5C?style=for-the-badge&logo=modrinth&label=my)](https://modrinth.com/modpack/optimum-fuse)
diff --git a/gradle.properties b/gradle.properties index 53f537d..9d3f40e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21-pre2+build.2 loader_version=0.15.11 # Mod Properties -mod_version=1.0.1+1.21-pre2 +mod_version=1.0.4+1.21-pre2 maven_group=dev.ultimatchamp archives_base_name=FabricBetterGrass diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index 1b6c787..4f906e0 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/bin/sh +#!/usr/bin/env sh # -# Copyright © 2015-2021 the original authors. +# Copyright 2015 the original author or authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,101 +17,67 @@ # ############################################################################## -# -# 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/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# +## +## Gradle start up script for UN*X +## ############################################################################## # 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 +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} +APP_BASE_NAME=`basename "$0"` # 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"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +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 ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + JAVACMD="java" which java >/dev/null 2>&1 || 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 @@ -140,95 +106,80 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi 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 Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi # 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" ) - +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi # 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" ) + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$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 + i=`expr $i + 1` done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# 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. -# +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" exec "$JAVACMD" "$@" diff --git a/src/main/resources/assets/bettergrass/lang/it_it.json b/src/main/resources/assets/bettergrass/lang/it_it.json new file mode 100644 index 0000000..3ae40d9 --- /dev/null +++ b/src/main/resources/assets/bettergrass/lang/it_it.json @@ -0,0 +1,13 @@ +{ + "bettergrass.midnightconfig.title":"FabricBetterGrass", + "bettergrass.midnightconfig.category.config": "Generali", + "bettergrass.midnightconfig.warn":"\u00A7cPer rendere effettivi i cambiamenti è necessario un ricaricamento del mondo o F3+A.", + "bettergrass.midnightconfig.betterGrassMode":"Modalità Erba Migliorata", + "bettergrass.midnightconfig.betterGrassMode.tooltip":"\u00A74Disattivata \u00A7r- Blocchi di erba classici\n\u00A73Rapida \u00A7r- La texture superiore verrà applicata a tutti il lati del blocco d'erba (veloce)\n\u00A7dDettagliata \u00A7r- La texture superiore verrà applicata dinamicamnete a i lati del blocco d'erba richiesti (lento)", + "bettergrass.midnightconfig.enum.BetterGrassMode.OFF":"Off", + "bettergrass.midnightconfig.enum.BetterGrassMode.FAST":"Rapida", + "bettergrass.midnightconfig.enum.BetterGrassMode.FANCY":"Dettagaliata", + "bettergrass.midnightconfig.category.advanced": "Avanzate", + "bettergrass.midnightconfig.blockstates":"Blocchi connessi", + "bettergrass.midnightconfig.blockstates.tooltip":"Blocchi come l'erba che dovrebbero essere connesssi sulle pendenze." +} diff --git a/src/main/resources/assets/bettergrass/lang/ru_ru.json b/src/main/resources/assets/bettergrass/lang/ru_ru.json new file mode 100644 index 0000000..dc6e283 --- /dev/null +++ b/src/main/resources/assets/bettergrass/lang/ru_ru.json @@ -0,0 +1,13 @@ +{ + "bettergrass.midnightconfig.title":"FabricBetterGrass", + "bettergrass.midnightconfig.category.config": "Основные настройки", + "bettergrass.midnightconfig.warn":"\u00A7cПерезапуск мира или F3+A необходимы чтобы применить эти изменения.", + "bettergrass.midnightconfig.betterGrassMode":"Режим улучшенной травы", + "bettergrass.midnightconfig.betterGrassMode.tooltip":"\u00A74Выкл \u00A7r- Блоки травы выглядят как обычно\n\u00A73Быстро \u00A7r- Верхняя текстура блока травы будет применена ко всем его сторонам (быстро)\n\u00A7dДетально \u00A7r- Верхняя текстура блока травы будет применена только к некоторым его сторонам (медленно)", + "bettergrass.midnightconfig.enum.BetterGrassMode.OFF":"Выкл", + "bettergrass.midnightconfig.enum.BetterGrassMode.FAST":"Быстро", + "bettergrass.midnightconfig.enum.BetterGrassMode.FANCY":"Детально", + "bettergrass.midnightconfig.category.advanced": "Продвинутые настройки", + "bettergrass.midnightconfig.blockstates":"Соединённые блоки", + "bettergrass.midnightconfig.blockstates.tooltip":"Схожие с травой блоки, которые следует соединять на склонах" +}