From 37e57890816d0805864506df87db0fea38a577a3 Mon Sep 17 00:00:00 2001 From: Motschen Date: Thu, 10 Mar 2022 20:59:02 +0100 Subject: [PATCH] VisualOverhaul 4.1.0 - 1.18.2, colored lilypads and improvements Fix #29 Fix #27 Fix #26 Fix #25 Fix #24 --- gradle.properties | 13 ++++++------- .../visualoverhaul/VisualOverhaulClient.java | 15 ++++++++++++--- .../renderer/FurnaceBlockEntityRenderer.java | 2 +- .../visualoverhaul/config/VOConfig.java | 17 +++++++++-------- .../assets/visualoverhaul/lang/en_us.json | 2 ++ .../minecraft/models/item/axolotl_bucket.json | 7 +++++++ .../minecraft/models/item/cod_bucket.json | 7 +++++++ .../models/item/pufferfish_bucket.json | 7 +++++++ .../minecraft/models/item/salmon_bucket.json | 7 +++++++ .../models/item/tropical_fish_bucket.json | 7 +++++++ .../textures/item/axolotl_bucket_overlay.png | Bin 0 -> 5057 bytes .../textures/item/fish_bucket_overlay.png | Bin 0 -> 5105 bytes .../item/pufferfish_bucket_overlay.png | Bin 0 -> 5173 bytes .../textures/item/salmon_bucket_overlay.png | Bin 0 -> 5085 bytes .../minecraft/textures/item/sugar_canee.png | Bin 0 -> 5354 bytes .../item/tropical_fish_bucket_overlay.png | Bin 0 -> 5082 bytes .../coloredwaterbucket/pack.mcmeta | 2 +- .../resourcepacks/nobrewingbottles/pack.mcmeta | 2 +- .../item/button_mushrooms_music_disk.json | 0 .../button_mushrooms_music_disk_round.json | 0 .../models/item/ghost_town_music_disk.json | 0 .../item/ghost_town_music_disk_round.json | 0 .../models/item/swamp_jives_music_disk.json | 0 .../item/swamp_jives_music_disk_round.json | 0 .../models/item/music_disc_ashes.json | 0 .../models/item/music_disc_ashes_round.json | 0 .../models/item/dynamic_disc.json | 0 .../models/item/music_disc_0x10c.json | 0 .../models/item/music_disc_0x10c_round.json | 0 .../item/music_disc_cliffside_hinson.json | 0 .../music_disc_cliffside_hinson_round.json | 0 .../models/item/music_disc_i_jate_my_hob.json | 0 .../item/music_disc_i_jate_my_hob_round.json | 0 .../models/item/music_disc_peanuts.json | 0 .../models/item/music_disc_peanuts_round.json | 0 .../models/item/music_disc_repetition.json | 0 .../item/music_disc_repetition_round.json | 0 ...disc_sometimes_i_make_video_game_music.json | 0 ...ometimes_i_make_video_game_music_round.json | 0 .../minecraft/models/item/music_disc_11.json | 0 .../models/item/music_disc_11_round.json | 0 .../minecraft/models/item/music_disc_13.json | 0 .../models/item/music_disc_13_round.json | 0 .../models/item/music_disc_blocks.json | 0 .../models/item/music_disc_blocks_round.json | 0 .../minecraft/models/item/music_disc_cat.json | 0 .../models/item/music_disc_cat_round.json | 0 .../models/item/music_disc_chirp.json | 0 .../models/item/music_disc_chirp_round.json | 0 .../minecraft/models/item/music_disc_far.json | 0 .../models/item/music_disc_far_round.json | 0 .../minecraft/models/item/music_disc_mall.json | 0 .../models/item/music_disc_mall_round.json | 0 .../models/item/music_disc_mellohi.json | 0 .../models/item/music_disc_mellohi_round.json | 0 .../models/item/music_disc_otherside.json | 15 +++++++++++++++ .../item/music_disc_otherside_round.json | 6 ++++++ .../models/item/music_disc_pigstep.json | 0 .../models/item/music_disc_pigstep_round.json | 0 .../minecraft/models/item/music_disc_stal.json | 0 .../models/item/music_disc_stal_round.json | 0 .../models/item/music_disc_strad.json | 0 .../models/item/music_disc_strad_round.json | 0 .../minecraft/models/item/music_disc_wait.json | 0 .../models/item/music_disc_wait_round.json | 0 .../minecraft/models/item/music_disc_ward.json | 0 .../models/item/music_disc_ward_round.json | 0 .../phonos/models/item/custom_music_disc.json | 0 .../models/item/custom_music_disc_round.json | 0 .../visualoverhaul/models/item/round_disc.json | 0 .../models/item/round_disc_colored_layers.json | 0 .../resourcepacks/rounddiscs/pack.mcmeta | 6 ++++++ .../resourcepacks/rounddiscs/pack.png | Bin 0 -> 4448 bytes 73 files changed, 94 insertions(+), 21 deletions(-) create mode 100755 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/axolotl_bucket.json create mode 100755 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/cod_bucket.json create mode 100755 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/pufferfish_bucket.json create mode 100755 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/salmon_bucket.json create mode 100755 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/models/item/tropical_fish_bucket.json create mode 100644 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/axolotl_bucket_overlay.png create mode 100644 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/fish_bucket_overlay.png create mode 100644 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/pufferfish_bucket_overlay.png create mode 100644 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/salmon_bucket_overlay.png create mode 100644 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/sugar_canee.png create mode 100644 src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/textures/item/tropical_fish_bucket_overlay.png rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/biomemakeover/models/item/button_mushrooms_music_disk.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/biomemakeover/models/item/button_mushrooms_music_disk_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/biomemakeover/models/item/ghost_town_music_disk.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/biomemakeover/models/item/ghost_town_music_disk_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/biomemakeover/models/item/swamp_jives_music_disk.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/biomemakeover/models/item/swamp_jives_music_disk_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/desolation/models/item/music_disc_ashes.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/desolation/models/item/music_disc_ashes_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/dynamic-discs/models/item/dynamic_disc.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_0x10c.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_0x10c_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_cliffside_hinson.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_cliffside_hinson_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_i_jate_my_hob.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_i_jate_my_hob_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_peanuts.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_peanuts_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_repetition.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_repetition_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/extra_discs/models/item/music_disc_sometimes_i_make_video_game_music_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_11.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_11_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_13.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_13_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_blocks.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_blocks_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_cat.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_cat_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_chirp.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_chirp_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_far.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_far_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_mall.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_mall_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_mellohi.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_mellohi_round.json (100%) create mode 100755 src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside.json create mode 100755 src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_otherside_round.json rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_pigstep.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_pigstep_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_stal.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_stal_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_strad.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_strad_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_wait.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_wait_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_ward.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/minecraft/models/item/music_disc_ward_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/phonos/models/item/custom_music_disc.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/phonos/models/item/custom_music_disc_round.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/visualoverhaul/models/item/round_disc.json (100%) rename src/main/resources/{ => resourcepacks/rounddiscs}/assets/visualoverhaul/models/item/round_disc_colored_layers.json (100%) create mode 100755 src/main/resources/resourcepacks/rounddiscs/pack.mcmeta create mode 100644 src/main/resources/resourcepacks/rounddiscs/pack.png 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 0000000000000000000000000000000000000000..b5d63f64019339258dbbcb3162eec08eb598c3a7 GIT binary patch literal 5057 zcmeHKc~lcu7a!S_R0UBHP&C91m&v|=1f^_AAuJ&XXi+A~Bt*zU5=cN00T;ln)CENl z)GF>MR$2uS1VJHnWpkr0Rrx@q2(4H_Iti$FzW(DmU;i`b%*>m2@BQ6(fA_vSc^LtI z-s4aXC;$M)ao8R_3K%vhUBD}>bGde!0dYEqzyA4C8e%U`%w|q9a#0mw(0!Vr!5&TXWX8#Bp+H)K3Y^n zub%L1J{#PNF`TYP8#Jj|5Tc@uL3i#C@2bgs1EY%9uRKPP(lfbJHp-o^#bG-r5`E zBiI!{=**bkq?Y=WF&TX8?Lgk;S15}s3@mVUNp;%Pr_&vLOk{^%*sU~WjVIwBRr>(6 zK$|PYP5V}-1~&w#9v@d)v!G+7yj(Tyk z4m`Y}xmjyXso7;Cn4|Lx&5QW%R^74Vak1h*qC#UgN7Xs!N1v&8-Ef@ojQ=yc@=ai( zrKiurBRtP}!OOz`pzu$eKD3?}CCHJTd}Eta(sD~AyOD5Camp)=(z>gCJydKV8?)i7 z_S%e&+!Q=@XN9h9QbEBvb%}FWecriicWms#AK9V9pC1p9j2(OTn->m__w8HlJM{y& zR^L6s@t$V zmr?z=qo^ez;zYOJSJ9brD$z<3d!|{#bWRkxCfAi*Nx4uH_DIk_x92~*=C@sZk@+CZ zq|^7A)4H&g#eVKd5wbs*ygK9h;C@IE^EFzObEhZQGpl}8HDRY~H79p5k&h+4V^Ubq+W^d@eXG?zVS9P5tUhY@(>+Hi9n|H1#r(LTCSKJU2CIsbAygbRJwwaZfcwuAD z!Y+04mg%z<#EQAr*NG2KrPI<2X<%NDYs~f?v)1+H>huL)*(_3p$GzFCz6mY5zR6*C zuS?AKQ0KT)_bZQ!4p#?N6FeK8f6b2#dsKEg>_kIo$KL*RS!E@~`q-Q*wqSyfwbNp+ zaWFr^$?up~W(K))u1mlBmKC$IeNPhY7`6fHP*=Ot1}nSdzg+rl?Vd>-ARJdRKrmSw zmm+>pa&fDyG~UE)Z_0uboki3&yZvu<$iO(WUb*R%W*N8D6suiRIX9d*%Nup0cM7WF zt$k9^__mAYm!jl~6G^$QfPMS?Skr0KOb&R~Eq|@kY9)%nz0yBkn+{~FbT?|ERY?1H zkRok9l*1^~cikxmH-qhJkM086BD7N)E8A_grLu`nSNE}pA& zha;uz1Qi^V;KvsxL6!YPDD`39C>^a0CW} zfx{DVL?Vc2fa-X;2GW6Y^-KfA5QYb=7OJF5jZ`5=8!#b(B38q~U=TU_{rY4|F82ex zTs_PJ!Us+VDRBfW9w(FGMp~#fo^c4s@Phu)Ld{3MmN*`)R>Z1=uxA`B*UTIVArgMD zSH`NMjp2xdI5--XA*yP`E8!ED-W+bg2MYrQ5~)mSv_i=KL{lRbe)3iT3;0jmn4?m&^1}2xAS)<9M(z2LDWvLMRn6jYEipr&B0G0SJ@m43JC{5J8B7 zB!xsLP+*3LAf~~T5l|etS_8?2umK7I$4U_#7^VpDG&%$_NHiKqCK3rC#1M->5`#iw z&`3f$115}s@K;HZs)V9PuF3!;!DFR@GMPgyP zt6)f@Q1KOtXcoo*fi_qg%Ny-7loYm9jcCLhDt@@;gW#Boh{ zH53PnjE)eyA(1c=l1pG@e-9Vb`+4aiWOYh5C5lf#t}*AT4s7F{Q1`K#oEd0v~S= z+4%c(^GgH*WQ4X!YIPONK+&CU?e0sew z!p^+G90b8ZPHM|Ok;$nwh%*4-c=~yq{5m4_Z{S6zjQ{`u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f52329415b54abd69b7af30c3e8e5169147915eb GIT binary patch literal 5105 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 Am;e9( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ef0b000b907aaa0c06052082e0995d89e789f3be GIT binary patch literal 5354 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 PR`EdJV4uVDS0?`#i4ici literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3388d12f9285f9e3f835046ff043057131a55d47 GIT binary patch literal 5082 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