diff --git a/build.gradle b/build.gradle
index 33e91c6..667595d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
@@ -16,7 +16,8 @@ repositories {
 }
 
 subprojects {
-    apply plugin: "dev.architectury.loom"
+    apply plugin: 'dev.architectury.loom'
+    apply plugin: 'architectury-plugin'
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/FakeBlocks.java b/common/src/main/java/eu/midnightdust/visualoverhaul/FakeBlocks.java
new file mode 100644
index 0000000..edf9475
--- /dev/null
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/FakeBlocks.java
@@ -0,0 +1,69 @@
+package eu.midnightdust.visualoverhaul;
+
+import eu.midnightdust.visualoverhaul.config.VOConfig;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.model.ModelNameSupplier;
+import net.minecraft.client.model.SpriteGetter;
+import net.minecraft.client.render.OverlayTexture;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.block.BlockRenderManager;
+import net.minecraft.client.render.model.*;
+import net.minecraft.client.render.model.json.JsonUnbakedModel;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.SpriteIdentifier;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.random.Random;
+import net.minecraft.world.BlockRenderView;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static eu.midnightdust.visualoverhaul.VisualOverhaulCommon.LOGGER;
+
+public class FakeBlocks {
+    private static final Baker BAKER = new FakeBaker();
+    private static final Map<Identifier, BakedModel> FAKE_MODELS = new HashMap<>();
+    private static final BlockRenderManager renderManager = MinecraftClient.getInstance().getBlockRenderManager();
+
+    public static void reload(ResourceManager manager) {
+        manager.findResources("models", path -> path.getPath().startsWith("models/fakeblock") && path.getPath().endsWith(".json")).forEach((id, resource) -> {
+            try {
+                JsonUnbakedModel unbaked = JsonUnbakedModel.deserialize(resource.getReader());
+                BakedModel baked = unbaked.bake(new ModelTextures.Builder().addFirst(unbaked.getTextures()).build(() -> "#fakeblock"), BAKER,
+                        new ModelBakeSettings(){}, Boolean.TRUE.equals(unbaked.getAmbientOcclusion()), unbaked.getGuiLight() != null && unbaked.getGuiLight().isSide(), unbaked.getTransformation());
+                Identifier fakeId = Identifier.of(id.getNamespace(), id.getPath().replace("models/fakeblock/", "").replace(".json", ""));
+                FAKE_MODELS.put(fakeId, baked);
+                if (VOConfig.debug) LOGGER.info("Successfully loaded fake block model: {}", fakeId);
+            } catch (IOException e) {
+                LOGGER.error("Error occurred while loading fake block model {}", id.toString(), e);
+            }
+        });
+    }
+    public static void renderFakeBlock(Identifier id, BlockPos pos, BlockRenderView world, MatrixStack matrices, VertexConsumer vertexConsumer) {
+        renderManager.getModelRenderer().render(world, FAKE_MODELS.get(id), Blocks.DIRT.getDefaultState(), // State is just needed for a few generic checks
+                pos, matrices, vertexConsumer, false, Random.create(), 0, OverlayTexture.DEFAULT_UV);
+    }
+
+    public static class FakeBaker implements Baker {
+        public BakedModel bake(Identifier id, ModelBakeSettings settings) {
+            return null; // Not used in Json models, so we just leave ít like this and cross our fingers.
+        }
+
+        @Override
+        public SpriteGetter getSpriteGetter() {
+            return new SpriteGetter() {
+                static final SpriteIdentifier MISSING = new SpriteIdentifier(Identifier.ofVanilla("textures/atlas/blocks.png"), Identifier.ofVanilla("missingno"));
+
+                @Override public Sprite get(SpriteIdentifier spriteId) { return spriteId.getSprite(); }
+                @Override public Sprite getMissing(String textureId) { return MISSING.getSprite(); }
+            };
+        }
+
+        public ModelNameSupplier getModelNameSupplier() { return () -> "#fakeblock"; }
+    }
+}
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/IconicButtons.java b/common/src/main/java/eu/midnightdust/visualoverhaul/IconicButtons.java
index b588694..ca89e14 100644
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/IconicButtons.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/IconicButtons.java
@@ -4,24 +4,39 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import eu.midnightdust.visualoverhaul.config.VOConfig;
 import eu.midnightdust.visualoverhaul.mixin.TextureManagerAccessor;
 import eu.midnightdust.visualoverhaul.util.ModIconUtil;
+import eu.midnightdust.visualoverhaul.util.VOColorUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.texture.*;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.client.texture.ResourceTexture;
+import net.minecraft.client.texture.TextureManager;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.ColorHelper;
+import net.minecraft.util.math.MathHelper;
 import org.apache.logging.log4j.LogManager;
 
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
+import java.util.function.Function;
+
+import static eu.midnightdust.visualoverhaul.VisualOverhaulCommon.LOGGER;
+import static eu.midnightdust.visualoverhaul.util.VOColorUtil.alphaAndBrightness;
 
 public class IconicButtons {
     MinecraftClient client = MinecraftClient.getInstance();
+    TextureManager textureManager = client.getTextureManager();
     private String buttonId;
     private Text prevText;
     private Identifier iconId;
+    private static final Map<Identifier, Identifier> ICONS = new HashMap<>();
+
     public IconicButtons() {}
     public void init(ClickableWidget widget) {
         if (widget == null || widget.getMessage() == null || widget.getMessage().getContent() == null) return;
@@ -30,57 +45,63 @@ public class IconicButtons {
         if (VOConfig.buttonIcons && !buttonId.isEmpty()) {
             if (VOConfig.debug) System.out.println(buttonId);
             iconId = Identifier.tryParse("iconic:textures/gui/icons/" + buttonId.toLowerCase()+".png");
-            if (buttonId.endsWith(".midnightconfig.title"))
-            {
+            // Show mod icons in MidnightConfig overview
+            if (buttonId.endsWith(".midnightconfig.title")) {
                 iconId = Identifier.of("modid", buttonId.replace(".midnightconfig.title", "") + "_icon");
                 NativeImageBackedTexture icon = new ModIconUtil(buttonId.replace(".midnightconfig.title", "")).createModIcon();
                 if (icon != null) {
                     client.getTextureManager().registerTexture(iconId, icon);
+                    ICONS.put(iconId, iconId);
                 } else {
                     iconId = null;
                 }
             }
-            if (iconId == null) return;
-            TextureManager textureManager = client.getTextureManager();
-            AbstractTexture abstractTexture = textureManager.getOrDefault(iconId, null);
-            if (abstractTexture == null) {
-                abstractTexture = new ResourceTexture(iconId);
-                try { abstractTexture.load(((TextureManagerAccessor)textureManager).getResourceContainer());
-                } catch (Exception e) {iconId = null; return;}
+            // Handle dynamic icons
+            else if (iconId != null && !ICONS.containsKey(iconId)) {
+                if (((TextureManagerAccessor)textureManager).getResourceContainer().getResource(iconId).isEmpty())
+                    return; // If no icon is present, don't load it
+
+                ResourceTexture abstractTexture = new ResourceTexture(iconId);
+                if (VOConfig.debug) System.out.println("Loading dynamic icon: "+iconId);
+                try {
+                    abstractTexture.loadContents(((TextureManagerAccessor)textureManager).getResourceContainer());
+                } catch (Exception e) {e.fillInStackTrace();}
                 textureManager.registerTexture(iconId, abstractTexture);
+                ICONS.put(iconId, iconId);
             }
-            if (abstractTexture == MissingSprite.getMissingSpriteTexture()) iconId = null;
         }
     }
     public void renderIcons(DrawContext context, ClickableWidget widget, float alpha) {
         if (widget.getMessage() == null || widget.getWidth() <= 20) return;
         if (prevText != widget.getMessage()) init(widget);
-        if (VOConfig.buttonIcons && !buttonId.equals("") && iconId != null) {
+        if (VOConfig.buttonIcons && !buttonId.isEmpty() && iconId != null && ICONS.containsKey(iconId)) {
             int scaledWidth = client.getWindow().getScaledWidth();
 
             boolean limitedSpace = client.textRenderer.getWidth(widget.getMessage()) > (widget.getWidth() * 0.75f);
             boolean showLeftWhenBoth = (VOConfig.buttonIconPosition.equals(VOConfig.IconPosition.BOTH) && !limitedSpace) || (VOConfig.buttonIconPosition.equals(VOConfig.IconPosition.BOTH) && widget.getX() < scaledWidth/2);
             boolean showRightWhenBoth = (VOConfig.buttonIconPosition.equals(VOConfig.IconPosition.BOTH) && !limitedSpace) || (VOConfig.buttonIconPosition.equals(VOConfig.IconPosition.BOTH) && widget.getX() > scaledWidth/2);
 
-            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
-            if (!widget.active) RenderSystem.setShaderColor(0.3F, 0.3F, 0.3F, alpha);
+            int color = widget.active ? alphaAndBrightness(alpha, 1.0F) : alphaAndBrightness(alpha, 0.3F);
             RenderSystem.enableBlend();
             RenderSystem.enableDepthTest();
             int inset = 2;
-            if (VOConfig.zoomIconOnHover && widget.isSelected()) inset = 1;
+            if (VOConfig.zoomIconOnHover && widget.isSelected() && widget.active) inset = 1;
             int size = 20-inset*2;
 
+            Identifier textureId = ICONS.get(iconId);
+
             if (VOConfig.buttonIconPosition.equals(VOConfig.IconPosition.LEFT) || showLeftWhenBoth || (VOConfig.buttonIconPosition.equals(VOConfig.IconPosition.LOCATION) && widget.getX() < scaledWidth/2))
-                context.drawTexture(iconId, widget.getX()+inset, widget.getY()+inset, 0, 0, size, size, size, size);
+                context.drawTexture(RenderLayer::getGuiTextured, textureId, widget.getX()+inset, widget.getY()+inset, 0, 0, size, size, size, size, size, size, color);
 
             if (VOConfig.buttonIconPosition.equals(VOConfig.IconPosition.RIGHT) || showRightWhenBoth || (VOConfig.buttonIconPosition.equals(VOConfig.IconPosition.LOCATION) && widget.getX()+widget.getWidth() > scaledWidth/2))
-                context.drawTexture(iconId, widget.getX()+widget.getWidth()-20+inset, widget.getY()+inset, 0, 0, size, size, size, size);
+                context.drawTexture(RenderLayer::getGuiTextured, textureId, widget.getX()+widget.getWidth()-20+inset, widget.getY()+inset, 0, 0, size, size, size, size, size, size, color);
 
-            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            RenderSystem.disableBlend();
+            RenderSystem.disableDepthTest();
         }
     }
     public static void reload(ResourceManager manager) {
-        manager.findResources("textures", path -> path.getPath().contains(".properties")).forEach((id, resource) -> {
+        manager.findResources("textures", path -> path.getNamespace().equals("iconic") && path.getPath().contains(".properties")).forEach((id, resource) -> {
             if (manager.getResource(id).isEmpty()) return;
             try (InputStream stream = manager.getResource(id).get().getInputStream()) {
                 Identifier iconId = Identifier.of(id.getNamespace(), id.getPath().replace(".properties", ".png"));
@@ -102,16 +123,11 @@ public class IconicButtons {
                 }
 
                 if (properties.get("texture") != null) {
-                    Identifier textureId = Identifier.of(properties.getProperty("texture"));
-                    TextureManager textureManager = MinecraftClient.getInstance().getTextureManager();
-                    AbstractTexture abstractTexture = textureManager.getOrDefault(iconId, null);
-                    if (abstractTexture == null) {
-                        abstractTexture = new ResourceTexture(textureId);
-                        textureManager.registerTexture(iconId, abstractTexture);
-                    }
+                    Identifier textureId = Identifier.tryParse(properties.getProperty("texture"));
+                    ICONS.put(iconId, textureId);
                 }
             } catch (Exception e) {
-                LogManager.getLogger("Iconic").error("Error occurred while loading texture.properties " + id.toString(), e);
+                LOGGER.error("Error occurred while loading texture.properties for button icon {}", id.toString(), e);
             }
         });
     }
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java b/common/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java
index 8ccd5c5..68d32b8 100755
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java
@@ -1,7 +1,6 @@
 package eu.midnightdust.visualoverhaul;
 
 import eu.midnightdust.visualoverhaul.config.VOConfig;
-import net.minecraft.block.Block;
 
 import static eu.midnightdust.visualoverhaul.VisualOverhaulCommon.MOD_ID;
 
@@ -11,8 +10,6 @@ public class VisualOverhaulClient {
     public static int grassColor = -8934609;
     public static int potionColor = -13083194;
 
-    public static Block JukeBoxTop;
-
     public static void onInitializeClient() {
         VOConfig.init(MOD_ID, VOConfig.class);
     }
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulCommon.java b/common/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulCommon.java
index 3e02b39..7dd3741 100755
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulCommon.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulCommon.java
@@ -3,6 +3,8 @@ package eu.midnightdust.visualoverhaul;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -12,6 +14,7 @@ import java.util.UUID;
 
 public class VisualOverhaulCommon {
     public static final String MOD_ID = "visualoverhaul";
+    public static final Logger LOGGER = LoggerFactory.getLogger("VisualOverhaul");
     public static final List<UUID> playersWithMod = new ArrayList<>();
     public static final Map<BlockPos, ItemStack> jukeboxItems = new HashMap<>();
 
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java b/common/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java
deleted file mode 100755
index aa498e3..0000000
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package eu.midnightdust.visualoverhaul.block;
-
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.state.StateManager;
-import net.minecraft.state.property.BooleanProperty;
-import net.minecraft.state.property.Properties;
-
-public class JukeboxTop extends Block {
-    private static final BooleanProperty HAS_RECORD = Properties.HAS_RECORD;
-
-    public JukeboxTop() {
-        super(AbstractBlock.Settings.copy(Blocks.JUKEBOX));
-        this.setDefaultState(this.stateManager.getDefaultState().with(HAS_RECORD,false));
-    }
-    @Override
-    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(HAS_RECORD);
-    }
-}
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java b/common/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java
index f6ca6de..49576a3 100755
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java
@@ -13,7 +13,7 @@ public class FurnaceWoodenPlanksModel extends Model {
     public static final EntityModelLayer WOODEN_PLANKS_MODEL_LAYER = new EntityModelLayer(id("wooden_planks"), "main");
 
     public FurnaceWoodenPlanksModel(ModelPart root) {
-        super(RenderLayer::getEntitySolid);
+        super(root, RenderLayer::getEntitySolid);
         bb_main = root;
         bb_main.setPivot(0.0F, 24.0F, 0.0F);
     }
@@ -34,7 +34,7 @@ public class FurnaceWoodenPlanksModel extends Model {
         return modelData;
     }
 
-    public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, int color) {
-        bb_main.render(matrices, vertices, light, overlay);
-    }
+//    public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, int color) {
+//        bb_main.render(matrices, vertices, light, overlay);
+//    }
 }
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java
index d025bfc..428b032 100755
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java
@@ -9,9 +9,9 @@ import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
-import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.ModelTransformationMode;
 import org.joml.AxisAngle4f;
 import org.joml.Math;
 import org.joml.Quaternionf;
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java
index d9644d0..f7939cf 100755
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java
@@ -13,10 +13,10 @@ import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
-import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.ModelTransformationMode;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.util.Identifier;
 import org.joml.AxisAngle4f;
@@ -41,7 +41,7 @@ public class FurnaceBlockEntityRenderer<E extends AbstractFurnaceBlockEntity> im
             ItemStack input = blockEntity.getStack(0);
             ItemStack fuel = blockEntity.getStack(1);
             ItemStack output = blockEntity.getStack(2);
-            float angle = (blockState.get(AbstractFurnaceBlock.FACING)).asRotation();
+            float angle = (blockState.get(AbstractFurnaceBlock.FACING)).getRotationQuaternion().angle();
 
             if(!input.isEmpty() || !output.isEmpty()) {
                 matrices.push();
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java
index e763fd8..3adb370 100755
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java
@@ -1,97 +1,73 @@
 package eu.midnightdust.visualoverhaul.block.renderer;
 
+import eu.midnightdust.visualoverhaul.FakeBlocks;
 import eu.midnightdust.visualoverhaul.VisualOverhaulClient;
 import eu.midnightdust.visualoverhaul.config.VOConfig;
 import eu.midnightdust.visualoverhaul.util.SoundTest;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.block.BlockState;
 import net.minecraft.block.SideShapeType;
 import net.minecraft.block.entity.JukeboxBlockEntity;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.render.*;
+import net.minecraft.client.render.block.BlockRenderManager;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
-import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.component.ComponentMap;
-import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.CustomModelDataComponent;
-import net.minecraft.item.ItemStack;
-import net.minecraft.registry.Registries;
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.random.Random;
-import org.apache.logging.log4j.LogManager;
+import net.minecraft.world.BlockRenderView;
 import org.joml.AxisAngle4f;
 import org.joml.Math;
 import org.joml.Quaternionf;
 
 import java.util.Objects;
 
+import static eu.midnightdust.visualoverhaul.VisualOverhaulCommon.id;
 import static eu.midnightdust.visualoverhaul.VisualOverhaulCommon.jukeboxItems;
 
 @Environment(EnvType.CLIENT)
 public class JukeboxBlockEntityRenderer implements BlockEntityRenderer<JukeboxBlockEntity> {
-    private ItemStack record;
-    private Identifier discItem;
 
-    public JukeboxBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
-    }
+    public JukeboxBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {}
 
     @Override
     public void render(JukeboxBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
         if (VOConfig.jukebox) {
             int lightAbove = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos().up());
 
+            Identifier discModel = null; // If the sound is stopped or no sound is playing, no model is set //
+
             // Tries to get the disc using the serverside method
             if (jukeboxItems.containsKey(blockEntity.getPos()) && !jukeboxItems.get(blockEntity.getPos()).isEmpty()) {
-                record = jukeboxItems.get(blockEntity.getPos()).copy();
+                discModel = RoundDiscRenderer.getModelId(jukeboxItems.get(blockEntity.getPos()));
             }
             // Else gets the record sound played at the position of the jukebox //
             else if (SoundTest.getSound(blockEntity.getPos()) != null) {
                 // Converts the Sound ID to the item ID of the appropriate disc (minecraft:music_disc.cat -> minecraft:music_disc_cat) //
-                discItem = Identifier.of(String.valueOf(SoundTest.getSound(blockEntity.getPos())).replace(".", "_"));
-
-                // Tries to get the disc item from the registry //
-                if (Registries.ITEM.getOrEmpty(discItem).isPresent()) {
-                    record = new ItemStack(Registries.ITEM.get(discItem));
-                }
-                else {
-                    if (VOConfig.debug) LogManager.getLogger("VisualOverhaul").warn("Error getting music disc item for " + SoundTest.getSound(blockEntity.getPos()));
-                    discItem = null;
-                    record = ItemStack.EMPTY;
-                }
-            }
-            // If the sound is stopped or no sound is playing, the stack is set to an empty stack //
-            else {
-                discItem = null;
-                record = ItemStack.EMPTY;
+                discModel = Identifier.of(String.valueOf(SoundTest.getSound(blockEntity.getPos())).replace(".", "_"));
             }
 
-            if (!record.isEmpty()) {
-                //record.setCount(2);
-                record.applyComponentsFrom(ComponentMap.builder().add(DataComponentTypes.CUSTOM_MODEL_DATA, new CustomModelDataComponent(710)).build());
+            if (discModel != null) {
                 matrices.push();
 
                 matrices.translate(0.5f, 1.03f, 0.5f);
                 matrices.scale(0.75f, 0.75f, 0.75f);
                 matrices.multiply(new Quaternionf(new AxisAngle4f(Math.toRadians(Util.getMeasuringTimeMs() / 9.0f), 0, 1, 0)));
-                MinecraftClient.getInstance().getItemRenderer().renderItem(record, ModelTransformationMode.GROUND, lightAbove, overlay, matrices, vertexConsumers, blockEntity.getWorld(), 0);
 
+                RoundDiscRenderer.render(discModel, lightAbove, overlay, matrices, vertexConsumers);
                 matrices.pop();
             }
             if (VOConfig.jukebox_fake_block && !blockEntity.getWorld().getBlockState(blockEntity.getPos().up()).isSideSolid(blockEntity.getWorld(),blockEntity.getPos().up(), Direction.DOWN, SideShapeType.FULL)) {
                 matrices.push();
                 matrices.translate(0f, 1f, 0f);
-                if (record == ItemStack.EMPTY) {
-                    MinecraftClient.getInstance().getBlockRenderManager().renderBlock(VisualOverhaulClient.JukeBoxTop.getDefaultState().with(Properties.HAS_RECORD, false), blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()), false, Random.create());
-                } else {
-                    MinecraftClient.getInstance().getBlockRenderManager().renderBlock(VisualOverhaulClient.JukeBoxTop.getDefaultState().with(Properties.HAS_RECORD, true), blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()), false, Random.create());
-                }
+                Identifier blockId = discModel != null ? id("jukebox_top_playing") : id("jukebox_top_stopped");
+                FakeBlocks.renderFakeBlock(blockId, blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()));
                 matrices.pop();
             }
         }
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/RoundDiscRenderer.java b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/RoundDiscRenderer.java
new file mode 100644
index 0000000..a597c66
--- /dev/null
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/RoundDiscRenderer.java
@@ -0,0 +1,110 @@
+package eu.midnightdust.visualoverhaul.block.renderer;
+
+import eu.midnightdust.visualoverhaul.mixin.ItemRenderStateAccessor;
+import net.minecraft.client.model.ModelNameSupplier;
+import net.minecraft.client.model.SpriteGetter;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.item.ItemRenderState;
+import net.minecraft.client.render.model.*;
+import net.minecraft.client.render.model.json.JsonUnbakedModel;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.SpriteIdentifier;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ModelTransformationMode;
+import net.minecraft.registry.Registries;
+import net.minecraft.util.Identifier;
+
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+
+import static eu.midnightdust.visualoverhaul.VisualOverhaulCommon.id;
+
+/*
+* Fabric's Model API would be much more elegant, but doesn't work on NeoForge, so I came up with this very hacky (but kinda cool) solution.
+*/
+public class RoundDiscRenderer {
+    private static final Map<Identifier, BakedModel> DISCS = new HashMap<>();
+    private static final DynamicBaker maBaker = new DynamicBaker();
+
+    /*
+    * Dynamically generates a baked model for the specified music disc.
+    */
+    private static BakedModel requestModel(Identifier id) {
+        JsonUnbakedModel model = JsonUnbakedModel.deserialize(new StringReader(getJsonModel(id)));
+        BakedModel bakedModel = model.bake(new ModelTextures.Builder().addFirst(model.getTextures()).build(()->"0"), maBaker, new ModelBakeSettings(){}, false, false, model.getTransformation());
+        DISCS.put(id, bakedModel);
+        return bakedModel;
+    }
+
+    /*
+    * Yes, this is VERY cursed, but hey, it works :)
+    */
+    private static String getJsonModel(Identifier id) {
+        return "{\"textures\":{\"0\":\""+
+                id.getNamespace()+":"+(id.getPath().contains("/") ? "" : "item/")+id.getPath()+
+                "\",\"particle\":\"#0\"},\"elements\":[{\"from\":[7.5,0,7.5],\"to\":[8.5,1,8.5],\"faces\":{\"up\":{\"uv\":[7,7,8,8],\"texture\":\"#0\"}}},{\"from\":[9.5,0,9.5],\"to\":[10.5,1,10.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[10,8,10]},\"faces\":{\"up\":{\"uv\":[5,6,6,7],\"texture\":\"#0\"}}},{\"from\":[5.5,0,9.5],\"to\":[6.5,1,10.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[6,8,10]},\"faces\":{\"up\":{\"uv\":[9,6,10,7],\"texture\":\"#0\"}}},{\"from\":[5.5,0,5.5],\"to\":[6.5,1,6.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[6,8,6]},\"faces\":{\"up\":{\"uv\":[9,8,10,9],\"texture\":\"#0\"}}},{\"from\":[9.5,0,5.5],\"to\":[10.5,1,6.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[10,8,6]},\"faces\":{\"up\":{\"uv\":[5,8,6,9],\"texture\":\"#0\"}}},{\"from\":[6.5,0,5.5],\"to\":[9.5,1,6.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[8,8,6]},\"faces\":{\"up\":{\"uv\":[6,8,9,9],\"texture\":\"#0\"}}},{\"from\":[2.5,0,4.5],\"to\":[13.5,1,5.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[8,8,5]},\"faces\":{\"up\":{\"uv\":[2,9,13,10],\"texture\":\"#0\"}}},{\"from\":[4.5,0.001,2.5],\"to\":[5.5,1.001,13.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[5,8,8]},\"faces\":{\"up\":{\"uv\":[2,9,13,10],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[10.5,0.001,2.5],\"to\":[11.5,1.001,13.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[11,8,8]},\"faces\":{\"up\":{\"uv\":[2,9,13,10],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[2.5,0,10.5],\"to\":[13.5,1,11.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[8,8,11]},\"faces\":{\"up\":{\"uv\":[2,5,13,6],\"texture\":\"#0\"}}},{\"from\":[6.5,0,9.5],\"to\":[9.5,1,10.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[8,8,10]},\"faces\":{\"up\":{\"uv\":[6,6,9,7],\"texture\":\"#0\"}}},{\"from\":[5.5,0,6.5],\"to\":[6.5,1,9.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[6,8,8]},\"faces\":{\"up\":{\"uv\":[6,8,9,9],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[9.5,0,6.5],\"to\":[10.5,1,9.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[10,8,8]},\"faces\":{\"up\":{\"uv\":[6,6,9,7],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[8.5,0,6.5],\"to\":[9.5,1,9.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[9,8,8]},\"faces\":{\"up\":{\"uv\":[6,7,7,8],\"texture\":\"#0\"}}},{\"from\":[6.5,0,6.5],\"to\":[7.5,1,9.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[7,8,8]},\"faces\":{\"up\":{\"uv\":[8,7,9,8],\"texture\":\"#0\"}}},{\"from\":[7.5,0,8.5],\"to\":[8.5,1,9.5],\"faces\":{\"up\":{\"uv\":[6,7,7,8],\"texture\":\"#0\"}}},{\"from\":[7.5,0,6.5],\"to\":[8.5,1,7.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[8,8,6]},\"faces\":{\"up\":{\"uv\":[8,7,9,8],\"texture\":\"#0\"}}},{\"from\":[7.5,-0.001,11.5],\"to\":[12.5,0.999,12.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[10,8,12]},\"faces\":{\"up\":{\"uv\":[3,5,8,6],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[3.5,-0.001,11.5],\"to\":[7.5,0.999,12.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[5,8,12]},\"faces\":{\"up\":{\"uv\":[8,5,12,6],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[5.5,0,12.5],\"to\":[10.5,1,13.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[8,8,13]},\"faces\":{\"up\":{\"uv\":[2,5,3,10],\"rotation\":90,\"texture\":\"#0\"}}},{\"from\":[6.5,0,13.5],\"to\":[11.5,1,14.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[9,8,14]},\"faces\":{\"east\":{\"uv\":[10,11,11,12],\"texture\":\"#0\"},\"south\":{\"uv\":[5,12,10,13],\"texture\":\"#0\"},\"up\":{\"uv\":[5,3,10,4],\"texture\":\"#0\"}}},{\"from\":[4.5,0,13.5],\"to\":[6.5,1,14.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[4,8,14]},\"faces\":{\"south\":{\"uv\":[3,11,5,12],\"texture\":\"#0\"},\"west\":{\"uv\":[2,11,3,12],\"texture\":\"#0\"},\"up\":{\"uv\":[8,3,10,4],\"texture\":\"#0\"}}},{\"from\":[3.5,0,12.5],\"to\":[4.5,1,13.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[2,8,13]},\"faces\":{\"south\":{\"uv\":[13,10,14,11],\"texture\":\"#0\"},\"west\":{\"uv\":[13,10,14,11],\"texture\":\"#0\"},\"up\":{\"uv\":[10,4,11,5],\"texture\":\"#0\"}}},{\"from\":[2.5,0,11.5],\"to\":[3.5,1,12.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[1,8,12]},\"faces\":{\"south\":{\"uv\":[12,11,13,12],\"texture\":\"#0\"},\"west\":{\"uv\":[10,11,11,12],\"texture\":\"#0\"},\"up\":{\"uv\":[11,4,12,5],\"texture\":\"#0\"}}},{\"from\":[12.5,0,11.5],\"to\":[13.5,1,12.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[11,8,12]},\"faces\":{\"east\":{\"uv\":[13,10,14,11],\"texture\":\"#0\"},\"south\":{\"uv\":[13,10,14,11],\"texture\":\"#0\"},\"up\":{\"uv\":[2,4,3,5],\"texture\":\"#0\"}}},{\"from\":[11.5,0,12.5],\"to\":[12.5,1,13.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[10,8,13]},\"faces\":{\"east\":{\"uv\":[12,11,13,12],\"texture\":\"#0\"},\"south\":{\"uv\":[11,11,12,12],\"texture\":\"#0\"},\"up\":{\"uv\":[4,4,5,5],\"texture\":\"#0\"}}},{\"from\":[11.5,-0.001,5.5],\"to\":[12.5,0.999,10.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[12,8,8]},\"faces\":{\"up\":{\"uv\":[5,4,10,5],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[11.5,-0.001,3.5],\"to\":[12.5,0.999,4.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[12,8,6]},\"faces\":{\"up\":{\"uv\":[2,9,3,10],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[12.5,0,5.5],\"to\":[13.5,1,10.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[13,8,8]},\"faces\":{\"up\":{\"uv\":[2,5,3,10],\"texture\":\"#0\"}}},{\"from\":[13.5,0,4.5],\"to\":[14.5,1,9.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[14,8,7]},\"faces\":{\"north\":{\"uv\":[10,11,11,12],\"texture\":\"#0\"},\"east\":{\"uv\":[5,12,10,13],\"texture\":\"#0\"},\"up\":{\"uv\":[5,3,10,4],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[13.5,0,9.5],\"to\":[14.5,1,11.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[14,8,12]},\"faces\":{\"east\":{\"uv\":[3,11,5,12],\"texture\":\"#0\"},\"south\":{\"uv\":[2,11,3,12],\"texture\":\"#0\"},\"up\":{\"uv\":[8,3,10,4],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[11.5,0,2.5],\"to\":[12.5,1,3.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[12,8,5]},\"faces\":{\"north\":{\"uv\":[11,11,12,12],\"texture\":\"#0\"},\"east\":{\"uv\":[10,11,11,12],\"texture\":\"#0\"},\"up\":{\"uv\":[1,5,2,6],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[12.5,0,3.5],\"to\":[13.5,1,4.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[13,8,6]},\"faces\":{\"north\":{\"uv\":[12,11,13,12],\"texture\":\"#0\"},\"east\":{\"uv\":[11,11,12,12],\"texture\":\"#0\"},\"up\":{\"uv\":[2,4,3,5],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[5.5,-0.001,3.5],\"to\":[10.5,0.999,4.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[8,8,4.1]},\"faces\":{\"up\":{\"uv\":[5,10,10,11],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[3.5,-0.001,3.5],\"to\":[4.5,0.999,4.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[6,8,4]},\"faces\":{\"up\":{\"uv\":[12,9,13,10],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[5.5,0,2.5],\"to\":[10.5,1,3.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[8,8,3]},\"faces\":{\"up\":{\"uv\":[2,5,3,10],\"rotation\":270,\"texture\":\"#0\"}}},{\"from\":[6.5,0,1.5],\"to\":[11.5,1,2.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[9,8,2]},\"faces\":{\"north\":{\"uv\":[5,12,10,13],\"texture\":\"#0\"},\"east\":{\"uv\":[12,11,13,12],\"texture\":\"#0\"},\"up\":{\"uv\":[5,3,10,4],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[4.5,0,1.5],\"to\":[6.5,1,2.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[7,8,2]},\"faces\":{\"north\":{\"uv\":[10,11,12,12],\"texture\":\"#0\"},\"west\":{\"uv\":[9,12,10,13],\"texture\":\"#0\"},\"up\":{\"uv\":[8,3,10,4],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[2.5,0,3.5],\"to\":[3.5,1,4.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[5,8,4]},\"faces\":{\"north\":{\"uv\":[12,11,13,12],\"texture\":\"#0\"},\"west\":{\"uv\":[12,11,13,12],\"texture\":\"#0\"},\"up\":{\"uv\":[1,5,2,6],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[3.5,0,2.5],\"to\":[4.5,1,3.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[6,8,3]},\"faces\":{\"north\":{\"uv\":[12,11,13,12],\"texture\":\"#0\"},\"west\":{\"uv\":[11,11,12,12],\"texture\":\"#0\"},\"up\":{\"uv\":[1,5,2,6],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[3.5,-0.001,5.5],\"to\":[4.5,0.999,10.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[4,8,8.1]},\"faces\":{\"up\":{\"uv\":[11,5,12,10],\"texture\":\"#0\"}}},{\"from\":[2.5,0,5.5],\"to\":[3.5,1,10.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[3,8,8]},\"faces\":{\"up\":{\"uv\":[12,5,13,10],\"rotation\":180,\"texture\":\"#0\"}}},{\"from\":[1.5,0,6.5],\"to\":[2.5,1,11.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[2,8,9]},\"faces\":{\"south\":{\"uv\":[13,10,14,11],\"texture\":\"#0\"},\"west\":{\"uv\":[5,12,10,13],\"texture\":\"#0\"},\"up\":{\"uv\":[5,3,10,4],\"rotation\":90,\"texture\":\"#0\"}}},{\"from\":[1.5,0,4.5],\"to\":[2.5,1,6.5],\"rotation\":{\"angle\":0,\"axis\":\"y\",\"origin\":[2,8,4]},\"faces\":{\"north\":{\"uv\":[13,10,14,11],\"texture\":\"#0\"},\"west\":{\"uv\":[10,11,12,12],\"texture\":\"#0\"},\"up\":{\"uv\":[8,3,10,4],\"rotation\":90,\"texture\":\"#0\"}}}],\"gui_light\":\"front\",\"display\":{\"thirdperson_righthand\":{\"rotation\":[38,0,0],\"translation\":[0,1.75,0.75],\"scale\":[0.5,0.5,0.5]},\"thirdperson_lefthand\":{\"rotation\":[38,0,0],\"translation\":[0,1.75,0.75],\"scale\":[0.5,0.5,0.5]},\"firstperson_righthand\":{\"rotation\":[87,-19,41],\"translation\":[0,4.25,0]},\"firstperson_lefthand\":{\"rotation\":[87,-19,41],\"translation\":[0,4.25,0]},\"ground\":{\"translation\":[0,7.5,0]},\"gui\":{\"rotation\":[90,0,0]},\"head\":{\"translation\":[0,14.5,0]},\"fixed\":{\"rotation\":[-90,0,0],\"translation\":[0,0,-8]}},\"groups\":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,{\"name\":\"group\",\"origin\":[10,8,12],\"color\":0,\"children\":[17,18,19,20,21,22,23,24,25]},{\"name\":\"group\",\"origin\":[10,8,12],\"color\":0,\"children\":[26,27,28,29,30,31,32]},{\"name\":\"group\",\"origin\":[10,8,12],\"color\":0,\"children\":[33,34,35,36,37,38,39]},{\"name\":\"group\",\"origin\":[10,8,12],\"color\":0,\"children\":[40,41,42,43]}]}";
+    }
+
+    /*
+    * Tries to retrieve a cached model and builds a new one otherwise
+    */
+    public static BakedModel getModel(Identifier id) {
+        if (DISCS.containsKey(id)) return DISCS.get(id);
+        else return requestModel(id);
+    }
+    public static Identifier getModelId(ItemStack stack) {
+        //System.out.println(stack.getComponents());
+        Identifier modelId = Registries.ITEM.getId(stack.getItem());
+        if (stack.hasChangedComponent(DataComponentTypes.ITEM_MODEL))
+            modelId = stack.getComponents().get(DataComponentTypes.ITEM_MODEL);
+        else if (stack.hasChangedComponent(DataComponentTypes.CUSTOM_MODEL_DATA) && !stack.getComponents().get(DataComponentTypes.CUSTOM_MODEL_DATA).strings().isEmpty()) {
+            modelId = Identifier.tryParse(stack.getComponents().get(DataComponentTypes.CUSTOM_MODEL_DATA).getString(0));
+        }
+        return modelId;
+    }
+
+    public static void render(Identifier modelId, int light, int overlay, MatrixStack matrices, VertexConsumerProvider vertexConsumers) {
+        ItemRenderState itemRenderState = new ItemRenderState();
+        ItemRenderState.LayerRenderState renderState = itemRenderState.newLayer();
+        ((ItemRenderStateAccessor)itemRenderState).setModelTransformationMode(ModelTransformationMode.GROUND);
+
+        renderState.setModel(getModel(modelId), RenderLayer.getCutout());
+
+        itemRenderState.render(matrices, vertexConsumers, light, overlay);
+    }
+
+    public static class DynamicBaker implements Baker {
+        @Override
+        public BakedModel bake(Identifier id, ModelBakeSettings settings) {
+            return null; // Not used in Json models, so we just leave ít like this and cross our fingers.
+        }
+
+        @Override
+        public SpriteGetter getSpriteGetter() {
+            return new SpriteGetter() {
+                static final Identifier MISSINGNO = Identifier.ofVanilla("missingno");
+                static final SpriteIdentifier MISSING_DISC = new SpriteIdentifier(Identifier.ofVanilla("textures/atlas/blocks.png"), id("item/music_disc_missing"));
+
+                @Override
+                public Sprite get(SpriteIdentifier spriteId) {
+                    Sprite sprite = spriteId.getSprite();
+                    if (sprite.getContents().getId().equals(MISSINGNO))
+                        return getMissing(spriteId.getTextureId().toString());
+                    return sprite;
+                }
+
+                @Override
+                public Sprite getMissing(String textureId) {
+                    return get(MISSING_DISC);
+                }
+            };
+        }
+
+        @Override // no clue what this does lol
+        public ModelNameSupplier getModelNameSupplier() { return () -> "round_disc"; }
+    }
+}
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/ItemRenderStateAccessor.java b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/ItemRenderStateAccessor.java
new file mode 100644
index 0000000..10c63a3
--- /dev/null
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/ItemRenderStateAccessor.java
@@ -0,0 +1,12 @@
+package eu.midnightdust.visualoverhaul.mixin;
+
+import net.minecraft.client.render.item.ItemRenderState;
+import net.minecraft.item.ModelTransformationMode;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ItemRenderState.class)
+public interface ItemRenderStateAccessor {
+    @Accessor("modelTransformationMode")
+    void setModelTransformationMode(ModelTransformationMode modelTransformationMode);
+}
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinConstantTintSource.java b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinConstantTintSource.java
new file mode 100644
index 0000000..afebab7
--- /dev/null
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinConstantTintSource.java
@@ -0,0 +1,25 @@
+package eu.midnightdust.visualoverhaul.mixin;
+
+import eu.midnightdust.visualoverhaul.VisualOverhaulClient;
+import eu.midnightdust.visualoverhaul.config.VOConfig;
+import net.minecraft.client.render.item.tint.ConstantTintSource;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(ConstantTintSource.class)
+public abstract class MixinConstantTintSource {
+    @Inject(at = @At("RETURN"), method = "getTint", cancellable = true)
+    public void vo$modifyLeafTint(ItemStack stack, ClientWorld world, LivingEntity user, CallbackInfoReturnable<Integer> cir) {
+        // Dynamic Leaf Item colors
+        if (VOConfig.coloredItems && List.of(-12012264).contains(cir.getReturnValue())) {
+            cir.setReturnValue(VisualOverhaulClient.foliageColor);
+        }
+    }
+}
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinGrassTintSource.java b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinGrassTintSource.java
new file mode 100644
index 0000000..fbdbe62
--- /dev/null
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinGrassTintSource.java
@@ -0,0 +1,23 @@
+package eu.midnightdust.visualoverhaul.mixin;
+
+import eu.midnightdust.visualoverhaul.VisualOverhaulClient;
+import eu.midnightdust.visualoverhaul.config.VOConfig;
+import net.minecraft.client.render.item.tint.GrassTintSource;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(GrassTintSource.class)
+public abstract class MixinGrassTintSource {
+    @Inject(at = @At("RETURN"), method = "getTint", cancellable = true)
+    public void vo$modifyGrassTint(ItemStack stack, ClientWorld world, LivingEntity user, CallbackInfoReturnable<Integer> cir) {
+        // Dynamic Grass Item colors
+        if (VOConfig.coloredItems) {
+            cir.setReturnValue(VisualOverhaulClient.grassColor);
+        }
+    }
+}
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinPotionTintSource.java b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinPotionTintSource.java
new file mode 100644
index 0000000..1cc0a04
--- /dev/null
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinPotionTintSource.java
@@ -0,0 +1,39 @@
+package eu.midnightdust.visualoverhaul.mixin;
+
+import eu.midnightdust.visualoverhaul.VisualOverhaulClient;
+import eu.midnightdust.visualoverhaul.config.VOConfig;
+import net.minecraft.client.render.item.tint.PotionTintSource;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.Potions;
+import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.util.math.ColorHelper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(PotionTintSource.class)
+public class MixinPotionTintSource {
+    @Unique private static final List<RegistryEntry<Potion>> WATER_POTIONS = List.of(Potions.WATER, Potions.MUNDANE, Potions.THICK, Potions.AWKWARD);
+
+    @Inject(at = @At("RETURN"), method = "getTint", cancellable = true)
+    public void vo$modifyWaterTint(ItemStack stack, ClientWorld world, LivingEntity user, CallbackInfoReturnable<Integer> cir) {
+        // Dynamic Potion Item colors
+        if (VOConfig.coloredItems) {
+            var contents = stack.getComponents().get(DataComponentTypes.POTION_CONTENTS);
+            if (contents != null && contents.potion().isPresent()) {
+                if (!WATER_POTIONS.contains(contents.potion().get()))
+                    return; // Skip all potions with effects
+            }
+            if (cir.getReturnValue() == -1) cir.setReturnValue(ColorHelper.fullAlpha(VisualOverhaulClient.potionColor));
+            else cir.setReturnValue(VisualOverhaulClient.potionColor);
+        }
+    }
+}
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/TextureManagerAccessor.java b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/TextureManagerAccessor.java
index 78e19dd..85bcf7b 100644
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/TextureManagerAccessor.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/mixin/TextureManagerAccessor.java
@@ -1,12 +1,19 @@
 package eu.midnightdust.visualoverhaul.mixin;
 
+import net.minecraft.client.texture.AbstractTexture;
 import net.minecraft.client.texture.TextureManager;
 import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
+import java.util.Map;
+
 @Mixin(TextureManager.class)
 public interface TextureManagerAccessor {
     @Accessor
     ResourceManager getResourceContainer();
+
+    @Accessor
+    Map<Identifier, AbstractTexture> getTextures();
 }
diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/util/VOColorUtil.java b/common/src/main/java/eu/midnightdust/visualoverhaul/util/VOColorUtil.java
index d4eaf61..471093b 100644
--- a/common/src/main/java/eu/midnightdust/visualoverhaul/util/VOColorUtil.java
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/util/VOColorUtil.java
@@ -1,12 +1,17 @@
 package eu.midnightdust.visualoverhaul.util;
 
+import net.minecraft.util.math.ColorHelper;
+import net.minecraft.util.math.MathHelper;
+
 public class VOColorUtil {
-    public static int convertRgbToArgb(int rgb) {
+    public static int convertRgbToArgb(int rgb, int alpha) {
         int red = 0xFF & (rgb >> 16);
         int green = 0xFF & (rgb >> 8);
         int blue = 0xFF & (rgb);
-        int alpha = 200; // Makes water bottles transparent, 255 would be opaque
 
         return (alpha << 24) | (red << 16) | (green << 8) | blue;
     }
+    public static int alphaAndBrightness(float alpha, float brightness) {
+        return ColorHelper.getArgb(MathHelper.floor(alpha*255), MathHelper.floor(brightness*255), MathHelper.floor(brightness*255), MathHelper.floor(brightness*255));
+    }
 }
diff --git a/common/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json b/common/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json
deleted file mode 100755
index 0ba4dad..0000000
--- a/common/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "has_record=true": {
-      "model": "visualoverhaul:block/jukebox_top_playing"
-    },
-    "has_record=false": {
-      "model": "visualoverhaul:block/jukebox_top_stopped"
-    }
-  }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json b/common/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json
deleted file mode 100755
index 0f3f921..0000000
--- a/common/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "variants": {
-    "playing=true,channel=0": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_0"},
-    "playing=false,channel=0": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_0"},
-	"playing=true,channel=1": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_1"},
-    "playing=false,channel=1": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_1"},
-	"playing=true,channel=2": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_2"},
-    "playing=false,channel=2": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_2"},
-	"playing=true,channel=3": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_3"},
-    "playing=false,channel=3": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_3"},
-	"playing=true,channel=4": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_4"},
-    "playing=false,channel=4": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_4"},
-	"playing=true,channel=5": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_5"},
-    "playing=false,channel=5": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_5"},
-	"playing=true,channel=6": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_6"},
-    "playing=false,channel=6": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_6"},
-	"playing=true,channel=7": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_7"},
-    "playing=false,channel=7": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_7"},
-	"playing=true,channel=8": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_8"},
-    "playing=false,channel=8": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_8"},
-	"playing=true,channel=9": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_9"},
-    "playing=false,channel=9": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_9"},
-	"playing=true,channel=10": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_10"},
-    "playing=false,channel=10": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_10"},
-	"playing=true,channel=11": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_11"},
-    "playing=false,channel=11": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_11"},
-	"playing=true,channel=12": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_12"},
-    "playing=false,channel=12": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_12"},
-	"playing=true,channel=13": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_13"},
-    "playing=false,channel=13": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_13"},
-	"playing=true,channel=14": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_14"},
-    "playing=false,channel=14": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_14"},
-	"playing=true,channel=15": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_15"},
-    "playing=false,channel=15": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_15"},
-	"playing=true,channel=16": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_16"},
-    "playing=false,channel=16": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_16"},
-	"playing=true,channel=17": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_17"},
-    "playing=false,channel=17": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_17"},
-	"playing=true,channel=18": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_18"},
-    "playing=false,channel=18": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_18"},
-	"playing=true,channel=19": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_19"},
-    "playing=false,channel=19": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_19"}
-  }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_playing.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/jukebox_top_playing.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_playing.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/jukebox_top_playing.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_stopped.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/jukebox_top_stopped.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_stopped.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/jukebox_top_stopped.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_0.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_0.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_0.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_0.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_1.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_1.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_1.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_1.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_10.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_10.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_10.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_10.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_11.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_11.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_11.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_11.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_12.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_12.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_12.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_12.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_13.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_13.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_13.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_13.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_14.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_14.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_14.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_14.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_15.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_15.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_15.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_15.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_16.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_16.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_16.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_16.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_17.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_17.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_17.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_17.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_18.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_18.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_18.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_18.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_19.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_19.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_19.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_19.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_2.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_2.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_2.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_2.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_3.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_3.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_3.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_3.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_4.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_4.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_4.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_4.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_5.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_5.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_5.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_5.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_6.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_6.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_6.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_6.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_7.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_7.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_7.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_7.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_8.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_8.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_8.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_8.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_9.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_9.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_9.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_playing_9.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_0.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_0.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_0.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_0.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_1.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_1.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_1.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_1.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_10.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_10.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_10.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_10.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_11.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_11.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_11.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_11.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_12.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_12.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_12.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_12.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_13.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_13.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_13.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_13.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_14.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_14.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_14.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_14.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_15.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_15.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_15.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_15.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_16.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_16.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_16.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_16.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_17.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_17.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_17.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_17.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_18.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_18.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_18.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_18.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_19.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_19.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_19.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_19.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_2.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_2.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_2.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_2.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_3.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_3.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_3.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_3.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_4.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_4.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_4.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_4.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_5.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_5.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_5.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_5.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_6.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_6.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_6.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_6.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_7.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_7.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_7.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_7.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_8.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_8.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_8.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_8.json
diff --git a/common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_9.json b/common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_9.json
similarity index 100%
rename from common/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_9.json
rename to common/src/main/resources/assets/visualoverhaul/models/fakeblock/phonos/jukebox_top_stopped_9.json
diff --git a/common/src/main/resources/assets/visualoverhaul/textures/item/music_disc_missing.png b/common/src/main/resources/assets/visualoverhaul/textures/item/music_disc_missing.png
new file mode 100644
index 0000000..6d7b229
Binary files /dev/null and b/common/src/main/resources/assets/visualoverhaul/textures/item/music_disc_missing.png differ
diff --git a/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/axolotl_bucket.json b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/axolotl_bucket.json
new file mode 100644
index 0000000..da0fb46
--- /dev/null
+++ b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/axolotl_bucket.json
@@ -0,0 +1,16 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/axolotl_bucket",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -1
+      },
+      {
+        "type": "minecraft:potion",
+        "default": -1
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/cod_bucket.json b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/cod_bucket.json
new file mode 100644
index 0000000..4ed7a6f
--- /dev/null
+++ b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/cod_bucket.json
@@ -0,0 +1,16 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/cod_bucket",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -1
+      },
+      {
+        "type": "minecraft:potion",
+        "default": -1
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/pufferfish_bucket.json b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/pufferfish_bucket.json
new file mode 100644
index 0000000..44134e2
--- /dev/null
+++ b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/pufferfish_bucket.json
@@ -0,0 +1,16 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/pufferfish_bucket",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -1
+      },
+      {
+        "type": "minecraft:potion",
+        "default": -1
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/salmon_bucket.json b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/salmon_bucket.json
new file mode 100644
index 0000000..304fb53
--- /dev/null
+++ b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/salmon_bucket.json
@@ -0,0 +1,16 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/salmon_bucket",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -1
+      },
+      {
+        "type": "minecraft:potion",
+        "default": -1
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/tropical_fish_bucket.json b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/tropical_fish_bucket.json
new file mode 100644
index 0000000..424dda4
--- /dev/null
+++ b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/tropical_fish_bucket.json
@@ -0,0 +1,16 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/tropical_fish_bucket",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -1
+      },
+      {
+        "type": "minecraft:potion",
+        "default": -1
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/water_bucket.json b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/water_bucket.json
new file mode 100644
index 0000000..dc0e26b
--- /dev/null
+++ b/common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/water_bucket.json
@@ -0,0 +1,16 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/water_bucket",
+    "tints": [
+      {
+        "type": "minecraft:constant",
+        "value": -1
+      },
+      {
+        "type": "minecraft:potion",
+        "default": -1
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk.json
deleted file mode 100755
index b6f6b05..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "biomemakeover:item/music_disk_button_mushrooms"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "biomemakeover:item/button_mushrooms_music_disk_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json
deleted file mode 100755
index 9736e4f..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "biomemakeover:item/music_disk_button_mushrooms"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk.json
deleted file mode 100755
index 2f8093d..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "biomemakeover:item/music_disc_ghost_town"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "biomemakeover:item/ghost_town_music_disk_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk_round.json
deleted file mode 100755
index f4aca7e..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "biomemakeover:item/music_disc_ghost_town"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk.json
deleted file mode 100755
index e8e6353..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "biomemakeover:item/music_disc_swamp_jives"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "biomemakeover:item/swamp_jives_music_disk_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json
deleted file mode 100755
index 38617a6..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "biomemakeover:item/music_disc_swamp_jives"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes.json
deleted file mode 100755
index e9afa3b..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "desolation:item/music_disc_ashes"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "desolation:item/music_disc_ashes_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes_round.json
deleted file mode 100755
index ee1c4ac..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "desolation:item/music_disc_ashes"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/dynamic-discs/models/item/dynamic_disc.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/dynamic-discs/models/item/dynamic_disc.json
deleted file mode 100755
index 7994d24..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/dynamic-discs/models/item/dynamic_disc.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_13"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_13_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c.json
deleted file mode 100755
index 400615a..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "extra_discs:item/music_disc_0x10c"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "extra_discs:item/music_disc_0x10c_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c_round.json
deleted file mode 100755
index 24fb651..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "extra_discs:item/music_disc_0x10c"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson.json
deleted file mode 100755
index 4c74236..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "extra_discs:item/music_disc_cliffside_hinson"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "extra_discs:item/music_disc_cliffside_hinson_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json
deleted file mode 100755
index 188618f..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "extra_discs:item/music_disc_cliffside_hinson"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json
deleted file mode 100755
index 739004e..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "extra_discs:item/music_disc_i_jate_my_hob"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "extra_discs:item/music_disc_i_jate_my_hob_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json
deleted file mode 100755
index 846ddec..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "extra_discs:item/music_disc_i_jate_my_hob"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts.json
deleted file mode 100755
index ae55134..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "extra_discs:item/music_disc_peanuts"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "extra_discs:item/music_disc_peanuts_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts_round.json
deleted file mode 100755
index 76883c8..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "extra_discs:item/music_disc_peanuts"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition.json
deleted file mode 100755
index f0875dc..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "extra_discs:item/music_disc_repetition"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "extra_discs:item/music_disc_repetition_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition_round.json
deleted file mode 100755
index f5bdbcf..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "extra_discs:item/music_disc_repetition"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json
deleted file mode 100755
index e898ac5..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "extra_discs:item/music_disc_sometimes_i_make_video_game_music"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "extra_discs:item/music_disc_sometimes_i_make_video_game_music_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json
deleted file mode 100755
index 7abc0b4..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "extra_discs:item/music_disc_sometimes_i_make_video_game_music"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11.json
deleted file mode 100755
index 51ec151..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_11"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_11_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11_round.json
deleted file mode 100755
index ed3d48d..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_11"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13.json
deleted file mode 100755
index 7994d24..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_13"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_13_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13_round.json
deleted file mode 100755
index 811ec2a..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_13"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5.json
deleted file mode 100755
index 93a8051..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_5"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_5_round"
-        }
-    ]
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5_round.json
deleted file mode 100755
index 894d3b1..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_5"
-	}
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks.json
deleted file mode 100755
index a6642fa..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_blocks"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_blocks_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks_round.json
deleted file mode 100755
index 0ac52b2..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_blocks"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat.json
deleted file mode 100755
index d695d96..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_cat"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_cat_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat_round.json
deleted file mode 100755
index ee0b2c9..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_cat"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp.json
deleted file mode 100755
index ce1df71..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_chirp"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_chirp_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp_round.json
deleted file mode 100755
index 30c3008..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_chirp"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator.json
deleted file mode 100755
index 9391542..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_creator"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_creator_round"
-        }
-    ]
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_music_box.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_music_box.json
deleted file mode 100755
index 268e8f1..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_music_box.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_creator_music_box"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_creator_music_box_round"
-        }
-    ]
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_music_box_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_music_box_round.json
deleted file mode 100755
index f886e40..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_music_box_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_creator_music_box"
-	}
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_round.json
deleted file mode 100755
index fe9a202..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_creator"
-	}
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far.json
deleted file mode 100755
index e6fd32a..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_far"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_far_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far_round.json
deleted file mode 100755
index f69d3d0..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_far"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall.json
deleted file mode 100755
index cde7957..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_mall"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_mall_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall_round.json
deleted file mode 100755
index 8039033..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_mall"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi.json
deleted file mode 100755
index 2507832..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_mellohi"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_mellohi_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi_round.json
deleted file mode 100755
index 1502751..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_mellohi"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside.json
deleted file mode 100755
index df809bf..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_otherside"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_otherside_round"
-        }
-    ]
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside_round.json
deleted file mode 100755
index 57302a5..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_otherside"
-	}
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep.json
deleted file mode 100755
index ce63a0f..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_pigstep"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_pigstep_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep_round.json
deleted file mode 100755
index d74b2a1..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_pigstep"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_precipice.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_precipice.json
deleted file mode 100755
index dc333f7..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_precipice.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_precipice"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_precipice_round"
-        }
-    ]
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_precipice_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_precipice_round.json
deleted file mode 100755
index 1de008f..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_precipice_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_precipice"
-	}
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_relic.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_relic.json
deleted file mode 100644
index 323afdc..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_relic.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_relic"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_relic_round"
-        }
-    ]
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_relic_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_relic_round.json
deleted file mode 100644
index 7ffd2da..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_relic_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_relic"
-	}
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal.json
deleted file mode 100755
index 7b99e7b..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_stal"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_stal_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal_round.json
deleted file mode 100755
index 24494cb..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_stal"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad.json
deleted file mode 100755
index bb45711..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_strad"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_strad_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad_round.json
deleted file mode 100755
index 926640f..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_strad"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait.json
deleted file mode 100755
index 717a368..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_wait"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_wait_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait_round.json
deleted file mode 100755
index 37a7936..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_wait"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward.json
deleted file mode 100755
index ef67221..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "minecraft:item/music_disc_ward"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "minecraft:item/music_disc_ward_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward_round.json
deleted file mode 100755
index ad7d040..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward_round.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc",
-	"textures": {
-		"0": "minecraft:item/music_disc_ward"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc.json
deleted file mode 100755
index bf35e49..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer1": "phonos:item/music_disc_outer",
-		"layer0": "phonos:item/music_disc_inner"
-	},
-	
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "phonos:item/custom_music_disc_round"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc_round.json
deleted file mode 100755
index 17a1088..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc_round.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"parent": "visualoverhaul:item/round_disc_colored_layers",
-	"textures": {
-		"0": "phonos:item/music_disc_inner",
-		"1": "phonos:item/music_disc_outer"
-	}
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record.json
deleted file mode 100755
index e297a5d..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-      "layer0": "recordable:item/copper_record",
-      "layer1": "recordable:item/copper_record_engravings",
-      "layer2": "recordable:item/copper_record_cover_1",
-      "layer3": "recordable:item/copper_record_cover_2",
-      "layer4": "recordable:item/copper_record_cover_3",
-      "layer5": "recordable:item/copper_record_cover_4",
-      "layer6": "recordable:item/copper_record_cover_5",
-      "layer7": "recordable:item/copper_record_cover_6",
-      "layer8": "recordable:item/copper_record_cover_7",
-      "layer9": "recordable:item/copper_record_cover_8",
-      "layer10": "recordable:item/copper_record_cover_9",
-      "layer11": "recordable:item/copper_record_cover_10"
-    },
-	"overrides": [
-        {
-            "predicate": {
-                "round": 1
-            },
-            "model": "recordable:item/copper_record_round"
-        }
-    ]
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record_round.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record_round.json
deleted file mode 100755
index 523dfb6..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record_round.json
+++ /dev/null
@@ -1,557 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"10": "recordable:item/copper_record_cover_10",
-		"particle": "recordable:item/copper_record",
-		"base": "recordable:item/copper_record",
-		"02": "recordable:item/copper_record_cover_2",
-		"03": "recordable:item/copper_record_cover_3",
-		"04": "recordable:item/copper_record_cover_4",
-		"05": "recordable:item/copper_record_cover_5",
-		"06": "recordable:item/copper_record_cover_6",
-		"08": "recordable:item/copper_record_cover_8",
-		"09": "recordable:item/copper_record_cover_9"
-	},
-	"elements": [
-		{
-			"from": [7.5, 0, 7.5],
-			"to": [8.5, 1, 8.5],
-			"faces": {
-				"up": {"uv": [7, 7, 8, 8], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [9.5, 0, 9.5],
-			"to": [10.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]},
-			"faces": {
-				"up": {"uv": [5, 6, 6, 7], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [5.5, 0, 9.5],
-			"to": [6.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 10]},
-			"faces": {
-				"up": {"uv": [9, 6, 10, 7], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [5.5, 0, 5.5],
-			"to": [6.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 6]},
-			"faces": {
-				"up": {"uv": [9, 8, 10, 9], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [9.5, 0, 5.5],
-			"to": [10.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]},
-			"faces": {
-				"up": {"uv": [5, 8, 6, 9], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [6.5, 0, 5.5],
-			"to": [7.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
-			"faces": {
-				"up": {"uv": [6, 8, 7, 9], "texture": "#08", "tintindex": 8}
-			}
-		},
-		{
-			"from": [7.5, 0, 5.5],
-			"to": [8.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
-			"faces": {
-				"up": {"uv": [7, 8, 8, 9], "texture": "#09", "tintindex": 9}
-			}
-		},
-		{
-			"from": [8.5, 0, 5.5],
-			"to": [9.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
-			"faces": {
-				"up": {"uv": [8, 8, 9, 9], "texture": "#10", "tintindex": 10}
-			}
-		},
-		{
-			"from": [2.5, 0, 4.5],
-			"to": [13.5, 1, 5.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [4.5, 0.001, 2.5],
-			"to": [5.5, 1.001, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [10.5, 0.001, 2.5],
-			"to": [11.5, 1.001, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [2.5, 0, 10.5],
-			"to": [13.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 11]},
-			"faces": {
-				"up": {"uv": [2, 5, 13, 6], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [6.5, 0, 9.5],
-			"to": [7.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]},
-			"faces": {
-				"up": {"uv": [7, 6, 8, 7], "texture": "#02", "tintindex": 1}
-			}
-		},
-		{
-			"from": [7.5, 0, 9.5],
-			"to": [8.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]},
-			"faces": {
-				"up": {"uv": [7, 6, 8, 7], "texture": "#02", "tintindex": 2}
-			}
-		},
-		{
-			"from": [8.5, 0, 9.5],
-			"to": [9.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]},
-			"faces": {
-				"up": {"uv": [8, 6, 9, 7], "texture": "#03", "tintindex": 3}
-			}
-		},
-		{
-			"from": [5.5, 0, 8.5],
-			"to": [6.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 8, 7, 9], "rotation": 270, "texture": "#08", "tintindex": 8}
-			}
-		},
-		{
-			"from": [5.5, 0, 7.5],
-			"to": [6.5, 1, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]},
-			"faces": {
-				"up": {"uv": [8, 7, 9, 8], "rotation": 270, "texture": "#06", "tintindex": 6}
-			}
-		},
-		{
-			"from": [5.5, 0, 6.5],
-			"to": [6.5, 1, 7.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]},
-			"faces": {
-				"up": {"uv": [8, 8, 9, 9], "rotation": 270, "texture": "#10", "tintindex": 10}
-			}
-		},
-		{
-			"from": [5.5, 0, 8.5],
-			"to": [6.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 8, 9, 9], "rotation": 270, "texture": "#08", "tintindex": 8}
-			}
-		},
-		{
-			"from": [9.5, 0, 8.5],
-			"to": [10.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]},
-			"faces": {
-				"up": {"uv": [7, 6, 8, 7], "rotation": 270, "texture": "#02", "tintindex": 1}
-			}
-		},
-		{
-			"from": [9.5, 0, 7.5],
-			"to": [10.5, 1, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]},
-			"faces": {
-				"up": {"uv": [5, 7, 6, 8], "rotation": 270, "texture": "#04", "tintindex": 4}
-			}
-		},
-		{
-			"from": [9.5, 0, 6.5],
-			"to": [10.5, 1, 7.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]},
-			"faces": {
-				"up": {"uv": [8, 6, 9, 7], "rotation": 270, "texture": "#03", "tintindex": 3}
-			}
-		},
-		{
-			"from": [8.5, 0, 6.5],
-			"to": [9.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 7, 7, 8], "texture": "#05", "tintindex": 5}
-			}
-		},
-		{
-			"from": [6.5, 0, 6.5],
-			"to": [7.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 8]},
-			"faces": {
-				"up": {"uv": [8, 7, 9, 8], "texture": "#06", "tintindex": 6}
-			}
-		},
-		{
-			"from": [7.5, 0, 8.5],
-			"to": [8.5, 1, 9.5],
-			"faces": {
-				"up": {"uv": [6, 7, 7, 8], "texture": "#05", "tintindex": 5}
-			}
-		},
-		{
-			"from": [7.5, 0, 6.5],
-			"to": [8.5, 1, 7.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
-			"faces": {
-				"up": {"uv": [8, 7, 9, 8], "texture": "#06", "tintindex": 6}
-			}
-		},
-		{
-			"from": [7.5, -0.001, 11.5],
-			"to": [12.5, 0.999, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 12]},
-			"faces": {
-				"up": {"uv": [3, 5, 8, 6], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 11.5],
-			"to": [7.5, 0.999, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 12]},
-			"faces": {
-				"up": {"uv": [8, 5, 12, 6], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [5.5, 0, 12.5],
-			"to": [10.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 13]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "rotation": 90, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [6.5, 0, 13.5],
-			"to": [11.5, 1, 14.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 14]},
-			"faces": {
-				"east": {"uv": [10, 11, 11, 12], "texture": "#base", "tintindex": 0},
-				"south": {"uv": [5, 12, 10, 13], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [5, 3, 10, 4], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [4.5, 0, 13.5],
-			"to": [6.5, 1, 14.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 14]},
-			"faces": {
-				"south": {"uv": [3, 11, 5, 12], "texture": "#base", "tintindex": 0},
-				"west": {"uv": [2, 11, 3, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [8, 3, 10, 4], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [3.5, 0, 12.5],
-			"to": [4.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]},
-			"faces": {
-				"south": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0},
-				"west": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [10, 4, 11, 5], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [2.5, 0, 11.5],
-			"to": [3.5, 1, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 12]},
-			"faces": {
-				"south": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0},
-				"west": {"uv": [10, 11, 11, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [11, 4, 12, 5], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [12.5, 0, 11.5],
-			"to": [13.5, 1, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 12]},
-			"faces": {
-				"east": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0},
-				"south": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [2, 4, 3, 5], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [11.5, 0, 12.5],
-			"to": [12.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 13]},
-			"faces": {
-				"east": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0},
-				"south": {"uv": [11, 11, 12, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [4, 4, 5, 5], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [11.5, -0.001, 5.5],
-			"to": [12.5, 0.999, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 8]},
-			"faces": {
-				"up": {"uv": [5, 4, 10, 5], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [11.5, -0.001, 3.5],
-			"to": [12.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 6]},
-			"faces": {
-				"up": {"uv": [2, 9, 3, 10], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [12.5, 0, 5.5],
-			"to": [13.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [13.5, 0, 4.5],
-			"to": [14.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 7]},
-			"faces": {
-				"north": {"uv": [10, 11, 11, 12], "texture": "#base", "tintindex": 0},
-				"east": {"uv": [5, 12, 10, 13], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [13.5, 0, 9.5],
-			"to": [14.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 12]},
-			"faces": {
-				"east": {"uv": [3, 11, 5, 12], "texture": "#base", "tintindex": 0},
-				"south": {"uv": [2, 11, 3, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [11.5, 0, 2.5],
-			"to": [12.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 5]},
-			"faces": {
-				"north": {"uv": [11, 11, 12, 12], "texture": "#base", "tintindex": 0},
-				"east": {"uv": [10, 11, 11, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [1, 5, 2, 6], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [12.5, 0, 3.5],
-			"to": [13.5, 1, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0},
-				"east": {"uv": [11, 11, 12, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [5.5, -0.001, 3.5],
-			"to": [10.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 4.1]},
-			"faces": {
-				"up": {"uv": [5, 10, 10, 11], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 3.5],
-			"to": [4.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 4]},
-			"faces": {
-				"up": {"uv": [12, 9, 13, 10], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [5.5, 0, 2.5],
-			"to": [10.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 3]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "rotation": 270, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [6.5, 0, 1.5],
-			"to": [11.5, 1, 2.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]},
-			"faces": {
-				"north": {"uv": [5, 12, 10, 13], "texture": "#base", "tintindex": 0},
-				"east": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [4.5, 0, 1.5],
-			"to": [6.5, 1, 2.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 2]},
-			"faces": {
-				"north": {"uv": [10, 11, 12, 12], "texture": "#base", "tintindex": 0},
-				"west": {"uv": [9, 12, 10, 13], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [2.5, 0, 3.5],
-			"to": [3.5, 1, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 4]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0},
-				"west": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [1, 5, 2, 6], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [3.5, 0, 2.5],
-			"to": [4.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 3]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0},
-				"west": {"uv": [11, 11, 12, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [12, 10, 13, 11], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 5.5],
-			"to": [4.5, 0.999, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 8.1]},
-			"faces": {
-				"up": {"uv": [11, 5, 12, 10], "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [2.5, 0, 5.5],
-			"to": [3.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 8]},
-			"faces": {
-				"up": {"uv": [12, 5, 13, 10], "rotation": 180, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [1.5, 0, 6.5],
-			"to": [2.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 9]},
-			"faces": {
-				"south": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0},
-				"west": {"uv": [5, 12, 10, 13], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 90, "texture": "#base", "tintindex": 0}
-			}
-		},
-		{
-			"from": [1.5, 0, 4.5],
-			"to": [2.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 4]},
-			"faces": {
-				"north": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0},
-				"west": {"uv": [10, 11, 12, 12], "texture": "#base", "tintindex": 0},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 90, "texture": "#base", "tintindex": 0}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [38, 0, 0],
-			"translation": [0, 1.75, 0.75],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [38, 0, 0],
-			"translation": [0, 1.75, 0.75],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"firstperson_righthand": {
-			"rotation": [87, -19, 41],
-			"translation": [0, 4.25, 0]
-		},
-		"firstperson_lefthand": {
-			"rotation": [87, -19, 41],
-			"translation": [0, 4.25, 0]
-		},
-		"ground": {
-			"translation": [0, 7.5, 0]
-		},
-		"gui": {
-			"rotation": [90, 0, 0]
-		},
-		"head": {
-			"translation": [0, 14.5, 0]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [0, 0, -8]
-		}
-	},
-	"groups": [
-		0,
-		1,
-		2,
-		3,
-		4,
-		5,
-		6,
-		7,
-		8,
-		9,
-		10,
-		11,
-		12,
-		13,
-		14,
-		15,
-		16,
-		17,
-		18,
-		19,
-		20,
-		21,
-		22,
-		23,
-		24,
-		25,
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"color": 0,
-			"children": [26, 27, 28, 29, 30, 31, 32, 33, 34]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"color": 0,
-			"children": [35, 36, 37, 38, 39, 40, 41]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"color": 0,
-			"children": [42, 43, 44, 45, 46, 47, 48]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"color": 0,
-			"children": [49, 50, 51, 52]
-		}
-	]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc.json
deleted file mode 100755
index 6fc3735..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc.json
+++ /dev/null
@@ -1,468 +0,0 @@
-{
-	"credit": "made by Motschen",
-	"textures": {
-		"0": "item/music_disc_relic",
-		"particle": "item/music_disc_relic"
-	},
-	"elements": [
-		{
-			"from": [7.5, 0, 7.5],
-			"to": [8.5, 1, 8.5],
-			"faces": {
-				"up": {"uv": [7, 7, 8, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [9.5, 0, 9.5],
-			"to": [10.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]},
-			"faces": {
-				"up": {"uv": [5, 6, 6, 7], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5.5, 0, 9.5],
-			"to": [6.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 10]},
-			"faces": {
-				"up": {"uv": [9, 6, 10, 7], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5.5, 0, 5.5],
-			"to": [6.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 6]},
-			"faces": {
-				"up": {"uv": [9, 8, 10, 9], "texture": "#0"}
-			}
-		},
-		{
-			"from": [9.5, 0, 5.5],
-			"to": [10.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]},
-			"faces": {
-				"up": {"uv": [5, 8, 6, 9], "texture": "#0"}
-			}
-		},
-		{
-			"from": [6.5, 0, 5.5],
-			"to": [9.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
-			"faces": {
-				"up": {"uv": [6, 8, 9, 9], "texture": "#0"}
-			}
-		},
-		{
-			"from": [2.5, 0, 4.5],
-			"to": [13.5, 1, 5.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4.5, 0.001, 2.5],
-			"to": [5.5, 1.001, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [10.5, 0.001, 2.5],
-			"to": [11.5, 1.001, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [2.5, 0, 10.5],
-			"to": [13.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 11]},
-			"faces": {
-				"up": {"uv": [2, 5, 13, 6], "texture": "#0"}
-			}
-		},
-		{
-			"from": [6.5, 0, 9.5],
-			"to": [9.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]},
-			"faces": {
-				"up": {"uv": [6, 6, 9, 7], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5.5, 0, 6.5],
-			"to": [6.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 8, 9, 9], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [9.5, 0, 6.5],
-			"to": [10.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 6, 9, 7], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [8.5, 0, 6.5],
-			"to": [9.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 7, 7, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [6.5, 0, 6.5],
-			"to": [7.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 8]},
-			"faces": {
-				"up": {"uv": [8, 7, 9, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.5, 0, 8.5],
-			"to": [8.5, 1, 9.5],
-			"faces": {
-				"up": {"uv": [6, 7, 7, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.5, 0, 6.5],
-			"to": [8.5, 1, 7.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
-			"faces": {
-				"up": {"uv": [8, 7, 9, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.5, -0.001, 11.5],
-			"to": [12.5, 0.999, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 12]},
-			"faces": {
-				"up": {"uv": [3, 5, 8, 6], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 11.5],
-			"to": [7.5, 0.999, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 12]},
-			"faces": {
-				"up": {"uv": [8, 5, 12, 6], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [5.5, 0, 12.5],
-			"to": [10.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 13]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "rotation": 90, "texture": "#0"}
-			}
-		},
-		{
-			"from": [6.5, 0, 13.5],
-			"to": [11.5, 1, 14.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 14]},
-			"faces": {
-				"east": {"uv": [10, 11, 11, 12], "texture": "#0"},
-				"south": {"uv": [5, 12, 10, 13], "texture": "#0"},
-				"up": {"uv": [5, 3, 10, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4.5, 0, 13.5],
-			"to": [6.5, 1, 14.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 14]},
-			"faces": {
-				"south": {"uv": [3, 11, 5, 12], "texture": "#0"},
-				"west": {"uv": [2, 11, 3, 12], "texture": "#0"},
-				"up": {"uv": [8, 3, 10, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3.5, 0, 12.5],
-			"to": [4.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]},
-			"faces": {
-				"south": {"uv": [13, 10, 14, 11], "texture": "#0"},
-				"west": {"uv": [13, 10, 14, 11], "texture": "#0"},
-				"up": {"uv": [10, 4, 11, 5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [2.5, 0, 11.5],
-			"to": [3.5, 1, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 12]},
-			"faces": {
-				"south": {"uv": [12, 11, 13, 12], "texture": "#0"},
-				"west": {"uv": [10, 11, 11, 12], "texture": "#0"},
-				"up": {"uv": [11, 4, 12, 5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [12.5, 0, 11.5],
-			"to": [13.5, 1, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 12]},
-			"faces": {
-				"east": {"uv": [13, 10, 14, 11], "texture": "#0"},
-				"south": {"uv": [13, 10, 14, 11], "texture": "#0"},
-				"up": {"uv": [2, 4, 3, 5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [11.5, 0, 12.5],
-			"to": [12.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 13]},
-			"faces": {
-				"east": {"uv": [12, 11, 13, 12], "texture": "#0"},
-				"south": {"uv": [11, 11, 12, 12], "texture": "#0"},
-				"up": {"uv": [4, 4, 5, 5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [11.5, -0.001, 5.5],
-			"to": [12.5, 0.999, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 8]},
-			"faces": {
-				"up": {"uv": [5, 4, 10, 5], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [11.5, -0.001, 3.5],
-			"to": [12.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 6]},
-			"faces": {
-				"up": {"uv": [2, 9, 3, 10], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [12.5, 0, 5.5],
-			"to": [13.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "texture": "#0"}
-			}
-		},
-		{
-			"from": [13.5, 0, 4.5],
-			"to": [14.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 7]},
-			"faces": {
-				"north": {"uv": [10, 11, 11, 12], "texture": "#0"},
-				"east": {"uv": [5, 12, 10, 13], "texture": "#0"},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [13.5, 0, 9.5],
-			"to": [14.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 12]},
-			"faces": {
-				"east": {"uv": [3, 11, 5, 12], "texture": "#0"},
-				"south": {"uv": [2, 11, 3, 12], "texture": "#0"},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [11.5, 0, 2.5],
-			"to": [12.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 5]},
-			"faces": {
-				"north": {"uv": [11, 11, 12, 12], "texture": "#0"},
-				"east": {"uv": [10, 11, 11, 12], "texture": "#0"},
-				"up": {"uv": [1, 5, 2, 6], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [12.5, 0, 3.5],
-			"to": [13.5, 1, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#0"},
-				"east": {"uv": [11, 11, 12, 12], "texture": "#0"},
-				"up": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [5.5, -0.001, 3.5],
-			"to": [10.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 4.1]},
-			"faces": {
-				"up": {"uv": [5, 10, 10, 11], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 3.5],
-			"to": [4.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 4]},
-			"faces": {
-				"up": {"uv": [12, 9, 13, 10], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [5.5, 0, 2.5],
-			"to": [10.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 3]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"from": [6.5, 0, 1.5],
-			"to": [11.5, 1, 2.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]},
-			"faces": {
-				"north": {"uv": [5, 12, 10, 13], "texture": "#0"},
-				"east": {"uv": [12, 11, 13, 12], "texture": "#0"},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [4.5, 0, 1.5],
-			"to": [6.5, 1, 2.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 2]},
-			"faces": {
-				"north": {"uv": [10, 11, 12, 12], "texture": "#0"},
-				"west": {"uv": [9, 12, 10, 13], "texture": "#0"},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [2.5, 0, 3.5],
-			"to": [3.5, 1, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 4]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#0"},
-				"west": {"uv": [12, 11, 13, 12], "texture": "#0"},
-				"up": {"uv": [1, 5, 2, 6], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [3.5, 0, 2.5],
-			"to": [4.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 3]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#0"},
-				"west": {"uv": [11, 11, 12, 12], "texture": "#0"},
-				"up": {"uv": [1, 5, 2, 6], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 5.5],
-			"to": [4.5, 0.999, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 8.1]},
-			"faces": {
-				"up": {"uv": [11, 5, 12, 10], "texture": "#0"}
-			}
-		},
-		{
-			"from": [2.5, 0, 5.5],
-			"to": [3.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 8]},
-			"faces": {
-				"up": {"uv": [12, 5, 13, 10], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [1.5, 0, 6.5],
-			"to": [2.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 9]},
-			"faces": {
-				"south": {"uv": [13, 10, 14, 11], "texture": "#0"},
-				"west": {"uv": [5, 12, 10, 13], "texture": "#0"},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 90, "texture": "#0"}
-			}
-		},
-		{
-			"from": [1.5, 0, 4.5],
-			"to": [2.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 4]},
-			"faces": {
-				"north": {"uv": [13, 10, 14, 11], "texture": "#0"},
-				"west": {"uv": [10, 11, 12, 12], "texture": "#0"},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 90, "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [38, 0, 0],
-			"translation": [0, 1.75, 0.75],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [38, 0, 0],
-			"translation": [0, 1.75, 0.75],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"firstperson_righthand": {
-			"rotation": [87, -19, 41],
-			"translation": [0, 4.25, 0]
-		},
-		"firstperson_lefthand": {
-			"rotation": [87, -19, 41],
-			"translation": [0, 4.25, 0]
-		},
-		"ground": {
-			"translation": [0, 7.5, 0]
-		},
-		"gui": {
-			"rotation": [90, 0, 0]
-		},
-		"head": {
-			"translation": [0, 14.5, 0]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [0, 0, -8]
-		}
-	},
-	"groups": [
-		0,
-		1,
-		2,
-		3,
-		4,
-		5,
-		6,
-		7,
-		8,
-		9,
-		10,
-		11,
-		12,
-		13,
-		14,
-		15,
-		16,
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"color": 0,
-			"children": [17, 18, 19, 20, 21, 22, 23, 24, 25]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"color": 0,
-			"children": [26, 27, 28, 29, 30, 31, 32]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"color": 0,
-			"children": [33, 34, 35, 36, 37, 38, 39]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"color": 0,
-			"children": [40, 41, 42, 43]
-		}
-	]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc_colored_layers.json b/common/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc_colored_layers.json
deleted file mode 100755
index a9b8470..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc_colored_layers.json
+++ /dev/null
@@ -1,448 +0,0 @@
-{
-	"credit": "made by Motschen",
-	"textures": {
-		"0": "phonos:item/music_disc_inner",
-		"1": "phonos:item/music_disc_outer",
-		"particle": "#0"
-	},
-	"elements": [
-		{
-			"from": [7.5, 0, 7.5],
-			"to": [8.5, 1, 8.5],
-			"faces": {
-				"up": {"uv": [7, 7, 8, 8], "texture": "#1"}
-			}
-		},
-		{
-			"from": [9.5, 0, 9.5],
-			"to": [10.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]},
-			"faces": {
-				"up": {"uv": [5, 6, 6, 7], "texture": "#1"}
-			}
-		},
-		{
-			"from": [5.5, 0, 9.5],
-			"to": [6.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 10]},
-			"faces": {
-				"up": {"uv": [9, 6, 10, 7], "texture": "#1"}
-			}
-		},
-		{
-			"from": [5.5, 0, 5.5],
-			"to": [6.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 6]},
-			"faces": {
-				"up": {"uv": [9, 8, 10, 9], "texture": "#1"}
-			}
-		},
-		{
-			"from": [9.5, 0, 5.5],
-			"to": [10.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]},
-			"faces": {
-				"up": {"uv": [5, 8, 6, 9], "texture": "#1"}
-			}
-		},
-		{
-			"from": [6.5, 0, 5.5],
-			"to": [9.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
-			"faces": {
-				"up": {"uv": [6, 8, 9, 9], "texture": "#0", "tintindex": 0}
-			}
-		},
-		{
-			"from": [2.5, 0, 4.5],
-			"to": [13.5, 1, 5.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "texture": "#1"}
-			}
-		},
-		{
-			"from": [4.5, 0.001, 2.5],
-			"to": [5.5, 1.001, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [10.5, 0.001, 2.5],
-			"to": [11.5, 1.001, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [2.5, 0, 10.5],
-			"to": [13.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 11]},
-			"faces": {
-				"up": {"uv": [2, 5, 13, 6], "texture": "#1"}
-			}
-		},
-		{
-			"from": [6.5, 0, 9.5],
-			"to": [9.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]},
-			"faces": {
-				"up": {"uv": [6, 6, 9, 7], "texture": "#0", "tintindex": 0}
-			}
-		},
-		{
-			"from": [5.5, 0, 6.5],
-			"to": [6.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 8, 9, 9], "rotation": 270, "texture": "#0", "tintindex": 0}
-			}
-		},
-		{
-			"from": [9.5, 0, 6.5],
-			"to": [10.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 6, 9, 7], "rotation": 270, "texture": "#0", "tintindex": 0}
-			}
-		},
-		{
-			"from": [8.5, 0, 6.5],
-			"to": [9.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]},
-			"faces": {
-				"up": {"uv": [6, 7, 7, 8], "texture": "#0", "tintindex": 0}
-			}
-		},
-		{
-			"from": [6.5, 0, 6.5],
-			"to": [7.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 8]},
-			"faces": {
-				"up": {"uv": [8, 7, 9, 8], "texture": "#0", "tintindex": 0}
-			}
-		},
-		{
-			"from": [7.5, 0, 8.5],
-			"to": [8.5, 1, 9.5],
-			"faces": {
-				"up": {"uv": [6, 7, 7, 8], "texture": "#0", "tintindex": 0}
-			}
-		},
-		{
-			"from": [7.5, 0, 6.5],
-			"to": [8.5, 1, 7.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
-			"faces": {
-				"up": {"uv": [8, 7, 9, 8], "texture": "#0", "tintindex": 0}
-			}
-		},
-		{
-			"from": [7.5, -0.001, 11.5],
-			"to": [12.5, 0.999, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 12]},
-			"faces": {
-				"up": {"uv": [3, 5, 8, 6], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 11.5],
-			"to": [7.5, 0.999, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 12]},
-			"faces": {
-				"up": {"uv": [8, 5, 12, 6], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [5.5, 0, 12.5],
-			"to": [10.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 13]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "rotation": 90, "texture": "#1"}
-			}
-		},
-		{
-			"from": [6.5, 0, 13.5],
-			"to": [11.5, 1, 14.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 14]},
-			"faces": {
-				"east": {"uv": [10, 11, 11, 12], "texture": "#1"},
-				"south": {"uv": [5, 12, 10, 13], "texture": "#1"},
-				"up": {"uv": [5, 3, 10, 4], "texture": "#1"}
-			}
-		},
-		{
-			"from": [4.5, 0, 13.5],
-			"to": [6.5, 1, 14.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 14]},
-			"faces": {
-				"south": {"uv": [3, 11, 5, 12], "texture": "#1"},
-				"west": {"uv": [2, 11, 3, 12], "texture": "#1"},
-				"up": {"uv": [8, 3, 10, 4], "texture": "#1"}
-			}
-		},
-		{
-			"from": [3.5, 0, 12.5],
-			"to": [4.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]},
-			"faces": {
-				"south": {"uv": [13, 10, 14, 11], "texture": "#1"},
-				"west": {"uv": [13, 10, 14, 11], "texture": "#1"},
-				"up": {"uv": [10, 4, 11, 5], "texture": "#1"}
-			}
-		},
-		{
-			"from": [2.5, 0, 11.5],
-			"to": [3.5, 1, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 12]},
-			"faces": {
-				"south": {"uv": [12, 11, 13, 12], "texture": "#1"},
-				"west": {"uv": [10, 11, 11, 12], "texture": "#1"},
-				"up": {"uv": [11, 4, 12, 5], "texture": "#1"}
-			}
-		},
-		{
-			"from": [12.5, 0, 11.5],
-			"to": [13.5, 1, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 12]},
-			"faces": {
-				"east": {"uv": [13, 10, 14, 11], "texture": "#1"},
-				"south": {"uv": [13, 10, 14, 11], "texture": "#1"},
-				"up": {"uv": [2, 4, 3, 5], "texture": "#1"}
-			}
-		},
-		{
-			"from": [11.5, 0, 12.5],
-			"to": [12.5, 1, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 13]},
-			"faces": {
-				"east": {"uv": [12, 11, 13, 12], "texture": "#1"},
-				"south": {"uv": [11, 11, 12, 12], "texture": "#1"},
-				"up": {"uv": [4, 4, 5, 5], "texture": "#1"}
-			}
-		},
-		{
-			"from": [11.5, -0.001, 5.5],
-			"to": [12.5, 0.999, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 8]},
-			"faces": {
-				"up": {"uv": [5, 4, 10, 5], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [11.5, -0.001, 3.5],
-			"to": [12.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 6]},
-			"faces": {
-				"up": {"uv": [2, 9, 3, 10], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [12.5, 0, 5.5],
-			"to": [13.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 8]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "texture": "#1"}
-			}
-		},
-		{
-			"from": [13.5, 0, 4.5],
-			"to": [14.5, 1, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 7]},
-			"faces": {
-				"north": {"uv": [10, 11, 11, 12], "texture": "#1"},
-				"east": {"uv": [5, 12, 10, 13], "texture": "#1"},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [13.5, 0, 9.5],
-			"to": [14.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 12]},
-			"faces": {
-				"east": {"uv": [3, 11, 5, 12], "texture": "#1"},
-				"south": {"uv": [2, 11, 3, 12], "texture": "#1"},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [11.5, 0, 2.5],
-			"to": [12.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 5]},
-			"faces": {
-				"north": {"uv": [11, 11, 12, 12], "texture": "#1"},
-				"east": {"uv": [10, 11, 11, 12], "texture": "#1"},
-				"up": {"uv": [1, 5, 2, 6], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [12.5, 0, 3.5],
-			"to": [13.5, 1, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#1"},
-				"east": {"uv": [11, 11, 12, 12], "texture": "#1"},
-				"up": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [5.5, -0.001, 3.5],
-			"to": [10.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 4.1]},
-			"faces": {
-				"up": {"uv": [5, 10, 10, 11], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 3.5],
-			"to": [4.5, 0.999, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 4]},
-			"faces": {
-				"up": {"uv": [12, 9, 13, 10], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [5.5, 0, 2.5],
-			"to": [10.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 3]},
-			"faces": {
-				"up": {"uv": [2, 5, 3, 10], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [6.5, 0, 1.5],
-			"to": [11.5, 1, 2.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]},
-			"faces": {
-				"north": {"uv": [5, 12, 10, 13], "texture": "#1"},
-				"east": {"uv": [12, 11, 13, 12], "texture": "#1"},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [4.5, 0, 1.5],
-			"to": [6.5, 1, 2.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 2]},
-			"faces": {
-				"north": {"uv": [10, 11, 12, 12], "texture": "#1"},
-				"west": {"uv": [9, 12, 10, 13], "texture": "#1"},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [2.5, 0, 3.5],
-			"to": [3.5, 1, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 4]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#1"},
-				"west": {"uv": [12, 11, 13, 12], "texture": "#1"},
-				"up": {"uv": [1, 5, 2, 6], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [3.5, 0, 2.5],
-			"to": [4.5, 1, 3.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 3]},
-			"faces": {
-				"north": {"uv": [12, 11, 13, 12], "texture": "#1"},
-				"west": {"uv": [11, 11, 12, 12], "texture": "#1"},
-				"up": {"uv": [12, 10, 13, 11], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [3.5, -0.001, 5.5],
-			"to": [4.5, 0.999, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 8.1]},
-			"faces": {
-				"up": {"uv": [11, 5, 12, 10], "texture": "#1"}
-			}
-		},
-		{
-			"from": [2.5, 0, 5.5],
-			"to": [3.5, 1, 10.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 8]},
-			"faces": {
-				"up": {"uv": [12, 5, 13, 10], "rotation": 180, "texture": "#1"}
-			}
-		},
-		{
-			"from": [1.5, 0, 6.5],
-			"to": [2.5, 1, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 9]},
-			"faces": {
-				"south": {"uv": [13, 10, 14, 11], "texture": "#1"},
-				"west": {"uv": [5, 12, 10, 13], "texture": "#1"},
-				"up": {"uv": [5, 3, 10, 4], "rotation": 90, "texture": "#1"}
-			}
-		},
-		{
-			"from": [1.5, 0, 4.5],
-			"to": [2.5, 1, 6.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 4]},
-			"faces": {
-				"north": {"uv": [13, 10, 14, 11], "texture": "#1"},
-				"west": {"uv": [10, 11, 12, 12], "texture": "#1"},
-				"up": {"uv": [8, 3, 10, 4], "rotation": 90, "texture": "#1"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [38, 0, 0],
-			"translation": [0, 1.75, 0.75],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [38, 0, 0],
-			"translation": [0, 1.75, 0.75],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"firstperson_righthand": {
-			"rotation": [87, -19, 41],
-			"translation": [0, 4.25, 0]
-		},
-		"firstperson_lefthand": {
-			"rotation": [87, -19, 41],
-			"translation": [0, 4.25, 0]
-		},
-		"ground": {
-			"translation": [0, 7.5, 0]
-		},
-		"gui": {
-			"rotation": [90, 0, 0]
-		},
-		"head": {
-			"translation": [0, 14.5, 0]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [0, 0, -8]
-		}
-	},
-	"groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"children": [17, 18, 19, 20, 21, 22, 23, 24, 25]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"children": [26, 27, 28, 29, 30, 31, 32]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"children": [33, 34, 35, 36, 37, 38, 39]
-		},
-		{
-			"name": "group",
-			"origin": [10, 8, 12],
-			"children": [40, 41, 42, 43]
-		}
-	]
-}
\ No newline at end of file
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta b/common/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta
deleted file mode 100755
index 15fe9cc..0000000
--- a/common/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "pack": {
-    "pack_format": 15,
-    "supported_formats": [15, 99],
-    "description": "§2Makes the spinning discs on Jukeboxes round"
-  }
-}
diff --git a/common/src/main/resources/resourcepacks/rounddiscs/pack.png b/common/src/main/resources/resourcepacks/rounddiscs/pack.png
deleted file mode 100644
index df5314b..0000000
Binary files a/common/src/main/resources/resourcepacks/rounddiscs/pack.png and /dev/null differ
diff --git a/common/src/main/resources/visualoverhaul.mixins.json b/common/src/main/resources/visualoverhaul.mixins.json
index 6c32857..d2b556c 100644
--- a/common/src/main/resources/visualoverhaul.mixins.json
+++ b/common/src/main/resources/visualoverhaul.mixins.json
@@ -7,11 +7,15 @@
     "MixinJukeboxBlockEntity"
   ],
   "client": [
-    "MixinSoundSystem",
-    "MixinSmokerBlock",
+    "ItemRenderStateAccessor",
     "MixinBlastFurnaceBlock",
+    "MixinConstantTintSource",
+    "MixinGrassTintSource",
+    "MixinPotionTintSource",
     "MixinPressableWidget",
     "MixinSliderWidget",
+    "MixinSmokerBlock",
+    "MixinSoundSystem",
     "TextureManagerAccessor"
   ],
   "injectors": {
diff --git a/fabric/src/main/java/eu/midnightdust/visualoverhaul/fabric/VisualOverhaulClientFabric.java b/fabric/src/main/java/eu/midnightdust/visualoverhaul/fabric/VisualOverhaulClientFabric.java
index dfd9026..a498e69 100644
--- a/fabric/src/main/java/eu/midnightdust/visualoverhaul/fabric/VisualOverhaulClientFabric.java
+++ b/fabric/src/main/java/eu/midnightdust/visualoverhaul/fabric/VisualOverhaulClientFabric.java
@@ -1,8 +1,8 @@
 package eu.midnightdust.visualoverhaul.fabric;
 
+import eu.midnightdust.visualoverhaul.FakeBlocks;
 import eu.midnightdust.visualoverhaul.IconicButtons;
 import eu.midnightdust.visualoverhaul.VisualOverhaulClient;
-import eu.midnightdust.visualoverhaul.block.JukeboxTop;
 import eu.midnightdust.visualoverhaul.block.model.FurnaceWoodenPlanksModel;
 import eu.midnightdust.visualoverhaul.block.renderer.BrewingStandBlockEntityRenderer;
 import eu.midnightdust.visualoverhaul.block.renderer.FurnaceBlockEntityRenderer;
@@ -27,14 +27,8 @@ import net.minecraft.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.BrewingStandBlockEntity;
 import net.minecraft.client.color.world.BiomeColors;
-import net.minecraft.client.item.ModelPredicateProviderRegistry;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
-import net.minecraft.component.DataComponentTypes;
-import net.minecraft.item.Items;
-import net.minecraft.potion.Potions;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
@@ -47,14 +41,10 @@ public class VisualOverhaulClientFabric implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         VisualOverhaulClient.onInitializeClient();
-        JukeBoxTop = new JukeboxTop();
-        // Block only registered on client, because it's just used for the renderer //
-        Registry.register(Registries.BLOCK, id("jukebox_top"), JukeBoxTop);
 
         EntityModelLayerRegistry.registerModelLayer(FurnaceWoodenPlanksModel.WOODEN_PLANKS_MODEL_LAYER, FurnaceWoodenPlanksModel::getTexturedModelData);
 
         BlockRenderLayerMap.INSTANCE.putBlock(Blocks.JUKEBOX, RenderLayer.getCutout());
-        BlockRenderLayerMap.INSTANCE.putBlock(JukeBoxTop, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(Blocks.FURNACE, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(Blocks.SMOKER, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(Blocks.BLAST_FURNACE, RenderLayer.getCutout());
@@ -70,12 +60,6 @@ public class VisualOverhaulClientFabric implements ClientModInitializer {
         //    PhonosCompatInit.init();
         //}
 
-        Registries.ITEM.forEach((item) -> {
-            ModelPredicateProviderRegistry.register(item, Identifier.ofVanilla("round"), (stack, world, entity, seed) ->
-                    stack.getComponents().contains(DataComponentTypes.JUKEBOX_PLAYABLE) && stack.getComponents().contains(DataComponentTypes.CUSTOM_MODEL_DATA) &&
-                            stack.getComponents().get(DataComponentTypes.CUSTOM_MODEL_DATA).value() == 710 ? 1.0F : 0.0F);
-        });
-
         ClientPlayNetworking.registerGlobalReceiver(UpdateItemsPacket.PACKET_ID,
                 (payload, context) -> context.client().execute(() -> {
                     if (payload.blockTypeID().equals(UPDATE_TYPE_RECORD)) jukeboxItems.put(payload.pos(), payload.inv().getFirst());
@@ -97,7 +81,6 @@ public class VisualOverhaulClientFabric implements ClientModInitializer {
             ResourceManagerHelper.registerBuiltinResourcePack(id("nobrewingbottles"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED);
             ResourceManagerHelper.registerBuiltinResourcePack(id("fancyfurnace"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED);
             ResourceManagerHelper.registerBuiltinResourcePack(id("coloredwaterbucket"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED);
-            ResourceManagerHelper.registerBuiltinResourcePack(id("rounddiscs"), modContainer, ResourcePackActivationType.ALWAYS_ENABLED);
         });
         ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
             if (client.player != null) {
@@ -112,7 +95,7 @@ public class VisualOverhaulClientFabric implements ClientModInitializer {
                     waterColor = BiomeColors.getWaterColor(client.world, client.player.getBlockPos());
                     foliageColor = BiomeColors.getFoliageColor(client.world, client.player.getBlockPos());
                     grassColor = BiomeColors.getGrassColor(client.world, client.player.getBlockPos());
-                    potionColor = VOColorUtil.convertRgbToArgb(waterColor);
+                    potionColor = VOColorUtil.convertRgbToArgb(waterColor, 200);
                 } else {
                     waterColor = 4159204;
                     foliageColor = -8934609;
@@ -120,21 +103,6 @@ public class VisualOverhaulClientFabric implements ClientModInitializer {
                     potionColor = -13083194;
                 }
             });
-
-            ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.WATER_BUCKET, Items.AXOLOTL_BUCKET, Items.COD_BUCKET, Items.PUFFERFISH_BUCKET, Items.TROPICAL_FISH_BUCKET, Items.SALMON_BUCKET);
-            ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.GRASS_BLOCK, Items.SHORT_GRASS, Items.TALL_GRASS, Items.FERN, Items.LARGE_FERN);
-            ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.OAK_LEAVES, Items.DARK_OAK_LEAVES, Items.JUNGLE_LEAVES, Items.ACACIA_LEAVES, Items.VINE, Items.SUGAR_CANE);
-            if (VOConfig.coloredLilypad) ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.LILY_PAD);
-
-            ColorProviderRegistry.ITEM.register((stack, tintIndex) -> {
-                var contents = stack.getComponents().get(DataComponentTypes.POTION_CONTENTS);
-                if (contents == null || contents.potion().isEmpty()) return tintIndex > 0 ? -1 : potionColor;
-                var potion = contents.potion().get();
-                if ((potion == Potions.WATER || potion == Potions.MUNDANE || potion == Potions.THICK || potion == Potions.AWKWARD) && tintIndex == 0) {
-                    return potionColor;
-                }
-                return tintIndex > 0 ? -1 : contents.getColor();
-            }, Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION);
         }
         if (VOConfig.coloredLilypad) {
             ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) -> world != null ? world.getColor(pos, BiomeColors.FOLIAGE_COLOR) : 0, Blocks.LILY_PAD);
@@ -149,6 +117,7 @@ public class VisualOverhaulClientFabric implements ClientModInitializer {
             @Override
             public void reload(ResourceManager manager) {
                 IconicButtons.reload(manager);
+                FakeBlocks.reload(manager);
             }
         });
     }
diff --git a/fabric/src/main/java/eu/midnightdust/visualoverhaul/fabric/mixin/MixinAbstractFurnaceBlockEntity.java b/fabric/src/main/java/eu/midnightdust/visualoverhaul/fabric/mixin/MixinAbstractFurnaceBlockEntity.java
index 2f8ad1d..eccb2e5 100755
--- a/fabric/src/main/java/eu/midnightdust/visualoverhaul/fabric/mixin/MixinAbstractFurnaceBlockEntity.java
+++ b/fabric/src/main/java/eu/midnightdust/visualoverhaul/fabric/mixin/MixinAbstractFurnaceBlockEntity.java
@@ -12,6 +12,7 @@ import net.minecraft.block.entity.LockableContainerBlockEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -43,7 +44,7 @@ public abstract class MixinAbstractFurnaceBlockEntity extends LockableContainerB
     }
 
     @Inject(at = @At("TAIL"), method = "tick")
-    private static void tick(World world, BlockPos pos, BlockState state, AbstractFurnaceBlockEntity blockEntity, CallbackInfo ci) {
+    private static void tick(ServerWorld world, BlockPos pos, BlockState state, AbstractFurnaceBlockEntity blockEntity, CallbackInfo ci) {
         if (world.getBlockState(pos).hasBlockEntity()) {
             if (!world.isClient && (visualoverhaul$invUpdate || world.getPlayers().size() != visualoverhaul$playerUpdate)) {
                 Stream<ServerPlayerEntity> watchingPlayers = PlayerLookup.tracking(blockEntity).stream();
diff --git a/gradle.properties b/gradle.properties
index 68ae896..387d026 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,23 +1,23 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.21
-yarn_mappings=1.21+build.2
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=visualoverhaul
-mod_version=5.2.1
+mod_version=6.0.0
 maven_group=eu.midnightdust
 release_type=release
 curseforge_id=432008
 modrinth_id=YQnwl5Vv
 
-midnightlib_version=1.5.7
+midnightlib_version=1.6.7
 phonos_version=0.3.0+1.19.2
 
-fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
+fabric_loader_version=0.16.9
+fabric_api_version=0.111.0+1.21.4
 
-neoforge_version=21.0.14-beta
+neoforge_version=21.4.10-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 quilt_loader_version=0.19.0-beta.18
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17655d0..0d18421 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulClientEvents.java b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulClientEvents.java
index 1f22754..02e489c 100644
--- a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulClientEvents.java
+++ b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulClientEvents.java
@@ -1,5 +1,6 @@
 package eu.midnightdust.visualoverhaul.neoforge;
 
+import eu.midnightdust.visualoverhaul.FakeBlocks;
 import eu.midnightdust.visualoverhaul.IconicButtons;
 import eu.midnightdust.visualoverhaul.block.model.FurnaceWoodenPlanksModel;
 import eu.midnightdust.visualoverhaul.block.renderer.BrewingStandBlockEntityRenderer;
@@ -49,6 +50,7 @@ public class VisualOverhaulClientEvents {
         @Override
         public void reload(ResourceManager manager) {
             IconicButtons.reload(manager);
+            FakeBlocks.reload(manager);
         }
     }
     @SubscribeEvent
@@ -57,7 +59,6 @@ public class VisualOverhaulClientEvents {
             registerResourcePack(event, id("nobrewingbottles"), false, true);
             registerResourcePack(event, id("fancyfurnace"), false, true);
             registerResourcePack(event, id("coloredwaterbucket"), false, true);
-            registerResourcePack(event, id("rounddiscs"), true, false);
         }
     }
     private static void registerResourcePack(AddPackFindersEvent event, Identifier id, boolean alwaysEnabled, boolean defaultEnabled) {
diff --git a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulClientForge.java b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulClientForge.java
index e04e5c9..39f3c81 100644
--- a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulClientForge.java
+++ b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulClientForge.java
@@ -1,28 +1,22 @@
 package eu.midnightdust.visualoverhaul.neoforge;
 
 import eu.midnightdust.visualoverhaul.VisualOverhaulClient;
-import eu.midnightdust.visualoverhaul.block.JukeboxTop;
 import eu.midnightdust.visualoverhaul.config.VOConfig;
 import eu.midnightdust.visualoverhaul.util.VOColorUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.color.world.BiomeColors;
-import net.minecraft.client.item.ModelPredicateProviderRegistry;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.RenderLayers;
-import net.minecraft.component.DataComponentTypes;
 import net.minecraft.registry.Registries;
 import net.minecraft.resource.ResourcePackProfile;
-import net.minecraft.util.Identifier;
-import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.registries.DeferredRegister;
 import org.apache.commons.compress.utils.Lists;
 
 import java.util.List;
-import java.util.Objects;
 
 import static eu.midnightdust.visualoverhaul.VisualOverhaulClient.*;
 import static eu.midnightdust.visualoverhaul.VisualOverhaulCommon.*;
@@ -35,20 +29,8 @@ public class VisualOverhaulClientForge {
 
     public static void initClient() {
         VisualOverhaulClient.onInitializeClient();
-        // Block only registered on client, because it's just used for the renderer //
-        BLOCKS.register(Objects.requireNonNull(ModLoadingContext.get().getActiveContainer().getEventBus()));
-        BLOCKS.register("jukebox_top", () -> {
-            VisualOverhaulClient.JukeBoxTop = new JukeboxTop();
-            return VisualOverhaulClient.JukeBoxTop;
-        });
         NeoForge.EVENT_BUS.addListener(VisualOverhaulClientForge::doClientTick);
 
-        Registries.ITEM.forEach((item) -> {
-            ModelPredicateProviderRegistry.register(item, Identifier.ofVanilla("round"), (stack, world, entity, seed) ->
-                    stack.getComponents().contains(DataComponentTypes.JUKEBOX_PLAYABLE) && stack.getComponents().contains(DataComponentTypes.CUSTOM_MODEL_DATA) &&
-                            stack.getComponents().get(DataComponentTypes.CUSTOM_MODEL_DATA).value() == 710 ? 1.0F : 0.0F);
-        });
-
         RenderLayers.setRenderLayer(Blocks.JUKEBOX, RenderLayer.getCutout());
         RenderLayers.setRenderLayer(Blocks.FURNACE, RenderLayer.getCutout());
         RenderLayers.setRenderLayer(Blocks.SMOKER, RenderLayer.getCutout());
@@ -61,7 +43,7 @@ public class VisualOverhaulClientForge {
                 waterColor = BiomeColors.getWaterColor(client.world, client.player.getBlockPos());
                 foliageColor = BiomeColors.getFoliageColor(client.world, client.player.getBlockPos());
                 grassColor = BiomeColors.getGrassColor(client.world, client.player.getBlockPos());
-                potionColor = VOColorUtil.convertRgbToArgb(waterColor);
+                potionColor = VOColorUtil.convertRgbToArgb(waterColor, 200);
             } else {
                 waterColor = 4159204;
                 foliageColor = -8934609;
diff --git a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulForge.java b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulForge.java
index a848e6e..499c890 100644
--- a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulForge.java
+++ b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/VisualOverhaulForge.java
@@ -8,7 +8,6 @@ import static eu.midnightdust.visualoverhaul.VisualOverhaulCommon.*;
 
 @Mod(MOD_ID)
 public class VisualOverhaulForge {
-
     public VisualOverhaulForge() {
         if (FMLEnvironment.dist == Dist.CLIENT) VisualOverhaulClientForge.initClient();
     }
diff --git a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/mixin/MixinAbstractFurnaceBlockEntity.java b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/mixin/MixinAbstractFurnaceBlockEntity.java
index b685723..86298c8 100755
--- a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/mixin/MixinAbstractFurnaceBlockEntity.java
+++ b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/mixin/MixinAbstractFurnaceBlockEntity.java
@@ -9,6 +9,7 @@ import net.minecraft.block.entity.LockableContainerBlockEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerChunkManager;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
@@ -36,7 +37,7 @@ public abstract class MixinAbstractFurnaceBlockEntity extends LockableContainerB
     }
 
     @Inject(at = @At("TAIL"), method = "tick")
-    private static void tick(World world, BlockPos pos, BlockState state, AbstractFurnaceBlockEntity blockEntity, CallbackInfo ci) {
+    private static void tick(ServerWorld world, BlockPos pos, BlockState state, AbstractFurnaceBlockEntity blockEntity, CallbackInfo ci) {
         if (world.getBlockState(pos).hasBlockEntity()) {
             if (!world.isClient && (visualoverhaul$invUpdate || world.getPlayers().size() == visualoverhaul$playerUpdate)) {
                 Stream<ServerPlayerEntity> watchingPlayers = ((ServerChunkManager)world.getChunkManager()).chunkLoadingManager.getPlayersWatchingChunk(new ChunkPos(pos), false).stream();
diff --git a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/mixin/MixinItemColors.java b/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/mixin/MixinItemColors.java
deleted file mode 100644
index 763c3f7..0000000
--- a/neoforge/src/main/java/eu/midnightdust/visualoverhaul/neoforge/mixin/MixinItemColors.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package eu.midnightdust.visualoverhaul.neoforge.mixin;
-
-import eu.midnightdust.visualoverhaul.config.VOConfig;
-import net.minecraft.client.color.block.BlockColors;
-import net.minecraft.client.color.item.ItemColors;
-import net.minecraft.component.DataComponentTypes;
-import net.minecraft.item.Items;
-import net.minecraft.potion.Potions;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import static eu.midnightdust.visualoverhaul.VisualOverhaulClient.*;
-import static eu.midnightdust.visualoverhaul.VisualOverhaulClient.potionColor;
-
-@Mixin(ItemColors.class)
-public abstract class MixinItemColors {
-    @SuppressWarnings("deprecation")
-    @Inject(method = "create", at = @At("RETURN"))
-    private static void create(BlockColors blockMap, CallbackInfoReturnable<ItemColors> info) {
-        if (VOConfig.coloredItems) {
-            ItemColors itemColors = info.getReturnValue();
-            itemColors.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.WATER_BUCKET, Items.AXOLOTL_BUCKET, Items.COD_BUCKET, Items.PUFFERFISH_BUCKET, Items.TROPICAL_FISH_BUCKET, Items.SALMON_BUCKET);
-            itemColors.register((stack, tintIndex) -> grassColor, Items.GRASS_BLOCK, Items.SHORT_GRASS, Items.TALL_GRASS, Items.FERN, Items.LARGE_FERN);
-            itemColors.register((stack, tintIndex) -> foliageColor, Items.OAK_LEAVES, Items.JUNGLE_LEAVES, Items.DARK_OAK_LEAVES, Items.ACACIA_LEAVES, Items.VINE, Items.SUGAR_CANE);
-            if (VOConfig.coloredLilypad) itemColors.register((stack, tintIndex) -> foliageColor, Items.LILY_PAD);
-            itemColors.register((stack, tintIndex) -> {
-                var contents = stack.getComponents().get(DataComponentTypes.POTION_CONTENTS);
-                if (contents == null || contents.potion().isEmpty()) return tintIndex > 0 ? -1 : potionColor;
-                var potion = contents.potion().get();
-                if ((potion == Potions.WATER || potion == Potions.MUNDANE || potion == Potions.THICK || potion == Potions.AWKWARD) && tintIndex == 0) {
-                    return potionColor;
-                }
-                return tintIndex > 0 ? -1 : contents.getColor();
-            }, Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION);
-        }
-    }
-}
diff --git a/neoforge/src/main/resources/visualoverhaul-neoforge.mixins.json b/neoforge/src/main/resources/visualoverhaul-neoforge.mixins.json
index c2c2e4f..877b73d 100644
--- a/neoforge/src/main/resources/visualoverhaul-neoforge.mixins.json
+++ b/neoforge/src/main/resources/visualoverhaul-neoforge.mixins.json
@@ -9,7 +9,6 @@
   ],
   "client": [
     "MixinResourcePackManager",
-    "MixinItemColors",
     "MixinBlockColors"
   ],
   "injectors": {