From 5f34336b7e7ea7e0053b8fea6e639213d76641fb Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Nov 2015 12:52:52 +0000 Subject: [PATCH 1/8] Fixed the Gaia Guardian spawning on the client side when it shouldn't. Closes #1586 --- .../java/vazkii/botania/common/entity/EntityDoppleganger.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4077e0c86..716fc0319 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -184,6 +184,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } par1ItemStack.stackSize--; + + if(par3World.isRemote) + return true; + EntityDoppleganger e = new EntityDoppleganger(par3World); e.setPosition(par4 + 0.5, par5 + 3, par6 + 0.5); e.setInvulTime(SPAWN_TICKS); From 4cb662c2cb8b3fd224a6803804c7199c3084c213 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Nov 2015 12:55:52 +0000 Subject: [PATCH 2/8] The Fruit of Grisaia now uses less mana. --- .../vazkii/botania/common/item/relic/ItemInfiniteFruit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 54ca07f67..1e24a9fc5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -54,7 +54,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { super.onUsingTick(stack, player, count); - if(ManaItemHandler.requestManaExact(stack, player, 1000, true)) { + if(ManaItemHandler.requestManaExact(stack, player, 500, true)) { if(count % 5 == 0) player.getFoodStats().addStats(1, 1F); From 5bc7d0637cf32ea6efef3acafc6da25a20403dc9 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Nov 2015 19:21:21 +0000 Subject: [PATCH 3/8] The Damage Lens deals more damage now. --- src/main/java/vazkii/botania/common/item/lens/LensDamage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index 68a512b24..f1a268901 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -35,7 +35,7 @@ public class LensDamage extends Lens { if(mana >= 16) { burst.setMana(mana - 16); if(!burst.isFake() && !entity.worldObj.isRemote) - living.attackEntityFrom(DamageSource.magic, 4); + living.attackEntityFrom(DamageSource.magic, 8); break; } } From 7abffa3bc9531ce96e1b0e7981af7bf19a140ece Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Nov 2015 19:27:07 +0000 Subject: [PATCH 4/8] The Gaia Guardian's damage cap is higher to accommodate for Overload Brews. HP remains the same. --- .../java/vazkii/botania/common/entity/EntityDoppleganger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 716fc0319..87e31ddab 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -377,7 +377,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi crit = p.fallDistance > 0.0F && !p.onGround && !p.isOnLadder() && !p.isInWater() && !p.isPotionActive(Potion.blindness) && p.ridingEntity == null; } - int cap = crit ? 50 : 35; + int cap = crit ? 60 : 40; return super.attackEntityFrom(par1DamageSource, Math.min(cap, dmg) * (isHardMode() ? 0.6F : 1F)); } return false; From 62e508d9796e97af89d41988bb377961a0f8d6ee Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Nov 2015 20:57:48 +0000 Subject: [PATCH 5/8] The Brew of Overload has a larger Weakness period now as it's now a viable tool against the GG. --- src/main/java/vazkii/botania/common/brew/ModBrews.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 505da7c30..b30edbfc6 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -56,7 +56,7 @@ public class ModBrews { nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(Potion.nightVision.id, 9600, 0)); absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(Potion.field_76444_x.id, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); - overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(Potion.damageBoost.id, 1800, 3), new PotionEffect(Potion.moveSpeed.id, 1800, 2), new PotionEffect(Potion.weakness.id, 2400, 2), new PotionEffect(Potion.hunger.id, 200, 2)); + overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(Potion.damageBoost.id, 1800, 3), new PotionEffect(Potion.moveSpeed.id, 1800, 2), new PotionEffect(Potion.weakness.id, 3600, 2), new PotionEffect(Potion.hunger.id, 200, 2)); soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross.id, 1800, 0)); featherfeet = new BrewModPotion(LibBrewNames.FEATHER_FEET, 7000, new PotionEffect(ModPotions.featherfeet.id, 1800, 0)); emptiness = new BrewModPotion(LibBrewNames.EMPTINESS, 30000, new PotionEffect(ModPotions.emptiness.id, 7200, 0)); From 90e88783174c1943c99af5a76621019a00f05bb5 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Nov 2015 20:58:10 +0000 Subject: [PATCH 6/8] The Spectrolus now produces and holds more mana. --- .../common/block/subtile/generating/SubTileSpectrolus.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index dfc12b5c4..4bdda5470 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -51,7 +51,7 @@ public class SubTileSpectrolus extends SubTileGenerating { if(stack != null && stack.getItem() == wool) { int meta = stack.getItemDamage(); if(meta == nextColor) { - mana = Math.min(getMaxMana(), mana + 200); + mana = Math.min(getMaxMana(), mana + 300); nextColor = nextColor == 15 ? 0 : nextColor + 1; sync(); @@ -69,7 +69,7 @@ public class SubTileSpectrolus extends SubTileGenerating { @Override public int getMaxMana() { - return 4000; + return 8000; } @Override From 3de3a13bbec981ea74f9cac74e0e32e7ab7dc054 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Nov 2015 21:10:08 +0000 Subject: [PATCH 7/8] The Rosa Arcana now produces and holds more mana. --- .../common/block/subtile/generating/SubTileArcaneRose.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 6bcb74ef2..08b5701c2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -35,7 +35,7 @@ public class SubTileArcaneRose extends SubTileGenerating { for(EntityPlayer player : players) if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) { ExperienceHelper.drainPlayerXP(player, 1); - mana += 24; + mana += 50; return; } } @@ -52,7 +52,7 @@ public class SubTileArcaneRose extends SubTileGenerating { @Override public int getMaxMana() { - return 1200; + return 6000; } @Override From 1f0c00a0ad658c19e35487e4dde3208e4e9483a0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 26 Nov 2015 22:25:42 +0000 Subject: [PATCH 8/8] Build 237 --- build.properties | 8 ++++---- version/1.7.10.txt | 2 +- web/changelog.txt | 8 ++++++++ web/versions.ini | 3 ++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index bd045f6ef..2e50e145d 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Nov 25 22:02:37 GMT 2015 +#Thu Nov 26 22:01:32 GMT 2015 version=r1.7 dir_output=../Build Output/Botania/ -mc_version=1.7.10 -forge_version=10.13.2.1291 dir_repo=./ -build_number=237 +forge_version=10.13.2.1291 +mc_version=1.7.10 +build_number=238 mod_name=Botania diff --git a/version/1.7.10.txt b/version/1.7.10.txt index aa2ba0333..5f718b53a 100644 --- a/version/1.7.10.txt +++ b/version/1.7.10.txt @@ -1 +1 @@ -r1.7-236 \ No newline at end of file +r1.7-237 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 861a3b4bf..2ce2f2b61 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,11 @@ +r1.7 237 +*Fixed the Gaia Guardian spawning on the client side when it shouldn't. +*The Brew of Overload has a larger Weakness period now. +*The Damage Lens now deals more damage. +*The Fruit of Grisaia uses less mana now. +*The Gaia Guardian's damage cap now is higher to accommodate for Overload Brews. HP remains the same. +*The Rosa Arcana now produces and holds more mana. +*The Spectrolus now produces and holds more mana. 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. diff --git a/web/versions.ini b/web/versions.ini index 86b806809..5a18f43cc 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -233,4 +233,5 @@ r1.7-232=1.7.10 r1.7-233=1.7.10 r1.7-234=1.7.10 r1.7-235=1.7.10 -r1.7-236=1.7.10 \ No newline at end of file +r1.7-236=1.7.10 +r1.7-237=1.7.10 \ No newline at end of file