Revert more number changes

This commit is contained in:
Vasco Lavos committed 2017-09-02 16:29:27 +01:00
1 parent 99a5a2a7ba
commit 872e98a5b0
7 files changed
+17 -30

No files matched your search

@@ -36,13 +36,13 @@ public class SubTileArcaneRose extends SubTileGenerating {
for(EntityPlayer player : players)
if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) {
ExperienceHelper.drainPlayerXP(player, 1);
mana += 17;
mana += 50;
return;
}
List<EntityXPOrb> orbs = supertile.getWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntityXPOrb orb : orbs) {
mana += orb.getXpValue() * 12;
mana += orb.getXpValue() * 35;
orb.setDead();
return;
}
@@ -98,6 +98,11 @@ public class SubTileEndoflame extends SubTileGenerating {
return 300;
}
@Override
public int getValueForPassiveGeneration() {
return 3;
}
@Override
public int getColor() {
return 0x785000;
@@ -180,7 +180,7 @@ public class SubTileHydroangeas extends SubTileGenerating {
@Override
public int getDelayBetweenPassiveGeneration() {
boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering());
return rain ? 6 : 9;
return rain ? 2 : 3;
}
public int getCooldown() {
@@ -17,13 +17,11 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.lexicon.LexiconData;
@@ -36,33 +34,27 @@ public class SubTileMunchdew extends SubTileGenerating {
private static final String TAG_COOLDOWN = "cooldown";
private static final String TAG_ATE_ONCE = "ateOnce";
private static final int SET_COOLDOWN_EVENT = 0;
private static final int RANGE = 8;
private static final int RANGE_Y = 16;
private boolean ateOnce = false;
private int ticksWithoutEating = -1;
private int cooldown = 0;
boolean ateOnce = false;
int ticksWithoutEating = -1;
int cooldown = 0;
@Override
public void onUpdate() {
super.onUpdate();
if(cooldown > 0) {
if(Math.random() < 0.5)
Botania.proxy.wispFX(getPos().getX() + Math.random(), getPos().getY() + 0.8, getPos().getZ() + Math.random(), 0.5F, 0.5F, 0.5F, 0.05F, -0.025F);
cooldown--;
ticksWithoutEating = 0;
return;
}
if(getWorld().isRemote)
return;
int manaPerLeaf = 80;
int manaPerLeaf = 160;
eatLeaves : {
if(getMaxMana() - mana >= manaPerLeaf && ticksExisted % 4 == 0) {
if(getMaxMana() - mana >= manaPerLeaf && !supertile.getWorld().isRemote && ticksExisted % 4 == 0) {
List<BlockPos> coords = new ArrayList<>();
BlockPos pos = supertile.getPos();
@@ -100,17 +92,7 @@ public class SubTileMunchdew extends SubTileGenerating {
if(ateOnce) {
ticksWithoutEating++;
if(ticksWithoutEating >= 5)
getWorld().addBlockEvent(getPos(), supertile.getBlockType(), SET_COOLDOWN_EVENT, 1600);
}
}
@Override
public boolean receiveClientEvent(int id, int param) {
if(id == SET_COOLDOWN_EVENT) {
cooldown = param;
return true;
} else {
return super.receiveClientEvent(id, param);
cooldown = 1600;
}
}
@@ -45,7 +45,7 @@ public class SubTileNarslimmus extends SubTileGenerating {
if(slime.getEntityData().getBoolean(TAG_WORLD_SPAWNED) && !slime.isDead) {
int size = slime.getSlimeSize();
int mul = (int) Math.pow(2, size);
int mana = 273 * mul;
int mana = 820 * mul;
if(!slime.world.isRemote) {
slime.setDead();
slime.playSound(size > 1 ? SoundEvents.ENTITY_SLIME_SQUISH : SoundEvents.ENTITY_SMALL_SLIME_SQUISH, 1, 0.02F);
@@ -42,7 +42,7 @@ public class SubTileRafflowsia extends SubTileGenerating {
public void onUpdate() {
super.onUpdate();
int mana = 5250;
int mana = 2100;
if(getMaxMana() - this.mana >= mana && !supertile.getWorld().isRemote && ticksExisted % 40 == 0) {
for(int i = 0; i < RANGE * 2 + 1; i++)
@@ -56,7 +56,7 @@ public class SubTileThermalily extends SubTileHydroangeas {
@Override
public int getValueForPassiveGeneration() {
return 7;
return 20;
}
@Override