diff --git a/gradle.properties b/gradle.properties index ae48ad1..9666fc3 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,16 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.18.1 - yarn_mappings=1.18.1+build.5 - loader_version=0.12.12 + minecraft_version=1.18.2 + yarn_mappings=1.18.2+build.2 + loader_version=0.13.3 # Mod Properties - mod_version = 4.0.0 + mod_version = 4.1.0 maven_group = eu.midnightdust archives_base_name = visualoverhaul # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.44.0+1.18 - mod_menu_version = 2.0.0-beta.5 - midnightlib_version=0.3.1 + fabric_version=0.47.10+1.18.2 + midnightlib_version=0.4.0 diff --git a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java index c4184ee..b0b2bde 100755 --- a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java @@ -34,9 +34,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; -import net.minecraft.world.biome.BuiltinBiomes; - -import java.util.logging.LogManager; import static eu.midnightdust.visualoverhaul.VisualOverhaul.*; @@ -128,6 +125,7 @@ public class VisualOverhaulClient implements ClientModInitializer { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul","nobrewingbottles"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED); ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul","fancyfurnace"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED); ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul","coloredwaterbucket"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED); + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("visualoverhaul","rounddiscs"), modContainer, ResourcePackActivationType.ALWAYS_ENABLED); }); @@ -148,6 +146,11 @@ public class VisualOverhaulClient implements ClientModInitializer { grassColor = -8934609; } ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.WATER_BUCKET); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.AXOLOTL_BUCKET); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.COD_BUCKET); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.PUFFERFISH_BUCKET); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.TROPICAL_FISH_BUCKET); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? -1 : waterColor, Items.SALMON_BUCKET); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.GRASS_BLOCK); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.GRASS); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> grassColor, Items.TALL_GRASS); @@ -157,6 +160,9 @@ public class VisualOverhaulClient implements ClientModInitializer { ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.DARK_OAK_LEAVES); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.JUNGLE_LEAVES); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.OAK_LEAVES); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.VINE); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.SUGAR_CANE); + if (VOConfig.coloredLilypad) ColorProviderRegistry.ITEM.register((stack, tintIndex) -> foliageColor, Items.LILY_PAD); ColorProviderRegistry.ITEM.register((stack, tintIndex) -> { if ((PotionUtil.getPotion(stack) == Potions.WATER || PotionUtil.getPotion(stack) == Potions.MUNDANE || PotionUtil.getPotion(stack) == Potions.THICK || PotionUtil.getPotion(stack) == Potions.AWKWARD) && tintIndex == 0) { return waterColor; @@ -177,5 +183,8 @@ public class VisualOverhaulClient implements ClientModInitializer { }, Items.LINGERING_POTION); }); } + if (VOConfig.coloredLilypad) { + ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) -> world != null ? world.getColor(pos, BiomeColors.FOLIAGE_COLOR) : 0, Blocks.LILY_PAD); + } } } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java index c1076a3..308030d 100755 --- a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java @@ -54,7 +54,7 @@ public class FurnaceBlockEntityRenderer im matrices.pop(); } - if (!item2.isEmpty() && !ItemTags.LOGS_THAT_BURN.contains(item2.getItem()) && !ItemTags.PLANKS.contains(item2.getItem())) { + if (!item2.isEmpty() && !item2.isIn(ItemTags.LOGS_THAT_BURN) && !item2.isIn(ItemTags.PLANKS)) { matrices.push(); matrices.translate(0.5f, 0.08f, 0.5f); diff --git a/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java b/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java index 3a4e3cb..5890447 100755 --- a/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/config/VOConfig.java @@ -3,12 +3,13 @@ package eu.midnightdust.visualoverhaul.config; import eu.midnightdust.lib.config.MidnightConfig; public class VOConfig extends MidnightConfig { - @Entry public static boolean brewingstand = true; - @Entry public static boolean jukebox = true; - @Entry public static boolean jukebox_fake_block = true; - @Entry public static boolean furnace = true; - @Entry public static boolean smoker_particles = true; - @Entry public static boolean blast_furnace_particles = true; - @Entry public static boolean coloredItems = true; - @Entry public static boolean potionEnchantmentGlint = true; + @Client @Entry public static boolean brewingstand = true; + @Client @Entry public static boolean jukebox = true; + @Client @Entry public static boolean jukebox_fake_block = true; + @Client @Entry public static boolean furnace = true; + @Client @Entry public static boolean smoker_particles = true; + @Client @Entry public static boolean blast_furnace_particles = true; + @Client @Entry public static boolean coloredItems = true; + @Client @Entry public static boolean coloredLilypad = true; + @Client @Entry public static boolean potionEnchantmentGlint = true; } diff --git a/src/main/resources/assets/visualoverhaul/lang/en_us.json b/src/main/resources/assets/visualoverhaul/lang/en_us.json index 14deba1..484b08c 100755 --- a/src/main/resources/assets/visualoverhaul/lang/en_us.json +++ b/src/main/resources/assets/visualoverhaul/lang/en_us.json @@ -8,5 +8,7 @@ "visualoverhaul.midnightconfig.blast_furnace_particles":"Blast Furnace Particles", "visualoverhaul.midnightconfig.coloredItems":"Biome-based item colors", "visualoverhaul.midnightconfig.coloredItems.tooltip":"§cNeeds restart!", + "visualoverhaul.midnightconfig.coloredLilypad":"Biome-based Lily Pad color", + "visualoverhaul.midnightconfig.coloredLilypad.tooltip":"§cNeeds restart!", "visualoverhaul.midnightconfig.potionEnchantmentGlint":"Potion enchantment glint" } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/axolotl_bucket.json b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/axolotl_bucket.json new file mode 100755 index 0000000..dc28589 --- /dev/null +++ b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/axolotl_bucket.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer1": "item/axolotl_bucket_overlay", + "layer0": "item/axolotl_bucket" + } +} diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/cod_bucket.json b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/cod_bucket.json new file mode 100755 index 0000000..1cc3601 --- /dev/null +++ b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/cod_bucket.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer1": "item/fish_bucket_overlay", + "layer0": "item/cod_bucket" + } +} diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/pufferfish_bucket.json b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/pufferfish_bucket.json new file mode 100755 index 0000000..f263aba --- /dev/null +++ b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/pufferfish_bucket.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer1": "item/pufferfish_bucket_overlay", + "layer0": "item/pufferfish_bucket" + } +} diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/salmon_bucket.json b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/salmon_bucket.json new file mode 100755 index 0000000..442ca96 --- /dev/null +++ b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/salmon_bucket.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer1": "item/fish_bucket_overlay", + "layer0": "item/salmon_bucket" + } +} diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/tropical_fish_bucket.json b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/tropical_fish_bucket.json new file mode 100755 index 0000000..bb8f02c --- /dev/null +++ b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/tropical_fish_bucket.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer1": "item/fish_bucket_overlay", + "layer0": "item/tropical_fish_bucket" + } +} diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/axolotl_bucket_overlay.png b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/axolotl_bucket_overlay.png new file mode 100644 index 0000000..b5d63f6 Binary files /dev/null and b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/axolotl_bucket_overlay.png differ diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/fish_bucket_overlay.png b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/fish_bucket_overlay.png new file mode 100644 index 0000000..f523294 Binary files /dev/null and b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/fish_bucket_overlay.png differ diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/pufferfish_bucket_overlay.png b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/pufferfish_bucket_overlay.png new file mode 100644 index 0000000..a8967e8 Binary files /dev/null and b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/pufferfish_bucket_overlay.png differ diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/salmon_bucket_overlay.png b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/salmon_bucket_overlay.png new file mode 100644 index 0000000..21e9a2f Binary files /dev/null and b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/salmon_bucket_overlay.png differ diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/sugar_canee.png b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/sugar_canee.png new file mode 100644 index 0000000..ef0b000 Binary files /dev/null and b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/sugar_canee.png differ diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/tropical_fish_bucket_overlay.png b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/tropical_fish_bucket_overlay.png new file mode 100644 index 0000000..3388d12 Binary files /dev/null and b/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/tropical_fish_bucket_overlay.png differ diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta b/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta index 08b3e49..f98ff68 100755 --- a/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta +++ b/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 8, - "description": "Makes the water bucket also change it's color based on biome color" + "description": "§2Makes the water bucket respect biome colors" } } diff --git a/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta b/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta index 18c38fa..d130d4b 100755 --- a/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta +++ b/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 8, - "description": "§2Removes the bottles from the brewing stand texture" + "description": "§2Removes the bottles from the brewing stand" } } diff --git a/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk.json b/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk.json similarity index 100% rename from src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk.json rename to src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk.json diff --git a/src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json similarity index 100% rename from src/main/resources/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json diff --git a/src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk.json b/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk.json similarity index 100% rename from src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk.json rename to src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk.json diff --git a/src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk_round.json similarity index 100% rename from src/main/resources/assets/biomemakeover/models/item/ghost_town_music_disk_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/ghost_town_music_disk_round.json diff --git a/src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk.json b/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk.json similarity index 100% rename from src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk.json rename to src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk.json diff --git a/src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json similarity index 100% rename from src/main/resources/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json diff --git a/src/main/resources/assets/desolation/models/item/music_disc_ashes.json b/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes.json similarity index 100% rename from src/main/resources/assets/desolation/models/item/music_disc_ashes.json rename to src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes.json diff --git a/src/main/resources/assets/desolation/models/item/music_disc_ashes_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes_round.json similarity index 100% rename from src/main/resources/assets/desolation/models/item/music_disc_ashes_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/desolation/models/item/music_disc_ashes_round.json diff --git a/src/main/resources/assets/dynamic-discs/models/item/dynamic_disc.json b/src/main/resources/resourcepacks/rounddiscs/assets/dynamic-discs/models/item/dynamic_disc.json similarity index 100% rename from src/main/resources/assets/dynamic-discs/models/item/dynamic_disc.json rename to src/main/resources/resourcepacks/rounddiscs/assets/dynamic-discs/models/item/dynamic_disc.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_0x10c.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_0x10c.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_0x10c_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c_round.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_0x10c_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_0x10c_round.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_peanuts.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_peanuts.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_peanuts_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts_round.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_peanuts_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_peanuts_round.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_repetition.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_repetition.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_repetition_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition_round.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_repetition_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_repetition_round.json diff --git a/src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json b/src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json 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/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json similarity index 100% rename from src/main/resources/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_11.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_11.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_11_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_11_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_11_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_13.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_13.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_13_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_13_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_13_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_blocks.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_blocks.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_blocks_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_blocks_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_blocks_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_cat.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_cat.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_cat_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_cat_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_cat_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_chirp.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_chirp.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_chirp_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_chirp_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_chirp_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_far.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_far.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_far_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_far_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_far_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_mall.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_mall.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_mall_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_mall_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mall_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_mellohi.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_mellohi.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_mellohi_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_mellohi_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_mellohi_round.json diff --git a/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside.json new file mode 100755 index 0000000..df809bf --- /dev/null +++ b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_otherside" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_otherside_round" + } + ] +} diff --git a/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside_round.json new file mode 100755 index 0000000..57302a5 --- /dev/null +++ b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_otherside" + } +} diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_pigstep.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_pigstep.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_pigstep_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_pigstep_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_pigstep_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_stal.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_stal.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_stal_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_stal_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_stal_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_strad.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_strad.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_strad_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_strad_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_strad_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_wait.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_wait.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_wait_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_wait_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_wait_round.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_ward.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_ward.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward.json diff --git a/src/main/resources/assets/minecraft/models/item/music_disc_ward_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward_round.json similarity index 100% rename from src/main/resources/assets/minecraft/models/item/music_disc_ward_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_ward_round.json diff --git a/src/main/resources/assets/phonos/models/item/custom_music_disc.json b/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc.json similarity index 100% rename from src/main/resources/assets/phonos/models/item/custom_music_disc.json rename to src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc.json diff --git a/src/main/resources/assets/phonos/models/item/custom_music_disc_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc_round.json similarity index 100% rename from src/main/resources/assets/phonos/models/item/custom_music_disc_round.json rename to src/main/resources/resourcepacks/rounddiscs/assets/phonos/models/item/custom_music_disc_round.json diff --git a/src/main/resources/assets/visualoverhaul/models/item/round_disc.json b/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc.json similarity index 100% rename from src/main/resources/assets/visualoverhaul/models/item/round_disc.json rename to src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc.json diff --git a/src/main/resources/assets/visualoverhaul/models/item/round_disc_colored_layers.json b/src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc_colored_layers.json similarity index 100% rename from src/main/resources/assets/visualoverhaul/models/item/round_disc_colored_layers.json rename to src/main/resources/resourcepacks/rounddiscs/assets/visualoverhaul/models/item/round_disc_colored_layers.json diff --git a/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta b/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta new file mode 100755 index 0000000..a0c8df3 --- /dev/null +++ b/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 8, + "description": "§2Makes the spinning discs on Jukeboxes round" + } +} diff --git a/src/main/resources/resourcepacks/rounddiscs/pack.png b/src/main/resources/resourcepacks/rounddiscs/pack.png new file mode 100644 index 0000000..3641601 Binary files /dev/null and b/src/main/resources/resourcepacks/rounddiscs/pack.png differ