Added mer, on and off states to all medieval lighting.

gradle.properties

@@ -11,13 +11,13 @@ neoforge_loader_range=[4,)
 fabric_loader_version=0.18.2
 
 ## Mod Properties
-mod_id=decocraft_worldflags
-mod_name=Decocraft World Flags Addon
+mod_id=decocraft_medieval
+mod_name=Decocraft Medieval Addon
 mod_license=All Rights Reserved
 mod_version=1.0.0
-mod_group_id=com.razz.decocraft.worldflags
-mod_authors=Momo, Razz, ProfMobius, Taelnia
-mod_description=Adds world flag decorations to Decocraft
+mod_group_id=com.razz.decocraft.medieval
+mod_authors=Momo, Razz, ProfMobius
+mod_description=Adds medieval decorations to Decocraft
 
 # Decocraft minimum version
 decocraft_version=3.0.7

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/<unknown>/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/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,6 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ 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" )
 
@@ -210,6 +212,7 @@ 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, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
 
 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
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,18 +65,30 @@ 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
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=
 
 
 @rem Execute Gradle
-@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
+"%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" %*
 
-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+: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-worldflags'
+rootProject.name = 'decocraft-medieval'

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

@@ -1,4 +1,4 @@
 [
   "groups.json",
-  "worldflags.json"
+  "medieval.json"
 ]

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

@@ -1,3 +1,3 @@
 {
-  "worldflags": { "label": "itemGroup.decocraft.worldflags", "icon": "mexico" }
-}
+  "medieval": { "label": "itemGroup.decocraft.medieval", "icon": "spinning_wheel" }
+}

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

@@ -0,0 +1,289 @@
+{
+  "bedrock_animation_mode": "entity",
+  "elements": [
+    {
+      "autouv": 0,
+      "box_uv": false,
+      "color": 7,
+      "faces": {
+        "east": {
+          "texture": 6,
+          "uv": [
+            0.0,
+            0.0,
+            1.5,
+            16.0
+          ]
+        },
+        "west": {
+          "texture": 6,
+          "uv": [
+            0.0,
+            0.0,
+            1.5,
+            16.0
+          ]
+        }
+      },
+      "from": [
+        0.0,
+        0.0,
+        -0.75
+      ],
+      "isReference": false,
+      "locked": false,
+      "name": "chain",
+      "origin": [
+        0.0,
+        10.50393009185791,
+        0.0
+      ],
+      "rescale": false,
+      "rotation": [
+        0.0,
+        90.0,
+        0.0
+      ],
+      "to": [
+        0.0,
+        16.0,
+        0.75
+      ],
+      "type": "cube",
+      "uuid": "07fca44e-b395-94c4-416b-da66e20530f6",
+      "visibility": true
+    },
+    {
+      "autouv": 0,
+      "box_uv": false,
+      "color": 7,
+      "faces": {
+        "east": {
+          "texture": 6,
+          "uv": [
+            0.0,
+            0.0,
+            1.5,
+            16.0
+          ]
+        },
+        "west": {
+          "texture": 6,
+          "uv": [
+            0.0,
+            0.0,
+            1.5,
+            16.0
+          ]
+        }
+      },
+      "from": [
+        0.0,
+        0.0,
+        -0.75
+      ],
+      "isReference": false,
+      "locked": false,
+      "name": "chain",
+      "origin": [
+        0.0,
+        -29.924999237060547,
+        -0.014720000326633453
+      ],
+      "rescale": false,
+      "to": [
+        0.0,
+        16.0,
+        0.75
+      ],
+      "type": "cube",
+      "uuid": "5aea2e77-03bf-1a98-d8b5-affa9a0ca70f",
+      "visibility": true
+    }
+  ],
+  "groups": [
+    {
+      "color": 0,
+      "export": true,
+      "isOpen": true,
+      "isReference": false,
+      "locked": false,
+      "name": "chain",
+      "origin": [
+        0.0,
+        8.0,
+        0.0
+      ],
+      "rotation": [
+        0.0,
+        0.0,
+        0.0
+      ],
+      "scale": [
+        1.0,
+        1.0,
+        1.0
+      ],
+      "uuid": "41031679-9394-79dc-9da9-6796ea742e3f",
+      "visibility": true
+    }
+  ],
+  "meta": {
+    "box_uv": false,
+    "format_version": "5.0",
+    "model_format": "bedrock"
+  },
+  "model_identifier": "chandelier_chain",
+  "multi_file_ruleset": "",
+  "name": "chain",
+  "outliner": [
+    {
+      "children": [
+        "07fca44e-b395-94c4-416b-da66e20530f6",
+        "5aea2e77-03bf-1a98-d8b5-affa9a0ca70f"
+      ],
+      "color": 0,
+      "isOpen": true,
+      "isReference": false,
+      "locked": false,
+      "name": "chain",
+      "origin": [
+        0.0,
+        8.0,
+        0.0
+      ],
+      "rotation": [
+        0.0,
+        0.0,
+        0.0
+      ],
+      "scale": [
+        1.0,
+        1.0,
+        1.0
+      ],
+      "uuid": "41031679-9394-79dc-9da9-6796ea742e3f",
+      "visibility": true
+    }
+  ],
+  "resolution": {
+    "height": 16,
+    "width": 16
+  },
+  "textures": [
+    {
+      "frame_time": 1,
+      "height": 32,
+      "id": "0",
+      "interpolate": false,
+      "name": "chain_black.png",
+      "render_mode": "default",
+      "render_sides": "auto",
+      "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABYElEQVR4XmNkAAJDK5f/54/tAbMZaABc/OP+//r5k+HXz+8MP39+Y/j1/SeQ/s7w68c3BkaQ5J6NixhVtEz+37l2hiaOOHrmwv/3nz4xfALi3z9+MHz49Jnh8+fPDD++f2NgAbkM5GmQaxhoBKy+rmX4+fYLw/fPPxm+ff3J8OXLN4b3Hz4zvHz2moEuUfDtovX/r2//MPz8/Ifh17c/DN+//Wb4/OkHw7tXHxlY6BEFx47JM3z68pnh48fPDF++AzEwFD5//Mnw6fMv+kRBxun7DH+//2ZgAON/DAw/2RgYfvMz/P3FRZ8oACa+/z+BueD3798MIPoHMCH++vWL4evXr/TJBZaWlv9Blv79+5cBhP/8+cMAw3TJBcePH8efvUEFEcNAAVAuANkNKogGwg1M9CiICHpsNApoXReMRgG+EBjNBQyjBRGsUTpaF9CyUTpaEI0WRHjTwGhBNOILIgB2siFV/NknLQAAAABJRU5ErkJggg==",
+      "uuid": "60aee482-c499-d167-63ac-c3d8acc2cf9a",
+      "uv_height": 32,
+      "uv_width": 32,
+      "width": 32,
+      "wrap_mode": "limited"
+    },
+    {
+      "frame_time": 1,
+      "height": 32,
+      "id": "0",
+      "interpolate": false,
+      "name": "chain_silver.png",
+      "render_mode": "default",
+      "render_sides": "auto",
+      "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABS0lEQVR4XmNkAIKFK9b8j48IAbMZaACOnrnw//2nTwyfgPj3jx8MHz59Zvj8+TPDj+/fGJhAkiDLW3on/WcYAMACchnIXpBraGW/1de1DD/ffmH4/vknw7evPxm+fPnG8P7DZ4aXz14z0CUKvl20/v/17R+Gn5//MPz69ofh+7ffDJ8//WB49+ojAwsoCqxNDBhBUVBTnEeTdHDsmDzDpy+fGT5+/Mzw5TsQA0Ph88efDJ8+/2KgSxRknL7P8Pf7bwYGMP7HwPCTjYHhNz/D319c9IkCYOr///PnT4bfv38zgOgfwJzw69cvhq9fvzIw0iMKLC0t/4Ms/fv3LwMI//nzhwGG6RIFx48fx5+2QAURw0ABUBSA7B6ogoiJHgURwcAdjQJa1wWjUYAvBEZzAcNoQQRrlI7WBbRslI4WRKMFEd40MFoQjfiCCABonSqbWf4z4gAAAABJRU5ErkJggg==",
+      "uuid": "704b804c-2219-32c1-1131-16f76d175b21",
+      "uv_height": 32,
+      "uv_width": 32,
+      "width": 32,
+      "wrap_mode": "limited"
+    },
+    {
+      "frame_time": 1,
+      "height": 32,
+      "id": "0",
+      "interpolate": false,
+      "name": "chain_rose_gold.png",
+      "render_mode": "default",
+      "render_sides": "auto",
+      "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABKklEQVR4XmNkAIKnk5P/S+fOBbMZaAD+H6z9//PVF4bvn38yfPv6k+HLl28M7z98Znj57DUDE0gSZPmJcp//DAMAmEAuA9kLcs1AOIAuUfDtovX/r2//MPz8/Ifh17c/DN+//Wb4/OkHw7tXHxlYQFHAaN/MCIoCi84tNEkHx47JM3z68pnh48fPDF++AzEwHXz++JPh0+dfDCz0iIKM0/cZ/n7/zcAAxv8YGH6yMTD85mf4+4uLgS5R8OnTp/8/f/5k+P37NwOI/vHjB8OvX78Yvn79ysBIjyiwtLT8D7L079+/DCD8588fBhimSxQcP34cf9oCFUQMAwVAUQCye8QWRAywumA0CgaqLhiNggGvjkejYDQKGEbrgtG6YKD7BaMF0WhBNOAFEQBFJRMX4ux9pAAAAABJRU5ErkJggg==",
+      "uuid": "a0133f5c-ad57-0f90-ebae-d746c4cba034",
+      "uv_height": 32,
+      "uv_width": 32,
+      "width": 32,
+      "wrap_mode": "limited"
+    },
+    {
+      "frame_time": 1,
+      "height": 32,
+      "id": "0",
+      "interpolate": false,
+      "name": "chain_gold.png",
+      "render_mode": "default",
+      "render_sides": "auto",
+      "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABFElEQVR4XmNkAIJ7y/X/K0VeBLMZaAC+XbT+//XtH4afn/8w/Pr2h+H7t98Mnz/9YHj36iMDE0gSZPmJfqX/DAMAmEAuA9kLcs1AOIBF1OkkI62jAJ/HWEBRwKV/lBEUBRaF92iSDo4dk2f49OUzw8ePnxm+fAfirz8ZPn/8yfDp8y8GFnpEQcbp+wx/v/9mYADjfwwMP9kYGH7zM/z9xcVAl1zw6dOn/z9//mT4/fs3A4j+8eMHw69fvxi+fv3KwEiPKLC0tPwPsvTv378MIPznzx8GGKZLFBw/fhx/2gLlAoaBAqAoANk9YgsiBlhdMBoFA1UXjEbBgFfHo1EwGgUMo3XBaF0w0P2C0YJotCAa8IIIAPK4/P4KuKmKAAAAAElFTkSuQmCC",
+      "uuid": "15dbd349-7074-181c-f4cb-678bb3606e98",
+      "uv_height": 32,
+      "uv_width": 32,
+      "width": 32,
+      "wrap_mode": "limited"
+    },
+    {
+      "frame_time": 1,
+      "height": 32,
+      "id": "0",
+      "interpolate": false,
+      "name": "chain_brass.png",
+      "render_mode": "default",
+      "render_sides": "auto",
+      "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAA9UlEQVR4XmNkAILJxcb/c3vPgtkMNAB7pkf9//TlM8PHj58ZvnwH4q9fGT4D2Z8+f2JgAkmCLK+KlP7PMACACeQykL0g1wyIA4JKNzOComDKls+MA+KAgY4CFnpEQcbp+wx/v/9mYADjfwwMP9kYGH7zM/z9xcVAl1zw6dOn/z9//mT4/fs3A4j+8eMHw69fvxi+AnMDIygKXDKXMYJyQdvypzRJB5aWlv9Blv79+5cBhP/8+cMAw3SJguPHj+P3GCgXMAwUAEUByO4RWxAxwOqC0SgYqLpgNAoGvDoejYLRKGAYrQtG64KB7heMFkSjBdGAF0QA2mjd9D9GS7YAAAAASUVORK5CYII=",
+      "uuid": "5d59e65a-8033-7854-c3ff-4a9665cdac79",
+      "uv_height": 32,
+      "uv_width": 32,
+      "width": 32,
+      "wrap_mode": "limited"
+    },
+    {
+      "frame_time": 1,
+      "height": 32,
+      "id": "0",
+      "interpolate": false,
+      "name": "chain_green.png",
+      "render_mode": "default",
+      "render_sides": "auto",
+      "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAA2UlEQVR4XmNkAAJFd93/93deBrMZaABUkiz///3+m4EBjP8xMPwEWvX7D8PfX78ZmECSIMsVrbX+MwwAYAK7DGgxyDUD4oD7y88wgqLg0enbjAPigBEfBXTJBZ8+ffr/8+dPht+/fzOA6B8/fjD8+vWL4evXrwyMoCi4M+84IygX3D96jSbpwNLS8j/I0r9//zKA8J8/fxhgmIUeueD48eP4PQbKBQwDBUBRAC4NR2pBxACrC0ajYKDqgtEoGPDqeDQKRqOAYbQuGK0LBrpfMFoQjRZEA14QAQCu3bzqO7ckKwAAAABJRU5ErkJggg==",
+      "uuid": "29d8baba-825e-5845-5716-04c70bfb2fa9",
+      "uv_height": 32,
+      "uv_width": 32,
+      "width": 32,
+      "wrap_mode": "limited"
+    },
+    {
+      "frame_time": 1,
+      "height": 32,
+      "id": "0",
+      "interpolate": false,
+      "name": "chain_white.png",
+      "render_mode": "default",
+      "render_sides": "auto",
+      "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAu0lEQVR4XmNkAIL79+//V1RUBLMZaAA+ffr0/+fPnwy/f/9mANE/fvxg+PXrF8PXr18ZmECSIMsvXrz4n2EAABPIRSB7Qa4ZCAewiIqKMtI6CvB5bDQKBjwKGEG5gI+PjxGUC/T19WmSFS0tLf+Dst7fv38ZQPjPnz8MMMxCj1xw/Phx/B4D5QKGgQKgKADZPWILIgZYXTAaBQNVF4xGwYBXx6NRMBoFDKN1wWhdMND9gtGCaLQgGvCCCAAGCt/6J2djSAAAAABJRU5ErkJggg==",
+      "uuid": "3d5ca7c7-27ce-141c-226c-348d472840db",
+      "uv_height": 32,
+      "uv_width": 32,
+      "width": 32,
+      "wrap_mode": "limited"
+    }
+  ],
+  "timeline_setups": [],
+  "unhandled_root_fields": {},
+  "variable_placeholder_buttons": [],
+  "variable_placeholders": "",
+  "visible_box": [
+    1,
+    1,
+    0
+  ]
+}