diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index 225c4083f..7fd80cf85 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -18,10 +18,13 @@ import vazkii.botania.client.lib.LibResources; public final class IconHelper { - public static IIcon forName(IIconRegister ir, String name) { return ir.registerIcon(LibResources.PREFIX_MOD + name); } + + public static IIcon forName(IIconRegister ir, String name, String dir) { + return ir.registerIcon(LibResources.PREFIX_MOD + dir + "/" + name); + } public static IIcon forBlock(IIconRegister ir, Block block) { return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "")); @@ -40,7 +43,7 @@ public final class IconHelper { } public static IIcon forBlock(IIconRegister ir, Block block, String s, String dir) { - return forName(ir, dir + "/" + block.getUnlocalizedName().replaceAll("tile\\.", "") + s); + return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "") + s, dir); } public static IIcon forItem(IIconRegister ir, Item item) { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 6262553af..01249bb6a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -31,6 +31,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibRenderIDs; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; @@ -44,6 +45,8 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab private static final int COUNT = 8; IIcon[] doublePlantTopIcons, doublePlantBottomIcons; + IIcon[] doublePlantTopIconsAlt, doublePlantBottomIconsAlt; + final int offset; public BlockModDoubleFlower(boolean second) { @@ -133,7 +136,8 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab @Override public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - return (func_149887_c(p_149691_2_) ? doublePlantTopIcons : doublePlantBottomIcons)[p_149691_2_ & 7]; + boolean top = func_149887_c(p_149691_2_); + return (ConfigHandler.altFlowerTextures ? (top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt) : (top ? doublePlantTopIcons : doublePlantBottomIcons))[p_149691_2_ & 7]; } @Override @@ -143,17 +147,21 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab if(top) meta = world.getBlockMetadata(x, y - 1, z); - return (top ? doublePlantBottomIcons : doublePlantTopIcons)[meta & 7]; + return (ConfigHandler.altFlowerTextures ? (top ? doublePlantBottomIconsAlt : doublePlantTopIconsAlt) : (top ? doublePlantBottomIcons : doublePlantTopIcons))[meta & 7]; } @Override public void registerBlockIcons(IIconRegister register) { doublePlantTopIcons = new IIcon[COUNT]; doublePlantBottomIcons = new IIcon[COUNT]; + doublePlantTopIconsAlt = new IIcon[COUNT]; + doublePlantBottomIconsAlt = new IIcon[COUNT]; for(int i = 0; i < COUNT; i++) { int off = offset(i); doublePlantTopIcons[i] = IconHelper.forName(register, "flower" + off + "Tall0"); doublePlantBottomIcons[i] = IconHelper.forName(register, "flower" + off + "Tall1"); + doublePlantTopIconsAlt[i] = IconHelper.forName(register, "flower" + off + "Tall0", BlockModFlower.ALT_DIR); + doublePlantBottomIconsAlt[i] = IconHelper.forName(register, "flower" + off + "Tall1", BlockModFlower.ALT_DIR); } } diff --git a/src/main/resources/assets/botania/textures/blocks/alt/agricarnationChibi.png b/src/main/resources/assets/botania/textures/blocks/alt/agricarnationChibi.png index fdec75446..46c3661a7 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/alt/agricarnationChibi.png and b/src/main/resources/assets/botania/textures/blocks/alt/agricarnationChibi.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower0Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower0Tall0.png new file mode 100644 index 000000000..dfe081b9f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower0Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower0Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower0Tall1.png new file mode 100644 index 000000000..c4fcd56da Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower0Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower10Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower10Tall0.png new file mode 100644 index 000000000..f31e5c3a9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower10Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower10Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower10Tall1.png new file mode 100644 index 000000000..d41362074 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower10Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower11Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower11Tall0.png new file mode 100644 index 000000000..4852ea099 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower11Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower11Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower11Tall1.png new file mode 100644 index 000000000..a4e6d1115 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower11Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower12Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower12Tall0.png new file mode 100644 index 000000000..9a7b0b62b Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower12Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower12Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower12Tall1.png new file mode 100644 index 000000000..34fde31a4 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower12Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower13Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower13Tall0.png new file mode 100644 index 000000000..b601e8ee9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower13Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower13Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower13Tall1.png new file mode 100644 index 000000000..995ddd673 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower13Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower14Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower14Tall0.png new file mode 100644 index 000000000..5324fa03e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower14Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower14Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower14Tall1.png new file mode 100644 index 000000000..ce5810d06 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower14Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower15Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower15Tall0.png new file mode 100644 index 000000000..5522d908e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower15Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower15Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower15Tall1.png new file mode 100644 index 000000000..be383c0b2 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower15Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower1Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower1Tall0.png new file mode 100644 index 000000000..067c72131 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower1Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower1Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower1Tall1.png new file mode 100644 index 000000000..43cf84bf8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower1Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower2Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower2Tall0.png new file mode 100644 index 000000000..df610d1e1 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower2Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower2Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower2Tall1.png new file mode 100644 index 000000000..b662dad9e Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower2Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower3Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower3Tall0.png new file mode 100644 index 000000000..5d415dd58 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower3Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower3Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower3Tall1.png new file mode 100644 index 000000000..6d02a573f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower3Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower4Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower4Tall0.png new file mode 100644 index 000000000..5f5541caf Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower4Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower4Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower4Tall1.png new file mode 100644 index 000000000..f5984b06c Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower4Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower5Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower5Tall0.png new file mode 100644 index 000000000..518156047 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower5Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower5Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower5Tall1.png new file mode 100644 index 000000000..40a1a4a0f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower5Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower6Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower6Tall0.png new file mode 100644 index 000000000..5c74e6a78 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower6Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower6Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower6Tall1.png new file mode 100644 index 000000000..a06e54aa3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower6Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower7Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower7Tall0.png new file mode 100644 index 000000000..0347a8b8c Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower7Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower7Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower7Tall1.png new file mode 100644 index 000000000..b6729b83c Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower7Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower8Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower8Tall0.png new file mode 100644 index 000000000..ed5978739 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower8Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower8Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower8Tall1.png new file mode 100644 index 000000000..03e19ac9a Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower8Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower9Tall0.png b/src/main/resources/assets/botania/textures/blocks/alt/flower9Tall0.png new file mode 100644 index 000000000..2d2e0c571 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower9Tall0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower9Tall1.png b/src/main/resources/assets/botania/textures/blocks/alt/flower9Tall1.png new file mode 100644 index 000000000..2eaa17d0f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/flower9Tall1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/rannuncarpusChibi.png b/src/main/resources/assets/botania/textures/blocks/alt/rannuncarpusChibi.png index 36d9794fb..3bc0696c4 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/alt/rannuncarpusChibi.png and b/src/main/resources/assets/botania/textures/blocks/alt/rannuncarpusChibi.png differ