diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/build.gradle b/build.gradle old mode 100755 new mode 100644 index 9f7d12c..d20344a --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.8-SNAPSHOT' + id 'fabric-loom' version '0.5-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_16 -targetCompatibility = JavaVersion.VERSION_16 +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 archivesBaseName = project.archives_base_name version = project.mod_version @@ -14,7 +14,6 @@ minecraft { } repositories { - maven { url "https://maven.terraformersmc.com/releases" } maven { url "https://jitpack.io" } } @@ -22,16 +21,13 @@ 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" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modCompile "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - compileOnly "io.github.FoundationGames:Phonos:0.1.1-1.17" + modImplementation "io.github.FoundationGames:Phonos:0.1.1-beta" - modImplementation "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}" - include "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}" - - modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") { + modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}") { exclude group: "net.fabricmc.fabric-api" } } @@ -39,33 +35,33 @@ dependencies { processResources { inputs.property "version", project.version - filesMatching("fabric.mod.json") { + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" expand "version": project.version } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } } -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 +// 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" } -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() +// 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") { - rename { "${it}_${project.archivesBaseName}"} - } + from "LICENSE" } // configure the maven publication @@ -82,11 +78,9 @@ publishing { } } - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + // select the repositories you want to publish to repositories { - // 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. + // uncomment to publish to the local maven + // mavenLocal() } } diff --git a/gradle.properties b/gradle.properties old mode 100755 new mode 100644 index fda099a..600169b --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.17-pre1 - yarn_mappings=1.17-pre1+build.9 - loader_version=0.11.3 + minecraft_version=1.16.5 + yarn_mappings=1.16.5+build.3 + loader_version=0.11.1 # Mod Properties - mod_version = 3.3.0 + mod_version = 3.2.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.34.8+1.17 - mod_menu_version = 2.0.0-beta.5 - midnightlib_version=v0.2.2 + fabric_version=0.29.4+1.16 + + 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 old mode 100755 new mode 100644 index e708b1c..5c2d1cf Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100755 new mode 100644 index e5338d3..4b7e1f3 --- 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-7.0.1-bin.zip +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 old mode 100755 new mode 100644 index 4f906e0..8e25e6c --- a/gradlew +++ b/gradlew @@ -82,7 +82,6 @@ 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 @@ -126,11 +125,10 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then +# 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 @@ -156,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=`expr $i + 1` + 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" ;; + (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 @@ -177,9 +175,14 @@ 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" "$@" diff --git a/gradlew.bat b/gradlew.bat old mode 100755 new mode 100644 index 107acd3..9618d8d --- a/gradlew.bat +++ b/gradlew.bat @@ -29,9 +29,6 @@ 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" @@ -40,7 +37,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if "%ERRORLEVEL%" == "0" goto init echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +51,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto execute +if exist "%JAVA_EXE%" goto init echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,14 +61,28 @@ 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 %* +"%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 diff --git a/settings.gradle b/settings.gradle old mode 100755 new mode 100644 diff --git a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java old mode 100755 new mode 100644 index 797ed50..459b696 --- a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java @@ -1,20 +1,19 @@ 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.compat.phonos.block.renderer.RadioJukeboxBlockEntityRenderer; +import eu.midnightdust.visualoverhaul.compat.phonos.init.PhonosCompatInit; import eu.midnightdust.visualoverhaul.config.VOConfig; +import io.github.foundationgames.phonos.block.PhonosBlocks; 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; @@ -26,8 +25,7 @@ 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.client.render.RenderLayer; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.MusicDiscItem; @@ -37,15 +35,16 @@ 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.Biome; import net.minecraft.world.biome.BuiltinBiomes; +import net.minecraft.world.level.ColorResolver; import static eu.midnightdust.visualoverhaul.VisualOverhaul.*; -@SuppressWarnings("UnstableApiUsage") +@SuppressWarnings("deprecation") public class VisualOverhaulClient implements ClientModInitializer { public static Block JukeBoxTop = new JukeboxTop(); - public static Item RoundDiscDummy = new Item(new FabricItemSettings()); private final MinecraftClient client = MinecraftClient.getInstance(); @Override @@ -54,8 +53,6 @@ public class VisualOverhaulClient implements ClientModInitializer { // 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()); @@ -66,15 +63,15 @@ public class VisualOverhaulClient implements ClientModInitializer { 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); -// } + // 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 || 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); + FabricModelPredicateProviderRegistry.register(item, new Identifier("round"), (stack, world, entity) -> stack.getCount() == 2 ? 1.0F : 0.0F); } }); @@ -86,7 +83,8 @@ public class VisualOverhaulClient implements ClientModInitializer { inv.set(i, attachedData.readItemStack()); } packetContext.getTaskQueue().execute(() -> { - if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof BrewingStandBlockEntity blockEntity) { + if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof BrewingStandBlockEntity) { + BrewingStandBlockEntity blockEntity = (BrewingStandBlockEntity) client.world.getBlockEntity(pos); blockEntity.setStack(0, inv.get(0)); blockEntity.setStack(1, inv.get(1)); blockEntity.setStack(2, inv.get(2)); @@ -100,7 +98,8 @@ public class VisualOverhaulClient implements ClientModInitializer { BlockPos pos = attachedData.readBlockPos(); ItemStack record = attachedData.readItemStack(); packetContext.getTaskQueue().execute(() -> { - if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof JukeboxBlockEntity blockEntity) { + if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof JukeboxBlockEntity) { + JukeboxBlockEntity blockEntity = (JukeboxBlockEntity) client.world.getBlockEntity(pos); blockEntity.setRecord(record); } }); @@ -113,7 +112,8 @@ public class VisualOverhaulClient implements ClientModInitializer { inv.set(i, attachedData.readItemStack()); } packetContext.getTaskQueue().execute(() -> { - if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof FurnaceBlockEntity blockEntity) { + if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof FurnaceBlockEntity) { + FurnaceBlockEntity blockEntity = (FurnaceBlockEntity) client.world.getBlockEntity(pos); blockEntity.setStack(0, inv.get(0)); blockEntity.setStack(1, inv.get(1)); blockEntity.setStack(2, inv.get(2)); @@ -123,9 +123,9 @@ public class VisualOverhaulClient implements ClientModInitializer { // Register builtin resourcepacks FabricLoader.getInstance().getModContainer("visualoverhaul").ifPresent(modContainer -> { - 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); + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul:nobottles"), "resourcepacks/nobrewingbottles", modContainer, true); + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul:fancyfurnace"), "resourcepacks/fancyfurnace", modContainer, true); + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul:coloredwaterbucket"), "resourcepacks/coloredwaterbucket", modContainer, true); }); // Biome-colored Items @@ -135,7 +135,6 @@ public class VisualOverhaulClient implements ClientModInitializer { 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); diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java b/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java old mode 100755 new mode 100644 diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java b/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java deleted file mode 100755 index 4115f6a..0000000 --- a/src/main/java/eu/midnightdust/visualoverhaul/block/model/FurnaceWoodenPlanksModel.java +++ /dev/null @@ -1,39 +0,0 @@ -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); - } -} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java old mode 100755 new mode 100644 index d4a99b6..4b03b40 --- a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/BrewingStandBlockEntityRenderer.java @@ -9,18 +9,16 @@ 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 implements BlockEntityRenderer { +public class BrewingStandBlockEntityRenderer extends BlockEntityRenderer { - public BrewingStandBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) { + public BrewingStandBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); } @@ -28,41 +26,35 @@ public class BrewingStandBlockEntityRenderer implements BlockEntityRenderer { - private final FurnaceWoodenPlanksModel planks; +public class FurnaceBlockEntityRenderer extends BlockEntityRenderer { + private static final ModelPart bb_main; + private static final ModelPart cube_r1; + private static final ModelPart cube_r2; + private static final ModelPart cube_r3; - public FurnaceBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) { - this.planks = new FurnaceWoodenPlanksModel(ctx.getLayerModelPart(FurnaceWoodenPlanksModel.WOODEN_PLANKS_MODEL_LAYER)); + static { + bb_main = new ModelPart(16, 16, 0, 0); + bb_main.setPivot(0.0F, 24.0F, 0.0F); + + cube_r1 = new ModelPart(16, 16, 0, 0); + cube_r1.setPivot(6.0F, 1.0F, -2.0F); + bb_main.addChild(cube_r1); + setRotationAngle(cube_r1, 0.0F, -0.5672F, 0.0F); + cube_r1.setTextureOffset(0, 0).addCuboid(-10.0F, -3.0F, 0.0F, 10.0F, 1.0F, 1.0F, 0.0F, false); + + cube_r2 = new ModelPart(16, 16, 0, 0); + cube_r2.setPivot(5.0F, 0.0F, -5.0F); + bb_main.addChild(cube_r2); + setRotationAngle(cube_r2, 0.0F, -0.1309F, 0.0F); + cube_r2.setTextureOffset(0, 0).addCuboid(-10.0F, -2.5F, 0.0F, 10.0F, 2.0F, 2.0F, 0.0F, false); + + cube_r3 = new ModelPart(16, 16, 0, 0); + cube_r3.setPivot(5.0F, -1.0F, -7.0F); + bb_main.addChild(cube_r3); + setRotationAngle(cube_r3, 0.0F, 0.2618F, 0.0F); + cube_r3.setTextureOffset(0, 0).addCuboid(-10.0F, -2.0F, 0.0F, 10.0F, 2.0F, 2.0F, 0.0F, false); + } + public static void setRotationAngle(ModelPart bone, float x, float y, float z) { + bone.pitch = x; + bone.yaw = y; + bone.roll = z; + } + + public FurnaceBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); } @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)) { + if (VOConfig.furnace && blockEntity.getCachedState().getBlock().is(Blocks.FURNACE)) { BlockState blockState = blockEntity.getCachedState(); - int lightAtBlock = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos().offset(blockState.get(AbstractFurnaceBlock.FACING))); + int lightAtBlock = WorldRenderer.getLightmapCoordinates(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.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.translate(0.5f, 0.58f, 0.5f); + matrices.scale(1f, 1f, 1f); + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(angle * 3 + 180)); + matrices.translate(0.0f, 0.0f, -0.4f); + matrices.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + MinecraftClient.getInstance().getItemRenderer().renderItem(item1, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers); - matrices.pop(); - } - if (!item2.isEmpty() && !ItemTags.LOGS_THAT_BURN.contains(item2.getItem()) && !ItemTags.PLANKS.contains(item2.getItem())) { + matrices.pop(); + if (!item2.getItem().isIn(ItemTags.LOGS_THAT_BURN) && !item2.getItem().isIn(ItemTags.PLANKS)) { 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.multiply(Vector3f.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.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + MinecraftClient.getInstance().getItemRenderer().renderItem(item2, ModelTransformation.Mode.GROUND, lightAtBlock, overlay, matrices, vertexConsumers); matrices.pop(); } - else if (!item2.isEmpty()) { + if (item2.getItem().isIn(ItemTags.LOGS_THAT_BURN) || item2.getItem().isIn(ItemTags.PLANKS)) { matrices.push(); BlockState state = Block.getBlockFromItem(item2.getItem()).getDefaultState(); Sprite texture = MinecraftClient.getInstance().getBlockRenderManager().getModel(state).getSprite(); @@ -75,8 +102,8 @@ public class FurnaceBlockEntityRenderer implements BlockEntityRenderer { +public class JukeboxBlockEntityRenderer extends BlockEntityRenderer { private ItemStack record; private Identifier discItem; - public JukeboxBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) { + public JukeboxBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); } @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()); + int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); // Tries to get the disc using the serverside method if (blockEntity.getRecord() != ItemStack.EMPTY) { @@ -65,18 +64,18 @@ public class JukeboxBlockEntityRenderer implements BlockEntityRenderer builder) { -// builder.add(PLAYING, CHANNEL); -// } -//} +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 builder) { + builder.add(PLAYING, CHANNEL); + } +} diff --git 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 old mode 100755 new mode 100644 index eefec02..abdc516 --- 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 @@ -1,74 +1,75 @@ 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 { -// 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(); -// } -// } -// } -//} \ No newline at end of file + +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.client.util.math.Vector3f; +import net.minecraft.item.ItemStack; + +import java.util.Random; + +@Environment(EnvType.CLIENT) +public class RadioJukeboxBlockEntityRenderer extends BlockEntityRenderer { + private ItemStack record; + private float rotation = 0; + private BlockState blockState; + + public RadioJukeboxBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + @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(); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java old mode 100755 new mode 100644 index 78d32a7..5f41f20 --- a/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java @@ -1,20 +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()); - } -} +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()); + } +} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java b/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java old mode 100755 new mode 100644 index fe721ee..2f88b11 --- a/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/config/ModMenuIntegration.java @@ -1,8 +1,7 @@ package eu.midnightdust.visualoverhaul.config; -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; -import eu.midnightdust.lib.config.MidnightConfig; +import io.github.prospector.modmenu.api.ConfigScreenFactory; +import io.github.prospector.modmenu.api.ModMenuApi; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -11,6 +10,6 @@ public class ModMenuIntegration implements ModMenuApi { @Override public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> MidnightConfig.getScreen(parent,"visualoverhaul"); + return parent -> new VOConfig().getScreen(parent); } } \ 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 old mode 100755 new mode 100644 index ee8fb75..c532cea --- a/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java @@ -1,11 +1,14 @@ package eu.midnightdust.visualoverhaul.config; -import eu.midnightdust.lib.config.MidnightConfig; - 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; + @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; } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinAbstractFurnaceBlockEntity.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinAbstractFurnaceBlockEntity.java old mode 100755 new mode 100644 index 24ec047..92a9f1c --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinAbstractFurnaceBlockEntity.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinAbstractFurnaceBlockEntity.java @@ -4,15 +4,14 @@ 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 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; @@ -23,25 +22,26 @@ import java.util.stream.Stream; @Mixin(AbstractFurnaceBlockEntity.class) public abstract class MixinAbstractFurnaceBlockEntity extends LockableContainerBlockEntity { - private static boolean invUpdate = true; - private static int playerUpdate = -1; + @Shadow protected DefaultedList inventory; + Boolean invUpdate = true; + int playerUpdate = -1; - - protected MixinAbstractFurnaceBlockEntity(BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState) { - super(blockEntityType, blockPos, blockState); + private MixinAbstractFurnaceBlockEntity(BlockEntityType blockEntityType) { + super(blockEntityType); } @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 watchingPlayers = PlayerStream.watching(world, pos); + public void tick(CallbackInfo ci) { + if (this.world.getBlockState(this.pos).getBlock().is(Blocks.FURNACE)) { + if (!this.world.isClient && (invUpdate || world.getPlayers().size() == playerUpdate)) { + Stream watchingPlayers = PlayerStream.watching(world, getPos()); PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer()); passedData.writeBlockPos(pos); - passedData.writeItemStack(blockEntity.getStack(0)); - passedData.writeItemStack(blockEntity.getStack(1)); - passedData.writeItemStack(blockEntity.getStack(2)); + passedData.writeItemStack(inventory.get(0)); + passedData.writeItemStack(inventory.get(1)); + passedData.writeItemStack(inventory.get(2)); + passedData.writeString(String.valueOf(inventory)); watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_FURNACE_ITEMS, passedData)); invUpdate = false; } @@ -50,7 +50,7 @@ public abstract class MixinAbstractFurnaceBlockEntity extends LockableContainerB } @Inject(at = @At("RETURN"), method = "getStack", cancellable = true) - public void getStack(int slot, CallbackInfoReturnable cir) { - invUpdate = true; + public void getStack(int slot, CallbackInfoReturnable cir) { + this.invUpdate = true; } } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java old mode 100755 new mode 100644 index 2b071b2..37ba938 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java @@ -4,16 +4,15 @@ 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.math.BlockPos; -import net.minecraft.world.World; +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; @@ -24,25 +23,27 @@ 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 inventory; + Boolean invUpdate = true; + int playerUpdate = -1; - protected MixinBrewingStandBlockEntity(BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState) { - super(blockEntityType, blockPos, blockState); + private MixinBrewingStandBlockEntity(BlockEntityType blockEntityType) { + super(blockEntityType); } @Inject(at = @At("TAIL"), method = "tick") - private static void tick(World world, BlockPos pos, BlockState state, BrewingStandBlockEntity blockEntity, CallbackInfo ci) { - if (!world.isClient && (invUpdate || world.getPlayers().size() == playerUpdate)) { - Stream watchingPlayers = PlayerStream.watching(world, pos); + public void tick(CallbackInfo ci) { + if (!this.world.isClient && (invUpdate || world.getPlayers().size() == playerUpdate)) { + Stream watchingPlayers = PlayerStream.watching(world, getPos()); PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer()); passedData.writeBlockPos(pos); - 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.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)); invUpdate = false; } @@ -50,7 +51,7 @@ public abstract class MixinBrewingStandBlockEntity extends LockableContainerBloc } @Inject(at = @At("RETURN"), method = "getStack", cancellable = true) - public void getStack(int slot, CallbackInfoReturnable cir) { - invUpdate = true; + public void getStack(int slot, CallbackInfoReturnable cir) { + this.invUpdate = true; } } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java deleted file mode 100755 index f57d6f7..0000000 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java +++ /dev/null @@ -1,56 +0,0 @@ -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 BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType 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 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(); - } -} - diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java old mode 100755 new mode 100644 index 956f1e8..122bee3 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java @@ -1,18 +1,16 @@ 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.math.BlockPos; -import net.minecraft.world.World; +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; @@ -21,28 +19,32 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.stream.Stream; @Mixin(JukeboxBlockEntity.class) -public abstract class MixinJukeboxBlockEntity extends BlockEntity { +public abstract class MixinJukeboxBlockEntity extends BlockEntity implements Tickable { - public MixinJukeboxBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { - super(type, pos, state); + @Shadow private ItemStack record; + Boolean invUpdate = true; + int playerUpdate = -1; + + private MixinJukeboxBlockEntity(BlockEntityType blockEntityType) { + super(blockEntityType); } @Unique - private static void tick(World world, BlockPos pos, BlockState state, JukeboxBlockEntity blockEntity) { - if (!world.isClient && (JukeboxPacketUpdate.invUpdate || world.getPlayers().size() == JukeboxPacketUpdate.playerUpdate)) { - Stream watchingPlayers = PlayerStream.watching(world, pos); + public void tick() { + if (!this.world.isClient && (invUpdate || world.getPlayers().size() == playerUpdate)) { + Stream watchingPlayers = PlayerStream.watching(world, getPos()); PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer()); passedData.writeBlockPos(pos); - passedData.writeItemStack(blockEntity.getRecord()); + passedData.writeItemStack(record); watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_RECORD, passedData)); - JukeboxPacketUpdate.invUpdate = false; + invUpdate = false; } - JukeboxPacketUpdate.playerUpdate = world.getPlayers().size(); + playerUpdate = world.getPlayers().size(); } @Inject(at = @At("RETURN"), method = "getRecord", cancellable = true) - public void getRecord(CallbackInfoReturnable cir) { - JukeboxPacketUpdate.invUpdate = true; + public void getRecord(CallbackInfoReturnable cir) { + this.invUpdate = true; } } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java old mode 100755 new mode 100644 index d5cfb3a..a58d070 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java @@ -1,40 +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()); - } - } - } - } +package eu.midnightdust.visualoverhaul.mixin; + +import eu.midnightdust.visualoverhaul.util.sound.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 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 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()); + } + } + } + } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/visualoverhaul/util/JukeboxPacketUpdate.java b/src/main/java/eu/midnightdust/visualoverhaul/util/JukeboxPacketUpdate.java deleted file mode 100755 index 1059775..0000000 --- a/src/main/java/eu/midnightdust/visualoverhaul/util/JukeboxPacketUpdate.java +++ /dev/null @@ -1,6 +0,0 @@ -package eu.midnightdust.visualoverhaul.util; - -public class JukeboxPacketUpdate { - public static boolean invUpdate = true; - public static int playerUpdate = -1; -} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/util/SoundTest.java b/src/main/java/eu/midnightdust/visualoverhaul/util/SoundTest.java deleted file mode 100755 index 0af8b78..0000000 --- a/src/main/java/eu/midnightdust/visualoverhaul/util/SoundTest.java +++ /dev/null @@ -1,23 +0,0 @@ -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 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; - } -} diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/desolation/models/item/music_disc_ashes.json b/src/main/resources/assets/desolation/models/item/music_disc_ashes.json old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/dynamic-discs/models/item/dynamic_disc.json b/src/main/resources/assets/dynamic-discs/models/item/dynamic_disc.json old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/phonos/models/item/custom_music_disc.json b/src/main/resources/assets/phonos/models/item/custom_music_disc.json old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json b/src/main/resources/assets/visualoverhaul/blockstates/jukebox_top.json old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json b/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/visualoverhaul/icon.png b/src/main/resources/assets/visualoverhaul/icon.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/visualoverhaul/lang/en_us.json b/src/main/resources/assets/visualoverhaul/lang/en_us.json old mode 100755 new mode 100644 index f762978..71bf2e3 --- a/src/main/resources/assets/visualoverhaul/lang/en_us.json +++ b/src/main/resources/assets/visualoverhaul/lang/en_us.json @@ -1,9 +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!" +{ + "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!" } \ No newline at end of file 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 diff --git 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 old mode 100755 new mode 100644 index 642136a..2f10cf0 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_1" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_1" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index 3b6d179..4a0a271 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_10" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_10" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index a713f45..1d3b402 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_11" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_11" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index b9f42a8..cf8abbe --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_12" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_12" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index 8ce6300..ee85815 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_13" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_13" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index 9f576df..a3ec693 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_14" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_14" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index 5ca7542..0f1374b --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_15" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_15" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index 11f2ce5..923bfd6 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_16" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_16" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index e7c38b3..7180109 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_17" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_17" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index 74db454..9269032 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_18" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_18" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index f3daff5..540a2a1 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_19" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_19" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index a80d91d..fd2fb06 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_2" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_2" + } } \ No newline at end of file diff --git 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 old mode 100755 new mode 100644 index 5626140..4801b94 --- 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 @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_3" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_3" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_4.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_4.json old mode 100755 new mode 100644 index d54f7c9..a80e12c --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_4.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_4.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_4" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_4" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_5.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_5.json old mode 100755 new mode 100644 index 54e1214..3d0af1f --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_5.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_5.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_5" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_5" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_6.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_6.json old mode 100755 new mode 100644 index 9095594..53a010d --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_6.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_6.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_6" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_6" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_7.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_7.json old mode 100755 new mode 100644 index c06722e..54a76de --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_7.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_7.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_7" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_7" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_8.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_8.json old mode 100755 new mode 100644 index 4d258f8..281b7a5 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_8.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_8.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_8" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_8" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_9.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_9.json old mode 100755 new mode 100644 index df21f46..47b18b3 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_9.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_9.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", - "textures": { - "4": "phonos:block/speaker_top_9" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_9" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_0.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_0.json old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_1.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_1.json old mode 100755 new mode 100644 index acef431..08de94b --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_1.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_1.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_1" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_1" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_10.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_10.json old mode 100755 new mode 100644 index 2401077..17df0b6 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_10.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_10.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_10" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_10" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_11.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_11.json old mode 100755 new mode 100644 index 63ddf37..096b218 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_11.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_11.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_11" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_11" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_12.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_12.json old mode 100755 new mode 100644 index 703e95e..bbe398b --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_12.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_12.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_12" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_12" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_13.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_13.json old mode 100755 new mode 100644 index 32afec1..16e3e42 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_13.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_13.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_13" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_13" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_14.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_14.json old mode 100755 new mode 100644 index 84812ce..3460b33 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_14.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_14.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_14" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_14" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_15.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_15.json old mode 100755 new mode 100644 index 4a724ab..8295d37 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_15.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_15.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_15" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_15" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_16.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_16.json old mode 100755 new mode 100644 index 9f637c5..39be751 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_16.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_16.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_16" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_16" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_17.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_17.json old mode 100755 new mode 100644 index 2492ceb..a275888 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_17.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_17.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_17" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_17" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_18.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_18.json old mode 100755 new mode 100644 index 2c7d7a0..5238087 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_18.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_18.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_18" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_18" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_19.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_19.json old mode 100755 new mode 100644 index 4a3ea2c..021752f --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_19.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_19.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_19" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_19" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_2.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_2.json old mode 100755 new mode 100644 index 7a82e27..135e4a6 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_2.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_2.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_2" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_2" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_3.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_3.json old mode 100755 new mode 100644 index 1dd25f8..22388ad --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_3.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_3.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_3" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_3" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_4.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_4.json old mode 100755 new mode 100644 index 17d1ed4..0ed117e --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_4.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_4.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_4" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_4" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_5.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_5.json old mode 100755 new mode 100644 index dfc7414..0c9900a --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_5.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_5.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_5" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_5" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_6.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_6.json old mode 100755 new mode 100644 index 8c1a75c..77b013c --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_6.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_6.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_6" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_6" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_7.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_7.json old mode 100755 new mode 100644 index 6171d13..8c6410d --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_7.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_7.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_7" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_7" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_8.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_8.json old mode 100755 new mode 100644 index c137ebd..4027c71 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_8.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_8.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_8" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_8" + } } \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_9.json b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_9.json old mode 100755 new mode 100644 index 10086ea..dc3ea27 --- a/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_9.json +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_9.json @@ -1,6 +1,6 @@ -{ - "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", - "textures": { - "4": "phonos:block/speaker_top_9" - } +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_stopped_0", + "textures": { + "4": "phonos:block/speaker_top_9" + } } \ 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 old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/visualoverhaul/models/item/round_disc_colored_layers.json b/src/main/resources/assets/visualoverhaul/models/item/round_disc_colored_layers.json old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json old mode 100755 new mode 100644 index e8d9655..0c5420f --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,6 +34,6 @@ "depends": { "fabric": ">=0.28.4", - "minecraft": "1.17.x" + "minecraft": "1.16.x" } } diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/water_bucket.json b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/water_bucket.json old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/water_bucket_overlay.png b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/water_bucket_overlay.png old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta b/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta old mode 100755 new mode 100644 index 14d4004..9a5d970 --- a/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta +++ b/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta @@ -1,6 +1,6 @@ -{ - "pack": { - "pack_format": 7, - "description": "Makes the water bucket also change it's color based on biome color" - } -} +{ + "pack": { + "pack_format": 6, + "description": "Makes the water bucket also change it's color based on biome color" + } +} diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/pack.png b/src/main/resources/resourcepacks/coloredwaterbucket/pack.png old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/fancyfurnace/assets/minecraft/blockstates/furnace.json b/src/main/resources/resourcepacks/fancyfurnace/assets/minecraft/blockstates/furnace.json old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/fancyfurnace/assets/minecraft/materialmaps/block/furnace.json b/src/main/resources/resourcepacks/fancyfurnace/assets/minecraft/materialmaps/block/furnace.json old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/fancyfurnace/assets/minecraft/models/block/furnace.json b/src/main/resources/resourcepacks/fancyfurnace/assets/minecraft/models/block/furnace.json old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/fancyfurnace/assets/minecraft/models/block/furnace_on.json b/src/main/resources/resourcepacks/fancyfurnace/assets/minecraft/models/block/furnace_on.json old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/fancyfurnace/pack.mcmeta b/src/main/resources/resourcepacks/fancyfurnace/pack.mcmeta old mode 100755 new mode 100644 index c1f6feb..eb59a5e --- a/src/main/resources/resourcepacks/fancyfurnace/pack.mcmeta +++ b/src/main/resources/resourcepacks/fancyfurnace/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 7, + "pack_format": 6, "description": "§2Changes the model of the furnace to be 3D" } } diff --git a/src/main/resources/resourcepacks/fancyfurnace/pack.png b/src/main/resources/resourcepacks/fancyfurnace/pack.png old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/textures/block/brewing_stand.png b/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/textures/block/brewing_stand.png old mode 100755 new mode 100644 diff --git a/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta b/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta old mode 100755 new mode 100644 index 2cd31dc..dc97b8d --- a/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta +++ b/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 7, + "pack_format": 6, "description": "§2Removes the bottles from the brewing stand texture" } } diff --git a/src/main/resources/resourcepacks/nobrewingbottles/pack.png b/src/main/resources/resourcepacks/nobrewingbottles/pack.png old mode 100755 new mode 100644 diff --git a/src/main/resources/visualoverhaul.accesswidener b/src/main/resources/visualoverhaul.accesswidener deleted file mode 100755 index e69de29..0000000 diff --git a/src/main/resources/visualoverhaul.mixins.json b/src/main/resources/visualoverhaul.mixins.json old mode 100755 new mode 100644 index bd97d96..dd0bc65 --- a/src/main/resources/visualoverhaul.mixins.json +++ b/src/main/resources/visualoverhaul.mixins.json @@ -3,10 +3,9 @@ "package": "eu.midnightdust.visualoverhaul.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ - "MixinAbstractFurnaceBlockEntity", "MixinBrewingStandBlockEntity", - "MixinJukeboxBlock", - "MixinJukeboxBlockEntity" + "MixinJukeboxBlockEntity", + "MixinAbstractFurnaceBlockEntity" ], "client": [ "MixinSoundSystem"