Add kotatsu hitbox so cushions fit around it

gradle.properties

@@ -11,13 +11,13 @@ neoforge_loader_range=[4,)
 fabric_loader_version=0.18.2
 
 ## Mod Properties
-mod_id=decocraft_lighting
+mod_id=decocraft_asia
-mod_name=Decocraft Lighting Addon
+mod_name=Decocraft Asia Addon
 mod_license=All Rights Reserved
 mod_version=1.0.0
-mod_group_id=com.razz.decocraft.lighting
+mod_group_id=com.razz.decocraft.asia
 mod_authors=Momo, Razz, ProfMobius, CiciHoneyBee
-mod_description=Adds lighting decorations to Decocraft
+mod_description=Adds asian style decorations to Decocraft
 
 # Decocraft minimum version
 decocraft_version=3.0.7

settings.gradle

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

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

@@ -0,0 +1,519 @@
+{
+  "bounding_boxes": [
+  {
+	"model": "kotatsu_hb"
+  }
+  ],
+  "models": [
+  {
+	"name": "Floor Cushion Red",
+	"decoref": "floor_cushion_red",
+	"material": "floor_cushion_red",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_orange"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Orange",
+	"decoref": "floor_cushion_orange",
+	"material": "floor_cushion_orange",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_yellow"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Yellow",
+	"decoref": "floor_cushion_yellow",
+	"material": "floor_cushion_yellow",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_lime"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Lime",
+	"decoref": "floor_cushion_lime",
+	"material": "floor_cushion_lime",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_green"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Green",
+	"decoref": "floor_cushion_green",
+	"material": "floor_cushion_green",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_cyan"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Cyan",
+	"decoref": "floor_cushion_cyan",
+	"material": "floor_cushion_cyan",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_light_blue"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Light Blue",
+	"decoref": "floor_cushion_light_blue",
+	"material": "floor_cushion_light_blue",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_blue"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Blue",
+	"decoref": "floor_cushion_blue",
+	"material": "floor_cushion_blue",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_purple"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Purple",
+	"decoref": "floor_cushion_purple",
+	"material": "floor_cushion_purple",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_magenta"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Magenta",
+	"decoref": "floor_cushion_magenta",
+	"material": "floor_cushion_magenta",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_pink"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Pink",
+	"decoref": "floor_cushion_pink",
+	"material": "floor_cushion_pink",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_white"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion White",
+	"decoref": "floor_cushion_white",
+	"material": "floor_cushion_white",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_black"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Floor Cushion Black",
+	"decoref": "floor_cushion_black",
+	"material": "floor_cushion_black",
+	"model": "floor_cushion",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"type": "seat",
+	"script": {
+	  "tool_modelswitch": {
+		"link": "floor_cushion_red"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Red",
+	"decoref": "kotatsu_red",
+	"material": "kotatsu_red",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_orange"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Orange",
+	"decoref": "kotatsu_orange",
+	"material": "kotatsu_orange",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_yellow"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Yellow",
+	"decoref": "kotatsu_yellow",
+	"material": "kotatsu_yellow",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_lime"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Lime",
+	"decoref": "kotatsu_lime",
+	"material": "kotatsu_lime",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_green"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Green",
+	"decoref": "kotatsu_green",
+	"material": "kotatsu_green",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_cyan"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Cyan",
+	"decoref": "kotatsu_cyan",
+	"material": "kotatsu_cyan",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_light_blue"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Light Blue",
+	"decoref": "kotatsu_light_blue",
+	"material": "kotatsu_light_blue",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_blue_kanagawa"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Blue Kanagawa",
+	"decoref": "kotatsu_blue_kanagawa",
+	"material": "kotatsu_blue_kanagawa",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_purple"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Purple",
+	"decoref": "kotatsu_purple",
+	"material": "kotatsu_purple",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_magenta"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Magenta",
+	"decoref": "kotatsu_magenta",
+	"material": "kotatsu_magenta",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_black"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Black",
+	"decoref": "kotatsu_black",
+	"material": "kotatsu_black",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_blossom"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Blossom",
+	"decoref": "kotatsu_blossom",
+	"material": "kotatsu_blossom",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_kanagawa"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Kotatsu Kanagawa",
+	"decoref": "kotatsu_kanagawa",
+	"material": "kotatsu_kanagawa",
+	"model": "kotatsu",
+	"shape": "kotatsu_hb",
+	"scale": 1.0,
+	"tabs": ["asia", "surface"],
+	"script": {
+	  "tool_modelswitch": {
+		"link": "kotatsu_red"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Potted Bamboo Yellow",
+	"decoref": "potted_bamboo_yellow",
+	"material": "potted_bamboo_yellow",
+	"model": "potted_bamboo",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"displayable": true,
+	"script": {
+	  "tool_modelswitch": {
+		"link": "potted_bamboo_green"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Potted Bamboo Green",
+	"decoref": "potted_bamboo_green",
+	"material": "potted_bamboo_green",
+	"model": "potted_bamboo",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"displayable": true,
+	"script": {
+	  "tool_modelswitch": {
+		"link": "potted_bamboo_yellow"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Potted Cherry Branch Red",
+	"decoref": "potted_cherry_branch_red",
+	"material": "potted_cherry_branch_red",
+	"model": "potted_cherry_branch",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"displayable": true,
+	"script": {
+	  "tool_modelswitch": {
+		"link": "potted_cherry_branch_yellow"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Potted Cherry Branch Yellow",
+	"decoref": "potted_cherry_branch_yellow",
+	"material": "potted_cherry_branch_yellow",
+	"model": "potted_cherry_branch",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"displayable": true,
+	"script": {
+	  "tool_modelswitch": {
+		"link": "potted_cherry_branch_pink"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Potted Cherry Branch Pink",
+	"decoref": "potted_cherry_branch_pink",
+	"material": "potted_cherry_branch_pink",
+	"model": "potted_cherry_branch",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"displayable": true,
+	"script": {
+	  "tool_modelswitch": {
+		"link": "potted_cherry_branch_white"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Potted Cherry Branch White",
+	"decoref": "potted_cherry_branch_white",
+	"material": "potted_cherry_branch_white",
+	"model": "potted_cherry_branch",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"displayable": true,
+	"script": {
+	  "tool_modelswitch": {
+		"link": "potted_cherry_branch_red"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Spider Lily Bouquet Red",
+	"decoref": "spider_lily_bouquet_red",
+	"material": "spider_lily_bouquet_red",
+	"model": "spider_lily_bouquet",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"displayable": true,
+	"script": {
+	  "tool_modelswitch": {
+		"link": "spider_lily_bouquet_white"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  },
+  {
+	"name": "Spider Lily Bouquet White",
+	"decoref": "spider_lily_bouquet_white",
+	"material": "spider_lily_bouquet_white",
+	"model": "spider_lily_bouquet",
+	"scale": 1.0,
+	"tabs": ["asia", "clutter"],
+	"displayable": true,
+	"script": {
+	  "tool_modelswitch": {
+		"link": "spider_lily_bouquet_red"
+	  }
+	},
+	"crafting_color": [0, 0, 0]
+  }
+]
+}

src/main/resources/assets/decocraft/bounding_boxes/kotatsu_hb.bbmodel

@@ -0,0 +1,101 @@
+{
+	"meta": {
+		"format_version": "4.0",
+		"model_format": "bedrock",
+		"box_uv": false
+	},
+	"name": "kotatsu_hb",
+	"model_identifier": "kotatsu_hb",
+	"visible_box": [
+		1,
+		1,
+		0
+	],
+	"variable_placeholders": "",
+	"variable_placeholder_buttons": [],
+	"timeline_setups": [],
+	"resolution": {
+		"width": 64,
+		"height": 64
+	},
+	"elements": [
+		{
+			"name": "kotatsu_table",
+			"rescale": false,
+			"locked": false,
+			"from": [
+				-8,
+				0,
+				-8
+			],
+			"to": [
+				8,
+				11.25,
+				8
+			],
+			"autouv": 1,
+			"color": 1,
+			"origin": [
+				0,
+				0,
+				0
+			],
+			"faces": {
+				"north": {
+					"uv": [
+						0,
+						0,
+						16,
+						16
+					]
+				},
+				"east": {
+					"uv": [
+						0,
+						0,
+						16,
+						16
+					]
+				},
+				"south": {
+					"uv": [
+						0,
+						0,
+						16,
+						16
+					]
+				},
+				"west": {
+					"uv": [
+						0,
+						0,
+						16,
+						16
+					]
+				},
+				"up": {
+					"uv": [
+						0,
+						0,
+						16,
+						16
+					]
+				},
+				"down": {
+					"uv": [
+						0,
+						0,
+						16,
+						16
+					]
+				}
+			},
+			"type": "cube",
+			"uuid": "307b93b1-616c-43ee-ae0b-f75d4d4c0db8"
+		}
+	],
+	"outliner": [
+		"307b93b1-616c-43ee-ae0b-f75d4d4c0db8"
+	],
+	"textures": []
+}

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

@@ -1,4 +1,4 @@
 [
   "groups.json",
-  "lighting.json"
+  "asia.json"
 ]

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

@@ -1,3 +1,3 @@
 {
-
+  "asia": { "label": "itemGroup.decocraft.asia", "icon": "spider_lily_bouquet_red" }
 }

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

@@ -1 +0,0 @@
-{"meta":{"format_version":"4.10","model_format":"bedrock","box_uv":false},"name":"lamp_cable_standalone","model_identifier":"","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"bedrock_animation_mode":"entity","timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":8},"elements":[{"name":"lamp_cable_standalone","box_uv":false,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4.5,4.25,-0.25],"to":[11.5,4.75,0.25],"autouv":0,"color":3,"rotation":[0,0,90],"origin":[0,4.5,0],"faces":{"north":{"uv":[0,0,16,0.5],"texture":1},"east":{"uv":[0,0,0.5,0.5],"texture":1},"south":{"uv":[0,0,16,0.5],"texture":1},"west":{"uv":[0,0,0.5,0.5],"texture":1},"up":{"uv":[16,0.5,0,0],"texture":1},"down":{"uv":[16,0,0,0.5],"texture":1}},"type":"cube","uuid":"fbbc3786-2db7-3deb-160b-6354d70ceb5f"}],"outliner":["fbbc3786-2db7-3deb-160b-6354d70ceb5f"],"textures":[{"path":"C:\\Users\\Gclif\\Downloads\\lamp_cable_standalone_black.png","name":"lamp_cable_standalone_black.png","folder":"block","namespace":"","id":"0","group":"","width":32,"height":16,"uv_width":32,"uv_height":32,"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":"6db2a266-9263-665f-a5a8-4bacd83886a4","relative_path":"lamp_cable_standalone_black.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAAAXNSR0IArs4c6QAAADRJREFUSEtjtPMI/8+AB7Cxs+OTJij36+dPvGoYCZpAYwWjDhgNgdEQGA2B0RAYDYHREAAAVcME7eyG2IsAAAAASUVORK5CYII="},{"path":"C:\\Users\\Gclif\\Downloads\\lamp_cable_standalone_white.png","name":"lamp_cable_standalone_white.png","folder":"block","namespace":"","id":"0","group":"","width":32,"height":16,"uv_width":32,"uv_height":32,"particle":false,"use_as_default":false,"layers_enabled":true,"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":"21398f9c-bb83-cf59-71a3-21005d6763da","layers":[{"name":"layer","offset":[0,0],"scale":[1,1],"opacity":100,"visible":true,"blend_mode":"default","width":32,"height":16,"data_url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAAAXNSR0IArs4c6QAAADRJREFUSEtjfP369X8GPICdnR2fNEG5nz9/4lXDSNAEGisYdcBoCIyGwGgIjIbAaAiMhgAAkXUG0V5Dk0cAAAAASUVORK5CYII="}],"relative_path":"lamp_cable_standalone_white.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAAAXNSR0IArs4c6QAAADRJREFUSEtjfP369X8GPICdnR2fNEG5nz9/4lXDSNAEGisYdcBoCIyGwGgIjIbAaAiMhgAAkXUG0V5Dk0cAAAAASUVORK5CYII="}]}