Merge pull request #62 from Patbox/1.21.6

Update to 1.21.10

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.9-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 	id "me.shedaniel.unified-publishing" version "0.1.+"
 }

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.21.4
+	minecraft_version=1.21.10
-	yarn_mappings=1.21.4+build.4
+	yarn_mappings=1.21.10+build.1
-	loader_version=0.16.9
+	loader_version=0.17.3
 
 # Mod Properties
-	mod_version = 1.9.3
+	mod_version = 1.9.4+1.21.10
 	maven_group = eu.midnightdust.motschen
 	archives_base_name = rocks
 	release_type=release
@@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx2G
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.113.0+1.21.4
+	fabric_version=0.136.0+1.21.10
-	midnightlib_version=1.6.6-fabric
+	midnightlib_version=1.8.3+1.21.9-fabric
-	polymer_version=0.11.3+1.21.4
+	polymer_version=0.14.3+1.21.10
-	factorytools_version=0.5.0+1.21.4
+	factorytools_version=0.8.2+1.21.10

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/generated/assets/rocks/blockstates/acacia_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/acacia_stick_large",
+        "model": "rocks:block/acacia_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/acacia_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/acacia_stick_medium",
+        "model": "rocks:block/acacia_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/acacia_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/acacia_stick_small",
+        "model": "rocks:block/acacia_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/acacia_stick_small",

src/main/generated/assets/rocks/blockstates/andesite_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/andesite_rock_large",
+        "model": "rocks:block/andesite_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/andesite_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/andesite_rock_medium",
+        "model": "rocks:block/andesite_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/andesite_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/andesite_rock_small",
+        "model": "rocks:block/andesite_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/andesite_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/andesite_rock_tiny",
+        "model": "rocks:block/andesite_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/andesite_rock_tiny",

src/main/generated/assets/rocks/blockstates/bamboo_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/bamboo_stick_large",
+        "model": "rocks:block/bamboo_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/bamboo_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/bamboo_stick_medium",
+        "model": "rocks:block/bamboo_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/bamboo_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/bamboo_stick_small",
+        "model": "rocks:block/bamboo_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/bamboo_stick_small",

src/main/generated/assets/rocks/blockstates/birch_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/birch_stick_large",
+        "model": "rocks:block/birch_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/birch_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/birch_stick_medium",
+        "model": "rocks:block/birch_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/birch_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/birch_stick_small",
+        "model": "rocks:block/birch_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/birch_stick_small",

src/main/generated/assets/rocks/blockstates/cherry_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/cherry_stick_large",
+        "model": "rocks:block/cherry_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/cherry_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/cherry_stick_medium",
+        "model": "rocks:block/cherry_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/cherry_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/cherry_stick_small",
+        "model": "rocks:block/cherry_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/cherry_stick_small",

src/main/generated/assets/rocks/blockstates/crimson_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/crimson_stick_large",
+        "model": "rocks:block/crimson_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/crimson_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/crimson_stick_medium",
+        "model": "rocks:block/crimson_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/crimson_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/crimson_stick_small",
+        "model": "rocks:block/crimson_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/crimson_stick_small",

src/main/generated/assets/rocks/blockstates/dark_oak_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/dark_oak_stick_large",
+        "model": "rocks:block/dark_oak_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/dark_oak_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/dark_oak_stick_medium",
+        "model": "rocks:block/dark_oak_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/dark_oak_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/dark_oak_stick_small",
+        "model": "rocks:block/dark_oak_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/dark_oak_stick_small",

src/main/generated/assets/rocks/blockstates/diorite_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/diorite_rock_large",
+        "model": "rocks:block/diorite_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/diorite_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/diorite_rock_medium",
+        "model": "rocks:block/diorite_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/diorite_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/diorite_rock_small",
+        "model": "rocks:block/diorite_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/diorite_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/diorite_rock_tiny",
+        "model": "rocks:block/diorite_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/diorite_rock_tiny",

src/main/generated/assets/rocks/blockstates/end_stone_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/end_stone_rock_large",
+        "model": "rocks:block/end_stone_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/end_stone_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/end_stone_rock_medium",
+        "model": "rocks:block/end_stone_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/end_stone_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/end_stone_rock_small",
+        "model": "rocks:block/end_stone_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/end_stone_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/end_stone_rock_tiny",
+        "model": "rocks:block/end_stone_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/end_stone_rock_tiny",

src/main/generated/assets/rocks/blockstates/granite_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/granite_rock_large",
+        "model": "rocks:block/granite_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/granite_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/granite_rock_medium",
+        "model": "rocks:block/granite_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/granite_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/granite_rock_small",
+        "model": "rocks:block/granite_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/granite_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/granite_rock_tiny",
+        "model": "rocks:block/granite_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/granite_rock_tiny",

src/main/generated/assets/rocks/blockstates/gravel_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/gravel_rock_large",
+        "model": "rocks:block/gravel_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/gravel_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/gravel_rock_medium",
+        "model": "rocks:block/gravel_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/gravel_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/gravel_rock_small",
+        "model": "rocks:block/gravel_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/gravel_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/gravel_rock_tiny",
+        "model": "rocks:block/gravel_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/gravel_rock_tiny",

src/main/generated/assets/rocks/blockstates/ice_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/ice_rock_large",
+        "model": "rocks:block/ice_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/ice_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/ice_rock_medium",
+        "model": "rocks:block/ice_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/ice_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/ice_rock_small",
+        "model": "rocks:block/ice_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/ice_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/ice_rock_tiny",
+        "model": "rocks:block/ice_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/ice_rock_tiny",

src/main/generated/assets/rocks/blockstates/jungle_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/jungle_stick_large",
+        "model": "rocks:block/jungle_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/jungle_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/jungle_stick_medium",
+        "model": "rocks:block/jungle_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/jungle_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/jungle_stick_small",
+        "model": "rocks:block/jungle_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/jungle_stick_small",

src/main/generated/assets/rocks/blockstates/mangrove_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/mangrove_stick_large",
+        "model": "rocks:block/mangrove_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/mangrove_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/mangrove_stick_medium",
+        "model": "rocks:block/mangrove_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/mangrove_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/mangrove_stick_small",
+        "model": "rocks:block/mangrove_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/mangrove_stick_small",

src/main/generated/assets/rocks/blockstates/netherrack_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/netherrack_rock_large",
+        "model": "rocks:block/netherrack_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/netherrack_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/netherrack_rock_medium",
+        "model": "rocks:block/netherrack_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/netherrack_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/netherrack_rock_small",
+        "model": "rocks:block/netherrack_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/netherrack_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/netherrack_rock_tiny",
+        "model": "rocks:block/netherrack_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/netherrack_rock_tiny",

src/main/generated/assets/rocks/blockstates/oak_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/oak_stick_large",
+        "model": "rocks:block/oak_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/oak_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/oak_stick_medium",
+        "model": "rocks:block/oak_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/oak_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/oak_stick_small",
+        "model": "rocks:block/oak_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/oak_stick_small",

src/main/generated/assets/rocks/blockstates/pale_oak_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/pale_oak_stick_large",
+        "model": "rocks:block/pale_oak_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/pale_oak_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/pale_oak_stick_medium",
+        "model": "rocks:block/pale_oak_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/pale_oak_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/pale_oak_stick_small",
+        "model": "rocks:block/pale_oak_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/pale_oak_stick_small",

src/main/generated/assets/rocks/blockstates/red_sand_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/red_sand_rock_large",
+        "model": "rocks:block/red_sand_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/red_sand_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/red_sand_rock_medium",
+        "model": "rocks:block/red_sand_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/red_sand_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/red_sand_rock_small",
+        "model": "rocks:block/red_sand_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/red_sand_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/red_sand_rock_tiny",
+        "model": "rocks:block/red_sand_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/red_sand_rock_tiny",

src/main/generated/assets/rocks/blockstates/rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/rock_large",
+        "model": "rocks:block/rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/rock_medium",
+        "model": "rocks:block/rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/rock_small",
+        "model": "rocks:block/rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/rock_tiny",
+        "model": "rocks:block/rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/rock_tiny",

src/main/generated/assets/rocks/blockstates/sand_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/sand_rock_large",
+        "model": "rocks:block/sand_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/sand_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/sand_rock_medium",
+        "model": "rocks:block/sand_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/sand_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/sand_rock_small",
+        "model": "rocks:block/sand_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/sand_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/sand_rock_tiny",
+        "model": "rocks:block/sand_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/sand_rock_tiny",

src/main/generated/assets/rocks/blockstates/soul_soil_rock.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/soul_soil_rock_large",
+        "model": "rocks:block/soul_soil_rock_large"
-        "y": 0
       },
       {
         "model": "rocks:block/soul_soil_rock_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/soul_soil_rock_medium",
+        "model": "rocks:block/soul_soil_rock_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/soul_soil_rock_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/soul_soil_rock_small",
+        "model": "rocks:block/soul_soil_rock_small"
-        "y": 0
       },
       {
         "model": "rocks:block/soul_soil_rock_small",
@@ -56,8 +53,7 @@
     ],
     "variation=tiny": [
       {
-        "model": "rocks:block/soul_soil_rock_tiny",
+        "model": "rocks:block/soul_soil_rock_tiny"
-        "y": 0
       },
       {
         "model": "rocks:block/soul_soil_rock_tiny",

src/main/generated/assets/rocks/blockstates/spruce_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/spruce_stick_large",
+        "model": "rocks:block/spruce_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/spruce_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/spruce_stick_medium",
+        "model": "rocks:block/spruce_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/spruce_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/spruce_stick_small",
+        "model": "rocks:block/spruce_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/spruce_stick_small",

src/main/generated/assets/rocks/blockstates/warped_stick.json

@@ -2,8 +2,7 @@
   "variants": {
     "variation=large": [
       {
-        "model": "rocks:block/warped_stick_large",
+        "model": "rocks:block/warped_stick_large"
-        "y": 0
       },
       {
         "model": "rocks:block/warped_stick_large",
@@ -20,8 +19,7 @@
     ],
     "variation=medium": [
       {
-        "model": "rocks:block/warped_stick_medium",
+        "model": "rocks:block/warped_stick_medium"
-        "y": 0
       },
       {
         "model": "rocks:block/warped_stick_medium",
@@ -38,8 +36,7 @@
     ],
     "variation=small": [
       {
-        "model": "rocks:block/warped_stick_small",
+        "model": "rocks:block/warped_stick_small"
-        "y": 0
       },
       {
         "model": "rocks:block/warped_stick_small",

src/main/generated/assets/rocks/items/starfish.json

@@ -6,21 +6,21 @@
       {
         "model": {
           "type": "minecraft:model",
-          "model": "rocks:block/starfish_red"
+          "model": "rocks:item/starfish_red"
         },
         "when": "red"
       },
       {
         "model": {
           "type": "minecraft:model",
-          "model": "rocks:block/starfish_pink"
+          "model": "rocks:item/starfish_pink"
         },
         "when": "pink"
       },
       {
         "model": {
           "type": "minecraft:model",
-          "model": "rocks:block/starfish_orange"
+          "model": "rocks:item/starfish_orange"
         },
         "when": "orange"
       }

src/main/generated/data/rocks/advancement/recipes/building_blocks/andesite_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:andesite_from_splitter"
+        "recipe": "rocks:andesite_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:andesite_from_splitter"
+      "rocks:andesite_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/cobblestone_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:stone_from_splitter"
+        "recipe": "rocks:cobblestone_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:stone_from_splitter"
+      "rocks:cobblestone_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/diorite_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:diorite_from_splitter"
+        "recipe": "rocks:diorite_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:diorite_from_splitter"
+      "rocks:diorite_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/end_stone_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:end_stone_from_splitter"
+        "recipe": "rocks:end_stone_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:end_stone_from_splitter"
+      "rocks:end_stone_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/granite_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:granite_from_splitter"
+        "recipe": "rocks:granite_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:granite_from_splitter"
+      "rocks:granite_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/ice_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:ice_from_splitter"
+        "recipe": "rocks:ice_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:ice_from_splitter"
+      "rocks:ice_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/netherrack_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:netherrack_from_splitter"
+        "recipe": "rocks:netherrack_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:netherrack_from_splitter"
+      "rocks:netherrack_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/red_sandstone_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:red_sandstone_from_splitter"
+        "recipe": "rocks:red_sandstone_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:red_sandstone_from_splitter"
+      "rocks:red_sandstone_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/sandstone_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:sandstone_from_splitter"
+        "recipe": "rocks:sandstone_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:sandstone_from_splitter"
+      "rocks:sandstone_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/advancement/recipes/building_blocks/soul_soil_from_splitter.json

@@ -13,7 +13,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:soul_soil_from_splitter"
+        "recipe": "rocks:soul_soil_from_splitter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:soul_soil_from_splitter"
+      "rocks:soul_soil_from_splitter"
     ]
   }
 }

src/main/generated/data/rocks/recipe/cobblestone_from_splitter.json

@@ -9,6 +9,6 @@
   ],
   "result": {
     "count": 1,
-    "id": "minecraft:stone"
+    "id": "minecraft:cobblestone"
   }
 }

src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java

@@ -22,7 +22,7 @@ public class NetherGeyserBlockEntity extends BlockEntity {
     }
 
     public static void tick(World world, BlockPos pos, BlockState state, NetherGeyserBlockEntity blockEntity) {
-        if (world == null || world.isClient) return;
+        if (world == null || world.isClient()) return;
         if (world.getBlockState(pos).getBlock() == RocksMain.NetherGeyser) {
             PlayerEntity player = world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 3, true);
             PlayerEntity player2 = world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 1, true);

src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/OverworldGeyserBlockEntity.java

@@ -26,12 +26,12 @@ public class OverworldGeyserBlockEntity extends BlockEntity {
     }
 
     public static void tick(World world, BlockPos pos, BlockState state, OverworldGeyserBlockEntity blockEntity) {
-        if (world == null || world.isClient) return;
+        if (world == null || world.isClient()) return;
         if (world.getBlockState(pos).getBlock() == RocksMain.Geyser) {
             PlayerEntity player = world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 3, true);
             PlayerEntity player2 = world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 8, true);
 
-            if (RocksConfig.geyserLevitation && player2 != null && (player2.getBlockPos().equals(pos) || world.raycast(new BlockStateRaycastContext(pos.toCenterPos(), player2.getPos(), blockState -> !blockState.isAir() && !blockState.isOf(RocksMain.Geyser))).getType() == HitResult.Type.MISS) && player2.getY() >= pos.getY() && player2.getY() <= pos.getY() + 5 && (pos.getX() <= player2.getX() && pos.getX() + 1 >= player2.getX()) && (pos.getZ() <= player2.getZ() && pos.getZ() + 1 >= player2.getZ())) {
+            if (RocksConfig.geyserLevitation && player2 != null && (player2.getBlockPos().equals(pos) || world.raycast(new BlockStateRaycastContext(pos.toCenterPos(), player2.getEntityPos(), blockState -> !blockState.isAir() && !blockState.isOf(RocksMain.Geyser))).getType() == HitResult.Type.MISS) && player2.getY() >= pos.getY() && player2.getY() <= pos.getY() + 5 && (pos.getX() <= player2.getX() && pos.getX() + 1 >= player2.getX()) && (pos.getZ() <= player2.getZ() && pos.getZ() + 1 >= player2.getZ())) {
                 player2.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 2, 10, true, false, false));
             }
 

src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java

@@ -13,27 +13,18 @@ import net.minecraft.util.math.RotationAxis;
 import net.minecraft.util.math.Vec3d;
 import org.joml.Vector3f;
 
-import java.util.HashSet;
+import static eu.midnightdust.motschen.rocks.RocksMain.id;
-import java.util.Set;
-
-import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.polymerId;
 
 public class ItemDisplayStarfishModel extends ConditionalBlockModel {
-    private final Set<ItemDisplayElement> arms = HashSet.newHashSet(5);
+    private final ItemDisplayElement arm;
     public static ItemStack RED;
     public static ItemStack ORANGE;
     public static ItemStack PINK;
-    public static ItemStack RED_FIRST;
-    public static ItemStack ORANGE_FIRST;
-    public static ItemStack PINK_FIRST;
 
     public static void initModels() {
-        RED = ItemDisplayElementUtil.getModel(polymerId("block/starfish_red_arm"));
+        RED = ItemDisplayElementUtil.getModel(id("block/starfish_red"));
-        ORANGE = ItemDisplayElementUtil.getModel(polymerId("block/starfish_orange_arm"));
+        ORANGE = ItemDisplayElementUtil.getModel(id("block/starfish_orange"));
-        PINK = ItemDisplayElementUtil.getModel(polymerId("block/starfish_pink_arm"));
+        PINK = ItemDisplayElementUtil.getModel(id("block/starfish_pink"));
-        RED_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_red_first_arm"));
-        ORANGE_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_orange_first_arm"));
-        PINK_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_pink_first_arm"));
     }
 
     public ItemDisplayStarfishModel(BlockState state, BlockPos pos) {
@@ -41,25 +32,21 @@ public class ItemDisplayStarfishModel extends ConditionalBlockModel {
         int baseRotation = pos.hashCode() % 360;
         double xOffset = ((pos.hashCode() + pos.getX()) % 250 - 125) / 1000f;
         double zOffset = ((pos.hashCode() + pos.getZ()) % 250 - 125) / 1000f;
-        for (int i = 0; i < 5; i++) {
+        arm = ItemDisplayElementUtil.createSimple(modelStack);
-            var arm = ItemDisplayElementUtil.createSimple(i != 0 ? modelStack : getFirstModel(state));
         arm.setDisplaySize(1, 1);
         arm.setScale(new Vector3f(1));
-            arm.setRightRotation(RotationAxis.POSITIVE_Y.rotationDegrees(baseRotation + 72.5f * i));
+        arm.setRightRotation(RotationAxis.POSITIVE_Y.rotationDegrees(baseRotation));
         arm.setOffset(new Vec3d(xOffset, 0, zOffset));
         arm.setViewRange(0.4f * (RocksConfig.polymerViewDistance / 100f));
-            arms.add(arm);
         this.addElement(arm);
     }
-    }
 
     @Override
     public void notifyUpdate(HolderAttachment.UpdateType updateType) {
         if (updateType == BlockAwareAttachment.BLOCK_STATE_UPDATE) {
             var state = this.blockState();
             ItemStack modelStack = getModel(state);
-            this.arms.forEach(arm -> arm.setItem(modelStack));
+            arm.setItem(modelStack);
-            this.arms.stream().findFirst().orElseThrow().setItem(getFirstModel(state));
 
             this.tick();
         }
@@ -71,11 +58,4 @@ public class ItemDisplayStarfishModel extends ConditionalBlockModel {
             case PINK -> PINK;
         };
     }
-    private ItemStack getFirstModel(BlockState state) {
-        return switch (state.get(RocksMain.STARFISH_VARIATION)) {
-            case RED -> RED_FIRST;
-            case ORANGE -> ORANGE_FIRST;
-            case PINK -> PINK_FIRST;
-        };
-    }
 }

src/main/java/eu/midnightdust/motschen/rocks/config/RocksConfig.java

@@ -53,6 +53,7 @@ public class RocksConfig extends MidnightConfig {
 
     @Entry(category = effects) public static boolean enablePolymerMode = true;
     @Entry(category = effects) public static boolean forcePolymerMode = false;
-    @Entry(category = effects, requiredMod = "factorytools", min = 0, max = 200, isSlider = true) public static int polymerViewDistance = 100;
+    @Condition(requiredModId = "factorytools")
+    @Entry(category = effects, min = 0, max = 200, isSlider = true) public static int polymerViewDistance = 100;
     @Entry(category = effects) public static List<String> biomeExclusions = new ArrayList<>();
 }

src/main/java/eu/midnightdust/motschen/rocks/datagen/Models.java

@@ -9,9 +9,13 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.minecraft.block.Block;
 import net.minecraft.client.data.*;
 import net.minecraft.client.render.item.model.ItemModel;
+import net.minecraft.client.render.model.json.ModelVariant;
+import net.minecraft.client.render.model.json.WeightedVariant;
 import net.minecraft.item.Item;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.Pool;
+import net.minecraft.util.math.AxisRotation;
 
 import java.util.*;
 
@@ -72,18 +76,18 @@ public class Models extends FabricModelProvider {
     public final void registerStarfishItemVariations(ItemModelGenerator modelGenerator, Block starfish) {
         Map<StarfishVariation, ItemModel.Unbaked> variantMap = new HashMap<>();
         for (StarfishVariation variation : StarfishVariation.values()) {
-            variantMap.put(variation, ItemModels.basic(ModelIds.getBlockSubModelId(starfish, "_"+variation.toString())));
+            variantMap.put(variation, ItemModels.basic(ModelIds.getItemSubModelId(starfish.asItem(), "_"+variation.toString())));
         }
         modelGenerator.output.accept(starfish.asItem(), ItemModels.select(RocksMain.STARFISH_VARIATION, ItemModels.basic(ModelIds.getItemModelId(starfish.asItem())), variantMap));
     }
 
-    public static <T> List<BlockStateVariant> getRandomRotationVariants(VariantSetting<T> baseSettings, T value) {
+    public static WeightedVariant getRandomRotationWeightedVariant(Identifier modelId) {
-        List<BlockStateVariant> list = new ArrayList<>();
+        Pool.Builder<ModelVariant> list = Pool.builder();
-        for (VariantSettings.Rotation rotation : VariantSettings.Rotation.values()) {
+        for (AxisRotation rotation : AxisRotation.values()) {
-            BlockStateVariant rotatedVariant = BlockStateVariant.create().put(baseSettings, value);
+            ModelVariant rotatedVariant = new ModelVariant(modelId, ModelVariant.ModelState.DEFAULT.setRotationY(rotation));
-            list.add(rotatedVariant.put(VariantSettings.Y, rotation));
+            list.add(rotatedVariant);
         }
-        return list;
+        return new WeightedVariant(list.build());
     }
 
     private static class RockModel {
@@ -97,10 +101,10 @@ public class Models extends FabricModelProvider {
             modelGenerator.blockStateCollector.accept(createBlockState(rockBlock, new Identifier[]{largeRock, mediumRock, smallRock, tinyRock}));
         }
 
-        private static BlockStateSupplier createBlockState(Block rockBlock, Identifier[] modelIds) {
+        private static BlockModelDefinitionCreator createBlockState(Block rockBlock, Identifier[] modelIds) {
-            return VariantsBlockStateSupplier.create(rockBlock)
+            return VariantsBlockModelDefinitionCreator.of(rockBlock)
-                    .coordinate(BlockStateVariantMap.create(RocksMain.ROCK_VARIATION)
+                    .with(BlockStateVariantMap.models(RocksMain.ROCK_VARIATION)
-                            .registerVariants(variation -> getRandomRotationVariants(VariantSettings.MODEL, modelIds[3 - variation.ordinal()]))
+                            .generate(variation -> getRandomRotationWeightedVariant(modelIds[3 - variation.ordinal()]))
                     );
         }
     }
@@ -114,10 +118,10 @@ public class Models extends FabricModelProvider {
             modelGenerator.blockStateCollector.accept(createBlockState(stickBlock, new Identifier[]{largeRock, mediumRock, smallRock}));
         }
 
-        private static BlockStateSupplier createBlockState(Block stickBlock, Identifier[] modelIds) {
+        private static BlockModelDefinitionCreator createBlockState(Block stickBlock, Identifier[] modelIds) {
-            return VariantsBlockStateSupplier.create(stickBlock)
+            return VariantsBlockModelDefinitionCreator.of(stickBlock)
-                    .coordinate(BlockStateVariantMap.create(RocksMain.STICK_VARIATION)
+                    .with(BlockStateVariantMap.models(RocksMain.STICK_VARIATION)
-                            .registerVariants(variation -> getRandomRotationVariants(VariantSettings.MODEL, modelIds[2 - variation.ordinal()]))
+                            .generate(variation -> getRandomRotationWeightedVariant(modelIds[2 - variation.ordinal()]))
                     );
         }
     }

src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java

@@ -39,11 +39,12 @@ public class Recipes extends FabricRecipeProvider {
         }
         private void generateCrafting(RecipeExporter exporter) {
             RocksMain.splittersByType.forEach(((rockType, splitter) -> {
+                Identifier stoneID = rockType.getFragment().getStoneId();
 
-                ShapelessRecipeJsonBuilder.create(registries.getOrThrow(RegistryKeys.ITEM), RecipeCategory.BUILDING_BLOCKS, Registries.BLOCK.get(Identifier.ofVanilla(rockType.name().toLowerCase())).asItem())
+                ShapelessRecipeJsonBuilder.create(registries.getOrThrow(RegistryKeys.ITEM), RecipeCategory.BUILDING_BLOCKS, Registries.BLOCK.get(stoneID).asItem())
                         .input(splitter, 4)
                         .criterion(RecipeGenerator.hasItem(splitter), this.conditionsFromItem(splitter))
-                        .offerTo(exporter, rockType.name().toLowerCase()+"_from_splitter");
+                        .offerTo(exporter, stoneID.getPath()+"_from_splitter");
             }));
         }
     }

src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java

@@ -14,8 +14,8 @@ import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.packettweaker.PacketContext;
 
+import static eu.midnightdust.motschen.rocks.RocksMain.id;
 import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient;
-import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.polymerId;
 
 public class StarfishItemPolymer extends BlockItem implements PolymerItem {
     private final Item polymerItem;
@@ -30,7 +30,7 @@ public class StarfishItemPolymer extends BlockItem implements PolymerItem {
         var state = itemStack.getComponents().get(DataComponentTypes.BLOCK_STATE);
         if (state != null && !state.isEmpty()) {
             StarfishVariation variation = state.getValue(RocksMain.STARFISH_VARIATION);
-            if (variation != null) return ResourcePackExtras.bridgeModel(polymerId("item/"+variation + "_starfish"));
+            if (variation != null) return ResourcePackExtras.bridgeModel(id("item/starfish_"+variation));
         }
         return itemStack.get(DataComponentTypes.ITEM_MODEL);
     }

src/main/java/eu/midnightdust/motschen/rocks/mixin/MixinModelElementDeserializer.java

@@ -1,22 +0,0 @@
-package eu.midnightdust.motschen.rocks.mixin;
-
-import com.google.gson.JsonObject;
-import net.minecraft.client.render.model.json.ModelElement;
-import net.minecraft.util.JsonHelper;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-
-@Mixin(value = ModelElement.Deserializer.class, priority = 2000)
-public class MixinModelElementDeserializer {
-
-    /**
-     * @author Motschen
-     * @reason Not cancellable
-     * Unlimited rotation angles for starfish
-     * Inspired by <a href="https://github.com/CottonMC/ModelsUnlocked/blob/master/src/main/java/io/github/cottonmc/modelsunlocked/mixin/ModelElementDeserializerMixin.java">ModelsUnlocked</a>
-     */
-    @Overwrite
-    private float deserializeRotationAngle(JsonObject json) {
-        return (JsonHelper.getFloat(json, "angle"));
-    }
-}

src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java

@@ -52,9 +52,7 @@ public class PolyUtil {
         if (PASSABLE_WATERLOGGED_BLOCK == null) SMALL_BLOCK = Blocks.BARRIER.getDefaultState().with(WATERLOGGED, true);
 
         PolymerResourcePackUtils.addModAssets(MOD_ID);
-        ResourcePackExtras.forDefault().addBridgedModelsFolder(id("block"), id("rocks"));
+        ResourcePackExtras.forDefault().addBridgedModelsFolder(id("block"), id("item"));
-        ResourcePackExtras.forDefault().addBridgedModelsFolder(polymerId("block"), polymerId("polymer-rocks"));
-        ResourcePackExtras.forDefault().addBridgedModelsFolder(polymerId("item"), polymerId("polymer-rocks"));
 
         ItemDisplayNetherGeyserModel.initModels();
         ItemDisplayOverworldGeyserModel.initModels();
@@ -64,9 +62,6 @@ public class PolyUtil {
         ItemDisplayStarfishModel.initModels();
         ItemDisplayStickModel.initModels();
     }
-    public static Identifier polymerId(String path) {
-        return Identifier.of("polymer-rocks", path);
-    }
 
     public static boolean hasModOnClient(ServerPlayerEntity player) {
         return playersWithMod.contains(player);

src/main/java/eu/midnightdust/motschen/rocks/world/FeatureRegistry.java

@@ -9,7 +9,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.state.property.Properties;
-import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.world.gen.ProbabilityConfig;
 import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.FeatureConfig;
@@ -27,17 +27,17 @@ public class FeatureRegistry {
         return Registry.register(Registries.FEATURE, name, feature);
     }
 
-    private static final WeightedBlockStateProvider StarfishStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+    private static final WeightedBlockStateProvider StarfishStates = new WeightedBlockStateProvider(Pool.<BlockState>builder()
             .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION, StarfishVariation.RED).with(Properties.WATERLOGGED, true), 6)
             .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.PINK).with(Properties.WATERLOGGED, true), 7)
             .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.ORANGE).with(Properties.WATERLOGGED, true), 2).build());
 
-    private static final WeightedBlockStateProvider SeashellStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+    private static final WeightedBlockStateProvider SeashellStates = new WeightedBlockStateProvider(Pool.<BlockState>builder()
             .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION, SeashellVariation.YELLOW).with(Properties.WATERLOGGED, true), 7)
             .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.PINK).with(Properties.WATERLOGGED, true), 2)
             .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.WHITE).with(Properties.WATERLOGGED, true), 6).build());
 
-    private static final WeightedBlockStateProvider GeyserStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+    private static final WeightedBlockStateProvider GeyserStates = new WeightedBlockStateProvider(Pool.<BlockState>builder()
             .add(RocksMain.Geyser.getDefaultState().with(Properties.SNOWY, true), 1).build());
 
     static {

src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/MiscFeatures.java

@@ -9,7 +9,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.registry.Registerable;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.gen.ProbabilityConfig;
 import net.minecraft.world.gen.blockpredicate.BlockPredicate;
@@ -23,19 +23,19 @@ import static eu.midnightdust.motschen.rocks.util.RegistryUtil.register;
 
 public class MiscFeatures {
     private static final ConfiguredFeature<?, ?> SEASHELL_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
-                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                    new WeightedBlockStateProvider(Pool.<BlockState>builder()
                             .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.YELLOW), 7)
                             .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.PINK), 2)
                             .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.WHITE), 6).build()
             )));
     public static ConfiguredFeature<?, ?> STARFISH_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
-                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                    new WeightedBlockStateProvider(Pool.<BlockState>builder()
                             .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.RED), 2)
                             .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.PINK), 6)
                             .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.ORANGE), 7).build()))
     );
     public static ConfiguredFeature<?, ?> PINECONE_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
-            new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+            new WeightedBlockStateProvider(Pool.<BlockState>builder()
                     .add(RocksMain.Pinecone.getDefaultState(), 1).build()))
     );
 

src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/NetherFeatures.java

@@ -6,7 +6,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.registry.Registerable;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.gen.blockpredicate.BlockPredicate;
 import net.minecraft.world.gen.feature.*;
@@ -19,7 +19,7 @@ import static eu.midnightdust.motschen.rocks.util.RegistryUtil.register;
 
 public class NetherFeatures {
     public static ConfiguredFeature<?, ?> NETHER_GEYSER_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
-                    new WeightedBlockStateProvider(DataPool.<BlockState>builder().add(RocksMain.NetherGeyser.getDefaultState(), 1)))
+                    new WeightedBlockStateProvider(Pool.<BlockState>builder().add(RocksMain.NetherGeyser.getDefaultState(), 1)))
     );
 
     public static PlacedFeature NETHER_GEYSER_PLACED_FEATURE = new PlacedFeature(RegistryEntry.of(NETHER_GEYSER_FEATURE),

src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/RockFeatures.java

@@ -8,7 +8,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.registry.*;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.gen.blockpredicate.BlockPredicate;
 import net.minecraft.world.gen.feature.*;
@@ -46,7 +46,7 @@ public class RockFeatures {
                 BlockFilterPlacementModifier.of(BlockPredicate.bothOf(BlockPredicate.IS_AIR, BlockPredicate.matchingBlocks(new Vec3i(0, -1, 0), groundBlocks))));
     }
     public static ConfiguredFeature<?, ?> ROCK_MIX_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
-            new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+            new WeightedBlockStateProvider(Pool.<BlockState>builder()
                     .add(rocksByType.get(RockType.GRANITE).getDefaultState().with(ROCK_VARIATION,RockVariation.TINY), 10).add(rocksByType.get(RockType.GRANITE).getDefaultState().with(ROCK_VARIATION,RockVariation.SMALL), 7)
                     .add(rocksByType.get(RockType.GRANITE).getDefaultState().with(ROCK_VARIATION,RockVariation.MEDIUM), 5).add(rocksByType.get(RockType.GRANITE).getDefaultState().with(ROCK_VARIATION,RockVariation.LARGE), 1)
                     .add(rocksByType.get(RockType.DIORITE).getDefaultState().with(ROCK_VARIATION,RockVariation.TINY), 10).add(rocksByType.get(RockType.DIORITE).getDefaultState().with(ROCK_VARIATION,RockVariation.SMALL), 7)
@@ -56,7 +56,7 @@ public class RockFeatures {
                     .build()))
     );
     public static ConfiguredFeature<?, ?> NETHER_GRAVEL_ROCK_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
-            new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+            new WeightedBlockStateProvider(Pool.<BlockState>builder()
                     .add(rocksByType.get(RockType.GRAVEL).getDefaultState().with(RocksMain.ROCK_VARIATION, RockVariation.TINY), 10)
                     .add(rocksByType.get(RockType.GRAVEL).getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
                     .add(rocksByType.get(RockType.GRAVEL).getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
@@ -69,7 +69,7 @@ public class RockFeatures {
     public static void init() {
         for (RockType type : RockType.values()) {
             ConfiguredFeature<?, ?> ROCK_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
-                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                    new WeightedBlockStateProvider(Pool.<BlockState>builder()
                             .add(rocksByType.get(type).getDefaultState().with(ROCK_VARIATION, RockVariation.TINY), 10)
                             .add(rocksByType.get(type).getDefaultState().with(ROCK_VARIATION, RockVariation.SMALL), 7)
                             .add(rocksByType.get(type).getDefaultState().with(ROCK_VARIATION, RockVariation.MEDIUM), 5)

src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/StickFeatures.java

@@ -7,7 +7,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.registry.Registerable;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.gen.blockpredicate.BlockPredicate;
 import net.minecraft.world.gen.feature.*;
@@ -41,7 +41,7 @@ public class StickFeatures {
     public static void init() {
         for (StickType type : StickType.values()) {
             ConfiguredFeature<?, ?> STICK_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
-                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                    new WeightedBlockStateProvider(Pool.<BlockState>builder()
                             .add(sticksByType.get(type).getDefaultState().with(STICK_VARIATION, StickVariation.SMALL), 7)
                             .add(sticksByType.get(type).getDefaultState().with(STICK_VARIATION, StickVariation.MEDIUM), 5)
                             .add(sticksByType.get(type).getDefaultState().with(STICK_VARIATION, StickVariation.LARGE), 1).build()))

src/main/resources/assets/rocks/models/block/starfish_orange.json

@@ -1,10 +1,10 @@
 {
+	"format_version": "1.21.6",
 	"credit": "Made with Blockbench",
 	"textures": {
 		"0": "rocks:block/starfish_orange",
 		"particle": "rocks:block/starfish_orange"
 	},
-	"gui_light": "front",
 	"elements": [
 		{
 			"from": [4.5, 0, 10.5],
@@ -59,211 +59,211 @@
 			}
 		},
 		{
-			"from": [5.75, 0, 10],
+			"from": [6, 0, 9.25],
-			"to": [6.75, 1, 14],
+			"to": [10, 1, 10.25],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [6, 0, 10]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [6, 0, 10]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [4.5, 0.02, 9],
+			"from": [6, 0.02, 9.5],
-			"to": [5.5, 1.02, 12],
+			"to": [9, 1.02, 10.5],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [6, 0, 9]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [6, 0, 9]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [5, 0.01, 9],
+			"from": [6, 0.01, 9],
-			"to": [6, 1.01, 12],
+			"to": [9, 1.01, 10],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [6, 0, 9]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [6, 0, 9]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [1.4, -0.01, 9],
+			"from": [6.6, -0.01, 8.2],
-			"to": [3.4, 0.99, 11],
+			"to": [8.6, 0.99, 10.2],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [4.6, 0, 7]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [4.6, 0, 7]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [3.5, 0, 10],
+			"from": [0, 0, 9.5],
-			"to": [4.5, 1, 14],
+			"to": [4, 1, 10.5],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [4, 0, 10]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [4, 0, 10]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [2.75, 0.02, 10.5],
+			"from": [1, 0.02, 9.25],
-			"to": [3.75, 1.02, 13.5],
+			"to": [4, 1.02, 10.25],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [4, 0, 10.5]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [4, 0, 10.5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [3.25, 0.01, 10.5],
+			"from": [1, 0.01, 9.75],
-			"to": [4.25, 1.01, 13.5],
+			"to": [4, 1.01, 10.75],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [4, 0, 10.5]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [4, 0, 10.5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [4, -0.01, 13],
+			"from": [3, -0.01, 8],
-			"to": [6, 0.99, 15],
+			"to": [5, 0.99, 10],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [7, 0, 11]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [7, 0, 11]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [3.5, 0, 7.4],
+			"from": [3.5, 0, 4.6],
-			"to": [4.5, 1, 11.4],
+			"to": [4.5, 1, 8.6],
-			"rotation": {"angle": -145, "axis": "y", "origin": [4, 0, 8]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [4, 0, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [1.25, 0.02, 8.7],
+			"from": [3.75, 0.02, 6.3],
-			"to": [2.25, 1.02, 11.7],
+			"to": [4.75, 1.02, 9.3],
-			"rotation": {"angle": -145, "axis": "y", "origin": [3, 0, 9]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [3, 0, 9]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [3.25, 0.01, 7.4],
+			"from": [3.75, 0.01, 5.6],
-			"to": [4.25, 1.01, 10.4],
+			"to": [4.75, 1.01, 8.6],
-			"rotation": {"angle": -145, "axis": "y", "origin": [4, 0, 8]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [4, 0, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [0, -0.01, 10.5],
+			"from": [4, -0.01, 7.5],
-			"to": [2, 0.99, 12.5],
+			"to": [6, 0.99, 9.5],
-			"rotation": {"angle": -145, "axis": "y", "origin": [3, 0, 10]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [3, 0, 10]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [7.35, 0, 7.3],
+			"from": [5.65, 0, 4.7],
-			"to": [8.35, 1, 11.3],
+			"to": [6.65, 1, 8.7],
-			"rotation": {"angle": 145, "axis": "y", "origin": [7, 0, 8]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [7, 0, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [3.5, 0.02, 8],
+			"from": [5.5, 0.02, 5],
-			"to": [4.5, 1.02, 11],
+			"to": [6.5, 1.02, 8],
-			"rotation": {"angle": 145, "axis": "y", "origin": [5, 0, 8]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [5, 0, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [4, 0.01, 8],
+			"from": [5, 0.01, 5],
-			"to": [5, 1.01, 11],
+			"to": [6, 1.01, 8],
-			"rotation": {"angle": 145, "axis": "y", "origin": [5, 0, 8]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [5, 0, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [2, -0.01, 10.5],
+			"from": [4, -0.01, 5.5],
-			"to": [4, 0.99, 12.5],
+			"to": [6, 0.99, 7.5],
-			"rotation": {"angle": 145, "axis": "y", "origin": [4, 0, 9]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [4, 0, 9]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
@@ -306,67 +306,39 @@
 			}
 		}
 	],
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [65, 35, 0],
-			"translation": [0.75, 4.75, 3.5],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [65, 35, 0],
-			"translation": [-1.75, 2.75, 3.5],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"firstperson_righthand": {
-			"rotation": [29, 0, 23],
-			"translation": [3.25, 8.25, 0]
-		},
-		"firstperson_lefthand": {
-			"rotation": [29, 0, 23],
-			"translation": [-3, 7.25, 0]
-		},
-		"ground": {
-			"translation": [2.5, 3.75, -1],
-			"scale": [0.75, 0.75, 0.75]
-		},
-		"gui": {
-			"rotation": [90, 35, 0],
-			"translation": [2.25, 3.5, 0],
-			"scale": [1.5, 1.5, 1.5]
-		},
-		"head": {
-			"translation": [3, 14.25, -0.75]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [4.25, -2, -12],
-			"scale": [1.5, 1.5, 1.5]
-		}
-	},
 	"groups": [
 		{
 			"name": "side1",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [0, 1, 2, 3]
 		},
 		{
 			"name": "side2",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [4, 5, 6, 7]
 		},
 		{
 			"name": "side3",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [8, 9, 10, 11]
 		},
 		{
 			"name": "side4",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [12, 13, 14, 15]
 		},
 		{
 			"name": "side5",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [16, 17, 18, 19]
-		}, 20, 21, 22]
+		},
+		20,
+		21,
+		22
+	]
 }

src/main/resources/assets/rocks/models/block/starfish_pink.json

@@ -1,10 +1,10 @@
 {
+	"format_version": "1.21.6",
 	"credit": "Made with Blockbench",
 	"textures": {
 		"0": "rocks:block/starfish_pink",
 		"particle": "rocks:block/starfish_pink"
 	},
-	"gui_light": "front",
 	"elements": [
 		{
 			"from": [7.5, 0, 8.5],
@@ -59,211 +59,211 @@
 			}
 		},
 		{
-			"from": [8.75, 0, 8],
+			"from": [9, 0, 7.25],
-			"to": [9.75, 1, 12],
+			"to": [13, 1, 8.25],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [9, 0, 8]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [9, 0, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [7.5, 0.02, 7],
+			"from": [9, 0.02, 7.5],
-			"to": [8.5, 1.02, 10],
+			"to": [12, 1.02, 8.5],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [9, 0, 7]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [9, 0, 7]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [8, 0.01, 7],
+			"from": [9, 0.01, 7],
-			"to": [9, 1.01, 10],
+			"to": [12, 1.01, 8],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [9, 0, 7]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [9, 0, 7]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [4.4, -0.01, 7],
+			"from": [9.6, -0.01, 6.2],
-			"to": [6.4, 0.99, 9],
+			"to": [11.6, 0.99, 8.2],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [7.6, 0, 5]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [7.6, 0, 5]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.5, 0, 8],
+			"from": [3, 0, 7.5],
-			"to": [7.5, 1, 12],
+			"to": [7, 1, 8.5],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [7, 0, 8]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [7, 0, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [5.75, 0.02, 8.5],
+			"from": [4, 0.02, 7.25],
-			"to": [6.75, 1.02, 11.5],
+			"to": [7, 1.02, 8.25],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [7, 0, 8.5]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [7, 0, 8.5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.25, 0.01, 8.5],
+			"from": [4, 0.01, 7.75],
-			"to": [7.25, 1.01, 11.5],
+			"to": [7, 1.01, 8.75],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [7, 0, 8.5]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [7, 0, 8.5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [7, -0.01, 11],
+			"from": [6, -0.01, 6],
-			"to": [9, 0.99, 13],
+			"to": [8, 0.99, 8],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [10, 0, 9]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [10, 0, 9]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.5, 0, 5.4],
+			"from": [6.5, 0, 2.6],
-			"to": [7.5, 1, 9.4],
+			"to": [7.5, 1, 6.6],
-			"rotation": {"angle": -145, "axis": "y", "origin": [7, 0, 6]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [7, 0, 6]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [4.25, 0.02, 6.7],
+			"from": [6.75, 0.02, 4.3],
-			"to": [5.25, 1.02, 9.7],
+			"to": [7.75, 1.02, 7.3],
-			"rotation": {"angle": -145, "axis": "y", "origin": [6, 0, 7]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [6, 0, 7]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.25, 0.01, 5.4],
+			"from": [6.75, 0.01, 3.6],
-			"to": [7.25, 1.01, 8.4],
+			"to": [7.75, 1.01, 6.6],
-			"rotation": {"angle": -145, "axis": "y", "origin": [7, 0, 6]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [7, 0, 6]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [3, -0.01, 8.5],
+			"from": [7, -0.01, 5.5],
-			"to": [5, 0.99, 10.5],
+			"to": [9, 0.99, 7.5],
-			"rotation": {"angle": -145, "axis": "y", "origin": [6, 0, 8]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [6, 0, 8]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [10.35, 0, 5.3],
+			"from": [8.65, 0, 2.7],
-			"to": [11.35, 1, 9.3],
+			"to": [9.65, 1, 6.7],
-			"rotation": {"angle": 145, "axis": "y", "origin": [10, 0, 6]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [10, 0, 6]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.5, 0.02, 6],
+			"from": [8.5, 0.02, 3],
-			"to": [7.5, 1.02, 9],
+			"to": [9.5, 1.02, 6],
-			"rotation": {"angle": 145, "axis": "y", "origin": [8, 0, 6]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [8, 0, 6]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [7, 0.01, 6],
+			"from": [8, 0.01, 3],
-			"to": [8, 1.01, 9],
+			"to": [9, 1.01, 6],
-			"rotation": {"angle": 145, "axis": "y", "origin": [8, 0, 6]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [8, 0, 6]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [5, -0.01, 8.5],
+			"from": [7, -0.01, 3.5],
-			"to": [7, 0.99, 10.5],
+			"to": [9, 0.99, 5.5],
-			"rotation": {"angle": 145, "axis": "y", "origin": [7, 0, 7]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [7, 0, 7]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
@@ -306,67 +306,39 @@
 			}
 		}
 	],
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [65, 35, 0],
-			"translation": [0, 2.25, 3.5],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [65, 35, 0],
-			"translation": [0, 2.5, 3.5],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"firstperson_righthand": {
-			"rotation": [29, 0, 23],
-			"translation": [3.25, 3.75, 0]
-		},
-		"firstperson_lefthand": {
-			"rotation": [29, 0, 23],
-			"translation": [6.25, 3.75, 0]
-		},
-		"ground": {
-			"translation": [0.25, 3.75, 0],
-			"scale": [0.75, 0.75, 0.75]
-		},
-		"gui": {
-			"rotation": [90, 35, 0],
-			"translation": [0.25, -1.5, 0],
-			"scale": [1.5, 1.5, 1.5]
-		},
-		"head": {
-			"translation": [-0.25, 14.25, 0.75]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [-0.25, 1.25, -12],
-			"scale": [1.5, 1.5, 1.5]
-		}
-	},
 	"groups": [
 		{
 			"name": "side1",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [0, 1, 2, 3]
 		},
 		{
 			"name": "side2",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [4, 5, 6, 7]
 		},
 		{
 			"name": "side3",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [8, 9, 10, 11]
 		},
 		{
 			"name": "side4",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [12, 13, 14, 15]
 		},
 		{
 			"name": "side5",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [16, 17, 18, 19]
-		}, 20, 21, 22]
+		},
+		20,
+		21,
+		22
+	]
 }

src/main/resources/assets/rocks/models/block/starfish_red.json

@@ -1,10 +1,10 @@
 {
+	"format_version": "1.21.6",
 	"credit": "Made with Blockbench",
 	"textures": {
 		"0": "rocks:block/starfish_red",
 		"particle": "rocks:block/starfish_red"
 	},
-	"gui_light": "front",
 	"elements": [
 		{
 			"from": [9.5, 0, 6.5],
@@ -59,211 +59,211 @@
 			}
 		},
 		{
-			"from": [10.75, 0, 6],
+			"from": [11, 0, 5.25],
-			"to": [11.75, 1, 10],
+			"to": [15, 1, 6.25],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [11, 0, 6]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [11, 0, 6]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [9.5, 0.02, 5],
+			"from": [11, 0.02, 5.5],
-			"to": [10.5, 1.02, 8],
+			"to": [14, 1.02, 6.5],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [11, 0, 5]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [11, 0, 5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [10, 0.01, 5],
+			"from": [11, 0.01, 5],
-			"to": [11, 1.01, 8],
+			"to": [14, 1.01, 6],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [11, 0, 5]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [11, 0, 5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.4, -0.01, 5],
+			"from": [11.6, -0.01, 4.2],
-			"to": [8.4, 0.99, 7],
+			"to": [13.6, 0.99, 6.2],
-			"rotation": {"angle": 72.5, "axis": "y", "origin": [9.6, 0, 3]},
+			"rotation": {"angle": -17.5, "axis": "y", "origin": [9.6, 0, 3]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [8.5, 0, 6],
+			"from": [5, 0, 5.5],
-			"to": [9.5, 1, 10],
+			"to": [9, 1, 6.5],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [9, 0, 6]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [9, 0, 6]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [7.75, 0.02, 6.5],
+			"from": [6, 0.02, 5.25],
-			"to": [8.75, 1.02, 9.5],
+			"to": [9, 1.02, 6.25],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [9, 0, 6.5]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [9, 0, 6.5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [8.25, 0.01, 6.5],
+			"from": [6, 0.01, 5.75],
-			"to": [9.25, 1.01, 9.5],
+			"to": [9, 1.01, 6.75],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [9, 0, 6.5]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [9, 0, 6.5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [9, -0.01, 9],
+			"from": [8, -0.01, 4],
-			"to": [11, 0.99, 11],
+			"to": [10, 0.99, 6],
-			"rotation": {"angle": -72.5, "axis": "y", "origin": [12, 0, 7]},
+			"rotation": {"angle": 17.5, "axis": "y", "origin": [12, 0, 7]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"from": [8.5, 0, 3.4],
+			"from": [8.5, 0, 0.6],
-			"to": [9.5, 1, 7.4],
+			"to": [9.5, 1, 4.6],
-			"rotation": {"angle": -145, "axis": "y", "origin": [9, 0, 4]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [9, 0, 4]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.25, 0.02, 4.7],
+			"from": [8.75, 0.02, 2.3],
-			"to": [7.25, 1.02, 7.7],
+			"to": [9.75, 1.02, 5.3],
-			"rotation": {"angle": -145, "axis": "y", "origin": [8, 0, 5]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [8, 0, 5]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [8.25, 0.01, 3.4],
+			"from": [8.75, 0.01, 1.6],
-			"to": [9.25, 1.01, 6.4],
+			"to": [9.75, 1.01, 4.6],
-			"rotation": {"angle": -145, "axis": "y", "origin": [9, 0, 4]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [9, 0, 4]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [5, -0.01, 6.5],
+			"from": [9, -0.01, 3.5],
-			"to": [7, 0.99, 8.5],
+			"to": [11, 0.99, 5.5],
-			"rotation": {"angle": -145, "axis": "y", "origin": [8, 0, 6]},
+			"rotation": {"angle": 35, "axis": "y", "origin": [8, 0, 6]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [12.35, 0, 3.3],
+			"from": [10.65, 0, 0.7],
-			"to": [13.35, 1, 7.3],
+			"to": [11.65, 1, 4.7],
-			"rotation": {"angle": 145, "axis": "y", "origin": [12, 0, 4]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [12, 0, 4]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [9, 4, 10, 5], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 9, 5], "texture": "#0"},
-				"south": {"uv": [9, 4, 10, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 9, 5], "texture": "#0"},
+				"west": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 0], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 0], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 0, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 0, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [8.5, 0.02, 4],
+			"from": [10.5, 0.02, 1],
-			"to": [9.5, 1.02, 7],
+			"to": [11.5, 1.02, 4],
-			"rotation": {"angle": 145, "axis": "y", "origin": [10, 0, 4]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [10, 0, 4]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [9, 0.01, 4],
+			"from": [10, 0.01, 1],
-			"to": [10, 1.01, 7],
+			"to": [11, 1.01, 4],
-			"rotation": {"angle": 145, "axis": "y", "origin": [10, 0, 4]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [10, 0, 4]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [8, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 4, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 8, 5], "texture": "#0"},
-				"south": {"uv": [8, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [4, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 8, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 4, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 4, 1], "texture": "#0"},
+				"up": {"uv": [5, 4, 4, 1], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 1, 5, 4], "texture": "#0"}
+				"down": {"uv": [6, 1, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"from": [7, -0.01, 6.5],
+			"from": [9, -0.01, 1.5],
-			"to": [9, 0.99, 8.5],
+			"to": [11, 0.99, 3.5],
-			"rotation": {"angle": 145, "axis": "y", "origin": [9, 0, 5]},
+			"rotation": {"angle": -35, "axis": "y", "origin": [9, 0, 5]},
 			"faces": {
-				"north": {"uv": [3, 4, 5, 5], "texture": "#0"},
+				"north": {"uv": [7, 4, 9, 5], "texture": "#0"},
-				"east": {"uv": [1, 4, 3, 5], "texture": "#0"},
+				"east": {"uv": [5, 4, 7, 5], "texture": "#0"},
-				"south": {"uv": [7, 4, 9, 5], "texture": "#0"},
+				"south": {"uv": [3, 4, 5, 5], "texture": "#0"},
-				"west": {"uv": [5, 4, 7, 5], "texture": "#0"},
+				"west": {"uv": [1, 4, 3, 5], "texture": "#0"},
-				"up": {"uv": [5, 4, 3, 2], "texture": "#0"},
+				"up": {"uv": [5, 4, 3, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7, 2, 5, 4], "texture": "#0"}
+				"down": {"uv": [7, 2, 5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
@@ -306,67 +306,39 @@
 			}
 		}
 	],
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [65, 35, 0],
-			"translation": [0, 2.25, 3.5],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [65, 35, 0],
-			"translation": [1.5, 2.5, 3.5],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"firstperson_righthand": {
-			"rotation": [29, 0, 23],
-			"translation": [3.25, 3.75, 0]
-		},
-		"firstperson_lefthand": {
-			"rotation": [29, 0, 23],
-			"translation": [6.25, 3.75, 0]
-		},
-		"ground": {
-			"translation": [-1.75, 3.75, 1.5],
-			"scale": [0.75, 0.75, 0.75]
-		},
-		"gui": {
-			"rotation": [90, 35, 0],
-			"translation": [0, -5.75, 0],
-			"scale": [1.5, 1.5, 1.5]
-		},
-		"head": {
-			"translation": [-2, 14.25, 3]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [-2.75, 3.5, -12],
-			"scale": [1.5, 1.5, 1.5]
-		}
-	},
 	"groups": [
 		{
 			"name": "side1",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [0, 1, 2, 3]
 		},
 		{
 			"name": "side2",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [4, 5, 6, 7]
 		},
 		{
 			"name": "side3",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [8, 9, 10, 11]
 		},
 		{
 			"name": "side4",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [12, 13, 14, 15]
 		},
 		{
 			"name": "side5",
 			"origin": [0, 0, 0],
+			"color": 0,
 			"children": [16, 17, 18, 19]
-		}, 20, 21, 22]
+		},
+		20,
+		21,
+		22
+	]
 }

src/main/resources/assets/rocks/models/item/starfish_orange.json

@@ -0,0 +1,41 @@
+{
+	"parent": "rocks:block/starfish_orange",
+	"gui_light": "front",
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [65, 35, 0],
+			"translation": [0.75, 4.75, 3.5],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [65, 35, 0],
+			"translation": [-1.75, 2.75, 3.5],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [29, 0, 23],
+			"translation": [3.25, 8.25, 0]
+		},
+		"firstperson_lefthand": {
+			"rotation": [29, 0, 23],
+			"translation": [-3, 7.25, 0]
+		},
+		"ground": {
+			"translation": [2.5, 3.75, -1],
+			"scale": [0.75, 0.75, 0.75]
+		},
+		"gui": {
+			"rotation": [90, 35, 0],
+			"translation": [2.25, 3.5, 0],
+			"scale": [1.5, 1.5, 1.5]
+		},
+		"head": {
+			"translation": [3, 14.25, -0.75]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [4.25, -2, -12],
+			"scale": [1.5, 1.5, 1.5]
+		}
+	}
+}

src/main/resources/assets/rocks/models/item/starfish_pink.json

@@ -0,0 +1,41 @@
+{
+	"parent": "rocks:block/starfish_pink",
+	"gui_light": "front",
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [65, 35, 0],
+			"translation": [0, 2.25, 3.5],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [65, 35, 0],
+			"translation": [0, 2.5, 3.5],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [29, 0, 23],
+			"translation": [3.25, 3.75, 0]
+		},
+		"firstperson_lefthand": {
+			"rotation": [29, 0, 23],
+			"translation": [6.25, 3.75, 0]
+		},
+		"ground": {
+			"translation": [0.25, 3.75, 0],
+			"scale": [0.75, 0.75, 0.75]
+		},
+		"gui": {
+			"rotation": [90, 35, 0],
+			"translation": [0.25, -1.5, 0],
+			"scale": [1.5, 1.5, 1.5]
+		},
+		"head": {
+			"translation": [-0.25, 14.25, 0.75]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [-0.25, 1.25, -12],
+			"scale": [1.5, 1.5, 1.5]
+		}
+	}
+}

src/main/resources/assets/rocks/models/item/starfish_red.json

@@ -0,0 +1,41 @@
+{
+  "parent": "rocks:block/starfish_red",
+	"gui_light": "front",
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [65, 35, 0],
+			"translation": [0, 2.25, 3.5],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [65, 35, 0],
+			"translation": [1.5, 2.5, 3.5],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [29, 0, 23],
+			"translation": [3.25, 3.75, 0]
+		},
+		"firstperson_lefthand": {
+			"rotation": [29, 0, 23],
+			"translation": [6.25, 3.75, 0]
+		},
+		"ground": {
+			"translation": [-1.75, 3.75, 1.5],
+			"scale": [0.75, 0.75, 0.75]
+		},
+		"gui": {
+			"rotation": [90, 35, 0],
+			"translation": [0, -5.75, 0],
+			"scale": [1.5, 1.5, 1.5]
+		},
+		"head": {
+			"translation": [-2, 14.25, 3]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [-2.75, 3.5, -12],
+			"scale": [1.5, 1.5, 1.5]
+		}
+	}
+}

src/main/resources/fabric.mod.json

@@ -31,9 +31,6 @@
   },
 
   "accessWidener" : "thisrocks.accesswidener",
-  "mixins": [
-    "rocks.mixins.json"
-  ],
 
   "depends": {
     "fabricloader": ">=0.7.2",