From 18623e64df3ff305a65effa1d1676c32c8ef1a80 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 22 Oct 2016 19:25:46 +0100 Subject: [PATCH] Recipe/docs for the cloud amulets --- .../common/crafting/ModCraftingRecipes.java | 25 +++++++++++++++++-- .../equipment/bauble/ItemCloudPendant.java | 3 +-- .../bauble/ItemSuperCloudPendant.java | 3 +-- .../botania/common/lexicon/LexiconData.java | 8 ++++++ .../vazkii/botania/common/lib/LibLexicon.java | 2 ++ .../resources/assets/botania/lang/en_US.lang | 12 +++++++++ 6 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 1652235e0..79e3ed6ae 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -301,6 +301,8 @@ public final class ModCraftingRecipes { public static IRecipe recipeForkLuminizer; public static IRecipe recipeToggleLuminizer; public static IRecipe recipeInvisibilityCloak; + public static IRecipe recipeCloudPendant; + public static IRecipe recipeSuperCloudPendant; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -763,7 +765,7 @@ public final class ModCraftingRecipes { // Snowflake Pendant Recipe addOreDictRecipe(new ItemStack(ModItems.icePendant), "WS ", "S S", "MSR", - 'S', new ItemStack(Items.STRING), + 'S', LibOreDict.MANA_STRING, 'M', LibOreDict.MANA_STEEL, 'R', LibOreDict.RUNE[0], 'W', LibOreDict.RUNE[7]); @@ -772,7 +774,7 @@ public final class ModCraftingRecipes { // Pyroclast Pendant Recipe addOreDictRecipe(new ItemStack(ModItems.lavaPendant), "MS ", "S S", "DSF", - 'S', new ItemStack(Items.STRING), + 'S', LibOreDict.MANA_STRING, 'D', LibOreDict.MANA_STEEL, 'M', LibOreDict.RUNE[5], 'F', LibOreDict.RUNE[1]); @@ -2040,6 +2042,25 @@ public final class ModCraftingRecipes { 'P', LibOreDict.MANA_PEARL); recipeInvisibilityCloak = BotaniaAPI.getLatestAddedRecipe(); + // Cirrus Pendant Recipe + addOreDictRecipe(new ItemStack(ModItems.cloudPendant), + "MS ", "S S", "DSF", + 'S', LibOreDict.MANA_STRING, + 'D', LibOreDict.MANA_STEEL, + 'M', LibOreDict.RUNE[6], + 'F', LibOreDict.RUNE[3]); + recipeCloudPendant = BotaniaAPI.getLatestAddedRecipe(); + + // Nimbus Pendant Recipe + addOreDictRecipe(new ItemStack(ModItems.superCloudPendant), + "BEB", "BPB", "NGN", + 'E', LibOreDict.ELEMENTIUM, + 'B', new ItemStack(Items.GHAST_TEAR), + 'P', new ItemStack(ModItems.cloudPendant), + 'N', new ItemStack(Blocks.WOOL), + 'G', LibOreDict.LIFE_ESSENCE); + recipeSuperCloudPendant = BotaniaAPI.getLatestAddedRecipe(); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index 8ee6e6317..a3f45c31a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -90,8 +90,7 @@ public class ItemCloudPendant extends CloudPendantShim implements IBaubleRender Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F); - GlStateManager.rotate(-45F, 0F, 0F, 1F); + GlStateManager.translate(-0.2F, -0.3F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.cirrusGem; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java index 18434fd89..0b83c310b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java @@ -45,8 +45,7 @@ public class ItemSuperCloudPendant extends ItemCloudPendant { Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F); - GlStateManager.rotate(-45F, 0F, 0F, 1F); + GlStateManager.translate(-0.2F, -0.45F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.nimbusGem; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index b0e621672..12aa902ac 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -253,6 +253,8 @@ public final class LexiconData { public static LexiconEntry baubleBox; public static LexiconEntry dodgeRing; public static LexiconEntry invisibilityCloak; + public static LexiconEntry cloudPendant; + public static LexiconEntry superCloudPendant; public static LexiconEntry alfhomancyIntro; public static LexiconEntry elvenMessage; @@ -1233,6 +1235,12 @@ public final class LexiconData { invisibilityCloak = new BasicLexiconEntry(LibLexicon.BAUBLE_INVISIBILITY_CLOAK, categoryBaubles); invisibilityCloak.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeInvisibilityCloak)); + cloudPendant = new BasicLexiconEntry(LibLexicon.BAUBLE_CLOUD_PENDANT, categoryBaubles); + cloudPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCloudPendant)); + + superCloudPendant = new AlfheimLexiconEntry(LibLexicon.BAUBLE_SUPER_CLOUD_PENDANT, categoryBaubles); + superCloudPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSuperCloudPendant)); + // ALFHOMANCY ENTRIES alfhomancyIntro = new BasicLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); alfhomancyIntro.setPriority() diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index de3d7b483..d66210418 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -228,6 +228,8 @@ public final class LibLexicon { public static final String BAUBLE_BOX = "baubleBox"; public static final String BAUBLE_DODGE_RING = "dodgeRing"; public static final String BAUBLE_INVISIBILITY_CLOAK = "invisibilityCloak"; + public static final String BAUBLE_CLOUD_PENDANT = "cloudPendant"; + public static final String BAUBLE_SUPER_CLOUD_PENDANT = "superCloudPendant"; public static final String ALF_INTRO = "aIntro"; public static final String ALF_MESSAGE = "elfMessage"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index f9dd5eea9..3e0e59f03 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3534,6 +3534,18 @@ botania.tagline.invisibilityCloak=Exactly what it says on the tin botania.page.invisibilityCloak0=Not much explanation is required for the &1Invisibility Cloak&0.
It's a bauble worn on the &4body&0 slot, that will take &4Mana&0 from the wearer's inventory to make them, and their baubles invisible as long as it's worn and the cost is fulfiled. botania.page.invisibilityCloak1=You're a wizard, steve +# -- CIRRUS AMULET +botania.entry.cloudPendant=Cirrus Amulet +botania.tagline.cloudPendant=Gives you double jump +botania.page.cloudPendant0=The &1Cirrus Amulet&0 is a bauble that can be worn in the &4amulet&0 slot.
While being worn, the wearer is granted the ability to &4double jump&0, the second jump negating all currently accumulated fall momentum and damage that would occur from the fall. +botania.page.cloudPendant1=It's all in the cloud + +# -- NIMBUS AMULET +botania.entry.superCloudPendant=Nimbus Amulet +botania.tagline.superCloudPendant=Gives you triple jump +botania.page.superCloudPendant0=The &1Nimbus Amulet&0 is an upgraded version of the &1Cirrus Amulet&0, infused with the power of &1Gaia Spirits&0, it allows the wearer to &4triple jump&0. +botania.page.superCloudPendant1=Magic > physics + # - ALFHOMANCY # -- THE PORTAL TO ALFHEIM botania.entry.aIntro=The Portal to Alfheim