diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 4161697a9..5c68172ca 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -8,12 +8,14 @@ */ package vazkii.botania.client.core.handler; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.Material; import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.tileentity.BannerPattern; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.event.TextureStitchEvent; @@ -28,6 +30,7 @@ import vazkii.botania.client.render.tile.RenderTilePump; import vazkii.botania.common.Botania; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; import java.lang.invoke.MethodHandle; @@ -88,6 +91,12 @@ public class MiscellaneousIcons { Set materials = (Set) MATERIALS.invokeExact(); materials.add(RenderLexicon.TEXTURE); materials.add(RenderLexicon.ELVEN_TEXTURE); + for (BannerPattern pattern : BannerPattern.values()) { + if (pattern.getFileName().startsWith(LibMisc.MOD_ID)) { + materials.add(new Material(Atlases.SHIELD_PATTERNS_ATLAS_TEXTURE, pattern.getSpriteId(false))); + materials.add(new Material(Atlases.BANNER_PATTERNS_ATLAS_TEXTURE, pattern.getSpriteId(true))); + } + } ModelLoader.addSpecialModel(prefix("icon/goldfish")); ModelLoader.addSpecialModel(prefix("icon/phiflower")); ModelLoader.addSpecialModel(prefix("icon/nerfbat")); diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png index 1f4cf8453..b4a227117 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png index 3812b6827..f823c0b64 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_flower.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_flower.png index 3330ed0c2..c29a29972 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_flower.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_flower.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png index 221f20b31..677ca4a33 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_lexicon.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_lexicon.png index 6097bd798..860d515b4 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_lexicon.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_lexicon.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png index 2b5d199c9..18578cae9 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_pickaxe.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_pickaxe.png index e537f9e04..b552c095a 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_pickaxe.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_pickaxe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_sapling.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sapling.png index 03a1fb7aa..b91889b0f 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_sapling.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sapling.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_shovel.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_shovel.png index 9b7efd146..0d7113670 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_shovel.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_shovel.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png index ec37a40ba..c6d28815f 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png index d0f621a01..d9690518f 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png index 465a25e5f..a52ca1e80 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png index 261fe04b3..c58758bb3 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png index 6c05792ab..373fcbd3b 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png index b47774f7a..aeaf7626b 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_axe.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_axe.png index 85ef19f00..4f444e7aa 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_axe.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_axe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_fish.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_fish.png index 29f83163e..2eb895f94 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_fish.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_fish.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_flower.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_flower.png index 6ccb0407e..2af9de8b6 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_flower.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_flower.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_hoe.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_hoe.png index 79d69536f..e80c11802 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_hoe.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_hoe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_lexicon.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_lexicon.png index bf8807dcb..ed34001ba 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_lexicon.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_lexicon.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_logo.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_logo.png index 18ba28291..fcb63f683 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_logo.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_logo.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_pickaxe.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_pickaxe.png index 491e0fcfe..c9c1fffc2 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_pickaxe.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_pickaxe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_sapling.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_sapling.png index 6bdd718cc..d6186ed9d 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_sapling.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_sapling.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_shovel.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_shovel.png index a8e420401..63cb209ce 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_shovel.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_shovel.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dispersive.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dispersive.png index 26b8f1fa4..12a8767da 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dispersive.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dispersive.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dominant.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dominant.png index 7e01ca7b8..f14860ca8 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dominant.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dominant.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_isolated.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_isolated.png index ab6ca3583..7bb0537fb 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_isolated.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_isolated.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_recessive.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_recessive.png index 0526571f3..ea7046209 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_recessive.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_recessive.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_sword.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_sword.png index fd07a2209..8a475db2e 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_sword.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_sword.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_tiny_potato.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_tiny_potato.png index 455de767d..708cee9cc 100644 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/botania_tiny_potato.png and b/src/main/resources/assets/minecraft/textures/entity/shield/botania_tiny_potato.png differ