Update push for Momo

gradle.properties

@@ -11,13 +11,13 @@ neoforge_loader_range=[4,)
 fabric_loader_version=0.18.2
 
 ## Mod Properties
-mod_id=decocraft_paintings
+mod_id=decocraft_citylife
-mod_name=Decocraft Paintings Addon
+mod_name=Decocraft City Life Addon
 mod_license=All Rights Reserved
 mod_version=1.0.0
-mod_group_id=com.razz.decocraft.paintings
+mod_group_id=com.razz.decocraft.citylife
 mod_authors=Momo, Razz, ProfMobius, Taelnia
-mod_description=Adds painting decorations to Decocraft
+mod_description=Adds city life decorations to Decocraft
 
 # Decocraft minimum version
 decocraft_version=3.0.7

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.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

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

settings.gradle

@@ -8,4 +8,4 @@ plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 
-rootProject.name = 'decocraft-paintings'
+rootProject.name = 'decocraft-citylife'

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

@@ -1,4 +1,4 @@
 [
   "groups.json",
-  "paintings.json"
+  "citylife.json"
 ]

src/main/resources/assets/decocraft/groups.json

@@ -1,3 +1,3 @@
 {
-  "paintings": { "label": "itemGroup.decocraft.paintings", "icon": "painting_1_a" }
+  "citylife": { "label": "itemGroup.decocraft.citylife", "icon": "dumpster" }
 }

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"
 }

src/main/resources/assets/decocraft/models/bbmodel/jukebox_disc.bbmodel

@@ -0,0 +1 @@
+{"meta":{"format_version":"5.0","model_format":"bedrock","box_uv":false},"name":"jukebox_disc","model_identifier":"jukebox","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"bedrock_animation_mode":"entity","timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[{"name":"disc","box_uv":false,"render_order":"default","locked":false,"allow_mirror_modeling":true,"from":[-4,20.1,-2],"to":[4,20.1,6],"autouv":0,"color":2,"origin":[0,20.1,2],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,16,16],"texture":0},"down":{"uv":[0,0,16,16],"texture":0}},"type":"cube","uuid":"ceea2b4e-c10d-c799-6872-ae8a1ea2ac2a"}],"groups":[{"uuid":"838f1dbb-a512-2fa5-a7b0-73a6d56621d3","export":true,"locked":false,"origin":[0,20,2],"rotation":[0,0,0],"bedrock_binding":"","color":0,"name":"disc","children":[],"reset":false,"shade":true,"mirror_uv":false,"selected":false,"visibility":true,"autouv":0,"isOpen":true,"primary_selected":false}],"outliner":[{"uuid":"838f1dbb-a512-2fa5-a7b0-73a6d56621d3","isOpen":true,"children":["ceea2b4e-c10d-c799-6872-ae8a1ea2ac2a"]}],"textures":[{"name":"disc_chirp.png","relative_path":"disc_chirp.png","folder":"","namespace":"","id":"0","group":"","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","pbr_channel":"color","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"0a4db602-423b-b23d-428f-595575d5a934","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABFklEQVR4AaSQzWrCQBSFb0tLIdUspIu+QBddFGqfpptuCn2tQikBUVFRxNcRBRUUfyEgij/fwA3jTKILAyczc865X8LcypVPJiAIgr2trO94AB26v3sQW+q7oBMApULhyQy6RYXRsbMEQMAwYT7Ms6QKEF0NEwDGYy4niP05CLnKACBCHg2GxldIs9WQcqVkPPtFlxk8A2CjAoKi6F+OJQnDMBWifQ+gwetXXYrfbXn/rErxp6O2t2YCXuZ/slmuZLxby8euJll3YgBxHN9stmuP/jz7lbdF5F0sXWYYMAA2l6QX6/5JAoAIOQ3Epao/nU6Erp4TAAYBEMTZVr/XFXeY/ASAAQQBsYWH6NjyABpStqW+ux4AAAD//04fCbMAAAAGSURBVAMAfx6CIdZav0kAAAAASUVORK5CYII="}],"animations":[{"uuid":"0cbbda43-2952-75ea-a38f-b1bce78d5255","name":"animation.jukebox_idle","loop":"once","override":false,"length":0,"snapping":25,"selected":false,"saved":false,"path":"","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":""},{"uuid":"faa4b26b-6bbc-352d-21b9-3b017475468f","name":"animation.jukebox_playing","loop":"loop","override":false,"length":2.4,"snapping":25,"selected":false,"saved":false,"path":"","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"838f1dbb-a512-2fa5-a7b0-73a6d56621d3":{"name":"disc","type":"bone","rotation_global":false,"quaternion_interpolation":false,"keyframes":[{"channel":"rotation","data_points":[{"x":"0","y":"0","z":"0"}],"uuid":"65340c59-3574-a32d-2d08-f1de120e3328","time":0,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"-180","z":"0"}],"uuid":"06155dca-ae84-a4fe-11bd-60891e9b2398","time":1.2,"color":-1,"interpolation":"linear"},{"channel":"rotation","data_points":[{"x":"0","y":"-360","z":"0"}],"uuid":"7712866e-f049-d304-f1cd-3d3e27f45cf1","time":2.4,"color":-1,"interpolation":"linear"}]}}}]}