updated tabs system and removed icons

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

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

@@ -6,7 +6,7 @@
       "material": "cottage_armchair",
       "model": "cottage_armchair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "crafting_color": [0, 0, 0]
     },
@@ -16,7 +16,7 @@
       "material": "cottage_couch_left",
       "model": "cottage_couch_left",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "crafting_color": [0, 0, 0]
     },
@@ -26,7 +26,7 @@
       "material": "cottage_couch_middle",
       "model": "cottage_couch_middle",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "crafting_color": [0, 0, 0]
     },
@@ -36,7 +36,7 @@
       "material": "cottage_couch_right",
       "model": "cottage_couch_right",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "crafting_color": [0, 0, 0]
     },
@@ -46,7 +46,7 @@
       "material": "cottage_footstool",
       "model": "cottage_footstool",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "crafting_color": [0, 0, 0]
     },
     {
@@ -55,7 +55,7 @@
       "material": "wrought_iron_set_black",
       "model": "wrought_iron_chair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -70,7 +70,7 @@
       "material": "wrought_iron_set_green",
       "model": "wrought_iron_chair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -85,7 +85,7 @@
       "material": "wrought_iron_set_white",
       "model": "wrought_iron_chair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -99,8 +99,9 @@
       "decoref": "wrought_iron_table_black",
       "material": "wrought_iron_set_black",
       "model": "wrought_iron_table",
+      "shape": "table_hb",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "wrought_iron_table_green"
@@ -113,8 +114,9 @@
       "decoref": "wrought_iron_table_green",
       "material": "wrought_iron_set_green",
       "model": "wrought_iron_table",
+      "shape": "table_hb",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "wrought_iron_table_white"
@@ -127,8 +129,9 @@
       "decoref": "wrought_iron_table_white",
       "material": "wrought_iron_set_white",
       "model": "wrought_iron_table",
+      "shape": "table_hb",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "wrought_iron_table_black"
@@ -142,7 +145,7 @@
       "material": "wrought_iron_set_black",
       "model": "wrought_iron_table_small",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "wrought_iron_table_small_green"
@@ -156,7 +159,7 @@
       "material": "wrought_iron_set_green",
       "model": "wrought_iron_table_small",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "wrought_iron_table_small_white"
@@ -170,7 +173,7 @@
       "material": "wrought_iron_set_white",
       "model": "wrought_iron_table_small",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "wrought_iron_table_small_black"
@@ -184,7 +187,7 @@
       "material": "cottage_coffee_table",
       "model": "cottage_coffee_table",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "crafting_color": [0, 0, 0]
     },
     {
@@ -193,7 +196,7 @@
       "material": "cottage_coffee_table_long",
       "model": "cottage_coffee_table_long",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "crafting_color": [0, 0, 0]
     },
     {
@@ -202,7 +205,7 @@
       "material": "cottage_coffee_table_oval",
       "model": "cottage_coffee_table_oval",
       "scale": 1.0,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "crafting_color": [0, 0, 0]
     },
     {
@@ -212,7 +215,7 @@
       "model": "bird_bath",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "garden"],
       "crafting_color": [0, 0, 0]
     },
     {
@@ -221,7 +224,7 @@
       "material": "sign_live_craft_love",
       "model": "sign_live_craft_love",
       "scale": 1.0,
-      "tabs": "wall_decor",
+      "tabs": ["cottagecore", "wall_decor"],
       "crafting_color": [0, 0, 0]
     },
     {
@@ -231,7 +234,7 @@
       "model": "china_cabinet",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "script": {
         "on_use": {
           "link": "china_cabinet_birch_open",
@@ -250,7 +253,7 @@
       "model": "china_cabinet",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "script": {
         "on_use": {
           "link": "china_cabinet_oak_open",
@@ -269,7 +272,7 @@
       "model": "china_cabinet",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "script": {
         "on_use": {
           "link": "china_cabinet_cherry_open",
@@ -288,7 +291,7 @@
       "model": "china_cabinet",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "script": {
         "on_use": {
           "link": "china_cabinet_palm_open",
@@ -307,7 +310,7 @@
       "model": "china_cabinet",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "script": {
         "on_use": {
           "link": "china_cabinet_spruce_open",
@@ -326,7 +329,7 @@
       "model": "china_cabinet",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "script": {
         "on_use": {
           "link": "china_cabinet_ebony_open",
@@ -345,7 +348,7 @@
       "model": "china_cabinet",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "script": {
         "on_use": {
           "link": "china_cabinet_black_open",
@@ -364,7 +367,7 @@
       "model": "china_cabinet",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "script": {
         "on_use": {
           "link": "china_cabinet_white_open",
@@ -383,7 +386,7 @@
       "model": "china_cabinet_open",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "hidden": true,
       "script": {
         "on_use": {
@@ -403,7 +406,7 @@
       "model": "china_cabinet_open",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "hidden": true,
       "script": {
         "on_use": {
@@ -423,7 +426,7 @@
       "model": "china_cabinet_open",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "hidden": true,
       "script": {
         "on_use": {
@@ -443,7 +446,7 @@
       "model": "china_cabinet_open",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "hidden": true,
       "script": {
         "on_use": {
@@ -463,7 +466,7 @@
       "model": "china_cabinet_open",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "hidden": true,
       "script": {
         "on_use": {
@@ -483,7 +486,7 @@
       "model": "china_cabinet_open",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "hidden": true,
       "script": {
         "on_use": {
@@ -503,7 +506,7 @@
       "model": "china_cabinet_open",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "hidden": true,
       "script": {
         "on_use": {
@@ -523,7 +526,7 @@
       "model": "china_cabinet_open",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "storage"],
       "hidden": true,
       "script": {
         "on_use": {
@@ -542,7 +545,7 @@
       "material": "typewriter_red",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_orange"
@@ -556,7 +559,7 @@
       "material": "typewriter_orange",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_yellow"
@@ -570,7 +573,7 @@
       "material": "typewriter_yellow",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_lime"
@@ -584,7 +587,7 @@
       "material": "typewriter_lime",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_green"
@@ -598,7 +601,7 @@
       "material": "typewriter_green",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_cyan"
@@ -612,7 +615,7 @@
       "material": "typewriter_cyan",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_blue"
@@ -626,7 +629,7 @@
       "material": "typewriter_blue",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_magenta"
@@ -640,7 +643,7 @@
       "material": "typewriter_magenta",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_pink"
@@ -654,7 +657,7 @@
       "material": "typewriter_pink",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_white"
@@ -668,7 +671,7 @@
       "material": "typewriter_white",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_black"
@@ -682,7 +685,7 @@
       "material": "typewriter_black",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_lavender"
@@ -696,7 +699,7 @@
       "material": "typewriter_lavender",
       "model": "typewriter",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "script": {
         "tool_modelswitch": {
           "link": "typewriter_red"
@@ -710,7 +713,7 @@
       "material": "rotary_phone_red",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -725,7 +728,7 @@
       "material": "rotary_phone_orange",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -740,7 +743,7 @@
       "material": "rotary_phone_yellow",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -755,7 +758,7 @@
       "material": "rotary_phone_lime",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -770,7 +773,7 @@
       "material": "rotary_phone_blue",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -785,7 +788,7 @@
       "material": "rotary_phone_pink",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -800,7 +803,7 @@
       "material": "rotary_phone_white",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -815,7 +818,7 @@
       "material": "rotary_phone_light_gray",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -830,7 +833,7 @@
       "material": "rotary_phone_black",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -845,7 +848,7 @@
       "material": "rotary_phone_aqua",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -860,7 +863,7 @@
       "material": "rotary_phone_coral",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -875,7 +878,7 @@
       "material": "rotary_phone_lavender",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -890,7 +893,7 @@
       "material": "rotary_phone_mint",
       "model": "rotary_phone",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -905,17 +908,17 @@
       "material": "dream_catcher",
       "model": "dream_catcher",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "crafting_color": [0, 0, 0]
     },
     {
-      "name": "Welcome Mat Spring",
-      "decoref": "welcome_mat_spring",
-      "material": "welcome_mat_spring",
+      "name": "Welcome Mat Flowers",
+      "decoref": "welcome_mat_flowers",
+      "material": "welcome_mat_flowers",
       "model": "welcome_mat",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "seasonal"],
       "crafting_color": [0, 0, 0]
     },
     {
@@ -924,7 +927,7 @@
       "material": "yarn_basket",
       "model": "yarn_basket",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "rotatable": true,
       "crafting_color": [0, 0, 0]
     },
@@ -935,18 +938,30 @@
       "model": "grandfather_clock",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "tech",
+      "tabs": ["cottagecore", "tech"],
       "default_animation": "animation.grandfather_clock.swing",
       "type": "animated",
       "crafting_color": [0, 0, 0]
     },
+    {
+      "name": "Grandmother Clock",
+      "decoref": "grandmother_clock",
+      "material": "grandfather_clock",
+      "model": "grandmother_clock",
+      "scale": 1.0,
+      "transparency": true,
+      "tabs": ["cottagecore", "tech"],
+      "default_animation": "animation.grandmother_clock.swing",
+      "type": "animated",
+      "crafting_color": [0, 0, 0]
+    },
     {
       "name": "Tea Set Pink",
       "decoref": "tea_set_pink",
       "material": "tea_set_pink",
       "model": "tea_set",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter", "food"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -961,7 +976,7 @@
       "material": "tea_set_orange",
       "model": "tea_set",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter", "food"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -976,7 +991,7 @@
       "material": "tea_set_yellow",
       "model": "tea_set",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter", "food"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -991,7 +1006,7 @@
       "material": "tea_set_mint",
       "model": "tea_set",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter", "food"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -1006,7 +1021,7 @@
       "material": "tea_set_blue",
       "model": "tea_set",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter", "food"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -1021,7 +1036,7 @@
       "material": "tea_set_lavender",
       "model": "tea_set",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter", "food"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -1036,7 +1051,7 @@
       "material": "tea_set_white",
       "model": "tea_set",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter", "food"],
       "rotatable": true,
       "script": {
         "tool_modelswitch": {
@@ -1051,7 +1066,7 @@
       "material": "wind_chime",
       "model": "wind_chime",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "default_animation": "animation.wind_chime.swing",
       "type": "animated",
       "script": {
@@ -1067,7 +1082,7 @@
       "material": "wind_chime_rainbow",
       "model": "wind_chime",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "default_animation": "animation.wind_chime.swing",
       "type": "animated",
       "script": {
@@ -1083,7 +1098,7 @@
       "material": "wind_chime_2",
       "model": "wind_chime_2",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "default_animation": "animation.wind_chime_2.swing",
       "type": "animated",
       "script": {
@@ -1099,7 +1114,7 @@
       "material": "wind_chime_2_rainbow",
       "model": "wind_chime_2",
       "scale": 1.0,
-      "tabs": "clutter",
+      "tabs": ["cottagecore", "clutter"],
       "default_animation": "animation.wind_chime_2.swing",
       "type": "animated",
       "script": {
@@ -1115,7 +1130,7 @@
       "material": "rattan_set_black",
       "model": "rattan_armchair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1130,7 +1145,7 @@
       "material": "rattan_set_brown",
       "model": "rattan_armchair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1145,7 +1160,7 @@
       "material": "rattan_set_gray",
       "model": "rattan_armchair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1160,7 +1175,7 @@
       "material": "rattan_set_light_gray",
       "model": "rattan_armchair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1175,7 +1190,7 @@
       "material": "rattan_set_orange",
       "model": "rattan_armchair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1190,7 +1205,7 @@
       "material": "rattan_set_white",
       "model": "rattan_armchair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1205,7 +1220,7 @@
       "material": "rattan_set_yellow",
       "model": "rattan_armchair",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1220,7 +1235,7 @@
       "material": "rattan_set_black",
       "model": "rattan_couch_center",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1235,7 +1250,7 @@
       "material": "rattan_set_brown",
       "model": "rattan_couch_center",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1250,7 +1265,7 @@
       "material": "rattan_set_gray",
       "model": "rattan_couch_center",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1265,7 +1280,7 @@
       "material": "rattan_set_light_gray",
       "model": "rattan_couch_center",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1280,7 +1295,7 @@
       "material": "rattan_set_orange",
       "model": "rattan_couch_center",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1295,7 +1310,7 @@
       "material": "rattan_set_white",
       "model": "rattan_couch_center",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1310,7 +1325,7 @@
       "material": "rattan_set_yellow",
       "model": "rattan_couch_center",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1325,7 +1340,7 @@
       "material": "rattan_set_black",
       "model": "rattan_couch_corner",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1340,7 +1355,7 @@
       "material": "rattan_set_brown",
       "model": "rattan_couch_corner",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1352,10 +1367,10 @@
     {
       "name": "Rattan Couch Corner Gray",
       "decoref": "rattan_couch_corner_gray",
-      "material": "rattan_set_light_gray",
+      "material": "rattan_set_gray",
       "model": "rattan_couch_corner",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1370,7 +1385,7 @@
       "material": "rattan_set_light_gray",
       "model": "rattan_couch_corner",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1385,7 +1400,7 @@
       "material": "rattan_set_orange",
       "model": "rattan_couch_corner",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1400,7 +1415,7 @@
       "material": "rattan_set_white",
       "model": "rattan_couch_corner",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1415,7 +1430,7 @@
       "material": "rattan_set_yellow",
       "model": "rattan_couch_corner",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1430,7 +1445,7 @@
       "material": "rattan_set_black",
       "model": "rattan_couch_left",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1445,7 +1460,7 @@
       "material": "rattan_set_brown",
       "model": "rattan_couch_left",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1457,10 +1472,10 @@
     {
       "name": "Rattan Couch Left Gray",
       "decoref": "rattan_couch_left_gray",
-      "material": "rattan_set_light_gray",
+      "material": "rattan_set_gray",
       "model": "rattan_couch_left",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1475,7 +1490,7 @@
       "material": "rattan_set_light_gray",
       "model": "rattan_couch_left",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1490,7 +1505,7 @@
       "material": "rattan_set_orange",
       "model": "rattan_couch_left",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1505,7 +1520,7 @@
       "material": "rattan_set_white",
       "model": "rattan_couch_left",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1520,7 +1535,7 @@
       "material": "rattan_set_yellow",
       "model": "rattan_couch_left",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1535,7 +1550,7 @@
       "material": "rattan_set_black",
       "model": "rattan_couch_right",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1550,7 +1565,7 @@
       "material": "rattan_set_brown",
       "model": "rattan_couch_right",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1562,10 +1577,10 @@
     {
       "name": "Rattan Couch Right Gray",
       "decoref": "rattan_couch_right_gray",
-      "material": "rattan_set_light_gray",
+      "material": "rattan_set_gray",
       "model": "rattan_couch_right",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1580,7 +1595,7 @@
       "material": "rattan_set_light_gray",
       "model": "rattan_couch_right",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1595,7 +1610,7 @@
       "material": "rattan_set_orange",
       "model": "rattan_couch_right",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1610,7 +1625,7 @@
       "material": "rattan_set_white",
       "model": "rattan_couch_right",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1625,7 +1640,7 @@
       "material": "rattan_set_yellow",
       "model": "rattan_couch_right",
       "scale": 1.0,
-      "tabs": "comfort",
+      "tabs": ["cottagecore", "comfort"],
       "type": "seat",
       "script": {
         "tool_modelswitch": {
@@ -1641,7 +1656,7 @@
       "model": "rattan_coffee_table",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "rattan_coffee_table_brown"
@@ -1656,7 +1671,7 @@
       "model": "rattan_coffee_table",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "rattan_coffee_table_gray"
@@ -1671,7 +1686,7 @@
       "model": "rattan_coffee_table",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "rattan_coffee_table_light_gray"
@@ -1686,7 +1701,7 @@
       "model": "rattan_coffee_table",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "rattan_coffee_table_orange"
@@ -1701,7 +1716,7 @@
       "model": "rattan_coffee_table",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "rattan_coffee_table_white"
@@ -1716,7 +1731,7 @@
       "model": "rattan_coffee_table",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "rattan_coffee_table_yellow"
@@ -1731,13 +1746,28 @@
       "model": "rattan_coffee_table",
       "scale": 1.0,
       "transparency": true,
-      "tabs": "surface",
+      "tabs": ["cottagecore", "surface"],
       "script": {
         "tool_modelswitch": {
           "link": "rattan_coffee_table_black"
         }
       },
       "crafting_color": [0, 0, 0]
+    },
+
+    {
+      "name": "Garden Lantern",
+      "decoref": "garden_lantern",
+      "material": "garden_lantern",
+      "model": "garden_lantern",
+      "scale": 1.0,
+      "tabs": ["cottagecore", "garden", "lighting"],
+      "script": {
+        "on_use": {
+          "toggle_light": true
+        }
+      },
+      "crafting_color": [0, 0, 0]
     }
   ],
   "bounding_boxes": []

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

@@ -1,3 +1,4 @@
 {
-  "cottagecore": { "label": "itemGroup.decocraft.cottagecore", "icon": "cottage_armchair" }
+  "cottagecore": { "label": "itemGroup.decocraft.cottagecore", "icon": "cottage_armchair" },
+  "garden": { "label": "itemGroup.decocraft.garden", "icon": "bird_bath" }
 }

src/main/resources/assets/decocraft/models/bbmodel/animation.grandfather_clock.swing.json

@@ -0,0 +1,142 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.grandfather_clock.swing": {
+			"loop": true,
+			"animation_length": 8,
+			"bones": {
+				"short_hand": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"8.0": {"pre": [0, 0, 360], "post": [0, 0, 0]}
+					}
+				},
+				"longer_hand": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"8.0": {"pre": [0, 0, 720], "post": [0, 0, 0]}
+					}
+				},
+				"chime_lever": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"1.0": {
+							"pre": [0, 0, 11.25],
+							"post": [0, 0, 11.25],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, -11.25],
+							"lerp_mode": "catmullrom"
+						},
+						"4.0": [0, 0, 0],
+						"5.0": {
+							"pre": [0, 0, 11.25],
+							"post": [0, 0, 11.25],
+							"lerp_mode": "catmullrom"
+						},
+						"6.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"7.0": {
+							"post": [0, 0, -11.25],
+							"lerp_mode": "catmullrom"
+						},
+						"8.0": [0, 0, 0]
+					}
+				},
+				"side_chim_lever": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": {
+							"pre": [0, 0, 11],
+							"post": [0, 0, 11],
+							"lerp_mode": "catmullrom"
+						},
+						"4.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"6.0": {
+							"post": [0, 0, -11],
+							"lerp_mode": "catmullrom"
+						},
+						"8.0": [0, 0, 0]
+					}
+				},
+				"side_chim_lever2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": {
+							"pre": [0, 0, -11],
+							"post": [0, 0, -11],
+							"lerp_mode": "catmullrom"
+						},
+						"4.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"6.0": {
+							"post": [0, 0, 11],
+							"lerp_mode": "catmullrom"
+						},
+						"8.0": [0, 0, 0]
+					}
+				},
+				"gear": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]},
+						"8.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"gear2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]},
+						"8.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"gear3": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]},
+						"8.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"gear4": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [360, 0, 0], "post": [0, 0, 0]},
+						"8.0": {"pre": [360, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"small_gear": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [0, 0, -360], "post": [0, 0, 0]},
+						"8.0": {"pre": [0, 0, -360], "post": [0, 0, 0]}
+					}
+				},
+				"small_gear2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [0, 0, -360], "post": [0, 0, 0]},
+						"8.0": {"pre": [0, 0, -360], "post": [0, 0, 0]}
+					}
+				},
+				"sun_moon": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"8.0": {"pre": [0, 0, 360], "post": [0, 0, 0]}
+					}
+				}
+			}
+		}
+	}
+}

src/main/resources/assets/decocraft/models/bbmodel/animation.grandmother_clock.swing.json

@@ -0,0 +1,136 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.grandmother_clock.swing": {
+			"loop": true,
+			"animation_length": 8,
+			"bones": {
+				"short_hand": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"8.0": {"pre": [0, 0, 360], "post": [0, 0, 0]}
+					}
+				},
+				"longer_hand": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"8.0": {"pre": [0, 0, 720], "post": [0, 0, 0]}
+					}
+				},
+				"chime_lever": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"1.0": {
+							"pre": [0, 0, 11.25],
+							"post": [0, 0, 11.25],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, -11.25],
+							"lerp_mode": "catmullrom"
+						},
+						"4.0": [0, 0, 0],
+						"5.0": {
+							"pre": [0, 0, 11.25],
+							"post": [0, 0, 11.25],
+							"lerp_mode": "catmullrom"
+						},
+						"6.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"7.0": {
+							"post": [0, 0, -11.25],
+							"lerp_mode": "catmullrom"
+						},
+						"8.0": [0, 0, 0]
+					}
+				},
+				"side_chim_lever": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": {
+							"pre": [0, 0, 11],
+							"post": [0, 0, 11],
+							"lerp_mode": "catmullrom"
+						},
+						"4.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"6.0": {
+							"post": [0, 0, -11],
+							"lerp_mode": "catmullrom"
+						},
+						"8.0": [0, 0, 0]
+					}
+				},
+				"side_chim_lever2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.0": {
+							"pre": [0, 0, -11],
+							"post": [0, 0, -11],
+							"lerp_mode": "catmullrom"
+						},
+						"4.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"6.0": {
+							"post": [0, 0, 11],
+							"lerp_mode": "catmullrom"
+						},
+						"8.0": [0, 0, 0]
+					}
+				},
+				"gear": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]},
+						"8.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"gear2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]},
+						"8.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"gear3": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]},
+						"8.0": {"pre": [-360, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"gear4": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [360, 0, 0], "post": [0, 0, 0]},
+						"8.0": {"pre": [360, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"small_gear": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [0, 0, -360], "post": [0, 0, 0]},
+						"8.0": {"pre": [0, 0, -360], "post": [0, 0, 0]}
+					}
+				},
+				"small_gear2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"4.0": {"pre": [0, 0, -360], "post": [0, 0, 0]},
+						"8.0": {"pre": [0, 0, -360], "post": [0, 0, 0]}
+					}
+				}
+			}
+		}
+	}
+}