From 6374026c7dfa7281c493f8278747dae787204896 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 23 Nov 2015 00:59:01 +0000 Subject: [PATCH 01/25] Update contributing.md --- contributing.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contributing.md b/contributing.md index 7edd52275..ce03bf13f 100644 --- a/contributing.md +++ b/contributing.md @@ -7,8 +7,7 @@ Hey there. Looks like you want to contribute with an issue. Great. Here's what y * Unless you manually update every mod on the pack to the latest, issues regarding any public modpack that is not officially maintained or supported by the botania developers (the ones in the modpack section of the website are not) are **not accepted**; * Duplicate issues or issues that have been solved already (use the search feature!) will be closed without asking. * Do not tag your issues' names. "Something Broke" is prefered to "[Bug] Something Broke" because there's a proper label system in place. - * Post suggestions or ideas on reddit or the forums. This is for bugs, not ideas. Unless I really like them and want to keep the issue open as a reminder (unlikely), they'll be closed without comment. - * If you ARE going to post a suggestion, which you shouldn't, post ONE, not a wishlist. + * Suggestions are **not** accepted here. Post them on the forums or reddit instead. If there's any still open they're old ones before this rule was added. The following "bugs" are not accepted: * Intended Behaviour From a04dfcb15d591d936bbf17898d6c2c5b6002f4cb Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Mon, 23 Nov 2015 19:08:35 +0000 Subject: [PATCH 02/25] Changed Featherfall fall distance to 2.5f to allow tiara glide to activate, Fixes #1577 --- .../vazkii/botania/common/brew/potion/PotionFeatherfeet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index c9e26d3c1..0a3fff124 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -28,7 +28,7 @@ public class PotionFeatherfeet extends PotionMod { public void onEntityUpdate(LivingUpdateEvent event) { EntityLivingBase e = event.entityLiving; if(hasEffect(e)) - e.fallDistance = 0F; + e.fallDistance = 2.5F; } } From 03f062d7fd7dd4b6d55b7cbb2359540c159632b5 Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Mon, 23 Nov 2015 19:31:54 +0000 Subject: [PATCH 03/25] Add ability for SimpleWikiProvider to put the block name in lowercase (for Witchery) Closes #1573 --- .../java/vazkii/botania/api/BotaniaAPI.java | 2 +- .../botania/api/wiki/SimpleWikiProvider.java | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 8c627f937..d6c42d09f 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -214,7 +214,7 @@ public final class BotaniaAPI { registerModWiki("EnderIO", new SimpleWikiProvider("EnderIO Wiki", "http://wiki.enderio.com/%s")); registerModWiki("TropiCraft", new SimpleWikiProvider("Tropicraft Wiki", "http://wiki.tropicraft.net/wiki/%s")); registerModWiki("RandomThings", new SimpleWikiProvider("Random Things Wiki", "http://randomthingsminecraftmod.wikispaces.com/%s")); - registerModWiki("Witchery", new SimpleWikiProvider("Witchery Wiki", "https://sites.google.com/site/witcherymod/%s", "-")); + registerModWiki("Witchery", new SimpleWikiProvider("Witchery Wiki", "https://sites.google.com/site/witcherymod/%s", "-", true)); registerModWiki("AppliedEnergistics2", new SimpleWikiProvider("AE2 Wiki", "http://ae-mod.info/%s")); registerModWiki("BigReactors", technicWiki); registerModWiki("BuildCraft|Core", buildcraftWiki); diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 9e0fa81ed..bfa418986 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -20,15 +20,28 @@ import org.apache.commons.lang3.text.WordUtils; public class SimpleWikiProvider implements IWikiProvider { final String name, urlBase, replacement; + final boolean lowercase; public SimpleWikiProvider(String name, String urlBase) { this(name, urlBase, "%20"); } + public SimpleWikiProvider(String name, String urlBase, boolean lowercase) { + this(name, urlBase, "%20", lowercase); + } + public SimpleWikiProvider(String name, String urlBase, String replacement) { this.name = name; this.urlBase = urlBase; this.replacement = replacement; + this.lowercase = false; + } + + public SimpleWikiProvider(String name, String urlBase, String replacement, boolean lowercase) { + this.name = name; + this.urlBase = urlBase; + this.replacement = replacement; + this.lowercase = lowercase; } @Override @@ -61,7 +74,12 @@ public class SimpleWikiProvider implements IWikiProvider { String name = getBlockName(world, pos); if(name == null) return null; - return String.format(urlBase, WordUtils.capitalizeFully(name).replaceAll(" ", replacement)); + + if(lowercase) { + return String.format(urlBase, name.toLowerCase().replaceAll(" ", replacement)); + } else { + return String.format(urlBase, WordUtils.capitalizeFully(name).replaceAll(" ", replacement)); + } } @Override From 653d0421279f1e12a6d897b97526f24d8fe0d59e Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Mon, 23 Nov 2015 19:32:03 +0000 Subject: [PATCH 04/25] bump api version --- src/main/java/vazkii/botania/api/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 80735fb05..ce44ed9bf 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "68", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "69", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; From 726878835801acffa438d8e93bbfeea51f146337 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Mon, 23 Nov 2015 17:11:56 -0500 Subject: [PATCH 05/25] make ItemLens combination checking more generic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this will allow ILens instances that aren’t ItemLens to combine with other ILens instances --- .../botania/api/mana/ICompositableLens.java | 32 +++++++++++++++++++ .../crafting/recipe/CompositeLensRecipe.java | 10 +++--- .../botania/common/item/lens/ItemLens.java | 29 +++++++++++++---- 3 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/mana/ICompositableLens.java diff --git a/src/main/java/vazkii/botania/api/mana/ICompositableLens.java b/src/main/java/vazkii/botania/api/mana/ICompositableLens.java new file mode 100644 index 000000000..d073eb89e --- /dev/null +++ b/src/main/java/vazkii/botania/api/mana/ICompositableLens.java @@ -0,0 +1,32 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Nov 23, 2015, 10:30:34 AM (GMT)] + */ +package vazkii.botania.api.mana; + +import net.minecraft.item.ItemStack; + +/** + * Have an Item implement this to be counted as a lens that can be combined with an ItemLens. + */ +public interface ICompositableLens extends ILens { + + /** + * Returns the properties of the itemstack, used to check if two lenses can combine. + */ + public int getProps(ItemStack stack); + + /** + * Checks if the lens is combinable. + */ + public boolean isCombinable(ItemStack stack); + +} + + diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index f4cdadcc7..7fc42916b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -15,7 +15,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import vazkii.botania.api.mana.ILens; +import vazkii.botania.api.mana.ICompositableLens; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; @@ -30,7 +30,7 @@ public class CompositeLensRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { - if(stack.getItem() instanceof ILens && !foundSecondLens) { + if(stack.getItem() instanceof ICompositableLens && !foundSecondLens) { if(foundLens) foundSecondLens = true; else foundLens = true; @@ -51,15 +51,15 @@ public class CompositeLensRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { - if(stack.getItem() instanceof ILens) + if(stack.getItem() instanceof ICompositableLens) if(lens == null) lens = stack; else secondLens = stack; } } - if(lens.getItem() instanceof ILens) { - ILens lensItem = (ILens) lens.getItem(); + if(lens.getItem() instanceof ICompositableLens) { + ICompositableLens lensItem = (ICompositableLens) lens.getItem(); if(secondLens == null || !lensItem.canCombineLenses(lens, secondLens) || lensItem.getCompositeLens(lens) != null || lensItem.getCompositeLens(secondLens) != null) return null; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 5434b4445..5c58ed735 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -28,6 +28,7 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; +import vazkii.botania.api.mana.ICompositableLens; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.api.mana.IManaSpreader; @@ -41,7 +42,7 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.registry.GameRegistry; -public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcempt { +public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { public static final int SUBTYPES = 22; @@ -287,8 +288,10 @@ public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcemp lenses[index] = lens; } - public static boolean isBlacklisted(int lens1, int lens2) { - return (props[lens1] & props[lens2]) != 0; + public static boolean isBlacklisted(ItemStack lens1, ItemStack lens2) { + ICompositableLens item1 = (ICompositableLens) lens1.getItem(); + ICompositableLens item2 = (ICompositableLens) lens2.getItem(); + return (item1.getProps(lens1) & item2.getProps(lens2)) != 0; } public static Lens getLens(int index) { @@ -301,13 +304,15 @@ public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcemp @Override public boolean canCombineLenses(ItemStack sourceLens, ItemStack compositeLens) { - if(sourceLens.getItemDamage() == compositeLens.getItemDamage()) + ICompositableLens sourceItem = (ICompositableLens) sourceLens.getItem(); + ICompositableLens compositeItem = (ICompositableLens) compositeLens.getItem(); + if(sourceItem == compositeItem && sourceLens.getItemDamage() == compositeLens.getItemDamage()) return false; - if(sourceLens.getItemDamage() == NORMAL || compositeLens.getItemDamage() == NORMAL) + if(!sourceItem.isCombinable(sourceLens) || !compositeItem.isCombinable(compositeLens)) return false; - if(isBlacklisted(sourceLens.getItemDamage(), compositeLens.getItemDamage())) + if(isBlacklisted(sourceLens, compositeLens)) return false; return true; @@ -336,7 +341,7 @@ public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcemp @Override public boolean isControlLens(ItemStack stack) { - return (props[stack.getItemDamage()] & PROP_CONTROL) != 0; + return (getProps(stack) & PROP_CONTROL) != 0; } @Override @@ -353,4 +358,14 @@ public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcemp public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) { lenses[stack.getItemDamage()].onControlledSpreaderPulse(stack, spreader, redstone); } + + @Override + public int getProps(ItemStack stack) { + return props[stack.getItemDamage()]; + } + + @Override + public boolean isCombinable(ItemStack stack) { + return stack.getItemDamage() != NORMAL; + } } From 95d0b60521313b23a74b29594303885c7fd565a1 Mon Sep 17 00:00:00 2001 From: wiiv Date: Sat, 21 Nov 2015 23:36:07 +0000 Subject: [PATCH 06/25] New Grass Types = New Mini Islands. --- .../botania/textures/model/miniIslandDry.png | Bin 0 -> 20017 bytes .../botania/textures/model/miniIslandGolden.png | Bin 0 -> 19969 bytes .../textures/model/miniIslandInfused.png | Bin 0 -> 19975 bytes .../textures/model/miniIslandMutated.png | Bin 0 -> 20100 bytes .../textures/model/miniIslandScorched.png | Bin 0 -> 19989 bytes .../botania/textures/model/miniIslandVivid.png | Bin 0 -> 20059 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/model/miniIslandDry.png create mode 100644 src/main/resources/assets/botania/textures/model/miniIslandGolden.png create mode 100644 src/main/resources/assets/botania/textures/model/miniIslandInfused.png create mode 100644 src/main/resources/assets/botania/textures/model/miniIslandMutated.png create mode 100644 src/main/resources/assets/botania/textures/model/miniIslandScorched.png create mode 100644 src/main/resources/assets/botania/textures/model/miniIslandVivid.png diff --git a/src/main/resources/assets/botania/textures/model/miniIslandDry.png b/src/main/resources/assets/botania/textures/model/miniIslandDry.png new file mode 100644 index 0000000000000000000000000000000000000000..b75dbde6329b1f75f3251541897d5d25d3d9831e GIT binary patch literal 20017 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 C0`{f= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/miniIslandGolden.png b/src/main/resources/assets/botania/textures/model/miniIslandGolden.png new file mode 100644 index 0000000000000000000000000000000000000000..74eb540ae92cb7510606538338a07272cd2c4f56 GIT binary patch literal 19969 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 HYv_Lg(XHb^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/miniIslandInfused.png b/src/main/resources/assets/botania/textures/model/miniIslandInfused.png new file mode 100644 index 0000000000000000000000000000000000000000..60efcf6beff2588d50059d68d7541c41f27f012f GIT binary patch literal 19975 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/miniIslandMutated.png b/src/main/resources/assets/botania/textures/model/miniIslandMutated.png new file mode 100644 index 0000000000000000000000000000000000000000..fb243edaaf7992a581abf0b5a1e81aa5afc96b8f GIT binary patch literal 20100 zcmeI4c{tSF`^P^XWlgk5lCqU0V^+hAE&EQkjI@~LGh?z0V=U<*lA=vgc9N2;iBeLL z6s3qtSxQ-wgr_J<_}bVI`p8{8Qz zhMzmbN5k7qs zRUlGH#oA>GIOA|v0hlkpv$NVNrFwITbxX0tKZwce)v9(RNut6rqA!N;0YFBqI5gVf ziJjYmoXykYJU zFB<}^pgeYMvnQqGYyA71~-Y=3?af3fvFO8|RbKe{1vrw(d>GDDyAJNZ5f%F?n zSHlJ8>DLM@Aq&> zviCuryJ%~Su3-(L^7V3lbhRf!?eg6O9av#A= zRla#~%o4cR&M3ob4TZ(ghA73dBY&8mKkeAGxXGl++g`p;H75mQwn9GcPAkQum>+jc zRc2jnWOrKk&2DtJRJZJVSD`f0df(Gy4xLK&ceh(e_K5XhdicOZl)lrcWcz1lPdYAA zkJ)5UaI)0?oZY^&OECV)xcd>y%q_DDGLJu8;V$7mNiKgDD3 z3LUpNzV^733fwU#_e}2dTw$kSr#i=&oUINag(gmDhprsKNAY=1xoI2v9i$v+Ia+7; z<RuB*3YgvpX6L8`JIB6)lL!_}+Tp1muK344O=*nop$D$ak)<~W zs^xlQNu4Y=3as$X9!yNXzBMe}ijn<%$F<(iD?{KDjuT#=vp<+FAn=teP~dA@P`_OJ zmbx!PTN+-|_Rh|5%gyzMS;XVSgqM3_%Nn&$JvKRHB6^U1dvljUm)C8t+o#s@t(9GC zY5m4}FxlR^?2PgmEh{ann)~A2*!DQJ^w>DkiDpm}lk zrZX;srB}TpH{o2e2u_=}l$aEx6|8A4FDTDmlwD>MXOoxSOuJe1uJlf6&LzpBo~L|m zg{5AlAw(KUf_CXv;myIgYjGi0LJm#n@QdtgS(qoiNjlW;0&^*TBmQ}Eed?fI$gPq1 zJ~)lgAlC2{-Br4zPPv+%=8*ExlqNwd^NSdcIuLESyG|`ZS1m>A_Ose+-4?75zFS@f zH+@J;DM_gsINNq^5Iaa8+}D2M9_EB{x(nLx!OdF37j`|3dcr4;BRo3tLv0Oh!)X_L z<>6#_taHJWqDxtUxue7(3Ehvn%oAO@UD_JYQO{kr-P5SNRC}q;_9i2JTV#jfF8L|S zRPa5-RokxJs&NH#Menv6)#ct}LK?x`({d$FO{Ea)?RmZ9%fRry&a_V9 zuALHz@Y*dtJ5JVDjYMWI%TZgbijQA!6=kD&>@R&Wm9xtZu6e&CaLr+%9aYj*G&y)9 zwlV6d;bxUpHt)?;tb>ofjlHVAL*W)WOSPwLk7CY|t5zab&rDYK-;KN7bHh98)rMB{jQp2)S7221tg4uWK?`!Efo^~8@{OpJwYv(oH&!_A$-t`b`(stiC>(HWUaG!HPH?O1<4F?_;#1yKhvmV|0}W zzBS8xE!&PYVfE`_%5%mRY*9mt5bmU6e6&MU3^b$$08Ouhvzq`pxezv)&iC z^(=9|?3{cKzs>6n>y7qg+(X-%^3?L=!m`aCWrM-jF7Bj`_DQ8{)IS@!w&UHhspiM& zIGtzLhJzWSw?;p7EPEEpRGg@$y(0KOJh{wY@Sh zW4N*1bd)bLqG2-jLyV~5{FtPey1gQM`_nabakx%B=0x9@Y{Ldh!`gI-$;`>RLWyPY z(6Pt;PwE>J8&4*@Pl&7V`ZH_dO=Z92xwhL?w^v=i6NE-?9oaZOa3ioiP-7J_1It1G|l7l_SIEtK} zu8?*R9tz+EvWPN4UY_25_#hp*uW|9v=jmd&oXpoMEDs$y{pki}2-X{93>i#NMqN!E zMn<5JG8#BFq&fzNM5@Z55J)r}iGZVUFeDO>(ZD0IGT&ZuxL8R)*NK% z$hosvK6p4hFfdRp5Us{w(%?uO4hKh|;3yOfssZ!c;mslj!My$CXM%i>V+8tb!O`L$~l zG92^-y+Ci4AEZP6R_F8m;s1yHrzU^6|F&UhPOPneFaF+NFR$M=?Z+|>fDn8``ct#t zm41#pd_cH8=*RG9l0oADXejc(8$F9oot>PYB29b#w(npN{cmK`o*CKKr7$x?+R#|> zhD?yiVlW*U3{TyeRW^Hng04?W&U9}IBhXJ-8_r&PcB*Fsfks3Ys0%Gcbr=E(Lt-5f zNW3~4k49~pqo1k7Cbwo#=+qsvawHOlLOP;Qc%%j%jr%5_Q;A&;B@BhgBL1rYbF0k> zK_TO*45k;6rAzlB(m=S6H%%KpTR5lYj}?SBWOy=|P>(=ev^M;A#lKZSchU_rS5jR+ zds71$b7Mm+5{JdYP-@7zVdm8PZ5$&8*?&3}^u5WTA2fk}b0!v=-ml4SK&1U#`rYA4 z*M(+NjY6m35l9k9#8GiDO${^_h5<2D7>TT|0YgwUDMTVwlLY-}!>3am63zDH+Y0(t z{yi8`1H_V%R4PnelZ1jHH8DsS5!ArJ5I7AKnTVy5G|0Gr9E^-ZU_c~Q1BN7#5ik-G z3Z{uhkYNZk5do4(Ac)YU{_|i|BpO5zaWD!(9ojod7!8;vG;|o1sDV=_W06=K8S#&U zQE=)+G>$}qfkYw(hSI>O!*C#069$ryAc{mJt7~e4|2PL>(;h{pUr*i7lqlRS3`aatnNDQj(wH~02q5up`iZuE6Q(4hqZYHFYm zC=eorqo83J;`HDsAP7TINjP;37EMJWv0sz)%38ueE>1ZKh{)SXHo3l@h(1K7A2_|=>&SiI z@P8bkGuiVkhrXU0cp`cFEY&4XZ^s}-8~#)2Y`1=r$PJGzc^%O0{*OEkNo>=_>bWCBL@86;G;FL6bcpz?N=nE z1`LOWvWJAlK*>baq-Y=!7z&OIW%IuW9|c2cIwEm+3<5e+p%d}{1^zVVnTE;kL~j~M z(S?8S$@hZ)ruq73yWPJvU%x!T{CCgSOxFFp>wP~5e%&Rtryo@D&<+cwJn`$!20h*U zQZ~C%X6h5BcS=wHuk~?Q1oVP#G|=mtbgr9S>cUw%*Uc`SRXTaoS-Plit+5r)QB6Nh z&piG)Ko>ty7aAIS5qs?o^dQiaU_^%=+5D#Wc`URGeATc!ek*jD6{4Z;%?jr@z6och zY0mZR>mfB$3SIu7dnf$I#q*c*>&NNxpZqX8qW@%6wpiRo*nn_0xwtss+1 za&d9y!{+7UVgth2u%n_OI+`LKDpxY&SjHo3Ss^I`LHaj^m6Y;tjN=ELUY z;$j2B+2rEl%!kd(#l;4Mv&qH9nGc(ni;E2iXOoMIGaoiD7Z)24&L$TZXFhCRE-p48 zoJ}q+&V1OsTwH8GIGbEtocXYMxwzPXa5lNPIP+oia&fT%;cRkoapuG3<>F!k!rA2F z;>?H5%f-b8gtN&Jm(c82xj}E}``dxg7q#ywON&8Y@|Gc+*;@lZ@EQOJivWO6Q_y=K z0Qe&S;Efvq;1dBrf^l@)EfWBkf6m-U-!Z85ZIXwl1Gv0q*Rw0@A{xC4i(D@G^Xi{k zYElI*coVhYwy~tQQ5?@A^6pq8tAm=+(TS=;(H0v}FM^rF8<15us`E=q^@rs`GzT~{wLRRZy z)uR!$y#Un}p4V?tWM*Tb*bnl;wrYp9Gz;(9RoQrkk67HQoR%7KXM1l-|I0;Q`RBx- z%4Mj+jH>f>x+qk<)1Brk4)W<()VwMUP(3Oi>=nCG(^a&3zI`X@6TwE=dymwIdCNtDtu|^|n5G4g zSVmSG$1A{942#XGtLv0+9r8K#oHx0xl_#_1u#U->kG)n1^brt;yaVO{UZH4s|tkgC1)Kyes?sV z-zeW~Sm_LpFkI?P?Pv8j?*z_mJI|__|4_fDO0G;P{dDy3HvcUz<3v-xeDUx#u$Vf$ z1VKyZEx9l0&qr-l}OtFjXY9HUQ4s(I|UJFjc8qp_xo@(?Mz6t%jBRY z&!QWd3X#V(9eM?g`?NLnZ{E7rD;OoP7C6mY*}TZtX1?ymFcFE-bj240KU9}Jir~6# zm!;DrD)yv}V!7((=JVD*WV?vh!t>14yc|XXKcxz~P7S$B&U=vMF4=2)OAbdlzR6<0 zP~cJLcOg@I&j|+>JHHcY=#H2LD!HXEm`nE?dKTQWX2za7@lwa{`vWl)oGw>B2&cm$NvRq+%=>FQV&mJv_`D<>z8PV#oNI=O=rYpMDq^sE< zElI-F$hv0ct$i#M8*6c2DB*3o+o6w==RXt-f1w9kHCNcX!VFYyK*`hC-mLpEI80CB z^}DA64BD-JAaK8w^NB416=LfPgx)-Vvfc$5D*_U>5=B!cq@9&f*_Bg|k6vyV(EnqV!VBF?yZ8XNLZeKr Ur@AH6|IEYO*v6>Pz-{;c0J-KQqyPW_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/miniIslandScorched.png b/src/main/resources/assets/botania/textures/model/miniIslandScorched.png new file mode 100644 index 0000000000000000000000000000000000000000..7d94a79991b84a45bdcf107e7ad3c993fef26875 GIT binary patch literal 19989 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 Date: Mon, 23 Nov 2015 09:43:58 +0000 Subject: [PATCH 07/25] Uh, all my shinies! --- .../botania/textures/items/unused/baubleBox.png | Bin 0 -> 19783 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/unused/baubleBox.png diff --git a/src/main/resources/assets/botania/textures/items/unused/baubleBox.png b/src/main/resources/assets/botania/textures/items/unused/baubleBox.png new file mode 100644 index 0000000000000000000000000000000000000000..00157f0c57aee29acc5f76586aa1c5b4a4dffd16 GIT binary patch literal 19783 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 literal 0 HcmV?d00001 From 09c7ff79cf596bdcfab1ed6a08a7586c66fc78c5 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:07:55 +0000 Subject: [PATCH 08/25] Fixed raytracing ignoring the player's height. Closes #1584 --- .../vazkii/botania/common/item/equipment/tool/ToolCommons.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 426138020..9c1a31fe6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -137,7 +137,7 @@ public final class ToolCommons { double d0 = player.prevPosX + (player.posX - player.prevPosX) * f; double d1 = player.prevPosY + (player.posY - player.prevPosY) * f; if (!world.isRemote && player instanceof EntityPlayer) - d1 += 1.62D; + d1 += ((EntityPlayer) player).eyeHeight; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f; Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); From 18f558bbbb5d23c80a258f0d9fdfaa9792a97d9f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:11:33 +0000 Subject: [PATCH 09/25] Fixed the Halos not rendering multipassed items properly. Closes #1579 --- src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index dd13df4db..d393f213a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -455,11 +455,11 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } else { GL11.glScalef(0.75F, 0.75F, 0.75F); GL11.glTranslatef(0F, 0F, 0.5F); + GL11.glRotatef(90F, 0F, 1F, 0F); int renderPass = 0; do { IIcon icon = slotStack.getItem().getIcon(slotStack, renderPass); if(icon != null) { - GL11.glRotatef(90F, 0F, 1F, 0F); Color color = new Color(slotStack.getItem().getColorFromItemStack(slotStack, renderPass)); GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); From 458464c6eb6b81a759185cf14d3593b52fb40f92 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:16:20 +0000 Subject: [PATCH 10/25] Fixed multiblock previews rendering in dimensions other than the one they were created in. --- .../client/core/handler/MultiblockRenderHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index f60e46c43..986ce1c0f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -47,11 +47,16 @@ public final class MultiblockRenderHandler { public static MultiblockSet currentMultiblock; public static ChunkCoordinates anchor; public static int angle; + public static int dimension; public static void setMultiblock(MultiblockSet set) { currentMultiblock = set; anchor = null; angle = 0; + + Minecraft mc = Minecraft.getMinecraft(); + if(mc.theWorld != null) + dimension = mc.theWorld.provider.dimensionId; } @SubscribeEvent @@ -73,7 +78,7 @@ public final class MultiblockRenderHandler { } private void renderPlayerLook(EntityPlayer player, MovingObjectPosition src) { - if(currentMultiblock != null) { + if(currentMultiblock != null && dimension == player.worldObj.provider.dimensionId) { int anchorX = anchor != null ? anchor.posX : src.blockX; int anchorY = anchor != null ? anchor.posY : src.blockY; int anchorZ = anchor != null ? anchor.posZ : src.blockZ; From cd4936f6c123eaf41641a7c945fe9f1406c109a4 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:18:34 +0000 Subject: [PATCH 11/25] Fixed botania armor models not resetting the "using a bow" state. Closes #1569 --- .../botania/client/model/armor/ModelArmorElementium.java | 1 + .../vazkii/botania/client/model/armor/ModelArmorManasteel.java | 3 ++- .../vazkii/botania/client/model/armor/ModelArmorManaweave.java | 1 + .../botania/client/model/armor/ModelArmorTerrasteel.java | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 5f6e67bfc..dd5e30f10 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -246,6 +246,7 @@ public class ModelArmorElementium extends ModelBiped { ItemStack itemstack = player.inventory.getCurrentItem(); heldItemRight = itemstack != null ? 1 : 0; + aimedBow = false; if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index c468620ec..aca2b67fc 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -175,12 +175,13 @@ public class ModelArmorManasteel extends ModelBiped { ItemStack itemstack = player.inventory.getCurrentItem(); heldItemRight = itemstack != null ? 1 : 0; + aimedBow = false; if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); if (enumaction == EnumAction.block) heldItemRight = 3; - else if (enumaction == EnumAction.bow) + else if(enumaction == EnumAction.bow) aimedBow = true; } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 62f47c178..657836e3d 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -176,6 +176,7 @@ public class ModelArmorManaweave extends ModelBiped { ItemStack itemstack = player.inventory.getCurrentItem(); heldItemRight = itemstack != null ? 1 : 0; + aimedBow = false; if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 70d840f3e..0215345f0 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -267,6 +267,7 @@ public class ModelArmorTerrasteel extends ModelBiped { ItemStack itemstack = player.inventory.getCurrentItem(); heldItemRight = itemstack != null ? 1 : 0; + aimedBow = false; if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); From 4490f3d8cf98eb4054791edc142111a91361016a Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:29:56 +0000 Subject: [PATCH 12/25] Fixed lexicon bookmarks being weird if you do multiple in the same entry. Closes #1572 --- .../core/handler/PersistentVariableHelper.java | 4 +++- .../botania/client/gui/lexicon/GuiLexicon.java | 14 ++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index e00303637..49c0bd42b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -85,8 +85,10 @@ public final class PersistentVariableHelper { for(int i = 0; i < count; i++) { NBTTagCompound bookmarkCmp = bookmarksCmp.getCompoundTag(TAG_BOOKMARK_PREFIX + i); GuiLexicon gui = GuiLexicon.create(bookmarkCmp); - if(gui != null) + if(gui != null) { GuiLexicon.bookmarks.add(gui); + GuiLexicon.bookmarkKeys.add(gui.getNotesKey()); + } } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index e569972b6..7d50c00ef 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -78,6 +78,7 @@ public class GuiLexicon extends GuiScreen { public static final int NOTES_BUTTON_ID = 1336; // random button tho public static final int MAX_BOOKMARK_COUNT = 8; public static List bookmarks = new ArrayList(); + public static List bookmarkKeys = new ArrayList(); boolean bookmarksNeedPopulation = false; public static Queue tutorial = new ArrayDeque(); @@ -392,19 +393,24 @@ public class GuiLexicon extends GuiScreen { public void handleBookmark(GuiButton par1GuiButton) { boolean modified = false; int i = par1GuiButton.id - BOOKMARK_START; + String key = getNotesKey(); if(i == bookmarks.size()) { - if(!bookmarks.contains(this)) { - bookmarks.add(this); + if(!bookmarkKeys.contains(key)) { + bookmarks.add(this.copy()); + bookmarkKeys.add(key); modified = true; } } else { if(isShiftKeyDown()) { - bookmarks.remove(i); + int index = bookmarkKeys.indexOf(key); + bookmarks.remove(index); + bookmarkKeys.remove(index); + modified = true; } else { GuiLexicon bookmark = bookmarks.get(i).copy(); - Minecraft.getMinecraft().displayGuiScreen(bookmark); if(!bookmark.getTitle().equals(getTitle())) { + Minecraft.getMinecraft().displayGuiScreen(bookmark); if(bookmark instanceof IParented) ((IParented) bookmark).setParent(this); ClientTickHandler.notifyPageChange(); From 1fcdc827415f5be27461ab8a2fb5c2833e9c7391 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:47:28 +0000 Subject: [PATCH 13/25] Weapons created by the Key of the King's Law now despawn properly on death. Also buffed its damage a bit. --- .../vazkii/botania/common/entity/EntityBabylonWeapon.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 94e7768cf..5dd088788 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -65,7 +65,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { @Override public void onUpdate() { EntityLivingBase thrower = getThrower(); - if(!worldObj.isRemote && (thrower == null || !(thrower instanceof EntityPlayer))) { + if(!worldObj.isRemote && (thrower == null || !(thrower instanceof EntityPlayer) || thrower.isDead)) { setDead(); return; } @@ -129,8 +129,8 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { if(living.hurtTime == 0) { if(player != null) - living.attackEntityFrom(DamageSource.causePlayerDamage(player), 14); - else living.attackEntityFrom(DamageSource.generic, 14); + living.attackEntityFrom(DamageSource.causePlayerDamage(player), 20); + else living.attackEntityFrom(DamageSource.generic, 20); onImpact(new MovingObjectPosition(living)); return; } From 064ff829c93eed31012d838efda7428f388f3f11 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:57:50 +0000 Subject: [PATCH 14/25] Fixed items getting destroyed if they're left in a crafting table when the lexicon's Ctrl lookup feature is used. --- .../client/core/handler/TooltipAdditionDisplayHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 56179cc92..6295716df 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -146,6 +146,7 @@ public final class TooltipAdditionDisplayHandler { mc.thePlayer.inventory.currentItem = lexSlot; Botania.proxy.setEntryToOpen(data.entry); Botania.proxy.setLexiconStack(lexiconStack); + mc.thePlayer.closeScreen(); ItemLexicon.openBook(mc.thePlayer, lexiconStack, mc.theWorld, false); } From 6db55e204f38ea1e5f0619ae1f85b8f9b80cc24d Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 22:05:28 +0000 Subject: [PATCH 15/25] Fixed the Gaia Guardian head not breaking properly or having the right drops. --- .../botania/common/block/BlockGaiaHead.java | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 7d209302e..6aebf5e9e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -10,11 +10,21 @@ */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntitySkull; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; @@ -28,6 +38,7 @@ public class BlockGaiaHead extends BlockSkull { public BlockGaiaHead() { setBlockName(LibBlockNames.GAIA_HEAD); + setHardness(1.0F); } @Override @@ -41,12 +52,33 @@ public class BlockGaiaHead extends BlockSkull { public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) { return ModItems.gaiaHead; } - + @Override public void registerBlockIcons(IIconRegister p_149651_1_) { // NO-OP } + + @Override + public ArrayList getDrops(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, int p_149749_6_, int fortune) { + ArrayList ret = new ArrayList(); + + if((p_149749_6_ & 8) == 0) { + ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); + TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); + if(tileentityskull == null) + return ret; + + ret.add(itemstack); + } + return ret; + } + + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + return ModItems.gaiaHead; + } + @Override public int getDamageValue(World p_149643_1_, int p_149643_2_, int p_149643_3_, int p_149643_4_) { return 0; @@ -62,4 +94,9 @@ public class BlockGaiaHead extends BlockSkull { return new TileGaiaHead(); } + @SideOnly(Side.CLIENT) + public IIcon getIcon(int p_149691_1_, int p_149691_2_) { + return Blocks.coal_block.getBlockTextureFromSide(p_149691_1_); + } + } From 903f36ab5cecd4b19fbc9a7e55149d8c7ac7ffec Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 22:33:18 +0000 Subject: [PATCH 16/25] Fixed Mana Bursts' position in the client sometimes going above the block they're inside. --- .../vazkii/botania/common/entity/EntityManaBurst.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 07a5560fb..cb1a75e41 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -49,6 +49,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EntityManaBurst extends EntityThrowable implements IManaBurst { @@ -394,6 +396,13 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } } + @Override + @SideOnly(Side.CLIENT) + public void setPositionAndRotation2(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_) { + setPosition(p_70056_1_, p_70056_3_, p_70056_5_); + setRotation(p_70056_7_, p_70056_8_); + } + @Override public boolean handleWaterMovement() { return false; From 2ced7506c69b38353f32f3b0215f6084cfc936a0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 22:42:27 +0000 Subject: [PATCH 17/25] Added floating flower variants to all the new pasture seed types. --- .../java/vazkii/botania/client/lib/LibResources.java | 6 ++++++ .../botania/common/block/decor/IFloatingFlower.java | 10 ++++++++-- .../vazkii/botania/common/item/ItemGrassSeeds.java | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 3cbc6df06..554f0cf7b 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -114,6 +114,12 @@ public final class LibResources { public static final String MODEL_MINI_ISLAND_PODZOL = PREFIX_MODEL + "miniIslandPodzol.png"; public static final String MODEL_MINI_ISLAND_MYCEL = PREFIX_MODEL + "miniIslandMycelium.png"; public static final String MODEL_MINI_ISLAND_SNOW = PREFIX_MODEL + "miniIslandSnow.png"; + public static final String MODEL_MINI_ISLAND_DRY = PREFIX_MODEL + "miniIslandDry.png"; + public static final String MODEL_MINI_ISLAND_GOLDEN = PREFIX_MODEL + "miniIslandGolden.png"; + public static final String MODEL_MINI_ISLAND_VIVID = PREFIX_MODEL + "miniIslandVivid.png"; + public static final String MODEL_MINI_ISLAND_SCORCHED = PREFIX_MODEL + "miniIslandScorched.png"; + public static final String MODEL_MINI_ISLAND_INFUSED = PREFIX_MODEL + "miniIslandInfused.png"; + public static final String MODEL_MINI_ISLAND_MUTATED = PREFIX_MODEL + "miniIslandMutated.png"; public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "pinkWither.png"; public static final String MODEL_CRYSTAL_CUBE = PREFIX_MODEL + "crystalCube.png"; public static final String MODEL_INCENSE_PLATE = PREFIX_MODEL + "incensePlate.png"; diff --git a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java index e3ec23aa1..5a66a8829 100644 --- a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java @@ -21,12 +21,18 @@ public interface IFloatingFlower { public IslandType getIslandType(); public void setIslandType(IslandType type); - + public static enum IslandType { GRASS(LibResources.MODEL_MINI_ISLAND), PODZOL(LibResources.MODEL_MINI_ISLAND_PODZOL), MYCEL(LibResources.MODEL_MINI_ISLAND_MYCEL), - SNOW(LibResources.MODEL_MINI_ISLAND_SNOW); + SNOW(LibResources.MODEL_MINI_ISLAND_SNOW), + DRY(LibResources.MODEL_MINI_ISLAND_DRY), + GOLDEN(LibResources.MODEL_MINI_ISLAND_GOLDEN), + VIVID(LibResources.MODEL_MINI_ISLAND_VIVID), + SCORCHED(LibResources.MODEL_MINI_ISLAND_SCORCHED), + INFUSED(LibResources.MODEL_MINI_ISLAND_INFUSED), + MUTATED(LibResources.MODEL_MINI_ISLAND_MUTATED); private IslandType(String s) { res = new ResourceLocation(s); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 40ee55673..45627d49b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -44,7 +44,8 @@ public class ItemGrassSeeds extends ItemMod { private static final IslandType[] ISLAND_TYPES = { IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, - null, null, null, null, null, null + IslandType.DRY, IslandType.GOLDEN, IslandType.VIVID, + IslandType.SCORCHED, IslandType.INFUSED, IslandType.MUTATED }; private static final int SUBTYPES = 9; From fa359c10fbba2b24567382f1d49bfd3ebc2a9a69 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 22:44:35 +0000 Subject: [PATCH 18/25] Added Chisel stone support to the Rod of the Terra Firma. --- .../botania/common/item/rod/ItemTerraformRod.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index a097c21b1..8b73dd279 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -52,7 +52,19 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP "snowLayer", "mycelium", "podzol", - "sandstone" + "sandstone", + + // Mod support + "blockDiorite", + "stoneDiorite", + "blockGranite", + "stoneGranite", + "blockAndesite", + "stoneAndesite", + "marble", + "blockMarble", + "limestone", + "blockLimestone" }); public ItemTerraformRod() { From 11ec7a5b6640a5d8925c497c2ccf87f8ed16af7b Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 23:46:57 +0000 Subject: [PATCH 19/25] Planestrider's Sash --- .../botania/client/lib/LibResources.java | 1 + .../common/core/BotaniaCreativeTab.java | 1 + .../common/crafting/ModCraftingRecipes.java | 10 +++ .../vazkii/botania/common/item/ModItems.java | 3 + .../equipment/bauble/ItemSpeedUpBelt.java | 73 ++++++++++++++++++ .../item/equipment/bauble/ItemTravelBelt.java | 26 ++++++- .../botania/common/lexicon/LexiconData.java | 4 + .../botania/common/lib/LibItemNames.java | 1 + .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 7 ++ .../botania/textures/items/speedUpBelt.png | Bin 0 -> 15365 bytes .../botania/textures/model/speedUpBelt.png | Bin 0 -> 18458 bytes 12 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java create mode 100644 src/main/resources/assets/botania/textures/items/speedUpBelt.png create mode 100644 src/main/resources/assets/botania/textures/model/speedUpBelt.png diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 554f0cf7b..66a38d5e6 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -104,6 +104,7 @@ public final class LibResources { public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png"; public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "travelBelt.png"; public static final String MODEL_SUPER_TRAVEL_BELT = PREFIX_MODEL + "superTravelBelt.png"; + public static final String MODEL_SPEED_UP_BELT = PREFIX_MODEL + "speedUpBelt.png"; public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "knockbackBelt.png"; public static final String MODEL_HOLY_CLOAK = PREFIX_MODEL + "holyCloak.png"; public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "unholyCloak.png"; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index b2ac1818d..999859b1b 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -239,6 +239,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.pixieRing); addItem(ModItems.travelBelt); addItem(ModItems.superTravelBelt); + addItem(ModItems.speedUpBelt); addItem(ModItems.knockbackBelt); addItem(ModItems.itemFinder); addItem(ModItems.monocle); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 8a9d85ede..de621711a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -306,6 +306,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeAvatar; public static IRecipe recipeSextant; public static List recipesAltGrassSeeds; + public static IRecipe recipeSpeedUpBelt; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -2063,6 +2064,15 @@ public final class ModCraftingRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 8), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.spider_eye)); recipesAltGrassSeeds = BotaniaAPI.getLatestAddedRecipes(6); + // Planestrider's Sash Recipe + GameRegistry.addRecipe(new ItemStack(ModItems.speedUpBelt), + " M ", "PBP", " S ", + 'M', new ItemStack(Items.filled_map, 1, Short.MAX_VALUE), + 'P', new ItemStack(ModItems.grassSeeds), + 'B', new ItemStack(ModItems.travelBelt), + 'S', new ItemStack(Items.sugar)); + recipeSpeedUpBelt = BotaniaAPI.getLatestAddedRecipe(); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index a1548feaa..3b2820435 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -55,6 +55,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemMiningRing; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.item.equipment.bauble.ItemPixieRing; import vazkii.botania.common.item.equipment.bauble.ItemReachRing; +import vazkii.botania.common.item.equipment.bauble.ItemSpeedUpBelt; import vazkii.botania.common.item.equipment.bauble.ItemSuperLavaPendant; import vazkii.botania.common.item.equipment.bauble.ItemSuperTravelBelt; import vazkii.botania.common.item.equipment.bauble.ItemSwapRing; @@ -266,6 +267,7 @@ public final class ModItems { public static Item autocraftingHalo; public static Item gaiaHead; public static Item sextant; + public static Item speedUpBelt; public static void init() { lexicon = new ItemLexicon(); @@ -414,6 +416,7 @@ public final class ModItems { autocraftingHalo = new ItemAutocraftingHalo(); gaiaHead = new ItemGaiaHead(); sextant = new ItemSextant(); + speedUpBelt = new ItemSpeedUpBelt(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java new file mode 100644 index 000000000..8348d3e43 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java @@ -0,0 +1,73 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [24/11/2015, 22:50:29 (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemSpeedUpBelt extends ItemTravelBelt { + + private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPEED_UP_BELT); + + private static final String TAG_SPEED = "speed"; + private static final String TAG_OLD_X = "oldX"; + private static final String TAG_OLD_Y = "oldY"; + private static final String TAG_OLD_Z = "oldZ"; + + public ItemSpeedUpBelt() { + super(LibItemNames.SPEED_UP_BELT, 0F, 0.2F, 2F); + } + + @Override + public ResourceLocation getRenderTexture() { + return texture; + } + + @Override + public float getSpeed(ItemStack stack) { + return ItemNBTHelper.getFloat(stack, TAG_SPEED, 0F); + } + + @Override + public void onMovedTick(ItemStack stack, EntityPlayer player) { + float speed = getSpeed(stack); + float newspeed = Math.min(0.25F, speed + 0.00035F); + ItemNBTHelper.setFloat(stack, TAG_SPEED, newspeed); + commitPositionAndCompare(stack, player); + } + + @Override + public void onNotMovingTick(ItemStack stack, EntityPlayer player) { + if(!commitPositionAndCompare(stack, player)) + ItemNBTHelper.setFloat(stack, TAG_SPEED, 0F); + } + + public boolean commitPositionAndCompare(ItemStack stack, EntityPlayer player) { + if(player.worldObj.isRemote) + return true; + + double oldX = ItemNBTHelper.getDouble(stack, TAG_OLD_X, 0); + double oldY = ItemNBTHelper.getDouble(stack, TAG_OLD_Y, 0); + double oldZ = ItemNBTHelper.getDouble(stack, TAG_OLD_Z, 0); + + ItemNBTHelper.setDouble(stack, TAG_OLD_X, player.posX); + ItemNBTHelper.setDouble(stack, TAG_OLD_Y, player.posY); + ItemNBTHelper.setDouble(stack, TAG_OLD_Z, player.posZ); + + return Math.abs(oldX - player.posX) > 0.001 || Math.abs(oldY - player.posY) > 0.001 || Math.abs(oldZ - player.posZ) > 0.001; + } + +} + diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 8eb097cbb..339f25f3b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -79,15 +79,21 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); if(playersWithStepup.contains(s)) { if(shouldPlayerHaveStepup(player)) { - if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.water)) - player.moveFlying(0F, 1F, player.capabilities.isFlying ? ((ItemTravelBelt) belt.getItem()).speed : ((ItemTravelBelt) belt.getItem()).speed * 2); + ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem(); + + if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.water)) { + float speed = beltItem.getSpeed(belt); + player.moveFlying(0F, 1F, player.capabilities.isFlying ? speed : speed); + beltItem.onMovedTick(belt, player); + + if(player.ticksExisted % COST_INTERVAL == 0) + ManaItemHandler.requestManaExact(belt, player, COST, true); + } else beltItem.onNotMovingTick(belt, player); if(player.isSneaking()) player.stepHeight = 0.50001F; // Not 0.5F because that is the default else player.stepHeight = 1F; - if(player.ticksExisted % COST_INTERVAL == 0) - ManaItemHandler.requestManaExact(belt, player, COST, true); } else { player.stepHeight = 0.5F; playersWithStepup.remove(s); @@ -98,6 +104,18 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs } } } + + public float getSpeed(ItemStack stack) { + return speed; + } + + public void onMovedTick(ItemStack stack, EntityPlayer player) { + // NO-OP + } + + public void onNotMovingTick(ItemStack stack, EntityPlayer player) { + // NO-OP + } @SubscribeEvent public void onPlayerJump(LivingJumpEvent event) { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 23aa13750..26d58ab1a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -250,6 +250,7 @@ public final class LexiconData { public static LexiconEntry judgementCloaks; public static LexiconEntry monocle; public static LexiconEntry swapRing; + public static LexiconEntry speedUpBelt; public static LexiconEntry alfhomancyIntro; public static LexiconEntry elvenMessage; @@ -951,6 +952,9 @@ public final class LexiconData { swapRing = new BLexiconEntry(LibLexicon.BAUBLE_SWAP_RING, categoryBaubles); swapRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSwapRing)); + speedUpBelt = new BLexiconEntry(LibLexicon.BAUBLE_SPEED_UP_BELT, categoryBaubles); + speedUpBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpeedUpBelt)); + // ALFHOMANCY ENTRIES alfhomancyIntro = new BLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); alfhomancyIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeAlfPortal), new PageCraftingRecipe("3", ModCraftingRecipes.recipeNaturaPylon), new PageMultiblock("4", ModMultiblocks.alfPortal), diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 4b4e2fb54..babdeb8e7 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -159,6 +159,7 @@ public final class LibItemNames { public static final String AUTOCRAFTING_HALO = "autocraftingHalo"; public static final String GAIA_HEAD = "gaiaHead"; public static final String SEXTANT = "sextant"; + public static final String SPEED_UP_BELT = "speedUpBelt"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 219c74dad..64f538048 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -221,6 +221,7 @@ public final class LibLexicon { public static final String BAUBLE_JUDGEMENT_CLOAKS = "judgementCloaks"; public static final String BAUBLE_MONOCLE = "monocle"; public static final String BAUBLE_SWAP_RING = "swapRing"; + public static final String BAUBLE_SPEED_UP_BELT = "speedUpBelt"; public static final String ALF_INTRO = "aIntro"; public static final String ALF_MESSAGE = "elfMessage"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 67bc4286b..4f0bfae46 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1632,6 +1632,7 @@ item.botania:manaweaveLegs.name=Manaweave Robe Bottom item.botania:manaweaveBoots.name=Manaweave Boots item.botania:gaiaHead.name=Gaia Guardian's Head item.botania:sextant.name=Worldshaper's Sextant +item.botania:speedUpBelt.name=Planestrider's Sash # BREW NAMES botania.brew.fallback=Fallback @@ -3518,6 +3519,12 @@ botania.tagline.swapRing=Makes one always use the right tool for the job botania.page.swapRing0=Switching tools is a pain. People often find themselves shoveling away at dirt with... a pick? Using the &1Ring of Correction&0 is a great way to, well, correct that.
While this ring is worn, the tool in hand will always be the right one for the block being broken, be it a pick, axe or shovel. This only works with tools that can use &4Mana&0. botania.page.swapRing1=Use the right tools +# -- PLANESTRIDER'S SASH +botania.entry.speedUpBelt=Planestrider's Sash +botania.tagline.speedUpBelt=Speeds you up the more you walk +botania.page.speedUpBelt0=The &1Planestrider's Sash&0 works as an alternative to the &1Soujourner's Sash&0.
Unlike the aforementioned item, the &1Planestider's Sash&0 will not give the wearer a speed boost by default. However, when they walk, the sash will get more and more charged, enabling the wearer to go much faster than any other sash. Case one would stop, this bonus is reset. +botania.page.speedUpBelt1=If you go slow you're a Planeswalker + # - ALFHOMANCY # -- THE PORTAL TO ALFHEIM botania.entry.aIntro=The Portal to Alfheim diff --git a/src/main/resources/assets/botania/textures/items/speedUpBelt.png b/src/main/resources/assets/botania/textures/items/speedUpBelt.png new file mode 100644 index 0000000000000000000000000000000000000000..2a4b8de020e29ede0302759647f89f4e58d3ee3a GIT binary patch literal 15365 zcmeI3Yiu0V6~|{KLWohoKoeS5iN~8J!U?nU*oQsS-3_+aV4JKPHcsNCfn*+c?ZLY< z+nup@ZPXIA0VhHzB?tisKwn~u>?HUJKxJLg};q67i4%? zlI1D_}r3 zBHqs@U-Qzs7V&Nl#<_T=0}Se2V_C3athY}c8&XBhyEa-E&Py;r8rU+OPp1q^%169~ zxDq^fhFLFNm|_n_ylqZGx<9_2?l7}}4*Eij%7t3!7SYECTUr7w*V6*W2U*U~`Z-4M zO94&_2z2S=jn=`la8^r7iP(*$bkK@;2W>kev1~4v^X2?LGdsZYqA0SQzzPBbXE4^N zVas{OuvQdSBcg^cfr)#FR?9LI0 zpoFxh(&`({05$Ta-ICPtP0Myv zPs;;<%@_k=wmRsVS=mNXhnX_7@QOgxA7*O}yHtg(C3PE?EgLH6jz!^sPuDd`_6HSB z;AAE!D;m?<5)c^0FSaluP}EjI=J`Mf6wt-vZuy+hF;g9O$^(Wjb`s50VfgB0h5W62 zG87aUQAlbG&x0T%i=xV?iUvZhqM#~(D<^UVo0I5ASsgYyIpvz;+=~X235s7xa$1lP zm0*bB)Bs>)O%)kcQ$&BOqG`MsET^auW=^Uu-GbY5)U|El<}I|c4d5rUN6U_sUT8@f zIcou@;3D2~#Z`J(rA0ZKLg7lX>NK;c>eK_!!tAWk>Sa}wC7C{VIWG=DF}_Pae~#QB zFy^VJVwA#!`Sq5Wv~zM6v<<+`aWPe1j5=F}h7Yq&-%siPgEg?^k^gQ5F0P>dvlT#F z(*JJ-s(V)*l#KzPMcMMUEe~AWq7|2Nc0HAAbZ-5Ho&O*S)-K#ka-nAUFgs_gnz=Z? z->JdWaACd}6nQSd@*Mn>q;5AV-GZ08-Keyx+-T@_R48RbhFvP>kFwa*H^65)5Df)` ze%P4T@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC z7oHE|CAbhEc$475^Fh1>7Xk!t5?pvbh?n3(fZ$Dn3(p7f5?lxnyh(83`5<0`3ju;R z2`)Sz#7l4?K=3BPh3A8K2`&T(-Xys2d=M|eg#f{u1Q(tU;w88cAb6AD!t+7A1Q!AX zZxUR1K8Tm#LV(~+f(y?F@e*7J5WGon;rSq5f(rqHHwi90AH+*=AwcjZ!G-68cnK~9 z2;L;P@O%(2!G!?9n^;_R)i*VP0bkF|!S^tm>hC)O-{GXyu0))o##U0)&Rl;==)tgSD9?D6{}T|bt;bN7{j#MRMbH}5*~@v?^I z7n^Q7a(Pqzx*Lur5{V_yMC8v7&^UYH$cctF*q@Eq^fBPTjXMS2g^u`Zvf3bb*zM~%b zSp9*8kNA9hpZn+N&O~(A#=xE{Kblx@aLp$t4*v4&qQ;wcjT?_{J=}A6)6h~FvhIbw z&3|eC>_RBNc9ng}7eno@YBal+ zKe=Lh@#N@TjW-)3t38T*?_u_;Lyx_=UvEqg9Dh=46{DZ-IP?84&o}?^aqj$7=jy*J z6ITy@vtwFsy!GBb^MeomHZisLhrQdTPOMy#JNM-Szk2xG!gaqnb#m*Pg?BvCIozRWnA;=(X($kFY0!8_QsxR-|_Q*0kqNT`v3p{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/speedUpBelt.png b/src/main/resources/assets/botania/textures/model/speedUpBelt.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb3cacd5e3496e13df12006328b084e9cb86f8b GIT binary patch literal 18458 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 Date: Wed, 25 Nov 2015 14:06:31 +0000 Subject: [PATCH 20/25] Extra Glimmer? --- .../textures/blocks/alt/flowerGlimmering0.png | Bin 0 -> 15456 bytes .../textures/blocks/alt/flowerGlimmering1.png | Bin 0 -> 15445 bytes .../textures/blocks/alt/flowerGlimmering10.png | Bin 0 -> 15434 bytes .../textures/blocks/alt/flowerGlimmering11.png | Bin 0 -> 15486 bytes .../textures/blocks/alt/flowerGlimmering12.png | Bin 0 -> 15478 bytes .../textures/blocks/alt/flowerGlimmering13.png | Bin 0 -> 15425 bytes .../textures/blocks/alt/flowerGlimmering14.png | Bin 0 -> 15476 bytes .../textures/blocks/alt/flowerGlimmering15.png | Bin 0 -> 15477 bytes .../textures/blocks/alt/flowerGlimmering2.png | Bin 0 -> 15922 bytes .../textures/blocks/alt/flowerGlimmering3.png | Bin 0 -> 15946 bytes .../textures/blocks/alt/flowerGlimmering4.png | Bin 0 -> 15459 bytes .../textures/blocks/alt/flowerGlimmering5.png | Bin 0 -> 15428 bytes .../textures/blocks/alt/flowerGlimmering6.png | Bin 0 -> 15448 bytes .../textures/blocks/alt/flowerGlimmering7.png | Bin 0 -> 15860 bytes .../textures/blocks/alt/flowerGlimmering8.png | Bin 0 -> 15444 bytes .../textures/blocks/alt/flowerGlimmering9.png | Bin 0 -> 15470 bytes .../textures/blocks/flowerGlimmering0.png | Bin 0 -> 14667 bytes .../textures/blocks/flowerGlimmering1.png | Bin 0 -> 14707 bytes .../textures/blocks/flowerGlimmering10.png | Bin 0 -> 14685 bytes .../textures/blocks/flowerGlimmering11.png | Bin 0 -> 14720 bytes .../textures/blocks/flowerGlimmering12.png | Bin 0 -> 14710 bytes .../textures/blocks/flowerGlimmering13.png | Bin 0 -> 14729 bytes .../textures/blocks/flowerGlimmering14.png | Bin 0 -> 14754 bytes .../textures/blocks/flowerGlimmering15.png | Bin 0 -> 14702 bytes .../textures/blocks/flowerGlimmering2.png | Bin 0 -> 15129 bytes .../textures/blocks/flowerGlimmering3.png | Bin 0 -> 14705 bytes .../textures/blocks/flowerGlimmering4.png | Bin 0 -> 14719 bytes .../textures/blocks/flowerGlimmering5.png | Bin 0 -> 14779 bytes .../textures/blocks/flowerGlimmering6.png | Bin 0 -> 14712 bytes .../textures/blocks/flowerGlimmering7.png | Bin 0 -> 15123 bytes .../textures/blocks/flowerGlimmering8.png | Bin 0 -> 14675 bytes .../textures/blocks/flowerGlimmering9.png | Bin 0 -> 14712 bytes 32 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering0.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering1.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering10.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering11.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering12.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering13.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering14.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering15.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering2.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering3.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering4.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering5.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering6.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering7.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering8.png create mode 100644 src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering9.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering0.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering1.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering10.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering11.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering12.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering13.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering14.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering15.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering2.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering3.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering4.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering5.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering6.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering7.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering8.png create mode 100644 src/main/resources/assets/botania/textures/blocks/flowerGlimmering9.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering0.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering0.png new file mode 100644 index 0000000000000000000000000000000000000000..6a1b6a11da191ccf3a771b5985e37a85f0dd5238 GIT binary patch literal 15456 zcmeI3ZEO@p7{|B4fR<436Y+(3T!CQfc5nA~d$;TLpxhO%hQr#Pp*0rR+nsASz1ux+ zx4mlv0`iHF7;REPh{42!7~)IdgNRm13Th;f7(=jNVj3mlTSTpi7R5Sy?>D^;s3d-w zP1?I>p7}q|%x`9%n=iY!eba_TwfELi6t$==6zqVXOYFZp=fnRGOwGvfCMh-@1Alx zG_~2eSqQtr$pGlnLc=N0IlL*N4EHOd>RjWm^<^X&AOS4dkx9gLQ_3_uvvDQ(-EL-_ zj%*jJzuDPhCvFR^mMp+vLbU zPJb=@=1ZwDsUx^PpAK5h&OXaZN(_@uryJAmMkCeBu%ak3E{@?i8up;gA>EQQv~Jet zf)wHefvKdlq@@|U!;ULQjRC9K>9i9SpZvTM$zmei%(H_OnT(ud*hUvqO{6MCO>!U= z&kjvh7!U^upj#%?u~l`+KEpE1K4XrQMfaSE;hKcQ#oSfLn@ChmZCb5^5J4VkRizmj zN&=<>n8rX#0j+~@D)rT7Z)vg8;#5SkJ#&s7WVAVCwkIdcZiU#(ly!(kVeXbKC z4;!i$8>*BG5f;i>$?eU{%Q~TQcwki7l5ZBEyjxiaRgq#wDj{2bEg|;;CaL%Om{Ma| z&*Bb}0!G|O!4Uz!+s9OEuBr+e%7DFvTXY4O5WHEoAaGf-hjg9XTiIH0#5F%$g+^6V zB~Ii;p5xrKs>DQ^SG^wE>+t|u@p#l2$3hRU_!#?WLQ!cX`IXPN7lO%AS2V_Z1RAPj znvZdSjtX28Ez3s7iThn)%R$?D^0(H;*^wjVe)&7Gt7JyJI|{ zy)LhtRs<2m1TXLQ@=b-%W%5~}A5Cen*30p-J_VZpBt?}lvr>gLd!r0hu3~nhbb_ZU zTT2@yTa}Y?$^>@JX?7NhPO*&Vc0ztXWNVisD|S8iD|Sf$s*kB?Ee)%v^yNBevlsBz z5X_R#og>``^f~HEE=sn;+1T6*ExyGfzT1*}w{k*lAE+k)Se2mc%VTRT1f z8h%Ap{$JqRm~)AhK3VSts-G!r)*SZwS$GlGpj)zRfXMi3CkRLVQ#6)uASM!murQW zT6mvkiWllxHL+N+Zs(WMjBaOCBo;}60KuCC7oHE|CAbhEc$475^Fh1>7Xk!t5?pvb zh?n3(fZ$Dn3(p7f5?lxnyh(83`5<0`3ju;R2`)Sz#7l4?K=3BPh3A8K2`&T(-Xys2 zd=M|eg#f{u1Q(tU;w88cAb6AD!t+7A1Q!AXZxUR1K8Tm#LV(~+f(y?F@e*7J5WGon z;rSq5f(rqHHwi90AH+*=AwcjZ!G-68cnK~92;L;P@O%(2!G!?9n*@HtsktXsG7RAU`r%(d2D34e%eK~&d}rM#?Pik zMnRxTQHt+XIYDNFVFUK$STy*qb_;o{M>66RG z7ktDoj@RgC=o4S{DpX_&l+gdjT-&nWpnZE%ahvfYL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering1.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering1.png new file mode 100644 index 0000000000000000000000000000000000000000..105af66271b67f6c1f0f5027e930a63661a31614 GIT binary patch literal 15445 zcmeI3ZEO@p7{|9(2vlh>hE(x`=K%@6?CslaueV;WlpfeduGaQ|D<72Y?p(X{?smD| za@RtnffhlG(Hf&jLXh}@L;(SlCKAOcn4l6+Vj@)%UlIsl^aBxMVyv^b_d2}}7)bmw zn_lmpdFKB-GryU6cE9Y7j`pYK)XcA;C~8hyYp4@`&$U0ZX2SmuUz?QS*KDJ;+oY)4 z6ZWU-jmK*rqA2NWEfTe&;T4jiCp@yM_W(~OVZh!L6==#BveFMMR}bjbl8x>^jvaTq zG_}#aS`4#cqXqP7twSl$HPjwahWZu1>TU|w1Tqo~kN}qK$|T}RQ_3{DvvDQ(+iqsu zu51^pztP=nCv-)_9j+EV1ze&>q!pIuTt2^t6TN?QJ=2aIWVC5yw#SiWw}P`m0XSEwB?V+lPepV+ z9&~nDM;@W8rNy;)wU$)%wE1X&L3#7zTMCF_yiM%9;IeAGZR1Ob}DqHf+0+e$^mvs3V;@Z@Dvl(#^11eWFoov?f4$(R#h5on zd+QrmT5j<3w2v2LUi1sB=LworC*8k}5@ps;WX zfaXC=phcforhEJiD(&<2cpF%s$ivZQH&nU2IL%z>eD+*un_B~`_6RXAPphKJ(k$l{ zX<3v3E%1V`p5<6pRk(cU68V(S&!jY1>*aV!pFGX~lA=PGDXCgDd!r1NuVQwibb*f(y?F@e*7J5WGon;rSq5f(rqHHwi90AH+*= zAwcjZ!G-68cnK~92;L;P@O%(2!G!?9n*4T@Fo^lP4N{~kc980rr`^yBjX3+@a0vP(%KoOsG&s^HN2Ig z{+fi}mnmw1rKl@w;d`%dQB<8i_Wa4^6jfE-7HW=UCf*%;XI%^T!04G1E1q*bd*5iF z`JQ+otk^fwdUlvTYsBzw9Z#Otaf}H^ezg$w_V-7 zcgNmC)Rv2z#$`?Y@TF@Pwi#osGmWv$cYQghb=&9bKI@zJ;&&s9M%1(GhWGBSHjb=n z-*$SU?bB0Nhu<9UzF*q7Yo~FwY025Z_~Jju=f8U5*Xz6Lex7)L&*rKZW>Wk2yf)gu T^6-fL;&0os_RztlYq$IhqLJE7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering10.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering10.png new file mode 100644 index 0000000000000000000000000000000000000000..441ce5630a49d92c4df9999c88f71c0692b7ae69 GIT binary patch literal 15434 zcmeI3Ym5_B6vxLUuDAjc5D1vCV|ggbbUHJA>`dCi(k|=*UDjnc>+9Ni;jZ0rUx80C0Qn^G>|$j6o7cYBz1 z(D^CWj)0@xPDl?#dgzdm2DHcNVH6k7(LT}1dE6q$EvI=GC$OB07W&G3|Ur6V%cmq>&yyHBOPZsQ50Dh&+>x!pC#P7>>0;}NRHdv*WzvcK zrKt)F5+Dh5%Y-_vt}ZoXScW-dG)P%?H%tuoBoZm-u6w=7WZl%J)iDea6p_|dntdZF z!1e;u$fOm}F$|ZosNU)=Emql_nn<>%;kARD)<9-^3bK4D6n4lD*D8h5K(>r@pJ60| zg(~YQA*4eg`hiWFt{Pc$nV&^xSGKwm2!v$|1Ys$9U=cFBr_be*;Ge)hQl&3ULgW!c z)nX&4oO9c9PAJN&CZTe8U{u+XuNRtejE9pIAFucX)eF~HFIZu;_JXTv;FfEbO(Y_9>82$^8eQT1;xxE8P6a-N^9hWb zhi`)H_A;Uv^)P%?bjgBOjd^%azMyL5m1Pz~m$DZ_+uVGrs=$uvV`7Te!w6ot$h66_ zixI?_DztgjHo%Fc&{gtDp*N&8*z4s))tnN||B|9km`SNRHM>woYIiYTC>z1f+R;j( z6F`ep%RMqkndfRtl0fLsMsw5sD8F)v~pQxrN1yio4kQHhG3Gs zagOW|&>QrXLX`Z3#(L9;Sy?#^+T-x-U8m6%0@f`2i!opTn-FD_1Uttv9)WZ8|wtPc9 zsV9~@)~)4T z@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1>7Xk!t5?pvbh?n3( zfZ$Dn3(p7f5?lxnyotrtQh7ub=@9wfk|3x;g$4d-6z3b*&=zI%P_K79%|^Y$~l_H{O&`YCi}!IOh$ zX9@4D-TV!`ZtuaSrlvhx#-eNbA3o&N`@eei<#Y2E&rZH}Vd?ixvo~Mz|JAzx#G%Vq z-~ZW&zt@~Qwriqw|Caf8Cl0nwTl(xBdrrP9@kjX?Z%ebba!1GZO`Cf>U@Uud@urLM z563^hd~8YVz|P(D$vMpj=C5DaeEN>h#;3aH{IclqGoP&7w&lW?e{*~H?LPNIa^lBW zX!#poAEFNrzp_1}UQ4g*iq8CX?p-Tq4L!JU^@8&wr?#%t*B&`DJ~h{o+xyS?-_`x6 zS@GJR-#&5i>5tTp-wcfPJ%8<7%h@^S``a8Vrcn29cq{gza8Cv@pt?G`!$($a-}5gd C-p~dB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering11.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering11.png new file mode 100644 index 0000000000000000000000000000000000000000..d19d7e1accd59042d444e3d428ab406ac77e65e9 GIT binary patch literal 15486 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering13.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering13.png new file mode 100644 index 0000000000000000000000000000000000000000..1fd5f0cea3e5de57f63d6faac65872e43dce1c28 GIT binary patch literal 15425 zcmeI3ZEO@p7{?biq!db&4^}kDdI*ZRw=Z{lFPrO;(xbKsSDUtm)E&ph*go|)gwJiA}^mENAGTACkhrYNeVyDQQMzwfm_P4nUZDMs2Yt40jC^XUxiO;Mq>`HZZL0E>=+gr>K-&K)}9 zqBXV6wNZ?6(M$(OYF!gq&_B^LpiGP?LDjW3+#JeFFhCkuGM!JSbW_T=xe9S5_}gw~ zU38&~HPYs4w-eHX(O$a4$O2k)i;ThvJnav`6p?C<2@|Tu|kmHdCBXScpqK7 zT;XQ;E0k5^QeULAm=0QPuB2sUB$mzPa_*eRZDbQH9}EUrPGALrfjt;=T({&rqnj(7 zAf-4FU@BQHV`+v?+i~TXF>1BBTy~=JRh(BkQ%4a+c-MuU`Pcf-VRO`_3q?z-bmr|YIRt@UFNK@n+Pr8zL3 z0c;;IjnS+E){nudtf)78ON&<)rzVo^X*hO}*BZ!dk0UE=1!sjqaIR8E7RZ*79Wabk z*x6;hC4_WG2mSa)O;?SaxjMw6y(>#y2?Qdt1;TJEif|J$f;hl&68!TB&sOQ3PKZ2e zs9Jm+mGfSS6C`h-D6i^-%He@gWlO$Ufa-2lAyh?*8`-pMg|)Pt0BlB2gxE@BRnPJc zk~)l(k%c1yVNZyy*IZW>F_ckz3%BbEFd=xeYC+(#6b|V+IZ@kMa-_5{Tm`qPsge-% z2EBsdVN@j^WV~v?&jkE_z$kvd8W(uz@hTzKKAKQe8A);Fi|wUg-Z-!FsxQFAcu{7& zo|uo3Id6>N;{h@55q%0L`|AgDT5AVfO#?Swd)q{#QnzkeGNjQRDNIg-lk*F)c+lff z7*6oR8OGpHWIr5~Cnk#lKc~jjc%ZPMYUPz_7DJb^7em|J0)9b^c{ms=AOI#PcmX5J zF_=UI9-kn`fQJ`Lp{wL`LO-3=V6B%^Reee{|4WKGVdkXj((H{gUb~8gjnWTZsBNum zltNX`$XOHEHK)y0Dmvvd?(Br(ekjx~NmlH79#-s<0Mrm$(^?r;Ss8LVXmc0v))35* zH_nku0=+?9aiSDDG}fC&+{(#W(4K&2?pTRT0s0l%s$ z|1a=u%uZq@DeDQKhS}0)Ej8TQdO53Ddx}bjf9|OZ**9Mao>;hroC6*Z`%u5hT4u*y*sI!jgc*jXriPAhzvoE|d;@-; zrKnMkqW&0$@4dc7QLV<#O~*T7-*erO_JRBl2TttnIoA8Y@xL$L^X*Tktg}0%*_Ic# zU6J1$o}T_a_Q{o|rbz$nsm-h2rXNY}r&leQ9RBC7(9z``?=Y($J0 zd-e@}Ju}(VIvb$ZxGp?#`t;swpLHJb9uhCyKfb1Q(Vy4nw=NpG@4Zv6fBtdL(ha+W z&e6%kD?eSb-}TGE$-`6M@3q_J_nP1B62k3Qte^dB=k+aJc;fO`;QbGd4Scly2G>M= ob8_i(Q@`!oeePxJ?lU9Qj`P#krUJPsICZLfeNSY1-SD=50WFEvZ~y=R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering14.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering14.png new file mode 100644 index 0000000000000000000000000000000000000000..6d94d4440eb4ed81f3533e3dad5d603d527b37b9 GIT binary patch literal 15476 zcmeI3e{2(F7{`x+$VRqcf`^?KKK?VWAMXa^gv(3BZAOqA>0+wEN2E4|y= zZ3-yy4>gK0kf3Oog26MG0q=&Mv(x&>=`_%p%Ha7+BJ=1e{G#?&fqtl=^^f3WFXc?lE8c=9t-} z$R6{0N5C3L_&~4HHk1VGhSqdSLwyo2o148g?z8{{#DFfE(y?e<6Ve`YCawU#8^es* zl$oOUdCV zFaekl(A55<1X>5+QW`3)URNT;%_)myc&5E}kXELV8J?^xQwrG~a>KO>z9bNJHQA}E zQE#@&f_a1{pU<>(y%Lwzl=h^XL1!1Yx)=!fMICryDLP;g(ww8yY8Bw0jonb9&rU+* z0aaEagQ%Rf3s#$8v*+X`lTbN4FtVtNcM4ECtt5mj2@y3J6Lqf=6MF!Yi1)ae;$X?l zLInvvHL51z6#=i!%~Tq$sPd~)zfr<1aS3P;yjHRya9c8mbcNVcKALw#6))Tci>$~3 z$J=>3$JuCEitw~ub~$O6(+OzF>69ZJ3q5wp%@{`$ii%f~+xgshJ{a$GM(i%mMN3>0 z3>JnxL}XnO9d<@IE62%BQ3REPWk<^|xReHNxklLp0z!LS(?v+5-Je;U0vG3W!Ioxa zBQ(!*5!zw3OEesiX`4;7H?a|5Z*nwc3aVUQTxKqGK6@^-!A-I{0PkeOG#9aPw8Lcw zbU5OaX&?bP>?FGkxvP|HmSf~FGfq|as6Ep?;PZoIVAjY^Bk=i-X)<#O4O;S!Z`hmieATL*7u zfw#%wusPfeI*clUN*YAF{0jU@(~RE1!oHl*ppJ^d?&*Xjj+`*NRVBBbnZ}nLg*UbE zewr!VP*3TJg^qPUzZ6$=KcgbCND>4H-Xys2d=M|eg#f{u1Q(tU;w88cAb6AD!t+7A z1Q!AXZxUR1K8Tm#LV(~+f(y?F@e*7J5WGon;rSq5f(rqHHwi90AH+*=AwcjZ!G-68 zcnK~92;L;P@O%(2!G!?9n*(}PZoH_Ta zuz2M4ch8+zwy%9}$JYlh)a-uZ?Impu`SIEL*2M$CMI)}>TdRHXs?@0Gt=|v5^ZCTVZzmt$*F3R$)5yuOH#d1( z8-{C_)&=W7vCBtanHAh}w)MvNL*MWH_3zQi#>vH}8|>FUwqKg~u zpLwKv$ExNn`(~eRaBSQE=|`cqhOwi!>!~BZ438h*b@G<+TyT5q8vlV68(;eu0(|RG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering15.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering15.png new file mode 100644 index 0000000000000000000000000000000000000000..c776e6b9bd6507fc8d55131c48ff84891cd04941 GIT binary patch literal 15477 zcmeI3Z)_7~9LI0rPjm=bqJfABmd+7SuGhQv+TPI?#yaQ>#buk&5hL90o^Hq5UhQ4i zZW19Q5m9(U#+*W8%!s}t=nDuz&=(pImKYNv0Tm@KfIvdXViZN^bN%0E-2(;^-#nLf z?eF&(w%v*G_|CnhEM^>`xKsZ-Rv zFU?QQ{ukywLs8?9H#cYzIbpcx@mVmt}%DXa?kmO!qSh_&B8uwXmpZMHr zQ5BzcBOkJd5>22-4Gtth`@s4Rd7xJo6zfWVtv4gW05M=lmP{-f*Tsy_nvE;M-)1vo zwPd>(y*_KBna~mrwOX3AB(U%{o|f$#YjF!UmUjv)yWGOrSqH<~8BU;CR&=^W)@8|G zR(~!0RuBZn&M_QE!ydHWA2*~79oOq~ zK?-pKK$nwh!ceui#f&R;X(_{JwVH{FSAJZvL@`lZ&$ELRnT(WRSeu=xCQ{_0CXq@; zv$v+m42Xglh#NZ8u~l`69?j779&MVGMfbFc;hcm*#oSfzHx{d!S~r^eAc8#7s!F}1 zKLMCFplhk544V7kQ0l9V-cTc@$*G8BdZxX1kWr_RnVy_1yA*OWv}A{- zMg6%|)>=SlX=<`8-KfSDEv+x}GHCD8RF?vQfMftaT#7tggfz!@*zF?xbFiDr^tn!m zJftaVq#u>DPSNfZIY(Yz)(Mrv4WmegbiV-Q-O55JvKY~lG0E_&F{v9ciFmh{DK(b$ zEUqB2NsDSpct^nR@G{k!tEvK;oHCbiV_XJ01h1D(2%MJeCS5IcSGE=$QPmG;!KSE+ z$O%rt$#D)^ks|`_R6K6l<8}jDcDt1b$3l-&_A=(ygrd@&xKkrv;?w)Q{mw3Zo%z# zz!JoE2?`vXlcyz@!$C_PyW$aKz&X3%;HJn+!_0>+WY32-xw+U#L;-G&R(KB39?l85 z32qk+6i=7SBXNSP2!+sP@+qNTN~*BdOVP4E1)BdQMU^m9QUz6Wq4ZbIVs@dlgV!os zOA94il@n4@2WHLjSqnv{SjKZJA-^87wM&#_v!459vm^k;%T%L#pD8TXLc@d2S8f(7cTr*UPu+E1^WiJP9SfI`l-((;mzmO5 z%AD&THg{e$mF+LM?C^r8G4T@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1>7Xk!t5?pvb zh?n3(fZ$Dn3(p7f5?lxnyotqCTY5zm#Nm6XY4`%_c6!n4@a0vD9Bd0w)IbA8?bu0C zcPHWZuN0NCQ`C(u@V(a&idvxU+x*oUimIt^2{d+OE`7G|lNV<+*1dVHVK~Ykx@a6b z5)N*&$m<-r7br1`nKlewTmn_MOf%w)a=?fg>Z4i<1W? zKX|%koN1Vxy>w#Mch|4%7@M`>-27Fx$h+auT{Rod4gYwwe)W=Hmc2KJ`thoX zgQGv3^d-(W%-;Og*xKOe=@~HI_|fP77+n0dH?_b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering2.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering2.png new file mode 100644 index 0000000000000000000000000000000000000000..19891416df9490b8422dd312ff1cadc7bfa2f561 GIT binary patch literal 15922 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering4.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering4.png new file mode 100644 index 0000000000000000000000000000000000000000..2d2a7994f8d91cebc436d4091f145567e11acbaa GIT binary patch literal 15459 zcmeI3ZEO@p7{`~O1WQ_r5%n39j1fA(v0`+DX--2`ks2iZghG0aGH#sivKj2_> zt;w<46BL4p7TBY=4J6^pfn{Clzy?*;91HwazO;e@#GnP(bSxS-m2{IM6IVgM?PlJ= zX1Z7#njFpcfNXcLgKaUAko7n{oGM5n>y@3N$1RKEGpr_CSRzx2{;CFi_mgu|pL3G)VBGQ{XF!G_{~f^d_U3 zsc9+?qc8^JmWgy?MO~uDune=um|)0)d%}Uyo&gHCI#x47Jxz;pVssO$6R7*$}iXnM1k|M9N$9j;QWOyWrGxO_5}` z?3N@Kr>S9?b88J=uEFbtoa*&zVM#xS`r~J5l<}cQKPFE8z>}t;Iyi zROJLnn$WH}O^$rgDU|VSCgk!VQ@a$P+V$M8+9d&MKEABAIIV)xm+hdB-@rRVFit-4 z7^xl@pP;T}qhvZvtT&CYl>$lF96@LAHia%5uv~#hu6!Eq34Rmw-5vZpJ3V&+zoaVv zFYs;5*@4v_5RX93&*zgh-*9L9mEFbiQK>zWFNX#G(`enUf;=_;GE;k+c1~ z?UNVn&GeV+1$3dOG<4;prEXlhhAb_0?efmEo~)wn1%j& zkH_Wl@pvek@;X=iVFimHYqMLAIwW} zVL-?x#YN_Wc_}Uo2-&2#$b2v_#f1SOn-mwB59Xz~Fd$@;;v)0Gyc8D(gltk=WImXe z;=+KCO^S=m2lG-~7!a~a#8p*%MHR-;d#Ne(0&1JHyAi#-%BpRhL53N4f?+lfG0cry z==%c0^a>1faXotPbvwh%GPbQdyog~YO>Yl0ccp*)WZTD!zv`I1=)mK{v*yi^v|k@~ z?_p~$IeWi7Gwsl>2ifiH;&~P~_4rd?e>Z>V?WJ29UaPHo=(Et&*~4dRs|RCkwOjW; zcPVvg^rxHmpXZm{s@i?Dx^-^HSo5YYpZ#;;je+)=jUNtwv7>eF@Zp+Oqu|=cQ&lIY zr8m789XxXC%$yUC3?HjL{>$dmeXV0V7Bru3d}ZTX`~Dcb`or`$jn1)`_nx>AeczIY z4^H2__r!{sjf>AM;wK;3_uj~!N$!_E-}OCz?9*$^H@{tpj;*zJ4*mZ3j4gFD-nclK z`*~>jaKyFb^7BJSYDeE4TYK}#6(fhQpSy2#=GKF;Db?CvAMIZ9`pEgnnUg)z2mf5Z g*u3-Rv@0@m%{sbnGw+fMDw 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering7.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering7.png new file mode 100644 index 0000000000000000000000000000000000000000..4fdb25f7e9f2f9a1a2374e92117c20969cdb25ef GIT binary patch literal 15860 zcmeI3TWl0n7{^B_C`GPH3@CB4NQA)bT=qJX?bgx-TVYEnH7%GRvomMf3A;1XooRR5 z7(+w_Ni^am(LN{`jfzObm`LISL{v2J;EfPT3-d~TWy|KEA>iUhx=m~HDUikkkB z^SR;qCDU)GsOYfP-D~$IR*ABa_DPD71ioC_guS7!IcG}pCSZG#pik4Aykj36@Om_* z$=ef5unDsj^lNP+8L)Pwqgx)?BnyhSIo24>i7-GK*pergPU)7IYx3sfitxA7%y>Qd zF7~D-Z;Laar#I2*X*Dvy6Z8dXndLc8SnzSdfWUD}Jv__#8IEOmf#x_d5Ei+Rr+9c{ zjqq1Aqo`t6d_{3MXf=8JZQB$XCY#OrvVNbD>0>xS5Ezzcc%FtmXlq!vr5vqW3kpF> zapJ&|Gn#2@hVF6VN=akTZt{Aafyzg5U1_sCkZu*(L5fUHG8xXtGPOjCT-KO_nN)si zip+o%NCVxrppL7lGy4tOu=&%-7G7@KfiyyOJC@O$PEBJx5&2=Kh0 zR%BJ614<-JN5Wx1%i*x1@*MO8In3a!->cGJKu*V#6SgxIcIwghRk$McKR;Nk%54<|!_qrry>3u+nF{PQ5 z8qmr7my>mErLF+xA0^9m3H^WPtB}R&l2@wK<4a`JxlC+mKq*KsoRZ8*WsmZH!7_t@7Fau#urCJnq4aAcCK*$u@*jgfLJIP z^ur4x+KehXwH!$G#x;2VVL64K3l%k}qo#0OJ)z4{6c$qDdPc}!r3$U^2?Rd;Fy*J8 zaTl=i<>h+*sI2IEMnz(gK@cE#li4T@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhE zc$475^Fh1>7Xk!t5?pvbh?n3(fZ$Dn3(p7f5?lxnyh(83`5<0`3ju;R2`)Sz#7l4? zK=3BPh3A8K2`&T(-Xys2d=M|eg#f{u1Q(tU;w88cAb6AD!t+7A1Q!AXZxUR1K8Tm# zLV(~+f(y?F@e*7J5WI=S)mV9-80hdN;w*eyc+XVvAbiu+T$(Vxf8EG+uZmed+R3$9#B>e{5WNV8d$V{ zXx4r2&Y9IPFzfW``3-MQf6CW&t9IllO-qn&5N zliN1zTRod?G)LF$IKO1)XwTORJ4WZ8_~p3`3mZ2My*RaD;7hRY|09dpMPP%G9b*;(M2EeB>|e Cz)dg! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering8.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering8.png new file mode 100644 index 0000000000000000000000000000000000000000..82c3e5b478924d104144b68fe7191d619379c084 GIT binary patch literal 15444 zcmeI3ZEO@p7{`|qP!DK9K?R~-4oxJox3_z{_p;m_Expzjxzd!97L3B)?p(X}?)Kc> za@R%>P@|0@2+_o7!WSjHXpBlUz7TvVCPtwcgb*q|V;^P45N_Bz~Dq zuXoQp^M9V1-^@I_Uv{Lk$c{YloX0*43yWsas>vQW=`2W63;}ZP3E!DQ#ps4yo z)@RZy57p17DDkk`-D~znmW#5Ma7v061iO^gI3VdZ<;BQVbbZeGwpV2dLP63{eH&9F&sz39<(u(G^GrkG#2E7 z6yk(|A?s?&RJEktiYrC6K{M!ZSc!^PeqM=GF;UXUvx5|wjFe(nr;Dj3Qskm0HK@n4 zLsMi1#6bciO#|xKs=8FaW@<*iRwHH6T{AIUlSrhPyXtroiK?j$vt>O*kVjfoX><>z z0Mi8wZBUm%%X&DK1=VJ6s7j-I^8; z<#t(T0inIQ+5TXUnpCv3u`s}(y-Q173IxKE2|{oy3UCwBoY3uZiSW)0+e?v3!%tjOw$vR8B!BcA7E0+z5r8dEbCd^ zL1MEO*K{}{5ON2YYRy$uVND*iws2EY1_lIglr0Ecmh2&2D)m*i794Rk1XsbSsEWw> zc|Xr_Zd#FJewtT&UfSpN0$TQZl^DlD4=)E8>u5qzX(aiT&$kzX`6S7wz=KcoQ2=P( z6$7*s^Z97M$IB~%#Bqx3uO2MdS~=iy8o23N+a?kb+mnVVK^pDh?BrB9IiBSNH~^03 zeLSH3GSAaKmn73MuORR-$pih~?1rk8m!_EyUC5pfZE^FuIj@TaQ5x_bHyx83SEV@UW%9XDbV~cDXN5-kg83!Hp)=tDrPszO7LW5YiXlo zt8z-x4Pe!rprcT9ie)^v6Y~2ZTf0O_w(5CEwn_p}0!&3~X;?*NAlE^ixPaG(V1m4M zj&wgr)~GAFDA^9R^@bKR(~=IF`rz5SMxo0EtW=*g!M6AQPHlszf1QcP$oWzO~Q zwN74qFx%hnals2drNJvNEq9~R)p%*S8nFsWe*s>0Q^gk_GrFt=1?kDb}VmurO&weWeGDLzn7 zsENgjbu)jIW^^;7BC$vk1PI4T@Fu~9=Yx0&E(8eP zB)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1>7Xk!t5?pvbh?n3(fZ$Dn3(p7f5?lxn zyh(83`5<0`3ju;R2`)Sz#7l4?K=3BPh3A8K2`&T(-Xys2d=M|eg#f{u1Q(tU;w88c zAb6AD!t+7A1Q!AXZ(?!TO0TGbBz!M54PQWQy!(zO`0}b;lb&n z^>wH1&q*^6Zho=*`>ESQ&f|N9NB3TyyV2Hu?%D7cBd^bn&N_T>!+1m6*_{pJ^S|5q z$AM{^W?!w}bLF1)x(zLtPh6O^Z`qrTm*?nX2j>1ZJakDqv}M%QxoY9o&UqgnIpex_ zWcHqYjkcFtKbrINk7xC@Bbk>(zWgEMbF~i6UJEb-1bk7oxC!|zV+SUTMZxV{^xhSr|!KoeB{#8 zi$ar6?f-k)M(6o~&9Prv8;)-4`TW@XYahSmWXDtUA6fFPr|tF&ld0uDy>b85#dp4K Qz4zPR(h+`V>AEfd0)UR%qW}N^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering9.png b/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering9.png new file mode 100644 index 0000000000000000000000000000000000000000..4ab4ca361cc8f313a8c9d0cbf4fbb3ada8883f7b GIT binary patch literal 15470 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 GZT}C=d~T`>tHh!<`}NSf86e#ZYS;Cd3U4j zOhmVh9pn7&RumP~sn6XiOv;6EQI)1eItoA(|K>_*~nyzjiH8FuZ&& z+xpw{e80cvxzF=^p5B|=GrVa-NBbS^2%(Ol!Q=?}?DT&Z%qM^EI)6zeA2-;8<1RuA zKlgvzUcGPO5`=o@8>4A2o!Y2qRxYUO)&vd~ayC&T6kAiURc#0MxCuOIm~sBx(NB2J z(Bu4=oDx%ZKb|rMXB@m`X49xPvqOvO{F+32te}ttIqa!iA(u5>r4Z*!c@+}-%>vJr zB;JlV-{%j=rBlOPzvW;~4$1*d3`tyfG$_fdqmtCcg+wVVNTLvm1|&&Y-K|Iwu5$5- zb`r%LJ)?{y*H?xk|Hb(!&$AUl$mjFHd^l)1lY$hDMg=h>ghBzL2)ISlQwsspU0zNy zn(cUYzIsfvQ*KzH)YTAk(d|BNT;#Y70_O6q=cIt?IF-oos1p zx+dT(&SBGYiBD?kv!^W2a;K~oLsq+64ouc0m8y>2biTP<)1h5&U?)LPLE6;mjuve! zj9}NAb~HS&libSkW_RxyncCviW%7Gk&K(zw7B;`9Y%7&Qd4*!+UX^|atDfbIT2?ku zuCn1-gj|0=ch8t%>Q>&pHzqWyYfD{Agp;a=6QmSnQiOq!JSvI``3Z-%0e@N4U{6`P zktsH@OFfD#SL{I4XeS#+S3Q-M0LnlLT~jialT*Efky9tJV4IUMq1FhL)e2Jjt*qsc z8R0}YCNygXu2NMgL#FGgriO=-3DOWW3|;Bgb&YJ`?m$M1$boQVbu`eUs$w7<&FJAC zS?|G8w1h5|g7!J7la@B^?~F=n{R&e9`<&F99fO=|Y8Ghx*g?P*IJua z)mgC_|91h)`GLLl82Kq|w%9@CEG0o}ziVZ@yz1b-Nm34!EnQAn?`X^%6a4c%Yt-W} zx7M%9Y@NDVBU1~q25sED9| z;es@%F~dbg1O*Hiq(O}tE-E4@V7MR+YRqs^5kUdN1!+)YhKq^_3K%X(gBmkjR76m~ za6uZ>nBk%#f&zvM(xAo+7Zni{FkFxZHDIYL5&$MDk3Og zxF8K`%y3Z=K>@=BX;5Q^i;4&e7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCL zT#yDeX1J(`pn&0mG^jDdMMVS!3>Tz9jTtT~A}C4^0r zr#-WK*K@s#zY?!G|L3tIC{>)9ck{fBZ*E)qC+$g_MIH-dNADO{`B`=e#6PJ^qKUL%!=aL heb-O!{kaX@^3d1IdQZK+irgF;8rYP4Z{7B1{{sXg_i+FK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering11.png b/src/main/resources/assets/botania/textures/blocks/flowerGlimmering11.png new file mode 100644 index 0000000000000000000000000000000000000000..1a462860cf37e357ff0ed29066e776e7f68bedf8 GIT binary patch literal 14720 zcmeI3eQXnD9LKLFAXJ&dC`Jr$6bTw^uh+M&M_ZWda0@HUQNyM&aJzfD9kh4H-IaDr zB!FmqNi-uNF=%i^-CxECi9tn!;mw#p#6ZFzyu=t2#kYvWM5Dpy+OGYzYk7j<&*!qO zzdg_Q`+J`IJiq7Z{c|t(tbSsabFPzNm|0z&@m~DdZ2!)fj{h$Bn3(_FQ6c-T@6i{4{1~I0%h=`zo;(|1YF~vnh z1O*fqq(O`+E+Qf*ptv9nVoY%n5kUdP1!)jtii?N{3Mei}gBVj>L_|7(F$Ns)Jd+VypvzAVbYOOPd zr~Ur^m+!3EyL#WMfZbmMn)4mw}17VV|+z-HhoQ2_q;W6 z^jz@Mwx(x4j=g*Oj#KLg&d&Sc$nmYp+C zT3>XVu&E5TIfM-+A`CW}ZgXQWa611YZo@xgf1JMC3%7~jm<*8(+;d5q{E{X&c~?R~bj9ih(I+Hk^7#9xpUBkhq@V-$Px=?qaL6zsH*CWiHyR9C?ru0RS(A9YJa*mrrqgwYw(Q<*1VIUDU8glX zk-_{Rwv4Q);NETIR+iMeds|CZ7N;tc)6;P7IIlIZIXy*Np%jWM6ejm7^_W<;4RhEq zQqf|S4NN2CdV090*K4|JPjLUlWiO&rRXO`==S=D1wkS|KJNzLFN$jH zaYNOT6LsufVh@$guQ4@ps>vy!ac2LZL)1w#W2ipOBDFXH zYLrxJ;oKU+TdP~AJ5pNV{K?3sg`M3MaZPWp@_|)8j~q{7mrAnYoLo`GDSoVm`Ks2+ zw93wsP5ZwKSj-RXjmOB1W4*x+DrPAN8v89HY3F1UcaM>Bpls=4!fHot<}mM^?ArV@o0xK&B)Y$ctfqMq6d%qCVlQWGY+GhXMk*$oCt$N>`P$}M$AFf{sYFa8yVi1QQ4Ewk zwHnBk%#f&zvM(xAo+7Zni{FkFxZHDIYL5&$MDk3OgxF8K`%y3Z=K>@=BX;5Q^i;4&e7%oVI8Z%r}L{PwRK^oMU;i4jf z0)`9HpvDXr6%iCLT#yDeX1J(`pn&0mG^jDdMMVS!3>Tz9jTtT~A}C*S5T9C>w5 z{IY8?dF_u=`Uc|&O)f>~r5y;}y+=O(KqxC9bYl}j(mMz}Y3$i}b_LPi=#O;|=dT{x zb3{KSwDs<9dqbF)y>NZmP}hmQa~|Ij{ETbfb#V6&`Y(@2~mxG>T>quSp#K{gJkJPi{W@Mf7s>zgLd$IkR|b!>1e8 zs@ESobMlz4@7Fia-bVA^dS>s1w{Il})Y%J~6Nf(>Ts$?u^`oWz3(bW4?h}_<&&Qhj z7yfnk_~}^p=eb}k_jlmZ<{x*yIJI%r&zIIsyeI6NJN4D>J6%XUw&>2R?`~hd*Yw+} zUoM`S>`F@Q-is?c4+Kx_YT7!_IC1Uz!TCo=u07wLX-DT?{>S`e`8Tu3U8DZq)v=G4 HZ+hiFDFFyv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering13.png b/src/main/resources/assets/botania/textures/blocks/flowerGlimmering13.png new file mode 100644 index 0000000000000000000000000000000000000000..c7b43ee328cb65ffd87c77b97d06e9dbb2370270 GIT binary patch literal 14729 zcmeI3e{2(F7{}j5L0K}?1cQ-?mx98g?e(s7qi0vZc65z&F584L1MGJ9ZaZo3j^2%S z69xHUA|}Q-mKcFVq9HLV36Uix%!nXy5fXzxFu`C98Wcs4phlvI@3md~tZR9L;m`N7 ztyp_*7zq?LT$>HOY4mHfT`@->-!Of#ESS_n=5 z*!is*erWnEgceTK+B@uy_%cZ`k{($#y0IsdG>ICa;G&EvD{HaMb>m)5Z*W~a_@Rr_ z)CSiIf7}~4!?;gt8cgA~!RB^laIF$hU5i51!Hh%_B(W`XnPft@q)dY=n^z*S)6BcL zti)d1;9BAg$aTb9xUiAJoZsVjD_&9H>H{9ZzaSt84|Aed@bQ9|7XxlVkQUTSLLHaC zT%l?b1ygE|)EZfuACCOj;Oet&Q{wq_I_*jOJVvUQ7XpC*?-hAbbQ6W!8qjSy&N+GIZlm9BaJig;3RnKVl4fBb-O95g6#0y7@`A_9mouqK!DIHP z64|M#3Xc;wiFMl|KB277>@#e`>N6?~S?I1fFjfCRawh8LM|NU=C9Cn)ks^lLB3R7To5+R27dWm~2tfHIImRiqvxm6Yv}mXv!jZ|c24zSszqg$k0w zM#4yu8R3vG$d_vdu549FG2OCdUBR(Ph%|UKO_dhbi~eq(x6bWbC}MX&T!7uO-0gF# ze(b9gknkQb|^vlPjb+#gEk> zKcTfat%5Ue)Bf)Q=JEr3kflJc;myN0Et(TqysW92D>9CMSmJ*dUMw zHDIYL5&$MDk3OgxF8K`%y3Z=K>@=BX;5Q^i;4&e7%oVI z8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCLT#yDeX1J(`pn&0mG^jDdMMVS!3>Tz9 zjTtT~A}C8Ps4>GuMFa&57o;;l z=u4AV_n!RfOM|@j$0<#%afAjRKxoqzgsxm8pXU(j_agLj7edmj2+cHJS#xwL(O!*3 zmb7P19T?jG)DiED#%&)Q8|yO1W@e6mH?n87*!TPLPu{rHdZM;%{tvetuwy?()$=De zKC*kR8ui2?8=Gf(-dsL+_iwMi6TfouxnC}9KXTXEGqV>}gxR&BYjcIPg0$EP!%-TLdE2ajt)WS(c|uCMPna`wP$2`(X4 zy?^NJwvkm&_wKJ>cX`v{?!}4bw~t;p;eWnS-@4}NlzID>ee}iOFC9d~wWEJ!p4lr- f8CexQy`cupesB9wC;B`|K%iJ-b7bG6U7P;{hY}gd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering14.png b/src/main/resources/assets/botania/textures/blocks/flowerGlimmering14.png new file mode 100644 index 0000000000000000000000000000000000000000..328f36d15c782cd6636b159fa3be394e199e038c GIT binary patch literal 14754 zcmeI3eQXnD9LEna3yk-W09q1`1BnLP>s{B49&NYMZfF?hN&~>6W1wGA1I(opA2PHe z2bgYe)E(8sAfdDl8=!M|ZI?7WAo*mbF<9%*2rxkkSR$QCB~??%1ek1I0mgPS%g|Yg zH4tDz_JDLxw4DxX2B5tzuTygK9Npk^ao#!~$K6l!ZqCDUZkG2sIZmi+5V(3ee=xyX z82Jr3E_6g%^25RZ0!+fPbb)2l>9i~DacM?B%lUjh*3Gj#?}Q4cIiy-*#;Kaia!Drg zM1Uz7if$>IO51tGm^Nqy7{(r`aOCeRr56TL%{)6uk}`tAsw(C zz|;l}2{dnjx3a9#-CIh$I5{Pm?4GLE4l+s=o86PMWlJG9LwdAMH0pA(hYqnfP5 zhbq{4Pu`0t%Dr&4$f70Q)QxHozbpxH%}9w>P)UjXfYsH0KU-`>l!e+6!dg-@;N^gz z$In)3MqJr?653SL5>*MbMS`%wr6{r>xxK*Gz{Q+=+`~J)tLlI=7H^Q9Kmu~CAtnPU z?#n`pMp65u)DcY@wAVyFwS0@I5&NXnj~EKv&%`96v9JDChp3Qd(on6639E1jsZLm< z*&VABJXP8{(UDZLJC80JCa~94fSFiWg{`Wv6WN~Z`V>UT-m`*|UG_lsvn8#?%PKhY zHs$|LU@kvmuRcaP0n{pMCzmBFsO~qlxRn+S5bB5JfLYABgr$!1%zoD1*^^2s{#>%Cr&*Uy$Wmpj^(3`q7w6u4?lyB4|nyr;aQ zqH$d{BhryK=B5hysm{)1t`$BAz-JJ)@DNfu$%XR2%|Y>wZgXNZ9T^0rfsF|+EFx4u zaG^A?F~NmJgbD~Qlm<2?xUh&&0l|gRz{Ug@77;2SxKJ9{nBc-9LIngDN&_1cTv$Y? zfZ#%DU}J&{iwG4ETqq4}OmJZlp#p*nrGbqJE-WHcKyaZnura}fMT80nE|dl~Cb+PO zPyxY((!j<97ZwpJAh=K(*qGqLB0>cO7fJ&g6I@tCsDR)?X<%c53yTO95L_q?Y)o)r z5upNt3#EaL2`(%mR6uZ{G_Wzjg++u42riTcHYT{Rh)@B+h0?&rH^o(3e60_t@Lj$% zd}*(4{_^ASg+E$q?TAv;@I4f@Wh+Hp8;9p#DQeJ7Q5X6sN*JZ6h1%{X$66?A%Hp<2 zs4H{sz^>H~jx{aX_IXXm^0B#J9pC=-p69l$Ty$`h(L;{wFI|XFIlG;n*YW%UX8*MH zZyxyc4t1daJpbZ1GhhB>v%f<8}A=mV68vhc-P6Jp54!m^lcrT6}t%f z=mh=GzkfD4MmEmdhuGv9xV(GcJIyVQ5ht%*IlK9bCVgdS>*!I? z>==PxQ%|32ubX@Fvz_&hRgtNuzy0WkIZ)x+^?^qZ|32gV#y1{{rE2T%xW4AvokxzG z3$%1U_Uhq1IYCN=O`s?41%FNRn{a43&S1g|YLR-yuOW#}l z;}c6}Ui^&*tz2l%-#=;6ksYDO4_Z5WSDd=k{>xuWzq~|k+57gP!@m7z?6)Y}n%73& ITGRK;f80?cF#rGn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering15.png b/src/main/resources/assets/botania/textures/blocks/flowerGlimmering15.png new file mode 100644 index 0000000000000000000000000000000000000000..510cb9b662e89cbb98d532d11e81c2b9f3dcb474 GIT binary patch literal 14702 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 F=6_haD2V_7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering5.png b/src/main/resources/assets/botania/textures/blocks/flowerGlimmering5.png new file mode 100644 index 0000000000000000000000000000000000000000..db9b107af598e45d2eac58df66b2f5b30431ffa1 GIT binary patch literal 14779 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 L2NFj%Y~S-Y9{F`f literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering8.png b/src/main/resources/assets/botania/textures/blocks/flowerGlimmering8.png new file mode 100644 index 0000000000000000000000000000000000000000..56601237ab05f12764734a2f2ae377a384aa20e5 GIT binary patch literal 14675 zcmeI3Uu+ab9LI;4R6J<|k%WRqmn9|`xZB(N)8p2=gVHOs%GIWna3zXtcjwxbyWM4X z%Ux??6i9%?L?AJ#Mo|-eP)WmsB>qVx{z2n|K_5_Kv@Zq{c=17r8bfe)_j>oc>m3se zkF#lezs`KWznT5aZ|3%8j}H%R?+mO7AcQ&x2eKpNbGiGww1fP8=#QH+`MAd%7_$-T z`qKSf^74kR`w`mIp^fI9d~S!N7^RS`8sj)rDVao#P-=63LL?F-il9BMJ8~tc+w1%! z3wg5GRxHhQG(+dyyz;m)<)nGu9jJCy@2h0i2GZ>+J3>*Y$fh8M!a^&Ps?U zg%NBUQfx+qvV4*2d=c_%^Q;{1r-(dzJbuEIWoZY8b_g zUuDA!2)VvKZvAdeSBl!*+G65Pte|P8wIBEcyPxyP17Du7H$_Q;c>Ues0}+1KaYl`Kwq`eaX-T;%(WTvaRVZnloy+6udy zt##)vU2`&#>S#^Pz~!E;{$a3_JOIYL5&$MDk3OgxF8K`%y3Z=K>@=B zX;5Q^i;4&e7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCLT#yDeX1J(`pn&0m zG^jDdMMVS!3>Tz9jTtT~A}C8PsPQdv1?n&NVV%6uS0=CSiL-$u zdF_u=21arS%{+|I^M?`o=O+2QiqKRTp=(87$n&0xmu9e@YZ?5WoCBR?rxa*_O=DxFUtlhqM&AF3bb!_ZEd9ytK z(xd2C;nIz_maJI&&XFJfJ-j5ku6W;LE27Gi54^hkOk(zpL^ygTF%~=W;J2%f4eyPH zy5cXsH+yWka%9K3`F%^%&vaip@%DkG=?}&_f7_5+p)E_Fi@ne1jV;-q{z~6_;m?)5 zKYl#dz3S-S&uzJT&uJm?{mkLBxz&$p2|uU|QF@iKq)-OJ@`^B2)m{hw~_ Te0|O#w}b}!hq7~9_Z|8VJ@oU? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering9.png b/src/main/resources/assets/botania/textures/blocks/flowerGlimmering9.png new file mode 100644 index 0000000000000000000000000000000000000000..d44853abb871fb0d8d91930f9b9a0c6160b4e1a5 GIT binary patch literal 14712 zcmeI3eQXnD9LG;U&_!MX25<(sbfBPXuh*`H9@pY%hg+nul<77TGOl;e)?;n2+}&um zs31fVf`K^kB^qO9^bdR^82&&PK!R@}Btp~>XJRlKBSc;z`UggW&t1Fr*RJIWhCiRn zw*K}!-|z2v?(_Vfr}xk8YG3=<^t$>whGC|+wMJt2bC&gc*Hrv>;nf=w{#c zxE!H69ErNpE5stJ3&Y|6f{uh~W(1DQX0xuW*QM!w93Kb-IJbxMc$`?_GzQbAlyjzy zhJ2FoJP~Bbx|%UnEzMearMNa=1|1G-pyE}yuT-WuP}(T4!xXukl;L=no2zD0ER)q!bM7do*05PUd7E7d`4tlJy$WF+Nv5WE zXj(Fqud?=Wglss>F6mU$ik3B&id?0-wA7_UC?c6CgiFzfi_q!ub-3LE{_%RA0{*$5` zk2}uC<8gPd-$oaWLi>c&5ltSjc19t!a*L^feM0JWx{6OVDG4;z>~D35DrqJR)v6k} z76(C%;!3s8t@UVgdFyybQnk;YjHDaL+Fe1%`1UFuSjF?m^4PmnkYwxR3dvUSBSqxO zT1(R^Itw=S|1MxYKd{#xBbz|!8apVT#TL}|8(OcKm2}kHhs%MmrSl2P9hI3y&N|uw*j;Ju zzPS~4S6WNXC(^1J@)Sm^Xa+9pY|S4A>+xd%3i*9LuTSJEn=2jdY7Qm4A}ZdshEn3(_FQ6c-T@6i{4{1~I0%h=`zo;(|1YF~vnh1O*fqq(O`+ zE+Qf*ptv9nVoY%n5kUdP1!)jtii?N{3Mei}gBVj>L_|3@v7uZ95p|+70}9o?!;u40B;4!w9c2%sg$l=Zn=?`$t=( zxg$4r=%s_3PPk|7ygs{m^NRUlPHxOPkDXug==l|~Ip==abKpcn ztozTgIn%#>Z|cZ`0~dFFH|3p=_Z{6mdEe1+;;Xo^=>7V+Z#1l0@yh7j{f#@e8GpZe z{h_`M|Lpl-)3aaJPZE#Z8Jja}?8UPWjBI$T@leCb$@`N%0pG~wU%%-;)xY)3XUD_C zCp|su?t5m}Z%59Je7a!T;jKrdC)XUlFmLDB-bwR2Us%|zb)Gu=?e5UiGnwaq`eFNr UuV4HT-#63NvNrP3s*T(K17+3_!~g&Q literal 0 HcmV?d00001 From d1d5c8d9777dc4fb000bf6f737b227ac7bbbad1f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 25 Nov 2015 19:21:39 +0000 Subject: [PATCH 21/25] Implemented the new textures for the glimmering flowers. --- .../common/block/decor/BlockShinyFlower.java | 16 +++++++++++++--- .../common/block/tile/TileFloatingFlower.java | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 7ea7a8ea1..ce60aa792 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -19,8 +19,10 @@ import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -29,6 +31,9 @@ import cpw.mods.fml.common.Optional; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { + private static IIcon[] icons; + private static IIcon[] iconsAlt; + public BlockShinyFlower() { super(LibBlockNames.SHINY_FLOWER); setLightLevel(1F); @@ -41,13 +46,18 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + public void registerBlockIcons(IIconRegister register) { + icons = new IIcon[16]; + iconsAlt = new IIcon[16]; + for(int i = 0; i < 16; i++) { + icons[i] = IconHelper.forName(register, "flowerGlimmering" + i); + iconsAlt[i] = IconHelper.forName(register, "flowerGlimmering" + i, BlockModFlower.ALT_DIR); + } } @Override public IIcon getIcon(int par1, int par2) { - return ModBlocks.flower.getIcon(par1, par2); + return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 8811ba542..03f4c4b69 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -29,7 +29,7 @@ public class TileFloatingFlower extends TileMod implements IFloatingFlower { return retStack; } - return new ItemStack(ModBlocks.flower, 1, getBlockMetadata()); + return new ItemStack(ModBlocks.shinyFlower, 1, getBlockMetadata()); } @Override From 6782ef152c6f71905575ee46c4fc9b537c1c9862 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 25 Nov 2015 20:40:13 +0000 Subject: [PATCH 22/25] Bauble Case. --- .../client/gui/{bag => }/SlotLocked.java | 2 +- .../client/gui/bag/ContainerFlowerBag.java | 1 + .../client/gui/box/ContainerBaubleBox.java | 122 +++++++++++++ .../botania/client/gui/box/GuiBaubleBox.java | 53 ++++++ .../client/gui/box/InventoryBaubleBox.java | 160 ++++++++++++++++++ .../botania/client/gui/box/SlotAnyBauble.java | 40 +++++ .../botania/client/lib/LibResources.java | 1 + .../common/core/BotaniaCreativeTab.java | 1 + .../botania/common/item/ItemBaubleBox.java | 76 +++++++++ .../vazkii/botania/common/item/ModItems.java | 2 + .../vazkii/botania/common/lib/LibGuiIDs.java | 1 + .../botania/common/lib/LibItemNames.java | 1 + .../botania/common/network/GuiHandler.java | 6 + .../resources/assets/botania/lang/en_US.lang | 1 + .../assets/botania/textures/gui/baubleBox.png | Bin 0 -> 18808 bytes .../textures/items/{unused => }/baubleBox.png | Bin 16 files changed, 466 insertions(+), 1 deletion(-) rename src/main/java/vazkii/botania/client/gui/{bag => }/SlotLocked.java (95%) create mode 100644 src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java create mode 100644 src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java create mode 100644 src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java create mode 100644 src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java create mode 100644 src/main/java/vazkii/botania/common/item/ItemBaubleBox.java create mode 100644 src/main/resources/assets/botania/textures/gui/baubleBox.png rename src/main/resources/assets/botania/textures/items/{unused => }/baubleBox.png (100%) diff --git a/src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java b/src/main/java/vazkii/botania/client/gui/SlotLocked.java similarity index 95% rename from src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java rename to src/main/java/vazkii/botania/client/gui/SlotLocked.java index 6ba8e937d..72b7ccadd 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java +++ b/src/main/java/vazkii/botania/client/gui/SlotLocked.java @@ -8,7 +8,7 @@ * * File Created @ [Sep 6, 2015, 1:11:25 AM (GMT)] */ -package vazkii.botania.client.gui.bag; +package vazkii.botania.client.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index 6cd2ca8aa..9a9de171b 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.gui.bag; +import vazkii.botania.client.gui.SlotLocked; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java new file mode 100644 index 000000000..24d54be75 --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -0,0 +1,122 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:59:06 (GMT)] + */ +package vazkii.botania.client.gui.box; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.client.gui.SlotLocked; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.container.SlotBauble; +import baubles.common.lib.PlayerHandler; + +public class ContainerBaubleBox extends Container { + + InventoryBaubleBox baubleBoxInv; + InventoryBaubles baubles; + + public ContainerBaubleBox(EntityPlayer player) { + int i; + int j; + + int slot = player.inventory.currentItem; + IInventory playerInv = player.inventory; + baubleBoxInv = new InventoryBaubleBox(player, slot); + + baubles = new InventoryBaubles(player); + baubles.setEventHandler(this); + if(!player.worldObj.isRemote) + baubles.stackList = PlayerHandler.getPlayerBaubles(player).stackList; + + addSlotToContainer(new SlotBauble(baubles, BaubleType.AMULET, 0, 8, 8 + 0 * 18)); + addSlotToContainer(new SlotBauble(baubles, BaubleType.RING, 1, 8, 8 + 1 * 18)); + addSlotToContainer(new SlotBauble(baubles, BaubleType.RING, 2, 8, 8 + 2 * 18)); + addSlotToContainer(new SlotBauble(baubles, BaubleType.BELT, 3, 8, 8 + 3 * 18)); + + for(i = 0; i < 4; ++i) + for(j = 0; j < 6; ++j) { + int k = j + i * 6; + addSlotToContainer(new SlotAnyBauble(baubleBoxInv, k, 62 + j * 18, 8 + i * 18)); + } + + for(i = 0; i < 3; ++i) + for(j = 0; j < 9; ++j) + addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + + for(i = 0; i < 9; ++i) { + if(player.inventory.currentItem == i) + addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142)); + else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + } + + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + boolean can = baubleBoxInv.isUseableByPlayer(player); + if(!can) + onContainerClosed(player); + + return can; + } + + @Override + public void onContainerClosed(EntityPlayer player) { + super.onContainerClosed(player); + baubleBoxInv.pushInventory(); + + if(!player.worldObj.isRemote) + PlayerHandler.setPlayerBaubles(player, baubles); + } + + @Override + public void putStacksInSlots(ItemStack[] p_75131_1_) { + baubles.blockEvents = true; + super.putStacksInSlots(p_75131_1_); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { + ItemStack itemstack = null; + Slot slot = (Slot)inventorySlots.get(p_82846_2_); + + if(slot != null && slot.getHasStack()) { + ItemStack itemstack1 = slot.getStack(); + itemstack = itemstack1.copy(); + + System.out.println(p_82846_2_ + " " + itemstack); + if(p_82846_2_ < 28) { + if(!mergeItemStack(itemstack1, 28, 64, true)) + return null; + } else { + if(itemstack1 != null && (itemstack1.getItem() instanceof IBauble || itemstack1.getItem() instanceof IManaItem) && !mergeItemStack(itemstack1, 4, 28, false)) + return null; + } + + if(itemstack1.stackSize == 0) + slot.putStack((ItemStack)null); + else slot.onSlotChanged(); + + if(itemstack1.stackSize == itemstack.stackSize) + return null; + + slot.onPickupFromSlot(p_82846_1_, itemstack1); + } + + return itemstack; + } + +} diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java new file mode 100644 index 000000000..250c1086c --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -0,0 +1,53 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:59:11 (GMT)] + */ +package vazkii.botania.client.gui.box; + +import net.minecraft.client.gui.inventory.GuiInventory; +import net.minecraft.client.renderer.InventoryEffectRenderer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.client.lib.LibResources; + +public class GuiBaubleBox extends InventoryEffectRenderer { + + private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_BAUBLE_BOX); + + public GuiBaubleBox(EntityPlayer player) { + super(new ContainerBaubleBox(player)); + } + + @Override + protected boolean checkHotbarKeys(int p_146983_1_) { + return false; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.getTextureManager().bindTexture(texture); + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + drawTexturedModalRect(k, l, 0, 0, xSize, ySize); + + for(int i1 = 0; i1 < 4; ++i1) { + Slot slot = (Slot) inventorySlots.inventorySlots.get(i1); + if(slot.getHasStack() && slot.getSlotStackLimit() == 1) + drawTexturedModalRect(k+slot.xDisplayPosition, l+slot.yDisplayPosition, 200, 0, 16, 16); + } + + GuiInventory.func_147046_a(this.guiLeft + 43, this.guiTop + 61, 20, (float)(this.guiLeft + 43 - p_146976_2_), (float)(this.guiTop + 45 - 30 - p_146976_3_), this.mc.thePlayer); + } + +} diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java new file mode 100644 index 000000000..415eee637 --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -0,0 +1,160 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:59:16 (GMT)] + */ +package vazkii.botania.client.gui.box; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import vazkii.botania.common.item.ItemBaubleBox; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibItemNames; + +public class InventoryBaubleBox implements IInventory { + + private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; + + EntityPlayer player; + int slot; + ItemStack[] stacks = null; + + boolean invPushed = false; + ItemStack storedInv = null; + + public InventoryBaubleBox(EntityPlayer player, int slot) { + this.player = player; + this.slot = slot; + } + + public static boolean isBaubleBox(ItemStack stack) { + return stack != null && stack.getItem() == ModItems.baubleBox; + } + + ItemStack getStack() { + ItemStack stack = player.inventory.getStackInSlot(slot); + if(stack != null) + storedInv = stack; + return stack; + } + + ItemStack[] getInventory() { + if(stacks != null) + return stacks; + + ItemStack stack = getStack(); + if(isBaubleBox(getStack())) { + stacks = ItemBaubleBox.loadStacks(stack); + return stacks; + } + + return FALLBACK_INVENTORY; + } + + public void pushInventory() { + if(invPushed) + return; + + ItemStack stack = getStack(); + if(stack == null) + stack = storedInv; + + if(stack != null) { + ItemStack[] inv = getInventory(); + ItemBaubleBox.setStacks(stack, inv); + } + + invPushed = true; + } + + @Override + public int getSizeInventory() { + return 16; + } + + @Override + public ItemStack getStackInSlot(int i) { + return getInventory()[i]; + } + + @Override + public ItemStack decrStackSize(int i, int j) { + ItemStack[] inventorySlots = getInventory(); + if (inventorySlots[i] != null) { + ItemStack stackAt; + + if (inventorySlots[i].stackSize <= j) { + stackAt = inventorySlots[i]; + inventorySlots[i] = null; + return stackAt; + } else { + stackAt = inventorySlots[i].splitStack(j); + + if (inventorySlots[i].stackSize == 0) + inventorySlots[i] = null; + + return stackAt; + } + } + + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return getStackInSlot(i); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack itemstack) { + ItemStack[] inventorySlots = getInventory(); + inventorySlots[slot] = itemstack; + } + + @Override + public int getInventoryStackLimit() { + return isBaubleBox(getStack()) ? 64 : 0; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) { + return isBaubleBox(getStack()); + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + return isBaubleBox(getStack()); + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public void openInventory() { + // NO-OP + } + + @Override + public void closeInventory() { + // NO-OP + } + + @Override + public String getInventoryName() { + return LibItemNames.BAUBLE_BOX; + } + + @Override + public void markDirty() { + // NO-OP + } + +} diff --git a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java new file mode 100644 index 000000000..60d7493b9 --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java @@ -0,0 +1,40 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:59:22 (GMT)] + */ +package vazkii.botania.client.gui.box; + +import baubles.api.IBauble; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.client.gui.bag.InventoryFlowerBag; +import vazkii.botania.common.block.ModBlocks; + +public class SlotAnyBauble extends Slot { + + InventoryBaubleBox inv; + + public SlotAnyBauble(InventoryBaubleBox p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_) { + super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); + inv = p_i1824_1_; + } + + @Override + public void onSlotChange(ItemStack oldStack, ItemStack newStack) { + inv.setInventorySlotContents(slotNumber, newStack); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return stack.getItem() instanceof IBauble || stack.getItem() instanceof IManaItem; + } + +} diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 66a38d5e6..b6237a71c 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -44,6 +44,7 @@ public final class LibResources { public static final String GUI_NEI_BLANK = PREFIX_GUI + "neiBlank.png"; public static final String GUI_NEI_BREWERY = PREFIX_GUI + "neiBrewery.png"; public static final String GUI_FLOWER_BAG = PREFIX_GUI + "flowerBag.png"; + public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "baubleBox.png"; public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png"; public static final String GUI_STENCIL = PREFIX_GUI + "stencil.png"; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 999859b1b..f41f62e15 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -224,6 +224,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.aesirRing); } + addItem(ModItems.baubleBox); addItem(ModItems.tinyPlanet); addBlock(ModBlocks.tinyPlanet); addItem(ModItems.manaRing); diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java new file mode 100644 index 000000000..e702b3f60 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -0,0 +1,76 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:46:11 (GMT)] + */ +package vazkii.botania.common.item; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.lib.LibGuiIDs; +import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public class ItemBaubleBox extends ItemMod { + + private static final String TAG_ITEMS = "InvItems"; + private static final String TAG_SLOT = "Slot"; + + public ItemBaubleBox() { + setUnlocalizedName(LibItemNames.BAUBLE_BOX); + setMaxStackSize(1); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.openGui(Botania.instance, LibGuiIDs.BAUBLE_BOX, world, 0, 0, 0); + return stack; + } + + + public static ItemStack[] loadStacks(ItemStack stack) { + NBTTagList var2 = ItemNBTHelper.getList(stack, TAG_ITEMS, 10, false); + ItemStack[] inventorySlots = new ItemStack[36]; + for(int var3 = 0; var3 < var2.tagCount(); ++var3) { + NBTTagCompound var4 = var2.getCompoundTagAt(var3); + byte var5 = var4.getByte(TAG_SLOT); + if(var5 >= 0 && var5 < inventorySlots.length) + inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4); + } + + return inventorySlots; + } + + public static void setStacks(ItemStack stack, ItemStack[] inventorySlots) { + NBTTagList var2 = new NBTTagList(); + for(int var3 = 0; var3 < inventorySlots.length; ++var3) + if(inventorySlots[var3] != null) { + NBTTagCompound var4 = new NBTTagCompound(); + var4.setByte(TAG_SLOT, (byte)var3); + inventorySlots[var3].writeToNBT(var4); + var2.appendTag(var4); + } + + ItemNBTHelper.setList(stack, TAG_ITEMS, var2); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 3b2820435..d0b7114cf 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -268,6 +268,7 @@ public final class ModItems { public static Item gaiaHead; public static Item sextant; public static Item speedUpBelt; + public static Item baubleBox; public static void init() { lexicon = new ItemLexicon(); @@ -417,6 +418,7 @@ public final class ModItems { gaiaHead = new ItemGaiaHead(); sextant = new ItemSextant(); speedUpBelt = new ItemSpeedUpBelt(); + baubleBox = new ItemBaubleBox(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java b/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java index d0f003b19..fefcb749a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java +++ b/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java @@ -15,5 +15,6 @@ public final class LibGuiIDs { public static final int LEXICON = 0; public static final int CRAFTING_HALO = 1; public static final int FLOWER_BAG = 2; + public static final int BAUBLE_BOX = 3; } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index babdeb8e7..5351f3a84 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -160,6 +160,7 @@ public final class LibItemNames { public static final String GAIA_HEAD = "gaiaHead"; public static final String SEXTANT = "sextant"; public static final String SPEED_UP_BELT = "speedUpBelt"; + public static final String BAUBLE_BOX = "baubleBox"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index c33d580f6..0dd9fea9f 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -14,6 +14,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import vazkii.botania.client.gui.bag.ContainerFlowerBag; import vazkii.botania.client.gui.bag.GuiFlowerBag; +import vazkii.botania.client.gui.box.ContainerBaubleBox; +import vazkii.botania.client.gui.box.GuiBaubleBox; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -29,6 +31,8 @@ public class GuiHandler implements IGuiHandler { return new ContainerCraftingHalo(player.inventory, world); case LibGuiIDs.FLOWER_BAG : return new ContainerFlowerBag(player); + case LibGuiIDs.BAUBLE_BOX : + return new ContainerBaubleBox(player); } return null; @@ -44,6 +48,8 @@ public class GuiHandler implements IGuiHandler { return new GuiCraftingHalo(player.inventory, world); case LibGuiIDs.FLOWER_BAG : return new GuiFlowerBag(player); + case LibGuiIDs.BAUBLE_BOX : + return new GuiBaubleBox(player); } return null; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4f0bfae46..76ab3da09 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1633,6 +1633,7 @@ item.botania:manaweaveBoots.name=Manaweave Boots item.botania:gaiaHead.name=Gaia Guardian's Head item.botania:sextant.name=Worldshaper's Sextant item.botania:speedUpBelt.name=Planestrider's Sash +item.botania:baubleBox.name=Bauble Case # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/textures/gui/baubleBox.png b/src/main/resources/assets/botania/textures/gui/baubleBox.png new file mode 100644 index 0000000000000000000000000000000000000000..8a819dd2591ab862429aae76d31d12af228d1744 GIT binary patch literal 18808 zcmeI4cT`i^*1&H9D59v?umPFakxP0N0xA}iHh={zaC37LGC+b!sJ29(`eymm5l7k+ z0Ur*iC^p1~;*4c%*b6pBv49|fVL)*d-U;0+-0^)gYkljzl`J54pMCb;=l=FS``r8y zzV-2%VQDek0)ik*_nB_K5JUo(B*?r6cw4B-mV&ol5iGD3 zKVLK7(?f_V!yOTcQj9sqghznc5ai?%6M>+in1&+8WO9WwRe$0%l_HloQ|EC!>7Ef& zu@L#pI2Gm>=jD&ag`xrp)kS3C6e9!I+WC_`HA)85QeNjag z;L1rQkqUj?rniOzk~1|#qlpmGXwlKpj?pYfrAkI)2m}Heok?RdVK4($$0{^P46IO( zYH`x$#|=}XDtUxPu2fJAei5-UQsYde8UnSyTJI}7qCJp8-O3J7q{Sc+G=?Lc)|HV2 zZMTVtRE0G!O@h*}Ff1HXXw<-t(WPBPh*G0ehbX%V*{<$3Fvy9gXM5}}*Bc(*WoWf# zS`SLDTKpu^4$bW(G}*S#v40 zWXK8Jt8l6cLo`a2zfu_{YN;}xHiVR^Q=6-bGJc+1AyG!FCpgjYCLQ_i@P@e|8cbxU zN0`BYnH+zHK*(eZnasdW_AQfe=AKH4TpHVjIhzeCy4AeXB)mD;H4;RF{E>ss(>l43 zphBrq6^>{`@^D0k(IONwCtAl~rws&5Q>P%ZPeJu)0+^0+xMHbP zfT9S)iDuZJz^G#-t?6$aZ+FJya@b-%3X2hh2eVN&0t@I87R+Yy5Gj{0macIqBXkx6 z=5g2pn9q~aVLHa=@Wl)cSIWV@+!>0oB~m(A6hq8|B@#9YoS{sZD`3%?QUSt581$~4 zwTymRF`dhisNM|w*3(nyu25?bP>$|y&DA9b)rEn@Gq~V9k#bmoIKl?$#akIG$wuFU&#q*^Y3y*3`CPD}7*Y%sGx&T4 zD8fIN0Ty3KXMvOQ|1Sdu)-BP|5JVxvBqCbda@q#|o09frUGUE(t?lvVe;{cs`|r~x z*w$D-Z<v1jbZrPYT8+iHw_>* z?X1R|c393)$TcEnYc$+&Co984cgq8!ANYKTiMSjN3!G#4VZ4QpJO&G!?pr#0fj0U;KRxQO}Sv_@PwAjF~(7cn24 z)`$xSgjh7Q>j^<|V<1So z8iE>{zE{@uHB0u{P^!^n%(H>DVnE zviJw#q05m8r?d;At;Vj396b4ZGe*I9bL!pRRu;NJxkJvbpHnu?HTPuyK??^B7*sqW zw|>f9_e+j@!rz=a{2FhplUrw8(3Oe3a`{1IKbGj zabw);$@+VxDciS8Q~TzW=IQN9ObZ`Fdy|rqs-Ner`53eC)~#DPw{($5xsh7Z{f*%d z<1-r?8jf!oH=x%!F=N>IB5N5d+2e7p%gH>G!V1#(#LJgnsO-1S^8UD3l$MALeXZA* zaLLIY(~C-6#!Q=$dAs)J<9m{AMg2)&_I`)id-m+PlUhRWV2$|``Y?0!4xjOdU+kKE=YTTg*Ku3kzpzW&_EyFmcGad~_r|n_jLiIE zd#&{*DD2_Bsz*0M{MRBs9|?zHcuterE6*L?<|2$An*?6KJ&9v zD@nuGesyb^ioWDs_0!jR+Q8zlx#!FOv29IB`A)k6>Z{-1?wsUzGehQI^l|pM^K*}y zn|mLNsS(dsa#NC$${L|cjhFt(uOmi|e00b9iu4e3qvZL?<+GTpe5=1xEdH3a-8oVA zs^`g}+I9Wx6f3RHu%ioVdA7aSEBa`An)F|P?(nHor*eamY;4Qop|hnm;U@bZuKf76 z)RMpV*@iK$14$A6YD4wpqwn9pkNSAdG3eB?^nOuMQ3<>RXsM-kX+~~tu6Jl?XkbuK zN&PGrt!;1Z2%Re>{mhv&&OyJKTwg;PI$}iahviqKxn`9YO2w%~Ijid#{;VMx3FytnKv7c+O< z$lh@yWRdB+pbaL@!@<9v=SyM97!Oud+{1<7Y>r+YQrsP>WeIu>1A2;~z z`kt(VuGwE-PojJJJ&ic(NY0z&l26iA9ej0 zhbW8Yt@_ghXrONXh29nE%ahD+|5z%H_ma%Q~Uo?3em01tCv7Y=BDrX5VUM$v#u|23)%J5e(UP0M5z5; zp?X_VR8*lX3xdoc$YmRuZuR%bll%KVSof_f?BqDMK_j&pOSZXgr9IIRwZt_2>rw~p z>kQL;vhInc_C)D|ggI|tpAMW$NM*ufTS2KDJt z@x+=g6kf_0d3^&ZWShzUfp5!#B@(v`pX@jNC^gT1KPYjJza;&7#JN?MyaIO4I#zY< z+@T;O)Wot;-wX7I%~-(F#rF^99P#csTo^rL`8CUlzis}Gnr7>BEM!7t*nGq+(m|Mm z-aw`e_AOd?ukMQ7{Rf4MO@bfRC%pP_QQ}*!2`twfS5RiY+3Y$g%fvD@&9AI>!q%Kf zGZ#VnrMi;?(kAV`w0c$ig>_ipFx%yic=NvRbH4bdD~ojhbz=y1v(M-OU-L)K1wY_| zy7~T{S5@ntH#CiZf9Tq!*s-H)&!!)i*vEV`KhR-f1ardPgq`!#_9ZCfeE#^$6DoA7 zu<-QcP-w%i4JXMu*SdnHBjFR%u0>bU-sB8J9hI9|&xIF8Vl6eJ=Jz<&5_a zw(eotogOz>U%r)gI&;gcJ;Bz$>4s<)^cLPijJAs4LzRRWve&4)9mp!C%@Qb{CI~*3> z3XfWmeh0c;RkjuxS$3k4S!`E!=L&7KJ5QsmU47*D+Lzwb0uK61U-e9})FzHQzRY=P zM)@_2>>a&#b$#&?u*;@-m_Bgv&_jGPXxWPKkA9f9H}2!lt42ZEQQEx>=R~lTyh{Cp zHPwT(^1K}N^@@lkDSi-SYWU|it`O9}n@cTJJqS$F_KTF*(<}D(Jt@DitI)$#Y(vYr z#kb0~@zXs#SHU7Bo1YbK4+1-Np$U<HamK*aduAx%=bOE4;vAxWuuOm0ds7o-!Sbu99+0eK^%V~Zx z>H5-Cn`M}^?C-k@b4nW`uZuj)rr$&C=`FpA43*e4qAN|u3|ouv!6VQ(>*{hV?dFS; z818k>@u%cqUdS@C&GrGB^0)iO#eQ_uKCL@V(blJZLEx^J^TngxW%Uo!{+~?Hg6G*k g0@ya85N+f^nbE)HsdJLHLEz;+&C6}yl;BnW1_e>bs{jB1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/unused/baubleBox.png b/src/main/resources/assets/botania/textures/items/baubleBox.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/baubleBox.png rename to src/main/resources/assets/botania/textures/items/baubleBox.png From 911f687cb3e13e26be575951d0776df9699f550e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 25 Nov 2015 20:41:55 +0000 Subject: [PATCH 23/25] Fixed Botania Grass types not spreading. --- src/main/java/vazkii/botania/common/block/BlockAltGrass.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 0bb2f00a9..7e0910000 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -44,6 +44,7 @@ public class BlockAltGrass extends BlockMod { setHardness(0.6F); setStepSound(soundTypeGrass); setBlockName(LibBlockNames.ALT_GRASS); + setTickRandomly(true); } @Override From 027ad89f94b664aa73eefa4d4fe6e9343c1109a2 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 25 Nov 2015 21:55:39 +0000 Subject: [PATCH 24/25] Recipe/docs for the Bauble Case. --- .../botania/common/crafting/ModCraftingRecipes.java | 9 +++++++++ .../java/vazkii/botania/common/lexicon/LexiconData.java | 4 ++++ src/main/java/vazkii/botania/common/lib/LibLexicon.java | 1 + src/main/resources/assets/botania/lang/en_US.lang | 6 ++++++ 4 files changed, 20 insertions(+) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index de621711a..eddaf917a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -307,6 +307,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeSextant; public static List recipesAltGrassSeeds; public static IRecipe recipeSpeedUpBelt; + public static IRecipe recipeBaubleCase; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -2073,6 +2074,14 @@ public final class ModCraftingRecipes { 'S', new ItemStack(Items.sugar)); recipeSpeedUpBelt = BotaniaAPI.getLatestAddedRecipe(); + // Bauble Case Recipe + addOreDictRecipe(new ItemStack(ModItems.baubleBox), + " M ", "MCG", " M ", + 'M', LibOreDict.MANA_STEEL, + 'C', new ItemStack(Blocks.chest), + 'G', "ingotGold"); + recipeBaubleCase = BotaniaAPI.getLatestAddedRecipe(); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 26d58ab1a..4c27419c7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -251,6 +251,7 @@ public final class LexiconData { public static LexiconEntry monocle; public static LexiconEntry swapRing; public static LexiconEntry speedUpBelt; + public static LexiconEntry baubleBox; public static LexiconEntry alfhomancyIntro; public static LexiconEntry elvenMessage; @@ -954,6 +955,9 @@ public final class LexiconData { speedUpBelt = new BLexiconEntry(LibLexicon.BAUBLE_SPEED_UP_BELT, categoryBaubles); speedUpBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpeedUpBelt)); + + baubleBox = new BLexiconEntry(LibLexicon.BAUBLE_BOX, categoryBaubles); + baubleBox.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBaubleCase)).setPriority(); // ALFHOMANCY ENTRIES alfhomancyIntro = new BLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 64f538048..4981e079c 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -222,6 +222,7 @@ public final class LibLexicon { public static final String BAUBLE_MONOCLE = "monocle"; public static final String BAUBLE_SWAP_RING = "swapRing"; public static final String BAUBLE_SPEED_UP_BELT = "speedUpBelt"; + public static final String BAUBLE_BOX = "baubleBox"; public static final String ALF_INTRO = "aIntro"; public static final String ALF_MESSAGE = "elfMessage"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 76ab3da09..c4a02e657 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3526,6 +3526,12 @@ botania.tagline.speedUpBelt=Speeds you up the more you walk botania.page.speedUpBelt0=The &1Planestrider's Sash&0 works as an alternative to the &1Soujourner's Sash&0.
Unlike the aforementioned item, the &1Planestider's Sash&0 will not give the wearer a speed boost by default. However, when they walk, the sash will get more and more charged, enabling the wearer to go much faster than any other sash. Case one would stop, this bonus is reset. botania.page.speedUpBelt1=If you go slow you're a Planeswalker +# -- BAUBLE CASE +botania.entry.baubleBox=Bauble Case +botania.tagline.baubleBox=A handy container to store your Baubles +botania.page.baubleBox0=Somtimes having too many &4Baubles&0 to pick from can be a real problem, as inventory space is limited. A better way would be to store all of these in a &1Bauble Case&0, a handy container for any &4Baubles&0.
The case's interface allows for quick switching of the current equipped baubles. The case can also store &4Mana&0 containing items like a &1Mana Tablet&0. +botania.page.baubleBox1=It could even be a boat! + # - ALFHOMANCY # -- THE PORTAL TO ALFHEIM botania.entry.aIntro=The Portal to Alfheim From b671094663f7b889762a10a5c40654f4a8106972 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 25 Nov 2015 22:05:20 +0000 Subject: [PATCH 25/25] Build 236 --- build.properties | 8 ++++---- version/1.7.10.txt | 2 +- web/changelog.txt | 23 +++++++++++++++++++++++ web/versions.ini | 3 ++- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index ea3b21104..bd045f6ef 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Nov 18 21:40:00 GMT 2015 +#Wed Nov 25 22:02:37 GMT 2015 version=r1.7 dir_output=../Build Output/Botania/ -dir_repo=./ -forge_version=10.13.2.1291 mc_version=1.7.10 -build_number=236 +forge_version=10.13.2.1291 +dir_repo=./ +build_number=237 mod_name=Botania diff --git a/version/1.7.10.txt b/version/1.7.10.txt index c41557e89..aa2ba0333 100644 --- a/version/1.7.10.txt +++ b/version/1.7.10.txt @@ -1 +1 @@ -r1.7-235 \ No newline at end of file +r1.7-236 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 2319a3d5b..861a3b4bf 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,26 @@ +r1.7 236 +*Added Chisel stone support to the Rod of the Terra Firma. +*Added floating flower variants to all the new pasture seed types. +*Added the Bauble Case, a way of storing baubles on your person. +*Added the Planestrider's Sash, a new belt item that gives you more speed the more you walk. +*Buffed the amount of damage the Key of the King's Law does. +*Fixed Botania armor models not resetting the "using a bow" state. +*Fixed Botania grass types not spreading. +*Fixed Featherfall disabling the Flugel Tiara's glide. (TheWhiteWolves) +*Fixed items getting destroyed if they're left in a crafting table when the lexicon's Ctrl lookup feature is used. +*Fixed lexicon bookmarks being weird if you do multiple in the same entry. +*Fixed Mana Bursts' position in the client sometimes going above the block they're inside. +*Fixed multiblock previews rendering in dimensions other than the one they were created in. +*Fixed raytracing ignoring the player's height. +*Fixed the Gaia Guardian head not breaking properly or having the right drops. +*Fixed the Halos not rendering multipassed items properly. +*Fixed the travel sashes using mana even if the player isn't moving. +*Fixed the weapons spawned by the Key of the King's Law not despawning if the player that created them dies. +*Fixed Witchery wiki lookup not working because google sites requires lowercase URLs. (TheWhiteWolves) +*Glimmering flowers now have slightly altered textures from the normal ones. +*[API] Added ICompositableLens for API level lens composition handling. (WireSegal) +*[API] Added lowercase conversion support to SimpleWikiProvider. (TheWhiteWolves) +*[API] Increased version number to 69. r1.7 235 *Fixed the Crafty Crate not syncing properly, and by extension, the Wand HUD for it not being accurate. *Fixed the Hopperhock not updating inventories properly. diff --git a/web/versions.ini b/web/versions.ini index 4e60c6bc3..86b806809 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -232,4 +232,5 @@ r1.7-231=1.7.10 r1.7-232=1.7.10 r1.7-233=1.7.10 r1.7-234=1.7.10 -r1.7-235=1.7.10 \ No newline at end of file +r1.7-235=1.7.10 +r1.7-236=1.7.10 \ No newline at end of file