VisualOverhaul 3.3.0 - 1.17 and small Refactor

Update to 1.17-pre1 and Java 16 Upgrade to MidnightLib, making the config more clean and accessible without modmenu (Please ignore the commits before)
Revert "VisualOverhaul 3.1.0 - 1.17 and small Refactor"
2025-12-16 14:05:08 +01:00 · 2021-05-30 13:25:44 +02:00 · 2021-05-30 13:22:52 +02:00 · 2021-05-30 13:15:12 +02:00 · 2021-03-30 20:35:17 +02:00 · 2021-03-28 12:07:47 +02:00
145 changed files with 2592 additions and 218 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/0
+++ b/0
--- a/README.md
+++ b/README.md
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }

-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16

 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -14,6 +14,7 @@ minecraft {
 }

 repositories {
+	maven { url "https://maven.terraformersmc.com/releases" }
 	maven { url "https://jitpack.io" }
 }

@@ -21,17 +22,16 @@ dependencies {
 	//to change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

-	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
-	modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}") {
-		exclude group: "net.fabricmc.fabric-api"
-	}
-	modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}") {
-		exclude group: "net.fabricmc.fabric-api"
-	}
-	modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}") {
+	compileOnly "io.github.FoundationGames:Phonos:0.1.1-1.17"
+	
+	modImplementation "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}"
+    include "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}"
+	
+	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") {
 		exclude group: "net.fabricmc.fabric-api"
 	}
 }
@@ -39,33 +39,33 @@ dependencies {
 processResources {
 	inputs.property "version", project.version

-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
+	filesMatching("fabric.mod.json") {
 		expand "version": project.version
 	}
-
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
 }

-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
+tasks.withType(JavaCompile).configureEach {
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
+	it.options.release = 16
 }

-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
-	from sourceSets.main.allSource
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
 }

 jar {
-	from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
 }

 // configure the maven publication
@@ -82,9 +82,11 @@ publishing {
 		}
 	}

-	// select the repositories you want to publish to
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
 	repositories {
-		// uncomment to publish to the local maven
-		// mavenLocal()
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
 	}
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,19 +3,17 @@ org.gradle.jvmargs=-Xmx1G

 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.4
-	yarn_mappings=1.16.4+build.7
-	loader_version=0.10.8
+	minecraft_version=1.17-pre1
+    yarn_mappings=1.17-pre1+build.9
+    loader_version=0.11.3

 # Mod Properties
-	mod_version = 1.0.0
+	mod_version = 3.3.0
 	maven_group = eu.midnightdust
 	archives_base_name = visualoverhaul

 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.28.4+1.16
-	
-	auto_config_version = 3.2.0-unstable
-	cloth_config_version = 4.7.0-unstable
-	mod_menu_version = 1.14.6+build.31
+	fabric_version=0.34.8+1.17
+	mod_menu_version = 2.0.0-beta.5
+	midnightlib_version=v0.2.2
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/35
+++ b/35
@@ -82,6 +82,7 @@ esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=$((i+1))
+        i=`expr $i + 1`
    done
    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -175,14 +177,9 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`

 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.

 goto fail

-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
--- a/settings.gradle
+++ b/settings.gradle
--- a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java
@@ -3,6 +3,9 @@ package eu.midnightdust.visualoverhaul;
 import net.minecraft.util.Identifier;

 public class VisualOverhaul {
-    public static final Identifier UPDATE_POTION_BOTTLES = new Identifier("visualoverhaul", "brewingstand");
-    public static final Identifier UPDATE_RECORD = new Identifier("visualoverhaul", "record");
+    public static final String MOD_ID = "visualoverhaul";
+
+    public static final Identifier UPDATE_POTION_BOTTLES = new Identifier(MOD_ID, "brewingstand");
+    public static final Identifier UPDATE_RECORD = new Identifier(MOD_ID, "record");
+    public static final Identifier UPDATE_FURNACE_ITEMS = new Identifier(MOD_ID, "furnace");
 }
--- a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java
@@ -1,51 +1,80 @@
 package eu.midnightdust.visualoverhaul;

 import eu.midnightdust.visualoverhaul.block.JukeboxTop;
+import eu.midnightdust.visualoverhaul.block.model.FurnaceWoodenPlanksModel;
 import eu.midnightdust.visualoverhaul.block.renderer.BrewingStandBlockEntityRenderer;
+import eu.midnightdust.visualoverhaul.block.renderer.FurnaceBlockEntityRenderer;
 import eu.midnightdust.visualoverhaul.block.renderer.JukeboxBlockEntityRenderer;
 import eu.midnightdust.visualoverhaul.config.VOConfig;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
+import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityModelLayerRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
+import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl;
 import net.fabricmc.fabric.impl.networking.ClientSidePacketRegistryImpl;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.BrewingStandBlockEntity;
+import net.minecraft.block.entity.FurnaceBlockEntity;
 import net.minecraft.block.entity.JukeboxBlockEntity;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.color.world.BiomeColors;
+import net.minecraft.client.render.*;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.item.MusicDiscItem;
+import net.minecraft.potion.PotionUtil;
+import net.minecraft.potion.Potions;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.registry.Registry;
+import net.minecraft.world.biome.BuiltinBiomes;

-import static eu.midnightdust.visualoverhaul.VisualOverhaul.UPDATE_POTION_BOTTLES;
-import static eu.midnightdust.visualoverhaul.VisualOverhaul.UPDATE_RECORD;
+import static eu.midnightdust.visualoverhaul.VisualOverhaul.*;

+@SuppressWarnings("UnstableApiUsage")
 public class VisualOverhaulClient implements ClientModInitializer {
-    public static VOConfig VO_CONFIG;
-    public static Block JukeBoxTop = new JukeboxTop();

+    public static Block JukeBoxTop = new JukeboxTop();
+    public static Item RoundDiscDummy = new Item(new FabricItemSettings());
+    private final MinecraftClient client = MinecraftClient.getInstance();

    @Override
    public void onInitializeClient() {
-        AutoConfig.register(VOConfig.class, JanksonConfigSerializer::new);
-        VO_CONFIG = AutoConfig.getConfigHolder(VOConfig.class).getConfig();
+        VOConfig.init("visualoverhaul", VOConfig.class);

        // Block only registered on client, because it's just used for the renderer //
        Registry.register(Registry.BLOCK, new Identifier("visualoverhaul","jukebox_top"), JukeBoxTop);
+        Registry.register(Registry.ITEM, new Identifier("visualoverhaul","round_disc"), RoundDiscDummy);
+        EntityModelLayerRegistry.registerModelLayer(FurnaceWoodenPlanksModel.WOODEN_PLANKS_MODEL_LAYER, FurnaceWoodenPlanksModel::getTexturedModelData);
+
+
+        BlockRenderLayerMapImpl.INSTANCE.putBlock(Blocks.JUKEBOX, RenderLayer.getCutout());
+        BlockRenderLayerMapImpl.INSTANCE.putBlock(JukeBoxTop, RenderLayer.getCutout());
+        BlockRenderLayerMapImpl.INSTANCE.putBlock(Blocks.FURNACE, RenderLayer.getCutout());

        BlockEntityRendererRegistry.INSTANCE.register(BlockEntityType.BREWING_STAND, BrewingStandBlockEntityRenderer::new);
        BlockEntityRendererRegistry.INSTANCE.register(BlockEntityType.JUKEBOX, JukeboxBlockEntityRenderer::new);
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntityType.FURNACE, FurnaceBlockEntityRenderer::new);
+
+//        // Phonos Compat //
+//        if (FabricLoader.getInstance().isModLoaded("phonos")) {
+//            PhonosCompatInit.init();
+//            BlockEntityRendererRegistry.INSTANCE.register(PhonosBlocks.RADIO_JUKEBOX_ENTITY, RadioJukeboxBlockEntityRenderer::new);
+//        }

        Registry.ITEM.forEach((item) -> {
-            if(item instanceof MusicDiscItem) {
-                FabricModelPredicateProviderRegistry.register(item, new Identifier("round"), (stack, world, entity) -> stack.getCount() == 2 ? 1.0F : 0.0F);
+            if(item instanceof MusicDiscItem || item.getName().getString().toLowerCase().contains("music_disc") || item.getName().getString().toLowerCase().contains("dynamic_disc")) {
+                FabricModelPredicateProviderRegistry.register(item, new Identifier("round"), (stack, world, entity, seed) -> stack.getCount() == 2 ? 1.0F : 0.0F);
            }
        });

@@ -57,12 +86,13 @@ public class VisualOverhaulClient implements ClientModInitializer {
                        inv.set(i, attachedData.readItemStack());
                    }
                    packetContext.getTaskQueue().execute(() -> {
-                        BrewingStandBlockEntity blockEntity = (BrewingStandBlockEntity) MinecraftClient.getInstance().world.getBlockEntity(pos);
-                        blockEntity.setStack(0,inv.get(0));
-                        blockEntity.setStack(1,inv.get(1));
-                        blockEntity.setStack(2,inv.get(2));
-                        blockEntity.setStack(3,inv.get(3));
-                        blockEntity.setStack(4,inv.get(4));
+                        if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof BrewingStandBlockEntity blockEntity) {
+                            blockEntity.setStack(0, inv.get(0));
+                            blockEntity.setStack(1, inv.get(1));
+                            blockEntity.setStack(2, inv.get(2));
+                            blockEntity.setStack(3, inv.get(3));
+                            blockEntity.setStack(4, inv.get(4));
+                        }
                    });
                });
        ClientSidePacketRegistryImpl.INSTANCE.register(UPDATE_RECORD,
@@ -70,13 +100,79 @@ public class VisualOverhaulClient implements ClientModInitializer {
                    BlockPos pos = attachedData.readBlockPos();
                    ItemStack record = attachedData.readItemStack();
                    packetContext.getTaskQueue().execute(() -> {
-                        JukeboxBlockEntity blockEntity = (JukeboxBlockEntity)MinecraftClient.getInstance().world.getBlockEntity(pos);
-                        blockEntity.setRecord(record);
+                        if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof JukeboxBlockEntity blockEntity) {
+                            blockEntity.setRecord(record);
+                        }
+                    });
+                });
+        ClientSidePacketRegistryImpl.INSTANCE.register(UPDATE_FURNACE_ITEMS,
+                (packetContext, attachedData) -> {
+                    BlockPos pos = attachedData.readBlockPos();
+                    DefaultedList<ItemStack> inv = DefaultedList.ofSize(3, ItemStack.EMPTY);
+                    for (int i = 0; i < 2; i++) {
+                        inv.set(i, attachedData.readItemStack());
+                    }
+                    packetContext.getTaskQueue().execute(() -> {
+                        if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof FurnaceBlockEntity blockEntity) {
+                            blockEntity.setStack(0, inv.get(0));
+                            blockEntity.setStack(1, inv.get(1));
+                            blockEntity.setStack(2, inv.get(2));
+                        }
                    });
                });

+        // Register builtin resourcepacks
        FabricLoader.getInstance().getModContainer("visualoverhaul").ifPresent(modContainer -> {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul:nobottles"), "resourcepacks/visualoverhaul", modContainer, true);
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul","nobrewingbottles"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED);
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul","fancyfurnace"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED);
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul","coloredwaterbucket"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED);
        });
+
+        // Biome-colored Items
+        if (VOConfig.coloredItems) {
+            ClientTickEvents.END_CLIENT_TICK.register(client -> {
+                int waterColor;
+                int foliageColor;
+                int grassColor;
+                if (client.world != null) {
+                    assert client.player != null;
+                    waterColor = client.world.getColor(client.player.getBlockPos(), BiomeColors.WATER_COLOR);
+                    foliageColor = client.world.getColor(client.player.getBlockPos(), BiomeColors.FOLIAGE_COLOR);
+                    grassColor = client.world.getColor(client.player.getBlockPos(), BiomeColors.GRASS_COLOR);
+                } else {
+                    waterColor = BuiltinBiomes.PLAINS.getWaterColor();
+                    foliageColor = BuiltinBiomes.PLAINS.getFoliageColor();
+                    grassColor = BuiltinBiomes.PLAINS.getFoliageColor();
+                }
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.WATER_BUCKET);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.GRASS_BLOCK);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.GRASS);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.TALL_GRASS);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.FERN);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.LARGE_FERN);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.ACACIA_LEAVES);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.DARK_OAK_LEAVES);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.JUNGLE_LEAVES);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.OAK_LEAVES);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> {
+                    if (PotionUtil.getPotion(stack) == Potions.WATER && tintIndex == 0) {
+                        return waterColor;
+                    }
+                    return tintIndex > 0 ? -1 : PotionUtil.getColor(stack);
+                }, Items.POTION);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> {
+                    if (PotionUtil.getPotion(stack) == Potions.WATER && tintIndex == 0) {
+                        return waterColor;
+                    }
+                    return tintIndex > 0 ? -1 : PotionUtil.getColor(stack);
+                }, Items.SPLASH_POTION);
+                ColorProviderRegistry.ITEM.register((stack, tintIndex) -> {
+                    if (PotionUtil.getPotion(stack) == Potions.WATER && tintIndex == 0) {
+                        return waterColor;
+                    }
+                    return tintIndex > 0 ? -1 : PotionUtil.getColor(stack);
+                }, Items.LINGERING_POTION);
+            });
+        }
    }
 }
--- a/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java
@@ -9,15 +9,14 @@ import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;

 public class JukeboxTop extends Block {
+    private static final BooleanProperty HAS_RECORD = Properties.HAS_RECORD;

-        private static final BooleanProperty HAS_RECORD = Properties.HAS_RECORD;
-
-        public JukeboxTop() {
-            super(FabricBlockSettings.copy(Blocks.JUKEBOX));
-            this.setDefaultState(this.stateManager.getDefaultState().with(HAS_RECORD,false));
-        }
-        @Override
-        protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-            builder.add(HAS_RECORD);
-        }
+    public JukeboxTop() {
+        super(FabricBlockSettings.copy(Blocks.JUKEBOX));
+        this.setDefaultState(this.stateManager.getDefaultState().with(HAS_RECORD,false));
    }
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(HAS_RECORD);
+    }
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java
@@ -0,0 +1,39 @@
+package eu.midnightdust.visualoverhaul.block.model;
+
+import net.minecraft.client.model.*;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.entity.model.EntityModelLayer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+
+public class FurnaceWoodenPlanksModel extends Model {
+    private static ModelPart bb_main;
+    public static final EntityModelLayer WOODEN_PLANKS_MODEL_LAYER = new EntityModelLayer(new Identifier("visualoverhaul", "wooden_planks"), "main");
+
+    public FurnaceWoodenPlanksModel(ModelPart root) {
+        super(RenderLayer::getEntitySolid);
+        bb_main = root;
+        bb_main.setPivot(0.0F, 24.0F, 0.0F);
+    }
+    public ModelPart getPart() {
+        return bb_main;
+    }
+
+    public static TexturedModelData getTexturedModelData() {
+        return TexturedModelData.of(getModelData(), 16, 16);
+    }
+
+    public static ModelData getModelData(){
+        ModelData modelData = new ModelData();
+        ModelPartData modelPartData = modelData.getRoot();
+        modelPartData.addChild("cube_r1", ModelPartBuilder.create().uv(0, 0).cuboid(-10.0F, -3.0F, 0.0F, 10.0F, 1.0F, 1.0F), ModelTransform.of(6.0F, 1.0F, -2.0F,0.0F, -0.5672F, 0.0F));
+        modelPartData.addChild("cube_r2", ModelPartBuilder.create().uv(0, 0).cuboid(-10.0F, -2.5F, 0.0F, 10.0F, 2.0F, 2.0F), ModelTransform.of(5.0F, 0.0F, -5.0F,0.0F, -0.1309F, 0.0F));
+        modelPartData.addChild("cube_r3", ModelPartBuilder.create().uv(0, 0).cuboid(-10.0F, -2.0F, 0.0F, 10.0F, 2.0F, 2.0F), ModelTransform.of(5.0F, -1.0F, -7.0F,0.0F, 0.2618F, 0.0F));
+        return modelData;
+    }
+
+    public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) {
+        bb_main.render(matrices, vertices, light, overlay, red, green, blue, alpha);
+    }
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java
@@ -1,7 +1,6 @@
 package eu.midnightdust.visualoverhaul.block.renderer;

-import eu.midnightdust.visualoverhaul.VisualOverhaul;
-import eu.midnightdust.visualoverhaul.VisualOverhaulClient;
+import eu.midnightdust.visualoverhaul.config.VOConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.entity.BrewingStandBlockEntity;
@@ -10,52 +9,60 @@ import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
 import net.minecraft.client.render.model.json.ModelTransformation;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.Vec3f;
+
+import java.util.Objects;

@Environment(EnvType.CLIENT)
-public class BrewingStandBlockEntityRenderer extends BlockEntityRenderer<BrewingStandBlockEntity> {
+public class BrewingStandBlockEntityRenderer implements BlockEntityRenderer<BrewingStandBlockEntity> {

-    public BrewingStandBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
-        super(blockEntityRenderDispatcher);
+    public BrewingStandBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
    }


    @Override
    public void render(BrewingStandBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {

-        if (VisualOverhaulClient.VO_CONFIG.brewingstand) {
-            int lightAtBlock = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos());
+        if (VOConfig.brewingstand) {
+            int lightAtBlock = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos());
            ItemStack item1 = blockEntity.getStack(0);
            ItemStack item2 = blockEntity.getStack(1);
            ItemStack item3 = blockEntity.getStack(2);

-            matrices.push();
+            if (!item1.isEmpty()) {
+                matrices.push();

-            matrices.translate(0.86f, 0.23f, 0.5f);
-            matrices.scale(1.15f, 1.15f, 1.15f);
-            matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180));
-            MinecraftClient.getInstance().getItemRenderer().renderItem(item1, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers);
+                matrices.translate(0.86f, 0.23f, 0.5f);
+                matrices.scale(1.15f, 1.15f, 1.15f);
+                matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180));
+                MinecraftClient.getInstance().getItemRenderer().renderItem(item1, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers, 0);

-            matrices.pop();
-            matrices.push();
+                matrices.pop();
+            }
+            if (!item2.isEmpty()) {
+                matrices.push();

-            matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(315));
-            matrices.translate(0.32f, 0.23f, 0f);
-            matrices.scale(1.15f, 1.15f, 1.15f);
-            MinecraftClient.getInstance().getItemRenderer().renderItem(item2, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers);
+                matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(315));
+                matrices.translate(0.32f, 0.23f, 0f);
+                matrices.scale(1.15f, 1.15f, 1.15f);
+                MinecraftClient.getInstance().getItemRenderer().renderItem(item2, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers, 0);

-            matrices.pop();
-            matrices.push();
+                matrices.pop();
+            }
+            if (!item3.isEmpty()) {
+                matrices.push();

-            matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(45));
-            matrices.translate(-0.39f, 0.23f, 0.705f);
-            matrices.scale(1.15f, 1.15f, 1.15f);
-            MinecraftClient.getInstance().getItemRenderer().renderItem(item3, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers);
+                matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(45));
+                matrices.translate(-0.39f, 0.23f, 0.705f);
+                matrices.scale(1.15f, 1.15f, 1.15f);
+                MinecraftClient.getInstance().getItemRenderer().renderItem(item3, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers, 0);

-            matrices.pop();
+                matrices.pop();
+            }
        }
    }
 }
--- a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java
@@ -0,0 +1,89 @@
+package eu.midnightdust.visualoverhaul.block.renderer;
+
+import eu.midnightdust.visualoverhaul.block.model.FurnaceWoodenPlanksModel;
+import eu.midnightdust.visualoverhaul.config.VOConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.FurnaceBlockEntity;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+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.ModelTransformation;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tag.ItemTags;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Vec3f;
+
+import java.util.Objects;
+
+@Environment(EnvType.CLIENT)
+public class FurnaceBlockEntityRenderer implements BlockEntityRenderer<FurnaceBlockEntity> {
+    private final FurnaceWoodenPlanksModel planks;
+
+    public FurnaceBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
+        this.planks = new FurnaceWoodenPlanksModel(ctx.getLayerModelPart(FurnaceWoodenPlanksModel.WOODEN_PLANKS_MODEL_LAYER));
+    }
+
+    @Override
+    public void render(FurnaceBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+        if (VOConfig.furnace && blockEntity.getCachedState().getBlock().getDefaultState().isOf(Blocks.FURNACE)) {
+            BlockState blockState = blockEntity.getCachedState();
+            int lightAtBlock = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos().offset(blockState.get(AbstractFurnaceBlock.FACING)));
+            ItemStack item1 = blockEntity.getStack(0);
+            ItemStack item2 = blockEntity.getStack(1);
+            float angle = (blockState.get(AbstractFurnaceBlock.FACING)).asRotation();
+
+            if(!item1.isEmpty()) {
+                matrices.push();
+
+                matrices.translate(0.5f, 0.58f, 0.5f);
+                matrices.scale(1f, 1f, 1f);
+                matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(angle * 3 + 180));
+                matrices.translate(0.0f, 0.0f, -0.4f);
+                matrices.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(90));
+                MinecraftClient.getInstance().getItemRenderer().renderItem(item1, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers, 0);
+
+
+                matrices.pop();
+            }
+            if (!item2.isEmpty() && !ItemTags.LOGS_THAT_BURN.contains(item2.getItem()) && !ItemTags.PLANKS.contains(item2.getItem())) {
+                matrices.push();
+
+                matrices.translate(0.5f, 0.08f, 0.5f);
+                matrices.scale(1f, 1f, 1f);
+                matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(angle * 3 + 180));
+                matrices.translate(0.0f, 0.0f, -0.4f);
+                matrices.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(90));
+                MinecraftClient.getInstance().getItemRenderer().renderItem(item2, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers,0);
+
+                matrices.pop();
+            }
+            else if (!item2.isEmpty()) {
+                matrices.push();
+                BlockState state = Block.getBlockFromItem(item2.getItem()).getDefaultState();
+                Sprite texture = MinecraftClient.getInstance().getBlockRenderManager().getModel(state).getSprite();
+                VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(spriteToTexture(texture)));
+
+                matrices.translate(0.5f, -1.3f, 0.5f);
+                matrices.scale(1f, 1f, 1f);
+
+
+                matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(angle * 3 + 180));
+                planks.getPart().render(matrices, vertexConsumer, lightAtBlock, overlay);
+                matrices.pop();
+            }
+        }
+
+    }
+    public static Identifier spriteToTexture(Sprite sprite) {
+        String texture = sprite.getId().getPath();
+        return new Identifier(sprite.getId().getNamespace(), "textures/" + texture + ".png");
+    }
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java
@@ -1,47 +1,82 @@
 package eu.midnightdust.visualoverhaul.block.renderer;

 import eu.midnightdust.visualoverhaul.VisualOverhaulClient;
+import eu.midnightdust.visualoverhaul.config.VOConfig;
+import eu.midnightdust.visualoverhaul.util.SoundTest;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.block.SideShapeType;
 import net.minecraft.block.entity.JukeboxBlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
 import net.minecraft.client.render.model.json.ModelTransformation;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.item.ItemStack;
 import net.minecraft.state.property.Properties;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Vec3f;
+import net.minecraft.util.registry.Registry;
+import org.apache.logging.log4j.LogManager;

-import java.util.Random;
+import java.util.*;

@Environment(EnvType.CLIENT)
-public class JukeboxBlockEntityRenderer extends BlockEntityRenderer<JukeboxBlockEntity> {
+public class JukeboxBlockEntityRenderer implements BlockEntityRenderer<JukeboxBlockEntity> {
+    private ItemStack record;
+    private Identifier discItem;

-    public JukeboxBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
-        super(blockEntityRenderDispatcher);
+    public JukeboxBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
    }

    @Override
    public void render(JukeboxBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+        if (VOConfig.jukebox) {
+            int lightAbove = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos().up());

-        if (VisualOverhaulClient.VO_CONFIG.jukebox) {
-            int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up());
-            ItemStack record = blockEntity.getRecord();
-            record.setCount(2);
+            // Tries to get the disc using the serverside method
+            if (blockEntity.getRecord() != ItemStack.EMPTY) {
+                record = blockEntity.getRecord().copy();
+            }
+            // Else gets the record sound played at the position of the jukebox //
+            else if (SoundTest.getSound(blockEntity.getPos()) != null) {
+                // Converts the Sound Id to the item id of the approprieate disc (minecraft:music_disc.cat -> minecraft:music_disc_cat) //
+                discItem = new Identifier(String.valueOf(SoundTest.getSound(blockEntity.getPos())).replace(".", "_"));

-            matrices.push();
+                // Tries to get the disc item from the registry //
+                if (Registry.ITEM.getOrEmpty(discItem).isPresent()) {

-            matrices.translate(0.5f, 1.03f, 0.5f);
-            matrices.scale(0.75f, 0.75f, 0.75f);
-            matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion((blockEntity.getWorld().getTime() + tickDelta) * 4));
-            MinecraftClient.getInstance().getItemRenderer().renderItem(record, ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers);
+                    record = new ItemStack(Registry.ITEM.get(discItem));
+                }
+                else {
+                    LogManager.getLogger("VisualOverhaul").warn("Error getting music disc item for" + SoundTest.getSound(blockEntity.getPos()));
+                    discItem = null;
+                    record = ItemStack.EMPTY;
+                }
+            }
+            // If the sound is stopped or no sound is playing, the stack is set to an empty stack //
+            else {
+                discItem = null;
+                record = ItemStack.EMPTY;
+            }

-            matrices.pop();
-            if (VisualOverhaulClient.VO_CONFIG.jukebox_fake_block) {
+            if (!record.isEmpty()) {
+                record.setCount(2);
+                matrices.push();
+
+                matrices.translate(0.5f, 1.03f, 0.5f);
+                matrices.scale(0.75f, 0.75f, 0.75f);
+                matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(Util.getMeasuringTimeMs() / 9.0f));
+                MinecraftClient.getInstance().getItemRenderer().renderItem(record, ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers, 0);
+
+                matrices.pop();
+            }
+            if (VOConfig.jukebox_fake_block && !blockEntity.getWorld().getBlockState(blockEntity.getPos().up()).isSideSolid(blockEntity.getWorld(),blockEntity.getPos().up(), Direction.DOWN, SideShapeType.FULL)) {
                matrices.push();
                matrices.translate(0f, 1f, 0f);
                if (record == ItemStack.EMPTY) {
--- a/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/RadioJukeboxTop.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/RadioJukeboxTop.java
@@ -0,0 +1,25 @@
+package eu.midnightdust.visualoverhaul.compat.phonos.block;
+
+import io.github.foundationgames.phonos.block.PhonosBlocks;
+import io.github.foundationgames.phonos.block.RadioJukeboxBlock;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.state.property.IntProperty;
+
+//public class RadioJukeboxTop extends Block {
+//    public static final BooleanProperty PLAYING = RadioJukeboxBlock.PLAYING;
+//    public static final IntProperty CHANNEL = RadioJukeboxBlock.CHANNEL;
+//
+//    public RadioJukeboxTop() {
+//        super(FabricBlockSettings.copy(PhonosBlocks.RADIO_JUKEBOX));
+//        this.setDefaultState(this.stateManager.getDefaultState());
+//    }
+//
+//    @Override
+//    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+//        builder.add(PLAYING, CHANNEL);
+//    }
+//}
--- a/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/renderer/RadioJukeboxBlockEntityRenderer.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/renderer/RadioJukeboxBlockEntityRenderer.java
@@ -0,0 +1,74 @@
+package eu.midnightdust.visualoverhaul.compat.phonos.block.renderer;
+//
+//import eu.midnightdust.visualoverhaul.compat.phonos.block.RadioJukeboxTop;
+//import eu.midnightdust.visualoverhaul.compat.phonos.init.PhonosCompatInit;
+//import eu.midnightdust.visualoverhaul.config.VOConfig;
+//import io.github.foundationgames.phonos.block.RadioJukeboxBlock;
+//import io.github.foundationgames.phonos.block.entity.RadioJukeboxBlockEntity;
+//import net.fabricmc.api.EnvType;
+//import net.fabricmc.api.Environment;
+//import net.minecraft.block.BlockState;
+//import net.minecraft.block.Blocks;
+//import net.minecraft.client.MinecraftClient;
+//import net.minecraft.client.render.RenderLayer;
+//import net.minecraft.client.render.VertexConsumerProvider;
+//import net.minecraft.client.render.WorldRenderer;
+//import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
+//import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+//import net.minecraft.client.render.model.json.ModelTransformation;
+//import net.minecraft.client.util.math.MatrixStack;
+//import net.minecraft.item.ItemStack;
+//
+//import java.util.Random;
+//
+//@Environment(EnvType.CLIENT)
+//public class RadioJukeboxBlockEntityRenderer implements BlockEntityRenderer<RadioJukeboxBlockEntity> {
+//    private ItemStack record;
+//    private float rotation = 0;
+//    private BlockState blockState;
+//
+//    public RadioJukeboxBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
+//        super();
+//    }
+//
+//    @Override
+//    public void render(RadioJukeboxBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+//        if (VOConfig.jukebox) {
+//            int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up());
+//
+//            // Tries to get the disc using the serverside method
+//            if (blockEntity.getStack(blockEntity.getPlayingSong()) != ItemStack.EMPTY) {
+//                record = blockEntity.getStack(blockEntity.getPlayingSong()).copy();
+//                record.setCount(2);
+//            }
+//            // If the sound is stopped or no sound is playing, the stack is set to an empty stack //
+//            else {
+//                record = ItemStack.EMPTY;
+//            }
+//
+//            matrices.push();
+//
+//            matrices.translate(0.5f, 1.03f, 0.5f);
+//            matrices.scale(0.75f, 0.75f, 0.75f);
+//
+//            if (blockEntity.isPlaying()) {
+//                rotation = (blockEntity.getWorld().getTime() + tickDelta) * 4;
+//            }
+//            matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation));
+//            MinecraftClient.getInstance().getItemRenderer().renderItem(record, ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers);
+//
+//            matrices.pop();
+//            if (VOConfig.jukebox_fake_block && blockEntity.getWorld().getBlockState(blockEntity.getPos().up()).getBlock() == Blocks.AIR) {
+//                blockState = blockEntity.getWorld().getBlockState(blockEntity.getPos());
+//                matrices.push();
+//                matrices.translate(0f, 1f, 0f);
+//                if (record == ItemStack.EMPTY) {
+//                    MinecraftClient.getInstance().getBlockRenderManager().renderBlock(PhonosCompatInit.RadioJukeboxTop.getDefaultState().with(RadioJukeboxTop.PLAYING, false).with(RadioJukeboxTop.CHANNEL, blockState.get(RadioJukeboxBlock.CHANNEL)), blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()), false, new Random());
+//                } else {
+//                    MinecraftClient.getInstance().getBlockRenderManager().renderBlock(PhonosCompatInit.RadioJukeboxTop.getDefaultState().with(RadioJukeboxTop.PLAYING, true).with(RadioJukeboxTop.CHANNEL, blockState.get(RadioJukeboxBlock.CHANNEL)), blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()), false, new Random());
+//                }
+//                matrices.pop();
+//            }
+//        }
+//    }
+//}
--- a/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java
@@ -0,0 +1,20 @@
+package eu.midnightdust.visualoverhaul.compat.phonos.init;
+
+//import eu.midnightdust.visualoverhaul.compat.phonos.block.RadioJukeboxTop;
+import io.github.foundationgames.phonos.block.PhonosBlocks;
+import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl;
+import net.minecraft.block.Block;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class PhonosCompatInit {
+    //public static Block RadioJukeboxTop = new RadioJukeboxTop();
+
+    public static void init() {
+        //Registry.register(Registry.BLOCK, new Identifier("visualoverhaul","radio_jukebox_top"), RadioJukeboxTop);
+
+        //BlockRenderLayerMapImpl.INSTANCE.putBlock(PhonosBlocks.RADIO_JUKEBOX, RenderLayer.getCutout());
+        //BlockRenderLayerMapImpl.INSTANCE.putBlock(RadioJukeboxTop, RenderLayer.getCutout());
+    }
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/config/MidnightConfig.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/config/MidnightConfig.java
@@ -0,0 +1,288 @@
+package eu.midnightdust.visualoverhaul.config;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ScreenTexts;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.*;
+import net.minecraft.util.Formatting;
+
+import java.lang.annotation.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+// MidnightConfig v0.1.0 //
+
+/* Based on https://github.com/Minenash/TinyConfig
+   Credits to Minenash - CC0-1.0
+   You can copy this class to get a standalone version of MidnightConfig */
+
+@SuppressWarnings("rawtypes")
+public class MidnightConfig {
+
+    private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
+    private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
+
+    private static final List<EntryInfo> entries = new ArrayList<>();
+
+    protected static class EntryInfo {
+        Field field;
+        Object widget;
+        int width;
+        Method dynamicTooltip;
+        Map.Entry<TextFieldWidget,Text> error;
+        Object defaultValue;
+        Object value;
+        String tempValue;
+        boolean inLimits = true;
+    }
+
+    private static Class configClass;
+    private static String translationPrefix;
+    private static Path path;
+
+    private static final Gson gson = new GsonBuilder()
+            .excludeFieldsWithModifiers(Modifier.TRANSIENT)
+            .excludeFieldsWithModifiers(Modifier.PRIVATE)
+            .setPrettyPrinting()
+            .create();
+
+    public static void init(String modid, Class<?> config) {
+        translationPrefix = modid + ".midnightconfig.";
+        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
+        configClass = config;
+
+        for (Field field : config.getFields()) {
+            Class<?> type = field.getType();
+            EntryInfo info = new EntryInfo();
+
+            Entry e;
+            try { e = field.getAnnotation(Entry.class); }
+            catch (Exception ignored) { continue; }
+
+            info.width = e.width();
+            info.field = field;
+
+            if (type == int.class)         textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
+            else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false);
+            else if (type == String.class) textField(info, String::length, null, Math.min(e.min(),0), Math.max(e.max(),1),true);
+            else if (type == boolean.class) {
+                Function<Object,Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
+                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
+                    info.value = !(Boolean) info.value;
+                    button.setMessage(func.apply(info.value));
+                }, func);
+            }
+            else if (type.isEnum()) {
+                List<?> values = Arrays.asList(field.getType().getEnumConstants());
+                Function<Object,Text> func = value -> new TranslatableText(translationPrefix + "enum." + type.getSimpleName() + "." + info.value.toString());
+                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object,Text>>( button -> {
+                    int index = values.indexOf(info.value) + 1;
+                    info.value = values.get(index >= values.size()? 0 : index);
+                    button.setMessage(func.apply(info.value));
+                }, func);
+            }
+            else
+                continue;
+
+            entries.add(info);
+
+            try { info.defaultValue = field.get(null); }
+            catch (IllegalAccessException ignored) {}
+
+            try {
+                info.dynamicTooltip = config.getMethod(e.dynamicTooltip());
+                info.dynamicTooltip.setAccessible(true);
+            } catch (Exception ignored) {}
+
+        }
+
+        try { gson.fromJson(Files.newBufferedReader(path), config); }
+        catch (Exception e) { write(); }
+
+        for (EntryInfo info : entries) {
+            try {
+                info.value = info.field.get(null);
+                info.tempValue = info.value.toString();
+            }
+            catch (IllegalAccessException ignored) {}
+        }
+
+    }
+
+    private static void textField(EntryInfo info, Function<String,Number> f, Pattern pattern, double min, double max, boolean cast) {
+        boolean isNumber = pattern != null;
+        info.widget = (BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) (t, b) -> s -> {
+            s = s.trim();
+            if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches()))
+                return false;
+
+            Number value = 0;
+            boolean inLimits = false;
+            System.out.println(((isNumber ^ s.isEmpty())));
+            System.out.println(!s.equals("-") && !s.equals("."));
+            info.error = null;
+            if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
+                value = f.apply(s);
+                inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
+                info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ?
+                        "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
+                        "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
+            }
+
+            info.tempValue = s;
+            t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777);
+            info.inLimits = inLimits;
+            b.active = entries.stream().allMatch(e -> e.inLimits);
+
+            if (inLimits)
+                info.value = isNumber? value : s;
+
+            return true;
+        };
+    }
+
+    public static void write() {
+        try {
+            if (!Files.exists(path)) Files.createFile(path);
+            Files.write(path, gson.toJson(configClass.newInstance()).getBytes());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public Screen getScreen(Screen parent) {
+        return new TinyConfigScreen(parent);
+    }
+
+    private static class TinyConfigScreen extends Screen {
+        protected TinyConfigScreen(Screen parent) {
+            super(new TranslatableText(MidnightConfig.translationPrefix + "title"));
+            this.parent = parent;
+        }
+        private final Screen parent;
+
+        // Real Time config update //
+        @Override
+        public void tick() {
+            for (EntryInfo info : entries)
+                try { info.field.set(null, info.value); }
+                catch (IllegalAccessException ignore) {}
+        }
+
+        @Override
+        protected void init() {
+            super.init();
+            this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
+                try { gson.fromJson(Files.newBufferedReader(path), configClass); }
+                catch (Exception e) { write(); }
+
+                for (EntryInfo info : entries) {
+                    try {
+                        info.value = info.field.get(null);
+                        info.tempValue = info.value.toString();
+                    }
+                    catch (IllegalAccessException ignored) {}
+                }
+                    Objects.requireNonNull(client).openScreen(parent);
+            }));
+
+            ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
+                for (EntryInfo info : entries)
+                    try { info.field.set(null, info.value); }
+                    catch (IllegalAccessException ignore) {}
+                write();
+                Objects.requireNonNull(client).openScreen(parent);
+            }));
+
+            int y = 45;
+            for (EntryInfo info : entries) {
+                addButton(new ButtonWidget(width - 155, y, 40,20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
+                    info.value = info.defaultValue;
+                    info.tempValue = info.value.toString();
+                    Objects.requireNonNull(client).openScreen(this);
+                })));
+
+                if (info.widget instanceof Map.Entry) {
+                    Map.Entry<ButtonWidget.PressAction,Function<Object,Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
+                    addButton(new ButtonWidget(width-110,y,info.width,20, widget.getValue().apply(info.value), widget.getKey()));
+                }
+                else {
+                    TextFieldWidget widget = addButton(new TextFieldWidget(textRenderer, width-110, y, info.width, 20, null));
+                    widget.setText(info.tempValue);
+
+                    Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget,done);
+                    widget.setTextPredicate(processor);
+
+                    children.add(widget);
+                }
+                y += 25;
+            }
+
+        }
+        int aniX = this.width / 2;
+        @Override
+        public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+            this.renderBackground(matrices);
+
+            if (aniX < this.width / 2) {
+                aniX = aniX +40;
+            }
+
+            int stringWidth = (int) (title.getString().length() * 2.75f);
+            this.fillGradient(matrices, this.width / 2 - stringWidth, 10, this.width /2 + stringWidth, 29, -1072689136, -804253680);
+            this.fillGradient(matrices, this.width / 2 - aniX, 35, width/2 + aniX, this.height - 40, -1072689136, -804253680);
+
+            super.render(matrices, mouseX, mouseY, delta);
+            drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
+
+            int y = 40;
+            for (EntryInfo info : entries) {
+                drawTextWithShadow(matrices, textRenderer, new TranslatableText(translationPrefix + info.field.getName()), 12, y + 10, 0xFFFFFF);
+
+                if (info.error != null && info.error.getKey().isMouseOver(mouseX,mouseY))
+                    renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
+                else if (mouseY >= y && mouseY < (y + 25)) {
+                    if (info.dynamicTooltip != null) {
+                        try {
+                            renderTooltip(matrices, (List<Text>) info.dynamicTooltip.invoke(null, entries), mouseX, mouseY);
+                            y += 25;
+                            continue;
+                        } catch (Exception e) { e.printStackTrace(); }
+                    }
+                    String key = translationPrefix + info.field.getName() + ".tooltip";
+                    if (I18n.hasTranslation(key)) {
+                        List<Text> list = new ArrayList<>();
+                        for (String str : I18n.translate(key).split("\n"))
+                            list.add(new LiteralText(str));
+                        renderTooltip(matrices, list, mouseX, mouseY);
+                    }
+                }
+                y += 25;
+            }
+        }
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.FIELD)
+    public @interface Entry {
+        String dynamicTooltip() default "";
+        int width() default 100;
+        double min() default Double.MIN_NORMAL;
+        double max() default Double.MAX_VALUE;
+    }
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java
@@ -1,8 +1,8 @@
 package eu.midnightdust.visualoverhaul.config;

-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import eu.midnightdust.lib.config.MidnightConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

@@ -11,6 +11,6 @@ public class ModMenuIntegration implements ModMenuApi {

    @Override
    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> AutoConfig.getConfigScreen(VOConfig.class, parent).get();
+        return parent -> MidnightConfig.getScreen(parent,"visualoverhaul");
    }
 }
--- a/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java
@@ -1,16 +1,11 @@
 package eu.midnightdust.visualoverhaul.config;

-import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
-import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
+import eu.midnightdust.lib.config.MidnightConfig;

-import java.util.ArrayList;
-import java.util.List;
-
-@Config(name = "visualoverhaul")
-public class VOConfig implements ConfigData {
-
-    public boolean brewingstand = true;
-    public boolean jukebox = true;
-    public boolean jukebox_fake_block = true;
+public class VOConfig extends MidnightConfig {
+    @Entry public static boolean brewingstand = true;
+    @Entry public static boolean jukebox = true;
+    @Entry public static boolean jukebox_fake_block = true;
+    @Entry public static boolean furnace = true;
+    @Entry public static boolean coloredItems = true;
 }
--- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinAbstractFurnaceBlockEntity.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinAbstractFurnaceBlockEntity.java
@@ -0,0 +1,56 @@
+package eu.midnightdust.visualoverhaul.mixin;
+
+import eu.midnightdust.visualoverhaul.VisualOverhaul;
+import io.netty.buffer.Unpooled;
+import net.fabricmc.fabric.api.server.PlayerStream;
+import net.fabricmc.fabric.impl.networking.ServerSidePacketRegistryImpl;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.entity.*;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.stream.Stream;
+
+@Mixin(AbstractFurnaceBlockEntity.class)
+public abstract class MixinAbstractFurnaceBlockEntity extends LockableContainerBlockEntity {
+
+    private static boolean invUpdate = true;
+    private static int playerUpdate = -1;
+
+
+    protected MixinAbstractFurnaceBlockEntity(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
+        super(blockEntityType, blockPos, blockState);
+    }
+
+    @Inject(at = @At("TAIL"), method = "tick")
+    private static void tick(World world, BlockPos pos, BlockState state, AbstractFurnaceBlockEntity blockEntity, CallbackInfo ci) {
+        if (world.getBlockState(pos).getBlock().equals(Blocks.FURNACE)) {
+            if (!world.isClient && (invUpdate || world.getPlayers().size() == playerUpdate)) {
+                Stream<PlayerEntity> watchingPlayers = PlayerStream.watching(world, pos);
+                PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer());
+                passedData.writeBlockPos(pos);
+                passedData.writeItemStack(blockEntity.getStack(0));
+                passedData.writeItemStack(blockEntity.getStack(1));
+                passedData.writeItemStack(blockEntity.getStack(2));
+
+                watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_FURNACE_ITEMS, passedData));
+                invUpdate = false;
+            }
+            playerUpdate = world.getPlayers().size();
+        }
+    }
+
+    @Inject(at = @At("RETURN"), method = "getStack", cancellable = true)
+    public void getStack(int slot, CallbackInfoReturnable<ItemStack> cir) {
+        invUpdate = true;
+    }
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java
@@ -4,15 +4,16 @@ import eu.midnightdust.visualoverhaul.VisualOverhaul;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.api.server.PlayerStream;
 import net.fabricmc.fabric.impl.networking.ServerSidePacketRegistryImpl;
+import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.BrewingStandBlockEntity;
 import net.minecraft.block.entity.LockableContainerBlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.util.collection.DefaultedList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -23,42 +24,33 @@ import java.util.stream.Stream;
@Mixin(BrewingStandBlockEntity.class)
 public abstract class MixinBrewingStandBlockEntity extends LockableContainerBlockEntity {

+    private static boolean invUpdate = true;
+    private static int playerUpdate = -1;

-    @Shadow private DefaultedList<ItemStack> inventory;
-    public ItemStack item1;
-    public ItemStack item2;
-    public ItemStack item3;
-    Boolean sendData = true;
-
-    private MixinBrewingStandBlockEntity(BlockEntityType<?> blockEntityType) {
-        super(blockEntityType);
-
+    protected MixinBrewingStandBlockEntity(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
+        super(blockEntityType, blockPos, blockState);
    }

    @Inject(at = @At("TAIL"), method = "tick")
-    public void tick(CallbackInfo ci) {
-        item1 = inventory.get(0);
-        item2 = inventory.get(1);
-        item3 = inventory.get(2);
-
-        if (!this.world.isClient) {
-            Stream<PlayerEntity> watchingPlayers = PlayerStream.watching(world, getPos());
+    private static void tick(World world, BlockPos pos, BlockState state, BrewingStandBlockEntity blockEntity, CallbackInfo ci) {
+        if (!world.isClient && (invUpdate || world.getPlayers().size() == playerUpdate)) {
+            Stream<PlayerEntity> watchingPlayers = PlayerStream.watching(world, pos);
            PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer());
            passedData.writeBlockPos(pos);
-            passedData.writeItemStack(inventory.get(0));
-            passedData.writeItemStack(inventory.get(1));
-            passedData.writeItemStack(inventory.get(2));
-            passedData.writeItemStack(inventory.get(3));
-            passedData.writeItemStack(inventory.get(4));
+            passedData.writeItemStack(blockEntity.getStack(0));
+            passedData.writeItemStack(blockEntity.getStack(1));
+            passedData.writeItemStack(blockEntity.getStack(2));
+            passedData.writeItemStack(blockEntity.getStack(3));
+            passedData.writeItemStack(blockEntity.getStack(4));

-            passedData.writeString(String.valueOf(inventory));
            watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_POTION_BOTTLES, passedData));
-            sendData = false;
+            invUpdate = false;
        }
+        playerUpdate = world.getPlayers().size();
    }

    @Inject(at = @At("RETURN"), method = "getStack", cancellable = true)
-    public void getStack(int slot, CallbackInfoReturnable cir) {
-        this.sendData = true;
+    public void getStack(int slot, CallbackInfoReturnable<ItemStack> cir) {
+        invUpdate = true;
    }
 }
--- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java
@@ -0,0 +1,56 @@
+package eu.midnightdust.visualoverhaul.mixin;
+
+import eu.midnightdust.visualoverhaul.VisualOverhaul;
+import eu.midnightdust.visualoverhaul.util.JukeboxPacketUpdate;
+import io.netty.buffer.Unpooled;
+import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
+import net.fabricmc.fabric.impl.networking.ServerSidePacketRegistryImpl;
+import net.minecraft.block.BlockRenderType;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.BlockWithEntity;
+import net.minecraft.block.JukeboxBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.BlockEntityTicker;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.block.entity.JukeboxBlockEntity;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+import java.util.stream.Stream;
+
+@Mixin(JukeboxBlock.class)
+public abstract class MixinJukeboxBlock extends BlockWithEntity {
+
+    protected MixinJukeboxBlock(Settings settings) {
+        super(settings);
+    }
+
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+
+    @Nullable
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return world.isClient() ? null : checkType(type, BlockEntityType.JUKEBOX, MixinJukeboxBlock::tick);
+    }
+    @Unique
+    private static void tick(World world, BlockPos pos, BlockState state, JukeboxBlockEntity blockEntity) {
+        if (!world.isClient && (JukeboxPacketUpdate.invUpdate || world.getPlayers().size() == JukeboxPacketUpdate.playerUpdate)) {
+            Stream<ServerPlayerEntity> watchingPlayers = PlayerLookup.tracking(blockEntity).stream();
+            PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer());
+            passedData.writeBlockPos(pos);
+            passedData.writeItemStack(blockEntity.getRecord());
+
+            watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_RECORD, passedData));
+            JukeboxPacketUpdate.invUpdate = false;
+        }
+        JukeboxPacketUpdate.playerUpdate = world.getPlayers().size();
+    }
+}
+
--- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java
@@ -1,16 +1,18 @@
 package eu.midnightdust.visualoverhaul.mixin;

 import eu.midnightdust.visualoverhaul.VisualOverhaul;
+import eu.midnightdust.visualoverhaul.util.JukeboxPacketUpdate;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.api.server.PlayerStream;
 import net.fabricmc.fabric.impl.networking.ServerSidePacketRegistryImpl;
+import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.*;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.util.Tickable;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -19,32 +21,28 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.stream.Stream;

@Mixin(JukeboxBlockEntity.class)
-public abstract class MixinJukeboxBlockEntity extends BlockEntity implements Tickable {
-
-
-    @Shadow private ItemStack record;
-    Boolean sendData = true;
-
-    private MixinJukeboxBlockEntity(BlockEntityType<?> blockEntityType) {
-        super(blockEntityType);
+public abstract class MixinJukeboxBlockEntity extends BlockEntity {

+    public MixinJukeboxBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
+        super(type, pos, state);
    }

    @Unique
-    public void tick() {
-        if (!this.world.isClient) {
-            Stream<PlayerEntity> watchingPlayers = PlayerStream.watching(world, getPos());
+    private static void tick(World world, BlockPos pos, BlockState state, JukeboxBlockEntity blockEntity) {
+        if (!world.isClient && (JukeboxPacketUpdate.invUpdate || world.getPlayers().size() == JukeboxPacketUpdate.playerUpdate)) {
+            Stream<PlayerEntity> watchingPlayers = PlayerStream.watching(world, pos);
            PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer());
            passedData.writeBlockPos(pos);
-            passedData.writeItemStack(record);
+            passedData.writeItemStack(blockEntity.getRecord());

            watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_RECORD, passedData));
-            sendData = false;
+            JukeboxPacketUpdate.invUpdate = false;
        }
+        JukeboxPacketUpdate.playerUpdate = world.getPlayers().size();
    }

    @Inject(at = @At("RETURN"), method = "getRecord", cancellable = true)
-    public void getRecord(CallbackInfoReturnable cir) {
-        this.sendData = true;
+    public void getRecord(CallbackInfoReturnable<ItemStack> cir) {
+        JukeboxPacketUpdate.invUpdate = true;
    }
 }
--- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java
@@ -0,0 +1,40 @@
+package eu.midnightdust.visualoverhaul.mixin;
+
+import eu.midnightdust.visualoverhaul.util.SoundTest;
+import net.minecraft.client.sound.SoundInstance;
+import net.minecraft.client.sound.SoundSystem;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.util.math.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(SoundSystem.class)
+public abstract class MixinSoundSystem {
+
+    @Shadow private boolean started;
+
+    private BlockPos jukeboxPos;
+
+    @Inject(at = @At("TAIL"),method = "play(Lnet/minecraft/client/sound/SoundInstance;)V")
+    public void vo$onPlayRecordSound(SoundInstance soundInstance, CallbackInfo ci) {
+        if (soundInstance.getCategory().equals(SoundCategory.RECORDS) && this.started) {
+            jukeboxPos = new BlockPos(soundInstance.getX(),soundInstance.getY(),soundInstance.getZ());
+            SoundTest.soundPos.put(jukeboxPos, soundInstance.getId());
+        }
+    }
+
+    @Inject(at = @At("HEAD"),method = "stop(Lnet/minecraft/client/sound/SoundInstance;)V")
+    public void vo$onStopRecordSound(SoundInstance soundInstance, CallbackInfo ci) {
+        if (soundInstance != null) {
+            if (soundInstance.getCategory().equals(SoundCategory.RECORDS)) {
+                jukeboxPos = new BlockPos(soundInstance.getX(), soundInstance.getY(), soundInstance.getZ());
+                if (SoundTest.soundPos.containsKey(jukeboxPos)) {
+                    SoundTest.soundPos.remove(jukeboxPos, soundInstance.getId());
+                }
+            }
+        }
+    }
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/util/JukeboxPacketUpdate.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/util/JukeboxPacketUpdate.java
@@ -0,0 +1,6 @@
+package eu.midnightdust.visualoverhaul.util;
+
+public class JukeboxPacketUpdate {
+    public static boolean invUpdate = true;
+    public static int playerUpdate = -1;
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/util/SoundTest.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/util/SoundTest.java
@@ -0,0 +1,23 @@
+package eu.midnightdust.visualoverhaul.util;
+
+import com.google.common.collect.Maps;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.Map;
+
+public class SoundTest {
+
+    public static Map<BlockPos, Identifier> soundPos = Maps.newHashMap();
+
+    /**
+     * Returns the Sound provided in MixinSoundSystem
+     * {@link eu.midnightdust.visualoverhaul.mixin.MixinSoundSystem}
+     */
+    public static Identifier getSound(BlockPos pos) {
+        if (soundPos.containsKey(pos)) {
+            return soundPos.get(pos);
+        }
+        return null;
+    }
+}
--- a/src/main/java/eu/midnightdust/visualoverhaul/util/sound/SoundTest.java
+++ b/src/main/java/eu/midnightdust/visualoverhaul/util/sound/SoundTest.java
@@ -0,0 +1,23 @@
+package eu.midnightdust.visualoverhaul.util.sound;
+
+import com.google.common.collect.Maps;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.Map;
+
+public class SoundTest {
+
+    public static Map<BlockPos, Identifier> soundPos = Maps.newHashMap();
+
+    /**
+     * Returns the Sound provided in MixinSoundSystem
+     * {@link eu.midnightdust.visualoverhaul.mixin.MixinSoundSystem}
+     */
+    public static Identifier getSound(BlockPos pos) {
+        if (soundPos.containsKey(pos)) {
+            return soundPos.get(pos);
+        }
+        return null;
+    }
+}
--- a/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk.json
+++ b/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "biomemakeover:item/music_disk_button_mushrooms"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "round": 1
+            },
+            "model": "biomemakeover:item/button_mushrooms_music_disk_round"
+        }
+    ]
+}
--- a/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json
+++ b/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "biomemakeover:item/music_disk_button_mushrooms"
+	}
+}
--- a/src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk.json
+++ b/src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "biomemakeover:item/music_disc_ghost_town"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "round": 1
+            },
+            "model": "biomemakeover:item/ghost_town_music_disk_round"
+        }
+    ]
+}
--- a/src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk_round.json
+++ b/src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "biomemakeover:item/music_disc_ghost_town"
+	}
+}
--- a/src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk.json
+++ b/src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "biomemakeover:item/music_disc_swamp_jives"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "round": 1
+            },
+            "model": "biomemakeover:item/swamp_jives_music_disk_round"
+        }
+    ]
+}
--- a/src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json
+++ b/src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "biomemakeover:item/music_disc_swamp_jives"
+	}
+}
--- a/src/main/resources/assets/desolation/models/item/music_disc_ashes.json
+++ b/src/main/resources/assets/desolation/models/item/music_disc_ashes.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "desolation:item/music_disc_ashes"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "round": 1
+            },
+            "model": "desolation:item/music_disc_ashes_round"
+        }
+    ]
+}
--- a/src/main/resources/assets/desolation/models/item/music_disc_ashes_round.json
+++ b/src/main/resources/assets/desolation/models/item/music_disc_ashes_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "desolation:item/music_disc_ashes"
+	}
+}
--- a/src/main/resources/assets/dynamic-discs/models/item/dynamic_disc.json
+++ b/src/main/resources/assets/dynamic-discs/models/item/dynamic_disc.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "minecraft:item/music_disc_13"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "round": 1
+            },
+            "model": "minecraft:item/music_disc_13_round"
+        }
+    ]
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_0x10c.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_0x10c.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "extra_discs:item/music_disc_0x10c"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "round": 1
+            },
+            "model": "extra_discs:item/music_disc_0x10c_round"
+        }
+    ]
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_0x10c_round.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_0x10c_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "extra_discs:item/music_disc_0x10c"
+	}
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson.json
@@ -0,0 +1,15 @@
+{
+	"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"
+        }
+    ]
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "extra_discs:item/music_disc_cliffside_hinson"
+	}
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json
@@ -0,0 +1,15 @@
+{
+	"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"
+        }
+    ]
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "extra_discs:item/music_disc_i_jate_my_hob"
+	}
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_peanuts.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_peanuts.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "extra_discs:item/music_disc_peanuts"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "round": 1
+            },
+            "model": "extra_discs:item/music_disc_peanuts_round"
+        }
+    ]
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_peanuts_round.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_peanuts_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "extra_discs:item/music_disc_peanuts"
+	}
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_repetition.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_repetition.json
@@ -0,0 +1,15 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "extra_discs:item/music_disc_repetition"
+	},
+	
+	"overrides": [
+        {
+            "predicate": {
+                "round": 1
+            },
+            "model": "extra_discs:item/music_disc_repetition_round"
+        }
+    ]
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_repetition_round.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_repetition_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "extra_discs:item/music_disc_repetition"
+	}
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json
@@ -0,0 +1,15 @@
+{
+	"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"
+        }
+    ]
+}
--- a/src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json
+++ b/src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json
@@ -0,0 +1,6 @@
+{
+	"parent": "visualoverhaul:item/round_disc",
+	"textures": {
+		"0": "extra_discs:item/music_disc_sometimes_i_make_video_game_music"
+	}
+}
--- a/src/main/resources/assets/minecraft/models/item/music_disc_11.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_11.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_11_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_11_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_13.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_13.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_13_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_13_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_blocks.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_blocks.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_blocks_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_blocks_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_cat.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_cat.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_cat_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_cat_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_chirp.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_chirp.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_chirp_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_chirp_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_far.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_far.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_far_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_far_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_mall.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_mall.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_mall_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_mall_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_mellohi.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_mellohi.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_mellohi_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_mellohi_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_pigstep.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_pigstep.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_pigstep_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_pigstep_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_stal.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_stal.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_stal_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_stal_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_strad.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_strad.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_strad_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_strad_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_wait.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_wait.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_wait_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_wait_round.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_ward.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_ward.json
--- a/src/main/resources/assets/minecraft/models/item/music_disc_ward_round.json
+++ b/src/main/resources/assets/minecraft/models/item/music_disc_ward_round.json
--- a/src/main/resources/assets/phonos/models/item/custom_music_disc.json
+++ b/src/main/resources/assets/phonos/models/item/custom_music_disc.json
@@ -0,0 +1,16 @@
+{
+	"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"
+        }
+    ]
+}
--- a/src/main/resources/assets/phonos/models/item/custom_music_disc_round.json
+++ b/src/main/resources/assets/phonos/models/item/custom_music_disc_round.json
@@ -0,0 +1,7 @@
+{
+	"parent": "visualoverhaul:item/round_disc_colored_layers",
+	"textures": {
+		"0": "phonos:item/music_disc_inner",
+		"1": "phonos:item/music_disc_outer"
+	}
+}
--- a/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json
+++ b/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json
--- a/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json
+++ b/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json
@@ -0,0 +1,44 @@
+{
+  "variants": {
+    "playing=true,channel=0": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_0"},
+    "playing=false,channel=0": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_0"},
+	"playing=true,channel=1": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_1"},
+    "playing=false,channel=1": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_1"},
+	"playing=true,channel=2": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_2"},
+    "playing=false,channel=2": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_2"},
+	"playing=true,channel=3": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_3"},
+    "playing=false,channel=3": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_3"},
+	"playing=true,channel=4": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_4"},
+    "playing=false,channel=4": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_4"},
+	"playing=true,channel=5": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_5"},
+    "playing=false,channel=5": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_5"},
+	"playing=true,channel=6": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_6"},
+    "playing=false,channel=6": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_6"},
+	"playing=true,channel=7": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_7"},
+    "playing=false,channel=7": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_7"},
+	"playing=true,channel=8": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_8"},
+    "playing=false,channel=8": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_8"},
+	"playing=true,channel=9": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_9"},
+    "playing=false,channel=9": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_9"},
+	"playing=true,channel=10": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_10"},
+    "playing=false,channel=10": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_10"},
+	"playing=true,channel=11": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_11"},
+    "playing=false,channel=11": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_11"},
+	"playing=true,channel=12": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_12"},
+    "playing=false,channel=12": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_12"},
+	"playing=true,channel=13": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_13"},
+    "playing=false,channel=13": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_13"},
+	"playing=true,channel=14": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_14"},
+    "playing=false,channel=14": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_14"},
+	"playing=true,channel=15": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_15"},
+    "playing=false,channel=15": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_15"},
+	"playing=true,channel=16": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_16"},
+    "playing=false,channel=16": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_16"},
+	"playing=true,channel=17": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_17"},
+    "playing=false,channel=17": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_17"},
+	"playing=true,channel=18": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_18"},
+    "playing=false,channel=18": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_18"},
+	"playing=true,channel=19": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_19"},
+    "playing=false,channel=19": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_19"}
+  }
+}
--- a/src/main/resources/assets/visualoverhaul/icon.png
+++ b/src/main/resources/assets/visualoverhaul/icon.png
--- a/src/main/resources/assets/visualoverhaul/lang/en_us.json
+++ b/src/main/resources/assets/visualoverhaul/lang/en_us.json
@@ -0,0 +1,9 @@
+{
+	"visualoverhaul.midnightconfig.title":"Visual Overhaul Config",
+	"visualoverhaul.midnightconfig.brewingstand":"Enable Brewing Stand Enhancements",
+	"visualoverhaul.midnightconfig.jukebox":"Enable Jukebox Enhancements",
+	"visualoverhaul.midnightconfig.jukebox_fake_block":"Enable fake block on jukebox top",
+	"visualoverhaul.midnightconfig.furnace":"Enable Furnace Enhancements",
+	"visualoverhaul.midnightconfig.coloredItems":"Enable biome-based item colors",
+	"visualoverhaul.midnightconfig.coloredItems.tooltip":"Needs restart!"
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_playing.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_playing.json
@@ -10,7 +10,7 @@
 	"elements": [
 		{
 			"from": [0, 0, 0],
-			"to": [16, 0.001, 16],
+			"to": [16, 0.01, 16],
 			"faces": {
 				"up": {"uv": [0, 0, 16, 16], "texture": "#3"}
 			}
--- a/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_stopped.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_stopped.json
@@ -10,7 +10,7 @@
 	"elements": [
 		{
 			"from": [0, 0, 0],
-			"to": [16, 0.001, 16],
+			"to": [16, 0.01, 16],
 			"faces": {
 				"up": {"uv": [0, 0, 16, 16], "texture": "#3"}
 			}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_0.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_0.json
@@ -0,0 +1,85 @@
+{
+	"credit": "made by Motschen",
+	"textures": {
+		"0": "block/glass",
+		"1": "block/black_concrete",
+		"2": "block/anvil",
+		"3": "visualoverhaul:block/vo_jukebox_top",
+		"4": "phonos:block/speaker_top_0",
+		"particle": "block/glass"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 0.01, 16],
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "texture": "#3"}
+			}
+		},
+		{
+			"from": [0, 0, 0],
+			"to": [16, 5, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 5], "texture": "#0"},
+				"east": {"uv": [0, 0, 16, 5], "texture": "#0"},
+				"south": {"uv": [0, 0, 16, 5], "texture": "#0"},
+				"west": {"uv": [0, 0, 16, 5], "texture": "#0"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.875, 0, 7.875],
+			"to": [8.125, 1.25, 8.125],
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"east": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"south": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"west": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"}
+			}
+		},
+		{
+			"from": [5.75, 1, 11.29],
+			"to": [6, 1.5, 11.54],
+			"rotation": {"angle": 45, "axis": "y", "origin": [5, 8, 12]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 2], "texture": "#2"},
+				"east": {"uv": [0, 0, 0.25, 2], "texture": "#2"},
+				"south": {"uv": [0, 0, 0.25, 2], "texture": "#2"},
+				"west": {"uv": [0, 0, 0.25, 2], "texture": "#2"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#2"}
+			}
+		},
+		{
+			"from": [0.875, 0, 14.875],
+			"to": [1.375, 1.5, 15.375],
+			"rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 15]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"east": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"south": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"west": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"}
+			}
+		},
+		{
+			"from": [0.65, 1.5, 14.875],
+			"to": [7.15, 2, 15.375],
+			"rotation": {"angle": 45, "axis": "y", "origin": [1, 10, 15]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"east": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"south": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"west": {"uv": [0, 0, 0.25, 2], "texture": "#1"},
+				"up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"}
+			}
+		},
+		{
+			"from": [10, 0.1, 12],
+			"to": [15, 0.1, 15],
+			"faces": {
+				"up": {"uv": [4, 5, 12, 10], "rotation": 180, "texture": "#4"}
+			}
+		}
+	]
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_1.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_1.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_1"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_10.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_10.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_10"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_11.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_11.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_11"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_12.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_12.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_12"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_13.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_13.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_13"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_14.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_14.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_14"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_15.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_15.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_15"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_16.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_16.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_16"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_17.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_17.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_17"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_18.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_18.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_18"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_19.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_19.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_19"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_2.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_2.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_2"
+    }
+}
--- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_3.json
+++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_3.json
@@ -0,0 +1,6 @@
+{
+    "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0",
+    "textures": {
+        "4": "phonos:block/speaker_top_3"
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Motschen	1bcba33aaa	VisualOverhaul 3.3.0 - 1.17 and small Refactor Update to 1.17-pre1 and Java 16 Upgrade to MidnightLib, making the config more clean and accessible without modmenu (Please ignore the commits before)	2021-05-30 13:25:44 +02:00
Motschen	88e5c38337	Revert "VisualOverhaul 3.1.0 - 1.17 and small Refactor" This reverts commit `98dee343e1`.	2021-05-30 13:22:52 +02:00
Motschen	98dee343e1	VisualOverhaul 3.1.0 - 1.17 and small Refactor Update to 1.17-pre1 and Java 16 Upgrade to MidnightLib, making the config more clean and accessible without modmenu	2021-05-30 13:15:12 +02:00
Motschen	8f51167982	VisualOverhaul 3.2.0 - Compat & Stability - Overhaul Phonos's Radio Jukebox -Added compat with Biome Makeover, Desolation, Dynamic Discs, Extra Discs and Phonos discs - Fixed crash with Charm - Way smoother biome-colored items - Biome colored items for more vanilla items - Serverside method to get music discs is now prioritized, clientside method only applies if the ItemStack is empty - Move puddles into a seperate mod	2021-03-30 20:35:17 +02:00
Motschen	afac024e9e	Client side implementation of the jukebox overhaul Uses a mixin into the sound system to determine the sound played at the position of the jukebox, then tries to get the record item of the sound. If it fails it will fall back to the server side implementation.	2021-03-28 12:07:47 +02:00
Motschen	f802e803b9	Fix #9	2021-03-15 13:43:38 +01:00
Motschen	0d008e40d9	Fix puddles connecting weirdly The cause of the bug cannot be easily fixed and would cause issues with certain renderers, so I just made puddles unable to be placed when the corners or sides of the block above or below already have a fluid.	2021-03-15 13:32:28 +01:00
Motschen	e43e483567	VisualOverhaul 3.0.0 - Puddles & Colors Switched to MidnightConfig (No need to seperately download AutoConfig & ClothConfig anymore) Adds puddles which spawn during rain and can be used to fill a water bottle. (Game rule: "puddleSpawnRate") Also, snow layers can now pile up during snow storms. (Game rule: "snowStackChance") Items which are colored in their block form also show the color corresponding to the biome as an item. (Toggleable via config)	2021-03-14 21:22:06 +01:00
Motschen	920bb6958e	Bump version	2021-01-23 19:59:56 +01:00
Motschen	c2306d7fa6	Fix ClassCastExeption	2021-01-23 19:58:36 +01:00
Motschen	792e81f4ca	Fancy Furnace, better packet handling, config translations	2021-01-23 19:37:41 +01:00
Motschen	fe5c2a7e1b	Canvas compat (Closes #2 ), Fix Z-Fighting	2021-01-23 10:47:14 +01:00