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_asia
-mod_name=Decocraft Asia Addon
+mod_id=decocraft_worldflags
+mod_name=Decocraft World Flags Addon
 mod_license=All Rights Reserved
 mod_version=1.0.0
-mod_group_id=com.razz.decocraft.asia
-mod_authors=Momo, Razz, ProfMobius, CiciHoneyBee
-mod_description=Adds asian style decorations to Decocraft
+mod_group_id=com.razz.decocraft.worldflags
+mod_authors=Momo, Razz, ProfMobius, Taelnia
+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
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+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
-@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
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

settings.gradle

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

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

@@ -1,519 +0,0 @@
-{
-  "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

@@ -1,101 +0,0 @@
-{
-	"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",
-  "asia.json"
+  "worldflags.json"
 ]

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

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