From 8f511679822f4b22c10a0ec26996e4cbf1d1936b Mon Sep 17 00:00:00 2001 From: Motschen Date: Tue, 30 Mar 2021 20:35:17 +0200 Subject: [PATCH] VisualOverhaul 3.2.0 - Compat & Stability - Overhaul Phonos's Radio Jukebox -Added compat with Biome Makeover, Desolation, Dynamic Discs, Extra Discs and Phonos discs - Fixed crash with Charm - Way smoother biome-colored items - Biome colored items for more vanilla items - Serverside method to get music discs is now prioritized, clientside method only applies if the ItemStack is empty - Move puddles into a seperate mod --- build.gradle | 2 + gradle.properties | 2 +- .../visualoverhaul/VisualOverhaul.java | 30 +- .../visualoverhaul/VisualOverhaulClient.java | 51 +- .../visualoverhaul/block/JukeboxTop.java | 19 +- .../visualoverhaul/block/PuddleBlock.java | 166 ------- .../renderer/JukeboxBlockEntityRenderer.java | 32 +- .../compat/phonos/block/RadioJukeboxTop.java | 25 + .../RadioJukeboxBlockEntityRenderer.java | 75 +++ .../compat/phonos/init/PhonosCompatInit.java | 20 + .../mixin/MixinServerWorld.java | 63 --- .../mixin/MixinSoundSystem.java | 12 +- .../item/button_mushrooms_music_disk.json | 15 + .../button_mushrooms_music_disk_round.json | 6 + .../models/item/ghost_town_music_disk.json | 15 + .../item/ghost_town_music_disk_round.json | 6 + .../models/item/swamp_jives_music_disk.json | 15 + .../item/swamp_jives_music_disk_round.json | 6 + .../models/item/music_disc_ashes.json | 15 + .../models/item/music_disc_ashes_round.json | 6 + .../models/item/dynamic_disc.json | 15 + .../models/item/music_disc_0x10c.json | 15 + .../models/item/music_disc_0x10c_round.json | 6 + .../item/music_disc_cliffside_hinson.json | 15 + .../music_disc_cliffside_hinson_round.json | 6 + .../models/item/music_disc_i_jate_my_hob.json | 15 + .../item/music_disc_i_jate_my_hob_round.json | 6 + .../models/item/music_disc_peanuts.json | 15 + .../models/item/music_disc_peanuts_round.json | 6 + .../models/item/music_disc_repetition.json | 15 + .../item/music_disc_repetition_round.json | 6 + ...isc_sometimes_i_make_video_game_music.json | 15 + ...metimes_i_make_video_game_music_round.json | 6 + .../phonos/models/item/custom_music_disc.json | 16 + .../models/item/custom_music_disc_round.json | 7 + .../visualoverhaul/blockstates/puddle.json | 7 - .../blockstates/radio_jukebox_top.json | 44 ++ .../assets/visualoverhaul/lang/en_us.json | 3 +- .../block/phonos/jukebox_top_playing_0.json | 85 ++++ .../block/phonos/jukebox_top_playing_1.json | 6 + .../block/phonos/jukebox_top_playing_10.json | 6 + .../block/phonos/jukebox_top_playing_11.json | 6 + .../block/phonos/jukebox_top_playing_12.json | 6 + .../block/phonos/jukebox_top_playing_13.json | 6 + .../block/phonos/jukebox_top_playing_14.json | 6 + .../block/phonos/jukebox_top_playing_15.json | 6 + .../block/phonos/jukebox_top_playing_16.json | 6 + .../block/phonos/jukebox_top_playing_17.json | 6 + .../block/phonos/jukebox_top_playing_18.json | 6 + .../block/phonos/jukebox_top_playing_19.json | 6 + .../block/phonos/jukebox_top_playing_2.json | 6 + .../block/phonos/jukebox_top_playing_3.json | 6 + .../block/phonos/jukebox_top_playing_4.json | 6 + .../block/phonos/jukebox_top_playing_5.json | 6 + .../block/phonos/jukebox_top_playing_6.json | 6 + .../block/phonos/jukebox_top_playing_7.json | 6 + .../block/phonos/jukebox_top_playing_8.json | 6 + .../block/phonos/jukebox_top_playing_9.json | 6 + .../block/phonos/jukebox_top_stopped_0.json | 85 ++++ .../block/phonos/jukebox_top_stopped_1.json | 6 + .../block/phonos/jukebox_top_stopped_10.json | 6 + .../block/phonos/jukebox_top_stopped_11.json | 6 + .../block/phonos/jukebox_top_stopped_12.json | 6 + .../block/phonos/jukebox_top_stopped_13.json | 6 + .../block/phonos/jukebox_top_stopped_14.json | 6 + .../block/phonos/jukebox_top_stopped_15.json | 6 + .../block/phonos/jukebox_top_stopped_16.json | 6 + .../block/phonos/jukebox_top_stopped_17.json | 6 + .../block/phonos/jukebox_top_stopped_18.json | 6 + .../block/phonos/jukebox_top_stopped_19.json | 6 + .../block/phonos/jukebox_top_stopped_2.json | 6 + .../block/phonos/jukebox_top_stopped_3.json | 6 + .../block/phonos/jukebox_top_stopped_4.json | 6 + .../block/phonos/jukebox_top_stopped_5.json | 6 + .../block/phonos/jukebox_top_stopped_6.json | 6 + .../block/phonos/jukebox_top_stopped_7.json | 6 + .../block/phonos/jukebox_top_stopped_8.json | 6 + .../block/phonos/jukebox_top_stopped_9.json | 6 + .../visualoverhaul/models/block/puddle.json | 7 - .../visualoverhaul/models/item/puddle.json | 22 - .../item/round_disc_colored_layers.json | 448 ++++++++++++++++++ src/main/resources/fabric.mod.json | 3 - src/main/resources/visualoverhaul.mixins.json | 3 +- 83 files changed, 1340 insertions(+), 340 deletions(-) delete mode 100644 src/main/java/eu/midnightdust/visualoverhaul/block/PuddleBlock.java create mode 100644 src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/RadioJukeboxTop.java create mode 100644 src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/renderer/RadioJukeboxBlockEntityRenderer.java create mode 100644 src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java delete mode 100644 src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinServerWorld.java create mode 100644 src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk.json create mode 100644 src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json create mode 100644 src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk.json create mode 100644 src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk_round.json create mode 100644 src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk.json create mode 100644 src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json create mode 100644 src/main/resources/assets/desolation/models/item/music_disc_ashes.json create mode 100644 src/main/resources/assets/desolation/models/item/music_disc_ashes_round.json create mode 100644 src/main/resources/assets/dynamic-discs/models/item/dynamic_disc.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_0x10c.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_0x10c_round.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_peanuts.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_peanuts_round.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_repetition.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_repetition_round.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json create mode 100644 src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json create mode 100644 src/main/resources/assets/phonos/models/item/custom_music_disc.json create mode 100644 src/main/resources/assets/phonos/models/item/custom_music_disc_round.json delete mode 100644 src/main/resources/assets/visualoverhaul/blockstates/puddle.json create mode 100644 src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_0.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_1.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_10.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_11.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_12.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_13.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_14.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_15.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_16.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_17.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_18.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_19.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_2.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_3.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_4.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_5.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_6.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_7.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_8.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_9.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_0.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_1.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_10.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_11.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_12.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_13.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_14.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_15.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_16.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_17.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_18.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_19.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_2.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_3.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_4.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_5.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_6.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_7.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_8.json create mode 100644 src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_9.json delete mode 100644 src/main/resources/assets/visualoverhaul/models/block/puddle.json delete mode 100644 src/main/resources/assets/visualoverhaul/models/item/puddle.json create mode 100644 src/main/resources/assets/visualoverhaul/models/item/round_disc_colored_layers.json diff --git a/build.gradle b/build.gradle index b183ec9..d20344a 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,8 @@ dependencies { modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "io.github.FoundationGames:Phonos:0.1.1-beta" + modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}") { exclude group: "net.fabricmc.fabric-api" } diff --git a/gradle.properties b/gradle.properties index f5cd9c1..600169b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.1 # Mod Properties - mod_version = 3.1.0 + mod_version = 3.2.0 maven_group = eu.midnightdust archives_base_name = visualoverhaul diff --git a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java index 571a069..9f9ae22 100644 --- a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java @@ -1,33 +1,11 @@ package eu.midnightdust.visualoverhaul; -import eu.midnightdust.visualoverhaul.block.PuddleBlock; -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.gamerule.v1.GameRuleFactory; -import net.fabricmc.fabric.api.gamerule.v1.GameRuleRegistry; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Material; -import net.minecraft.fluid.Fluids; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.GameRules; -public class VisualOverhaul implements ModInitializer { +public class VisualOverhaul { public static final String MOD_ID = "visualoverhaul"; - public static final Block Puddle = new PuddleBlock(Fluids.WATER, FabricBlockSettings.of(Material.WATER)); - public static GameRules.Key PUDDLE_SPAWN_RATE; - public static GameRules.Key SNOW_STACK_CHANCE; - public static final Identifier UPDATE_POTION_BOTTLES = new Identifier("visualoverhaul", "brewingstand"); - public static final Identifier UPDATE_RECORD = new Identifier("visualoverhaul", "record"); - public static final Identifier UPDATE_FURNACE_ITEMS = new Identifier("visualoverhaul", "furnace"); - - public void onInitialize() { - PUDDLE_SPAWN_RATE = GameRuleRegistry.register("puddleSpawnRate", GameRules.Category.SPAWNING, GameRuleFactory.createIntRule(1)); - SNOW_STACK_CHANCE = GameRuleRegistry.register("snowStackChance", GameRules.Category.SPAWNING, GameRuleFactory.createIntRule(1)); - Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"puddle"), Puddle); - Registry.register(Registry.ITEM, new Identifier(MOD_ID,"puddle"), new BlockItem(Puddle, new Item.Settings())); - } + public static final Identifier UPDATE_POTION_BOTTLES = new Identifier(MOD_ID, "brewingstand"); + public static final Identifier UPDATE_RECORD = new Identifier(MOD_ID, "record"); + public static final Identifier UPDATE_FURNACE_ITEMS = new Identifier(MOD_ID, "furnace"); } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java index f349eb2..459b696 100644 --- a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java @@ -4,7 +4,10 @@ import eu.midnightdust.visualoverhaul.block.JukeboxTop; 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; @@ -12,7 +15,6 @@ import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl; -import net.fabricmc.fabric.impl.client.rendering.ColorProviderRegistryImpl; import net.fabricmc.fabric.impl.networking.ClientSidePacketRegistryImpl; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.Block; @@ -22,6 +24,7 @@ import net.minecraft.block.entity.BrewingStandBlockEntity; import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.block.entity.JukeboxBlockEntity; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.color.world.BiomeColors; import net.minecraft.client.render.RenderLayer; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -34,8 +37,7 @@ 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 java.util.Objects; +import net.minecraft.world.level.ColorResolver; import static eu.midnightdust.visualoverhaul.VisualOverhaul.*; @@ -52,6 +54,7 @@ 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); + BlockRenderLayerMapImpl.INSTANCE.putBlock(Blocks.JUKEBOX, RenderLayer.getCutout()); BlockRenderLayerMapImpl.INSTANCE.putBlock(JukeBoxTop, RenderLayer.getCutout()); BlockRenderLayerMapImpl.INSTANCE.putBlock(Blocks.FURNACE, RenderLayer.getCutout()); @@ -60,8 +63,14 @@ 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); + } + Registry.ITEM.forEach((item) -> { - if(item instanceof MusicDiscItem) { + 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) -> stack.getCount() == 2 ? 1.0F : 0.0F); } }); @@ -119,22 +128,27 @@ public class VisualOverhaulClient implements ClientModInitializer { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul:coloredwaterbucket"), "resourcepacks/coloredwaterbucket", modContainer, true); }); - // Context Colored Items + // Biome-colored Items if (VOConfig.coloredItems) { ClientTickEvents.END_CLIENT_TICK.register(client -> { int waterColor; int foliageColor; + int grassColor; if (client.world != null) { - Biome biome = client.world.getBiome(client.player.getBlockPos()); - waterColor = biome.getWaterColor(); - foliageColor = biome.getFoliageColor(); + waterColor = client.world.getColor(client.player.getBlockPos(), BiomeColors.WATER_COLOR); + foliageColor = client.world.getColor(client.player.getBlockPos(), BiomeColors.FOLIAGE_COLOR); + grassColor = client.world.getColor(client.player.getBlockPos(), BiomeColors.GRASS_COLOR); } else { waterColor = BuiltinBiomes.PLAINS.getWaterColor(); foliageColor = BuiltinBiomes.PLAINS.getFoliageColor(); + grassColor = BuiltinBiomes.PLAINS.getFoliageColor(); } - ColorProviderRegistry.ITEM.register((stack, tintIndex) -> waterColor, VisualOverhaul.Puddle); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.WATER_BUCKET); - ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.GRASS_BLOCK); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.GRASS_BLOCK); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.GRASS); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.TALL_GRASS); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.FERN); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.LARGE_FERN); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.ACACIA_LEAVES); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.DARK_OAK_LEAVES); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.JUNGLE_LEAVES); @@ -145,12 +159,19 @@ public class VisualOverhaulClient implements ClientModInitializer { } return tintIndex > 0 ? -1 : PotionUtil.getColor(stack); }, Items.POTION); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> { + if (PotionUtil.getPotion(stack) == Potions.WATER && tintIndex == 0) { + return waterColor; + } + return tintIndex > 0 ? -1 : PotionUtil.getColor(stack); + }, Items.SPLASH_POTION); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> { + if (PotionUtil.getPotion(stack) == Potions.WATER && tintIndex == 0) { + return waterColor; + } + return tintIndex > 0 ? -1 : PotionUtil.getColor(stack); + }, Items.LINGERING_POTION); }); } - // Else just register a static color for our puddle item - else { - ColorProviderRegistry.ITEM.register((stack, tintIndex) -> BuiltinBiomes.PLAINS.getWaterColor(), Puddle); - } - ColorProviderRegistry.BLOCK.register((state, view, pos, tintIndex) -> Objects.requireNonNull(ColorProviderRegistryImpl.BLOCK.get(Blocks.WATER)).getColor(state, view, pos, tintIndex), Puddle); } } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java b/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java index b29ec2a..92fc360 100644 --- a/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/block/JukeboxTop.java @@ -9,15 +9,14 @@ import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; public class JukeboxTop extends Block { + private static final BooleanProperty HAS_RECORD = Properties.HAS_RECORD; - private static final BooleanProperty HAS_RECORD = Properties.HAS_RECORD; - - public JukeboxTop() { - super(FabricBlockSettings.copy(Blocks.JUKEBOX)); - this.setDefaultState(this.stateManager.getDefaultState().with(HAS_RECORD,false)); - } - @Override - protected void appendProperties(StateManager.Builder builder) { - builder.add(HAS_RECORD); - } + public JukeboxTop() { + super(FabricBlockSettings.copy(Blocks.JUKEBOX)); + this.setDefaultState(this.stateManager.getDefaultState().with(HAS_RECORD,false)); } + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(HAS_RECORD); + } +} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/PuddleBlock.java b/src/main/java/eu/midnightdust/visualoverhaul/block/PuddleBlock.java deleted file mode 100644 index 682d6bc..0000000 --- a/src/main/java/eu/midnightdust/visualoverhaul/block/PuddleBlock.java +++ /dev/null @@ -1,166 +0,0 @@ -package eu.midnightdust.visualoverhaul.block; - -import eu.midnightdust.visualoverhaul.VisualOverhaul; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.block.*; -import net.minecraft.entity.ai.pathing.NavigationType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.*; -import net.minecraft.item.*; -import net.minecraft.loot.context.LootContext; -import net.minecraft.potion.PotionUtil; -import net.minecraft.potion.Potions; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.stat.Stats; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.shape.VoxelShape; -import net.minecraft.util.shape.VoxelShapes; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; -import net.minecraft.world.WorldView; - -import java.util.Collections; -import java.util.List; -import java.util.Random; - -@SuppressWarnings("deprecation") -public class PuddleBlock extends Block { - - protected final FlowableFluid fluid; - public static final VoxelShape COLLISION_SHAPE; - - public PuddleBlock(FlowableFluid fluid, AbstractBlock.Settings settings) { - super(settings); - this.fluid = fluid; - } - @Override - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - ItemStack itemStack = player.getStackInHand(hand); - if (itemStack.isEmpty()) { - return ActionResult.PASS; - } else { - Item item = itemStack.getItem(); - ItemStack waterBottleStack; - if (item == Items.GLASS_BOTTLE) { - if (!world.isClient) { - if (!player.abilities.creativeMode) { - waterBottleStack = PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER); - player.incrementStat(Stats.USE_CAULDRON); - itemStack.decrement(1); - if (itemStack.isEmpty()) { - player.setStackInHand(hand, waterBottleStack); - } else if (!player.inventory.insertStack(waterBottleStack)) { - player.dropItem(waterBottleStack, false); - } else if (player instanceof ServerPlayerEntity) { - ((ServerPlayerEntity)player).refreshScreenHandler(player.playerScreenHandler); - } - } - - world.playSound(null, pos, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F); - world.setBlockState(pos, Blocks.AIR.getDefaultState()); - } - return ActionResult.success(world.isClient); - } - else return ActionResult.FAIL; - } - - } - @Override - public boolean hasRandomTicks(BlockState state) { - return true; - } - @Override - public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { - if (!world.isRaining() && random.nextInt(2000) == 0) { - world.setBlockState(pos, Blocks.AIR.getDefaultState()); - } - - this.scheduledTick(state, world, pos, random); - } - - @Override - public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return context.isAbove(COLLISION_SHAPE, pos, true) ? COLLISION_SHAPE : VoxelShapes.empty(); - } - @Override - public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return COLLISION_SHAPE; - } - @Override - public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) { - return VoxelShapes.empty(); - } - - public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { - return true; - } - - public FluidState getFluidState(BlockState state) { - return fluid.getFlowing(1,false); - } - - @Environment(EnvType.CLIENT) - public boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) { - return stateFrom.getFluidState().getFluid().matchesType(this.fluid); - } - - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.INVISIBLE; - } - - public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - return Collections.emptyList(); - } - - public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { - if (world.getBlockState(pos) == Blocks.AIR.getDefaultState() || world.getBlockState(pos) == VisualOverhaul.Puddle.getDefaultState()) { - int i; - // Check if there are fluids on the sides or corners of the block above - for (i = 2; i < 6; ++i) { - BlockPos pos1 = pos.up(); - BlockPos pos2 = pos1.offset(Direction.byId(i)); - if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) { - // When sides of the block above have water don't place the puddle - return false; - } - if (!world.getFluidState(pos2.offset(Direction.byId(i).rotateYClockwise())).isEmpty()) { - // When corners of the block above have water don't place the puddle - return false; - } - } - // Check if there are fluids on the sides or corners of the block below - for (i = 2; i < 6; ++i) { - BlockPos pos1 = pos.down(); - BlockPos pos2 = pos1.offset(Direction.byId(i)); - if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) { - // When sides of the block below have water don't place the puddle - return false; - } - if (!world.getFluidState(pos2.offset(Direction.byId(i).rotateYClockwise())).isEmpty()) { - // When corners of the block below have water don't place the puddle - return false; - } - } - return world.getBlockState(pos.down()).isSideSolidFullSquare(world, pos, Direction.UP); - } - // When there's already another block at the position don't place the puddle - else return false; - } - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { - return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); - } - - static { - COLLISION_SHAPE = net.minecraft.block.Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 0.5D, 16.0D); - } -} - diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java index 7c7c775..1b9b84e 100644 --- a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; +import org.apache.logging.log4j.LogManager; import java.util.Random; @@ -34,28 +35,35 @@ public class JukeboxBlockEntityRenderer extends BlockEntityRenderer minecraft:music_disc_cat) // discItem = new Identifier(String.valueOf(SoundTest.getSound(blockEntity.getPos())).replace(".", "_")); + + // Tries to get the disc item from the registry // + if (Registry.ITEM.getOrEmpty(discItem).isPresent()) { + + record = new ItemStack(Registry.ITEM.get(discItem)); + } + else { + LogManager.getLogger("VisualOverhaul").warn("Error getting music disc item for" + SoundTest.getSound(blockEntity.getPos())); + discItem = null; + record = ItemStack.EMPTY; + } } // If the sound is stopped or no sound is playing, the stack is set to an empty stack // - if (SoundTest.getSound(blockEntity.getPos()) == null) { + else { discItem = null; record = ItemStack.EMPTY; } - // Tries to get the disc item from the registry // - else if (Registry.ITEM.getOrEmpty(discItem).isPresent()) { - record = new ItemStack(Registry.ITEM.get(discItem)); - } - // Fallback to serverside implementation if the id doesn't match an item // - else { - record = blockEntity.getRecord(); - } + record.setCount(2); diff --git a/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/RadioJukeboxTop.java b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/RadioJukeboxTop.java new file mode 100644 index 0000000..95ecc72 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/RadioJukeboxTop.java @@ -0,0 +1,25 @@ +package eu.midnightdust.visualoverhaul.compat.phonos.block; + +import io.github.foundationgames.phonos.block.PhonosBlocks; +import io.github.foundationgames.phonos.block.RadioJukeboxBlock; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.IntProperty; + +public class RadioJukeboxTop extends Block { + public static final BooleanProperty PLAYING = RadioJukeboxBlock.PLAYING; + public static final IntProperty CHANNEL = RadioJukeboxBlock.CHANNEL; + + public RadioJukeboxTop() { + super(FabricBlockSettings.copy(PhonosBlocks.RADIO_JUKEBOX)); + this.setDefaultState(this.stateManager.getDefaultState()); + } + + @Override + protected void appendProperties(StateManager.Builder 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 new file mode 100644 index 0000000..abdc516 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/renderer/RadioJukeboxBlockEntityRenderer.java @@ -0,0 +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.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 new file mode 100644 index 0000000..5f41f20 --- /dev/null +++ b/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java @@ -0,0 +1,20 @@ +package eu.midnightdust.visualoverhaul.compat.phonos.init; + +import eu.midnightdust.visualoverhaul.compat.phonos.block.RadioJukeboxTop; +import io.github.foundationgames.phonos.block.PhonosBlocks; +import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl; +import net.minecraft.block.Block; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class PhonosCompatInit { + public static Block RadioJukeboxTop = new RadioJukeboxTop(); + + public static void init() { + Registry.register(Registry.BLOCK, new Identifier("visualoverhaul","radio_jukebox_top"), RadioJukeboxTop); + + BlockRenderLayerMapImpl.INSTANCE.putBlock(PhonosBlocks.RADIO_JUKEBOX, RenderLayer.getCutout()); + BlockRenderLayerMapImpl.INSTANCE.putBlock(RadioJukeboxTop, RenderLayer.getCutout()); + } +} diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinServerWorld.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinServerWorld.java deleted file mode 100644 index bcbc6a8..0000000 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinServerWorld.java +++ /dev/null @@ -1,63 +0,0 @@ -package eu.midnightdust.visualoverhaul.mixin; - -import eu.midnightdust.visualoverhaul.VisualOverhaul; -import net.minecraft.block.Blocks; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.state.property.Properties; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.profiler.Profiler; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.*; -import net.minecraft.world.chunk.WorldChunk; -import net.minecraft.world.dimension.DimensionType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.function.Supplier; - -@Mixin(ServerWorld.class) -public abstract class MixinServerWorld extends World { - protected MixinServerWorld(MutableWorldProperties properties, RegistryKey registryRef, DimensionType dimensionType, Supplier profiler, boolean isClient, boolean debugWorld, long seed) { - super(properties, registryRef, dimensionType, profiler, isClient, debugWorld, seed); - } - - @Shadow protected abstract BlockPos getSurface(BlockPos pos); - - @Inject(at = @At("TAIL"),method = "tickChunk") - public void tickChunk(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci) { - ChunkPos chunkPos = chunk.getPos(); - boolean bl = this.isRaining(); - int x = chunkPos.getStartX(); - int z = chunkPos.getStartZ(); - Profiler profiler = this.getProfiler(); - BlockPos pos; - - if (this.getGameRules().getInt(VisualOverhaul.PUDDLE_SPAWN_RATE) != 0) { - profiler.push("puddles"); - if (bl && random.nextInt(10000 / this.getGameRules().getInt(VisualOverhaul.PUDDLE_SPAWN_RATE)) == 0) { - pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15)); - if (this.hasRain(pos) && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP)) { - setBlockState(pos, VisualOverhaul.Puddle.getDefaultState()); - } - } - profiler.pop(); - } - - if (this.getGameRules().getInt(VisualOverhaul.SNOW_STACK_CHANCE) != 0) { - profiler.push("extra_snow"); - if (bl && random.nextInt(10000 / this.getGameRules().getInt(VisualOverhaul.SNOW_STACK_CHANCE)) == 0) { - pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15)); - if (this.getBlockState(pos).getBlock() == Blocks.SNOW && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP)) { - int layer = getBlockState(pos).get(Properties.LAYERS); - setBlockState(pos, Blocks.SNOW.getDefaultState().with(Properties.LAYERS, layer + 1)); - } - } - profiler.pop(); - } - } -} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java index b8985d8..a58d070 100644 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSoundSystem.java @@ -26,11 +26,15 @@ public abstract class MixinSoundSystem { } } - @Inject(at = @At("TAIL"),method = "stop(Lnet/minecraft/client/sound/SoundInstance;)V") + @Inject(at = @At("HEAD"),method = "stop(Lnet/minecraft/client/sound/SoundInstance;)V") public void onStopRecordSound(SoundInstance soundInstance, CallbackInfo ci) { - if (soundInstance.getCategory().equals(SoundCategory.RECORDS) && SoundTest.soundPos.containsKey(new BlockPos(soundInstance.getX(),soundInstance.getY(),soundInstance.getZ()))) { - jukeboxPos = new BlockPos(soundInstance.getX(),soundInstance.getY(),soundInstance.getZ()); - SoundTest.soundPos.remove(jukeboxPos,soundInstance.getId()); + 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/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk.json b/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk.json new file mode 100644 index 0000000..b6f6b05 --- /dev/null +++ b/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "biomemakeover:item/music_disk_button_mushrooms" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "biomemakeover:item/button_mushrooms_music_disk_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..9736e4f --- /dev/null +++ b/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "biomemakeover:item/music_disk_button_mushrooms" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..2f8093d --- /dev/null +++ b/src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "biomemakeover:item/music_disc_ghost_town" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "biomemakeover:item/ghost_town_music_disk_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..f4aca7e --- /dev/null +++ b/src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "biomemakeover:item/music_disc_ghost_town" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..e8e6353 --- /dev/null +++ b/src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "biomemakeover:item/music_disc_swamp_jives" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "biomemakeover:item/swamp_jives_music_disk_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..38617a6 --- /dev/null +++ b/src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "biomemakeover:item/music_disc_swamp_jives" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..e9afa3b --- /dev/null +++ b/src/main/resources/assets/desolation/models/item/music_disc_ashes.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "desolation:item/music_disc_ashes" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "desolation:item/music_disc_ashes_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..ee1c4ac --- /dev/null +++ b/src/main/resources/assets/desolation/models/item/music_disc_ashes_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "desolation:item/music_disc_ashes" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..7994d24 --- /dev/null +++ b/src/main/resources/assets/dynamic-discs/models/item/dynamic_disc.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_13" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_13_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..400615a --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_0x10c.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "extra_discs:item/music_disc_0x10c" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "extra_discs:item/music_disc_0x10c_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..24fb651 --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_0x10c_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "extra_discs:item/music_disc_0x10c" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..4c74236 --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "extra_discs:item/music_disc_cliffside_hinson" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "extra_discs:item/music_disc_cliffside_hinson_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..188618f --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "extra_discs:item/music_disc_cliffside_hinson" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..739004e --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "extra_discs:item/music_disc_i_jate_my_hob" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "extra_discs:item/music_disc_i_jate_my_hob_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..846ddec --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "extra_discs:item/music_disc_i_jate_my_hob" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..ae55134 --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_peanuts.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "extra_discs:item/music_disc_peanuts" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "extra_discs:item/music_disc_peanuts_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..76883c8 --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_peanuts_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "extra_discs:item/music_disc_peanuts" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..f0875dc --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_repetition.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "extra_discs:item/music_disc_repetition" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "extra_discs:item/music_disc_repetition_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..f5bdbcf --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_repetition_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "extra_discs:item/music_disc_repetition" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..e898ac5 --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "extra_discs:item/music_disc_sometimes_i_make_video_game_music" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "extra_discs:item/music_disc_sometimes_i_make_video_game_music_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..7abc0b4 --- /dev/null +++ b/src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "extra_discs:item/music_disc_sometimes_i_make_video_game_music" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..bf35e49 --- /dev/null +++ b/src/main/resources/assets/phonos/models/item/custom_music_disc.json @@ -0,0 +1,16 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer1": "phonos:item/music_disc_outer", + "layer0": "phonos:item/music_disc_inner" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "phonos:item/custom_music_disc_round" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..17a1088 --- /dev/null +++ b/src/main/resources/assets/phonos/models/item/custom_music_disc_round.json @@ -0,0 +1,7 @@ +{ + "parent": "visualoverhaul:item/round_disc_colored_layers", + "textures": { + "0": "phonos:item/music_disc_inner", + "1": "phonos:item/music_disc_outer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/blockstates/puddle.json b/src/main/resources/assets/visualoverhaul/blockstates/puddle.json deleted file mode 100644 index 1e87399..0000000 --- a/src/main/resources/assets/visualoverhaul/blockstates/puddle.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "visualoverhaul:block/puddle" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json b/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json new file mode 100644 index 0000000..0f3f921 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/blockstates/radio_jukebox_top.json @@ -0,0 +1,44 @@ +{ + "variants": { + "playing=true,channel=0": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_0"}, + "playing=false,channel=0": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_0"}, + "playing=true,channel=1": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_1"}, + "playing=false,channel=1": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_1"}, + "playing=true,channel=2": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_2"}, + "playing=false,channel=2": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_2"}, + "playing=true,channel=3": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_3"}, + "playing=false,channel=3": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_3"}, + "playing=true,channel=4": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_4"}, + "playing=false,channel=4": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_4"}, + "playing=true,channel=5": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_5"}, + "playing=false,channel=5": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_5"}, + "playing=true,channel=6": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_6"}, + "playing=false,channel=6": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_6"}, + "playing=true,channel=7": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_7"}, + "playing=false,channel=7": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_7"}, + "playing=true,channel=8": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_8"}, + "playing=false,channel=8": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_8"}, + "playing=true,channel=9": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_9"}, + "playing=false,channel=9": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_9"}, + "playing=true,channel=10": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_10"}, + "playing=false,channel=10": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_10"}, + "playing=true,channel=11": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_11"}, + "playing=false,channel=11": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_11"}, + "playing=true,channel=12": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_12"}, + "playing=false,channel=12": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_12"}, + "playing=true,channel=13": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_13"}, + "playing=false,channel=13": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_13"}, + "playing=true,channel=14": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_14"}, + "playing=false,channel=14": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_14"}, + "playing=true,channel=15": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_15"}, + "playing=false,channel=15": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_15"}, + "playing=true,channel=16": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_16"}, + "playing=false,channel=16": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_16"}, + "playing=true,channel=17": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_17"}, + "playing=false,channel=17": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_17"}, + "playing=true,channel=18": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_18"}, + "playing=false,channel=18": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_18"}, + "playing=true,channel=19": {"model": "visualoverhaul:block/phonos/jukebox_top_playing_19"}, + "playing=false,channel=19": {"model": "visualoverhaul:block/phonos/jukebox_top_stopped_19"} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/lang/en_us.json b/src/main/resources/assets/visualoverhaul/lang/en_us.json index 8075cd2..71bf2e3 100644 --- a/src/main/resources/assets/visualoverhaul/lang/en_us.json +++ b/src/main/resources/assets/visualoverhaul/lang/en_us.json @@ -5,6 +5,5 @@ "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!", - "block.visualoverhaul.puddle":"Puddle" + "visualoverhaul.midnightconfig.coloredItems.tooltip":"Needs restart!" } \ No newline at end of file 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 new file mode 100644 index 0000000..be8b742 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_0.json @@ -0,0 +1,85 @@ +{ + "credit": "made by Motschen", + "textures": { + "0": "block/glass", + "1": "block/black_concrete", + "2": "block/anvil", + "3": "visualoverhaul:block/vo_jukebox_top", + "4": "phonos:block/speaker_top_0", + "particle": "block/glass" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 0.01, 16], + "faces": { + "up": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + }, + { + "from": [7.875, 0, 7.875], + "to": [8.125, 1.25, 8.125], + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"} + } + }, + { + "from": [5.75, 1, 11.29], + "to": [6, 1.5, 11.54], + "rotation": {"angle": 45, "axis": "y", "origin": [5, 8, 12]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#2"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#2"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#2"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#2"} + } + }, + { + "from": [0.875, 0, 14.875], + "to": [1.375, 1.5, 15.375], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 15]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"} + } + }, + { + "from": [0.65, 1.5, 14.875], + "to": [7.15, 2, 15.375], + "rotation": {"angle": 45, "axis": "y", "origin": [1, 10, 15]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"} + } + }, + { + "from": [10, 0.1, 12], + "to": [15, 0.1, 15], + "faces": { + "up": {"uv": [4, 5, 12, 10], "rotation": 180, "texture": "#4"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..2f10cf0 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_1.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_1" + } +} \ 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 new file mode 100644 index 0000000..4a0a271 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_10.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_10" + } +} \ 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 new file mode 100644 index 0000000..1d3b402 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_11.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_11" + } +} \ 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 new file mode 100644 index 0000000..cf8abbe --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_12.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_12" + } +} \ 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 new file mode 100644 index 0000000..ee85815 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_13.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_13" + } +} \ 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 new file mode 100644 index 0000000..a3ec693 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_14.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_14" + } +} \ 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 new file mode 100644 index 0000000..0f1374b --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_15.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_15" + } +} \ 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 new file mode 100644 index 0000000..923bfd6 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_16.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_16" + } +} \ 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 new file mode 100644 index 0000000..7180109 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_17.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_17" + } +} \ 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 new file mode 100644 index 0000000..9269032 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_18.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_18" + } +} \ 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 new file mode 100644 index 0000000..540a2a1 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_19.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_19" + } +} \ 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 new file mode 100644 index 0000000..fd2fb06 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_2.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_2" + } +} \ 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 new file mode 100644 index 0000000..4801b94 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_3.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:block/phonos/jukebox_top_playing_0", + "textures": { + "4": "phonos:block/speaker_top_3" + } +} \ 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 new file mode 100644 index 0000000..a80e12c --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_4.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..3d0af1f --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_5.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..53a010d --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_6.json @@ -0,0 +1,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 new file mode 100644 index 0000000..54a76de --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_7.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..281b7a5 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_8.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..47b18b3 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_playing_9.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..48df72f --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_0.json @@ -0,0 +1,85 @@ +{ + "credit": "made by Motschen", + "textures": { + "0": "block/glass", + "1": "block/black_concrete", + "2": "block/anvil", + "3": "visualoverhaul:block/vo_jukebox_top", + "4": "phonos:block/speaker_top_0", + "particle": "block/glass" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 0.01, 16], + "faces": { + "up": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + }, + { + "from": [7.875, 0, 7.875], + "to": [8.125, 1.25, 8.125], + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"} + } + }, + { + "from": [6.75, 1, 15], + "to": [7, 1.5, 15.25], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 16]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#2"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#2"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#2"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#2"} + } + }, + { + "from": [0.875, 0, 14.875], + "to": [1.375, 1.5, 15.375], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 15]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"} + } + }, + { + "from": [0.65, 1.5, 14.875], + "to": [7.15, 2, 15.375], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 15]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#1"} + } + }, + { + "from": [10, 0.1, 12], + "to": [15, 0.1, 15], + "faces": { + "up": {"uv": [4, 5, 12, 10], "rotation": 180, "texture": "#4"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..08de94b --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_1.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..17df0b6 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_10.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..096b218 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_11.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..bbe398b --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_12.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..16e3e42 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_13.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..3460b33 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_14.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..8295d37 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_15.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..39be751 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_16.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..a275888 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_17.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..5238087 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_18.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..021752f --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_19.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..135e4a6 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_2.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..22388ad --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_3.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..0ed117e --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_4.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..0c9900a --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_5.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..77b013c --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_6.json @@ -0,0 +1,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 new file mode 100644 index 0000000..8c6410d --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_7.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..4027c71 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_8.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..dc3ea27 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/block/phonos/jukebox_top_stopped_9.json @@ -0,0 +1,6 @@ +{ + "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/block/puddle.json b/src/main/resources/assets/visualoverhaul/models/block/puddle.json deleted file mode 100644 index 2df7f06..0000000 --- a/src/main/resources/assets/visualoverhaul/models/block/puddle.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "particle": "block/water_still" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/visualoverhaul/models/item/puddle.json b/src/main/resources/assets/visualoverhaul/models/item/puddle.json deleted file mode 100644 index ad258f4..0000000 --- a/src/main/resources/assets/visualoverhaul/models/item/puddle.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "0": "block/water_still", - "particle": "block/water_still" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 1, 16], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0", "tintindex": 0}, - "east": {"uv": [0, 0, 16, 1], "texture": "#0", "tintindex": 0}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0", "tintindex": 0}, - "west": {"uv": [0, 0, 16, 1], "texture": "#0", "tintindex": 0}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "tintindex": 0}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "tintindex": 0} - } - } - ] -} \ No newline at end of file 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 new file mode 100644 index 0000000..a9b8470 --- /dev/null +++ b/src/main/resources/assets/visualoverhaul/models/item/round_disc_colored_layers.json @@ -0,0 +1,448 @@ +{ + "credit": "made by Motschen", + "textures": { + "0": "phonos:item/music_disc_inner", + "1": "phonos:item/music_disc_outer", + "particle": "#0" + }, + "elements": [ + { + "from": [7.5, 0, 7.5], + "to": [8.5, 1, 8.5], + "faces": { + "up": {"uv": [7, 7, 8, 8], "texture": "#1"} + } + }, + { + "from": [9.5, 0, 9.5], + "to": [10.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]}, + "faces": { + "up": {"uv": [5, 6, 6, 7], "texture": "#1"} + } + }, + { + "from": [5.5, 0, 9.5], + "to": [6.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 10]}, + "faces": { + "up": {"uv": [9, 6, 10, 7], "texture": "#1"} + } + }, + { + "from": [5.5, 0, 5.5], + "to": [6.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 6]}, + "faces": { + "up": {"uv": [9, 8, 10, 9], "texture": "#1"} + } + }, + { + "from": [9.5, 0, 5.5], + "to": [10.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "up": {"uv": [5, 8, 6, 9], "texture": "#1"} + } + }, + { + "from": [6.5, 0, 5.5], + "to": [9.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "up": {"uv": [6, 8, 9, 9], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [2.5, 0, 4.5], + "to": [13.5, 1, 5.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "texture": "#1"} + } + }, + { + "from": [4.5, 0.001, 2.5], + "to": [5.5, 1.001, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 8]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [10.5, 0.001, 2.5], + "to": [11.5, 1.001, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 8]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [2.5, 0, 10.5], + "to": [13.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 11]}, + "faces": { + "up": {"uv": [2, 5, 13, 6], "texture": "#1"} + } + }, + { + "from": [6.5, 0, 9.5], + "to": [9.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]}, + "faces": { + "up": {"uv": [6, 6, 9, 7], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [5.5, 0, 6.5], + "to": [6.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, + "faces": { + "up": {"uv": [6, 8, 9, 9], "rotation": 270, "texture": "#0", "tintindex": 0} + } + }, + { + "from": [9.5, 0, 6.5], + "to": [10.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]}, + "faces": { + "up": {"uv": [6, 6, 9, 7], "rotation": 270, "texture": "#0", "tintindex": 0} + } + }, + { + "from": [8.5, 0, 6.5], + "to": [9.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "up": {"uv": [6, 7, 7, 8], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [6.5, 0, 6.5], + "to": [7.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 8]}, + "faces": { + "up": {"uv": [8, 7, 9, 8], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [7.5, 0, 8.5], + "to": [8.5, 1, 9.5], + "faces": { + "up": {"uv": [6, 7, 7, 8], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [7.5, 0, 6.5], + "to": [8.5, 1, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "up": {"uv": [8, 7, 9, 8], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [7.5, -0.001, 11.5], + "to": [12.5, 0.999, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 12]}, + "faces": { + "up": {"uv": [3, 5, 8, 6], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3.5, -0.001, 11.5], + "to": [7.5, 0.999, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 12]}, + "faces": { + "up": {"uv": [8, 5, 12, 6], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [5.5, 0, 12.5], + "to": [10.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 13]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [6.5, 0, 13.5], + "to": [11.5, 1, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 14]}, + "faces": { + "east": {"uv": [10, 11, 11, 12], "texture": "#1"}, + "south": {"uv": [5, 12, 10, 13], "texture": "#1"}, + "up": {"uv": [5, 3, 10, 4], "texture": "#1"} + } + }, + { + "from": [4.5, 0, 13.5], + "to": [6.5, 1, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 14]}, + "faces": { + "south": {"uv": [3, 11, 5, 12], "texture": "#1"}, + "west": {"uv": [2, 11, 3, 12], "texture": "#1"}, + "up": {"uv": [8, 3, 10, 4], "texture": "#1"} + } + }, + { + "from": [3.5, 0, 12.5], + "to": [4.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]}, + "faces": { + "south": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "west": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "up": {"uv": [10, 4, 11, 5], "texture": "#1"} + } + }, + { + "from": [2.5, 0, 11.5], + "to": [3.5, 1, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 12]}, + "faces": { + "south": {"uv": [12, 11, 13, 12], "texture": "#1"}, + "west": {"uv": [10, 11, 11, 12], "texture": "#1"}, + "up": {"uv": [11, 4, 12, 5], "texture": "#1"} + } + }, + { + "from": [12.5, 0, 11.5], + "to": [13.5, 1, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 12]}, + "faces": { + "east": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "south": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "up": {"uv": [2, 4, 3, 5], "texture": "#1"} + } + }, + { + "from": [11.5, 0, 12.5], + "to": [12.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 13]}, + "faces": { + "east": {"uv": [12, 11, 13, 12], "texture": "#1"}, + "south": {"uv": [11, 11, 12, 12], "texture": "#1"}, + "up": {"uv": [4, 4, 5, 5], "texture": "#1"} + } + }, + { + "from": [11.5, -0.001, 5.5], + "to": [12.5, 0.999, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 8]}, + "faces": { + "up": {"uv": [5, 4, 10, 5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [11.5, -0.001, 3.5], + "to": [12.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 6]}, + "faces": { + "up": {"uv": [2, 9, 3, 10], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [12.5, 0, 5.5], + "to": [13.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 8]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "texture": "#1"} + } + }, + { + "from": [13.5, 0, 4.5], + "to": [14.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 7]}, + "faces": { + "north": {"uv": [10, 11, 11, 12], "texture": "#1"}, + "east": {"uv": [5, 12, 10, 13], "texture": "#1"}, + "up": {"uv": [5, 3, 10, 4], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [13.5, 0, 9.5], + "to": [14.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 12]}, + "faces": { + "east": {"uv": [3, 11, 5, 12], "texture": "#1"}, + "south": {"uv": [2, 11, 3, 12], "texture": "#1"}, + "up": {"uv": [8, 3, 10, 4], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [11.5, 0, 2.5], + "to": [12.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 5]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#1"}, + "east": {"uv": [10, 11, 11, 12], "texture": "#1"}, + "up": {"uv": [1, 5, 2, 6], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [12.5, 0, 3.5], + "to": [13.5, 1, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#1"}, + "east": {"uv": [11, 11, 12, 12], "texture": "#1"}, + "up": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [5.5, -0.001, 3.5], + "to": [10.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 4.1]}, + "faces": { + "up": {"uv": [5, 10, 10, 11], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3.5, -0.001, 3.5], + "to": [4.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 4]}, + "faces": { + "up": {"uv": [12, 9, 13, 10], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [5.5, 0, 2.5], + "to": [10.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 3]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [6.5, 0, 1.5], + "to": [11.5, 1, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]}, + "faces": { + "north": {"uv": [5, 12, 10, 13], "texture": "#1"}, + "east": {"uv": [12, 11, 13, 12], "texture": "#1"}, + "up": {"uv": [5, 3, 10, 4], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [4.5, 0, 1.5], + "to": [6.5, 1, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 2]}, + "faces": { + "north": {"uv": [10, 11, 12, 12], "texture": "#1"}, + "west": {"uv": [9, 12, 10, 13], "texture": "#1"}, + "up": {"uv": [8, 3, 10, 4], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [2.5, 0, 3.5], + "to": [3.5, 1, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 4]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#1"}, + "west": {"uv": [12, 11, 13, 12], "texture": "#1"}, + "up": {"uv": [1, 5, 2, 6], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3.5, 0, 2.5], + "to": [4.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 3]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#1"}, + "west": {"uv": [11, 11, 12, 12], "texture": "#1"}, + "up": {"uv": [12, 10, 13, 11], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [3.5, -0.001, 5.5], + "to": [4.5, 0.999, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 8.1]}, + "faces": { + "up": {"uv": [11, 5, 12, 10], "texture": "#1"} + } + }, + { + "from": [2.5, 0, 5.5], + "to": [3.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 8]}, + "faces": { + "up": {"uv": [12, 5, 13, 10], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [1.5, 0, 6.5], + "to": [2.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 9]}, + "faces": { + "south": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "west": {"uv": [5, 12, 10, 13], "texture": "#1"}, + "up": {"uv": [5, 3, 10, 4], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.5, 0, 4.5], + "to": [2.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 4]}, + "faces": { + "north": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "west": {"uv": [10, 11, 12, 12], "texture": "#1"}, + "up": {"uv": [8, 3, 10, 4], "rotation": 90, "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [38, 0, 0], + "translation": [0, 1.75, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [38, 0, 0], + "translation": [0, 1.75, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [87, -19, 41], + "translation": [0, 4.25, 0] + }, + "firstperson_lefthand": { + "rotation": [87, -19, 41], + "translation": [0, 4.25, 0] + }, + "ground": { + "translation": [0, 7.5, 0] + }, + "gui": { + "rotation": [90, 0, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -8] + } + }, + "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + { + "name": "group", + "origin": [10, 8, 12], + "children": [17, 18, 19, 20, 21, 22, 23, 24, 25] + }, + { + "name": "group", + "origin": [10, 8, 12], + "children": [26, 27, 28, 29, 30, 31, 32] + }, + { + "name": "group", + "origin": [10, 8, 12], + "children": [33, 34, 35, 36, 37, 38, 39] + }, + { + "name": "group", + "origin": [10, 8, 12], + "children": [40, 41, 42, 43] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cfc1f63..0c5420f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -20,9 +20,6 @@ "environment": "*", "entrypoints": { - "main": [ - "eu.midnightdust.visualoverhaul.VisualOverhaul" - ], "client": [ "eu.midnightdust.visualoverhaul.VisualOverhaulClient" ], diff --git a/src/main/resources/visualoverhaul.mixins.json b/src/main/resources/visualoverhaul.mixins.json index 716e32c..dd0bc65 100644 --- a/src/main/resources/visualoverhaul.mixins.json +++ b/src/main/resources/visualoverhaul.mixins.json @@ -5,8 +5,7 @@ "mixins": [ "MixinBrewingStandBlockEntity", "MixinJukeboxBlockEntity", - "MixinAbstractFurnaceBlockEntity", - "MixinServerWorld" + "MixinAbstractFurnaceBlockEntity" ], "client": [ "MixinSoundSystem"