Update push for Momo

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -57,7 +57,7 @@
 #       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
+#       https://github.com/gradle/gradle/blob/<unknown>/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/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ 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" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables, and ensure extensions are enabled
-if "%OS%"=="Windows_NT" setlocal
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ 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
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,30 +65,18 @@ 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
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
+:exitWithErrorLevel
-@rem End local scope for the variables with windows NT shell
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-if %ERRORLEVEL% equ 0 goto mainEnd
+"%COMSPEC%" /c exit %ERRORLEVEL%
-
-: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

src/main/resources/assets/decocraft/lang/en_us.json

@@ -1,99 +1,2 @@
 {
-  "itemGroup.decocraft.paintings": "Decocraft - Paintings",
-  "block.decocraft.painting_1_a": "Painting 1-A",
-  "block.decocraft.painting_1_b": "Painting 1-B",
-  "block.decocraft.painting_1_c": "Painting 1-C",
-  "block.decocraft.painting_1_d": "Painting 1-D",
-  "block.decocraft.painting_1_e": "Painting 1-E",
-  "block.decocraft.painting_1_f": "Painting 1-F",
-  "block.decocraft.painting_1_g": "Painting 1-G",
-  "block.decocraft.painting_1_h": "Painting 1-H",
-  "block.decocraft.painting_1_i": "Painting 1-I",
-  "block.decocraft.painting_1_j": "Painting 1-J",
-  "block.decocraft.painting_2_a": "Painting 2-A",
-  "block.decocraft.painting_2_b": "Painting 2-B",
-  "block.decocraft.painting_2_c": "Painting 2-C",
-  "block.decocraft.painting_2_d": "Painting 2-D",
-  "block.decocraft.painting_2_e": "Painting 2-E",
-  "block.decocraft.painting_2_f": "Painting 2-F",
-  "block.decocraft.painting_2_g": "Painting 2-G",
-  "block.decocraft.painting_2_h": "Painting 2-H",
-  "block.decocraft.painting_2_i": "Painting 2-I",
-  "block.decocraft.painting_2_j": "Painting 2-J",
-  "block.decocraft.painting_2_k": "Painting 2-K",
-  "block.decocraft.painting_3_a": "Painting 3-A",
-  "block.decocraft.painting_3_b": "Painting 3-B",
-  "block.decocraft.painting_3_c": "Painting 3-C",
-  "block.decocraft.painting_3_d": "Painting 3-D",
-  "block.decocraft.painting_3_e": "Painting 3-E",
-  "block.decocraft.painting_3_f": "Painting 3-F",
-  "block.decocraft.painting_3_g": "Painting 3-G",
-  "block.decocraft.painting_3_h": "Painting 3-H",
-  "block.decocraft.painting_3_i": "Painting 3-I",
-  "block.decocraft.painting_3_j": "Painting 3-J",
-  "block.decocraft.painting_3_k": "Painting 3-K",
-  "block.decocraft.painting_4_a": "Painting 4-A",
-  "block.decocraft.painting_4_b": "Painting 4-B",
-  "block.decocraft.painting_4_c": "Painting 4-C",
-  "block.decocraft.painting_4_d": "Painting 4-D",
-  "block.decocraft.painting_4_e": "Painting 4-E",
-  "block.decocraft.painting_4_f": "Painting 4-F",
-  "block.decocraft.painting_4_g": "Painting 4-G",
-  "block.decocraft.painting_4_h": "Painting 4-H",
-  "block.decocraft.painting_4_i": "Painting 4-I",
-  "block.decocraft.painting_4_j": "Painting 4-J",
-  "block.decocraft.painting_4_k": "Painting 4-K",
-  "block.decocraft.painting_5_a": "Painting 5-A",
-  "block.decocraft.painting_5_b": "Painting 5-B",
-  "block.decocraft.painting_5_c": "Painting 5-C",
-  "block.decocraft.painting_5_d": "Painting 5-D",
-  "block.decocraft.painting_5_e": "Painting 5-E",
-  "item.decocraft.painting_1_a": "Painting 1-A",
-  "item.decocraft.painting_1_b": "Painting 1-B",
-  "item.decocraft.painting_1_c": "Painting 1-C",
-  "item.decocraft.painting_1_d": "Painting 1-D",
-  "item.decocraft.painting_1_e": "Painting 1-E",
-  "item.decocraft.painting_1_f": "Painting 1-F",
-  "item.decocraft.painting_1_g": "Painting 1-G",
-  "item.decocraft.painting_1_h": "Painting 1-H",
-  "item.decocraft.painting_1_i": "Painting 1-I",
-  "item.decocraft.painting_1_j": "Painting 1-J",
-  "item.decocraft.painting_2_a": "Painting 2-A",
-  "item.decocraft.painting_2_b": "Painting 2-B",
-  "item.decocraft.painting_2_c": "Painting 2-C",
-  "item.decocraft.painting_2_d": "Painting 2-D",
-  "item.decocraft.painting_2_e": "Painting 2-E",
-  "item.decocraft.painting_2_f": "Painting 2-F",
-  "item.decocraft.painting_2_g": "Painting 2-G",
-  "item.decocraft.painting_2_h": "Painting 2-H",
-  "item.decocraft.painting_2_i": "Painting 2-I",
-  "item.decocraft.painting_2_j": "Painting 2-J",
-  "item.decocraft.painting_2_k": "Painting 2-K",
-  "item.decocraft.painting_3_a": "Painting 3-A",
-  "item.decocraft.painting_3_b": "Painting 3-B",
-  "item.decocraft.painting_3_c": "Painting 3-C",
-  "item.decocraft.painting_3_d": "Painting 3-D",
-  "item.decocraft.painting_3_e": "Painting 3-E",
-  "item.decocraft.painting_3_f": "Painting 3-F",
-  "item.decocraft.painting_3_g": "Painting 3-G",
-  "item.decocraft.painting_3_h": "Painting 3-H",
-  "item.decocraft.painting_3_i": "Painting 3-I",
-  "item.decocraft.painting_3_j": "Painting 3-J",
-  "item.decocraft.painting_3_k": "Painting 3-K",
-  "item.decocraft.painting_4_a": "Painting 4-A",
-  "item.decocraft.painting_4_b": "Painting 4-B",
-  "item.decocraft.painting_4_c": "Painting 4-C",
-  "item.decocraft.painting_4_d": "Painting 4-D",
-  "item.decocraft.painting_4_e": "Painting 4-E",
-  "item.decocraft.painting_4_f": "Painting 4-F",
-  "item.decocraft.painting_4_g": "Painting 4-G",
-  "item.decocraft.painting_4_h": "Painting 4-H",
-  "item.decocraft.painting_4_i": "Painting 4-I",
-  "item.decocraft.painting_4_j": "Painting 4-J",
-  "item.decocraft.painting_4_k": "Painting 4-K",
-  "item.decocraft.painting_5_a": "Painting 5-A",
-  "item.decocraft.painting_5_b": "Painting 5-B",
-  "item.decocraft.painting_5_c": "Painting 5-C",
-  "item.decocraft.painting_5_d": "Painting 5-D",
-  "item.decocraft.painting_5_e": "Painting 5-E"
 }