From fcfb7d2356c320efb81b2fa1a905ac6ec389fe83 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 30 Jul 2017 18:30:59 -0500 Subject: [PATCH] Dice now succeeds until all relics are unlocked --- .../java/vazkii/botania/api/item/IRelic.java | 8 +++ .../common/item/relic/ItemAesirRing.java | 7 +++ .../botania/common/item/relic/ItemDice.java | 61 +++++++++---------- .../common/item/relic/ItemFlugelEye.java | 7 +++ .../common/item/relic/ItemInfiniteFruit.java | 5 ++ .../common/item/relic/ItemKingKey.java | 7 +++ .../common/item/relic/ItemLokiRing.java | 7 +++ .../common/item/relic/ItemOdinRing.java | 9 ++- .../common/item/relic/ItemThorRing.java | 7 +++ 9 files changed, 86 insertions(+), 32 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index b1752adb6..2bd0fff60 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -38,4 +38,12 @@ public interface IRelic { */ public boolean hasUUID(ItemStack stack); + /** + * Get the advancement granted when this relic binds + */ + @Nullable + default ResourceLocation getAdvancement() { + return null; + } + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index e229e0e09..8bd17160f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -20,6 +20,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; @@ -27,6 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import java.util.List; import java.util.UUID; @@ -63,6 +65,11 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina } } + @Override + public ResourceLocation getAdvancement() { + return new ResourceLocation(LibMisc.MOD_ID, "challenge/aesir_ring"); + } + @Override public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { ((ItemOdinRing) ModItems.odinRing).onValidPlayerWornTick(stack, player); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index af9aa00d3..4504499c8 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.item.relic; -import gnu.trove.list.array.TIntArrayList; +import net.minecraft.advancements.Advancement; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; @@ -29,11 +30,10 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; public class ItemDice extends ItemRelic { - - private static final int[] SIDES_FOR_MOON_PHASES = { -1, 0, 1, 2, -1, 2, 3, 4 }; - public static ItemStack[] relicStacks; public ItemDice() { @@ -54,35 +54,30 @@ public class ItemDice extends ItemRelic { public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - if(isRightPlayer(player, stack) && !player.world.isRemote) { - int moonPhase = world.provider.getMoonPhase(world.getWorldTime()); - int relic = SIDES_FOR_MOON_PHASES[moonPhase]; - if(hasRelicAlready(player, relic)) { - TIntArrayList possible = new TIntArrayList(); - TIntArrayList alreadyHas = new TIntArrayList(); - for(int i = 0; i < 6; i++) - if(hasRelicAlready(player, i)) - alreadyHas.add(i); - else possible.add(i); - - if(alreadyHas.size() > 0) - possible.add(alreadyHas.get(world.rand.nextInt(alreadyHas.size()))); - relic = possible.get(world.rand.nextInt(possible.size())); - } + if(isRightPlayer(player, stack)) { + if(world.isRemote) + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); - if(hasRelicAlready(player, relic)) { - player.sendMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); - stack.shrink(1); - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + List possible = new ArrayList<>(); + for(int i = 0; i < 6; i++) { + if(!hasRelicAlready(player, i)) + possible.add(i); } - player.sendMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); - return ActionResult.newResult(EnumActionResult.SUCCESS, relicStacks[relic].copy()); + if(possible.isEmpty()) { + player.sendMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", world.rand.nextInt(6) + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); + stack.shrink(1); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } else { + int relic = possible.get(world.rand.nextInt(possible.size())); + player.sendMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); + return ActionResult.newResult(EnumActionResult.SUCCESS, relicStacks[relic].copy()); + } } - return ActionResult.newResult(EnumActionResult.FAIL, stack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override @@ -91,15 +86,19 @@ public class ItemDice extends ItemRelic { } private boolean hasRelicAlready(EntityPlayer player, int relic) { - if(relic < 0 || relic > 5 || !(player instanceof EntityPlayerMP)) + if(relic < 0 || relic > relicStacks.length || !(player instanceof EntityPlayerMP)) return true; EntityPlayerMP mpPlayer = (EntityPlayerMP) player; Item item = relicStacks[relic].getItem(); - IRelic irelic = (IRelic) item; - return false; // todo 1.12 - /*Achievement achievement = irelic.getBindAchievement(); - return mpPlayer.getStatFile().hasAchievementUnlocked(achievement);*/ + ResourceLocation advId = ((IRelic) item).getAdvancement(); + + if(advId != null) { + Advancement adv = mpPlayer.getServerWorld().getAdvancementManager().getAdvancement(advId); + return adv != null && mpPlayer.getAdvancements().getProgress(adv).isDone(); + } + + return false; } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index c7a605014..e86a135aa 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -21,6 +21,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -31,6 +32,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -142,4 +144,9 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs return true; } + @Override + public ResourceLocation getAdvancement() { + return new ResourceLocation(LibMisc.MOD_ID, "challenge/flugel_eye"); + } + } 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 f64183e60..68345496b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -84,4 +84,9 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { return true; } + @Override + public ResourceLocation getAdvancement() { + return new ResourceLocation(LibMisc.MOD_ID, "challenge/infinite_fruit"); + } + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index ca78b8941..beecba898 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; @@ -26,6 +27,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Random; @@ -136,4 +138,9 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { return true; } + @Override + public ResourceLocation getAdvancement() { + return new ResourceLocation(LibMisc.MOD_ID, "challenge/king_key"); + } + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 7971a93fe..1ee7bb702 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -43,6 +44,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.Collections; @@ -275,5 +277,10 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat return true; } + @Override + public ResourceLocation getAdvancement() { + return new ResourceLocation(LibMisc.MOD_ID, "challenge/loki_ring"); + } + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index dd8a40314..95e2a19c1 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -20,6 +20,7 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.fml.common.Mod; @@ -28,6 +29,7 @@ import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; @@ -99,12 +101,17 @@ public class ItemOdinRing extends ItemRelicBauble { player.getAttributeMap().removeAttributeModifiers(attributes); } - void fillModifiers(Multimap attributes, ItemStack stack) { + private void fillModifiers(Multimap attributes, ItemStack stack) { if(stack.isEmpty()) // workaround for Azanor/Baubles#156 return; attributes.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } + @Override + public ResourceLocation getAdvancement() { + return new ResourceLocation(LibMisc.MOD_ID, "challenge/odin_ring"); + } + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java index 84e1fc11a..7709833c7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -14,9 +14,11 @@ import baubles.api.BaubleType; import baubles.api.BaublesApi; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; public class ItemThorRing extends ItemRelicBauble { @@ -29,6 +31,11 @@ public class ItemThorRing extends ItemRelicBauble { return BaubleType.RING; } + @Override + public ResourceLocation getAdvancement() { + return new ResourceLocation(LibMisc.MOD_ID, "challenge/thor_ring"); + } + public static ItemStack getThorRing(EntityPlayer player) { IItemHandler baubles = BaublesApi.getBaublesHandler(player); ItemStack stack1 = baubles.getStackInSlot(1);