Small what are wheels?

- Implement new water wheel asset
- Increased water flow no longer has any benefits. Both wheels have only one power level each

src/generated/resources/.cache/cache

@@ -529,7 +529,7 @@ c9bf881ea71aa274b2803142456f1bbed9539076 assets/create/blockstates/veridium.json
 c4db76b9d36cfb098df0d158cb6f8b82768ebe14 assets/create/blockstates/vertical_framed_glass_pane.json
 3a5da54d9763e9512cfaa47b25226b79738b25f3 assets/create/blockstates/warped_window.json
 19ef7a16c82f07d304fb60d121845185d189aecf assets/create/blockstates/warped_window_pane.json
-d31fce8315c8715521d66b5dcc166c84e949dd1d assets/create/blockstates/water_wheel.json
+638109f42fe1da576c8c832a79676065d54b1ee5 assets/create/blockstates/water_wheel.json
 f4d185b9eb086e5024a9818bad57d524267d6e13 assets/create/blockstates/water_wheel_structure.json
 97a8f4cf45776b1fb5249fe1a9314b5c615fb130 assets/create/blockstates/waxed_copper_shingle_slab.json
 d31a8ad9ffa09cbabfb284d44c9c44d036072083 assets/create/blockstates/waxed_copper_shingle_stairs.json
@@ -2206,7 +2206,7 @@ fb24881c4e92bbb7ffa54a71e0af6b1c66d84829 assets/create/models/item/turntable.jso
 2d4a31321cc13f62f5fd73aabdc5fd97e635bfbc assets/create/models/item/wand_of_symmetry.json
 89493fa0691453d6c604e3ed9ae077fe43648d18 assets/create/models/item/warped_window.json
 5f169d526b4697c85e6d113be4ff81a2b45b6e6a assets/create/models/item/warped_window_pane.json
-ae20383b0b0806431d0fdd8ffdd16fe2b0cc61ad assets/create/models/item/water_wheel.json
+fc03f409357f75af210d3a77df588224e00a0af0 assets/create/models/item/water_wheel.json
 d4be2b3cc812b5a692162c1be03744c151bdfe2d assets/create/models/item/waxed_copper_shingle_slab.json
 5133884393aeb3d812d437983e0ddee84ad82c71 assets/create/models/item/waxed_copper_shingle_stairs.json
 69f7261ed8967a728298ca89b1018704cf4c01d4 assets/create/models/item/waxed_copper_shingles.json

src/generated/resources/assets/create/blockstates/water_wheel.json

@@ -1,28 +1,28 @@
 {
   "variants": {
     "facing=down": {
-      "model": "create:block/water_wheel",
+      "model": "create:block/water_wheel/block",
       "x": 180
     },
     "facing=up": {
-      "model": "create:block/water_wheel"
+      "model": "create:block/water_wheel/block"
     },
     "facing=north": {
-      "model": "create:block/water_wheel",
+      "model": "create:block/water_wheel/block",
       "x": 90
     },
     "facing=south": {
-      "model": "create:block/water_wheel",
+      "model": "create:block/water_wheel/block",
       "x": 90,
       "y": 180
     },
     "facing=west": {
-      "model": "create:block/water_wheel",
+      "model": "create:block/water_wheel/block",
       "x": 90,
       "y": 270
     },
     "facing=east": {
-      "model": "create:block/water_wheel",
+      "model": "create:block/water_wheel/block",
       "x": 90,
       "y": 90
     }

src/generated/resources/assets/create/models/item/water_wheel.json

@@ -1,3 +1,3 @@
 {
-  "parent": "create:block/water_wheel"
+  "parent": "create:block/water_wheel/item"
 }

src/main/java/com/simibubi/create/AllBlocks.java

@@ -526,11 +526,14 @@ public class AllBlocks {
 		.properties(p -> p.color(MaterialColor.DIRT))
 		.properties(BlockBehaviour.Properties::noOcclusion)
 		.transform(axeOrPickaxe())
-		.blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(false))
+		.blockstate(
+			(c, p) -> BlockStateGen.directionalBlockIgnoresWaterlogged(c, p, s -> AssetLookup.partialBaseModel(c, p)))
 		.addLayer(() -> RenderType::cutoutMipped)
-		.transform(BlockStressDefaults.setCapacity(16.0))
+		.transform(BlockStressDefaults
+			.setCapacity(32.0))
 		.transform(BlockStressDefaults.setGeneratorSpeed(WaterWheelBlock::getSpeedRange))
-		.simpleItem()
+		.item()
+		.transform(customItemModel())
 		.register();
 
 	public static final BlockEntry<LargeWaterWheelBlock> LARGE_WATER_WHEEL =
@@ -542,8 +545,8 @@ public class AllBlocks {
 			.blockstate((c, p) -> axisBlock(c, p,
 				s -> s.getValue(LargeWaterWheelBlock.EXTENSION) ? AssetLookup.partialBaseModel(c, p, "extension")
 					: AssetLookup.partialBaseModel(c, p)))
-			.transform(BlockStressDefaults.setCapacity(64.0))
+			.transform(BlockStressDefaults.setCapacity(128.0))
-			.transform(BlockStressDefaults.setGeneratorSpeed(WaterWheelBlock::getSpeedRange))
+			.transform(BlockStressDefaults.setGeneratorSpeed(LargeWaterWheelBlock::getSpeedRange))
 			.item(LargeWaterWheelBlockItem::new)
 			.transform(customItemModel())
 			.register();

src/main/java/com/simibubi/create/AllPartialModels.java

@@ -159,8 +159,7 @@ public class AllPartialModels {
 		WHISTLE_MOUTH_MEDIUM = block("steam_whistle/medium_mouth"),
 		WHISTLE_MOUTH_SMALL = block("steam_whistle/small_mouth"),
 
-		WATER_WHEEL = block("water_wheel/block"),
+		WATER_WHEEL = block("water_wheel/wheel"),
-		WATER_WHEEL_EXTENSION = block("water_wheel/block_extension"),
 		LARGE_WATER_WHEEL = block("large_water_wheel/block"),
 		LARGE_WATER_WHEEL_EXTENSION = block("large_water_wheel/block_extension"),
 

src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlock.java

@@ -167,7 +167,7 @@ public class LargeWaterWheelBlock extends RotatedPillarKineticBlock implements I
 	}
 
 	public static Couple<Integer> getSpeedRange() {
-		return Couple.create(4, 8);
+		return Couple.create(4, 4);
 	}
 
 }

src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java

@@ -22,7 +22,6 @@ import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
@@ -33,11 +32,6 @@ public class WaterWheelBlock extends DirectionalKineticBlock implements IBE<Wate
 		super(properties);
 	}
 
-	@Override
-	public RenderShape getRenderShape(BlockState state) {
-		return RenderShape.ENTITYBLOCK_ANIMATED;
-	}
-
 	@Override
 	public boolean canSurvive(BlockState state, LevelReader worldIn, BlockPos pos) {
 		for (Direction direction : Iterate.directions) {
@@ -134,7 +128,7 @@ public class WaterWheelBlock extends DirectionalKineticBlock implements IBE<Wate
 	}
 
 	public static Couple<Integer> getSpeedRange() {
-		return Couple.create(8, 16);
+		return Couple.create(8, 8);
 	}
 
 }

src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlockEntity.java

@@ -203,7 +203,7 @@ public class WaterWheelBlockEntity extends GeneratingKineticBlockEntity {
 
 	@Override
 	public float getGeneratedSpeed() {
-		return Mth.clamp(flowScore / getSize(), -2, 2) * 8 / getSize();
+		return Mth.clamp(flowScore, -1, 1) * 8 / getSize();
 	}
 
 }

src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelRenderer.java

@@ -81,18 +81,14 @@ public class WaterWheelRenderer<T extends WaterWheelBlockEntity> extends Kinetic
 				return AllPartialModels.LARGE_WATER_WHEEL;
 			}
 		} else {
-			if (extension) {
+			return AllPartialModels.WATER_WHEEL;
-				return AllPartialModels.WATER_WHEEL_EXTENSION;
-			} else {
-				return AllPartialModels.WATER_WHEEL;
-			}
 		}
 	}
 
 	public static BakedModel generateModel(WaterWheelModelKey key) {
-		// TODO waterwheels
+		boolean extension = key.state()
-//		boolean extension = state.getValue(LargeWaterWheelBlock.EXTENSION);
+			.getOptionalValue(LargeWaterWheelBlock.EXTENSION)
-		boolean extension = key.state().getOptionalValue(LargeWaterWheelBlock.EXTENSION).orElse(false);
+			.orElse(false);
 		BakedModel template = getTemplateModel(key.large(), extension).get();
 
 		BlockState planksBlockState = key.material();

src/main/java/com/simibubi/create/foundation/config/CKinetics.java

@@ -43,18 +43,18 @@ public class CKinetics extends ConfigBase {
 	public final ConfigBool moveItemsToStorage = b(true, "moveItemsToStorage", Comments.moveItemsToStorage);
 	public final ConfigBool harvestPartiallyGrown = b(false, "harvestPartiallyGrown", Comments.harvestPartiallyGrown);
 	public final ConfigBool harvesterReplants = b(true, "harvesterReplants", Comments.harvesterReplants);
-
+	
-	public final CStress stressValues = nested(1, CStress::new, Comments.stress);
+	public final ConfigGroup stats = group(1, "stats", Comments.stats);
-
-	public final ConfigGroup state = group(1, "stats", Comments.stats);
 	public final ConfigFloat mediumSpeed = f(30, 0, 4096, "mediumSpeed", Comments.rpm, Comments.mediumSpeed);
 	public final ConfigFloat fastSpeed = f(100, 0, 65535, "fastSpeed", Comments.rpm, Comments.fastSpeed);
 	public final ConfigFloat mediumStressImpact =
 		f(4, 0, 4096, "mediumStressImpact", Comments.su, Comments.mediumStressImpact);
 	public final ConfigFloat highStressImpact = f(8, 0, 65535, "highStressImpact", Comments.su, Comments.highStressImpact);
-	public final ConfigFloat mediumCapacity = f(128, 0, 4096, "mediumCapacity", Comments.su, Comments.mediumCapacity);
+	public final ConfigFloat mediumCapacity = f(256, 0, 4096, "mediumCapacity", Comments.su, Comments.mediumCapacity);
 	public final ConfigFloat highCapacity = f(1024, 0, 65535, "highCapacity", Comments.su, Comments.highCapacity);
 
+	public final CStress stressValues = nested(1, CStress::new, Comments.stress);
+
 	@Override
 	public String getName() {
 		return "kinetics";

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

@@ -1,443 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"parent": "create:block/large_wheels",
-	"texture_size": [32, 32],
-	"textures": {
-		"6": "create:block/wheel_extras",
-		"axis": "create:block/axis",
-		"axis_top": "create:block/axis_top",
-		"wheel": "create:block/wheel",
-		"particle": "block/stripped_spruce_log"
-	},
-	"elements": [
-		{
-			"name": "Axis",
-			"from": [6, 0, 6],
-			"to": [10, 16, 10],
-			"faces": {
-				"north": {"uv": [6, 0, 10, 16], "texture": "#axis"},
-				"east": {"uv": [6, 0, 10, 16], "texture": "#axis"},
-				"south": {"uv": [6, 0, 10, 16], "texture": "#axis"},
-				"west": {"uv": [6, 0, 10, 16], "texture": "#axis"},
-				"up": {"uv": [6, 6, 10, 10], "rotation": 90, "texture": "#axis_top"},
-				"down": {"uv": [6, 6, 10, 10], "rotation": 90, "texture": "#axis_top"}
-			}
-		},
-		{
-			"name": "Segment1",
-			"from": [-8, -1, 2],
-			"to": [0, 17, 3],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 270, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 270, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment2",
-			"from": [2, -1, 16],
-			"to": [3, 17, 24],
-			"faces": {
-				"north": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment3",
-			"from": [-8, -1, 2],
-			"to": [0, 17, 3],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 270, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 270, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment4",
-			"from": [16, -1, 13],
-			"to": [24, 17, 14],
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment2",
-			"from": [2, -1, 16],
-			"to": [3, 17, 24],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment3",
-			"from": [13, -1, -8],
-			"to": [14, 17, 0],
-			"faces": {
-				"north": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment4",
-			"from": [16, -1, 13],
-			"to": [24, 17, 14],
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment5",
-			"from": [16, -1, 13],
-			"to": [24, 17, 14],
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment3",
-			"from": [2, -1, 16],
-			"to": [3, 17, 24],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment4",
-			"from": [-8, -1, 2],
-			"to": [0, 17, 3],
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 270, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 270, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment5",
-			"from": [13, -1, -8],
-			"to": [14, 17, 0],
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment3",
-			"from": [2, -1, 16],
-			"to": [3, 17, 24],
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment4",
-			"from": [13, -1, -8],
-			"to": [14, 17, 0],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment5",
-			"from": [16, -1, 13],
-			"to": [24, 17, 14],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment4",
-			"from": [16, -1, 13],
-			"to": [24, 17, 14],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"east": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Segment5",
-			"from": [-8, -1, 2],
-			"to": [0, 17, 3],
-			"faces": {
-				"north": {"uv": [7, 0, 16, 4], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7, 3.5, 16, 4], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7, 0, 16, 4], "rotation": 270, "texture": "#6"},
-				"west": {"uv": [7, 0, 16, 0.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 0, 7.5, 4], "rotation": 270, "texture": "#6"},
-				"down": {"uv": [7, 0, 7.5, 4], "rotation": 270, "texture": "#6"}
-			}
-		},
-		{
-			"name": "LargeRim",
-			"from": [-5, -0.7, -5],
-			"to": [21, -0.6, 21],
-			"faces": {
-				"up": {"uv": [0, 0, 13, 13], "texture": "#wheel"},
-				"down": {"uv": [0, 0, 13, 13], "texture": "#wheel"}
-			}
-		},
-		{
-			"name": "LargeRim3",
-			"from": [-5, 16.6, -5],
-			"to": [21, 16.7, 21],
-			"faces": {
-				"up": {"uv": [0, 0, 13, 13], "texture": "#wheel"},
-				"down": {"uv": [0, 0, 13, 13], "texture": "#wheel"}
-			}
-		},
-		{
-			"name": "InnerSegment",
-			"from": [15.9, -0.5, 4],
-			"to": [18, 16.5, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8.1, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 4, 8, 8.5], "texture": "#6"},
-				"down": {"uv": [7, 4, 8, 8.5], "texture": "#6"}
-			}
-		},
-		{
-			"name": "InnerSegment",
-			"from": [-2, -0.5, 4],
-			"to": [0.1, 16.5, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8.1, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 4, 8, 8.5], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [7, 4, 8, 8.5], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "InnerSegment",
-			"from": [4, -0.5, -2],
-			"to": [12, 16.5, 0.1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8.1, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 4, 8, 8.5], "rotation": 270, "texture": "#6"},
-				"down": {"uv": [7, 4, 8, 8.5], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "InnerSegment",
-			"from": [4, -0.5, 15.9],
-			"to": [12, 16.5, 18],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8.1, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 4, 8, 8.5], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 4, 8, 8.5], "rotation": 270, "texture": "#6"}
-			}
-		},
-		{
-			"name": "InnerSegment",
-			"from": [15.9, -0.5, 4],
-			"to": [18, 16.5, 12],
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 8.1, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 4, 8, 8.5], "texture": "#6"},
-				"down": {"uv": [7, 4, 8, 8.5], "texture": "#6"}
-			}
-		},
-		{
-			"name": "InnerSegment",
-			"from": [4, -0.5, 15.9],
-			"to": [12, 16.5, 18],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, 8.1, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 4, 8, 8.5], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 4, 8, 8.5], "rotation": 270, "texture": "#6"}
-			}
-		},
-		{
-			"name": "InnerSegment",
-			"from": [-2, -0.5, 4],
-			"to": [0.1, 16.5, 12],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, 8.1, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 4, 8, 8.5], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [7, 4, 8, 8.5], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "InnerSegment",
-			"from": [15.9, -0.5, 4],
-			"to": [18, 16.5, 12],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, 8.1, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [7.5, 5.5, 16, 6.5], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [7.5, 4.5, 16, 8.5], "rotation": 90, "texture": "#6"},
-				"up": {"uv": [7, 4, 8, 8.5], "texture": "#6"},
-				"down": {"uv": [7, 4, 8, 8.5], "texture": "#6"}
-			}
-		},
-		{
-			"name": "AxisCoat",
-			"from": [5, 1, 5],
-			"to": [11, 15, 11],
-			"shade": false,
-			"faces": {
-				"north": {"uv": [13, 0, 16, 7], "texture": "#wheel"},
-				"east": {"uv": [13, 0, 16, 7], "texture": "#wheel"},
-				"south": {"uv": [13, 0, 16, 7], "texture": "#wheel"},
-				"west": {"uv": [13, 0, 16, 7], "texture": "#wheel"},
-				"up": {"uv": [13, 7, 16, 10], "rotation": 90, "texture": "#wheel"},
-				"down": {"uv": [13, 7, 16, 10], "rotation": 90, "texture": "#wheel"}
-			}
-		},
-		{
-			"name": "Connector",
-			"from": [6.5, 2, -1],
-			"to": [9.5, 14, 17],
-			"shade": false,
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"east": {"uv": [7, 8.5, 16, 14.5], "texture": "#6"},
-				"west": {"uv": [7, 8.5, 16, 14.5], "texture": "#6"},
-				"up": {"uv": [7, 14.5, 16, 16], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 14.5, 16, 16], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Connector",
-			"from": [6.5, 2.1, -1],
-			"to": [9.5, 13.9, 17],
-			"shade": false,
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"east": {"uv": [7, 8.5, 16, 14.5], "texture": "#6"},
-				"west": {"uv": [7, 8.5, 16, 14.5], "texture": "#6"},
-				"up": {"uv": [7, 14.5, 16, 16], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [7, 14.5, 16, 16], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "Connector",
-			"from": [-1, 2.1, 6.5],
-			"to": [17, 13.9, 9.5],
-			"shade": false,
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 8.5, 16, 14.5], "texture": "#6"},
-				"south": {"uv": [7, 8.5, 16, 14.5], "texture": "#6"},
-				"up": {"uv": [7, 14.5, 16, 16], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [7, 14.5, 16, 16], "texture": "#6"}
-			}
-		},
-		{
-			"name": "Connector",
-			"from": [-1, 2, 6.5],
-			"to": [17, 14, 9.5],
-			"shade": false,
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [7, 8.5, 16, 14.5], "texture": "#6"},
-				"south": {"uv": [7, 8.5, 16, 14.5], "texture": "#6"},
-				"up": {"uv": [7, 14.5, 16, 16], "texture": "#6"},
-				"down": {"uv": [7, 14.5, 16, 16], "texture": "#6"}
-			}
-		}
-	]
-}

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

@@ -0,0 +1,69 @@
+{
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "create:block/gearbox",
+		"1": "create:block/funnel/andesite_funnel_frame",
+		"particle": "create:block/gearbox"
+	},
+	"elements": [
+		{
+			"from": [2, 1, 2],
+			"to": [14, 0, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
+			"faces": {
+				"north": {"uv": [2, 0, 14, 1], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [0, 2, 1, 14], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [2, 15, 14, 16], "texture": "#0"},
+				"west": {"uv": [15, 2, 16, 14], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"from": [2, 16, 2],
+			"to": [14, 15, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
+			"faces": {
+				"north": {"uv": [2, 0, 14, 1], "texture": "#0"},
+				"east": {"uv": [15, 2, 16, 14], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [2, 15, 14, 16], "rotation": 180, "texture": "#0"},
+				"west": {"uv": [0, 2, 1, 14], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [2, 2, 14, 14], "texture": "#0"}
+			}
+		},
+		{
+			"from": [2, 2, 2],
+			"to": [14, 14, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
+			"faces": {
+				"north": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [6, 6, 10, 10], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [6, 6, 10, 10], "texture": "#0"},
+				"west": {"uv": [6, 6, 10, 10], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"from": [0, 14, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 2], "texture": "#1"},
+				"east": {"uv": [0, 0, 16, 2], "texture": "#1"},
+				"south": {"uv": [0, 0, 16, 2], "texture": "#1"},
+				"west": {"uv": [0, 0, 16, 2], "texture": "#1"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		},
+		{
+			"from": [0, 0, 0],
+			"to": [16, 2, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"},
+				"east": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"},
+				"south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"},
+				"west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#1"}
+			}
+		}
+	]
+}

src/main/resources/assets/create/models/block/water_wheel/item.json

@@ -0,0 +1,10 @@
+{
+	"parent": "create:block/water_wheel/textures",
+	"loader": "forge:obj",
+	"flip-v": true,
+	"model": "create:models/block/water_wheel/water_wheel_item.obj",
+	"textures": {
+		"log": "block/spruce_log",
+		"planks": "block/spruce_planks"
+	}
+}

src/main/resources/assets/create/models/block/water_wheel/textures.json

@@ -0,0 +1,13 @@
+{
+	"parent": "create:block/large_wheels",
+	"ambientocclusion": false,
+	"textures": {
+		"axis": "create:block/axis",
+		"gearbox": "create:block/gearbox",
+		"axis_top": "create:block/axis_top",
+		"metal": "create:block/waterwheel_metal",
+		"log": "block/oak_log",
+		"planks": "block/oak_planks",
+		"particle": "#planks"
+	}
+}

src/main/resources/assets/create/models/block/water_wheel/water_wheel.mtl

@@ -0,0 +1,17 @@
+# Blender 3.4.1 MTL File: 'waterwheel.blend'
+# www.blender.org
+
+newmtl axis
+map_Kd #axis
+
+newmtl axis_top
+map_Kd #axis_top
+
+newmtl waterwheel_log
+map_Kd #log
+
+newmtl waterwheel_metal
+map_Kd #metal
+
+newmtl waterwheel_plank
+map_Kd #planks

src/main/resources/assets/create/models/block/water_wheel/water_wheel_item.mtl

@@ -0,0 +1,20 @@
+# Blender 3.4.1 MTL File: 'waterwheel.blend'
+# www.blender.org
+
+newmtl Casing
+map_Kd #gearbox
+
+newmtl axis
+map_Kd #axis
+
+newmtl axis_top
+map_Kd #axis_top
+
+newmtl waterwheel_log
+map_Kd #log
+
+newmtl waterwheel_metal
+map_Kd #metal
+
+newmtl waterwheel_plank
+map_Kd #planks

src/main/resources/assets/create/models/block/water_wheel/wheel.json

@@ -0,0 +1,6 @@
+{
+	"parent": "create:block/water_wheel/textures",
+	"loader": "forge:obj",
+	"flip-v": true,
+	"model": "create:models/block/water_wheel/water_wheel.obj"
+}