diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 10aaa9b97..0df549a7e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -69,7 +69,7 @@ public final class BossBarHandler { Entity e = (Entity) currentBoss; EntityPlayer p = mc.thePlayer; - if(e.isDead || !e.worldObj.loadedEntityList.contains(e) || MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, p.posX, p.posY, p.posZ) > 32) + if(e.isDead || !p.worldObj.loadedEntityList.contains(e) || MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, p.posX, p.posY, p.posZ) > 32) currentBoss = null; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index bcb6d3a09..19fb07f75 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -53,8 +53,9 @@ public class RenderDoppleganger extends RenderBiped { EntityDoppleganger dopple = (EntityDoppleganger) par1Entity; BossBarHandler.setCurrentBoss(dopple); - if(dopple.getInvulTime() > 0) { - grainIntensity = dopple.getInvulTime() > 20 ? 1F : dopple.getInvulTime() * 0.05F; + int invulTime = dopple.getInvulTime(); + if(invulTime > 0) { + grainIntensity = invulTime > 20 ? 1F : invulTime * 0.05F; disfiguration = grainIntensity * 0.3F; } else { disfiguration = (0.025F + dopple.hurtTime * ((1F - 0.15F) / 20F)) / 2F; diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index ab88e7257..a09862e65 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -25,6 +25,7 @@ public class ModBrews { public static Brew healing; public static Brew jumpBoost; public static Brew regen; + public static Brew regenWeak; public static Brew resistance; public static Brew fireResistance; public static Brew waterBreathing; @@ -51,6 +52,7 @@ public class ModBrews { healing = new BrewMod(LibBrewNames.HEALING, 0xFF5ECC, 6000, new PotionEffect(Potion.heal.id, 1, 1)); jumpBoost = new BrewMod(LibBrewNames.JUMP_BOOST, 0x32F46D, 4000, new PotionEffect(Potion.jump.id, 1800, 1)); regen = new BrewMod(LibBrewNames.REGEN, 0xFD6488, 7000, new PotionEffect(Potion.regeneration.id, 500, 1)); + regenWeak = new BrewMod(LibBrewNames.REGEN_WEAK, 0xFD6488, 9000, new PotionEffect(Potion.regeneration.id, 2400, 0)); resistance = new BrewMod(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new PotionEffect(Potion.resistance.id, 1800, 1)); fireResistance = new BrewMod(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new PotionEffect(Potion.fireResistance.id, 9600, 0)); waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffect(Potion.waterBreathing.id, 9600, 0)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index 256851974..e2e50bd4d 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -28,6 +28,7 @@ public class ModBrewRecipes { public static RecipeBrew healingBrew; public static RecipeBrew jumpBoostBrew; public static RecipeBrew regenerationBrew; + public static RecipeBrew weakRegenerationBrew; public static RecipeBrew resistanceBrew; public static RecipeBrew fireResistanceBrew; public static RecipeBrew waterBreathingBrew; @@ -44,6 +45,7 @@ public class ModBrewRecipes { healingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.healing, new ItemStack(Items.nether_wart), new ItemStack(Items.speckled_melon), new ItemStack(Items.potato)); jumpBoostBrew = BotaniaAPI.registerBrewRecipe(ModBrews.jumpBoost, new ItemStack(Items.nether_wart), new ItemStack(Items.feather), new ItemStack(Items.carrot)); regenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regen, new ItemStack(Items.nether_wart), new ItemStack(Items.ghast_tear), new ItemStack(Items.glowstone_dust)); + weakRegenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regenWeak, new ItemStack(Items.nether_wart), new ItemStack(Items.ghast_tear), new ItemStack(Items.redstone)); resistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.resistance, new ItemStack(Items.nether_wart), new ItemStack(Items.iron_ingot), new ItemStack(Items.leather)); fireResistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.fireResistance, new ItemStack(Items.nether_wart), new ItemStack(Items.magma_cream), new ItemStack(Blocks.netherrack)); waterBreathingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.waterBreathing, new ItemStack(Items.nether_wart), new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.glowstone_dust)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 199458628..bafcfd887 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -16,17 +16,21 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.lwjgl.opengl.ARBShaderObjects; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWatchClosest; -import net.minecraft.entity.boss.IBossDisplayData; +import net.minecraft.entity.monster.EntityCaveSpider; +import net.minecraft.entity.monster.EntityPigZombie; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.monster.EntitySpider; +import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; @@ -42,11 +46,14 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -import vazkii.botania.api.boss.IBotaniaBoss; + +import org.lwjgl.opengl.ARBShaderObjects; + import vazkii.botania.api.boss.IBotaniaBossWithShader; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -58,11 +65,23 @@ import cpw.mods.fml.relauncher.SideOnly; public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWithShader { public static final int SPAWN_TICKS = 100; + + public static final int MOB_SPAWN_START_TICKS = 20; + public static final int MOB_SPAWN_END_TICKS = 80; + public static final int MOB_SPAWN_BASE_TICKS = 800; + public static final int MOB_SPAWN_TICKS = MOB_SPAWN_BASE_TICKS + MOB_SPAWN_START_TICKS + MOB_SPAWN_END_TICKS; + public static final int MOB_SPAWN_WAVES = 10; + public static final int MOB_SPAWN_WAVE_TIME = MOB_SPAWN_BASE_TICKS / MOB_SPAWN_WAVES; private static final float MAX_HP = 300F; private static final String TAG_INVUL_TIME = "invulTime"; private static final String TAG_AGGRO = "aggro"; + private static final String TAG_SOURCE_X = "sourceX"; + private static final String TAG_SOURCE_Y = "sourceY"; + private static final String TAG_SOURCE_Z = "sourcesZ"; + private static final String TAG_MOB_SPAWN_TICKS = "mobSpawnTicks"; + private static final int[][] PYLON_LOCATIONS = new int[][] { { 4, 1, 4 }, { 4, 1, -4 }, @@ -107,14 +126,15 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi par1ItemStack.stackSize--; EntityDoppleganger e = new EntityDoppleganger(par3World); e.setPosition(par4 + 0.5, par5 + 3, par6 + 0.5); - e.setInvulTime(EntityDoppleganger.SPAWN_TICKS); + e.setInvulTime(SPAWN_TICKS); e.setHealth(1F); e.setSource(par4, par5, par6); + e.setMobSpawnTicks(MOB_SPAWN_TICKS); par3World.playSoundAtEntity(e, "mob.enderdragon.growl", 10F, 0.1F); par3World.spawnEntityInWorld(e); return true; } - + return false; } @@ -132,6 +152,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi dataWatcher.addObject(23, 0); // Source X dataWatcher.addObject(24, 0); // Source Y dataWatcher.addObject(25, 0); // Source Z + dataWatcher.addObject(26, 0); // Ticks spawning mobs } public int getInvulTime() { @@ -153,6 +174,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return new ChunkCoordinates(x, y, z); } + public int getMobSpawnTicks() { + return dataWatcher.getWatchableObjectInt(26); + } + public void setInvulTime(int time) { dataWatcher.updateObject(20, time); } @@ -171,11 +196,21 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi dataWatcher.updateObject(25, z); } + public void setMobSpawnTicks(int ticks) { + dataWatcher.updateObject(26, ticks); + } + @Override public void writeEntityToNBT(NBTTagCompound par1nbtTagCompound) { super.writeEntityToNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_INVUL_TIME, getInvulTime()); par1nbtTagCompound.setBoolean(TAG_AGGRO, isAggored()); + par1nbtTagCompound.setInteger(TAG_MOB_SPAWN_TICKS, getMobSpawnTicks()); + + ChunkCoordinates source = getSource(); + par1nbtTagCompound.setInteger(TAG_SOURCE_X, source.posX); + par1nbtTagCompound.setInteger(TAG_SOURCE_Y, source.posY); + par1nbtTagCompound.setInteger(TAG_SOURCE_Z, source.posZ); } @Override @@ -183,6 +218,12 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi super.readEntityFromNBT(par1nbtTagCompound); setInvulTime(par1nbtTagCompound.getInteger(TAG_INVUL_TIME)); setAggroed(par1nbtTagCompound.getBoolean(TAG_AGGRO)); + setMobSpawnTicks(par1nbtTagCompound.getInteger(TAG_MOB_SPAWN_TICKS)); + + int x = par1nbtTagCompound.getInteger(TAG_SOURCE_X); + int y = par1nbtTagCompound.getInteger(TAG_SOURCE_Y); + int z = par1nbtTagCompound.getInteger(TAG_SOURCE_Z); + setSource(x, y, z); } @Override @@ -236,19 +277,33 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public void onLivingUpdate() { super.onLivingUpdate(); - + if(!worldObj.isRemote && worldObj.difficultySetting == EnumDifficulty.PEACEFUL) setDead(); ChunkCoordinates source = getSource(); - + float range = 32F; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range)); range = 12F; - List playersInside = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range)); + for(int i = 0; i < 360; i += 8) { + float r = 0.6F; + float g = 0F; + float b = 0.2F; + float m = 0.15F; + float mv = 0.35F; - if(players.isEmpty()) + float rad = (float) i * (float) Math.PI / 180F; + double x = source.posX - 0.5 - Math.cos(rad) * range; + double y = source.posY - 0.5; + double z = source.posZ - 0.5 - Math.sin(rad) * range; + + Botania.proxy.wispFX(worldObj, x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); + + } + + if(players.isEmpty() && !worldObj.playerEntities.isEmpty()) setDead(); else for(EntityPlayer player : players) { List remove = new ArrayList(); @@ -261,7 +316,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; - if(!playersInside.contains(player)) { + if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.posX + 0.5, source.posY + 0.5, source.posZ + 0.5) >= range) { Vector3 sourceVector = new Vector3(source.posX + 0.5, source.posY + 0.5, source.posZ + 0.5); Vector3 playerVector = Vector3.fromEntityCenter(player); Vector3 motion = sourceVector.copy().sub(playerVector).copy().normalize(); @@ -276,7 +331,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return; int invul = getInvulTime(); - if(invul > 0) { + int mobTicks = getMobSpawnTicks(); + + if(invul > 0 && mobTicks == MOB_SPAWN_TICKS) { if(invul < SPAWN_TICKS && invul > SPAWN_TICKS / 2 && worldObj.rand.nextInt(SPAWN_TICKS - invul + 1) == 0) for(int i = 0; i < 2; i++) spawnExplosionParticle(); @@ -286,7 +343,67 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi motionY = 0; } else { if(isAggored()) { - if(getTPDelay() > 0) { + boolean dying = getHealth() / getMaxHealth() < 0.2; + if(dying && mobTicks > 0) { + motionX = 0; + motionY = 0; + motionZ = 0; + + int reverseTicks = MOB_SPAWN_TICKS - mobTicks; + if(reverseTicks < MOB_SPAWN_START_TICKS) { + motionY = 0.2; + setInvulTime(invul + 1); + } + + if(reverseTicks > MOB_SPAWN_START_TICKS * 2 && mobTicks > MOB_SPAWN_END_TICKS && mobTicks % MOB_SPAWN_WAVE_TIME == 0 && !worldObj.isRemote) { + for(int i = 0; i < 4 + worldObj.rand.nextInt(3); i++) { + EntityLiving entity = null; + switch(worldObj.rand.nextInt(5)) { + case 0 : { + entity = new EntityZombie(worldObj); + if(worldObj.rand.nextInt(8) == 0) + entity = new EntityPigZombie(worldObj); + + break; + } + case 1 : { + entity = new EntitySkeleton(worldObj); + ((EntitySkeleton) entity).setCurrentItemOrArmor(0, new ItemStack(Items.bow)); + if(worldObj.rand.nextInt(8) == 0) { + ((EntitySkeleton) entity).setSkeletonType(1); + ((EntitySkeleton) entity).setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword)); + } + break; + } + case 2 : { + entity = new EntitySpider(worldObj); + if(worldObj.rand.nextInt(8) == 0) + entity = new EntityCaveSpider(worldObj); + break; + } + case 3 : { + for(int j = 0; j < 1 + worldObj.rand.nextInt(5); j++) { + EntityPixie pixie = new EntityPixie(worldObj); + pixie.setProps(players.get(rand.nextInt(players.size())), this, 1, 8); + pixie.setPosition(posX + width / 2, posY + 2, posZ + width / 2); + worldObj.spawnEntityInWorld(pixie); + } + } + } + + if(entity != null) { + entity.setPosition(source.posX + 0.5 + Math.random() * range - range / 2, posY - 1, source.posZ + 0.5 + Math.random() * range - range / 2); + worldObj.spawnEntityInWorld(entity); + } + } + } + + setMobSpawnTicks(mobTicks - 1); + setTPDelay(10); + } else if(getTPDelay() > 0 && !worldObj.isRemote) { + if(invul > 0) + setInvulTime(invul - 1); + setTPDelay(getTPDelay() - 1); if(getTPDelay() == 0 && getHealth() > 0) { int tries = 0; @@ -295,7 +412,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(tries >= 50) teleportTo(source.posX + 0.5, source.posY + 1.6, source.posZ + 0.5); - if(spawnLandmines && !worldObj.isRemote) + if(spawnLandmines) for(int i = 0; i < 6; i++) { int x = source.posX - 10 + rand.nextInt(20); int z = source.posZ - 10 + rand.nextInt(20); @@ -307,15 +424,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi worldObj.spawnEntityInWorld(landmine); } - if(!worldObj.isRemote) - for(int i = 0; i < (spawnPixies ? worldObj.rand.nextInt(3) : 1); i++) { - EntityPixie pixie = new EntityPixie(worldObj); - pixie.setProps(players.get(rand.nextInt(players.size())), this, 1, 6); - pixie.setPosition(posX + width / 2, posY + 2, posZ + width / 2); - worldObj.spawnEntityInWorld(pixie); - } + for(int i = 0; i < (spawnPixies ? worldObj.rand.nextInt(3) : 1); i++) { + EntityPixie pixie = new EntityPixie(worldObj); + pixie.setProps(players.get(rand.nextInt(players.size())), this, 1, 8); + pixie.setPosition(posX + width / 2, posY + 2, posZ + width / 2); + worldObj.spawnEntityInWorld(pixie); + } - setTPDelay(60); + setTPDelay(dying ? 40 : 60); spawnLandmines = true; spawnPixies = false; } @@ -372,7 +488,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi // Prevent out of bounds teleporting ChunkCoordinates source = getSource(); - if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(posX, posY, posZ, source.posX, source.posY, source.posZ) > 15) + if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(posX, posY, posZ, source.posX, source.posY, source.posZ) > 12) flag = false; } } @@ -410,7 +526,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private static Rectangle barRect; @SideOnly(Side.CLIENT) private static Rectangle hpBarRect; - + @Override @SideOnly(Side.CLIENT) public Rectangle getBossBarTextureRect() { @@ -440,28 +556,28 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } @SideOnly(Side.CLIENT) - private static ShaderCallback shaderCallback; - + private ShaderCallback shaderCallback; + @Override @SideOnly(Side.CLIENT) public ShaderCallback getBossBarShaderCallback(boolean background, int shader) { if(shaderCallback == null) shaderCallback = new ShaderCallback() { - + @Override public void call(int shader) { int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); int hpFractUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "hpFract"); - + float time = getInvulTime(); float grainIntensity = time > 20 ? 1F : time / 20F; - + ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); ARBShaderObjects.glUniform1fARB(hpFractUniform, (float) getHealth() / (float) getMaxHealth()); } - + }; - + return background ? null : shaderCallback; } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 31c120d23..d9c3efee0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -60,9 +60,9 @@ public class EntityMagicLandmine extends Entity { if(!worldObj.isRemote) { List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); for(EntityPlayer player : players) { - player.attackEntityFrom(summoner == null ? DamageSource.generic : DamageSource.causeMobDamage(summoner), 8); + player.attackEntityFrom(summoner == null ? DamageSource.generic : DamageSource.causeMobDamage(summoner), 10); player.addPotionEffect(new PotionEffect(Potion.blindness.id, 25, 0)); - player.addPotionEffect(new PotionEffect(Potion.wither.id, 60, 3)); + player.addPotionEffect(new PotionEffect(Potion.wither.id, 70, 3)); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index e73ff9719..2bbfac467 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -89,7 +89,7 @@ public class EntityPixie extends EntityFlyingCreature { @Override public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { - if(getType() == 0 && par1DamageSource.getEntity() != summoner || getType() == 1 && par1DamageSource.getDamageType().equals("player")) + if(getType() == 0 && par1DamageSource.getEntity() != summoner || getType() == 1 && par1DamageSource.getEntity() instanceof EntityPlayer) return super.attackEntityFrom(par1DamageSource, par2); return false; } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 03a3ec68c..401e68e14 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -462,6 +462,7 @@ public final class LexiconData { new PageBrew(ModBrewRecipes.speedBrew, "5a", "5b"), new PageBrew(ModBrewRecipes.strengthBrew, "6a", "6b"), new PageBrew(ModBrewRecipes.hasteBrew, "7a", "7b"), new PageBrew(ModBrewRecipes.healingBrew, "8a", "8b"), new PageBrew(ModBrewRecipes.jumpBoostBrew, "9a", "9b"), new PageBrew(ModBrewRecipes.regenerationBrew, "10a", "10b"), + new PageBrew(ModBrewRecipes.weakRegenerationBrew, "17a", "17b"), new PageBrew(ModBrewRecipes.resistanceBrew, "11a", "11b"), new PageBrew(ModBrewRecipes.fireResistanceBrew, "12a", "12b"), new PageBrew(ModBrewRecipes.waterBreathingBrew, "13a", "13b"), new PageBrew(ModBrewRecipes.invisibilityBrew, "14a", "14b"), new PageBrew(ModBrewRecipes.nightVisionBrew, "15a", "15b"), new PageBrew(ModBrewRecipes.absorptionBrew, "16a", "16b")); diff --git a/src/main/java/vazkii/botania/common/lib/LibBrewNames.java b/src/main/java/vazkii/botania/common/lib/LibBrewNames.java index b5f4d269b..f99e34572 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBrewNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBrewNames.java @@ -19,6 +19,7 @@ public final class LibBrewNames { public static final String HEALING = "healing"; public static final String JUMP_BOOST = "jumpBoost"; public static final String REGEN = "regen"; + public static final String REGEN_WEAK = "regenWeak"; public static final String RESISTANCE = "resistance"; public static final String FIRE_RESISTANCE = "fireResistance"; public static final String WATER_BREATHING = "waterBreathing"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index d2e7cbe8e..94d196e69 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -787,6 +787,7 @@ botania.brew.haste=Adrenaline botania.brew.healing=Mending botania.brew.jumpBoost=Upsurging botania.brew.regen=Revitalization +botania.brew.regenWeak=Restoration botania.brew.resistance=Fortitude botania.brew.fireResistance=Magmaskin botania.brew.waterBreathing=Gills @@ -1303,6 +1304,8 @@ botania.page.brewery9a=A simple brew, it mimics a &1Potion of Leaping&0, when ta botania.page.brewery9b=I got jumps, isn't that what the kids say? botania.page.brewery10a=A simple brew, it mimics a &1Potion of Regeneration&0, when taken, it has a similar effect, giving the individual a &4Regeneration II&0 effect. botania.page.brewery10b=Good reaction to simochi +botania.page.brewery17a=A simple brew, it mimics a &1Potion of Regeneration&0, when taken, it has a similar effect, giving the individual a &4Regeneration&0 effect, albeit for longer than the previous brew. +botania.page.brewery17b=I guess she was just more resilient botania.page.brewery11a=A simple brew, it mimics a &1Potion of Resistance&0, when taken, it has a similar effect, giving the individual a &4Resistance II&0 effect. botania.page.brewery11b=Can't touch this botania.page.brewery12a=A simple brew, it mimics a &1Potion of Fire Resistance&0, when taken, it has a similar effect, giving the individual a &4Fire Resistance&0 effect.