Merge branch 'mc1.16/dev' into mc1.16/chromatic-projector

# Conflicts:
#	src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
#	src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoader.java
#	src/main/java/com/simibubi/create/foundation/render/backend/core/BasicProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/GlBuffer.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/GlVertexArray.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/FogSensitiveProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramSpec.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlCompat.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/DrawInstanced.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/InstancedArrays.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/VertexArrayObject.java
#	src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedModel.java
#	src/main/java/com/simibubi/create/foundation/render/backend/instancing/RenderMaterial.java

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

@@ -1,38 +1,20 @@
 package com.simibubi.create;
 
-import static net.minecraft.state.properties.BlockStateProperties.FACING;
-import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING;
-
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.function.Supplier;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes;
+import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
-import com.simibubi.create.foundation.render.SuperByteBuffer;
-import com.simibubi.create.foundation.render.backend.instancing.InstancedModel;
-import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial;
-import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
-import com.simibubi.create.foundation.utility.MatrixStacker;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.ModelBakeEvent;
-import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.model.ModelLoader;
 
 public class AllBlockPartials {
 
-	private static final List<AllBlockPartials> all = new ArrayList<>();
+	public static final PartialModel SCHEMATICANNON_CONNECTOR = get("schematicannon/connector"),
-
-	public static final AllBlockPartials SCHEMATICANNON_CONNECTOR = get("schematicannon/connector"),
 		SCHEMATICANNON_PIPE = get("schematicannon/pipe"),
 
 		SHAFTLESS_COGWHEEL = get("cogwheel_shaftless"), SHAFT_HALF = get("shaft_half"),
@@ -123,124 +105,40 @@ public class AllBlockPartials {
 
 	;
 
-	public static final Map<AttachmentTypes, Map<Direction, AllBlockPartials>> PIPE_ATTACHMENTS = map();
+	public static final Map<FluidTransportBehaviour.AttachmentTypes, Map<Direction, PartialModel>> PIPE_ATTACHMENTS = new HashMap<>();
-	public static final Map<HeatLevel, AllBlockPartials> BLAZES = map();
+	public static final Map<BlazeBurnerBlock.HeatLevel, PartialModel> BLAZES = new HashMap<>();
 
 	static {
 		populateMaps();
 	}
 
-	;
+	static void populateMaps() {
-
+		for (FluidTransportBehaviour.AttachmentTypes type : FluidTransportBehaviour.AttachmentTypes.values()) {
-	private ResourceLocation modelLocation;
-	private IBakedModel bakedModel;
-
-	private AllBlockPartials() {}
-
-	private static void populateMaps() {
-		for (AttachmentTypes type : AttachmentTypes.values()) {
 			if (!type.hasModel())
 				continue;
-			Map<Direction, AllBlockPartials> map = map();
+			Map<Direction, PartialModel> map = new HashMap<>();
 			for (Direction d : Iterate.directions) {
 				String asId = Lang.asId(type.name());
 				map.put(d, get("fluid_pipe/" + asId + "/" + Lang.asId(d.getString())));
 			}
 			PIPE_ATTACHMENTS.put(type, map);
 		}
-		for (HeatLevel heat : HeatLevel.values()) {
+		for (BlazeBurnerBlock.HeatLevel heat : BlazeBurnerBlock.HeatLevel.values()) {
-			if (heat == HeatLevel.NONE)
+			if (heat == BlazeBurnerBlock.HeatLevel.NONE)
 				continue;
 			BLAZES.put(heat, get("blaze_burner/blaze/" + heat.getString()));
 		}
 	}
 
-	private static <T, U> Map<T, U> map() {
+	private static PartialModel getEntity(String path) {
-		return new HashMap<>();
+		return new PartialModel(new ResourceLocation(Create.ID, "entity/" + path));
 	}
 
-	private static AllBlockPartials getEntity(String path) {
+	private static PartialModel get(String path) {
-		AllBlockPartials partials = new AllBlockPartials();
+		return new PartialModel(new ResourceLocation(Create.ID, "block/" + path));
-		partials.modelLocation = new ResourceLocation(Create.ID, "entity/" + path);
-		all.add(partials);
-		return partials;
 	}
 
-	private static AllBlockPartials get(String path) {
+	public static void clientInit() {
-		AllBlockPartials partials = new AllBlockPartials();
+		// init static fields
-		partials.modelLocation = new ResourceLocation(Create.ID, "block/" + path);
-		all.add(partials);
-		return partials;
 	}
-
-	public static void onModelRegistry(ModelRegistryEvent event) {
-		for (AllBlockPartials partial : all)
-			ModelLoader.addSpecialModel(partial.modelLocation);
-	}
-
-	public static void onModelBake(ModelBakeEvent event) {
-		Map<ResourceLocation, IBakedModel> modelRegistry = event.getModelRegistry();
-		for (AllBlockPartials partial : all)
-			partial.bakedModel = modelRegistry.get(partial.modelLocation);
-	}
-
-	public IBakedModel get() {
-		return bakedModel;
-	}
-
-	public SuperByteBuffer renderOn(BlockState referenceState) {
-		return CreateClient.bufferCache.renderPartial(this, referenceState);
-	}
-
-	public SuperByteBuffer renderOnDirectionalSouth(BlockState referenceState) {
-		Direction facing = referenceState.get(FACING);
-		return renderOnDirectionalSouth(referenceState, facing);
-	}
-
-	public SuperByteBuffer renderOnDirectional(BlockState referenceState) {
-		Direction facing = referenceState.get(FACING);
-		return renderOnDirectional(referenceState, facing);
-	}
-
-	public SuperByteBuffer renderOnHorizontal(BlockState referenceState) {
-		Direction facing = referenceState.get(HORIZONTAL_FACING);
-		return renderOnDirectionalSouth(referenceState, facing);
-	}
-
-	public SuperByteBuffer renderOnDirectionalSouth(BlockState referenceState, Direction facing) {
-		MatrixStack ms = new MatrixStack();
-		// TODO 1.15 find a way to cache this model matrix computation
-		MatrixStacker.of(ms)
-			.centre()
-			.rotateY(AngleHelper.horizontalAngle(facing))
-			.rotateX(AngleHelper.verticalAngle(facing))
-			.unCentre();
-		return CreateClient.bufferCache.renderDirectionalPartial(this, referenceState, facing, ms);
-	}
-
-	public SuperByteBuffer renderOnDirectional(BlockState referenceState, Direction facing) {
-		MatrixStack ms = new MatrixStack();
-		// TODO 1.15 find a way to cache this model matrix computation
-		MatrixStacker.of(ms)
-			.centre()
-			.rotateY(AngleHelper.horizontalAngle(facing))
-			.rotateX(facing == Direction.UP ? 0 : facing == Direction.DOWN ? 180 : 90)
-			.unCentre();
-		return CreateClient.bufferCache.renderDirectionalPartial(this, referenceState, facing, ms);
-	}
-
-	public <M extends InstancedModel<?>> M getModel(RenderMaterial<?, M> mat, BlockState referenceState,
-		Direction facing) {
-		Supplier<MatrixStack> ms = () -> {
-			MatrixStack stack = new MatrixStack();
-			MatrixStacker.of(stack)
-				.centre()
-				.rotateY(AngleHelper.horizontalAngle(facing))
-				.rotateX(AngleHelper.verticalAngle(facing))
-				.unCentre();
-			return stack;
-		};
-		return mat.getModel(this, referenceState, facing, ms);
-	}
-
 }

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

@@ -27,6 +27,7 @@ import com.simibubi.create.foundation.render.KineticRenderer;
 import com.simibubi.create.foundation.render.SuperByteBufferCache;
 import com.simibubi.create.foundation.render.backend.Backend;
 import com.simibubi.create.foundation.render.backend.OptifineHandler;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
 import com.simibubi.create.foundation.utility.WorldAttached;
 import com.simibubi.create.foundation.utility.ghost.GhostBlocks;
@@ -115,6 +116,8 @@ public class CreateClient {
 			.getResourceManager();
 		if (resourceManager instanceof IReloadableResourceManager)
 			((IReloadableResourceManager) resourceManager).addReloadListener(new ResourceReloadHandler());
+
+		AllBlockPartials.clientInit();
 	}
 
 	public static void onTextureStitch(TextureStitchEvent.Pre event) {
@@ -128,7 +131,7 @@ public class CreateClient {
 
 	public static void onModelBake(ModelBakeEvent event) {
 		Map<ResourceLocation, IBakedModel> modelRegistry = event.getModelRegistry();
-		AllBlockPartials.onModelBake(event);
+		PartialModel.onModelBake(event);
 
 		getCustomBlockModels()
 			.foreach((block, modelFunc) -> swapModels(modelRegistry, getAllBlockStateModelLocations(block), modelFunc));
@@ -141,7 +144,7 @@ public class CreateClient {
 	}
 
 	public static void onModelRegistry(ModelRegistryEvent event) {
-		AllBlockPartials.onModelRegistry(event);
+		PartialModel.onModelRegistry(event);
 
 		getCustomRenderedItems().foreach((item, modelFunc) -> modelFunc.apply(null)
 			.getModelLocations()

src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java

@@ -5,6 +5,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.gui.GuiGameElement;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 
 import mezz.jei.api.gui.drawable.IDrawable;
 import net.minecraft.util.math.vector.Vector3f;
@@ -30,7 +31,7 @@ public class AnimatedBlazeBurner implements IDrawable {
 			.scale(scale)
 			.render(matrixStack);
 
-		AllBlockPartials blaze = AllBlockPartials.BLAZES.get(heatLevel);
+		PartialModel blaze = AllBlockPartials.BLAZES.get(heatLevel);
 		GuiGameElement.of(blaze)
 			.atLocal(1, 1.65, 1)
 			.rotate(0, 180, 0)

src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java

@@ -2,6 +2,7 @@ package com.simibubi.create.compat.jei.category.animations;
 
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import mezz.jei.api.gui.drawable.IDrawable;
@@ -19,7 +20,7 @@ public abstract class AnimatedKinetics implements IDrawable {
 		return AllBlocks.SHAFT.getDefaultState().with(BlockStateProperties.AXIS, axis);
 	}
 
-	protected AllBlockPartials cogwheel() {
+	protected PartialModel cogwheel() {
 		return AllBlockPartials.SHAFTLESS_COGWHEEL;
 	}
 

src/main/java/com/simibubi/create/content/contraptions/base/HalfShaftInstance.java

@@ -15,7 +15,7 @@ public class HalfShaftInstance extends SingleRotatingInstance {
     @Override
     protected InstancedModel<RotatingData> getModel() {
 		Direction dir = getShaftDirection();
-        return AllBlockPartials.SHAFT_HALF.getModel(getRotatingMaterial(), blockState, dir);
+		return getRotatingMaterial().getModel(AllBlockPartials.SHAFT_HALF, blockState, dir);
 	}
 
     protected Direction getShaftDirection() {

src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillInstance.java

@@ -10,6 +10,7 @@ import com.simibubi.create.foundation.render.backend.instancing.InstancedModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
 
 import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
 
 public class DrillInstance extends SingleRotatingInstance {
 
@@ -20,6 +21,7 @@ public class DrillInstance extends SingleRotatingInstance {
     @Override
     protected InstancedModel<RotatingData> getModel() {
 		BlockState referenceState = tile.getBlockState();
-		return AllBlockPartials.DRILL_HEAD.getModel(getRotatingMaterial(), referenceState, referenceState.get(FACING));
+		Direction facing = referenceState.get(FACING);
+		return getRotatingMaterial().getModel(AllBlockPartials.DRILL_HEAD, referenceState, facing);
 	}
 }

src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillRenderer.java

@@ -5,6 +5,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -25,18 +26,14 @@ public class DrillRenderer extends KineticTileEntityRenderer {
 
 	@Override
 	protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
-		return AllBlockPartials.DRILL_HEAD.renderOnDirectionalSouth(te.getBlockState());
+		return PartialBufferer.getFacing(AllBlockPartials.DRILL_HEAD, te.getBlockState());
-	}
-
-	protected static SuperByteBuffer getRotatingModel(BlockState state) {
-		return AllBlockPartials.DRILL_HEAD.renderOnDirectionalSouth(state);
 	}
 
 	public static void renderInContraption(MovementContext context, MatrixStack ms, MatrixStack msLocal,
 		IRenderTypeBuffer buffer) {
-		MatrixStack[] matrixStacks = new MatrixStack[] { ms, msLocal };
+		MatrixStack[] matrixStacks = new MatrixStack[]{ms, msLocal};
 		BlockState state = context.state;
-		SuperByteBuffer superBuffer = AllBlockPartials.DRILL_HEAD.renderOn(state);
+		SuperByteBuffer superBuffer = PartialBufferer.get(AllBlockPartials.DRILL_HEAD, state);
 		Direction facing = state.get(DrillBlock.FACING);
 
 		float speed = (float) (context.contraption.stalled

src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java

@@ -6,6 +6,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -31,7 +32,7 @@ public class HarvesterRenderer extends SafeTileEntityRenderer<HarvesterTileEntit
 	protected void renderSafe(HarvesterTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer,
 		int light, int overlay) {
 		BlockState blockState = te.getBlockState();
-		SuperByteBuffer superBuffer = AllBlockPartials.HARVESTER_BLADE.renderOn(blockState);
+		SuperByteBuffer superBuffer = PartialBufferer.get(AllBlockPartials.HARVESTER_BLADE, blockState);
 		transform(te.getWorld(), blockState.get(HarvesterBlock.HORIZONTAL_FACING), superBuffer,
 				te.manuallyAnimatedSpeed);
 		superBuffer.light(light)
@@ -42,7 +43,7 @@ public class HarvesterRenderer extends SafeTileEntityRenderer<HarvesterTileEntit
 		IRenderTypeBuffer buffers) {
 		BlockState blockState = context.state;
 		Direction facing = blockState.get(HORIZONTAL_FACING);
-		SuperByteBuffer superBuffer = AllBlockPartials.HARVESTER_BLADE.renderOn(blockState);
+		SuperByteBuffer superBuffer = PartialBufferer.get(AllBlockPartials.HARVESTER_BLADE, blockState);
 		float speed = (float) (!VecHelper.isVecPointingTowards(context.relativeMotion, facing.getOpposite())
 				? context.getAnimationSpeed()
 				: 0);

src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java

@@ -8,7 +8,9 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -63,8 +65,8 @@ public class PortableStorageInterfaceRenderer extends SafeTileEntityRenderer<Por
 		for (MatrixStack ms : matrixStacks)
 			ms.push();
 
-		SuperByteBuffer middle = getMiddleForState(blockState, lit).renderOn(blockState);
+		SuperByteBuffer middle = PartialBufferer.get(getMiddleForState(blockState, lit), blockState);
-		SuperByteBuffer top = getTopForState(blockState).renderOn(blockState);
+		SuperByteBuffer top = PartialBufferer.get(getTopForState(blockState), blockState);
 
 		Direction facing = blockState.get(PortableStorageInterfaceBlock.FACING);
 		for (MatrixStack ms : matrixStacks)
@@ -109,7 +111,7 @@ public class PortableStorageInterfaceRenderer extends SafeTileEntityRenderer<Por
 		return psi;
 	}
 
-	static AllBlockPartials getMiddleForState(BlockState state, boolean lit) {
+	static PartialModel getMiddleForState(BlockState state, boolean lit) {
 		if (AllBlocks.PORTABLE_FLUID_INTERFACE.has(state))
 			return lit ? AllBlockPartials.PORTABLE_FLUID_INTERFACE_MIDDLE_POWERED
 				: AllBlockPartials.PORTABLE_FLUID_INTERFACE_MIDDLE;
@@ -117,7 +119,7 @@ public class PortableStorageInterfaceRenderer extends SafeTileEntityRenderer<Por
 			: AllBlockPartials.PORTABLE_STORAGE_INTERFACE_MIDDLE;
 	}
 
-	static AllBlockPartials getTopForState(BlockState state) {
+	static PartialModel getTopForState(BlockState state) {
 		if (AllBlocks.PORTABLE_FLUID_INTERFACE.has(state))
 			return AllBlockPartials.PORTABLE_FLUID_INTERFACE_TOP;
 		return AllBlockPartials.PORTABLE_STORAGE_INTERFACE_TOP;

src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java

@@ -6,7 +6,9 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.components.clock.CuckooClockTileEntity.Animation;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.AngleHelper;
 
 import net.minecraft.block.BlockState;
@@ -38,8 +40,8 @@ public class CuckooClockRenderer extends KineticTileEntityRenderer {
 		IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid());
 
 		// Render Hands
-		SuperByteBuffer hourHand = AllBlockPartials.CUCKOO_HOUR_HAND.renderOn(blockState);
+		SuperByteBuffer hourHand = PartialBufferer.get(AllBlockPartials.CUCKOO_HOUR_HAND, blockState);
-		SuperByteBuffer minuteHand = AllBlockPartials.CUCKOO_MINUTE_HAND.renderOn(blockState);
+		SuperByteBuffer minuteHand = PartialBufferer.get(AllBlockPartials.CUCKOO_MINUTE_HAND, blockState);
 		float hourAngle = clock.hourHand.get(partialTicks);
 		float minuteAngle = clock.minuteHand.get(partialTicks);
 		rotateHand(hourHand, hourAngle, direction).light(packedLightmapCoords)
@@ -48,8 +50,8 @@ public class CuckooClockRenderer extends KineticTileEntityRenderer {
 				.renderInto(ms, vb);
 
 		// Doors
-		SuperByteBuffer leftDoor = AllBlockPartials.CUCKOO_LEFT_DOOR.renderOn(blockState);
+		SuperByteBuffer leftDoor = PartialBufferer.get(AllBlockPartials.CUCKOO_LEFT_DOOR, blockState);
-		SuperByteBuffer rightDoor = AllBlockPartials.CUCKOO_RIGHT_DOOR.renderOn(blockState);
+		SuperByteBuffer rightDoor = PartialBufferer.get(AllBlockPartials.CUCKOO_RIGHT_DOOR, blockState);
 		float angle = 0;
 		float offset = 0;
 
@@ -78,9 +80,9 @@ public class CuckooClockRenderer extends KineticTileEntityRenderer {
 		// Figure
 		if (clock.animationType != Animation.NONE) {
 			offset = -(angle / 135) * 1 / 2f + 10 / 16f;
+			PartialModel partialModel = (clock.animationType == Animation.PIG ? AllBlockPartials.CUCKOO_PIG : AllBlockPartials.CUCKOO_CREEPER);
 			SuperByteBuffer figure =
-				(clock.animationType == Animation.PIG ? AllBlockPartials.CUCKOO_PIG : AllBlockPartials.CUCKOO_CREEPER)
+					PartialBufferer.get(partialModel, blockState);
-					.renderOn(blockState);
 			figure.rotateCentered(Direction.UP, AngleHelper.rad(AngleHelper.horizontalAngle(direction.rotateYCCW())));
 			figure.translate(offset, 0, 0);
 			figure.light(packedLightmapCoords)
@@ -94,8 +96,8 @@ public class CuckooClockRenderer extends KineticTileEntityRenderer {
 		return transform(AllBlockPartials.SHAFT_HALF, te);
 	}
 
-	private SuperByteBuffer transform(AllBlockPartials partial, KineticTileEntity te) {
+	private SuperByteBuffer transform(PartialModel partial, KineticTileEntity te) {
-		return partial.renderOnDirectionalSouth(te.getBlockState(), te.getBlockState()
+		return PartialBufferer.getFacing(partial, te.getBlockState(), te.getBlockState()
 				.get(CuckooClockBlock.HORIZONTAL_FACING)
 				.getOpposite());
 	}

src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java

@@ -9,8 +9,10 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllSpriteShifts;
 import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity.Phase;
 import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -155,7 +157,7 @@ public class MechanicalCrafterRenderer extends SafeTileEntityRenderer<Mechanical
 		IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid());
 
 		if (!FastRenderDispatcher.available(te.getWorld())) {
-			SuperByteBuffer superBuffer = AllBlockPartials.SHAFTLESS_COGWHEEL.renderOn(blockState);
+			SuperByteBuffer superBuffer = PartialBufferer.get(AllBlockPartials.SHAFTLESS_COGWHEEL, blockState);
 			standardKineticRotationTransform(superBuffer, te, light);
 			superBuffer.rotateCentered(Direction.UP, (float) (blockState.get(HORIZONTAL_FACING).getAxis() != Direction.Axis.X ? 0 : Math.PI / 2));
 			superBuffer.rotateCentered(Direction.EAST, (float) (Math.PI / 2));
@@ -193,9 +195,9 @@ public class MechanicalCrafterRenderer extends SafeTileEntityRenderer<Mechanical
 
 	}
 
-	private SuperByteBuffer renderAndTransform(MechanicalCrafterTileEntity te, AllBlockPartials renderBlock,
+	private SuperByteBuffer renderAndTransform(MechanicalCrafterTileEntity te, PartialModel renderBlock,
 		BlockState crafterState, BlockPos pos) {
-		SuperByteBuffer buffer = renderBlock.renderOn(crafterState);
+		SuperByteBuffer buffer = PartialBufferer.get(renderBlock, crafterState);
 		float xRot = crafterState.get(MechanicalCrafterBlock.POINTING)
 				.getXRotation();
 		float yRot = AngleHelper.horizontalAngle(crafterState.get(HORIZONTAL_FACING));

src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java

@@ -6,6 +6,7 @@ import com.simibubi.create.AllTileEntities;
 import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
 import com.simibubi.create.foundation.block.ITE;
 import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockRenderType;
@@ -40,7 +41,7 @@ public class HandCrankBlock extends DirectionalKineticBlock implements ITE<HandC
 	}
 
 	@OnlyIn(Dist.CLIENT)
-	public AllBlockPartials getRenderedHandle() {
+	public PartialModel getRenderedHandle() {
 		return AllBlockPartials.HAND_CRANK_HANDLE;
 	}
 

src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankInstance.java

@@ -1,9 +1,9 @@
 package com.simibubi.create.content.contraptions.components.crank;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
 import com.simibubi.create.foundation.render.backend.core.ModelData;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
@@ -25,14 +25,15 @@ public class HandCrankInstance extends SingleRotatingInstance implements IDynami
 		this.tile = tile;
 
 		Block block = blockState.getBlock();
-        AllBlockPartials renderedHandle = null;
+		PartialModel renderedHandle = null;
 		if (block instanceof HandCrankBlock)
 			renderedHandle = ((HandCrankBlock) block).getRenderedHandle();
 		if (renderedHandle == null)
 			return;
 
 		facing = blockState.get(BlockStateProperties.FACING);
-		InstancedModel<ModelData> model = renderedHandle.getModel(getTransformMaterial(), blockState, facing.getOpposite());
+		Direction opposite = facing.getOpposite();
+		InstancedModel<ModelData> model = getTransformMaterial().getModel(renderedHandle, blockState, opposite);
 		crank = model.createInstance();
 
 		rotateCrank();

src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankRenderer.java

@@ -3,11 +3,12 @@ package com.simibubi.create.content.contraptions.components.crank;
 import static net.minecraft.state.properties.BlockStateProperties.FACING;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -31,14 +32,14 @@ public class HandCrankRenderer extends KineticTileEntityRenderer {
 
 		BlockState state = te.getBlockState();
 		Block block = state.getBlock();
-		AllBlockPartials renderedHandle = null;
+		PartialModel renderedHandle = null;
 		if (block instanceof HandCrankBlock)
 			renderedHandle = ((HandCrankBlock) block).getRenderedHandle();
 		if (renderedHandle == null)
 			return;
 
 		Direction facing = state.get(FACING);
-		SuperByteBuffer handle = renderedHandle.renderOnDirectionalSouth(state, facing.getOpposite());
+		SuperByteBuffer handle = PartialBufferer.getFacing(renderedHandle, state, facing.getOpposite());
 		HandCrankTileEntity crank = (HandCrankTileEntity) te;
 		kineticRotationTransform(handle, te, facing.getAxis(),
 				(crank.independentAngle + partialTicks * crank.chasingVelocity) / 360, light);

src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java

@@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.components.crank;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.DyeHelper;
 
 import net.minecraft.block.BlockState;
@@ -68,7 +68,7 @@ public class ValveHandleBlock extends HandCrankBlock {
 
 	@Override
 	@OnlyIn(Dist.CLIENT)
-	public AllBlockPartials getRenderedHandle() {
+	public PartialModel getRenderedHandle() {
 		return null;
 	}
 

src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerActorInstance.java

@@ -14,6 +14,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.ren
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionProgram;
 import com.simibubi.create.foundation.render.backend.core.ModelData;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedModel;
 import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -48,7 +49,7 @@ public class DeployerActorInstance extends ActorInstance {
 
         BlockState state = context.state;
         DeployerTileEntity.Mode mode = NBTHelper.readEnum(context.tileData, "Mode", DeployerTileEntity.Mode.class);
-        AllBlockPartials handPose = DeployerRenderer.getHandPose(mode);
+        PartialModel handPose = DeployerRenderer.getHandPose(mode);
 
         stationaryTimer = context.data.contains("StationaryTimer");
         facing = state.get(FACING);

src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerInstance.java

@@ -7,6 +7,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
 import com.simibubi.create.foundation.render.backend.core.OrientedData;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance;
 import com.simibubi.create.foundation.render.backend.instancing.ITickableInstance;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
@@ -31,7 +32,7 @@ public class DeployerInstance extends ShaftInstance implements IDynamicInstance,
 
     protected OrientedData hand;
 
-    AllBlockPartials currentHand;
+    PartialModel currentHand;
     float progress;
     private boolean newHand = false;
 
@@ -89,7 +90,7 @@ public class DeployerInstance extends ShaftInstance implements IDynamicInstance,
     }
 
     private boolean updateHandPose() {
-        AllBlockPartials handPose = tile.getHandPose();
+        PartialModel handPose = tile.getHandPose();
 
         if (currentHand == handPose) return false;
         currentHand = handPose;

src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java

@@ -11,8 +11,10 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.Mode;
 import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -117,9 +119,8 @@ public class DeployerRenderer extends SafeTileEntityRenderer<DeployerTileEntity>
 		BlockPos pos = te.getPos();
 		Vector3d offset = getHandOffset(te, partialTicks, blockState);
 
-		SuperByteBuffer pole = AllBlockPartials.DEPLOYER_POLE.renderOn(blockState);
+		SuperByteBuffer pole = PartialBufferer.get(AllBlockPartials.DEPLOYER_POLE, blockState);
-		SuperByteBuffer hand = te.getHandPose()
+		SuperByteBuffer hand = PartialBufferer.get(te.getHandPose(), blockState);
-			.renderOn(blockState);
 
 		transform(te.getWorld(), pole.translate(offset.x, offset.y, offset.z), blockState, pos, true).renderInto(ms,
 				vb);
@@ -155,16 +156,16 @@ public class DeployerRenderer extends SafeTileEntityRenderer<DeployerTileEntity>
 
 	public static void renderInContraption(MovementContext context, MatrixStack ms, MatrixStack msLocal,
 		IRenderTypeBuffer buffer) {
-		MatrixStack[] matrixStacks = new MatrixStack[] { ms, msLocal };
+		MatrixStack[] matrixStacks = new MatrixStack[]{ms, msLocal};
 		IVertexBuilder builder = buffer.getBuffer(RenderType.getSolid());
 		BlockState blockState = context.state;
 		BlockPos pos = BlockPos.ZERO;
 		Mode mode = NBTHelper.readEnum(context.tileData, "Mode", Mode.class);
 		World world = context.world;
-		AllBlockPartials handPose = getHandPose(mode);
+		PartialModel handPose = getHandPose(mode);
 
-		SuperByteBuffer pole = AllBlockPartials.DEPLOYER_POLE.renderOn(blockState);
+		SuperByteBuffer pole = PartialBufferer.get(AllBlockPartials.DEPLOYER_POLE, blockState);
-		SuperByteBuffer hand = handPose.renderOn(blockState);
+		SuperByteBuffer hand = PartialBufferer.get(handPose, blockState);
 		pole = transform(world, pole, blockState, pos, true);
 		hand = transform(world, hand, blockState, pos, false);
 
@@ -192,7 +193,7 @@ public class DeployerRenderer extends SafeTileEntityRenderer<DeployerTileEntity>
 			.renderInto(ms, builder);
 	}
 
-	static AllBlockPartials getHandPose(DeployerTileEntity.Mode mode) {
+	static PartialModel getHandPose(DeployerTileEntity.Mode mode) {
 		return mode == DeployerTileEntity.Mode.PUNCH ? AllBlockPartials.DEPLOYER_HAND_PUNCHING : AllBlockPartials.DEPLOYER_HAND_POINTING;
 	}
 

src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java

@@ -11,6 +11,7 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.curiosities.tools.SandPaperItem;
 import com.simibubi.create.foundation.advancement.AllTriggers;
 import com.simibubi.create.foundation.item.TooltipHelper;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
@@ -342,7 +343,7 @@ public class DeployerTileEntity extends KineticTileEntity {
 		sendData();
 	}
 
-	public AllBlockPartials getHandPose() {
+	public PartialModel getHandPose() {
 		return mode == Mode.PUNCH ? AllBlockPartials.DEPLOYER_HAND_PUNCHING
 			: heldItem.isEmpty() ? AllBlockPartials.DEPLOYER_HAND_POINTING : AllBlockPartials.DEPLOYER_HAND_HOLDING;
 	}
@@ -395,7 +396,7 @@ public class DeployerTileEntity extends KineticTileEntity {
 
 		float progress = 0;
 		int timerSpeed = getTimerSpeed();
-		AllBlockPartials handPose = getHandPose();
+		PartialModel handPose = getHandPose();
 
 		if (state == State.EXPANDING)
 			progress = 1 - (timer - partialTicks * timerSpeed) / 1000f;

src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanRenderer.java

@@ -7,6 +7,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -37,9 +38,9 @@ public class EncasedFanRenderer extends KineticTileEntityRenderer {
 		int lightInFront = WorldRenderer.getLightmapCoordinates(te.getWorld(), te.getPos().offset(direction));
 
 		SuperByteBuffer shaftHalf =
-			AllBlockPartials.SHAFT_HALF.renderOnDirectionalSouth(te.getBlockState(), direction.getOpposite());
+				PartialBufferer.getFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState(), direction.getOpposite());
 		SuperByteBuffer fanInner =
-			AllBlockPartials.ENCASED_FAN_INNER.renderOnDirectionalSouth(te.getBlockState(), direction.getOpposite());
+				PartialBufferer.getFacing(AllBlockPartials.ENCASED_FAN_INNER, te.getBlockState(), direction.getOpposite());
 
 		float time = AnimationTickHolder.getRenderTime(te.getWorld());
 		float speed = te.getSpeed() * 5;

src/main/java/com/simibubi/create/content/contraptions/components/fan/FanInstance.java

@@ -24,8 +24,8 @@ public class FanInstance extends KineticTileInstance<EncasedFanTileEntity> {
 		direction = blockState.get(FACING);
 
 		opposite = direction.getOpposite();
-        shaft = AllBlockPartials.SHAFT_HALF.getModel(getRotatingMaterial(), blockState, opposite).createInstance();
+		shaft = getRotatingMaterial().getModel(AllBlockPartials.SHAFT_HALF, blockState, opposite).createInstance();
-        fan = AllBlockPartials.ENCASED_FAN_INNER.getModel(getRotatingMaterial(), blockState, opposite).createInstance();
+		fan = getRotatingMaterial().getModel(AllBlockPartials.ENCASED_FAN_INNER, blockState, opposite).createInstance();
 
 		setup(shaft);
 		setup(fan, getFanSpeed());

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java

@@ -53,7 +53,7 @@ public class FlyWheelInstance extends KineticTileInstance<FlywheelTileEntity> im
 		shaft = setup(shaftModel().createInstance());
 
 		BlockState referenceState = blockState.rotate(Rotation.CLOCKWISE_90);
-        wheel = AllBlockPartials.FLYWHEEL.getModel(getTransformMaterial(), referenceState, referenceState.get(HORIZONTAL_FACING)).createInstance();
+		wheel = getTransformMaterial().getModel(AllBlockPartials.FLYWHEEL, referenceState, referenceState.get(HORIZONTAL_FACING)).createInstance();
 
 		connection = FlywheelBlock.getConnection(blockState);
 		if (connection != null) {
@@ -159,7 +159,8 @@ public class FlyWheelInstance extends KineticTileInstance<FlywheelTileEntity> im
     }
 
     protected InstancedModel<RotatingData> shaftModel() {
-        return AllBlockPartials.SHAFT_HALF.getModel(getRotatingMaterial(), blockState, facing.getOpposite());
+		Direction opposite = facing.getOpposite();
+		return getRotatingMaterial().getModel(AllBlockPartials.SHAFT_HALF, blockState, opposite);
 	}
 
     protected void transformConnector(MatrixStacker ms, boolean upper, boolean rotating, float angle, boolean flip) {

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java

@@ -8,6 +8,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock.ConnectionState;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -17,6 +18,7 @@ import net.minecraft.client.renderer.IRenderTypeBuffer;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.state.properties.BlockStateProperties;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.Direction.AxisDirection;
@@ -54,23 +56,29 @@ public class FlywheelRenderer extends KineticTileEntityRenderer {
 			boolean flip = blockState.get(FlywheelBlock.CONNECTION) == ConnectionState.LEFT;
 
 			transformConnector(
-				rotateToFacing(AllBlockPartials.FLYWHEEL_UPPER_ROTATING.renderOn(blockState), connection), true, true,
+					rotateToFacing(PartialBufferer.get(AllBlockPartials.FLYWHEEL_UPPER_ROTATING, blockState), connection), true, true,
 					rotation, flip).light(light)
 					.renderInto(ms, vb);
 			transformConnector(
-				rotateToFacing(AllBlockPartials.FLYWHEEL_LOWER_ROTATING.renderOn(blockState), connection), false, true,
+					rotateToFacing(PartialBufferer.get(AllBlockPartials.FLYWHEEL_LOWER_ROTATING, blockState), connection), false, true,
 					rotation, flip).light(light)
 					.renderInto(ms, vb);
 
-			transformConnector(rotateToFacing(AllBlockPartials.FLYWHEEL_UPPER_SLIDING.renderOn(blockState), connection),
+			transformConnector(rotateToFacing(PartialBufferer.get(AllBlockPartials.FLYWHEEL_UPPER_SLIDING, blockState), connection),
 					true, false, rotation, flip).light(light)
 					.renderInto(ms, vb);
-			transformConnector(rotateToFacing(AllBlockPartials.FLYWHEEL_LOWER_SLIDING.renderOn(blockState), connection),
+			transformConnector(rotateToFacing(PartialBufferer.get(AllBlockPartials.FLYWHEEL_LOWER_SLIDING, blockState), connection),
 					false, false, rotation, flip).light(light)
 					.renderInto(ms, vb);
 		}
 
-		SuperByteBuffer wheel = AllBlockPartials.FLYWHEEL.renderOnHorizontal(blockState.rotate(Rotation.CLOCKWISE_90));
+		renderFlywheel(te, ms, light, blockState, angle, vb);
+	}
+
+	private void renderFlywheel(KineticTileEntity te, MatrixStack ms, int light, BlockState blockState, float angle, IVertexBuilder vb) {
+		BlockState referenceState = blockState.rotate(Rotation.CLOCKWISE_90);
+		Direction facing = referenceState.get(BlockStateProperties.HORIZONTAL_FACING);
+		SuperByteBuffer wheel = PartialBufferer.getFacing(AllBlockPartials.FLYWHEEL, referenceState, facing);
 		kineticRotationTransform(wheel, te, blockState.get(HORIZONTAL_FACING)
 				.getAxis(), AngleHelper.rad(angle), light);
 		wheel.renderInto(ms, vb);
@@ -78,8 +86,8 @@ public class FlywheelRenderer extends KineticTileEntityRenderer {
 
 	@Override
 	protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
-		return AllBlockPartials.SHAFT_HALF.renderOnDirectionalSouth(te.getBlockState(), te.getBlockState()
+		return PartialBufferer.getFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState(), te.getBlockState()
-			.get(HORIZONTAL_FACING)
+				.get(BlockStateProperties.HORIZONTAL_FACING)
 				.getOpposite());
 	}
 

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java

@@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.components.flywheel.engine;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.block.Block;
@@ -95,7 +95,7 @@ public abstract class EngineBlock extends HorizontalBlock implements IWrenchable
 
 	@Nullable
 	@OnlyIn(Dist.CLIENT)
-	public abstract AllBlockPartials getFrameModel();
+	public abstract PartialModel getFrameModel();
 
 	protected abstract boolean isValidBaseBlock(BlockState baseBlock, IBlockReader world, BlockPos pos);
 

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineInstance.java

@@ -1,8 +1,8 @@
 package com.simibubi.create.content.contraptions.components.flywheel.engine;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.foundation.render.backend.core.ModelData;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
 import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -25,7 +25,7 @@ public class EngineInstance extends TileEntityInstance<EngineTileEntity> {
             return;
 
         EngineBlock engineBlock = (EngineBlock) block;
-        AllBlockPartials frame = engineBlock.getFrameModel();
+        PartialModel frame = engineBlock.getFrameModel();
 
         Direction facing = blockState.get(BlockStateProperties.HORIZONTAL_FACING);
 

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineRenderer.java

@@ -1,8 +1,9 @@
 package com.simibubi.create.content.contraptions.components.flywheel.engine;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 
@@ -29,12 +30,12 @@ public class EngineRenderer<T extends EngineTileEntity> extends SafeTileEntityRe
 			.getBlock();
 		if (block instanceof EngineBlock) {
 			EngineBlock engineBlock = (EngineBlock) block;
-			AllBlockPartials frame = engineBlock.getFrameModel();
+			PartialModel frame = engineBlock.getFrameModel();
 			if (frame != null) {
 				Direction facing = te.getBlockState()
 						.get(EngineBlock.HORIZONTAL_FACING);
 				float angle = AngleHelper.rad(AngleHelper.horizontalAngle(facing));
-				frame.renderOn(te.getBlockState())
+				PartialBufferer.get(frame, te.getBlockState())
 						.rotateCentered(Direction.UP, angle)
 						.translate(0, 0, -1)
 						.light(WorldRenderer.getLightmapCoordinates(te.getWorld(), te.getBlockState(), te.getPos()))

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java

@@ -5,6 +5,7 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllTileEntities;
 import com.simibubi.create.foundation.block.ITE;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
 
 import net.minecraft.block.AbstractFurnaceBlock;
@@ -41,7 +42,7 @@ public class FurnaceEngineBlock extends EngineBlock implements ITE<FurnaceEngine
 	}
 
 	@Override
-	public AllBlockPartials getFrameModel() {
+	public PartialModel getFrameModel() {
 		return AllBlockPartials.FURNACE_GENERATOR_FRAME;
 	}
 

src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerRenderer.java

@@ -5,6 +5,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -40,7 +41,7 @@ public class MechanicalMixerRenderer extends KineticTileEntityRenderer {
 
 		IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid());
 
-		SuperByteBuffer superBuffer = AllBlockPartials.SHAFTLESS_COGWHEEL.renderOn(blockState);
+		SuperByteBuffer superBuffer = PartialBufferer.get(AllBlockPartials.SHAFTLESS_COGWHEEL, blockState);
 		standardKineticRotationTransform(superBuffer, te, light).renderInto(ms, vb);
 
 		int packedLightmapCoords = WorldRenderer.getLightmapCoordinates(te.getWorld(), blockState, pos);
@@ -49,12 +50,12 @@ public class MechanicalMixerRenderer extends KineticTileEntityRenderer {
 		float time = AnimationTickHolder.getRenderTime(te.getWorld());
 		float angle = ((time * speed * 6 / 10f) % 360) / 180 * (float) Math.PI;
 
-		SuperByteBuffer poleRender = AllBlockPartials.MECHANICAL_MIXER_POLE.renderOn(blockState);
+		SuperByteBuffer poleRender = PartialBufferer.get(AllBlockPartials.MECHANICAL_MIXER_POLE, blockState);
 		poleRender.translate(0, -renderedHeadOffset, 0)
 				.light(packedLightmapCoords)
 				.renderInto(ms, vb);
 
-		SuperByteBuffer headRender = AllBlockPartials.MECHANICAL_MIXER_HEAD.renderOn(blockState);
+		SuperByteBuffer headRender = PartialBufferer.get(AllBlockPartials.MECHANICAL_MIXER_HEAD, blockState);
 		headRender.rotateCentered(Direction.UP, angle)
 				.translate(0, -renderedHeadOffset, 0)
 				.light(packedLightmapCoords)

src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorRenderer.java

@@ -3,6 +3,7 @@ package com.simibubi.create.content.contraptions.components.motor;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
@@ -15,7 +16,7 @@ public class CreativeMotorRenderer extends KineticTileEntityRenderer {
 
 	@Override
 	protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
-		return AllBlockPartials.SHAFT_HALF.renderOnDirectionalSouth(te.getBlockState());
+		return PartialBufferer.getFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState());
 	}
 
 }

src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressRenderer.java

@@ -1,9 +1,12 @@
 package com.simibubi.create.content.contraptions.components.press;
 
+import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING;
+
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 
@@ -37,7 +40,7 @@ public class MechanicalPressRenderer extends KineticTileEntityRenderer {
 		int packedLightmapCoords = WorldRenderer.getLightmapCoordinates(te.getWorld(), blockState, pos);
 		float renderedHeadOffset = ((MechanicalPressTileEntity) te).getRenderedHeadOffset(partialTicks);
 
-		SuperByteBuffer headRender = AllBlockPartials.MECHANICAL_PRESS_HEAD.renderOnHorizontal(blockState);
+		SuperByteBuffer headRender = PartialBufferer.getFacing(AllBlockPartials.MECHANICAL_PRESS_HEAD, blockState, blockState.get(HORIZONTAL_FACING));
 		headRender.translate(0, -renderedHeadOffset, 0)
 				.light(packedLightmapCoords)
 				.renderInto(ms, buffer.getBuffer(RenderType.getSolid()));

src/main/java/com/simibubi/create/content/contraptions/components/saw/SawInstance.java

@@ -10,6 +10,7 @@ import com.simibubi.create.foundation.render.backend.instancing.InstancedModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
 
 import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
 import net.minecraft.util.Rotation;
 
 public class SawInstance extends SingleRotatingInstance {
@@ -22,7 +23,8 @@ public class SawInstance extends SingleRotatingInstance {
     protected InstancedModel<RotatingData> getModel() {
         if (blockState.get(FACING).getAxis().isHorizontal()) {
 			BlockState referenceState = blockState.rotate(tile.getWorld(), tile.getPos(), Rotation.CLOCKWISE_180);
-			return AllBlockPartials.SHAFT_HALF.getModel(getRotatingMaterial(), referenceState, referenceState.get(FACING));
+			Direction facing = referenceState.get(FACING);
+			return getRotatingMaterial().getModel(AllBlockPartials.SHAFT_HALF, referenceState, facing);
 		} else {
 			return getRotatingMaterial().getModel(shaft());
 		}

src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java

@@ -9,8 +9,10 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -53,7 +55,7 @@ public class SawRenderer extends SafeTileEntityRenderer<SawTileEntity> {
 	protected void renderBlade(SawTileEntity te, MatrixStack ms, IRenderTypeBuffer buffer, int light) {
 		BlockState blockState = te.getBlockState();
 		SuperByteBuffer superBuffer;
-		AllBlockPartials partial;
+		PartialModel partial;
 		float speed = te.getSpeed();
 
 		ms.push();
@@ -81,7 +83,7 @@ public class SawRenderer extends SafeTileEntityRenderer<SawTileEntity> {
 						.rotateY(90)
 						.unCentre();
 		}
-		superBuffer = partial.renderOnDirectionalSouth(blockState);
+		superBuffer = PartialBufferer.getFacing(partial, blockState);
 		superBuffer.light(light)
 				.renderInto(ms, buffer.getBuffer(RenderType.getCutoutMipped()));
 
@@ -140,7 +142,7 @@ public class SawRenderer extends SafeTileEntityRenderer<SawTileEntity> {
 	protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
 		BlockState state = te.getBlockState();
 		if (state.get(FACING).getAxis().isHorizontal())
-			return AllBlockPartials.SHAFT_HALF.renderOnDirectionalSouth(state.rotate(te.getWorld(), te.getPos(), Rotation.CLOCKWISE_180));
+			return PartialBufferer.getFacing(AllBlockPartials.SHAFT_HALF, state.rotate(te.getWorld(), te.getPos(), Rotation.CLOCKWISE_180));
 		return CreateClient.bufferCache.renderBlockIn(KineticTileEntityRenderer.KINETIC_TILE,
 				getRenderedBlockState(te));
 	}
@@ -171,14 +173,14 @@ public class SawRenderer extends SafeTileEntityRenderer<SawTileEntity> {
 
 		if (SawBlock.isHorizontal(state)) {
 			if (shouldAnimate)
-				superBuffer = AllBlockPartials.SAW_BLADE_HORIZONTAL_ACTIVE.renderOn(state);
+				superBuffer = PartialBufferer.get(AllBlockPartials.SAW_BLADE_HORIZONTAL_ACTIVE, state);
 			else
-				superBuffer = AllBlockPartials.SAW_BLADE_HORIZONTAL_INACTIVE.renderOn(state);
+				superBuffer = PartialBufferer.get(AllBlockPartials.SAW_BLADE_HORIZONTAL_INACTIVE, state);
 		} else {
 			if (shouldAnimate)
-				superBuffer = AllBlockPartials.SAW_BLADE_VERTICAL_ACTIVE.renderOn(state);
+				superBuffer = PartialBufferer.get(AllBlockPartials.SAW_BLADE_VERTICAL_ACTIVE, state);
 			else
-				superBuffer = AllBlockPartials.SAW_BLADE_VERTICAL_INACTIVE.renderOn(state);
+				superBuffer = PartialBufferer.get(AllBlockPartials.SAW_BLADE_VERTICAL_INACTIVE, state);
 		}
 
 		for (MatrixStack m : matrixStacks) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingInstance.java

@@ -4,6 +4,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.BackHalfShaftInstance;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.foundation.render.backend.core.OrientedData;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -31,7 +32,7 @@ public class BearingInstance<B extends KineticTileEntity & IBearingTileEntity> e
 
 		blockOrientation = getBlockStateOrientation(facing);
 
-		AllBlockPartials top =
+		PartialModel top =
 				bearing.isWoodenTop() ? AllBlockPartials.BEARING_TOP_WOODEN : AllBlockPartials.BEARING_TOP;
 
 		topInstance = getOrientedMaterial().getModel(top, blockState).createInstance();

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java

@@ -4,8 +4,10 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.AngleHelper;
 
 import net.minecraft.client.renderer.IRenderTypeBuffer;
@@ -31,9 +33,9 @@ public class BearingRenderer extends KineticTileEntityRenderer {
 		IBearingTileEntity bearingTe = (IBearingTileEntity) te;
 		final Direction facing = te.getBlockState()
 				.get(BlockStateProperties.FACING);
-		AllBlockPartials top =
+		PartialModel top =
 				bearingTe.isWoodenTop() ? AllBlockPartials.BEARING_TOP_WOODEN : AllBlockPartials.BEARING_TOP;
-		SuperByteBuffer superBuffer = top.renderOn(te.getBlockState());
+		SuperByteBuffer superBuffer = PartialBufferer.get(top, te.getBlockState());
 
 		float interpolatedAngle = bearingTe.getInterpolatedAngle(partialTicks - 1);
 		kineticRotationTransform(superBuffer, te, facing.getAxis(), (float) (interpolatedAngle / 180 * Math.PI), light);
@@ -48,7 +50,7 @@ public class BearingRenderer extends KineticTileEntityRenderer {
 
 	@Override
 	protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
-		return AllBlockPartials.SHAFT_HALF.renderOnDirectionalSouth(te.getBlockState(), te.getBlockState()
+		return PartialBufferer.getFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState(), te.getBlockState()
 				.get(BearingBlock.FACING)
 				.getOpposite());
 	}

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingMovementBehaviour.java

@@ -12,8 +12,10 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Ori
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import net.minecraft.client.renderer.IRenderTypeBuffer;
@@ -34,8 +36,8 @@ public class StabilizedBearingMovementBehaviour extends MovementBehaviour {
 		if (FastRenderDispatcher.available()) return;
 
 		Direction facing = context.state.get(BlockStateProperties.FACING);
-		AllBlockPartials top = AllBlockPartials.BEARING_TOP;
+		PartialModel top = AllBlockPartials.BEARING_TOP;
-		SuperByteBuffer superBuffer = top.renderOn(context.state);
+		SuperByteBuffer superBuffer = PartialBufferer.get(top, context.state);
 		float renderPartialTicks = AnimationTickHolder.getPartialTicks();
 
 		// rotate to match blockstate

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerRenderer.java

@@ -2,6 +2,7 @@ package com.simibubi.create.content.contraptions.components.structureMovement.ch
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
@@ -28,7 +29,7 @@ public class StickerRenderer extends SafeTileEntityRenderer<StickerTileEntity> {
 		if (FastRenderDispatcher.available(te.getWorld())) return;
 
 		BlockState state = te.getBlockState();
-		SuperByteBuffer head = AllBlockPartials.STICKER_HEAD.renderOn(state);
+		SuperByteBuffer head = PartialBufferer.get(AllBlockPartials.STICKER_HEAD, state);
 		float offset = te.piston.getValue(AnimationTickHolder.getPartialTicks(te.getWorld()));
 
 		if (te.getWorld() != Minecraft.getInstance().world && !te.isVirtual())

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageRenderer.java

@@ -4,6 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -54,7 +55,7 @@ public class GantryCarriageRenderer extends KineticTileEntityRenderer {
 			if (facing == Direction.NORTH || facing == Direction.EAST)
 				angleForTe *= -1;
 
-		SuperByteBuffer cogs = AllBlockPartials.GANTRY_COGS.renderOn(state);
+		SuperByteBuffer cogs = PartialBufferer.get(AllBlockPartials.GANTRY_COGS, state);
 		cogs.matrixStacker()
 				.centre()
 				.rotateY(AngleHelper.horizontalAngle(facing))

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java

@@ -2,12 +2,13 @@ package com.simibubi.create.content.contraptions.components.structureMovement.pu
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
-import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.IRotate;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.AngleHelper;
 
 import net.minecraft.block.BlockState;
@@ -24,11 +25,11 @@ import net.minecraft.world.World;
 
 public abstract class AbstractPulleyRenderer extends KineticTileEntityRenderer {
 
-	private AllBlockPartials halfRope;
+	private PartialModel halfRope;
-	private AllBlockPartials halfMagnet;
+	private PartialModel halfMagnet;
 
-	public AbstractPulleyRenderer(TileEntityRendererDispatcher dispatcher, AllBlockPartials halfRope,
+	public AbstractPulleyRenderer(TileEntityRendererDispatcher dispatcher, PartialModel halfRope,
-		AllBlockPartials halfMagnet) {
+		PartialModel halfMagnet) {
 		super(dispatcher);
 		this.halfRope = halfRope;
 		this.halfMagnet = halfMagnet;
@@ -58,8 +59,8 @@ public abstract class AbstractPulleyRenderer extends KineticTileEntityRenderer {
 		BlockState blockState = te.getBlockState();
 		BlockPos pos = te.getPos();
 
-		SuperByteBuffer halfMagnet = this.halfMagnet.renderOn(blockState);
+		SuperByteBuffer halfMagnet = PartialBufferer.get(this.halfMagnet, blockState);
-		SuperByteBuffer halfRope = this.halfRope.renderOn(blockState);
+		SuperByteBuffer halfRope = PartialBufferer.get(this.halfRope, blockState);
 		SuperByteBuffer magnet = renderMagnet(te);
 		SuperByteBuffer rope = renderRope(te);
 
@@ -89,7 +90,7 @@ public abstract class AbstractPulleyRenderer extends KineticTileEntityRenderer {
 
 	protected abstract Axis getShaftAxis(KineticTileEntity te);
 
-	protected abstract AllBlockPartials getCoil();
+	protected abstract PartialModel getCoil();
 
 	protected abstract SuperByteBuffer renderRope(KineticTileEntity te);
 
@@ -106,8 +107,7 @@ public abstract class AbstractPulleyRenderer extends KineticTileEntityRenderer {
 
 	protected SuperByteBuffer getRotatedCoil(KineticTileEntity te) {
 		BlockState blockState = te.getBlockState();
-		return getCoil().renderOnDirectionalSouth(blockState,
+		return PartialBufferer.getFacing(getCoil(), blockState, Direction.getFacingFromAxis(AxisDirection.POSITIVE, getShaftAxis(te)));
-			Direction.getFacingFromAxis(AxisDirection.POSITIVE, getShaftAxis(te)));
 	}
 
 }

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/HosePulleyInstance.java

@@ -28,7 +28,7 @@ public class HosePulleyInstance extends AbstractPulleyInstance {
 	}
 
 	protected InstancedModel<OrientedData> getCoilModel() {
-		return AllBlockPartials.HOSE_COIL.getModel(getOrientedMaterial(), blockState, rotatingAbout);
+		return getOrientedMaterial().getModel(AllBlockPartials.HOSE_COIL, blockState, rotatingAbout);
 	}
 
 	protected InstancedModel<OrientedData> getHalfRopeModel() {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java

@@ -6,6 +6,7 @@ import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.util.Direction.Axis;
@@ -24,7 +25,7 @@ public class PulleyRenderer extends AbstractPulleyRenderer {
 	}
 
 	@Override
-	protected AllBlockPartials getCoil() {
+	protected PartialModel getCoil() {
 		return AllBlockPartials.ROPE_COIL;
 	}
 

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/RopePulleyInstance.java

@@ -29,7 +29,7 @@ public class RopePulleyInstance extends AbstractPulleyInstance {
 	}
 
 	protected InstancedModel<OrientedData> getCoilModel() {
-		return AllBlockPartials.ROPE_COIL.getModel(getOrientedMaterial(), blockState, rotatingAbout);
+		return getOrientedMaterial().getModel(AllBlockPartials.ROPE_COIL, blockState, rotatingAbout);
 	}
 
 	protected InstancedModel<OrientedData> getHalfRopeModel() {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java

@@ -44,7 +44,6 @@ import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.world.IBlockDisplayReader;
 import net.minecraft.world.LightType;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.template.Template;
@@ -56,24 +55,6 @@ public class ContraptionRenderDispatcher {
 	public static final Compartment<Pair<Contraption, Integer>> CONTRAPTION = new Compartment<>();
 	protected static PlacementSimulationWorld renderWorld;
 
-    public static void notifyLightPacket(IBlockDisplayReader world, int chunkX, int chunkZ) {
-        for (RenderedContraption renderer : renderers.values()) {
-            renderer.getLighter().lightVolume.notifyLightPacket(world, chunkX, chunkZ);
-        }
-    }
-
-    public static void renderTileEntities(World world, Contraption c, MatrixStack ms, MatrixStack msLocal,
-                                          IRenderTypeBuffer buffer) {
-        PlacementSimulationWorld renderWorld = null;
-        if (Backend.canUseVBOs()) {
-            RenderedContraption renderer = getRenderer(world, c);
-
-            renderWorld = renderer.renderWorld;
-        }
-        TileEntityRenderHelper.renderTileEntities(world, renderWorld, c.specialRenderedTileEntities, ms, msLocal, buffer);
-
-    }
-
 	public static void tick() {
 		if (Minecraft.getInstance().isGamePaused()) return;
 
@@ -84,18 +65,6 @@ public class ContraptionRenderDispatcher {
 		}
 	}
 
-    private static RenderedContraption getRenderer(World world, Contraption c) {
-        int entityId = c.entity.getEntityId();
-        RenderedContraption contraption = renderers.get(entityId);
-
-        if (contraption == null) {
-            contraption = new RenderedContraption(world, c);
-            renderers.put(entityId, contraption);
-        }
-
-        return contraption;
-    }
-
 	public static void beginFrame(ActiveRenderInfo info, double camX, double camY, double camZ) {
 		for (RenderedContraption renderer : renderers.values()) {
 			renderer.beginFrame(info, camX, camY, camZ);
@@ -131,27 +100,21 @@ public class ContraptionRenderDispatcher {
 		GL13.glActiveTexture(GL40.GL_TEXTURE0);
 	}
 
-    public static void removeDeadContraptions() {
+	private static RenderedContraption getRenderer(World world, Contraption c) {
-        renderers.values().removeIf(renderer -> {
+		int entityId = c.entity.getEntityId();
-            if (renderer.isDead()) {
+		RenderedContraption contraption = renderers.get(entityId);
-                renderer.invalidate();
+
-                return true;
+		if (contraption == null) {
-            }
+			contraption = new RenderedContraption(world, c);
-            return false;
+			renderers.put(entityId, contraption);
-        });
 		}
 
-    public static void invalidateAll() {
+		return contraption;
-        for (RenderedContraption renderer : renderers.values()) {
-            renderer.invalidate();
-        }
-
-        renderers.clear();
 	}
 
 	public static void render(AbstractContraptionEntity entity, MatrixStack ms, IRenderTypeBuffer buffers,
 							  MatrixStack msLocal, Contraption contraption) {
-        if (Backend.canUseVBOs()) {
+		if (Backend.canUseVBOs() && Backend.isFlywheelWorld(entity.world)) {
 			ContraptionRenderDispatcher.renderDynamic(entity.world, contraption, ms, msLocal, buffers);
 		} else {
 			ContraptionRenderDispatcher.renderDynamic(entity.world, contraption, ms, msLocal, buffers);
@@ -159,14 +122,6 @@ public class ContraptionRenderDispatcher {
 		}
 	}
 
-    public static void renderDynamic(World world, Contraption c, MatrixStack ms, MatrixStack msLocal,
-                                     IRenderTypeBuffer buffer) {
-        renderTileEntities(world, c, ms, msLocal, buffer);
-        if (buffer instanceof IRenderTypeBuffer.Impl)
-            ((IRenderTypeBuffer.Impl) buffer).draw();
-        renderActors(world, c, ms, msLocal, buffer);
-    }
-
 	public static void renderStructure(World world, Contraption c, MatrixStack ms, MatrixStack msLocal,
 									   IRenderTypeBuffer buffer) {
 		SuperByteBufferCache bufferCache = CreateClient.bufferCache;
@@ -186,6 +141,51 @@ public class ContraptionRenderDispatcher {
 		}
 	}
 
+	public static void renderDynamic(World world, Contraption c, MatrixStack ms, MatrixStack msLocal,
+									 IRenderTypeBuffer buffer) {
+		renderTileEntities(world, c, ms, msLocal, buffer);
+		if (buffer instanceof IRenderTypeBuffer.Impl)
+			((IRenderTypeBuffer.Impl) buffer).draw();
+		renderActors(world, c, ms, msLocal, buffer);
+	}
+
+	public static void renderTileEntities(World world, Contraption c, MatrixStack ms, MatrixStack msLocal,
+										  IRenderTypeBuffer buffer) {
+		PlacementSimulationWorld renderWorld = null;
+		if (Backend.canUseVBOs() && Backend.isFlywheelWorld(world)) {
+			RenderedContraption renderer = getRenderer(world, c);
+
+			renderWorld = renderer.renderWorld;
+		}
+		TileEntityRenderHelper.renderTileEntities(world, renderWorld, c.specialRenderedTileEntities, ms, msLocal, buffer);
+
+	}
+
+	protected static void renderActors(World world, Contraption c, MatrixStack ms, MatrixStack msLocal,
+									   IRenderTypeBuffer buffer) {
+		MatrixStack[] matrixStacks = new MatrixStack[]{ms, msLocal};
+		for (Pair<Template.BlockInfo, MovementContext> actor : c.getActors()) {
+			MovementContext context = actor.getRight();
+			if (context == null)
+				continue;
+			if (context.world == null)
+				context.world = world;
+			Template.BlockInfo blockInfo = actor.getLeft();
+			for (MatrixStack m : matrixStacks) {
+				m.push();
+				MatrixStacker.of(m)
+						.translate(blockInfo.pos);
+			}
+
+			MovementBehaviour movementBehaviour = AllMovementBehaviours.of(blockInfo.state);
+			if (movementBehaviour != null)
+				movementBehaviour.renderInContraption(context, ms, msLocal, buffer);
+
+			for (MatrixStack m : matrixStacks)
+				m.pop();
+		}
+	}
+
 	private static SuperByteBuffer buildStructureBuffer(Contraption c, RenderType layer) {
 		BufferBuilder builder = buildStructure(c, layer);
 		return new SuperByteBuffer(builder);
@@ -232,31 +232,6 @@ public class ContraptionRenderDispatcher {
         return builder;
     }
 
-    protected static void renderActors(World world, Contraption c, MatrixStack ms, MatrixStack msLocal,
-                                       IRenderTypeBuffer buffer) {
-        MatrixStack[] matrixStacks = new MatrixStack[] { ms, msLocal };
-        for (Pair<Template.BlockInfo, MovementContext> actor : c.getActors()) {
-            MovementContext context = actor.getRight();
-            if (context == null)
-                continue;
-            if (context.world == null)
-                context.world = world;
-            Template.BlockInfo blockInfo = actor.getLeft();
-            for (MatrixStack m : matrixStacks) {
-                m.push();
-                MatrixStacker.of(m)
-                    .translate(blockInfo.pos);
-            }
-
-            MovementBehaviour movementBehaviour = AllMovementBehaviours.of(blockInfo.state);
-            if (movementBehaviour != null)
-                movementBehaviour.renderInContraption(context, ms, msLocal, buffer);
-
-            for (MatrixStack m : matrixStacks)
-                m.pop();
-        }
-    }
-
     public static int getLight(World world, float lx, float ly, float lz) {
         BlockPos.Mutable pos = new BlockPos.Mutable();
         float sky = 0, block = 0;
@@ -302,4 +277,22 @@ public class ContraptionRenderDispatcher {
 			return -1;
 		}
 	}
+
+	public static void invalidateAll() {
+		for (RenderedContraption renderer : renderers.values()) {
+			renderer.invalidate();
+		}
+
+		renderers.clear();
+	}
+
+	public static void removeDeadContraptions() {
+		renderers.values().removeIf(renderer -> {
+			if (renderer.isDead()) {
+				renderer.invalidate();
+				return true;
+			}
+			return false;
+		});
+	}
 }

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingRenderer.java

@@ -8,6 +8,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.contraptions.KineticDebugger;
 import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.ColorHelper;
@@ -65,9 +66,9 @@ public class CouplingRenderer {
 
 		BlockState renderState = Blocks.AIR.getDefaultState();
 		IVertexBuilder builder = buffer.getBuffer(RenderType.getSolid());
-		SuperByteBuffer attachment = AllBlockPartials.COUPLING_ATTACHMENT.renderOn(renderState);
+		SuperByteBuffer attachment = PartialBufferer.get(AllBlockPartials.COUPLING_ATTACHMENT, renderState);
-		SuperByteBuffer ring = AllBlockPartials.COUPLING_RING.renderOn(renderState);
+		SuperByteBuffer ring = PartialBufferer.get(AllBlockPartials.COUPLING_RING, renderState);
-		SuperByteBuffer connector = AllBlockPartials.COUPLING_CONNECTOR.renderOn(renderState);
+		SuperByteBuffer connector = PartialBufferer.get(AllBlockPartials.COUPLING_CONNECTOR, renderState);
 
 		Vector3d zero = Vector3d.ZERO;
 		Vector3d firstEndpoint = transforms.getFirst()

src/main/java/com/simibubi/create/content/contraptions/fluids/PumpCogInstance.java

@@ -10,6 +10,7 @@ import com.simibubi.create.foundation.render.backend.instancing.InstancedModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
 
 import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
 
 public class PumpCogInstance extends SingleRotatingInstance {
 
@@ -20,6 +21,7 @@ public class PumpCogInstance extends SingleRotatingInstance {
     @Override
     protected InstancedModel<RotatingData> getModel() {
 		BlockState referenceState = tile.getBlockState();
-        return AllBlockPartials.MECHANICAL_PUMP_COG.getModel(getRotatingMaterial(), referenceState, referenceState.get(FACING));
+		Direction facing = referenceState.get(FACING);
+		return getRotatingMaterial().getModel(AllBlockPartials.MECHANICAL_PUMP_COG, referenceState, facing);
 	}
 }

src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java

@@ -4,6 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.MatrixStacker;
@@ -34,7 +35,7 @@ public class PumpRenderer extends KineticTileEntityRenderer {
 		float angle = MathHelper.lerp(pump.arrowDirection.getValue(partialTicks), 0, 90) - 90;
 		for (float yRot : new float[] { 0, 90 }) {
 			ms.push();
-			SuperByteBuffer arrow = AllBlockPartials.MECHANICAL_PUMP_ARROW.renderOn(blockState);
+			SuperByteBuffer arrow = PartialBufferer.get(AllBlockPartials.MECHANICAL_PUMP_ARROW, blockState);
 			Direction direction = blockState.get(PumpBlock.FACING);
 			MatrixStacker.of(ms)
 					.centre()
@@ -52,7 +53,7 @@ public class PumpRenderer extends KineticTileEntityRenderer {
 
 	@Override
 	protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
-		return AllBlockPartials.MECHANICAL_PUMP_COG.renderOnDirectionalSouth(te.getBlockState());
+		return PartialBufferer.getFacing(AllBlockPartials.MECHANICAL_PUMP_COG, te.getBlockState());
 	}
 
 }

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java

@@ -3,7 +3,9 @@ package com.simibubi.create.content.contraptions.fluids.actors;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.pulley.AbstractPulleyRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.util.Direction.Axis;
@@ -23,18 +25,18 @@ public class HosePulleyRenderer extends AbstractPulleyRenderer {
 	}
 
 	@Override
-	protected AllBlockPartials getCoil() {
+	protected PartialModel getCoil() {
 		return AllBlockPartials.HOSE_COIL;
 	}
 
 	@Override
 	protected SuperByteBuffer renderRope(KineticTileEntity te) {
-		return AllBlockPartials.HOSE.renderOn(te.getBlockState());
+		return PartialBufferer.get(AllBlockPartials.HOSE, te.getBlockState());
 	}
 
 	@Override
 	protected SuperByteBuffer renderMagnet(KineticTileEntity te) {
-		return AllBlockPartials.HOSE_MAGNET.renderOn(te.getBlockState());
+		return PartialBufferer.get(AllBlockPartials.HOSE_MAGNET, te.getBlockState());
 	}
 
 	@Override

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java

@@ -3,6 +3,8 @@ package com.simibubi.create.content.contraptions.fluids.actors;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.foundation.fluid.FluidRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
@@ -20,7 +22,7 @@ public class SpoutRenderer extends SafeTileEntityRenderer<SpoutTileEntity> {
 		super(dispatcher);
 	}
 
-	static final AllBlockPartials[] BITS =
+	static final PartialModel[] BITS =
 		{ AllBlockPartials.SPOUT_TOP, AllBlockPartials.SPOUT_MIDDLE, AllBlockPartials.SPOUT_BOTTOM };
 
 	@Override
@@ -69,8 +71,8 @@ public class SpoutRenderer extends SafeTileEntityRenderer<SpoutTileEntity> {
 			squeeze = -1;
 
 		ms.push();
-		for (AllBlockPartials bit : BITS) {
+		for (PartialModel bit : BITS) {
-			bit.renderOn(te.getBlockState())
+			PartialBufferer.get(bit, te.getBlockState())
 					.light(light)
 					.renderInto(ms, buffer.getBuffer(RenderType.getSolid()));
 			ms.translate(0, -3 * squeeze / 32f, 0);

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java

@@ -4,6 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -31,7 +32,7 @@ public class FluidValveRenderer extends KineticTileEntityRenderer {
 
 		super.renderSafe(te, partialTicks, ms, buffer, light, overlay);
 		BlockState blockState = te.getBlockState();
-		SuperByteBuffer pointer = AllBlockPartials.FLUID_VALVE_POINTER.renderOn(blockState);
+		SuperByteBuffer pointer = PartialBufferer.get(AllBlockPartials.FLUID_VALVE_POINTER, blockState);
 		Direction facing = blockState.get(FluidValveBlock.FACING);
 
 		if (!(te instanceof FluidValveTileEntity))

src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java

@@ -3,7 +3,9 @@ package com.simibubi.create.content.contraptions.processing.burner;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -30,8 +32,8 @@ public class BlazeBurnerRenderer extends SafeTileEntityRenderer<BlazeBurnerTileE
 		float renderTick = AnimationTickHolder.getRenderTime(te.getWorld()) + (te.hashCode() % 13) * 16f;
 		float offset = (MathHelper.sin((float) ((renderTick / 16f) % (2 * Math.PI))) + .5f) / 16f;
 
-		AllBlockPartials blazeModel = AllBlockPartials.BLAZES.get(heatLevel);
+		PartialModel blazeModel = AllBlockPartials.BLAZES.get(heatLevel);
-		SuperByteBuffer blazeBuffer = blazeModel.renderOn(te.getBlockState());
+		SuperByteBuffer blazeBuffer = PartialBufferer.get(blazeModel, te.getBlockState());
 		blazeBuffer.rotateCentered(Direction.UP, AngleHelper.rad(te.headAngle.getValue(partialTicks)));
 		blazeBuffer.translate(0, offset, 0);
 		blazeBuffer.light(0xF000F0)

src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java

@@ -5,6 +5,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer;
@@ -43,7 +44,7 @@ public class SpeedControllerRenderer extends SmartTileEntityRenderer<SpeedContro
 		BlockState blockState = tileEntityIn.getBlockState();
 		boolean alongX = blockState.get(SpeedControllerBlock.HORIZONTAL_AXIS) == Axis.X;
 
-		SuperByteBuffer bracket = AllBlockPartials.SPEED_CONTROLLER_BRACKET.renderOn(blockState);
+		SuperByteBuffer bracket = PartialBufferer.get(AllBlockPartials.SPEED_CONTROLLER_BRACKET, blockState);
 		bracket.translate(0, 1, 0);
 		bracket.rotateCentered(Direction.UP,
 				(float) (alongX ? Math.PI : Math.PI / 2));

src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstance.java

@@ -10,6 +10,7 @@ import com.simibubi.create.content.contraptions.base.KineticRenderMaterials;
 import com.simibubi.create.content.contraptions.base.KineticTileInstance;
 import com.simibubi.create.content.contraptions.base.RotatingData;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstanceData;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedModel;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer;
@@ -57,7 +58,7 @@ public class BeltInstance extends KineticTileInstance<BeltTileEntity> {
         DyeColor color = tile.color.orElse(null);
 
         for (boolean bottom : Iterate.trueAndFalse) {
-            AllBlockPartials beltPartial = BeltRenderer.getBeltPartial(diagonal, start, end, bottom);
+            PartialModel beltPartial = BeltRenderer.getBeltPartial(diagonal, start, end, bottom);
             SpriteShiftEntry spriteShift = BeltRenderer.getSpriteShiftEntry(color, diagonal, bottom);
 
             InstancedModel<BeltData> beltModel = modelManager.getMaterial(KineticRenderMaterials.BELTS).getModel(beltPartial, blockState);

src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java

@@ -1,6 +1,7 @@
 package com.simibubi.create.content.contraptions.relays.belt;
 
 import java.util.Random;
+import java.util.function.Supplier;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
@@ -11,9 +12,11 @@ import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.ShadowRenderHelper;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -93,9 +96,9 @@ public class BeltRenderer extends SafeTileEntityRenderer<BeltTileEntity> {
 
 			for (boolean bottom : Iterate.trueAndFalse) {
 
-				AllBlockPartials beltPartial = getBeltPartial(diagonal, start, end, bottom);
+				PartialModel beltPartial = getBeltPartial(diagonal, start, end, bottom);
 
-				SuperByteBuffer beltBuffer = beltPartial.renderOn(blockState)
+				SuperByteBuffer beltBuffer = PartialBufferer.get(beltPartial, blockState)
 						.light(light);
 
 				SpriteShiftEntry spriteShift = getSpriteShiftEntry(color, diagonal, bottom);
@@ -127,18 +130,20 @@ public class BeltRenderer extends SafeTileEntityRenderer<BeltTileEntity> {
 			}
 
 			if (te.hasPulley()) {
-				// TODO 1.15 find a way to cache this model matrix computation
+				Direction dir = sideways ? Direction.UP : blockState.get(BeltBlock.HORIZONTAL_FACING).rotateY();
-				MatrixStack modelTransform = new MatrixStack();
-				Direction dir = blockState.get(BeltBlock.HORIZONTAL_FACING).rotateY();
-				if (sideways) dir = Direction.UP;
-				msr = MatrixStacker.of(modelTransform);
-				msr.centre();
-				if (dir.getAxis() == Axis.X) msr.rotateY(90);
-				if (dir.getAxis() == Axis.Y) msr.rotateX(90);
-				msr.rotateX(90);
-				msr.unCentre();
 
-				SuperByteBuffer superBuffer = CreateClient.bufferCache.renderDirectionalPartial(AllBlockPartials.BELT_PULLEY, blockState, dir, modelTransform);
+				Supplier<MatrixStack> matrixStackSupplier = () -> {
+					MatrixStack stack = new MatrixStack();
+					MatrixStacker stacker = MatrixStacker.of(stack);
+					stacker.centre();
+					if (dir.getAxis() == Axis.X) stacker.rotateY(90);
+					if (dir.getAxis() == Axis.Y) stacker.rotateX(90);
+					stacker.rotateX(90);
+					stacker.unCentre();
+					return stack;
+				};
+
+				SuperByteBuffer superBuffer = CreateClient.bufferCache.renderDirectionalPartial(AllBlockPartials.BELT_PULLEY, blockState, dir, matrixStackSupplier);
 				KineticTileEntityRenderer.standardKineticRotationTransform(superBuffer, te, light).renderInto(ms, vb);
 			}
 		}
@@ -155,7 +160,7 @@ public class BeltRenderer extends SafeTileEntityRenderer<BeltTileEntity> {
 					: bottom ? AllSpriteShifts.BELT_OFFSET : AllSpriteShifts.BELT;
 	}
 
-	public static AllBlockPartials getBeltPartial(boolean diagonal, boolean start, boolean end, boolean bottom) {
+	public static PartialModel getBeltPartial(boolean diagonal, boolean start, boolean end, boolean bottom) {
 		if (diagonal) {
 			if (start) return AllBlockPartials.BELT_DIAGONAL_START;
 			if (end) return AllBlockPartials.BELT_DIAGONAL_END;

src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftInstance.java

@@ -30,7 +30,7 @@ public class SplitShaftInstance extends KineticTileInstance<SplitShaftTileEntity
 
         for (Direction dir : Iterate.directionsInAxis(getRotationAxis())) {
 
-            InstancedModel<RotatingData> half = AllBlockPartials.SHAFT_HALF.getModel(rotatingMaterial, blockState, dir);
+			InstancedModel<RotatingData> half = rotatingMaterial.getModel(AllBlockPartials.SHAFT_HALF, blockState, dir);
 
 			float splitSpeed = speed * tile.getRotationSpeedModifier(dir);
 

src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftRenderer.java

@@ -5,6 +5,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.IRotate;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -51,7 +52,7 @@ public class SplitShaftRenderer extends KineticTileEntityRenderer {
 			angle = angle / 180f * (float) Math.PI;
 
 			SuperByteBuffer superByteBuffer =
-				AllBlockPartials.SHAFT_HALF.renderOnDirectionalSouth(te.getBlockState(), direction);
+					PartialBufferer.getFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState(), direction);
 			kineticRotationTransform(superByteBuffer, te, axis, angle, light);
 			superByteBuffer.renderInto(ms, buffer.getBuffer(RenderType.getSolid()));
 		}

src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeRenderer.java

@@ -6,8 +6,10 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock.Type;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.block.BlockState;
@@ -45,10 +47,10 @@ public class GaugeRenderer extends KineticTileEntityRenderer {
 		GaugeTileEntity gaugeTE = (GaugeTileEntity) te;
 		int lightCoords = WorldRenderer.getLightmapCoordinates(te.getWorld(), gaugeState, te.getPos());
 
+		PartialModel partialModel = (type == Type.SPEED ? AllBlockPartials.GAUGE_HEAD_SPEED : AllBlockPartials.GAUGE_HEAD_STRESS);
 		SuperByteBuffer headBuffer =
-			(type == Type.SPEED ? AllBlockPartials.GAUGE_HEAD_SPEED : AllBlockPartials.GAUGE_HEAD_STRESS)
+				PartialBufferer.get(partialModel, gaugeState);
-				.renderOn(gaugeState);
+		SuperByteBuffer dialBuffer = PartialBufferer.get(AllBlockPartials.GAUGE_DIAL, gaugeState);
-		SuperByteBuffer dialBuffer = AllBlockPartials.GAUGE_DIAL.renderOn(gaugeState);
 
 		float dialPivot = 5.75f / 16;
 		float progress = MathHelper.lerp(partialTicks, gaugeTE.prevDialState, gaugeTE.dialState);

src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxInstance.java

@@ -40,7 +40,7 @@ public class GearboxInstance extends KineticTileInstance<GearboxTileEntity> {
 			if (boxAxis == axis)
 				continue;
 
-            InstancedModel<RotatingData> shaft = AllBlockPartials.SHAFT_HALF.getModel(rotatingMaterial, blockState, direction);
+			InstancedModel<RotatingData> shaft = rotatingMaterial.getModel(AllBlockPartials.SHAFT_HALF, blockState, direction);
 
 			RotatingData key = shaft.createInstance();
 

src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxRenderer.java

@@ -4,6 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -37,7 +38,7 @@ public class GearboxRenderer extends KineticTileEntityRenderer {
 			if (boxAxis == axis)
 				continue;
 
-			SuperByteBuffer shaft = AllBlockPartials.SHAFT_HALF.renderOnDirectionalSouth(te.getBlockState(), direction);
+			SuperByteBuffer shaft = PartialBufferer.getFacing(AllBlockPartials.SHAFT_HALF, te.getBlockState(), direction);
 			float offset = getRotationOffsetForPosition(te, pos, axis);
 			float angle = (time * te.getSpeed() * 3f / 10) % 360;
 

src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/CrossPlaneMirror.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.MatrixStacker;
 
@@ -86,7 +87,7 @@ public class CrossPlaneMirror extends SymmetryMirror {
 	}
 
 	@Override
-	public AllBlockPartials getModel() {
+	public PartialModel getModel() {
 		return AllBlockPartials.SYMMETRY_CROSSPLANE;
 	}
 

src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/EmptyMirror.java

@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.IStringSerializable;
@@ -50,7 +50,7 @@ public class EmptyMirror extends SymmetryMirror {
 	}
 
 	@Override
-	public AllBlockPartials getModel() {
+	public PartialModel getModel() {
 		return null;
 	}
 

src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/PlaneMirror.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.MatrixStacker;
 
@@ -82,7 +83,7 @@ public class PlaneMirror extends SymmetryMirror {
 	}
 
 	@Override
-	public AllBlockPartials getModel() {
+	public PartialModel getModel() {
 		return AllBlockPartials.SYMMETRY_PLANE;
 	}
 

src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/SymmetryMirror.java

@@ -6,7 +6,7 @@ import java.util.Map;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.block.BlockState;
@@ -80,7 +80,7 @@ public abstract class SymmetryMirror {
 
 	public abstract String typeName();
 
-	public abstract AllBlockPartials getModel();
+	public abstract PartialModel getModel();
 
 	public void applyModelTransform(MatrixStack ms) {}
 

src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/TriplePlaneMirror.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.block.BlockState;
@@ -43,7 +44,7 @@ public class TriplePlaneMirror extends SymmetryMirror {
 	}
 
 	@Override
-	public AllBlockPartials getModel() {
+	public PartialModel getModel() {
 		return AllBlockPartials.SYMMETRY_TRIPLEPLANE;
 	}
 

src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java

@@ -3,6 +3,7 @@ package com.simibubi.create.content.curiosities.tools;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.MatrixStacker;
 
@@ -28,7 +29,7 @@ public class ExtendoGripRenderHandler {
 
 	public static float mainHandAnimation;
 	public static float lastMainHandAnimation;
-	public static AllBlockPartials pose = AllBlockPartials.DEPLOYER_HAND_PUNCHING;
+	public static PartialModel pose = AllBlockPartials.DEPLOYER_HAND_PUNCHING;
 
 	public static void tick() {
 		lastMainHandAnimation = mainHandAnimation;

src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java

@@ -52,7 +52,7 @@ public class RedstoneLinkNetworkHandler {
 
 		@Override
 		public int hashCode() {
-			return item.hashCode() ^ color;
+			return (item.hashCode() * 31) ^ color;
 		}
 
 		@Override

src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelRenderer.java

@@ -3,6 +3,7 @@ package com.simibubi.create.content.logistics.block.belts.tunnel;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
 import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer;
@@ -32,7 +33,7 @@ public class BeltTunnelRenderer extends SmartTileEntityRenderer<BeltTunnelTileEn
 
 		if (FastRenderDispatcher.available(te.getWorld())) return;
 
-		SuperByteBuffer flapBuffer = AllBlockPartials.BELT_TUNNEL_FLAP.renderOn(te.getBlockState());
+		SuperByteBuffer flapBuffer = PartialBufferer.get(AllBlockPartials.BELT_TUNNEL_FLAP, te.getBlockState());
 		IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid());
 		Vector3d pivot = VecHelper.voxelSpace(0, 10, 1f);
 		MatrixStacker msr = MatrixStacker.of(ms);

src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorRenderer.java

@@ -5,6 +5,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -45,7 +46,7 @@ public class EjectorRenderer extends KineticTileEntityRenderer {
 		float angle = lidProgress * 70;
 
 		if (!FastRenderDispatcher.available(te.getWorld())) {
-			SuperByteBuffer model = AllBlockPartials.EJECTOR_TOP.renderOn(te.getBlockState());
+			SuperByteBuffer model = PartialBufferer.get(AllBlockPartials.EJECTOR_TOP, te.getBlockState());
 			applyLidAngle(te, angle, model.matrixStacker());
 			model.light(light)
 					.renderInto(ms, vertexBuilder);

src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterRenderer.java

@@ -1,6 +1,7 @@
 package com.simibubi.create.content.logistics.block.diodes;
 
 import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.tileEntity.renderer.ColoredOverlayTileEntityRenderer;
 import com.simibubi.create.foundation.utility.ColorHelper;
@@ -20,7 +21,7 @@ public class AdjustableRepeaterRenderer extends ColoredOverlayTileEntityRenderer
 
 	@Override
 	protected SuperByteBuffer getOverlayBuffer(AdjustableRepeaterTileEntity te) {
-		return AllBlockPartials.FLEXPEATER_INDICATOR.renderOn(te.getBlockState());
+		return PartialBufferer.get(AllBlockPartials.FLEXPEATER_INDICATOR, te.getBlockState());
 	}
 
 }

src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticRenderMaterials;
 import com.simibubi.create.content.logistics.block.FlapData;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance;
 import com.simibubi.create.foundation.render.backend.instancing.InstanceData;
 import com.simibubi.create.foundation.render.backend.instancing.InstancedModel;
@@ -26,7 +27,7 @@ public class FunnelInstance extends TileEntityInstance<FunnelTileEntity> impleme
 
         if (!tile.hasFlap()) return;
 
-        AllBlockPartials flapPartial = (blockState.getBlock() instanceof FunnelBlock ? AllBlockPartials.FUNNEL_FLAP
+        PartialModel flapPartial = (blockState.getBlock() instanceof FunnelBlock ? AllBlockPartials.FUNNEL_FLAP
                 : AllBlockPartials.BELT_FUNNEL_FLAP);
         InstancedModel<FlapData> model = modelManager.getMaterial(KineticRenderMaterials.FLAPS)
                                                      .getModel(flapPartial, blockState);

src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java

@@ -3,8 +3,10 @@ package com.simibubi.create.content.logistics.block.funnel;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
 import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.MatrixStacker;
@@ -33,8 +35,9 @@ public class FunnelRenderer extends SmartTileEntityRenderer<FunnelTileEntity> {
 
 		BlockState blockState = te.getBlockState();
 		IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid());
-		SuperByteBuffer flapBuffer = (blockState.getBlock() instanceof FunnelBlock ? AllBlockPartials.FUNNEL_FLAP
+		PartialModel partialModel = (blockState.getBlock() instanceof FunnelBlock ? AllBlockPartials.FUNNEL_FLAP
-			: AllBlockPartials.BELT_FUNNEL_FLAP).renderOn(blockState);
+				: AllBlockPartials.BELT_FUNNEL_FLAP);
+		SuperByteBuffer flapBuffer = PartialBufferer.get(partialModel, blockState);
 		Vector3d pivot = VecHelper.voxelSpace(0, 10, 9.5f);
 		MatrixStacker msr = MatrixStacker.of(ms);
 

src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java

@@ -27,6 +27,7 @@ import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
 import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity;
 import com.simibubi.create.foundation.advancement.AllTriggers;
 import com.simibubi.create.foundation.item.SmartInventory;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
@@ -100,7 +101,7 @@ public abstract class ArmInteractionPoint {
 	@OnlyIn(Dist.CLIENT)
 	void transformFlag(MatrixStack stack) {}
 
-	AllBlockPartials getFlagType() {
+	PartialModel getFlagType() {
 		return mode == Mode.TAKE ? AllBlockPartials.FLAG_LONG_OUT : AllBlockPartials.FLAG_LONG_IN;
 	}
 

src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java

@@ -6,6 +6,7 @@ import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.logistics.block.mechanicalArm.ArmTileEntity.Phase;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
@@ -104,12 +105,12 @@ public class ArmRenderer extends KineticTileEntityRenderer {
 	}
 
 	private void renderArm(IVertexBuilder builder, MatrixStack ms, MatrixStack msLocal, MatrixStacker msr, BlockState blockState, int color, float baseAngle, float lowerArmAngle, float upperArmAngle, float headAngle, boolean hasItem, boolean isBlockItem, int light) {
-		SuperByteBuffer base = AllBlockPartials.ARM_BASE.renderOn(blockState).light(light);
+		SuperByteBuffer base = PartialBufferer.get(AllBlockPartials.ARM_BASE, blockState).light(light);
-		SuperByteBuffer lowerBody = AllBlockPartials.ARM_LOWER_BODY.renderOn(blockState).light(light);
+		SuperByteBuffer lowerBody = PartialBufferer.get(AllBlockPartials.ARM_LOWER_BODY, blockState).light(light);
-		SuperByteBuffer upperBody = AllBlockPartials.ARM_UPPER_BODY.renderOn(blockState).light(light);
+		SuperByteBuffer upperBody = PartialBufferer.get(AllBlockPartials.ARM_UPPER_BODY, blockState).light(light);
-		SuperByteBuffer head = AllBlockPartials.ARM_HEAD.renderOn(blockState).light(light);
+		SuperByteBuffer head = PartialBufferer.get(AllBlockPartials.ARM_HEAD, blockState).light(light);
-		SuperByteBuffer claw = AllBlockPartials.ARM_CLAW_BASE.renderOn(blockState).light(light);
+		SuperByteBuffer claw = PartialBufferer.get(AllBlockPartials.ARM_CLAW_BASE, blockState).light(light);
-		SuperByteBuffer clawGrip = AllBlockPartials.ARM_CLAW_GRIP.renderOn(blockState);
+		SuperByteBuffer clawGrip = PartialBufferer.get(AllBlockPartials.ARM_CLAW_GRIP, blockState);
 
 		transformBase(msr, baseAngle);
 		base.transform(msLocal)
@@ -182,7 +183,7 @@ public class ArmRenderer extends KineticTileEntityRenderer {
 
 	@Override
 	protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
-		return AllBlockPartials.ARM_COG.renderOn(te.getBlockState());
+		return PartialBufferer.get(AllBlockPartials.ARM_COG, te.getBlockState());
 	}
 
 }

src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverRenderer.java

@@ -3,6 +3,7 @@ package com.simibubi.create.content.logistics.block.redstone;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
 import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
@@ -36,7 +37,7 @@ public class AnalogLeverRenderer extends SafeTileEntityRenderer<AnalogLeverTileE
 		IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid());
 
 		// Handle
-		SuperByteBuffer handle = AllBlockPartials.ANALOG_LEVER_HANDLE.renderOn(leverState);
+		SuperByteBuffer handle = PartialBufferer.get(AllBlockPartials.ANALOG_LEVER_HANDLE, leverState);
 		float angle = (float) ((state / 15) * 90 / 180 * Math.PI);
 		transform(handle, leverState).translate(1 / 2f, 1 / 16f, 1 / 2f)
 				.rotate(Direction.EAST, angle)
@@ -46,7 +47,7 @@ public class AnalogLeverRenderer extends SafeTileEntityRenderer<AnalogLeverTileE
 
 		// Indicator
 		int color = ColorHelper.mixColors(0x2C0300, 0xCD0000, state / 15f);
-		SuperByteBuffer indicator = transform(AllBlockPartials.ANALOG_LEVER_INDICATOR.renderOn(leverState), leverState);
+		SuperByteBuffer indicator = transform(PartialBufferer.get(AllBlockPartials.ANALOG_LEVER_INDICATOR, leverState), leverState);
 		indicator.light(lightCoords)
 				.color(color)
 				.renderInto(ms, vb);

src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java

@@ -7,6 +7,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.content.schematics.block.LaunchedItem.ForBlockState;
 import com.simibubi.create.content.schematics.block.LaunchedItem.ForEntity;
+import com.simibubi.create.foundation.render.PartialBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
 import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer;
@@ -62,13 +63,13 @@ public class SchematicannonRenderer extends SafeTileEntityRenderer<Schematicanno
 
 		IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid());
 
-		SuperByteBuffer connector = AllBlockPartials.SCHEMATICANNON_CONNECTOR.renderOn(state);
+		SuperByteBuffer connector = PartialBufferer.get(AllBlockPartials.SCHEMATICANNON_CONNECTOR, state);
 		connector.translate(.5f, 0, .5f);
 		connector.rotate(Direction.UP, (float) ((yaw + 90) / 180 * Math.PI));
 		connector.translate(-.5f, 0, -.5f);
 		connector.light(lightCoords).renderInto(ms, vb);
 
-		SuperByteBuffer pipe = AllBlockPartials.SCHEMATICANNON_PIPE.renderOn(state);
+		SuperByteBuffer pipe = PartialBufferer.get(AllBlockPartials.SCHEMATICANNON_PIPE, state);
 		pipe.translate(.5f, 15 / 16f, .5f);
 		pipe.rotate(Direction.UP, (float) ((yaw + 90) / 180 * Math.PI));
 		pipe.rotate(Direction.SOUTH, (float) (pitch / 180 * Math.PI));

src/main/java/com/simibubi/create/foundation/OptionalUtil.java

@@ -1,24 +0,0 @@
-package com.simibubi.create.foundation;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-
-public class OptionalUtil {
-
-	public static <T> Optional<T> thenTry(Optional<T> first, Optional<T> thenTry) {
-		if (first.isPresent()) {
-			return first;
-		} else {
-			return thenTry;
-		}
-	}
-
-	public static <T> Optional<T> thenTryLazy(Supplier<Optional<T>> first, Supplier<Optional<T>> thenTry) {
-		Optional<T> one = first.get();
-		if (one.isPresent()) {
-			return one;
-		} else {
-			return thenTry.get();
-		}
-	}
-}

src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java

@@ -8,8 +8,8 @@ import com.mojang.blaze3d.platform.GlStateManager.DestFactor;
 import com.mojang.blaze3d.platform.GlStateManager.SourceFactor;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
-import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.foundation.fluid.FluidRenderer;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.ColorHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.VirtualEmptyModelData;
@@ -53,7 +53,7 @@ public class GuiGameElement {
 		return new GuiBlockStateRenderBuilder(state);
 	}
 
-	public static GuiRenderBuilder of(AllBlockPartials partial) {
+	public static GuiRenderBuilder of(PartialModel partial) {
 		return new GuiBlockPartialRenderBuilder(partial);
 	}
 
@@ -251,7 +251,7 @@ public class GuiGameElement {
 
 	public static class GuiBlockPartialRenderBuilder extends GuiBlockModelRenderBuilder {
 
-		public GuiBlockPartialRenderBuilder(AllBlockPartials partial) {
+		public GuiBlockPartialRenderBuilder(PartialModel partial) {
 			super(partial.get(), null);
 		}
 

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

@@ -2,13 +2,13 @@ package com.simibubi.create.foundation.render;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.Direction;
 
 public class Compartment<T> {
 	public static final Compartment<BlockState> GENERIC_TILE = new Compartment<>();
-	public static final Compartment<AllBlockPartials> PARTIAL = new Compartment<>();
+	public static final Compartment<PartialModel> PARTIAL = new Compartment<>();
-	public static final Compartment<Pair<Direction, AllBlockPartials>> DIRECTIONAL_PARTIAL = new Compartment<>();
+	public static final Compartment<Pair<Direction, PartialModel>> DIRECTIONAL_PARTIAL = new Compartment<>();
 }

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

@@ -0,0 +1,43 @@
+package com.simibubi.create.foundation.render;
+
+import static net.minecraft.state.properties.BlockStateProperties.FACING;
+
+import java.util.function.Supplier;
+
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.simibubi.create.CreateClient;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
+import com.simibubi.create.foundation.utility.AngleHelper;
+import com.simibubi.create.foundation.utility.MatrixStacker;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
+
+public class PartialBufferer {
+
+	public static SuperByteBuffer get(PartialModel partial, BlockState referenceState) {
+		return CreateClient.bufferCache.renderPartial(partial, referenceState);
+	}
+
+	public static SuperByteBuffer getFacing(PartialModel partial, BlockState referenceState) {
+		Direction facing = referenceState.get(FACING);
+		return getFacing(partial, referenceState, facing);
+	}
+
+	public static SuperByteBuffer getFacing(PartialModel partial, BlockState referenceState, Direction facing) {
+		return CreateClient.bufferCache.renderDirectionalPartial(partial, referenceState, facing, rotateToFace(facing));
+	}
+
+	public static Supplier<MatrixStack> rotateToFace(Direction facing) {
+		return () -> {
+			MatrixStack stack = new MatrixStack();
+			MatrixStacker.of(stack)
+					.centre()
+					.rotateY(AngleHelper.horizontalAngle(facing))
+					.rotateX(AngleHelper.verticalAngle(facing))
+					.unCentre();
+			return stack;
+		};
+	}
+
+}

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

@@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.simibubi.create.AllBlockPartials;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.utility.VirtualEmptyModelData;
 
 import net.minecraft.block.BlockState;
@@ -41,26 +41,26 @@ public class SuperByteBufferCache {
 		return getGeneric(toRender, () -> standardBlockRender(toRender));
 	}
 
-	public SuperByteBuffer renderPartial(AllBlockPartials partial, BlockState referenceState) {
+	public SuperByteBuffer renderPartial(PartialModel partial, BlockState referenceState) {
 		return get(Compartment.PARTIAL, partial, () -> standardModelRender(partial.get(), referenceState));
 	}
 
-	public SuperByteBuffer renderPartial(AllBlockPartials partial, BlockState referenceState,
+	public SuperByteBuffer renderPartial(PartialModel partial, BlockState referenceState,
-		MatrixStack modelTransform) {
+										 Supplier<MatrixStack> modelTransform) {
 		return get(Compartment.PARTIAL, partial,
-			() -> standardModelRender(partial.get(), referenceState, modelTransform));
+				() -> standardModelRender(partial.get(), referenceState, modelTransform.get()));
 	}
 
-	public SuperByteBuffer renderDirectionalPartial(AllBlockPartials partial, BlockState referenceState,
+	public SuperByteBuffer renderDirectionalPartial(PartialModel partial, BlockState referenceState,
 													Direction dir) {
 		return get(Compartment.DIRECTIONAL_PARTIAL, Pair.of(dir, partial),
 			() -> standardModelRender(partial.get(), referenceState));
 	}
 
-	public SuperByteBuffer renderDirectionalPartial(AllBlockPartials partial, BlockState referenceState, Direction dir,
+	public SuperByteBuffer renderDirectionalPartial(PartialModel partial, BlockState referenceState, Direction dir,
-		MatrixStack modelTransform) {
+													Supplier<MatrixStack> modelTransform) {
 		return get(Compartment.DIRECTIONAL_PARTIAL, Pair.of(dir, partial),
-			() -> standardModelRender(partial.get(), referenceState, modelTransform));
+				() -> standardModelRender(partial.get(), referenceState, modelTransform.get()));
 	}
 
 	public SuperByteBuffer renderBlockIn(Compartment<BlockState> compartment, BlockState toRender) {

src/main/java/com/simibubi/create/foundation/render/backend/OptifineHandler.java

@@ -23,6 +23,7 @@ public class OptifineHandler {
 
 	/**
 	 * Get information about the current Optifine configuration.
+	 *
 	 * @return {@link Optional#empty()} if Optifine is not installed.
 	 */
 	public static Optional<OptifineHandler> get() {

src/main/java/com/simibubi/create/foundation/render/backend/RenderUtil.java

@@ -1,7 +1,12 @@
 package com.simibubi.create.foundation.render.backend;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import java.util.function.Supplier;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.simibubi.create.foundation.utility.AngleHelper;
+import com.simibubi.create.foundation.utility.MatrixStacker;
+
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.vector.Matrix3f;
 import net.minecraft.util.math.vector.Matrix4f;
 
@@ -79,4 +84,16 @@ public class RenderUtil {
 				model.a33,
 		};
 	}
+
+	public static Supplier<MatrixStack> rotateToFace(Direction facing) {
+		return () -> {
+			MatrixStack stack = new MatrixStack();
+			MatrixStacker.of(stack)
+					.centre()
+					.rotateY(AngleHelper.horizontalAngle(facing))
+					.rotateX(AngleHelper.verticalAngle(facing))
+					.unCentre();
+			return stack;
+		};
+	}
 }

src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoader.java

@@ -67,7 +67,7 @@ public class ShaderLoader {
 		}
 	}
 
-	private void loadShaderSources(IResourceManager manager){
+	private void loadShaderSources(IResourceManager manager) {
 		Collection<ResourceLocation> allShaders = manager.getAllResourceLocations(SHADER_DIR, s -> {
 			for (String ext : EXTENSIONS) {
 				if (s.endsWith(ext)) return true;
@@ -173,7 +173,7 @@ public class ShaderLoader {
 		try {
 			bytebuffer = readToBuffer(is);
 			int i = bytebuffer.position();
-			((Buffer)bytebuffer).rewind();
+			((Buffer) bytebuffer).rewind();
 			return MemoryUtil.memASCII(bytebuffer, i);
 		} catch (IOException e) {
 
@@ -190,11 +190,12 @@ public class ShaderLoader {
 	public ByteBuffer readToBuffer(InputStream is) throws IOException {
 		ByteBuffer bytebuffer;
 		if (is instanceof FileInputStream) {
-			FileInputStream fileinputstream = (FileInputStream)is;
+			FileInputStream fileinputstream = (FileInputStream) is;
 			FileChannel filechannel = fileinputstream.getChannel();
-			bytebuffer = MemoryUtil.memAlloc((int)filechannel.size() + 1);
+			bytebuffer = MemoryUtil.memAlloc((int) filechannel.size() + 1);
 
-			while (filechannel.read(bytebuffer) != -1) { }
+			while (filechannel.read(bytebuffer) != -1) {
+			}
 		} else {
 			bytebuffer = MemoryUtil.memAlloc(8192);
 			ReadableByteChannel readablebytechannel = Channels.newChannel(is);

src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoadingException.java

@@ -1,23 +0,0 @@
-package com.simibubi.create.foundation.render.backend;
-
-public class ShaderLoadingException extends RuntimeException {
-
-    public ShaderLoadingException() {
-    }
-
-    public ShaderLoadingException(String message) {
-        super(message);
-    }
-
-    public ShaderLoadingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ShaderLoadingException(Throwable cause) {
-        super(cause);
-    }
-
-    public ShaderLoadingException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}

src/main/java/com/simibubi/create/foundation/render/backend/core/BasicData.java

@@ -73,6 +73,6 @@ public class BasicData extends InstanceData implements IFlatLight<BasicData> {
 
 	@Override
 	public void write(ByteBuffer buf) {
-        buf.put(new byte[] { blockLight, skyLight, r, g, b, a });
+		buf.put(new byte[]{blockLight, skyLight, r, g, b, a});
 	}
 }

src/main/java/com/simibubi/create/foundation/render/backend/core/IFlatLight.java

@@ -5,8 +5,9 @@ import com.simibubi.create.foundation.render.backend.instancing.InstanceData;
 /**
  * An interface that implementors of {@link InstanceData} should also implement
  * if they wish to make use of Flywheel's provided light update methods.
- *
+ * <p>
  * This only covers flat lighting, smooth lighting is still TODO.
+ *
  * @param <D> The name of the class that implements this interface.
  */
 public interface IFlatLight<D extends InstanceData & IFlatLight<D>> {

src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedData.java

@@ -85,7 +85,7 @@ public class OrientedData extends BasicData {
 	public void write(ByteBuffer buf) {
 		super.write(buf);
 
-		buf.asFloatBuffer().put(new float[] {
+		buf.asFloatBuffer().put(new float[]{
 				posX,
 				posY,
 				posZ,

src/main/java/com/simibubi/create/foundation/render/backend/core/PartialModel.java

@@ -0,0 +1,56 @@
+package com.simibubi.create.foundation.render.backend.core;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.ModelBakeEvent;
+import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.model.ModelLoader;
+
+/**
+ * A helper class for loading and accessing json models.
+ * <p>
+ * Creating a PartialModel will make the associated modelLocation automatically load.
+ * As such, PartialModels must be initialized at or before {@link ModelRegistryEvent}.
+ * Once {@link ModelBakeEvent} finishes, all PartialModels (with valid modelLocations)
+ * will have their bakedModel fields populated.
+ * <p>
+ * Attempting to create a PartialModel after ModelRegistryEvent will cause an error.
+ */
+public class PartialModel {
+
+	private static boolean tooLate = false;
+	private static final List<PartialModel> all = new ArrayList<>();
+
+	protected final ResourceLocation modelLocation;
+	protected IBakedModel bakedModel;
+
+	public PartialModel(ResourceLocation modelLocation) {
+
+		if (tooLate) throw new RuntimeException("PartialModel '" + modelLocation + "' loaded after ModelRegistryEvent");
+
+		this.modelLocation = modelLocation;
+		all.add(this);
+	}
+
+	public static void onModelRegistry(ModelRegistryEvent event) {
+		for (PartialModel partial : all)
+			ModelLoader.addSpecialModel(partial.modelLocation);
+
+		tooLate = true;
+	}
+
+	public static void onModelBake(ModelBakeEvent event) {
+		Map<ResourceLocation, IBakedModel> modelRegistry = event.getModelRegistry();
+		for (PartialModel partial : all)
+			partial.bakedModel = modelRegistry.get(partial.modelLocation);
+	}
+
+	public IBakedModel get() {
+		return bakedModel;
+	}
+
+}

src/main/java/com/simibubi/create/foundation/render/backend/gl/GlFog.java

@@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11;
 import com.mojang.blaze3d.platform.GlStateManager;
 
 public class GlFog {
-    public static float[] FOG_COLOR = new float[] {0, 0, 0, 0};
+	public static float[] FOG_COLOR = new float[]{0, 0, 0, 0};
 
 	public static boolean fogEnabled() {
 		return GlStateManager.FOG.field_179049_a.field_179201_b;

src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlProgram.java

@@ -35,6 +35,7 @@ public abstract class GlProgram extends GlObject {
 
 	/**
 	 * Retrieves the index of the uniform with the given name.
+	 *
 	 * @param uniform The name of the uniform to find the index of
 	 * @return The uniform's index
 	 */
@@ -50,6 +51,7 @@ public abstract class GlProgram extends GlObject {
 
 	/**
 	 * Binds a sampler uniform to the given texture unit.
+	 *
 	 * @param name    The name of the sampler uniform.
 	 * @param binding The index of the texture unit.
 	 * @return The sampler uniform's index.

src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/IMultiProgram.java

@@ -10,6 +10,7 @@ public interface IMultiProgram<P extends GlProgram> {
 
 	/**
 	 * Get the shader program most suited for the current game state.
+	 *
 	 * @return The one true program.
 	 */
 	P get();

src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlVersioned.java

@@ -9,6 +9,7 @@ import org.lwjgl.opengl.GLCapabilities;
 public interface GlVersioned {
 	/**
 	 * Queries whether this variant is supported by the current system.
+	 *
 	 * @param caps The {@link GLCapabilities} reported by the current system.
 	 * @return <code>true</code> if this variant is supported, or if this is the last defined variant.
 	 */

src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/RGPixelFormat.java

@@ -67,11 +67,11 @@ public enum RGPixelFormat implements GlVersioned {
 		public int byteCount() {
 			throw new UnsupportedOperationException();
 		}
-    }
+	};
-
-    ;
 
 	public abstract int internalFormat();
+
 	public abstract int format();
+
 	public abstract int byteCount();
 }

src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/DrawInstanced.java

@@ -51,9 +51,7 @@ public enum DrawInstanced implements GlVersioned {
 		public void drawArraysInstanced(int mode, int first, int count, int primcount) {
 			throw new UnsupportedOperationException();
 		}
-    }
+	};
-
-    ;
 
 	public abstract void drawArraysInstanced(int mode, int first, int count, int primcount);
 }

src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/InstancedArrays.java

@@ -39,9 +39,7 @@ public enum InstancedArrays implements GlVersioned {
 		public void vertexAttribDivisor(int index, int divisor) {
 			throw new UnsupportedOperationException();
 		}
-    }
+	};
-
-    ;
 
 	public abstract void vertexAttribDivisor(int index, int divisor);
 }

src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/VertexArrayObject.java

@@ -69,9 +69,7 @@ public enum VertexArrayObject implements GlVersioned {
 		public void deleteVertexArrays(int array) {
 			throw new UnsupportedOperationException();
 		}
-    }
+	};
-
-    ;
 
 	public abstract int genVertexArrays();
 

src/main/java/com/simibubi/create/foundation/render/backend/instancing/RenderMaterial.java

@@ -1,9 +1,5 @@
 package com.simibubi.create.foundation.render.backend.instancing;
 
-import static com.simibubi.create.foundation.render.Compartment.PARTIAL;
-
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -14,12 +10,12 @@ import org.apache.commons.lang3.tuple.Pair;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.simibubi.create.AllBlockPartials;
-import com.simibubi.create.foundation.render.Compartment;
 import com.simibubi.create.foundation.render.SuperByteBufferCache;
 import com.simibubi.create.foundation.render.backend.Backend;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
+import com.simibubi.create.foundation.render.backend.RenderUtil;
 import com.simibubi.create.foundation.render.backend.core.BasicProgram;
+import com.simibubi.create.foundation.render.backend.core.PartialModel;
 import com.simibubi.create.foundation.render.backend.gl.shader.ProgramSpec;
 import com.simibubi.create.foundation.render.backend.gl.shader.ShaderCallback;
 
@@ -35,7 +31,7 @@ import net.minecraft.util.math.vector.Matrix4f;
 public class RenderMaterial<P extends BasicProgram, MODEL extends InstancedModel<?>> {
 
 	protected final InstancedTileRenderer<?> renderer;
-    protected final Map<Compartment<?>, Cache<Object, MODEL>> models;
+	protected final Cache<Object, MODEL> models;
 	protected final ModelFactory<MODEL> factory;
 	protected final ProgramSpec<P> programSpec;
 	protected final Predicate<RenderType> layerPredicate;
@@ -49,13 +45,12 @@ public class RenderMaterial<P extends BasicProgram, MODEL extends InstancedModel
 
 	public RenderMaterial(InstancedTileRenderer<?> renderer, ProgramSpec<P> programSpec, ModelFactory<MODEL> factory, Predicate<RenderType> layerPredicate) {
 		this.renderer = renderer;
-        this.models = new HashMap<>();
+		this.models = CacheBuilder.newBuilder()
+				.removalListener(notification -> ((InstancedModel<?>) notification.getValue()).delete())
+				.build();
 		this.factory = factory;
 		this.programSpec = programSpec;
 		this.layerPredicate = layerPredicate;
-        registerCompartment(Compartment.PARTIAL);
-        registerCompartment(Compartment.DIRECTIONAL_PARTIAL);
-        registerCompartment(Compartment.GENERIC_TILE);
 	}
 
 	public boolean canRenderInLayer(RenderType layer) {
@@ -73,14 +68,11 @@ public class RenderMaterial<P extends BasicProgram, MODEL extends InstancedModel
 		if (setup != null) setup.call(program);
 
 		makeRenderCalls();
-        teardown();
 	}
 
-    public void teardown() {}
-
 	public void delete() {
-        runOnAll(InstancedModel::delete);
+		//runOnAll(InstancedModel::delete);
-        models.values().forEach(Cache::invalidateAll);
+		models.invalidateAll();
 	}
 
 	protected void makeRenderCalls() {
@@ -88,39 +80,31 @@ public class RenderMaterial<P extends BasicProgram, MODEL extends InstancedModel
 	}
 
 	public void runOnAll(Consumer<MODEL> f) {
-        for (Cache<Object, MODEL> cache : models.values()) {
+		for (MODEL model : models.asMap().values()) {
-            for (MODEL model : cache.asMap().values()) {
 			f.accept(model);
 		}
 	}
+
+	public MODEL getModel(PartialModel partial, BlockState referenceState) {
+		return get(partial, () -> buildModel(partial.get(), referenceState));
 	}
 
-    public void registerCompartment(Compartment<?> instance) {
+	public MODEL getModel(PartialModel partial, BlockState referenceState, Direction dir) {
-        models.put(instance, CacheBuilder.newBuilder().build());
+		return getModel(partial, referenceState, dir, RenderUtil.rotateToFace(dir));
 	}
 
-    public MODEL getModel(AllBlockPartials partial, BlockState referenceState) {
+	public MODEL getModel(PartialModel partial, BlockState referenceState, Direction dir, Supplier<MatrixStack> modelTransform) {
-        return get(PARTIAL, partial, () -> buildModel(partial.get(), referenceState));
+		return get(Pair.of(dir, partial),
-    }
-
-    public MODEL getModel(AllBlockPartials partial, BlockState referenceState, Direction dir) {
-        return get(Compartment.DIRECTIONAL_PARTIAL, Pair.of(dir, partial),
-                   () -> buildModel(partial.get(), referenceState));
-    }
-
-    public MODEL getModel(AllBlockPartials partial, BlockState referenceState, Direction dir, Supplier<MatrixStack> modelTransform) {
-        return get(Compartment.DIRECTIONAL_PARTIAL, Pair.of(dir, partial),
 				() -> buildModel(partial.get(), referenceState, modelTransform.get()));
 	}
 
 	public MODEL getModel(BlockState toRender) {
-        return get(Compartment.GENERIC_TILE, toRender, () -> buildModel(toRender));
+		return get(toRender, () -> buildModel(toRender));
 	}
 
-    public <T> MODEL get(Compartment<T> compartment, T key, Supplier<MODEL> supplier) {
+	public MODEL get(Object key, Supplier<MODEL> supplier) {
-        Cache<Object, MODEL> compartmentCache = models.get(compartment);
 		try {
-            return compartmentCache.get(key, supplier::get);
+			return models.get(key, supplier::get);
 		} catch (ExecutionException e) {
 			e.printStackTrace();
 			return null;

src/main/java/com/simibubi/create/foundation/render/backend/instancing/TileEntityInstance.java

@@ -54,14 +54,16 @@ public abstract class TileEntityInstance<T extends TileEntity> implements IInsta
 	 *
 	 * <br><br> If your animations are complex or more CPU driven, see {@link IDynamicInstance} or {@link ITickableInstance}.
 	 */
-    protected void update() { }
+	protected void update() {
+	}
 
 	/**
 	 * Called after construction and when a light update occurs in the world.
 	 *
 	 * <br> If your model needs it, update light here.
 	 */
-    public void updateLight() { }
+	public void updateLight() {
+	}
 
 	/**
 	 * Free any acquired resources.

src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/InstanceGroup.java

@@ -30,7 +30,6 @@ public class InstanceGroup<D extends InstanceData> extends AbstractCollection<D>
 	}
 
 	/**
-	 *
 	 * @param count
 	 * @return True if the number of elements changed.
 	 */

src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdater.java

@@ -49,7 +49,7 @@ public class LightUpdater {
 
 	/**
 	 * Add a listener associated with the given {@link BlockPos}.
-	 *
+	 * <p>
 	 * When a light update occurs in the chunk the position is contained in,
 	 * {@link LightUpdateListener#onLightUpdate} will be called.
 	 *
@@ -71,7 +71,7 @@ public class LightUpdater {
 
 	/**
 	 * Add a listener associated with the given {@link GridAlignedBB}.
-	 *
+	 * <p>
 	 * When a light update occurs in any chunk spanning the given volume,
 	 * {@link LightUpdateListener#onLightUpdate} will be called.
 	 *

src/main/java/com/simibubi/create/foundation/render/backend/light/LightVolume.java

@@ -170,6 +170,7 @@ public class LightVolume {
 
 	/**
 	 * Copy block light from the world into this volume.
+	 *
 	 * @param worldVolume the region in the world to copy data from.
 	 */
 	public void copyBlock(IBlockDisplayReader world, GridAlignedBB worldVolume) {
@@ -192,6 +193,7 @@ public class LightVolume {
 
 	/**
 	 * Copy sky light from the world into this volume.
+	 *
 	 * @param worldVolume the region in the world to copy data from.
 	 */
 	public void copySky(IBlockDisplayReader world, GridAlignedBB worldVolume) {
@@ -214,6 +216,7 @@ public class LightVolume {
 
 	/**
 	 * Copy all light from the world into this volume.
+	 *
 	 * @param worldVolume the region in the world to copy data from.
 	 */
 	public void copyLight(IBlockDisplayReader world, GridAlignedBB worldVolume) {

src/main/java/com/simibubi/create/foundation/utility/Pair.java

@@ -49,7 +49,11 @@ public class Pair<F, S> {
 
 	@Override
 	public int hashCode() {
-		return (first == null ? 0 : first.hashCode()) ^ (second == null ? 0 : second.hashCode());
+		return (nullHash(first) * 31) ^ nullHash(second);
+	}
+
+	int nullHash(Object o) {
+		return o == null ? 0 : o.hashCode();
 	}
 
 	@Override