From f05a08955c8901c53a4600a8e9600c56b3a4063a Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 21 Aug 2015 21:23:25 +0100 Subject: [PATCH] Big magnet! --- .../common/core/BotaniaCreativeTab.java | 1 + .../common/crafting/ModCraftingRecipes.java | 9 +++++++- .../vazkii/botania/common/item/ModItems.java | 5 ++++- .../bauble/ItemGreaterMagnetRing.java | 21 ++++++++++++++++++ .../item/equipment/bauble/ItemMagnetRing.java | 12 +++++++--- .../botania/common/lexicon/LexiconData.java | 2 +- .../botania/common/lib/LibItemNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 2 ++ .../textures/items/magnetRingGreater0.png | Bin 0 -> 15202 bytes .../textures/items/magnetRingGreater1.png | Bin 0 -> 15187 bytes 10 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterMagnetRing.java create mode 100644 src/main/resources/assets/botania/textures/items/magnetRingGreater0.png create mode 100644 src/main/resources/assets/botania/textures/items/magnetRingGreater1.png diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index e72d146bd..e8845eb56 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -215,6 +215,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.waterRing); addItem(ModItems.miningRing); addItem(ModItems.magnetRing); + addItem(ModItems.magnetRingGreater); addItem(ModItems.swapRing); addItem(ModItems.reachRing); addItem(ModItems.pixieRing); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 319e3b480..2ed6ef678 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -278,6 +278,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeSlimeBottle; public static IRecipe recipeStarSword; public static IRecipe recipeExchangeRod; + public static IRecipe recipeGreaterMagnetRing; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -1887,7 +1888,7 @@ public final class ModCraftingRecipes { 'T', new ItemStack(ModItems.terraSword)); recipeStarSword = BotaniaAPI.getLatestAddedRecipe(); - // Rod of the Shifting Crust + // Rod of the Shifting Crust Recipe addOreDictRecipe(new ItemStack(ModItems.exchangeRod), " SR", " TS", "T ", 'T', LibOreDict.LIVINGWOOD_TWIG, @@ -1895,6 +1896,12 @@ public final class ModCraftingRecipes { 'R', LibOreDict.RUNE[12]); recipeExchangeRod = BotaniaAPI.getLatestAddedRecipe(); + // Greater Ring of Magnetization Recipe + addShapelessOreDictRecipe(new ItemStack(ModItems.magnetRingGreater), LibOreDict.TERRA_STEEL, new ItemStack(ModItems.magnetRing)); + recipeGreaterMagnetRing = BotaniaAPI.getLatestAddedRecipe(); + + /////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Storage Block/Nugget Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index b0a6b1ab5..b9a84c0b9 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -38,6 +38,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemGoldenLaurel; import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; +import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing; import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing; import vazkii.botania.common.item.equipment.bauble.ItemHolyCloak; import vazkii.botania.common.item.equipment.bauble.ItemIcePendant; @@ -251,7 +252,8 @@ public final class ModItems { public static Item slimeBottle; public static Item starSword; public static Item exchangeRod; - + public static Item magnetRingGreater; + public static void init() { lexicon = new ItemLexicon(); petal = new ItemPetal(); @@ -390,6 +392,7 @@ public final class ModItems { slimeBottle = new ItemSlimeBottle(); starSword = new ItemStarSword(); exchangeRod = new ItemExchangeRod(); + magnetRingGreater = new ItemGreaterMagnetRing(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterMagnetRing.java new file mode 100644 index 000000000..4e548c6b7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterMagnetRing.java @@ -0,0 +1,21 @@ +/** + * 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 @ [Aug 21, 2015, 9:00:04 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemGreaterMagnetRing extends ItemMagnetRing { + + public ItemGreaterMagnetRing() { + super(LibItemNames.MAGNET_RING_GREATER, 16); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 785015bbc..005c65a74 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -49,10 +49,17 @@ public class ItemMagnetRing extends ItemBauble { "appliedenergistics2:item.ItemCrystalSeed", }); + int range; + public ItemMagnetRing() { - super(LibItemNames.MAGNET_RING); + this(LibItemNames.MAGNET_RING, 6); MinecraftForge.EVENT_BUS.register(this); } + + public ItemMagnetRing(String name, int range) { + super(name); + this.range = range; + } @Override @SideOnly(Side.CLIENT) @@ -72,7 +79,7 @@ public class ItemMagnetRing extends ItemBauble { InventoryBaubles inv = PlayerHandler.getPlayerBaubles(event.player); for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack != null && stack.getItem() == this) { + if(stack != null && stack.getItem() instanceof ItemMagnetRing) { setCooldown(stack, 100); BotaniaAPI.internalHandler.sendBaubleUpdatePacket(event.player, i); } @@ -87,7 +94,6 @@ public class ItemMagnetRing extends ItemBauble { if(cooldown <= 0) { if(!player.isSneaking()) { - int range = 6; double x = player.posX; double y = player.posY -(player.worldObj.isRemote ? 1.62 : 0) + 0.75; double z = player.posZ; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 8a68d9d5e..eb9f61904 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -868,7 +868,7 @@ public final class LexiconData { miningRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMiningRing)); magnetRing = new BLexiconEntry(LibLexicon.BAUBLE_MAGNET_RING, categoryBaubles); - magnetRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMagnetRing)); + magnetRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMagnetRing), new PageCraftingRecipe("2", ModCraftingRecipes.recipeGreaterMagnetRing)); divaCharm = new ALexiconEntry(LibLexicon.BAUBLE_DIVA_CHARM, categoryBaubles); divaCharm.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDivaCharm)); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 343e67cd2..ae4293a5f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -150,6 +150,7 @@ public final class LibItemNames { public static final String SLIME_BOTTLE = "slimeBottle"; public static final String STAR_SWORD = "starSword"; public static final String EXCHANGE_ROD = "exchangeRod"; + public static final String MAGNET_RING_GREATER = "magnetRingGreater"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index d015f1152..99edd6bc7 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1432,6 +1432,7 @@ item.botania:cacophonium.name=Cacophonium item.botania:slimeBottle.name=Slime in a Bottle item.botania:starSword.name=Starcaller item.botania:exchangeRod.name=Rod of the Shifting Crust +item.botania:magnetRingGreater.name=Greater Ring of Magnetization # BREW NAMES botania.brew.fallback=Fallback @@ -2723,6 +2724,7 @@ botania.page.miningRing1=Diggy diggy hole botania.entry.magnetRing=Ring of Magnetization botania.page.magnetRing0=By turning a &1Magnetizing Lens&0 into a wearable ring, one can use it to magnetize nearby items. While equipped, this ring will make any nearby items magnetize towards the wearer if they're not sneaking. A notable feature of this piece is that it'll negate its effect for 5 seconds after the wearer tosses an item so as to not interfere with whatever means it was tossed for. A &1Solegnolia&0 can disrupt this ring's functionality. botania.page.magnetRing1=How do they work? +botania.page.magnetRing2=Upgrading the ring for a larger range # -- RING OF FAR REACH botania.entry.reachRing=Ring of Far Reach diff --git a/src/main/resources/assets/botania/textures/items/magnetRingGreater0.png b/src/main/resources/assets/botania/textures/items/magnetRingGreater0.png new file mode 100644 index 0000000000000000000000000000000000000000..a980055136aae254ac7a090ee0b9c807d89deed6 GIT binary patch literal 15202 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 Zxuw#N?;k(6&3^5*V?}3Z|MGRie*!{dnv?(l literal 0 HcmV?d00001