From 4f7ede5d9e03fa1cafbbf78d667cd793b24a06ad Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Thu, 28 Aug 2014 22:47:52 +0200 Subject: [PATCH] add spruce and jungle particles fix additional leaf types not loading --- .../client/resource/LeafParticleTextures.java | 30 +++++++++++------- .../betterfoliage/leafTextureMappings.cfg | 7 ++++ .../textures/blocks/falling_leaf_jungle_0.png | Bin 0 -> 286 bytes .../textures/blocks/falling_leaf_jungle_1.png | Bin 0 -> 265 bytes .../textures/blocks/falling_leaf_jungle_2.png | Bin 0 -> 274 bytes .../textures/blocks/falling_leaf_jungle_3.png | Bin 0 -> 278 bytes .../textures/blocks/falling_leaf_spruce_0.png | Bin 0 -> 255 bytes .../textures/blocks/falling_leaf_spruce_1.png | Bin 0 -> 244 bytes .../textures/blocks/falling_leaf_spruce_2.png | Bin 0 -> 231 bytes .../textures/blocks/falling_leaf_spruce_3.png | Bin 0 -> 236 bytes 10 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/assets/betterfoliage/leafTextureMappings.cfg create mode 100644 src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_0.png create mode 100644 src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_1.png create mode 100644 src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_2.png create mode 100644 src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_3.png create mode 100644 src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_spruce_0.png create mode 100644 src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_spruce_1.png create mode 100644 src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_spruce_2.png create mode 100644 src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_spruce_3.png diff --git a/src/main/java/mods/betterfoliage/client/resource/LeafParticleTextures.java b/src/main/java/mods/betterfoliage/client/resource/LeafParticleTextures.java index 3ce4960..93b5f5c 100644 --- a/src/main/java/mods/betterfoliage/client/resource/LeafParticleTextures.java +++ b/src/main/java/mods/betterfoliage/client/resource/LeafParticleTextures.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.imageio.ImageIO; +import mods.betterfoliage.BetterFoliage; import mods.betterfoliage.client.TextureMatcher; import mods.betterfoliage.client.render.IconSet; import mods.betterfoliage.client.resource.LeafTextureEnumerator.LeafTextureFoundEvent; @@ -40,6 +41,8 @@ public class LeafParticleTextures { /** Default color value */ public int defaultColor = 0x208040; + public int loadedSets; + public LeafParticleTextures(int defaultColor) { this.defaultColor = defaultColor; } @@ -56,16 +59,6 @@ public class LeafParticleTextures { return result == null ? defaultColor : result; } - protected void addAtlasTexture(TextureAtlasSprite icon) { - Integer textureColor = calculateTextureColor(icon); - if (textureColor != null) iconColors.put(icon, textureColor); - - String leafType = leafTypes.put(icon); - if (leafType != null && !iconSets.keySet().contains(leafType)) { - iconSets.put(leafType, new IconSet("betterfoliage", String.format("falling_leaf_%s_%%d", leafType))); - } - } - /** Calculate average color value (in HSB color space) for a texture. * @param icon texture */ @@ -104,6 +97,7 @@ public class LeafParticleTextures { @SubscribeEvent public void handleTextureReload(TextureStitchEvent.Pre event) { if (event.map.getTextureType() != 0) return; + loadedSets = 1; iconSets.clear(); iconColors.clear(); @@ -113,9 +107,23 @@ public class LeafParticleTextures { defaultIcons.registerIcons(event.map); } + @SubscribeEvent + public void endTextureReload(TextureStitchEvent.Post event) { + if (event.map.getTextureType() == 0) BetterFoliage.log.info(String.format("Loaded %d leaf particle sets", loadedSets)); + } + @SubscribeEvent public void handleRegisterTexture(LeafTextureFoundEvent event) { - addAtlasTexture(event.icon); + Integer textureColor = calculateTextureColor(event.icon); + if (textureColor != null) iconColors.put(event.icon, textureColor); + + String leafType = leafTypes.put(event.icon); + if (leafType != null && !iconSets.keySet().contains(leafType)) { + IconSet newSet = new IconSet("betterfoliage", String.format("falling_leaf_%s_%%d", leafType)); + newSet.registerIcons(event.blockTextures); + iconSets.put(leafType, newSet); + loadedSets++; + } } } diff --git a/src/main/resources/assets/betterfoliage/leafTextureMappings.cfg b/src/main/resources/assets/betterfoliage/leafTextureMappings.cfg new file mode 100644 index 0000000..d8d4f00 --- /dev/null +++ b/src/main/resources/assets/betterfoliage/leafTextureMappings.cfg @@ -0,0 +1,7 @@ +// Vanilla +spruce=spruce +jungle=jungle + +// Biomes O' Plenty +loftwood=jungle +fir=spruce \ No newline at end of file diff --git a/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_0.png b/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_0.png new file mode 100644 index 0000000000000000000000000000000000000000..3b3ea399e45e67b5065679f8ed5eec41ca97458a GIT binary patch literal 286 zcmV+(0pb3MP)i-WP zJ}}(4af3lpQj+1-t5*yx2j^=rh?uPfOR%!Cf+f$NKhN;_^JfNAQ&R>e`@|azyLayf zODYTBVbImpWe76Z&7h{H#vmXdz`%0E}0i^0`ZfC1h($07*qoM6N<$f(`L?=>Px# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_1.png b/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_1.png new file mode 100644 index 0000000000000000000000000000000000000000..b44a85f5c00cd2521efc7cb0d48025dd88d348eb GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XR(rZQhE&{2`t$$4J+s{brsSBtRbT%fZs(W$@$;u73k%DE zq+7Rc_2|65zW#sxzdM#~)7QrtW@KdDL=2I`Mm72h0=rAcOD~o47>uQN3t&x(?-cL%sQE{!|A zKi}@`fzzi?fB5-1y{$a|zLAEewz9|q>u;hLe3O!rW^i3#bZB5?uru*mHmxTu4CrhI MPgg&ebxsLQ05QOAod5s; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_2.png b/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_2.png new file mode 100644 index 0000000000000000000000000000000000000000..102025910f97d3e33215c0fe8ecf24f360b5b5d1 GIT binary patch literal 274 zcmV+t0qy>YP)XW{^{{U{Dsm!@$bQ3RlGB<>kfr?(JK!qDOa5FnoHpivegV!;Kp^z={|_ z4mo=C=>Lx&KQg>}^$KjSs;Vjjh!4^XRsaGMCQSIRrl!Wg&(F_bZEej6b0k~=E&vc< Y0CCf5@w){6rvLx|07*qoM6N<$f*=)dfB*mh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_3.png b/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_jungle_3.png new file mode 100644 index 0000000000000000000000000000000000000000..8665fcc4ff1215d86997fc68cef72dc1110f2924 GIT binary patch literal 278 zcmV+x0qOpUP)0Ze);@l!TkW^61V9Mjoxn z|Gxq`N{p|-f*?g+US41}Bgmy70CL=k4v-sEECcgtR^*1oM6t##KZ7RIdrLYSml18V;MYM{an^LB{Ts5 Dbt+}p literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_spruce_1.png b/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_spruce_1.png new file mode 100644 index 0000000000000000000000000000000000000000..7103dcc681850c4beef4fb28c032a98207a52eb3 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xrg^$JhE&{2`t$$4J+s|`rZYFU<=(EZtE*#UWMpK^&CPY& z(De27_5b$u?_>_24qq=}VrnYM#l(nV8 r9tG_U4}X4s{-6C~Ps<)ofdqz%BG>ib-~MU>x{$%s)z4*}Q$iB}^Y&r5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_spruce_2.png b/src/main/resources/assets/betterfoliage/textures/blocks/falling_leaf_spruce_2.png new file mode 100644 index 0000000000000000000000000000000000000000..480f4098f9748dbb7ab303d201e998ca3e1b8d91 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XIz3$+Ln>}1{rUgjp4sjIi_*3A@%_P~+#MG6?_`>1&60|k zxNV!6@+PLV$jF=jx98nWVu*bD?%lbL#HJ-nRGOD9Q#-sec)7!${|f&;KR+*NVqzk( zX6;%@$vzp&Px4E4@8AEwJ}T~S_+8{YtRPa;b}pe%^}0Yw=Z*d}u7mv3FYx{; zY@hPQdzPx+#)OSi