From 2857570170c030a4da3d656f871de33a1ad80090 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 31 Mar 2015 01:10:24 +0100 Subject: [PATCH] Getting the Dice of Fate setup. --- .../common/core/BotaniaCreativeTab.java | 1 + .../vazkii/botania/common/item/ModItems.java | 5 +- .../botania/common/item/relic/ItemDice.java | 86 ++++++++++++++++++ .../botania/common/lib/LibItemNames.java | 3 +- .../resources/assets/botania/lang/en_US.lang | 7 +- .../items/{unused/faithDie.png => dice.png} | Bin .../faithDie.png.mcmeta => dice.png.mcmeta} | 0 7 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/relic/ItemDice.java rename src/main/resources/assets/botania/textures/items/{unused/faithDie.png => dice.png} (100%) rename src/main/resources/assets/botania/textures/items/{unused/faithDie.png.mcmeta => dice.png.mcmeta} (100%) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index e2bb9b207..67132ee86 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -173,6 +173,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.phantomInk); addItem(ModItems.ancientWill); addItem(ModItems.pinkinator); + addItem(ModItems.dice); addItem(ModItems.infiniteFruit); addItem(ModItems.excaliber); addItem(ModItems.flugelEye); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index ea4a4b508..239d6b5c7 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -83,6 +83,7 @@ import vazkii.botania.common.item.material.ItemPetal; import vazkii.botania.common.item.material.ItemQuartz; import vazkii.botania.common.item.material.ItemRune; import vazkii.botania.common.item.relic.ItemAesirRing; +import vazkii.botania.common.item.relic.ItemDice; import vazkii.botania.common.item.relic.ItemExcaliber; import vazkii.botania.common.item.relic.ItemFlugelEye; import vazkii.botania.common.item.relic.ItemInfiniteFruit; @@ -228,6 +229,7 @@ public final class ModItems { public static Item odinRing; public static Item lokiRing; public static Item aesirRing; + public static Item dice; public static void init() { lexicon = new ItemLexicon(); @@ -353,7 +355,8 @@ public final class ModItems { odinRing = new ItemOdinRing(); lokiRing = new ItemLokiRing(); aesirRing = new ItemAesirRing(); - + dice = new ItemDice(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java new file mode 100644 index 000000000..70a417ffe --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -0,0 +1,86 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 30, 2015, 6:52:35 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.ChatStyle; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import vazkii.botania.api.item.IRelic; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemDice extends ItemRelic { + + private static final int[] SIDES_FOR_MOON_PHASES = new int[] { + -1, 0, 1, 2, -1, 2, 3, 4 + }; + + final ItemStack[] relicStacks; + + public ItemDice() { + super(LibItemNames.DICE); + + relicStacks = new ItemStack[] { + new ItemStack(ModItems.infiniteFruit), + new ItemStack(ModItems.excaliber), + new ItemStack(ModItems.flugelEye), + new ItemStack(ModItems.thorRing), + new ItemStack(ModItems.odinRing), + new ItemStack(ModItems.lokiRing) + }; + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(isRightPlayer(player, stack) && !player.worldObj.isRemote) { + int moonPhase = world.provider.getMoonPhase(world.getWorldTime()); + int side = SIDES_FOR_MOON_PHASES[moonPhase]; + int relic = side; + if(hasRelicAlready(player, relic)) + relic = world.rand.nextInt(6); + + world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); + + if(hasRelicAlready(player, relic)) { + player.addChatMessage(new ChatComponentTranslation("botaniamisc.dudDiceRoll", (relic + 1)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN))); + stack.stackSize--; + return stack; + } + + player.addChatMessage(new ChatComponentTranslation("botaniamisc.diceRoll", (relic + 1)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN))); + return relicStacks[relic].copy(); + } + + return stack; + } + + boolean hasRelicAlready(EntityPlayer player, int relic) { + if(relic < 0 || relic > 5 || !(player instanceof EntityPlayerMP)) + return true; + + EntityPlayerMP mpPlayer = (EntityPlayerMP) player; + Item item = relicStacks[relic].getItem(); + IRelic irelic = (IRelic) item; + Achievement achievement = irelic.getBindAchievement(); + return mpPlayer.func_147099_x().hasAchievementUnlocked(achievement); + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index c7736baa3..f4c181656 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -136,7 +136,8 @@ public final class LibItemNames { public static final String ODIN_RING = "odinRing"; public static final String LOKI_RING = "lokiRing"; public static final String AESIR_RING = "aesirRing"; - + public static final String DICE = "dice"; + public static final String[] LENS_NAMES = new String[] { "lensNormal", "lensSpeed", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 6db85deee..d911fbdd1 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -98,6 +98,8 @@ botaniamisc.pinkinatorDesc=Apply directly to Wither botaniamisc.relicUnbound=&6Relic&7, Unbound botaniamisc.relicSoulbound=&6Relic&7, Soulbound to &f%s botaniamisc.notYourSagittarius=&4This relic is not yours +botaniamisc.diceRoll=The dice lands on a %s, you notice that it transforms into something else. +botaniamisc.dudDiceRoll=The dice lands on a %s, it seemed to vanish into thin air afterward. # NEI INTEGRATION botania.nei.brewery=Botanical Brewery @@ -311,6 +313,9 @@ botania.baubletype.ring=Equippable in the &aRing&7 slot botania.baubletype.belt=Equippable in the &aBelt&7 slot botania.baubletooltip=Press &b%key%&7 to open the Baubles menu +# RELIC POEMS + + # DEATH MESSAGES death.attack.botania-relic=%s was punished for using a relic that isn't theirs @@ -1176,7 +1181,7 @@ item.botania:thorRing.name=Ring of Thor item.botania:odinRing.name=Ring of Odin item.botania:lokiRing.name=Ring of Loki item.botania:aesirRing.name=Ring of the Aesir -item.botania:relicDice.name=Dice of Fate +item.botania:dice.name=Dice of Fate # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/textures/items/unused/faithDie.png b/src/main/resources/assets/botania/textures/items/dice.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/faithDie.png rename to src/main/resources/assets/botania/textures/items/dice.png diff --git a/src/main/resources/assets/botania/textures/items/unused/faithDie.png.mcmeta b/src/main/resources/assets/botania/textures/items/dice.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/faithDie.png.mcmeta rename to src/main/resources/assets/botania/textures/items/dice.png.mcmeta