Changed the tab to worldflags from flags.

gradle.properties

@@ -11,13 +11,13 @@ neoforge_loader_range=[4,)
 fabric_loader_version=0.18.2
 
 ## Mod Properties
-mod_id=decocraft_cottagecore
+mod_id=decocraft_worldflags
-mod_name=Decocraft Cottagecore Addon
+mod_name=Decocraft World Flags Addon
 mod_license=All Rights Reserved
 mod_version=1.0.0
-mod_group_id=com.razz.decocraft.cottagecore
+mod_group_id=com.razz.decocraft.worldflags
-mod_authors=Momo, Razz, ProfMobius, CiciHoneyBee
+mod_authors=Momo, Razz, ProfMobius, Taelnia
-mod_description=Adds cottagecore decorations to Decocraft
+mod_description=Adds world flag 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.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

settings.gradle

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

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

@@ -1,541 +0,0 @@
-{
-  "models": [
-    {
-      "name": "Cottage Armchair",
-      "decoref": "cottage_armchair",
-      "material": "cottage_armchair",
-      "model": "cottage_armchair",
-      "scale": 1.0,
-      "tabs": "comfort",
-      "type": "seat",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Cottage Couch Left",
-      "decoref": "cottage_couch_left",
-      "material": "cottage_couch_left",
-      "model": "cottage_couch_left",
-      "scale": 1.0,
-      "tabs": "comfort",
-      "type": "seat",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Cottage Couch Middle",
-      "decoref": "cottage_couch_middle",
-      "material": "cottage_couch_middle",
-      "model": "cottage_couch_middle",
-      "scale": 1.0,
-      "tabs": "comfort",
-      "type": "seat",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Cottage Couch Right",
-      "decoref": "cottage_couch_right",
-      "material": "cottage_couch_right",
-      "model": "cottage_couch_right",
-      "scale": 1.0,
-      "tabs": "comfort",
-      "type": "seat",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Cottage Footstool",
-      "decoref": "cottage_footstool",
-      "material": "cottage_footstool",
-      "model": "cottage_footstool",
-      "scale": 1.0,
-      "tabs": "comfort",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Chair Black",
-      "decoref": "wrought_iron_chair_black",
-      "material": "wrought_iron_set_black",
-      "model": "wrought_iron_chair",
-      "scale": 1.0,
-      "tabs": "comfort",
-      "type": "seat",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_chair_green"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Chair Green",
-      "decoref": "wrought_iron_chair_green",
-      "material": "wrought_iron_set_green",
-      "model": "wrought_iron_chair",
-      "scale": 1.0,
-      "tabs": "comfort",
-      "type": "seat",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_chair_white"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Chair White",
-      "decoref": "wrought_iron_chair_white",
-      "material": "wrought_iron_set_white",
-      "model": "wrought_iron_chair",
-      "scale": 1.0,
-      "tabs": "comfort",
-      "type": "seat",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_chair_black"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Table Black",
-      "decoref": "wrought_iron_table_black",
-      "material": "wrought_iron_set_black",
-      "model": "wrought_iron_table",
-      "scale": 1.0,
-      "tabs": "surface",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_table_green"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Table Green",
-      "decoref": "wrought_iron_table_green",
-      "material": "wrought_iron_set_green",
-      "model": "wrought_iron_table",
-      "scale": 1.0,
-      "tabs": "surface",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_table_white"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Table White",
-      "decoref": "wrought_iron_table_white",
-      "material": "wrought_iron_set_white",
-      "model": "wrought_iron_table",
-      "scale": 1.0,
-      "tabs": "surface",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_table_black"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Table Small Black",
-      "decoref": "wrought_iron_table_small_black",
-      "material": "wrought_iron_set_black",
-      "model": "wrought_iron_table_small",
-      "scale": 1.0,
-      "tabs": "surface",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_table_small_green"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Table Small Green",
-      "decoref": "wrought_iron_table_small_green",
-      "material": "wrought_iron_set_green",
-      "model": "wrought_iron_table_small",
-      "scale": 1.0,
-      "tabs": "surface",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_table_small_white"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Wrought Iron Table Small White",
-      "decoref": "wrought_iron_table_small_white",
-      "material": "wrought_iron_set_white",
-      "model": "wrought_iron_table_small",
-      "scale": 1.0,
-      "tabs": "surface",
-      "script": {
-        "tool_modelswitch": {
-          "link": "wrought_iron_table_small_black"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Cottage Coffee Table",
-      "decoref": "cottage_coffee_table",
-      "material": "cottage_coffee_table",
-      "model": "cottage_coffee_table",
-      "scale": 1.0,
-      "tabs": "surface",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Cottage Coffee Table Long",
-      "decoref": "cottage_coffee_table_long",
-      "material": "cottage_coffee_table_long",
-      "model": "cottage_coffee_table_long",
-      "scale": 1.0,
-      "tabs": "surface",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Cottage Coffee Table Oval",
-      "decoref": "cottage_coffee_table_oval",
-      "material": "cottage_coffee_table_oval",
-      "model": "cottage_coffee_table_oval",
-      "scale": 1.0,
-      "tabs": "surface",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Bird Bath",
-      "decoref": "bird_bath",
-      "material": "bird_bath",
-      "model": "bird_bath",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "Sign Live Craft Love",
-      "decoref": "sign_live_craft_love",
-      "material": "sign_live_craft_love",
-      "model": "sign_live_craft_love",
-      "scale": 1.0,
-      "tabs": "wall_decor",
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Birch",
-      "decoref": "china_cabinet_birch",
-      "material": "china_cabinet_birch",
-      "model": "china_cabinet",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_birch_open",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_oak"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Oak",
-      "decoref": "china_cabinet_oak",
-      "material": "china_cabinet_oak",
-      "model": "china_cabinet",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_oak_open",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_cherry"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Cherry",
-      "decoref": "china_cabinet_cherry",
-      "material": "china_cabinet_cherry",
-      "model": "china_cabinet",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_cherry_open",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_palm"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Palm",
-      "decoref": "china_cabinet_palm",
-      "material": "china_cabinet_palm",
-      "model": "china_cabinet",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_palm_open",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_spruce"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Spruce",
-      "decoref": "china_cabinet_spruce",
-      "material": "china_cabinet_spruce",
-      "model": "china_cabinet",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_spruce_open",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_ebony"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Ebony",
-      "decoref": "china_cabinet_ebony",
-      "material": "china_cabinet_ebony",
-      "model": "china_cabinet",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_ebony_open",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_black"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Black",
-      "decoref": "china_cabinet_black",
-      "material": "china_cabinet_black",
-      "model": "china_cabinet",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_black_open",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_white"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet White",
-      "decoref": "china_cabinet_white",
-      "material": "china_cabinet_white",
-      "model": "china_cabinet",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_white_open",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_birch"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Birch Open",
-      "decoref": "china_cabinet_birch_open",
-      "material": "china_cabinet_birch",
-      "model": "china_cabinet_open",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "hidden": true,
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_birch",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_oak_open"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Oak Open",
-      "decoref": "china_cabinet_oak_open",
-      "material": "china_cabinet_oak",
-      "model": "china_cabinet_open",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "hidden": true,
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_oak",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_cherry_open"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Cherry Open",
-      "decoref": "china_cabinet_cherry_open",
-      "material": "china_cabinet_cherry",
-      "model": "china_cabinet_open",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "hidden": true,
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_cherry",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_palm_open"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Palm Open",
-      "decoref": "china_cabinet_palm_open",
-      "material": "china_cabinet_palm",
-      "model": "china_cabinet_open",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "hidden": true,
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_palm",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_spruce_open"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Spruce Open",
-      "decoref": "china_cabinet_spruce_open",
-      "material": "china_cabinet_spruce",
-      "model": "china_cabinet_open",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "hidden": true,
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_spruce",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_ebony_open"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Ebony Open",
-      "decoref": "china_cabinet_ebony_open",
-      "material": "china_cabinet_ebony",
-      "model": "china_cabinet_open",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "hidden": true,
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_ebony",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_black_open"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet Black Open",
-      "decoref": "china_cabinet_black_open",
-      "material": "china_cabinet_black",
-      "model": "china_cabinet_open",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "hidden": true,
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_black",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_white_open"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    },
-    {
-      "name": "China Cabinet White Open",
-      "decoref": "china_cabinet_white_open",
-      "material": "china_cabinet_white",
-      "model": "china_cabinet_open",
-      "scale": 1.0,
-      "transparency": true,
-      "tabs": "clutter",
-      "hidden": true,
-      "script": {
-        "on_use": {
-          "link": "china_cabinet_white",
-          "storage": [5, 8]
-        },
-        "tool_modelswitch": {
-          "link": "china_cabinet_birch_open"
-        }
-      },
-      "crafting_color": [0, 0, 0]
-    }
-  ],
-  "bounding_boxes": []
-}

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

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

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

@@ -1,3 +1,3 @@
 {
-  "cottagecore": { "label": "itemGroup.decocraft.cottagecore", "icon": "cottage_armchair" }
+  "worldflags": { "label": "itemGroup.decocraft.worldflags", "icon": "wall_flag_1_mexico" }
-}
+}