diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..823aca8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# gradle + +.gradle/ +out/ +classes/ +build/ + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ea9ed68 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 MidnightDust + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3e048de --- /dev/null +++ b/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'fabric-loom' version '0.5-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +minecraft { +} + +repositories { + maven { url "https://jitpack.io" } +} + +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}" + + modCompile "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}") { + exclude group: "net.fabricmc.fabric-api" + } +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "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" +} + +// 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 +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..ba1fef3 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Done to increase the memory available to gradle. +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 + +# Mod Properties + mod_version = 1.0.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 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..4b7e1f3 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..8e25e6c --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +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 + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +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 + 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 + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((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" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +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% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java new file mode 100644 index 0000000..3079472 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java @@ -0,0 +1,8 @@ +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"); +} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java new file mode 100644 index 0000000..a366ab4 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java @@ -0,0 +1,82 @@ +package eu.midnightdust.visualoverhaul; + +import eu.midnightdust.visualoverhaul.block.JukeboxTop; +import eu.midnightdust.visualoverhaul.block.renderer.BrewingStandBlockEntityRenderer; +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.rendereregistry.v1.BlockEntityRendererRegistry; +import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; +import net.fabricmc.fabric.api.resource.ResourceManagerHelper; +import net.fabricmc.fabric.impl.networking.ClientSidePacketRegistryImpl; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.block.entity.BrewingStandBlockEntity; +import net.minecraft.block.entity.JukeboxBlockEntity; +import net.minecraft.client.MinecraftClient; +import net.minecraft.item.ItemStack; +import net.minecraft.item.MusicDiscItem; +import net.minecraft.util.Identifier; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.Registry; + +import static eu.midnightdust.visualoverhaul.VisualOverhaul.UPDATE_POTION_BOTTLES; +import static eu.midnightdust.visualoverhaul.VisualOverhaul.UPDATE_RECORD; + +public class VisualOverhaulClient implements ClientModInitializer { + public static VOConfig VO_CONFIG; + public static Block JukeBoxTop = new JukeboxTop(); + + + @Override + public void onInitializeClient() { + AutoConfig.register(VOConfig.class, JanksonConfigSerializer::new); + VO_CONFIG = AutoConfig.getConfigHolder(VOConfig.class).getConfig(); + + // Block only registered on client, because it's just used for the renderer // + Registry.register(Registry.BLOCK, new Identifier("visualoverhaul","jukebox_top"), JukeBoxTop); + + BlockEntityRendererRegistry.INSTANCE.register(BlockEntityType.BREWING_STAND, BrewingStandBlockEntityRenderer::new); + BlockEntityRendererRegistry.INSTANCE.register(BlockEntityType.JUKEBOX, JukeboxBlockEntityRenderer::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); + } + }); + + ClientSidePacketRegistryImpl.INSTANCE.register(UPDATE_POTION_BOTTLES, + (packetContext, attachedData) -> { + BlockPos pos = attachedData.readBlockPos(); + DefaultedList inv = DefaultedList.ofSize(5, ItemStack.EMPTY); + for (int i = 0; i < 4; i++) { + 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)); + }); + }); + ClientSidePacketRegistryImpl.INSTANCE.register(UPDATE_RECORD, + (packetContext, attachedData) -> { + BlockPos pos = attachedData.readBlockPos(); + ItemStack record = attachedData.readItemStack(); + packetContext.getTaskQueue().execute(() -> { + JukeboxBlockEntity blockEntity = (JukeboxBlockEntity)MinecraftClient.getInstance().world.getBlockEntity(pos); + blockEntity.setRecord(record); + }); + }); + + FabricLoader.getInstance().getModContainer("visualoverhaul").ifPresent(modContainer -> { + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul:nobottles"), "resourcepacks/visualoverhaul", modContainer, true); + }); + } +} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java b/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java new file mode 100644 index 0000000..b29ec2a --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java @@ -0,0 +1,23 @@ +package eu.midnightdust.visualoverhaul.block; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; + +public class JukeboxTop extends Block { + + private static final BooleanProperty HAS_RECORD = Properties.HAS_RECORD; + + public JukeboxTop() { + super(FabricBlockSettings.copy(Blocks.JUKEBOX)); + this.setDefaultState(this.stateManager.getDefaultState().with(HAS_RECORD,false)); + } + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(HAS_RECORD); + } + } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java new file mode 100644 index 0000000..a441894 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java @@ -0,0 +1,61 @@ +package eu.midnightdust.visualoverhaul.block.renderer; + +import eu.midnightdust.visualoverhaul.VisualOverhaul; +import eu.midnightdust.visualoverhaul.VisualOverhaulClient; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.entity.BrewingStandBlockEntity; +import net.minecraft.client.MinecraftClient; +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.client.util.math.Vector3f; +import net.minecraft.item.ItemStack; + +@Environment(EnvType.CLIENT) +public class BrewingStandBlockEntityRenderer extends BlockEntityRenderer { + + public BrewingStandBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + + @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()); + ItemStack item1 = blockEntity.getStack(0); + ItemStack item2 = blockEntity.getStack(1); + ItemStack item3 = blockEntity.getStack(2); + + 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.pop(); + 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.pop(); + 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.pop(); + } + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java new file mode 100644 index 0000000..7ee25e5 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java @@ -0,0 +1,56 @@ +package eu.midnightdust.visualoverhaul.block.renderer; + +import eu.midnightdust.visualoverhaul.VisualOverhaulClient; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +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.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 java.util.Random; + +@Environment(EnvType.CLIENT) +public class JukeboxBlockEntityRenderer extends BlockEntityRenderer { + + public JukeboxBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + @Override + public void render(JukeboxBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + + if (VisualOverhaulClient.VO_CONFIG.jukebox) { + int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); + ItemStack record = blockEntity.getRecord(); + record.setCount(2); + + matrices.push(); + + 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); + + matrices.pop(); + if (VisualOverhaulClient.VO_CONFIG.jukebox_fake_block) { + matrices.push(); + matrices.translate(0f, 1f, 0f); + if (record == ItemStack.EMPTY) { + MinecraftClient.getInstance().getBlockRenderManager().renderBlock(VisualOverhaulClient.JukeBoxTop.getDefaultState().with(Properties.HAS_RECORD, false), blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()), false, new Random()); + } else { + MinecraftClient.getInstance().getBlockRenderManager().renderBlock(VisualOverhaulClient.JukeBoxTop.getDefaultState().with(Properties.HAS_RECORD, true), blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()), false, new Random()); + } + matrices.pop(); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java b/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java new file mode 100644 index 0000000..37094f4 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java @@ -0,0 +1,16 @@ +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 net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class ModMenuIntegration implements ModMenuApi { + + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return parent -> AutoConfig.getConfigScreen(VOConfig.class, parent).get(); + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java b/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java new file mode 100644 index 0000000..d3fbc4e --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java @@ -0,0 +1,16 @@ +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 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; +} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java new file mode 100644 index 0000000..47da926 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java @@ -0,0 +1,64 @@ +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.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 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; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.stream.Stream; + +@Mixin(BrewingStandBlockEntity.class) +public abstract class MixinBrewingStandBlockEntity extends LockableContainerBlockEntity { + + + @Shadow private DefaultedList inventory; + public ItemStack item1; + public ItemStack item2; + public ItemStack item3; + Boolean sendData = true; + + private MixinBrewingStandBlockEntity(BlockEntityType blockEntityType) { + super(blockEntityType); + + } + + @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 watchingPlayers = PlayerStream.watching(world, getPos()); + 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.writeString(String.valueOf(inventory)); + watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_POTION_BOTTLES, passedData)); + sendData = false; + } + } + + @Inject(at = @At("RETURN"), method = "getStack", cancellable = true) + public void getStack(int slot, CallbackInfoReturnable cir) { + this.sendData = true; + } +} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java new file mode 100644 index 0000000..0ce7e4b --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java @@ -0,0 +1,50 @@ +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.entity.*; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Tickable; +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; +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); + + } + + @Unique + public void tick() { + if (!this.world.isClient) { + Stream watchingPlayers = PlayerStream.watching(world, getPos()); + PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer()); + passedData.writeBlockPos(pos); + passedData.writeItemStack(record); + + watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_RECORD, passedData)); + sendData = false; + } + } + + @Inject(at = @At("RETURN"), method = "getRecord", cancellable = true) + public void getRecord(CallbackInfoReturnable cir) { + this.sendData = true; + } +} diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_11.json b/src/main/resources/assets/minecraft/models/item/music_disc_11.json new file mode 100644 index 0000000..51ec151 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_11.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_11" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_11_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..ed3d48d --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_11_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_13.json b/src/main/resources/assets/minecraft/models/item/music_disc_13.json new file mode 100644 index 0000000..7994d24 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_13.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" + } + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 0000000..811ec2a --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_13_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_blocks.json b/src/main/resources/assets/minecraft/models/item/music_disc_blocks.json new file mode 100644 index 0000000..a6642fa --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_blocks.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_blocks" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_blocks_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..0ac52b2 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_blocks_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_blocks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_cat.json b/src/main/resources/assets/minecraft/models/item/music_disc_cat.json new file mode 100644 index 0000000..d695d96 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_cat.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_cat" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_cat_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..ee0b2c9 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_cat_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_cat" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_chirp.json b/src/main/resources/assets/minecraft/models/item/music_disc_chirp.json new file mode 100644 index 0000000..ce1df71 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_chirp.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_chirp" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_chirp_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..30c3008 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_chirp_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_chirp" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_far.json b/src/main/resources/assets/minecraft/models/item/music_disc_far.json new file mode 100644 index 0000000..e6fd32a --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_far.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_far" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_far_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..f69d3d0 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_far_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_far" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_mall.json b/src/main/resources/assets/minecraft/models/item/music_disc_mall.json new file mode 100644 index 0000000..cde7957 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_mall.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_mall" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_mall_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..8039033 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_mall_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_mall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_mellohi.json b/src/main/resources/assets/minecraft/models/item/music_disc_mellohi.json new file mode 100644 index 0000000..2507832 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_mellohi.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_mellohi" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_mellohi_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..1502751 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_mellohi_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_mellohi" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_pigstep.json b/src/main/resources/assets/minecraft/models/item/music_disc_pigstep.json new file mode 100644 index 0000000..ce63a0f --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_pigstep.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_pigstep" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_pigstep_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..d74b2a1 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_pigstep_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_pigstep" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_stal.json b/src/main/resources/assets/minecraft/models/item/music_disc_stal.json new file mode 100644 index 0000000..7b99e7b --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_stal.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_stal" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_stal_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..24494cb --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_stal_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_stal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_strad.json b/src/main/resources/assets/minecraft/models/item/music_disc_strad.json new file mode 100644 index 0000000..bb45711 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_strad.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_strad" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_strad_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..926640f --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_strad_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_strad" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_wait.json b/src/main/resources/assets/minecraft/models/item/music_disc_wait.json new file mode 100644 index 0000000..717a368 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_wait.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_wait" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_wait_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..37a7936 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_wait_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_wait" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_ward.json b/src/main/resources/assets/minecraft/models/item/music_disc_ward.json new file mode 100644 index 0000000..ef67221 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_ward.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_ward" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_ward_round" + } + ] +} \ No newline at end of file diff --git a/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 new file mode 100644 index 0000000..ad7d040 --- /dev/null +++ b/src/main/resources/assets/minecraft/models/item/music_disc_ward_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_ward" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json b/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json new file mode 100644 index 0000000..0ba4dad --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json @@ -0,0 +1,10 @@ +{ + "variants": { + "has_record=true": { + "model": "visualoverhaul:block/jukebox_top_playing" + }, + "has_record=false": { + "model": "visualoverhaul:block/jukebox_top_stopped" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/icon.png b/src/main/resources/assets/visualoverhaul/icon.png new file mode 100644 index 0000000..6ef8e43 Binary files /dev/null and b/src/main/resources/assets/visualoverhaul/icon.png differ diff --git a/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_playing.json b/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_playing.json new file mode 100644 index 0000000..cb9803f --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_playing.json @@ -0,0 +1,77 @@ +{ + "credit": "made by Motschen", + "textures": { + "0": "block/glass", + "1": "block/black_concrete", + "2": "block/anvil", + "3": "visualoverhaul:block/vo_jukebox_top", + "particle": "block/glass" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 0.001, 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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_stopped.json b/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_stopped.json new file mode 100644 index 0000000..0d51089 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/jukebox_top_stopped.json @@ -0,0 +1,77 @@ +{ + "credit": "made by Motschen", + "textures": { + "0": "block/glass", + "1": "block/black_concrete", + "2": "block/anvil", + "3": "visualoverhaul:block/vo_jukebox_top", + "particle": "block/glass" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 0.001, 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": [6.75, 1, 15], + "to": [7, 1.5, 15.25], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 16]}, + "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": 0, "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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/item/round_disc.json b/src/main/resources/assets/visualoverhaul/models/item/round_disc.json new file mode 100644 index 0000000..27d709c --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/item/round_disc.json @@ -0,0 +1,447 @@ +{ + "credit": "made by Motschen", + "textures": { + "0": "item/music_disc_mellohi", + "particle": "#0" + }, + "elements": [ + { + "from": [7.5, 0, 7.5], + "to": [8.5, 1, 8.5], + "faces": { + "up": {"uv": [7, 7, 8, 8], "texture": "#0"} + } + }, + { + "from": [9.5, 0, 9.5], + "to": [10.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]}, + "faces": { + "up": {"uv": [5, 6, 6, 7], "texture": "#0"} + } + }, + { + "from": [5.5, 0, 9.5], + "to": [6.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 10]}, + "faces": { + "up": {"uv": [9, 6, 10, 7], "texture": "#0"} + } + }, + { + "from": [5.5, 0, 5.5], + "to": [6.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 6]}, + "faces": { + "up": {"uv": [9, 8, 10, 9], "texture": "#0"} + } + }, + { + "from": [9.5, 0, 5.5], + "to": [10.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "up": {"uv": [5, 8, 6, 9], "texture": "#0"} + } + }, + { + "from": [6.5, 0, 5.5], + "to": [9.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "up": {"uv": [6, 8, 9, 9], "texture": "#0"} + } + }, + { + "from": [2.5, 0, 4.5], + "to": [13.5, 1, 5.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "texture": "#0"} + } + }, + { + "from": [4.5, 0.001, 2.5], + "to": [5.5, 1.001, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 8]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [10.5, 0.001, 2.5], + "to": [11.5, 1.001, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 8]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [2.5, 0, 10.5], + "to": [13.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 11]}, + "faces": { + "up": {"uv": [2, 5, 13, 6], "texture": "#0"} + } + }, + { + "from": [6.5, 0, 9.5], + "to": [9.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]}, + "faces": { + "up": {"uv": [6, 6, 9, 7], "texture": "#0"} + } + }, + { + "from": [5.5, 0, 6.5], + "to": [6.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, + "faces": { + "up": {"uv": [6, 8, 9, 9], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [9.5, 0, 6.5], + "to": [10.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]}, + "faces": { + "up": {"uv": [6, 6, 9, 7], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [8.5, 0, 6.5], + "to": [9.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "up": {"uv": [6, 7, 7, 8], "texture": "#0"} + } + }, + { + "from": [6.5, 0, 6.5], + "to": [7.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 8]}, + "faces": { + "up": {"uv": [8, 7, 9, 8], "texture": "#0"} + } + }, + { + "from": [7.5, 0, 8.5], + "to": [8.5, 1, 9.5], + "faces": { + "up": {"uv": [6, 7, 7, 8], "texture": "#0"} + } + }, + { + "from": [7.5, 0, 6.5], + "to": [8.5, 1, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "up": {"uv": [8, 7, 9, 8], "texture": "#0"} + } + }, + { + "from": [7.5, -0.001, 11.5], + "to": [12.5, 0.999, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 12]}, + "faces": { + "up": {"uv": [3, 5, 8, 6], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3.5, -0.001, 11.5], + "to": [7.5, 0.999, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 12]}, + "faces": { + "up": {"uv": [8, 5, 12, 6], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5.5, 0, 12.5], + "to": [10.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 13]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [6.5, 0, 13.5], + "to": [11.5, 1, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 14]}, + "faces": { + "east": {"uv": [10, 11, 11, 12], "texture": "#0"}, + "south": {"uv": [5, 12, 10, 13], "texture": "#0"}, + "up": {"uv": [5, 3, 10, 4], "texture": "#0"} + } + }, + { + "from": [4.5, 0, 13.5], + "to": [6.5, 1, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 14]}, + "faces": { + "south": {"uv": [3, 11, 5, 12], "texture": "#0"}, + "west": {"uv": [2, 11, 3, 12], "texture": "#0"}, + "up": {"uv": [8, 3, 10, 4], "texture": "#0"} + } + }, + { + "from": [3.5, 0, 12.5], + "to": [4.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]}, + "faces": { + "south": {"uv": [13, 10, 14, 11], "texture": "#0"}, + "west": {"uv": [13, 10, 14, 11], "texture": "#0"}, + "up": {"uv": [10, 4, 11, 5], "texture": "#0"} + } + }, + { + "from": [2.5, 0, 11.5], + "to": [3.5, 1, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 12]}, + "faces": { + "south": {"uv": [12, 11, 13, 12], "texture": "#0"}, + "west": {"uv": [10, 11, 11, 12], "texture": "#0"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#0"} + } + }, + { + "from": [12.5, 0, 11.5], + "to": [13.5, 1, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 12]}, + "faces": { + "east": {"uv": [13, 10, 14, 11], "texture": "#0"}, + "south": {"uv": [13, 10, 14, 11], "texture": "#0"}, + "up": {"uv": [2, 4, 3, 5], "texture": "#0"} + } + }, + { + "from": [11.5, 0, 12.5], + "to": [12.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 13]}, + "faces": { + "east": {"uv": [12, 11, 13, 12], "texture": "#0"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#0"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#0"} + } + }, + { + "from": [11.5, -0.001, 5.5], + "to": [12.5, 0.999, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 8]}, + "faces": { + "up": {"uv": [5, 4, 10, 5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [11.5, -0.001, 3.5], + "to": [12.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 6]}, + "faces": { + "up": {"uv": [2, 9, 3, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [12.5, 0, 5.5], + "to": [13.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 8]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "texture": "#0"} + } + }, + { + "from": [13.5, 0, 4.5], + "to": [14.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 7]}, + "faces": { + "north": {"uv": [10, 11, 11, 12], "texture": "#0"}, + "east": {"uv": [5, 12, 10, 13], "texture": "#0"}, + "up": {"uv": [5, 3, 10, 4], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [13.5, 0, 9.5], + "to": [14.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 12]}, + "faces": { + "east": {"uv": [3, 11, 5, 12], "texture": "#0"}, + "south": {"uv": [2, 11, 3, 12], "texture": "#0"}, + "up": {"uv": [8, 3, 10, 4], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [11.5, 0, 2.5], + "to": [12.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 5]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#0"}, + "east": {"uv": [10, 11, 11, 12], "texture": "#0"}, + "up": {"uv": [1, 5, 2, 6], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [12.5, 0, 3.5], + "to": [13.5, 1, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#0"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#0"}, + "up": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [5.5, -0.001, 3.5], + "to": [10.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 4.1]}, + "faces": { + "up": {"uv": [5, 10, 10, 11], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3.5, -0.001, 3.5], + "to": [4.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 4]}, + "faces": { + "up": {"uv": [12, 9, 13, 10], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [5.5, 0, 2.5], + "to": [10.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 3]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [6.5, 0, 1.5], + "to": [11.5, 1, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]}, + "faces": { + "north": {"uv": [5, 12, 10, 13], "texture": "#0"}, + "east": {"uv": [12, 11, 13, 12], "texture": "#0"}, + "up": {"uv": [5, 3, 10, 4], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [4.5, 0, 1.5], + "to": [6.5, 1, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 2]}, + "faces": { + "north": {"uv": [10, 11, 12, 12], "texture": "#0"}, + "west": {"uv": [9, 12, 10, 13], "texture": "#0"}, + "up": {"uv": [8, 3, 10, 4], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2.5, 0, 3.5], + "to": [3.5, 1, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 4]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#0"}, + "west": {"uv": [12, 11, 13, 12], "texture": "#0"}, + "up": {"uv": [1, 5, 2, 6], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3.5, 0, 2.5], + "to": [4.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 3]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#0"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#0"}, + "up": {"uv": [12, 10, 13, 11], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3.5, -0.001, 5.5], + "to": [4.5, 0.999, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 8.1]}, + "faces": { + "up": {"uv": [11, 5, 12, 10], "texture": "#0"} + } + }, + { + "from": [2.5, 0, 5.5], + "to": [3.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 8]}, + "faces": { + "up": {"uv": [12, 5, 13, 10], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [1.5, 0, 6.5], + "to": [2.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 9]}, + "faces": { + "south": {"uv": [13, 10, 14, 11], "texture": "#0"}, + "west": {"uv": [5, 12, 10, 13], "texture": "#0"}, + "up": {"uv": [5, 3, 10, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [1.5, 0, 4.5], + "to": [2.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 4]}, + "faces": { + "north": {"uv": [13, 10, 14, 11], "texture": "#0"}, + "west": {"uv": [10, 11, 12, 12], "texture": "#0"}, + "up": {"uv": [8, 3, 10, 4], "rotation": 90, "texture": "#0"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [38, 0, 0], + "translation": [0, 1.75, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [38, 0, 0], + "translation": [0, 1.75, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [87, -19, 41], + "translation": [0, 4.25, 0] + }, + "firstperson_lefthand": { + "rotation": [87, -19, 41], + "translation": [0, 4.25, 0] + }, + "ground": { + "translation": [0, 7.5, 0] + }, + "gui": { + "rotation": [90, 0, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -8] + } + }, + "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + { + "name": "group", + "origin": [10, 8, 12], + "children": [17, 18, 19, 20, 21, 22, 23, 24, 25] + }, + { + "name": "group", + "origin": [10, 8, 12], + "children": [26, 27, 28, 29, 30, 31, 32] + }, + { + "name": "group", + "origin": [10, 8, 12], + "children": [33, 34, 35, 36, 37, 38, 39] + }, + { + "name": "group", + "origin": [10, 8, 12], + "children": [40, 41, 42, 43] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/textures/block/vo_jukebox_top.png b/src/main/resources/assets/visualoverhaul/textures/block/vo_jukebox_top.png new file mode 100644 index 0000000..bc74286 Binary files /dev/null and b/src/main/resources/assets/visualoverhaul/textures/block/vo_jukebox_top.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..da90502 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,38 @@ +{ + "schemaVersion": 1, + "id": "visualoverhaul", + "version": "${version}", + + "name": "VisualOverhaul", + "description": "Adds better visuals for certain Minecraft Vanilla Blocks.", + "authors": [ + "Motschen", + "TeamMidnightDust" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/VisualOverhaul", + "issues": "https://github.com/TeamMidnightDust/VisualOverhaul/issues" + }, + + "license": "MIT", + "icon": "assets/visualoverhaul/icon.png", + + "environment": "*", + "entrypoints": { + "client": [ + "eu.midnightdust.visualoverhaul.VisualOverhaulClient" + ], + "modmenu": [ + "eu.midnightdust.visualoverhaul.config.ModMenuIntegration" + ] + }, + + "mixins": [ + "visualoverhaul.mixins.json" + ], + + "depends": { + "fabric": "*" + } +} diff --git a/src/main/resources/resourcepacks/visualoverhaul/assets/minecraft/textures/block/brewing_stand.png b/src/main/resources/resourcepacks/visualoverhaul/assets/minecraft/textures/block/brewing_stand.png new file mode 100644 index 0000000..c7bc11e Binary files /dev/null and b/src/main/resources/resourcepacks/visualoverhaul/assets/minecraft/textures/block/brewing_stand.png differ diff --git a/src/main/resources/resourcepacks/visualoverhaul/pack.mcmeta b/src/main/resources/resourcepacks/visualoverhaul/pack.mcmeta new file mode 100644 index 0000000..dc97b8d --- /dev/null +++ b/src/main/resources/resourcepacks/visualoverhaul/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 6, + "description": "ยง2Removes the bottles from the brewing stand texture" + } +} diff --git a/src/main/resources/resourcepacks/visualoverhaul/pack.png b/src/main/resources/resourcepacks/visualoverhaul/pack.png new file mode 100644 index 0000000..ede38ed Binary files /dev/null and b/src/main/resources/resourcepacks/visualoverhaul/pack.png differ diff --git a/src/main/resources/visualoverhaul.mixins.json b/src/main/resources/visualoverhaul.mixins.json new file mode 100644 index 0000000..10763e8 --- /dev/null +++ b/src/main/resources/visualoverhaul.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "eu.midnightdust.visualoverhaul.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinBrewingStandBlockEntity", + "MixinJukeboxBlockEntity" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file