Some missing challenge advancements

This commit is contained in:
Vincent Lee committed 2017-07-30 13:33:05 -05:00
1 parent 8f12fbde20
commit 3790652d3d
19 files changed
+226 -16

No files matched your search

@@ -13,7 +13,9 @@ package vazkii.botania.common.block.tile.corporea;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextComponentTranslation;
@@ -29,6 +31,8 @@ import vazkii.botania.api.corporea.ICorporeaAutoCompleteController;
import vazkii.botania.api.corporea.ICorporeaRequestor;
import vazkii.botania.api.corporea.ICorporeaSpark;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.Collections;
@@ -265,6 +269,9 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ
index.doCorporeaRequest(name, count, spark);
event.getPlayer().sendMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE)));
if(CorporeaHelper.lastRequestExtractions >= 50000) {
PlayerHelper.grantCriterion(event.getPlayer(), new ResourceLocation(LibMisc.MOD_ID, "challenge/super_corporea_request"), "code_triggered");
}
}
}
@@ -76,6 +76,7 @@ import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibEntityNames;
@@ -435,6 +436,9 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss {
public void onDeath(@Nonnull DamageSource source) {
super.onDeath(source);
EntityLivingBase entitylivingbase = getAttackingEntity();
if(entitylivingbase instanceof EntityPlayerMP && !anyWithArmor) {
PlayerHelper.grantCriterion((EntityPlayerMP) entitylivingbase, new ResourceLocation(LibMisc.MOD_ID, "challenge/gaia_guardian_no_armor"), "code_triggered");
}
playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX, posY, posZ, 1D, 0D, 0D);
@@ -17,6 +17,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@@ -27,6 +28,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
@@ -42,8 +44,10 @@ import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.entity.EntityManaBurst;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.List;
@@ -95,7 +99,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet
ItemStack stack = player.getHeldItem(hand);
spawnBurstFirst(world, pos, stack);
if(stack.getItemDamage() == 19)
;
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/l20_shard_use"), "code_triggered");
stack.shrink(1);
}
@@ -91,6 +91,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1);
world.spawnEntity(burst);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/mana_blaster_shoot"), "code_triggered");
if(isSugoiKawaiiDesuNe(stack)) {
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/desu_gun"), "code_triggered");
}
} else {
player.swingArm(hand);
player.motionX -= burst.motionX * 0.1;
@@ -14,19 +14,23 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.boss.EntityWither;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.entity.EntityPinkWither;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.List;
@@ -46,18 +50,18 @@ public class ItemPinkinator extends ItemMod {
int range = 16;
List<EntityWither> withers = world.getEntitiesWithinAABB(EntityWither.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range));
for(EntityWither wither : withers)
if(!wither.isDead && !(wither instanceof EntityPinkWither)) {
if(!world.isRemote) {
wither.setDead();
EntityPinkWither pink = new EntityPinkWither(world);
pink.setLocationAndAngles(wither.posX, wither.posY, wither.posZ, wither.rotationYaw, wither.rotationPitch);
pink.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(pink)), null);
world.spawnEntity(pink);
pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
}
world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D);
if(!world.isRemote && !wither.isDead && !(wither instanceof EntityPinkWither)) {
wither.setDead();
EntityPinkWither pink = new EntityPinkWither(world);
pink.setLocationAndAngles(wither.posX, wither.posY, wither.posZ, wither.rotationYaw, wither.rotationPitch);
pink.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(pink)), null);
world.spawnEntity(pink);
pink.spawnExplosionParticle();
pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
stack.shrink(1);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/pinkinator"), "code_triggered");
return ActionResult.newResult(EnumActionResult.SUCCESS, stack);
}
@@ -141,6 +141,10 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
if(SubTileFunctional.class.isAssignableFrom(subtile)) {
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/functional_flower"), "code_triggered");
}
if("".equals(type)) {
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "challenge/null_flower"), "code_triggered");
}
}
}
@@ -17,6 +17,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Enchantments;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -40,6 +41,7 @@ import vazkii.botania.api.mana.IManaGivingItem;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.item.ItemTemperanceStone;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.tool.ToolCommons;
@@ -47,6 +49,7 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick;
import vazkii.botania.common.item.relic.ItemLokiRing;
import vazkii.botania.common.item.relic.ItemThorRing;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.Arrays;
@@ -187,6 +190,10 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
Vec3i endDiff = new Vec3i(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0);
ToolCommons.removeBlocksInIteration(player, stack, world, pos, beginDiff, endDiff, null, MATERIALS, silk, fortune, isTipped(stack));
if(origLevel == 5) {
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/rank_ss_pick"), "code_triggered");
}
}
@Override
@@ -10,6 +10,8 @@
*/
package vazkii.botania.common.lexicon;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementProgress;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.util.ResourceLocation;
@@ -37,10 +39,9 @@ public class RelicLexiconEntry extends BasicLexiconEntry {
if(a == null || player.capabilities.isCreativeMode) {
return true;
} else {
/*Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a);
Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a);
AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(adv);
return progress.isDone();*/
return false; // todo 1.12
return progress != null && progress.isDone();
}
}