Frame perfect

- Re-enable AO on fluid pipes to restore smooth lighting on them - Boost sounds in stock keeper screen - Tweak item frame transforms of creates components
2025-03-04 06:44:40 +01:00 · 2025-02-28 10:57:08 +01:00 · 2025-02-28 10:57:08 +01:00 · a8a160c666
commit a8a160c666
parent b67842105d
33 changed files with 121 additions and 38 deletions
--- a/src/main/java/com/simibubi/create/AllBlocks.java
+++ b/src/main/java/com/simibubi/create/AllBlocks.java
@ -876,7 +876,7 @@ public class AllBlocks {
 		.properties(p -> p.forceSolidOff())
 		.transform(pickaxeOnly())
 		.blockstate(BlockStateGen.pipe())
-		.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
+		.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
 		.item()
 		.transform(customItemModel())
 		.register();
@ -915,7 +915,7 @@ public class AllBlocks {
 							.build();
 					}, BlockStateProperties.WATERLOGGED);
 			})
-			.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
+			.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
 			.loot((p, b) -> p.dropOther(b, FLUID_PIPE.get()))
 			.register();

@ -924,7 +924,7 @@ public class AllBlocks {
 		.properties(p -> p.mapColor(MapColor.STONE))
 		.transform(pickaxeOnly())
 		.blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(true))
-		.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
+		.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
 		.transform(CStress.setImpact(4.0))
 		.item()
 		.transform(customItemModel())
@ -936,7 +936,7 @@ public class AllBlocks {
 			.properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW))
 			.transform(pickaxeOnly())
 			.blockstate(new SmartFluidPipeGenerator()::generate)
-			.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
+			.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
 			.item()
 			.transform(customItemModel())
 			.register();
@ -948,7 +948,7 @@ public class AllBlocks {
 		.blockstate((c, p) -> BlockStateGen.directionalAxisBlock(c, p,
 			(state, vertical) -> AssetLookup.partialBaseModel(c, p, vertical ? "vertical" : "horizontal",
 				state.getValue(FluidValveBlock.ENABLED) ? "open" : "closed")))
-		.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO))
+		.onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO))
 		.item()
 		.transform(customItemModel())
 		.register();
--- a/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java
+++ b/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java
@ -1080,12 +1080,12 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
 				
 				if (!entry.hidden) {
 					hiddenCategories.add(indexOf);
-					playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 0.75f, 1.5f);
+					playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 1f, 1.5f);
 				}
 				
 				else {
 					hiddenCategories.remove(indexOf);
-					playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 0.75f, 0.675f);
+					playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 1f, 0.675f);
 				}
 				
 				refreshSearchNextTick = true;
@ -1122,8 +1122,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
 			if (itemsToOrder.size() >= cols || rmb)
 				return true;
 			itemsToOrder.add(existingOrder = new BigItemStack(itemStack.copyWithCount(1), 0));
-			playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.2f);
-			playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 0.8f);
+			playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.2f);
+			playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 0.8f);
 		}

 		int current = existingOrder.count;
@ -1132,8 +1132,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
 			existingOrder.count = current - transfer;
 			if (existingOrder.count <= 0) {
 				itemsToOrder.remove(existingOrder);
-				playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.8f);
-				playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 1.8f);
+				playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.8f);
+				playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 1.8f);
 			}
 			return true;
 		}
@ -1189,8 +1189,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
 			if (itemsToOrder.size() >= cols || remove)
 				return true;
 			itemsToOrder.add(existingOrder = new BigItemStack(entry.stack.copyWithCount(1), 0));
-			playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.2f);
-			playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 0.8f);
+			playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.2f);
+			playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 0.8f);
 		}

 		int current = existingOrder.count;
@ -1199,8 +1199,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
 			existingOrder.count = current - transfer;
 			if (existingOrder.count <= 0) {
 				itemsToOrder.remove(existingOrder);
-				playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.8f);
-				playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 1.8f);
+				playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.8f);
+				playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 1.8f);
 			} else if (existingOrder.count != current)
 				playUiSound(AllSoundEvents.SCROLL_VALUE.getMainEvent(), 0.25f, 1.2f);
 			return true;
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java
@ -146,8 +146,7 @@ public class ValueBox extends ChasingAABBOutline {
 			ItemRenderer itemRenderer = Minecraft.getInstance()
 				.getItemRenderer();
 			BakedModel modelWithOverrides = itemRenderer.getModel(stack, null, null, 0);
-			boolean blockItem = modelWithOverrides.isGui3d() && modelWithOverrides.getRenderPasses(stack, false)
-				.size() <= 1;
+			boolean blockItem = modelWithOverrides.isGui3d();

 			float scale = 1.5f;
 			ms.translate(-font.width(count), 0, 0);
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java
@ -28,8 +28,7 @@ public class ValueBoxRenderer {
 		Minecraft mc = Minecraft.getInstance();
 		ItemRenderer itemRenderer = mc.getItemRenderer();
 		BakedModel modelWithOverrides = itemRenderer.getModel(filter, null, null, 0);
-		boolean blockItem =
-			modelWithOverrides.isGui3d() && modelWithOverrides.getRenderPasses(filter, false).size() <= 1;
+		boolean blockItem = modelWithOverrides.isGui3d();
 		float scale = (!blockItem ? .5f : 1f) + 1 / 64f;
 		float zOffset = (!blockItem ? -.15f : 0) + customZOffset(filter.getItem());
 		ms.scale(scale, scale, scale);
--- a/src/main/resources/assets/create/models/block/chain_conveyor/item.json
+++ b/src/main/resources/assets/create/models/block/chain_conveyor/item.json
@ -10,9 +10,9 @@
            "scale":[ 0.4, 0.4, 0.4 ]
        },
 		"fixed": {
-            "rotation": [ 90, 0, 0 ],
+            "rotation": [ 270, 180, 0 ],
            "translation": [ 0, 0, 0],
-            "scale":[ 0.5, 0.5, 0.5 ]
+            "scale":[ 0.375, 0.375, 0.375 ]
        }
    }
 }
--- a/src/main/resources/assets/create/models/block/clutch/item.json
+++ b/src/main/resources/assets/create/models/block/clutch/item.json
@ -61,6 +61,12 @@
 			}
 		}
 	],
+	"display": {
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	},
 	"groups": [
 		0,
 		1,
--- a/src/main/resources/assets/create/models/block/diodes/latch_off.json
+++ b/src/main/resources/assets/create/models/block/diodes/latch_off.json
@ -99,7 +99,7 @@
 		},
        "fixed": {
            "rotation": [ 270, 0, 0 ],
-            "translation": [ 0, 0, -3],
+            "translation": [ 0, 0, -5],
            "scale":[ 0.5, 0.5, 0.5 ]
        }
    }
--- a/src/main/resources/assets/create/models/block/diodes/latch_on.json
+++ b/src/main/resources/assets/create/models/block/diodes/latch_on.json
@ -101,7 +101,7 @@
 		},
        "fixed": {
            "rotation": [ 270, 0, 0 ],
-            "translation": [ 0, 0, -3],
+            "translation": [ 0, 0, -5],
            "scale":[ 0.5, 0.5, 0.5 ]
        }
    }
--- a/src/main/resources/assets/create/models/block/diodes/pulse_extender.json
+++ b/src/main/resources/assets/create/models/block/diodes/pulse_extender.json
@ -94,7 +94,7 @@
 		},
 		"fixed": {
 			"rotation": [270, 0, 0],
-			"translation": [0, 0, -3],
+			"translation": [0, 0, -5],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
--- a/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json
+++ b/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json
@ -68,7 +68,7 @@
 		},
 		"fixed": {
 			"rotation": [270, 0, 0],
-			"translation": [0, 0, -3],
+			"translation": [0, 0, -5],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
--- a/src/main/resources/assets/create/models/block/diodes/pulse_timer.json
+++ b/src/main/resources/assets/create/models/block/diodes/pulse_timer.json
@ -68,7 +68,7 @@
 		},
 		"fixed": {
 			"rotation": [270, 0, 0],
-			"translation": [0, 0, -3],
+			"translation": [0, 0, -5],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
--- a/src/main/resources/assets/create/models/block/display_link/block.json
+++ b/src/main/resources/assets/create/models/block/display_link/block.json
@ -136,6 +136,8 @@
 			"scale": [0.625, 0.625, 0.625]
 		},
 		"fixed": {
+			"rotation": [270, 0, 0],
+			"translation": [0, 0, -4],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
--- a/src/main/resources/assets/create/models/block/elevator_pulley/item.json
+++ b/src/main/resources/assets/create/models/block/elevator_pulley/item.json
@ -214,6 +214,12 @@
 			}
 		}
 	],
+	"display": {
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	},
 	"groups": [
 		{
 			"name": "Frame",
--- a/src/main/resources/assets/create/models/block/encased_chain_drive/item.json
+++ b/src/main/resources/assets/create/models/block/encased_chain_drive/item.json
@ -80,6 +80,12 @@
 			}
 		}
 	],
+	"display": {
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	},
 	"groups": [
 		0,
 		1,
--- a/src/main/resources/assets/create/models/block/factory_gauge/item.json
+++ b/src/main/resources/assets/create/models/block/factory_gauge/item.json
@ -112,7 +112,9 @@
 			"translation": [0, 14.25, 0]
 		},
 		"fixed": {
-			"scale": [0.5, 0.5, 0.5]
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -6.5],
+			"scale": [0.75, 0.75, 0.75]
 		}
 	},
 	"groups": [
--- a/src/main/resources/assets/create/models/block/fluid_valve/item.json
+++ b/src/main/resources/assets/create/models/block/fluid_valve/item.json
@ -128,6 +128,7 @@
 			"scale": [0.625, 0.625, 0.625]
 		},
 		"fixed": {
+			"rotation": [90, 0, 0],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	},
--- a/src/main/resources/assets/create/models/block/flywheel/item.json
+++ b/src/main/resources/assets/create/models/block/flywheel/item.json
@ -11,8 +11,8 @@
        },
 		"fixed": {
            "rotation": [ 90, 0, 0 ],
-            "translation": [ 0, 0, 0],
-            "scale":[ 0.4, 0.4, 0.4 ]
+            "translation": [ 0, 0, -1],
+            "scale":[ 0.375, 0.375, 0.375 ]
        }
    }
 }
--- a/src/main/resources/assets/create/models/block/gearshift/item.json
+++ b/src/main/resources/assets/create/models/block/gearshift/item.json
@ -80,6 +80,12 @@
 			}
 		}
 	],
+	"display": {
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	},
 	"groups": [
 		0,
 		1,
--- a/src/main/resources/assets/create/models/block/haunted_bell.json
+++ b/src/main/resources/assets/create/models/block/haunted_bell.json
@ -92,5 +92,12 @@
 			"color": 0,
 			"children": [0, 1, 2, 3, 4, 5, 6]
 		}
-	]
+	],
+	"display": {
+		"fixed": {
+			"rotation": [0, 0, 0],
+			"translation": [0, 0, -1],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
 }
--- a/src/main/resources/assets/create/models/block/mechanical_arm/item.json
+++ b/src/main/resources/assets/create/models/block/mechanical_arm/item.json
@ -264,7 +264,7 @@
 		},
 		"fixed": {
 			"rotation": [0, 90, 0],
-			"translation": [0, 2.25, -0.75],
+			"translation": [0, 4.25, -0.75],
 			"scale": [0.45, 0.45, 0.45]
 		}
 	},
--- a/src/main/resources/assets/create/models/block/nixie_tube/block.json
+++ b/src/main/resources/assets/create/models/block/nixie_tube/block.json
@ -77,5 +77,11 @@
 				}
 			]
 		}
+	},
+	"display": {
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
 	}
 }
--- a/src/main/resources/assets/create/models/block/peculiar_bell.json
+++ b/src/main/resources/assets/create/models/block/peculiar_bell.json
@ -90,5 +90,12 @@
 			"color": 0,
 			"children": [0, 1, 2, 3, 4, 5, 6]
 		}
-	]
+	],
+	"display": {
+		"fixed": {
+			"rotation": [0, 0, 0],
+			"translation": [0, 0, -1],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
 }
--- a/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json
+++ b/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json
@ -102,7 +102,7 @@
 			"translation": [0, 22.25, 0]
 		},
 		"fixed": {
-			"translation": [0, -1.25, 0],
+			"translation": [0, 0, 0],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	},
--- a/src/main/resources/assets/create/models/block/portable_storage_interface/item.json
+++ b/src/main/resources/assets/create/models/block/portable_storage_interface/item.json
@ -210,7 +210,7 @@
 			"translation": [0, 22.25, 0]
 		},
 		"fixed": {
-			"translation": [0, -1.25, 0],
+			"translation": [0, 0, 0],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	},
--- a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json
+++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json
@ -99,6 +99,8 @@
 			"scale": [0.625, 0.625, 0.625]
 		},
 		"fixed": {
+			"rotation": [270, 90, 0],
+			"translation": [0, 0, -4],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
--- a/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json
+++ b/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json
@ -80,6 +80,12 @@
 			}
 		}
 	],
+	"display": {
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"scale": [0.5, 0.5, 0.5]
+		}
+	},
 	"groups": [
 		{
 			"name": "encased_shaft",
--- a/src/main/resources/assets/create/models/block/smart_fluid_pipe/item.json
+++ b/src/main/resources/assets/create/models/block/smart_fluid_pipe/item.json
@ -112,6 +112,7 @@
 			"scale": [0.625, 0.625, 0.625]
 		},
 		"fixed": {
+			"rotation": [0, 90, 0],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
--- a/src/main/resources/assets/create/models/block/stock_link/block_vertical.json
+++ b/src/main/resources/assets/create/models/block/stock_link/block_vertical.json
@ -148,6 +148,8 @@
 			"scale": [0.625, 0.625, 0.625]
 		},
 		"fixed": {
+			"rotation": [270, 0, 0],
+			"translation": [0, 0, -4],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
--- a/src/main/resources/assets/create/models/block/table_cloth/item.json
+++ b/src/main/resources/assets/create/models/block/table_cloth/item.json
@ -202,7 +202,8 @@
 			"scale": [0.625, 0.625, 0.625]
 		},
 		"fixed": {
-			"translation": [0, 5.75, 0],
+			"rotation": [270, 0, 0],
+			"translation": [0, 0, -6],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	},
--- a/src/main/resources/assets/create/models/block/threshold_switch/block_wall.json
+++ b/src/main/resources/assets/create/models/block/threshold_switch/block_wall.json
@ -37,6 +37,10 @@
 		"gui": {
 			"rotation": [30, -135, 0],
 			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"rotation": [0, 90, 0],
+			"scale": [0.5, 0.5, 0.5]
 		}
 	}
 }
--- a/src/main/resources/assets/create/models/block/valve_handle.json
+++ b/src/main/resources/assets/create/models/block/valve_handle.json
@ -6,5 +6,24 @@
 	"textures": {
 		"3": "create:block/valve_handle/valve_handle_copper",
 		"particle": "#3"
+	},
+	"display": {
+		"fixed": {
+			"rotation": [
+				270,
+				0,
+				0
+			],
+			"translation": [
+				0,
+				0,
+				-2
+			],
+			"scale": [
+				0.5,
+				0.5,
+				0.5
+			]
+		}
 	}
 }
--- a/src/main/resources/assets/create/models/item/wand_of_symmetry/item.json
+++ b/src/main/resources/assets/create/models/item/wand_of_symmetry/item.json
@ -122,7 +122,8 @@
 		},
 		"fixed": {
 			"rotation": [0, 90, 0],
-			"translation": [0, -5, 0]
+			"translation": [0, -2.5, -0.75],
+			"scale": [0.5, 0.5, 0.5]
 		}
 	}
 }
--- a/src/main/resources/assets/create/models/item/wrench/item.json
+++ b/src/main/resources/assets/create/models/item/wrench/item.json
@ -134,8 +134,8 @@
 			"scale": [1.09453, 1.09453, 1.09453]
 		},
 		"fixed": {
-			"rotation": [0, 160.5, 0],
-			"translation": [0.5, 0.5, 0]
+			"rotation": [0, 180, 0],
+			"translation": [0.5, 0.5, -0.75]
 		}
 	},
 	"groups": [