Merge remote-tracking branch 'origin/mc1.21.1/dev' into mc1.21.1/dev

Author: IThundxr

gradle.properties

@@ -34,7 +34,7 @@ ponder_version = 1.0.66
 
 # Flywheel & Vanillin
 # https://maven.createmod.net/dev/engine-room/flywheel/
-flywheel_version = 1.0.5
+flywheel_version = 1.0.6-beta-37
 flywheel_version_range = [1.0.0,2.0)
 # https://maven.createmod.net/dev/engine-room/vanillin/
 vanillin_version = 1.0.0-beta-11

src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java

@@ -96,8 +96,8 @@ public BlockState getBlockState(BlockPos pos) {
 		};
 
 		var model = new BlockModelBuilder(modelWorld, blocks.positions())
-			.materialFunc((renderType, shaded) -> {
-				Material material = ModelUtil.getMaterial(renderType, shaded);
+			.materialFunc((renderType, shaded, ao) -> {
+				Material material = ModelUtil.getMaterial(renderType, shaded, ao);
 				if (material != null && material.cardinalLightingMode() == CardinalLightingMode.ENTITY) {
 					return SimpleMaterial.builderOf(material)
 						.cardinalLightingMode(CardinalLightingMode.CHUNK)

src/main/java/com/simibubi/create/foundation/render/SpecialModels.java

@@ -12,8 +12,8 @@
 
 public class SpecialModels {
 	private static final RendererReloadCache<Key, Model> FLAT = new RendererReloadCache<>(it -> new BakedModelBuilder(it.partial.get())
-		.materialFunc((renderType, shaded) -> {
-			var material = ModelUtil.getMaterial(renderType, shaded);
+		.materialFunc((renderType, shaded, ao) -> {
+			var material = ModelUtil.getMaterial(renderType, shaded, ao);
 			if (material == null) {
 				return null;
 			}

src/main/resources/assets/create/models/block/ladder.json

@@ -10,6 +10,7 @@
 			"name": "hoop_right",
 			"from": [2, 16, 14],
 			"to": [4, 18, 18],
+			"shade": false,
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
 			"faces": {
 				"north": {"uv": [14, 4, 16, 6], "texture": "#0", "cullface": "up"},
@@ -21,6 +22,7 @@
 			"name": "hoop_right_backface",
 			"from": [2, 18, 14],
 			"to": [4, 16, 18],
+			"shade": false,
 			"rotation": {"angle": 0, "axis": "y", "origin": [13, 19, 16]},
 			"faces": {
 				"north": {"uv": [16, 4, 14, 6], "rotation": 180, "texture": "#0", "cullface": "up"},
@@ -43,6 +45,7 @@
 			"name": "ladder",
 			"from": [2, 0, 14],
 			"to": [14, 16, 16],
+			"shade": false,
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
 			"faces": {
 				"north": {"uv": [2, 0, 14, 16], "texture": "#1"}
@@ -63,6 +66,7 @@
 			"name": "ladder_backface",
 			"from": [2, 0, 16],
 			"to": [14, 16, 14],
+			"shade": false,
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
 			"faces": {
 				"south": {"uv": [14, 0, 2, 16], "texture": "#1"}
@@ -72,6 +76,7 @@
 			"name": "hoop_left",
 			"from": [12, 16, 14],
 			"to": [14, 18, 18],
+			"shade": false,
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
 			"faces": {
 				"north": {"uv": [14, 4, 16, 6], "texture": "#0", "cullface": "up"},
@@ -83,6 +88,7 @@
 			"name": "hoop_left_backface",
 			"from": [12, 18, 14],
 			"to": [14, 16, 18],
+			"shade": false,
 			"rotation": {"angle": 0, "axis": "y", "origin": [13, 19, 16]},
 			"faces": {
 				"north": {"uv": [16, 4, 14, 6], "rotation": 180, "texture": "#0", "cullface": "up"},
@@ -107,4 +113,4 @@
 			"children": [4, 5, 6, 7]
 		}
 	]
-}
+}