From 07ef48fefb5f22521505ef6d19248d8cbff60602 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Mon, 13 Jan 2020 21:59:26 +0100
Subject: [PATCH] Sprites and CT - Except it works

- Added a few new sprites for crafting ingredients
- Reworked the Connected Texture system
- Added Limestone Layers to test custom CT spriteshifts
- Migrated existing CT blocks to use the new system
- Crushing wheel controllers no longer crash when in a schematic
---
 .../java/com/simibubi/create/AllBlocks.java   |  12 +-
 .../com/simibubi/create/CreateClient.java     |   3 +-
 .../foundation/block/connected/CTModel.java   |  47 +++---
 .../block/connected/CTSpriteShiftEntry.java   |  12 +-
 .../block/connected/CTSpriteShifter.java      |   4 +
 .../connected/ConnectedTextureBehaviour.java  |  13 +-
 .../connected/IHaveConnectedTextures.java     | 155 +-----------------
 .../block/connected/StandardCTBehaviour.java  |  21 ++-
 .../block/render/SpriteShifter.java           |   6 +
 .../chassis/LinearChassisBlock.java           |  59 +++++--
 .../crusher/CrushingWheelControllerBlock.java |   7 +-
 .../create/modules/palettes/CTGlassBlock.java |   9 +
 .../modules/palettes/LayeredCTBlock.java      |  55 +++++++
 .../create/blockstates/limestone_layers.json  |   5 +
 .../resources/assets/create/lang/en_us.json   |   1 +
 .../block/palettes/limestone_layers.json      |   7 +
 .../create/models/item/limestone_layers.json  |   3 +
 .../block/connected/limestone_layers.png      | Bin 0 -> 962 bytes
 .../block/connected/polished_limestone.png    | Bin 0 -> 3538 bytes
 .../textures/block/limestone_layers.png       | Bin 0 -> 679 bytes
 .../create/textures/item/unused/Untitled.pdn  | Bin 4584 -> 0 bytes
 .../create/textures/item/unused/Untitled.png  | Bin 560 -> 0 bytes
 .../textures/item/unused/processor2.png       | Bin 604 -> 0 bytes
 .../create/textures/item/unused/tube.pdn      | Bin 4718 -> 0 bytes
 .../loot_tables/blocks/limestone_layers.json  |  20 +++
 25 files changed, 219 insertions(+), 220 deletions(-)
 create mode 100644 src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java
 create mode 100644 src/main/resources/assets/create/blockstates/limestone_layers.json
 create mode 100644 src/main/resources/assets/create/models/block/palettes/limestone_layers.json
 create mode 100644 src/main/resources/assets/create/models/item/limestone_layers.json
 create mode 100644 src/main/resources/assets/create/textures/block/connected/limestone_layers.png
 create mode 100644 src/main/resources/assets/create/textures/block/connected/polished_limestone.png
 create mode 100644 src/main/resources/assets/create/textures/block/limestone_layers.png
 delete mode 100644 src/main/resources/assets/create/textures/item/unused/Untitled.pdn
 delete mode 100644 src/main/resources/assets/create/textures/item/unused/Untitled.png
 delete mode 100644 src/main/resources/assets/create/textures/item/unused/processor2.png
 delete mode 100644 src/main/resources/assets/create/textures/item/unused/tube.pdn
 create mode 100644 src/main/resources/data/create/loot_tables/blocks/limestone_layers.json

diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java
index b8bb0d06c..c6acc3cf0 100644
--- a/src/main/java/com/simibubi/create/AllBlocks.java
+++ b/src/main/java/com/simibubi/create/AllBlocks.java
@@ -7,6 +7,8 @@ import com.simibubi.create.foundation.block.ProperStairsBlock;
 import com.simibubi.create.foundation.block.RenderUtilityAxisBlock;
 import com.simibubi.create.foundation.block.RenderUtilityBlock;
 import com.simibubi.create.foundation.block.RenderUtilityDirectionalBlock;
+import com.simibubi.create.foundation.block.connected.CTSpriteShifter;
+import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.world.CopperOreBlock;
 import com.simibubi.create.modules.IModule;
@@ -69,6 +71,7 @@ import com.simibubi.create.modules.logistics.transport.villager.LogisticiansTabl
 import com.simibubi.create.modules.logistics.transport.villager.PackageFunnelBlock;
 import com.simibubi.create.modules.palettes.CTGlassBlock;
 import com.simibubi.create.modules.palettes.GlassPaneBlock;
+import com.simibubi.create.modules.palettes.LayeredCTBlock;
 import com.simibubi.create.modules.palettes.VolcanicRockBlock;
 import com.simibubi.create.modules.schematics.block.CreativeCrateBlock;
 import com.simibubi.create.modules.schematics.block.SchematicTableBlock;
@@ -222,11 +225,12 @@ public enum AllBlocks {
 	LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
 	POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block)), ComesWith.SLAB),
 	LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(LIMESTONE.block))),
+	LIMESTONE_LAYERS(
+			new LayeredCTBlock(Properties.from(LIMESTONE.block),
+					CTSpriteShifter.get(CTType.HORIZONTAL, "limestone_layers"),
+					CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_limestone"))),
 	WEATHERED_LIMESTONE(new Block(Properties.from(Blocks.ANDESITE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
-	WEATHERED_LIMESTONE_BRICKS(
-			new Block(Properties.from(WEATHERED_LIMESTONE.block)),
-			ComesWith.STAIRS,
-			ComesWith.SLAB,
+	WEATHERED_LIMESTONE_BRICKS(new Block(Properties.from(WEATHERED_LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB,
 			ComesWith.WALL),
 	POLISHED_WEATHERED_LIMESTONE(new Block(Properties.from(WEATHERED_LIMESTONE.block)), ComesWith.SLAB),
 	WEATHERED_LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(WEATHERED_LIMESTONE.block))),
diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java
index 87cca5825..13720b920 100644
--- a/src/main/java/com/simibubi/create/CreateClient.java
+++ b/src/main/java/com/simibubi/create/CreateClient.java
@@ -109,9 +109,10 @@ public class CreateClient {
 			Block block = allBlocks.get();
 			if (!(block instanceof IHaveConnectedTextures))
 				continue;
-			for (SpriteShiftEntry spriteShiftEntry : ((IHaveConnectedTextures) block).getSpriteShifts())
+			for (SpriteShiftEntry spriteShiftEntry : ((IHaveConnectedTextures) block).getBehaviour().getAllCTShifts())
 				event.addSprite(spriteShiftEntry.getTargetResourceLocation());
 		}
+
 	}
 
 	@OnlyIn(Dist.CLIENT)
diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java
index b78b197cb..71c87bffa 100644
--- a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java
+++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
-import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
+import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour.CTContext;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -24,28 +24,28 @@ import net.minecraftforge.client.model.data.ModelProperty;
 public class CTModel extends BakedModelWrapper<IBakedModel> {
 
 	private static ModelProperty<CTData> CT_PROPERTY = new ModelProperty<>();
-	private Iterable<SpriteShiftEntry> textures;
+	private ConnectedTextureBehaviour behaviour;
 
 	private class CTData {
-		int[] textures;
+		int[] indices;
 
 		public CTData() {
-			textures = new int[6];
-			Arrays.fill(textures, -1);
+			indices = new int[6];
+			Arrays.fill(indices, -1);
 		}
 
 		void put(Direction face, int texture) {
-			textures[face.getIndex()] = texture;
+			indices[face.getIndex()] = texture;
 		}
 
 		int get(Direction face) {
-			return textures[face.getIndex()];
+			return indices[face.getIndex()];
 		}
 	}
 
 	public CTModel(IBakedModel originalModel, IHaveConnectedTextures block) {
 		super(originalModel);
-		textures = block.getSpriteShifts();
+		behaviour = block.getBehaviour();
 	}
 
 	@Override
@@ -53,11 +53,15 @@ public class CTModel extends BakedModelWrapper<IBakedModel> {
 		if (!(state.getBlock() instanceof IHaveConnectedTextures))
 			return EmptyModelData.INSTANCE;
 		CTData data = new CTData();
-		IHaveConnectedTextures texDef = (IHaveConnectedTextures) state.getBlock();
+
 		for (Direction face : Direction.values()) {
 			if (!Block.shouldSideBeRendered(state, world, pos, face))
 				continue;
-			data.put(face, texDef.getTextureIndex(world, pos, state, face));
+			CTSpriteShiftEntry spriteShift = behaviour.get(state, face);
+			if (spriteShift == null)
+				continue;
+			CTContext ctContext = behaviour.buildContext(world, pos, state, face);
+			data.put(face, spriteShift.getTextureIndex(ctContext));
 		}
 		return new ModelDataMap.Builder().withInitial(CT_PROPERTY, data).build();
 	}
@@ -67,40 +71,27 @@ public class CTModel extends BakedModelWrapper<IBakedModel> {
 		List<BakedQuad> quads = new ArrayList<>(super.getQuads(state, side, rand, extraData));
 		if (!extraData.hasProperty(CT_PROPERTY))
 			return quads;
-		IHaveConnectedTextures texDef = (IHaveConnectedTextures) state.getBlock();
 		CTData data = extraData.getData(CT_PROPERTY);
 
 		for (int i = 0; i < quads.size(); i++) {
 			BakedQuad quad = quads.get(i);
-			if (!texDef.appliesTo(quad))
-				continue;
 
-			SpriteShiftEntry texture = null;
-			for (SpriteShiftEntry entry : textures) {
-				if (entry.getOriginal() == quad.getSprite()) {
-					texture = entry;
-					break;
-				}
-			}
-			if (texture == null)
+			CTSpriteShiftEntry spriteShift = behaviour.get(state, quad.getFace());
+			if (spriteShift == null)
 				continue;
-
 			int index = data.get(quad.getFace());
 			if (index == -1)
 				continue;
 
-			float textureSize = 16f / 128f / 8f;
-			float uShift = (index % 8) * textureSize;
-			float vShift = (index / 8) * textureSize * 2;
-
-			uShift = texture.getTarget().getInterpolatedU((index % 8) * 2) - texture.getOriginal().getMinU();
-			vShift = texture.getTarget().getInterpolatedV((index / 8) * 2) - texture.getOriginal().getMinV();
+			float uShift = spriteShift.getUShift(index);
+			float vShift = spriteShift.getVShift(index);
 
 			BakedQuad newQuad = new BakedQuad(Arrays.copyOf(quad.getVertexData(), quad.getVertexData().length),
 					quad.getTintIndex(), quad.getFace(), quad.getSprite(), quad.shouldApplyDiffuseLighting(),
 					quad.getFormat());
 			VertexFormat format = quad.getFormat();
 			int[] vertexData = newQuad.getVertexData();
+
 			for (int vertex = 0; vertex < vertexData.length; vertex += format.getIntegerSize()) {
 				int uvOffset = format.getUvOffsetById(0) / 4;
 				int uIndex = vertex + uvOffset;
diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShiftEntry.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShiftEntry.java
index ed80e7987..b9a564137 100644
--- a/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShiftEntry.java
+++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShiftEntry.java
@@ -11,6 +11,16 @@ public abstract class CTSpriteShiftEntry extends SpriteShiftEntry {
 		this.textureSheetSize = sheetSize;
 	}
 
+	public float getUShift(int index) {
+		return getTarget().getInterpolatedU((index % textureSheetSize) * (16 / textureSheetSize))
+				- getOriginal().getMinU();
+	}
+
+	public float getVShift(int index) {
+		return getTarget().getInterpolatedV((index / textureSheetSize) * (16 / textureSheetSize))
+				- getOriginal().getMinV();
+	}
+
 	public abstract int getTextureIndex(CTContext context);
 
 	public static class Horizontal extends CTSpriteShiftEntry {
@@ -21,7 +31,7 @@ public abstract class CTSpriteShiftEntry extends SpriteShiftEntry {
 
 		@Override
 		public int getTextureIndex(CTContext context) {
-			return (context.left ? 1 : 0) + (context.right ? 2 : 0);
+			return (context.right ? 1 : 0) + (context.left ? 2 : 0);
 		}
 
 	}
diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShifter.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShifter.java
index c46892cb4..8425a6381 100644
--- a/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShifter.java
+++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShifter.java
@@ -11,6 +11,10 @@ public class CTSpriteShifter extends SpriteShifter {
 		OMNIDIRECTIONAL, HORIZONTAL, VERTICAL;
 	}
 
+	public static CTSpriteShiftEntry get(CTType type, String blockTextureName) {
+		return get(type, blockTextureName, blockTextureName);
+	}
+	
 	public static CTSpriteShiftEntry get(CTType type, String blockTextureName, String connectedTextureName) {
 		String originalLocation = "block/" + blockTextureName;
 		String targetLocation = "block/connected/" + blockTextureName;
diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java b/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java
index 586aa017a..a3a2068c8 100644
--- a/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java
@@ -1,22 +1,13 @@
 package com.simibubi.create.foundation.block.connected;
 
-import java.util.Map;
 import java.util.function.BiPredicate;
 
-import com.google.common.collect.ImmutableList;
-import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
-import com.simibubi.create.foundation.block.render.SpriteShifter;
-
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.Direction.AxisDirection;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IEnviromentBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 public abstract class ConnectedTextureBehaviour {
 
@@ -26,8 +17,10 @@ public abstract class ConnectedTextureBehaviour {
 	}
 
 	public abstract CTSpriteShiftEntry get(BlockState state, Direction direction);
+	
+	public abstract Iterable<CTSpriteShiftEntry> getAllCTShifts();
 
-	boolean shouldFlipUVs(BlockState state, Direction face) {
+	protected boolean shouldFlipUVs(BlockState state, Direction face) {
 		return false;
 	}
 
diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/IHaveConnectedTextures.java b/src/main/java/com/simibubi/create/foundation/block/connected/IHaveConnectedTextures.java
index a2c22efa3..a818dfc7f 100644
--- a/src/main/java/com/simibubi/create/foundation/block/connected/IHaveConnectedTextures.java
+++ b/src/main/java/com/simibubi/create/foundation/block/connected/IHaveConnectedTextures.java
@@ -1,160 +1,7 @@
 package com.simibubi.create.foundation.block.connected;
 
-import java.util.function.BiPredicate;
-
-import com.google.common.collect.ImmutableList;
-import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
-import com.simibubi.create.foundation.block.render.SpriteShifter;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.model.BakedQuad;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Direction.Axis;
-import net.minecraft.util.Direction.AxisDirection;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IEnviromentBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
 public interface IHaveConnectedTextures {
 
-	class CTContext {
-		boolean up, down, left, right;
-		boolean topLeft, topRight, bottomLeft, bottomRight;
-	}
-
-	@OnlyIn(Dist.CLIENT)
-	default boolean appliesTo(BakedQuad quad) {
-		return true;
-	}
-
-	default boolean connectsTo(BlockState state, BlockState other, IEnviromentBlockReader reader, BlockPos pos,
-			BlockPos otherPos, Direction face) {
-
-		BlockPos blockingPos = otherPos.offset(face);
-		if ((face.getAxis().getCoordinate(pos.getX(), pos.getY(), pos.getZ()) == face.getAxis()
-				.getCoordinate(otherPos.getX(), otherPos.getY(), otherPos.getZ()))
-				&& connectsTo(state, reader.getBlockState(blockingPos), reader, pos, blockingPos, face))
-			return false;
-
-		return state.getBlock() == other.getBlock();
-	}
-
-	default Iterable<SpriteShiftEntry> getSpriteShifts() {
-		return ImmutableList.of(SpriteShifter.getCT(((Block) this).getRegistryName().getPath()));
-	}
-
-	default int getTextureIndex(IEnviromentBlockReader reader, BlockPos pos, BlockState state, Direction face) {
-		return getTextureIndexForContext(reader, pos, state, face, buildContext(reader, pos, state, face));
-	}
-
-	default CTContext buildContext(IEnviromentBlockReader reader, BlockPos pos, BlockState state, Direction face) {
-		Axis axis = face.getAxis();
-		boolean positive = face.getAxisDirection() == AxisDirection.POSITIVE;
-		Direction h = axis == Axis.X ? Direction.SOUTH : Direction.WEST;
-		Direction v = axis.isHorizontal() ? Direction.UP : Direction.NORTH;
-		h = positive ? h.getOpposite() : h;
-		if (face == Direction.DOWN) {
-			v = v.getOpposite();
-			h = h.getOpposite();
-		}
-
-		final Direction horizontal = h;
-		final Direction vertical = v;
-
-		BiPredicate<Integer, Integer> connection = (x, y) -> {
-			BlockPos p = pos.offset(horizontal, x).offset(vertical, y);
-			return connectsTo(state, reader.getBlockState(p), reader, pos, p, face);
-		};
-
-		boolean up = connection.test(0, 1);
-		boolean down = connection.test(0, -1);
-		boolean left = connection.test(-1, 0);
-		boolean right = connection.test(1, 0);
-		boolean topLeft = connection.test(-1, 1);
-		boolean topRight = connection.test(1, 1);
-		boolean bottomLeft = connection.test(-1, -1);
-		boolean bottomRight = connection.test(1, -1);
-
-		boolean flip = shouldFlipUVs(state, face);
-		CTContext context = new CTContext();
-
-		context.up = flip ? down : up;
-		context.down = flip ? up : down;
-		context.left = flip ? right : left;
-		context.right = flip ? left : right;
-		context.topLeft = flip ? bottomRight : topLeft;
-		context.topRight = flip ? bottomLeft : topRight;
-		context.bottomLeft = flip ? topRight : bottomLeft;
-		context.bottomRight = flip ? topLeft : bottomRight;
-
-		return context;
-	}
-
-	default boolean shouldFlipUVs(BlockState state, Direction face) {
-		return false;
-	}
-
-	default int getTextureIndexForContext(IEnviromentBlockReader reader, BlockPos pos, BlockState state, Direction face,
-			CTContext c) {
-		int tileX = 0, tileY = 0;
-		int borders = (!c.up ? 1 : 0) + (!c.down ? 1 : 0) + (!c.left ? 1 : 0) + (!c.right ? 1 : 0);
-
-		if (c.up)
-			tileX++;
-		if (c.down)
-			tileX += 2;
-		if (c.left)
-			tileY++;
-		if (c.right)
-			tileY += 2;
-
-		if (borders == 0) {
-			if (c.topRight)
-				tileX++;
-			if (c.topLeft)
-				tileX += 2;
-			if (c.bottomRight)
-				tileY += 2;
-			if (c.bottomLeft)
-				tileY++;
-		}
-
-		if (borders == 1) {
-			if (!c.right) {
-				if (c.topLeft || c.bottomLeft) {
-					tileY = 4;
-					tileX = -1 + (c.bottomLeft ? 1 : 0) + (c.topLeft ? 1 : 0) * 2;
-				}
-			}
-			if (!c.left) {
-				if (c.topRight || c.bottomRight) {
-					tileY = 5;
-					tileX = -1 + (c.bottomRight ? 1 : 0) + (c.topRight ? 1 : 0) * 2;
-				}
-			}
-			if (!c.down) {
-				if (c.topLeft || c.topRight) {
-					tileY = 6;
-					tileX = -1 + (c.topLeft ? 1 : 0) + (c.topRight ? 1 : 0) * 2;
-				}
-			}
-			if (!c.up) {
-				if (c.bottomLeft || c.bottomRight) {
-					tileY = 7;
-					tileX = -1 + (c.bottomLeft ? 1 : 0) + (c.bottomRight ? 1 : 0) * 2;
-				}
-			}
-		}
-
-		if (borders == 2) {
-			if ((c.up && c.left && c.topLeft) || (c.down && c.left && c.bottomLeft) || (c.up && c.right && c.topRight)
-					|| (c.down && c.right && c.bottomRight))
-				tileX += 3;
-		}
-
-		return tileX + 8 * tileY;
-	}
+	public ConnectedTextureBehaviour getBehaviour();
 
 }
diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/StandardCTBehaviour.java b/src/main/java/com/simibubi/create/foundation/block/connected/StandardCTBehaviour.java
index b6a3a1415..180fba5af 100644
--- a/src/main/java/com/simibubi/create/foundation/block/connected/StandardCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/block/connected/StandardCTBehaviour.java
@@ -1,7 +1,26 @@
 package com.simibubi.create.foundation.block.connected;
 
+import java.util.Arrays;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
+
 public class StandardCTBehaviour extends ConnectedTextureBehaviour {
 
+	CTSpriteShiftEntry shift;
+
+	public StandardCTBehaviour(CTSpriteShiftEntry shift) {
+		this.shift = shift;
+	}
+
+	@Override
+	public CTSpriteShiftEntry get(BlockState state, Direction direction) {
+		return shift;
+	}
 	
-	
+	@Override
+	public Iterable<CTSpriteShiftEntry> getAllCTShifts() {
+		return Arrays.asList(shift);
+	}
+
 }
diff --git a/src/main/java/com/simibubi/create/foundation/block/render/SpriteShifter.java b/src/main/java/com/simibubi/create/foundation/block/render/SpriteShifter.java
index 51e101ac8..a4f0d19c4 100644
--- a/src/main/java/com/simibubi/create/foundation/block/render/SpriteShifter.java
+++ b/src/main/java/com/simibubi/create/foundation/block/render/SpriteShifter.java
@@ -1,7 +1,9 @@
 package com.simibubi.create.foundation.block.render;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.simibubi.create.Create;
 
@@ -27,4 +29,8 @@ public class SpriteShifter {
 		textures.values().forEach(SpriteShiftEntry::loadTextures);
 	}
 
+	public static List<ResourceLocation> getAllTargetSprites() {
+		return textures.values().stream().map(SpriteShiftEntry::getTargetResourceLocation).collect(Collectors.toList());
+	}
+
 }
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java
index dc1951c3a..52be464b9 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java
@@ -1,10 +1,13 @@
 package com.simibubi.create.modules.contraptions.components.contraptions.chassis;
 
-import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
+
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
+import com.simibubi.create.foundation.block.connected.CTSpriteShifter;
+import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType;
+import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour;
 import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures;
-import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
-import com.simibubi.create.foundation.block.render.SpriteShifter;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -68,24 +71,44 @@ public class LinearChassisBlock extends AbstractChassisBlock implements IHaveCon
 	}
 
 	@Override
-	public Iterable<SpriteShiftEntry> getSpriteShifts() {
-		return ImmutableList.of(
-				SpriteShifter.get("block/translation_chassis_top", "block/connected/translation_chassis_top"),
-				SpriteShifter.get("block/translation_chassis_top_sticky",
-						"block/connected/translation_chassis_top_sticky"));
+	public ConnectedTextureBehaviour getBehaviour() {
+		return new ChassisCTBehaviour();
 	}
+	
+	private static class ChassisCTBehaviour extends ConnectedTextureBehaviour {
 
-	@Override
-	public boolean shouldFlipUVs(BlockState state, Direction face) {
-		if (state.get(AXIS).isHorizontal() && face.getAxisDirection() == AxisDirection.POSITIVE)
-			return true;
-		return IHaveConnectedTextures.super.shouldFlipUVs(state, face);
-	}
+		static final CTSpriteShiftEntry regular = CTSpriteShifter.get(CTType.OMNIDIRECTIONAL,
+				"translation_chassis_top");
+		static final CTSpriteShiftEntry sticky = CTSpriteShifter.get(CTType.OMNIDIRECTIONAL,
+				"translation_chassis_top_sticky");
+
+		@Override
+		public CTSpriteShiftEntry get(BlockState state, Direction direction) {
+			Block block = state.getBlock();
+			BooleanProperty glueableSide = ((LinearChassisBlock) block).getGlueableSide(state, direction);
+			if (glueableSide == null)
+				return null;
+			return state.get(glueableSide) ? sticky : regular;
+		}
+		
+		@Override
+		public Iterable<CTSpriteShiftEntry> getAllCTShifts() {
+			return Arrays.asList(regular, sticky);
+		}
+
+		@Override
+		public boolean shouldFlipUVs(BlockState state, Direction face) {
+			if (state.get(AXIS).isHorizontal() && face.getAxisDirection() == AxisDirection.POSITIVE)
+				return true;
+			return super.shouldFlipUVs(state, face);
+		}
+
+		@Override
+		public boolean connectsTo(BlockState state, BlockState other, IEnviromentBlockReader reader, BlockPos pos,
+				BlockPos otherPos, Direction face) {
+			return sameKind(state, other) && state.get(AXIS) == other.get(AXIS);
+		}
 
-	@Override
-	public boolean connectsTo(BlockState state, BlockState other, IEnviromentBlockReader reader, BlockPos pos,
-			BlockPos otherPos, Direction face) {
-		return sameKind(state, other) && state.get(AXIS) == other.get(AXIS);
 	}
 
 }
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java
index 036718abe..8d4c14593 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java
@@ -104,10 +104,11 @@ public class CrushingWheelControllerBlock extends Block implements IHaveNoBlockI
 	}
 
 	public void updateSpeed(BlockState state, World world, BlockPos pos) {
-		CrushingWheelControllerTileEntity te = (CrushingWheelControllerTileEntity) world.getTileEntity(pos);
-
-		if (te == null)
+		TileEntity tileEntity = world.getTileEntity(pos);
+		if (tileEntity == null || !(tileEntity instanceof CrushingWheelControllerTileEntity))
 			return;
+
+		CrushingWheelControllerTileEntity te = (CrushingWheelControllerTileEntity) tileEntity;
 		if (!state.get(VALID) || CrushingWheelControllerTileEntity.isFrozen()) {
 			if (te.crushingspeed != 0) {
 				te.crushingspeed = 0;
diff --git a/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java b/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java
index e29cddbf3..21ae8dd44 100644
--- a/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java
+++ b/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java
@@ -1,6 +1,10 @@
 package com.simibubi.create.modules.palettes;
 
+import com.simibubi.create.foundation.block.connected.CTSpriteShifter;
+import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour;
 import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures;
+import com.simibubi.create.foundation.block.connected.StandardCTBehaviour;
+import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType;
 
 import net.minecraft.block.Blocks;
 import net.minecraft.block.GlassBlock;
@@ -20,4 +24,9 @@ public class CTGlassBlock extends GlassBlock implements IHaveConnectedTextures {
 		return hasAlpha ? BlockRenderLayer.TRANSLUCENT : super.getRenderLayer();
 	}
 
+	@Override
+	public ConnectedTextureBehaviour getBehaviour() {
+		return new StandardCTBehaviour(CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, getRegistryName().getPath()));
+	}
+
 }
diff --git a/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java b/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java
new file mode 100644
index 000000000..06b79772c
--- /dev/null
+++ b/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java
@@ -0,0 +1,55 @@
+package com.simibubi.create.modules.palettes;
+
+import java.util.Arrays;
+
+import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
+import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour;
+import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
+
+public class LayeredCTBlock extends Block implements IHaveConnectedTextures {
+
+	private LayeredCTBehaviour behaviour;
+
+	public LayeredCTBlock(Properties properties, CTSpriteShiftEntry layerShift) {
+		this(properties, layerShift, null);
+	}
+
+	public LayeredCTBlock(Properties properties, CTSpriteShiftEntry layerShift, CTSpriteShiftEntry topShift) {
+		super(properties);
+		behaviour = new LayeredCTBehaviour(layerShift, topShift);
+	}
+
+	@Override
+	public ConnectedTextureBehaviour getBehaviour() {
+		return behaviour;
+	}
+
+	private static class LayeredCTBehaviour extends ConnectedTextureBehaviour {
+
+		CTSpriteShiftEntry topShift;
+		CTSpriteShiftEntry layerShift;
+
+		public LayeredCTBehaviour(CTSpriteShiftEntry layerShift, CTSpriteShiftEntry topShift) {
+			this.layerShift = layerShift;
+			this.topShift = topShift;
+		}
+
+		@Override
+		public CTSpriteShiftEntry get(BlockState state, Direction direction) {
+			return direction.getAxis().isHorizontal() ? layerShift : topShift;
+		}
+
+		@Override
+		public Iterable<CTSpriteShiftEntry> getAllCTShifts() {
+			if (topShift == null)
+				return Arrays.asList(layerShift);
+			return Arrays.asList(layerShift, topShift);
+		}
+
+	}
+
+}
diff --git a/src/main/resources/assets/create/blockstates/limestone_layers.json b/src/main/resources/assets/create/blockstates/limestone_layers.json
new file mode 100644
index 000000000..7ed9e8f3d
--- /dev/null
+++ b/src/main/resources/assets/create/blockstates/limestone_layers.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+		"": { "model": "create:block/palettes/limestone_layers" }
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json
index 1022cb2d9..70c83ceda 100644
--- a/src/main/resources/assets/create/lang/en_us.json
+++ b/src/main/resources/assets/create/lang/en_us.json
@@ -180,6 +180,7 @@
 	"block.create.polished_limestone": "Polished Limestone",
 	"block.create.polished_limestone_slab": "Polished Limestone Slab",
 	"block.create.limestone_pillar": "Limestone Pillar",
+	"block.create.limestone_layers": "Limestone Layers",
 
 	"block.create.schematicannon": "Schematicannon",
 	"block.create.schematic_table": "Schematic Table",
diff --git a/src/main/resources/assets/create/models/block/palettes/limestone_layers.json b/src/main/resources/assets/create/models/block/palettes/limestone_layers.json
new file mode 100644
index 000000000..a0eba407b
--- /dev/null
+++ b/src/main/resources/assets/create/models/block/palettes/limestone_layers.json
@@ -0,0 +1,7 @@
+{
+    "parent": "block/cube_column",
+    "textures": {
+        "end": "create:block/polished_limestone",
+        "side": "create:block/limestone_layers"
+    }
+}
diff --git a/src/main/resources/assets/create/models/item/limestone_layers.json b/src/main/resources/assets/create/models/item/limestone_layers.json
new file mode 100644
index 000000000..289ddb8d6
--- /dev/null
+++ b/src/main/resources/assets/create/models/item/limestone_layers.json
@@ -0,0 +1,3 @@
+{
+    "parent": "create:block/palettes/limestone_layers"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/textures/block/connected/limestone_layers.png b/src/main/resources/assets/create/textures/block/connected/limestone_layers.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de677d2d1bb10e24d441cd745d7078f29ccb233
GIT binary patch
literal 962
zcmV;z13mnSP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D16N5zK~zXf-IcqJ
z97Pm{>wfE=omubTSyn&-NFV|N2P6=X5+UBox#cGyabn4t#S0)IB#Q-vkU*>jV&(OC
zW~aOQR#%_q38oSUv}Pu#`c6-sbN)I%{_U3^v=+`y&WH22-<f=7G!m5IX}bd>oH8u6
zW=eQFKD+$!y^9Zz=i9Euzy9>SmVCKh`xulmOfE16eo84!w#Ag@5Ex@bXq4mS<<F;!
zljC_e4)~AXpI!a+r(P^DWfZnkB9v!D!_@T6L283iBpKOpAdLU};`Z~;?j6ss&MwG$
zbD`=QVT5u*1h$eJZP&a?Ay6h#N{mY;q){5@9DP^B2WLqPBfu!*-gbT*az@?ZHcsQ%
z4^n9<tKQm}Xv$e@odOi5fREl0sU#+Z2~n?BLqEVaS0*9Eq<~T~21%Q)-KCT<GyVLQ
z0^Zt=AdD&J7~>oRmokPBVgwn$aiDJq1=tl@!fMy-lu|{!F^256+pcZB8zIuvr;8PQ
zHqQCZS|4L39O4mXi?efGRej$V@on3Zv-Ml^DV)a$6CAmajB{Pp_2OhMb#|0O+7&Dk
z#+G;P6!GiLhG<ipx^{kkQlbzBkl>)a1a*ipQdKi)P!3G07*i1sg(3(+a|Ap&r_t_x
z$hK*xX@F8=5MA&nx}03_V{}eRRm5v;h@0BJYau&01)(_mfgs>Qv)@6*y>oL6LLfW1
zSc0=6UJ4FPehIQ0h5=Fz(_|0(sk4+Z$Q?ANG)T>ch=*bF5FJ7h4_}fog4NTryC5!T
zo~deGnQ<84->c=4f)cgr4%>MoV0zf^i}>x$4gT)wqkpbn3cZA^n%#Abfl{vP3KYS$
zMlr)BMJU3ZB7{N?AAj^g5l=t;<b5a^rI=6woiX)^u2;?e)i@5&O+wk|qLR{>iVHFJ
z{q^5hMg0H351u^!wu0Guv>%+->Ue(kgU!XeMSf7kzY#xBS{3<05&tIqfPVA!S1Cq3
z4__+v3Fq*;8akNx4pTU(@qSDRndO=i^!)i1#2n8z&4JwAoEP~)5kLEZsTM_kP{jY|
z2c%%W&wfzC&weoVO_3iI@v|RnZ(bDnK@mUuK|;C64~qEN4<0_aud3?!`OX<D;^~)P
k+=G%GKi{YBwt(;Z*EZ;b=UgbMC;$Ke07*qoM6N<$f)A&?{r~^~

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/create/textures/block/connected/polished_limestone.png b/src/main/resources/assets/create/textures/block/connected/polished_limestone.png
new file mode 100644
index 0000000000000000000000000000000000000000..23fe206a94469566ab0655eed73b9b7d4d8d491d
GIT binary patch
literal 3538
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
Z4|h|@-doPrqW>^}(}~meuWbWw{s(gVEb#yU

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/create/textures/block/limestone_layers.png b/src/main/resources/assets/create/textures/block/limestone_layers.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d2eccf3108a8f65f3ad5a5d59948791b6694868
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0z64XK~y+T6_U$t
z)G!o=eSEi*=}g;!7Q~Jv3!a-dK)e7FLaG=*2nhrWM1|VUbP^|aeC5nhR_FTvp99~%
zd@x4FxWtsNpS@U8<E&89FvjV~sbCzGF<i^!!p-g@eEsy^D6!sdQ^{Ieu2ulpztox+
zHv(fVXU;j5hP1NVeTE<3Z+`#!X;v#>oME|E%0we9FT*?>m9eB2+K3CDa`E@yBi&v-
z*L_cbkX8xBQjNh)!$ZxPaan8SLUF0AHqcs06D>JlGiflpDFxpenU0TT31Rk18>PD0
zxl&ne%@|X2qDm{EluOxfHh%V47TQ)qxRNNHa};H#abIf#Zs*xk0>Fd-fL5|ls^pwY
zK`gi)eG`(gDviSIH0-t3bbo(8jbn-dCvAVe+TeE;W15^xr8FvVo&aB6UYo9)=b2t^
zpPaVF1OzA)Ar%+GbbY@%J6UUyF_hI|l5)PjxS+=Nw(ny)MXe0Sut^FeTTy2zh3TFv
zOIqeimr^MqXij3ZR)agF+}toOi$`mKP;(+Bwi<H^B}Sz*jmtPsBVNa?ltD|#0sHcB
z*rVbU<7tKv#EK6q1xM3&h}C<KlJc^+<6)T`;~cdiQ*EqsE*J2ANjRM|Z9p)4e)$yP
zp?TZ&rnA9&rewEXGbC;Fbi6<PGQf_91H60t=Fjb&G;6#%>~BlSj0w|sNJtn%O2bDd
zq~M!U%J2qz{pux3WDF>i=*;$Krr!*QhY&o{pp1uDv{Ke~Ldr1D{{dAdYScLiNw)w1
N002ovPDHLkV1nY~D@_0Z

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/create/textures/item/unused/Untitled.pdn b/src/main/resources/assets/create/textures/item/unused/Untitled.pdn
deleted file mode 100644
index 2258e25a7ba33d8ed3856968486b4a973c79cce7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4584
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
C>!D!)

diff --git a/src/main/resources/assets/create/textures/item/unused/Untitled.png b/src/main/resources/assets/create/textures/item/unused/Untitled.png
deleted file mode 100644
index 7402b73196d140b55c3def1056e8790d6bf1b94c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 560
zcmV-00?+-4P)<h;3K|Lk000e1NJLTq000mG001Be1^@s68;SVL00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0mVr~K~zXf?UKze
z13?(ZpWQaPODm|<fyCFJz{QQkg}UI((bu2g)Npb^A`%xTHzID%5+`XKHj+(?NF%B=
zZI@Q7+ii``ORJ(r!oj6aGI`$F-|RE*%r4UDba^b!&aqBaWtGn=M>Q^^Lc#OEdsSUk
zc`12vXpluNPua!sA?-5M(OKR}#3c^r=f>e^X@(JwA{BpttFZ~;U;xWY8yN78K*Z??
zW-bG%V8PSV4QGRj$i)?+p%AX(QR-5}DS*j#WFJkOX&QF-4-hj9SlJA{%q8M7zZl~#
zMw3j&f}Po@F6k#u9oS_RsYD7n)I%yhQt}0YC5bo%)H|FsG0i+|`8?IFaveFBh`)8<
zYAoJv63;gw<l+g)$t0ZeN2?-E0bGvaXmT~ftti0#9aQV{F}~vz@DjO&VrDVi--j-@
z8@8t;6jh}KTp}*<ziE2R%T{NmU<3k4gv0Q7+TdN=f*y-We36j%wkpiBEXI9ebeMIx
zom6X@M$QK-gud{cK1xnU&~=>~Hn(@+TUn>t@As2)S-}PJy}foEE%Vy|u8&U0;q&>Z
yi=xOYYtDY+63zag@@M?5Y5}zXu3EtV2LP{5fMyhU-9ME80000<MNUMnLSTYlKKXF~

diff --git a/src/main/resources/assets/create/textures/item/unused/processor2.png b/src/main/resources/assets/create/textures/item/unused/processor2.png
deleted file mode 100644
index 774cecbf1e8cbca82459d4671a9f7989103d1393..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0r5#hK~y+TosmsQ
z8&MR6&kPDx7fF;P8Y5z9-DpL{h*0Q8L|tk?7o{k;PTf?B5D-)l)U_fJ6&3tJ!FJPC
z6;vdkAQZYu4W$^8_){GrX6f|ZJM*HWV!;oFd*94E=bd*)8SQ?L`}EB&nw^27C|n=g
ztLVCJwofBX0)YTmV)5$+RI`7;*zhO4)8G1EcS`~iQ9U^PiJ8y@^76|dOt2dc^Y?gM
zGh&!HN=pm_DeMc5BYp83xk6Z6?BGpATU!@mu^9IEzgtYmAd8x0@&rSJgAYXMbP8Ut
zm&H|8mHb|q=yy#rGkE=`Rt)Gfnw$OT>FKqIWo>AvgWvxF9*;e9Z@z-3s6bcL8~A*U
zyeSen%81I#Uy0ap-keIMvAnbfN4~;Wp(}8Lc;YWdQdJe<@Bxc7?Sd<rY1%cWL-Q<N
znj1l((?#2H`RCY3K>wIxy)3JS)8!PW7mCx9*xKBNc6EZB7d93)HMQ`73Hm#4Yu+h5
z#JilGo}s?J77O#Mn421~h=?yMlZgC^a{n>df17}iDTrwF2VISO5^eA7iFE=u$mVw|
z>)%*pF)-l?ceJ;luBL*2aV&Ap9|$Rwuz}m{HkS}Xi*U8u?PS7c_eBI9%7?pL#zYAz
qCTupF*%`=`GBH(#3~2GZN5?;KnFcPsiW>9)0000<MNUMnLSTZ2!wSCu

diff --git a/src/main/resources/assets/create/textures/item/unused/tube.pdn b/src/main/resources/assets/create/textures/item/unused/tube.pdn
deleted file mode 100644
index 1c9b9385212fcd76fc1be38c25530a73608bbc25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4718
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
XeQkcMa?#cU`3x>wzU$>rq1gWbo9etG

diff --git a/src/main/resources/data/create/loot_tables/blocks/limestone_layers.json b/src/main/resources/data/create/loot_tables/blocks/limestone_layers.json
new file mode 100644
index 000000000..5b42d6f80
--- /dev/null
+++ b/src/main/resources/data/create/loot_tables/blocks/limestone_layers.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "name": "create:limestone_layers",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:limestone_layers"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file