From 0a905a79d183b4f16201544acfb746da3b326620 Mon Sep 17 00:00:00 2001
From: Martin Prokoph <motschen@midnightdust.eu>
Date: Sun, 26 Jan 2025 00:55:03 +0100
Subject: [PATCH] feat: dynamic round disc model generation

- Cursed, but it works :)
---
 .../renderer/JukeboxBlockEntityRenderer.java  |  10 +-
 .../block/renderer/RoundDiscRenderer.java     |  90 +++
 .../mixin/ItemRenderStateAccessor.java        |  12 +
 .../item/button_mushrooms_music_disk.json     |  15 -
 .../button_mushrooms_music_disk_round.json    |   6 -
 .../models/item/ghost_town_music_disk.json    |  15 -
 .../item/ghost_town_music_disk_round.json     |   6 -
 .../models/item/swamp_jives_music_disk.json   |  15 -
 .../item/swamp_jives_music_disk_round.json    |   6 -
 .../models/item/music_disc_ashes.json         |  15 -
 .../models/item/music_disc_ashes_round.json   |   6 -
 .../models/item/dynamic_disc.json             |  15 -
 .../models/item/music_disc_0x10c.json         |  15 -
 .../models/item/music_disc_0x10c_round.json   |   6 -
 .../item/music_disc_cliffside_hinson.json     |  15 -
 .../music_disc_cliffside_hinson_round.json    |   6 -
 .../models/item/music_disc_i_jate_my_hob.json |  15 -
 .../item/music_disc_i_jate_my_hob_round.json  |   6 -
 .../models/item/music_disc_peanuts.json       |  15 -
 .../models/item/music_disc_peanuts_round.json |   6 -
 .../models/item/music_disc_repetition.json    |  15 -
 .../item/music_disc_repetition_round.json     |   6 -
 ...isc_sometimes_i_make_video_game_music.json |  15 -
 ...metimes_i_make_video_game_music_round.json |   6 -
 .../minecraft/models/item/music_disc_11.json  |  15 -
 .../models/item/music_disc_11_round.json      |   6 -
 .../minecraft/models/item/music_disc_13.json  |  15 -
 .../models/item/music_disc_13_round.json      |   6 -
 .../minecraft/models/item/music_disc_5.json   |  15 -
 .../models/item/music_disc_5_round.json       |   6 -
 .../models/item/music_disc_blocks.json        |  15 -
 .../models/item/music_disc_blocks_round.json  |   6 -
 .../minecraft/models/item/music_disc_cat.json |  15 -
 .../models/item/music_disc_cat_round.json     |   6 -
 .../models/item/music_disc_chirp.json         |  15 -
 .../models/item/music_disc_chirp_round.json   |   6 -
 .../models/item/music_disc_creator.json       |  15 -
 .../item/music_disc_creator_music_box.json    |  15 -
 .../music_disc_creator_music_box_round.json   |   6 -
 .../models/item/music_disc_creator_round.json |   6 -
 .../minecraft/models/item/music_disc_far.json |  15 -
 .../models/item/music_disc_far_round.json     |   6 -
 .../models/item/music_disc_mall.json          |  15 -
 .../models/item/music_disc_mall_round.json    |   6 -
 .../models/item/music_disc_mellohi.json       |  15 -
 .../models/item/music_disc_mellohi_round.json |   6 -
 .../models/item/music_disc_otherside.json     |  15 -
 .../item/music_disc_otherside_round.json      |   6 -
 .../models/item/music_disc_pigstep.json       |  15 -
 .../models/item/music_disc_pigstep_round.json |   6 -
 .../models/item/music_disc_precipice.json     |  15 -
 .../item/music_disc_precipice_round.json      |   6 -
 .../models/item/music_disc_relic.json         |  15 -
 .../models/item/music_disc_relic_round.json   |   6 -
 .../models/item/music_disc_stal.json          |  15 -
 .../models/item/music_disc_stal_round.json    |   6 -
 .../models/item/music_disc_strad.json         |  15 -
 .../models/item/music_disc_strad_round.json   |   6 -
 .../models/item/music_disc_wait.json          |  15 -
 .../models/item/music_disc_wait_round.json    |   6 -
 .../models/item/music_disc_ward.json          |  15 -
 .../models/item/music_disc_ward_round.json    |   6 -
 .../phonos/models/item/custom_music_disc.json |  16 -
 .../models/item/custom_music_disc_round.json  |   7 -
 .../recordable/models/item/copper_record.json |  25 -
 .../models/item/copper_record_round.json      | 557 ------------------
 .../models/item/round_disc.json               | 468 ---------------
 .../item/round_disc_colored_layers.json       | 448 --------------
 .../resourcepacks/rounddiscs/pack.mcmeta      |   7 -
 .../resourcepacks/rounddiscs/pack.png         | Bin 3881 -> 0 bytes
 .../main/resources/visualoverhaul.mixins.json |   5 +-
 71 files changed, 107 insertions(+), 2162 deletions(-)
 create mode 100644 common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/RoundDiscRenderer.java
 create mode 100644 common/src/main/java/eu/midnightdust/visualoverhaul/mixin/ItemRenderStateAccessor.java
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/dynamic-discs/models/item/dynamic_disc.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_music_box.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_music_box_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_creator_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_precipice.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_precipice_round.json
 delete mode 100644 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_relic.json
 delete mode 100644 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_relic_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record_round.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc_colored_layers.json
 delete mode 100755 common/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta
 delete mode 100644 common/src/main/resources/resourcepacks/rounddiscs/pack.png

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..837334a 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
@@ -13,11 +13,7 @@ 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.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;
@@ -57,7 +53,7 @@ public class JukeboxBlockEntityRenderer implements BlockEntityRenderer<JukeboxBl
                 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()) {
+                if (Registries.ITEM.getOptionalValue(discItem).isPresent()) {
                     record = new ItemStack(Registries.ITEM.get(discItem));
                 }
                 else {
@@ -73,15 +69,13 @@ public class JukeboxBlockEntityRenderer implements BlockEntityRenderer<JukeboxBl
             }
 
             if (!record.isEmpty()) {
-                //record.setCount(2);
-                record.applyComponentsFrom(ComponentMap.builder().add(DataComponentTypes.CUSTOM_MODEL_DATA, new CustomModelDataComponent(710)).build());
                 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(record.getItem(), 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)) {
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..3da4038
--- /dev/null
+++ b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/RoundDiscRenderer.java
@@ -0,0 +1,90 @@
+package eu.midnightdust.visualoverhaul.block.renderer;
+
+import eu.midnightdust.visualoverhaul.mixin.ItemRenderStateAccessor;
+import net.minecraft.client.MinecraftClient;
+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.item.Item;
+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;
+
+/*
+* 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()+":"+"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 void render(Item item, 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(Registries.ITEM.getId(item)), 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() {
+                @Override
+                public Sprite get(SpriteIdentifier spriteId) { return spriteId.getSprite(); }
+
+                @Override
+                public Sprite getMissing(String textureId) {
+                    return MinecraftClient.getInstance().getPaintingManager().getBackSprite();
+                    // should be the missing sprite, but this also works lol
+                }
+            };
+        }
+
+        @Override // no clue what this does
+        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/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 df5314b894aaf7bc955267707c7f7034102a2955..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3881
zcmeHKYitx%6rNI$+VTiWgOL814p^(r?9A-W?skS<*urkxm2TZ`H&8-MxI1%aJL&Gu
zFf;8=n;=M#heCJ+OhhEr1dR|7_#s9EBBBTpH4zC>f<zOH^@W6zfarQ>cH3?vf11d@
zPBM>s?{~g)&UeqfnY%gK+BCI%PC15QQ^U={7<vb+dtxbib~L4aL$8U+hDZa39o<%O
z4@^Ss5<S+m2s`{m)z7H$u-d#_$FPb=t-A!<v-dH?G)Ini7#)!oUQp5wASwyyFw-hR
zW0-HDsRE%38h8RG<&2;B<AV<gTo(PrGIxZIsEc8z+}x+Z_P*A*(AOn!BC&8mxzFSg
zK^htWH`A$%&YOP1=H=11)lCt&4Kcd>L`NiwFIF^&vkulllOa>?aS{v4ai1nid@R^l
zpg=7@(P<bePf^)y){%8N6fH?H9LG_#lX5yqgdp|ai~&qCqtCS{@*F{^3!1DNvXa3q
zPLNQ#4L?DkaeOGgv>J&F(`WR83P=yi1S-WiXeyniiY;^_)PqP00o~U^kN2vOia}lJ
z)&v;pff-|NF@-1$+pFDL%1%cVD42q21l5sOW|YgOa3nfxVM&mb)2eNS#2$q-WNAdK
zQL$Mgb~?p@AoF3~QRt!EZ7@PbB79I0x~=fSK|f*n=S4-3Mc)4OIupQIFF47B6Szs%
z3A`i+8J2Xipq_zHbk)~0MO5L8Zh(vcEh<FrkP(lU0iu^?y(I96UXqm<7YW=fO)@OQ
zh|rrz2(+t+;u%dwRS8nXQCU<XqH;_1qQuZ%(#0kq$$DLo1RMb90X;Nyb1W-*Y${RU
z8x<`L&~(aakc5<)N!kOJ;Cw?g>?fQKdZZ_s0)~VP{6veK={83O;&K|c8^BVN@vt5a
z#q9QQ9PM`I)3*7RLQO}NXmK*M!<FZ?riDkzAYp-3r-;C&MY-^cH3$qviz`aXPgoSV
zWoef;?#oX~v#cXTuT}Adns0}z@~!+5NXhmPj@xC+10nB32R%@<9U;5?kkAP-Nr={W
zp`eEP<@-#Qi<Vdq^ms{0as!g(AWfnIkVuwJh@d_pxi}9T&8{nwkp&uTNTN(pHmHE?
zZ17rJ$|pyovz^e=iAHOic99GnchbCz;~7sK&G0l$P=$mkYgG?r?4$mpiO&WUZ3D<I
z--osrv|CZb+f_j`OU4Iy73SgrdO+0UPR69~xLo6MjY)wqfyb+BT&^)GFedPLb^UL0
zm5&^FU<UmKWzliw;3YU89feNyp;J-}WN}qfBsm3f1O49P(3B+%GrvtoS3L4DUUu)N
znf`SX7`5u_%dcGRKTDOLJM-rJA8&RfL;b6-Ql_y|x(0W@v437^UER_p^SFU)d(9iz
zMse`s#`Zwhj?m56(^nSWy~Ey!k}DjIH>ZGCCvBY-eQwKFrGuOMPHx<>VaDqf+>`@r
z>MC~+-hJWF{@FiF=8t|Zd_VBbyT_^9)2cn^cWv36zy>Bif8cTP3RIRI?7p=voT|><
zHn5Z5@yjP(+3?a%luKo_B_3*0TaID5>gwu1Akfy<mdoX8YHEHtCZ9oo5+l~yjs>n?
zM#*9O!oh}k^Vti#PgJhOr>yVIY(IT<*0X^>xwT?R#Y0CxZpJR`pZ?Wa<@R^3O{n^G
zp1b31mvXLj(+PMX=-65ljGU5By?jjAu<5N&Ui7K6j~v~Ot(bYJc7oZv{?cDl@zbqO
zVAI<Mj#sI_v&Vbj%Fj-~(&}HIDsjIiZpH4rw}v`2Z7p^E@An6>FUt<xx=_pYpFdr7
ieM#9GnJTNz?U~+4gf6c7=*T`4DHaa31`jV<x$a-HsaHDy

diff --git a/common/src/main/resources/visualoverhaul.mixins.json b/common/src/main/resources/visualoverhaul.mixins.json
index 6c32857..5131ba7 100644
--- a/common/src/main/resources/visualoverhaul.mixins.json
+++ b/common/src/main/resources/visualoverhaul.mixins.json
@@ -7,11 +7,12 @@
     "MixinJukeboxBlockEntity"
   ],
   "client": [
-    "MixinSoundSystem",
-    "MixinSmokerBlock",
+    "ItemRenderStateAccessor",
     "MixinBlastFurnaceBlock",
     "MixinPressableWidget",
     "MixinSliderWidget",
+    "MixinSmokerBlock",
+    "MixinSoundSystem",
     "TextureManagerAccessor"
   ],
   "injectors": {