src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java

@@ -29,7 +29,6 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -40,8 +39,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.phys.shapes.VoxelShape;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
 
@@ -94,24 +91,6 @@ public class BlockAtomicReconstructor extends FullyDirectionalBlock.Container im
         return InteractionResult.CONSUME;
     }
 
-    @Override
-    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-        switch (state.getValue(FACING)) {
-            case UP:
-                return VoxelShapes.AtomicReconstructorShapes.SHAPE_U;
-            case DOWN:
-                return VoxelShapes.AtomicReconstructorShapes.SHAPE_D;
-            case EAST:
-                return VoxelShapes.AtomicReconstructorShapes.SHAPE_E;
-            case SOUTH:
-                return VoxelShapes.AtomicReconstructorShapes.SHAPE_S;
-            case WEST:
-                return VoxelShapes.AtomicReconstructorShapes.SHAPE_W;
-            default:
-                return VoxelShapes.AtomicReconstructorShapes.SHAPE_N;
-        }
-    }
-
     @Nullable
     @Override
     public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java

@@ -16,20 +16,15 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 import javax.annotation.Nullable;
 
-import static net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING;
-
 public class BlockBioReactor extends DirectionalBlock.Container {
 
     public BlockBioReactor() {
@@ -52,18 +47,4 @@ public class BlockBioReactor extends DirectionalBlock.Container {
     public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
         return this.openGui(world, player, pos, TileEntityBioReactor.class);
     }
-
-    @Override
-    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-        switch (state.getValue(HORIZONTAL_FACING)) {
-            case EAST:
-                return VoxelShapes.BioReactorShapes.SHAPE_E;
-            case SOUTH:
-                return VoxelShapes.BioReactorShapes.SHAPE_S;
-            case WEST:
-                return VoxelShapes.BioReactorShapes.SHAPE_W;
-            default:
-                return VoxelShapes.BioReactorShapes.SHAPE_N;
-        }
-    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java

@@ -17,15 +17,12 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 import javax.annotation.Nullable;
 
@@ -62,22 +59,4 @@ public class BlockBreaker extends FullyDirectionalBlock.Container {
 
         return this.openGui(world, player, pos, TileEntityBreaker.class);
     }
-
-    @Override
-    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-        switch (state.getValue(FACING)) {
-            case UP:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_U;
-            case DOWN:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_D;
-            case EAST:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_E;
-            case SOUTH:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_S;
-            case WEST:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_W;
-            default:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_N;
-        }
-    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java

@@ -103,17 +103,18 @@ public class BlockCrusher extends BlockContainerBase {
                 : 0;
     }
 
-    @Override
+    // TODO (Rid): Remove Shape
-    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
+//    @Override
-        switch (state.getValue(HORIZONTAL_FACING)) {
+//    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-            case EAST:
+//        switch (state.getValue(HORIZONTAL_FACING)) {
-                return VoxelShapes.GrinderShapes.SHAPE_E;
+//            case EAST:
-            case SOUTH:
+//                return VoxelShapes.GrinderShapes.SHAPE_E;
-                return VoxelShapes.GrinderShapes.SHAPE_S;
+//            case SOUTH:
-            case WEST:
+//                return VoxelShapes.GrinderShapes.SHAPE_S;
-                return VoxelShapes.GrinderShapes.SHAPE_W;
+//            case WEST:
-            default:
+//                return VoxelShapes.GrinderShapes.SHAPE_W;
-                return VoxelShapes.GrinderShapes.SHAPE_N;
+//            default:
-        }
+//                return VoxelShapes.GrinderShapes.SHAPE_N;
-    }
+//        }
+//    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java

@@ -16,15 +16,12 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 import javax.annotation.Nullable;
 
@@ -54,22 +51,4 @@ public class BlockDropper extends FullyDirectionalBlock.Container {
 
         return this.openGui(world, player, pos, TileEntityDropper.class);
     }
-
-    @Override
-    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-        switch (state.getValue(FACING)) {
-            case UP:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_U;
-            case DOWN:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_D;
-            case EAST:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_E;
-            case SOUTH:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_S;
-            case WEST:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_W;
-            default:
-                return VoxelShapes.BlockBreakerShapes.SHAPE_N;
-        }
-    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java

@@ -51,17 +51,18 @@ public class BlockFarmer extends DirectionalBlock.Container {
         return this.openGui(worldIn, player, pos, TileEntityFarmer.class);
     }
 
-    @Override
+    // TODO (Rid): Remove Shape
-    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
+//    @Override
-        switch (state.getValue(FACING)) {
+//    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-            case EAST:
+//        switch (state.getValue(FACING)) {
-                return VoxelShapes.FarmerShapes.SHAPE_E;
+//            case EAST:
-            case SOUTH:
+//                return VoxelShapes.FarmerShapes.SHAPE_E;
-                return VoxelShapes.FarmerShapes.SHAPE_S;
+//            case SOUTH:
-            case WEST:
+//                return VoxelShapes.FarmerShapes.SHAPE_S;
-                return VoxelShapes.FarmerShapes.SHAPE_W;
+//            case WEST:
-            default:
+//                return VoxelShapes.FarmerShapes.SHAPE_W;
-                return VoxelShapes.FarmerShapes.SHAPE_N;
+//            default:
-        }
+//                return VoxelShapes.FarmerShapes.SHAPE_N;
-    }
+//        }
+//    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java

@@ -51,8 +51,9 @@ public class BlockFeeder extends BlockContainerBase {
         return this.openGui(worldIn, player, pos, TileEntityFeeder.class);
     }
 
-    @Override
+    // TODO (Rid): Remove Shape
-    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
+//    @Override
-        return VoxelShapes.FEEDER_SHAPE;
+//    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-    }
+//        return VoxelShapes.FEEDER_SHAPE;
+//    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java

@@ -55,21 +55,22 @@ public class BlockLongRangeBreaker extends FullyDirectionalBlock.Container {
         return this.openGui(world, player, pos, TileEntityLongRangeBreaker.class);
     }
 
-    @Override
+    // TODO (Rid) - Remove Shape
-    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
+//    @Override
-        switch (state.getValue(FACING)) {
+//    public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-            case UP:
+//        switch (state.getValue(FACING)) {
-                return VoxelShapes.BlockBreakerShapes.SHAPE_U;
+//            case UP:
-            case DOWN:
+//                return VoxelShapes.DirectionalBlockBreakerShapes.SHAPE_U;
-                return VoxelShapes.BlockBreakerShapes.SHAPE_D;
+//            case DOWN:
-            case EAST:
+//                return VoxelShapes.DirectionalBlockBreakerShapes.SHAPE_D;
-                return VoxelShapes.BlockBreakerShapes.SHAPE_E;
+//            case EAST:
-            case SOUTH:
+//                return VoxelShapes.DirectionalBlockBreakerShapes.SHAPE_E;
-                return VoxelShapes.BlockBreakerShapes.SHAPE_S;
+//            case SOUTH:
-            case WEST:
+//                return VoxelShapes.DirectionalBlockBreakerShapes.SHAPE_S;
-                return VoxelShapes.BlockBreakerShapes.SHAPE_W;
+//            case WEST:
-            default:
+//                return VoxelShapes.DirectionalBlockBreakerShapes.SHAPE_W;
-                return VoxelShapes.BlockBreakerShapes.SHAPE_N;
+//            default:
-        }
+//                return VoxelShapes.DirectionalBlockBreakerShapes.SHAPE_N;
-    }
+//        }
+//    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/CrystalClusterBlock.java

@@ -31,19 +31,18 @@ import java.util.stream.Stream;
 public class CrystalClusterBlock extends FullyDirectionalBlock {
     public static final DirectionProperty FACING = BlockStateProperties.FACING;
 
-    // TODO: Remove - Duplicate
+    public static final VoxelShape CRYSTAL_SHAPE = Stream.of(
-//    public static final VoxelShape CRYSTAL_SHAPE = Stream.of(
+        Block.box(5, 4, 5, 10, 19, 10), Block.box(4, 0, 4, 11, 5, 11),
-//        Block.box(5, 4, 5, 10, 19, 10), Block.box(4, 0, 4, 11, 5, 11),
+        Block.box(3, 0, 3, 5, 4, 5), Block.box(10, 0, 3, 12, 2, 5),
-//        Block.box(3, 0, 3, 5, 4, 5), Block.box(10, 0, 3, 12, 2, 5),
+        Block.box(12, 0, 4, 13, 1, 5), Block.box(11, 0, 5, 12, 1, 6),
-//        Block.box(12, 0, 4, 13, 1, 5), Block.box(11, 0, 5, 12, 1, 6),
+        Block.box(10, 0, 10, 12, 3, 12), Block.box(3, 0, 10, 5, 1, 12),
-//        Block.box(10, 0, 10, 12, 3, 12), Block.box(3, 0, 10, 5, 1, 12),
+        Block.box(9, 0, 3, 10, 3, 4), Block.box(8, 0, 2, 11, 1, 4),
-//        Block.box(9, 0, 3, 10, 3, 4), Block.box(8, 0, 2, 11, 1, 4),
+        Block.box(4, 0, 2, 5, 2, 3), Block.box(5, 0, 3, 7, 1, 4),
-//        Block.box(4, 0, 2, 5, 2, 3), Block.box(5, 0, 3, 7, 1, 4),
+        Block.box(2, 0, 4, 4, 1, 6), Block.box(3, 0, 5, 4, 3, 6.5),
-//        Block.box(2, 0, 4, 4, 1, 6), Block.box(3, 0, 5, 4, 3, 6.5),
+        Block.box(3, 0, 9, 4, 2, 10), Block.box(2, 0, 8, 4, 1, 10),
-//        Block.box(3, 0, 9, 4, 2, 10), Block.box(2, 0, 8, 4, 1, 10),
+        Block.box(5, 0, 11, 7, 2, 13), Block.box(7, 0, 11, 11, 1, 13),
-//        Block.box(5, 0, 11, 7, 2, 13), Block.box(7, 0, 11, 11, 1, 13),
+        Block.box(10, 0, 9, 13, 1, 11), Block.box(11, 0, 7, 12, 3, 9)
-//        Block.box(10, 0, 9, 13, 1, 11), Block.box(11, 0, 7, 12, 3, 9)
+    ).reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR) ).get();
-//    ).reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR) ).get();
 
     public CrystalClusterBlock(Crystals crystal) {
         super(Block.Properties.of()
@@ -61,6 +60,6 @@ public class CrystalClusterBlock extends FullyDirectionalBlock {
 
     @Override
     public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
-        return VoxelShapes.CRYSTAL_CLUSTER_SHAPE;
+        return CRYSTAL_SHAPE;
     }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ReconstructorRenderer.java

@@ -63,7 +63,7 @@ public class ReconstructorRenderer implements BlockEntityRenderer<TileEntityAtom
         }
 
         matrices.pushPose();
-        matrices.translate(0.5F, 0.5F, 0.45F);
+        matrices.translate(0.5F, 0.5F, 0.5F);
 
         matrices.mulPose(Axis.YP.rotationDegrees(rot));
         matrices.mulPose(Axis.XP.rotationDegrees(pitch));

src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java

@@ -46,7 +46,7 @@ public class RenderWorm extends EntityRenderer<EntityWorm> {
     public void render(EntityWorm entity, float partialTicks, float p_225623_3_, PoseStack matrix, MultiBufferSource buffer, int light) {
         boolean isSnail = entity.getCustomName().getString().equalsIgnoreCase("snail mail");
         matrix.pushPose();
-        matrix.translate(0, 0.75F, 0);
+        matrix.translate(0, 0.7F, 0);
         double boop = Util.getMillis() / 70D;
         matrix.mulPose(Axis.YP.rotationDegrees(-(float) (boop % 360)));
         matrix.translate(0,0,0.4);

src/main/resources/assets/actuallyadditions/models/block/lamp_controller.json

@@ -11,85 +11,73 @@
 	},
 	"elements": [
 		{
-			"from": [0, 4, 4],
+			"from": [0, 15, 0],
-			"to": [1, 12, 12],
+			"to": [1, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 12], "texture": "#back"},
+				"north": {"uv": [15, 0, 16, 1], "texture": "#base", "cullface": "north"},
-				"south": {"uv": [11, 4, 12, 12], "texture": "#back"},
+				"east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"},
-				"west": {"uv": [4, 4, 12, 12], "texture": "#back", "cullface": "west"},
+				"south": {"uv": [0, 0, 1, 1], "texture": "#base", "cullface": "south"},
-				"up": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#back"},
+				"west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base", "cullface": "west"},
-				"down": {"uv": [12, 11, 4, 12], "rotation": 90, "texture": "#back"}
+				"up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base", "cullface": "up"},
+				"down": {"uv": [15, 0, 16, 16], "texture": "#base"}
 			}
 		},
 		{
-			"from": [1, 1, 1],
+			"from": [15, 15, 0],
-			"to": [15, 15, 15],
+			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [23, 23, 8]},
 			"faces": {
-				"north": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#front"},
+				"north": {"uv": [0, 0, 1, 1], "texture": "#base", "cullface": "north"},
-				"east": {"uv": [1, 1, 15, 15], "texture": "#side"},
+				"east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base", "cullface": "east"},
-				"south": {"uv": [1, 1, 15, 15], "texture": "#5"},
+				"south": {"uv": [15, 0, 16, 1], "texture": "#base", "cullface": "south"},
-				"west": {"uv": [1, 1, 15, 15], "texture": "#base"},
+				"west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"},
-				"up": {"uv": [1, 1, 15, 15], "texture": "#top"},
+				"up": {"uv": [15, 0, 16, 16], "texture": "#base", "cullface": "up"},
-				"down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#top"}
+				"down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}
 			}
 		},
 		{
-			"from": [0, 1, 0],
+			"from": [1, 15, 0],
-			"to": [1, 15, 1],
+			"to": [15, 16, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 8]},
 			"faces": {
-				"north": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "north"},
+				"north": {"uv": [1, 0, 15, 1], "texture": "#base", "cullface": "north"},
-				"east": {"uv": [15, 1, 16, 15], "texture": "#base"},
+				"south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"},
-				"south": {"uv": [15, 1, 16, 15], "texture": "#base"},
+				"up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base", "cullface": "up"},
-				"west": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "west"}
+				"down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}
 			}
 		},
 		{
-			"from": [15, 1, 0],
+			"from": [1, 15, 15],
-			"to": [16, 15, 1],
+			"to": [15, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, 23, 23]},
 			"faces": {
-				"north": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "north"},
+				"north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"},
-				"east": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "east"},
+				"south": {"uv": [1, 0, 15, 1], "texture": "#base", "cullface": "south"},
-				"south": {"uv": [0, 1, 1, 15], "texture": "#base"},
+				"up": {"uv": [1, 0, 15, 1], "texture": "#base", "cullface": "up"},
-				"west": {"uv": [0, 1, 1, 15], "texture": "#base"}
+				"down": {"uv": [1, 0, 15, 1], "texture": "#base"}
 			}
 		},
 		{
-			"from": [15, 1, 15],
+			"from": [1, 0, 15],
-			"to": [16, 15, 16],
+			"to": [15, 1, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 23]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]},
 			"faces": {
-				"north": {"uv": [15, 1, 16, 15], "texture": "#base"},
+				"north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"},
-				"east": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "east"},
+				"south": {"uv": [1, 15, 15, 16], "texture": "#base", "cullface": "south"},
-				"south": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "south"},
+				"up": {"uv": [1, 15, 15, 16], "texture": "#base"},
-				"west": {"uv": [15, 1, 16, 15], "texture": "#base"}
+				"down": {"uv": [1, 15, 15, 16], "texture": "#base", "cullface": "down"}
 			}
 		},
 		{
-			"from": [0, 1, 15],
+			"from": [1, 0, 0],
-			"to": [1, 15, 16],
+			"to": [15, 1, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 23]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]},
 			"faces": {
-				"north": {"uv": [0, 1, 1, 15], "texture": "#base"},
+				"north": {"uv": [1, 15, 15, 16], "texture": "#base", "cullface": "north"},
-				"east": {"uv": [0, 1, 1, 15], "texture": "#base"},
+				"south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"},
-				"south": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "south"},
+				"up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"},
-				"west": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "west"}
+				"down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base", "cullface": "down"}
-			}
-		},
-		{
-			"from": [0, 0, 0],
-			"to": [1, 1, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
-			"faces": {
-				"north": {"uv": [15, 15, 16, 16], "texture": "#base", "cullface": "north"},
-				"east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"},
-				"south": {"uv": [0, 15, 1, 16], "texture": "#base", "cullface": "south"},
-				"west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base", "cullface": "west"},
-				"up": {"uv": [0, 0, 1, 16], "texture": "#base"},
-				"down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base", "cullface": "down"}
 			}
 		},
 		{
@@ -106,73 +94,135 @@
 			}
 		},
 		{
-			"from": [1, 0, 0],
+			"from": [0, 0, 0],
-			"to": [15, 1, 1],
+			"to": [1, 1, 16],
+			"faces": {
+				"north": {"uv": [15, 15, 16, 16], "texture": "#base", "cullface": "north"},
+				"east": {"uv": [0, 0, 1, 16], "rotation": 90, "texture": "#base"},
+				"south": {"uv": [0, 15, 1, 16], "texture": "#base", "cullface": "south"},
+				"west": {"uv": [0, 0, 1, 16], "rotation": 270, "texture": "#base", "cullface": "west"},
+				"up": {"uv": [0, 0, 1, 16], "texture": "#base"},
+				"down": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#base", "cullface": "down"}
+			}
+		},
+		{
+			"from": [0, 1, 15],
+			"to": [1, 15, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]},
+			"faces": {
+				"north": {"uv": [0, 1, 1, 15], "texture": "#base"},
+				"east": {"uv": [0, 1, 1, 15], "texture": "#base"},
+				"south": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "south"},
+				"west": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "west"}
+			}
+		},
+		{
+			"from": [15, 1, 15],
+			"to": [16, 15, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]},
+			"faces": {
+				"north": {"uv": [15, 1, 16, 15], "texture": "#base"},
+				"east": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "east"},
+				"south": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "south"},
+				"west": {"uv": [15, 1, 16, 15], "texture": "#base"}
+			}
+		},
+		{
+			"from": [15, 1, 0],
+			"to": [16, 15, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]},
+			"faces": {
+				"north": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "north"},
+				"east": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "east"},
+				"south": {"uv": [0, 1, 1, 15], "texture": "#base"},
+				"west": {"uv": [0, 1, 1, 15], "texture": "#base"}
+			}
+		},
+		{
+			"from": [0, 1, 0],
+			"to": [1, 15, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]},
+			"faces": {
+				"north": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "north"},
+				"east": {"uv": [15, 1, 16, 15], "texture": "#base"},
+				"south": {"uv": [15, 1, 16, 15], "texture": "#base"},
+				"west": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "west"}
+			}
+		},
+		{
+			"from": [1, 14, 1],
+			"to": [15, 15, 15],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]},
+			"faces": {
+				"north": {"uv": [1, 1, 15, 2], "rotation": 180, "texture": "#front"},
+				"east": {"uv": [1, 1, 15, 2], "texture": "#side"},
+				"south": {"uv": [1, 1, 15, 2], "texture": "#back"},
+				"west": {"uv": [1, 1, 15, 2], "texture": "#side"},
+				"up": {"uv": [1, 1, 15, 15], "texture": "#top"},
+				"down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#base"}
+			}
+		},
+		{
+			"from": [1, 1, 1],
+			"to": [15, 2, 15],
+			"faces": {
+				"north": {"uv": [1, 14, 15, 15], "texture": "#front"},
+				"east": {"uv": [1, 14, 15, 15], "texture": "#side"},
+				"south": {"uv": [1, 14, 15, 15], "rotation": 180, "texture": "#back"},
+				"west": {"uv": [1, 14, 15, 15], "texture": "#side"},
+				"up": {"uv": [1, 1, 15, 15], "texture": "#base"},
+				"down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#top"}
+			}
+		},
+		{
+			"from": [14, 2, 1],
+			"to": [15, 14, 15],
+			"rotation": {"angle": 0, "axis": "y", "origin": [22, 8, 8]},
+			"faces": {
+				"north": {"uv": [1, 2, 2, 14], "texture": "#base"},
+				"east": {"uv": [1, 2, 15, 14], "texture": "#side"},
+				"south": {"uv": [14, 2, 15, 14], "texture": "#back"},
+				"west": {"uv": [2, 2, 16, 14], "texture": "#base"}
+			}
+		},
+		{
+			"from": [1, 2, 1],
+			"to": [2, 14, 15],
 			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]},
 			"faces": {
-				"north": {"uv": [1, 15, 15, 16], "texture": "#base", "cullface": "north"},
+				"north": {"uv": [14, 2, 15, 14], "texture": "#base"},
-				"south": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"},
+				"east": {"uv": [2, 2, 16, 14], "texture": "#base"},
-				"up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"},
+				"south": {"uv": [1, 2, 2, 14], "texture": "#back"},
-				"down": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base", "cullface": "down"}
+				"west": {"uv": [1, 2, 15, 14], "texture": "#back"}
 			}
 		},
 		{
-			"from": [1, 0, 15],
+			"from": [2, 2, 14],
-			"to": [15, 1, 16],
+			"to": [14, 14, 15],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 22]},
 			"faces": {
-				"north": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#base"},
+				"north": {"uv": [2, 2, 14, 14], "texture": "#base"},
-				"south": {"uv": [1, 15, 15, 16], "texture": "#base", "cullface": "south"},
+				"south": {"uv": [2, 2, 14, 14], "texture": "#5"}
-				"up": {"uv": [1, 15, 15, 16], "texture": "#base"},
-				"down": {"uv": [1, 15, 15, 16], "texture": "#base", "cullface": "down"}
 			}
 		},
 		{
-			"from": [1, 15, 15],
+			"from": [2, 2, 1],
-			"to": [15, 16, 16],
+			"to": [14, 14, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 23]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]},
 			"faces": {
-				"north": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"},
+				"north": {"uv": [2, 2, 14, 14], "texture": "#front"},
-				"south": {"uv": [1, 0, 15, 1], "texture": "#base", "cullface": "south"},
+				"south": {"uv": [2, 2, 14, 14], "texture": "#base"}
-				"up": {"uv": [1, 0, 15, 1], "texture": "#base", "cullface": "up"},
-				"down": {"uv": [1, 0, 15, 1], "texture": "#base"}
 			}
 		},
 		{
-			"from": [1, 15, 0],
+			"from": [0, 4, 4],
-			"to": [15, 16, 1],
+			"to": [1, 12, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]},
 			"faces": {
-				"north": {"uv": [1, 0, 15, 1], "texture": "#base", "cullface": "north"},
+				"north": {"uv": [4, 4, 5, 12], "texture": "#back"},
-				"south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"},
+				"south": {"uv": [11, 4, 12, 12], "texture": "#back"},
-				"up": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base", "cullface": "up"},
+				"west": {"uv": [4, 4, 12, 12], "texture": "#back", "cullface": "west"},
-				"down": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#base"}
+				"up": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#back"},
-			}
+				"down": {"uv": [12, 11, 4, 12], "rotation": 90, "texture": "#back"}
-		},
-		{
-			"from": [15, 15, 0],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 1], "texture": "#base", "cullface": "north"},
-				"east": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base", "cullface": "east"},
-				"south": {"uv": [15, 0, 16, 1], "texture": "#base", "cullface": "south"},
-				"west": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"},
-				"up": {"uv": [15, 0, 16, 16], "texture": "#base", "cullface": "up"},
-				"down": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base"}
-			}
-		},
-		{
-			"from": [0, 15, 0],
-			"to": [1, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [15, 0, 16, 1], "texture": "#base", "cullface": "north"},
-				"east": {"uv": [15, 0, 16, 16], "rotation": 270, "texture": "#base"},
-				"south": {"uv": [0, 0, 1, 1], "texture": "#base", "cullface": "south"},
-				"west": {"uv": [15, 0, 16, 16], "rotation": 90, "texture": "#base", "cullface": "west"},
-				"up": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#base", "cullface": "up"},
-				"down": {"uv": [15, 0, 16, 16], "texture": "#base"}
 			}
 		}
 	],

src/main/resources/assets/actuallyadditions/models/block/oil_generator.json

@@ -57,51 +57,47 @@
 			}
 		},
 		{
-			"from": [0, 0, 15],
+			"from": [0, 1, 15],
 			"to": [1, 15, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 23]},
 			"faces": {
-				"north": {"uv": [0, 1, 1, 16], "texture": "#base"},
+				"north": {"uv": [0, 1, 1, 15], "texture": "#base"},
-				"east": {"uv": [0, 1, 1, 16], "texture": "#base"},
+				"east": {"uv": [0, 1, 1, 15], "texture": "#base"},
-				"south": {"uv": [0, 1, 1, 16], "texture": "#base", "cullface": "south"},
+				"south": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "south"},
-				"west": {"uv": [0, 1, 1, 16], "texture": "#base", "cullface": "west"},
+				"west": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "west"}
-				"down": {"uv": [0, 0, 1, 1], "texture": "#base", "cullface": "down"}
 			}
 		},
 		{
-			"from": [15, 0, 15],
+			"from": [15, 1, 15],
 			"to": [16, 15, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 23]},
 			"faces": {
-				"north": {"uv": [15, 1, 16, 16], "texture": "#base"},
+				"north": {"uv": [15, 1, 16, 15], "texture": "#base"},
-				"east": {"uv": [15, 1, 16, 16], "texture": "#base", "cullface": "east"},
+				"east": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "east"},
-				"south": {"uv": [15, 1, 16, 16], "texture": "#base", "cullface": "south"},
+				"south": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "south"},
-				"west": {"uv": [15, 1, 16, 16], "texture": "#base"},
+				"west": {"uv": [15, 1, 16, 15], "texture": "#base"}
-				"down": {"uv": [0, 0, 1, 1], "texture": "#base", "cullface": "down"}
 			}
 		},
 		{
-			"from": [15, 0, 0],
+			"from": [15, 1, 0],
 			"to": [16, 15, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [23, 9, 8]},
 			"faces": {
-				"north": {"uv": [0, 1, 1, 16], "texture": "#base", "cullface": "north"},
+				"north": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "north"},
-				"east": {"uv": [0, 1, 1, 16], "texture": "#base", "cullface": "east"},
+				"east": {"uv": [0, 1, 1, 15], "texture": "#base", "cullface": "east"},
-				"south": {"uv": [0, 1, 1, 16], "texture": "#base"},
+				"south": {"uv": [0, 1, 1, 15], "texture": "#base"},
-				"west": {"uv": [0, 1, 1, 16], "texture": "#base"},
+				"west": {"uv": [0, 1, 1, 15], "texture": "#base"}
-				"down": {"uv": [0, 0, 1, 1], "texture": "#base", "cullface": "down"}
 			}
 		},
 		{
-			"from": [0, 0, 0],
+			"from": [0, 1, 0],
 			"to": [1, 15, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]},
 			"faces": {
-				"north": {"uv": [15, 1, 16, 16], "texture": "#base", "cullface": "north"},
+				"north": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "north"},
-				"east": {"uv": [15, 1, 16, 16], "texture": "#base"},
+				"east": {"uv": [15, 1, 16, 15], "texture": "#base"},
-				"south": {"uv": [15, 1, 16, 16], "texture": "#base"},
+				"south": {"uv": [15, 1, 16, 15], "texture": "#base"},
-				"west": {"uv": [15, 1, 16, 16], "texture": "#base", "cullface": "west"},
+				"west": {"uv": [15, 1, 16, 15], "texture": "#base", "cullface": "west"}
-				"down": {"uv": [0, 0, 1, 1], "texture": "#base", "cullface": "down"}
 			}
 		},
 		{
@@ -240,6 +236,53 @@
 				"up": {"uv": [2, 2, 8, 7], "texture": "#animation"},
 				"down": {"uv": [0, 0, 12, 12], "texture": "#animation"}
 			}
+		},
+		{
+			"from": [0, 0, 15],
+			"to": [1, 1, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 23]},
+			"faces": {
+				"north": {"uv": [2, 1, 3, 2], "texture": "#base"},
+				"east": {"uv": [2, 1, 3, 2], "texture": "#base"},
+				"south": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "south"},
+				"west": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "west"},
+				"down": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "down"}
+			}
+		},
+		{
+			"from": [15, 0, 15],
+			"to": [16, 1, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 23]},
+			"faces": {
+				"north": {"uv": [2, 1, 3, 2], "texture": "#base"},
+				"east": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "east"},
+				"south": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "south"},
+				"west": {"uv": [2, 1, 3, 2], "texture": "#base"},
+				"down": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "down"}
+			}
+		},
+		{
+			"from": [15, 0, 0],
+			"to": [16, 1, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]},
+			"faces": {
+				"north": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "north"},
+				"east": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "east"},
+				"south": {"uv": [2, 1, 3, 2], "texture": "#base"},
+				"west": {"uv": [2, 1, 3, 2], "texture": "#base"},
+				"down": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "down"}
+			}
+		},
+		{
+			"from": [0, 0, 0],
+			"to": [1, 1, 1],
+			"faces": {
+				"north": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "north"},
+				"east": {"uv": [2, 1, 3, 2], "texture": "#base"},
+				"south": {"uv": [2, 1, 3, 2], "texture": "#base"},
+				"west": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "west"},
+				"down": {"uv": [2, 1, 3, 2], "texture": "#base", "cullface": "down"}
+			}
 		}
 	],
 	"display": {

src/main/resources/assets/actuallyadditions/textures/item/lens_of_color.png.mcmeta

@@ -1,6 +1,19 @@
 {
   "animation": {
-    "interpolate": true,
+    "frametime": 4,
-    "frametime": 10
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11
+    ]
   }
 }

src/main/resources/assets/actuallyadditions/textures/item/lens_of_disenchanting.png.mcmeta

@@ -1,6 +0,0 @@
-{
-  "animation": {
-    "interpolate": true,
-    "frametime": 10
-  }
-}