diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index e62c0ea4c..09d75cc88 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -140,6 +140,7 @@ public class ClientProxy extends CommonProxy { @Override public void setExtraReach(EntityLivingBase entity, float reach) { + super.setExtraReach(entity, reach); Minecraft mc = Minecraft.getMinecraft(); EntityPlayer player = mc.thePlayer; if(entity == player) { diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index d27e802e3..8b9dd221b 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -108,7 +108,7 @@ public class CommonProxy { public void setExtraReach(EntityLivingBase entity, float reach) { if(entity instanceof EntityPlayerMP) - ((EntityPlayerMP) entity).theItemInWorldManager.setBlockReachDistance(reach); + ((EntityPlayerMP) entity).theItemInWorldManager.setBlockReachDistance(5.0 + reach); } public long getWorldElapsedTicks() { diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 0465b536b..8f1297927 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -166,6 +166,7 @@ public final class ModCrafingRecipes { public static List recipesLaputaShard; public static IRecipe recipeVirusZombie; public static IRecipe recipeVirusSkeleton; + public static IRecipe recipeReachRing; public static void init() { // Lexicon Recipe @@ -1015,6 +1016,13 @@ public final class ModCrafingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.virus, 1, 1), LibOreDict.PIXIE_DUST, new ItemStack(ModItems.vineBall), new ItemStack(Items.magma_cream), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.skull)); recipeVirusSkeleton = BotaniaAPI.getLatestAddedRecipe(); + // Ring of Far Reach Recipe + addOreDictRecipe(new ItemStack(ModItems.reachRing), + "RE ", "E E", " E ", + 'R', LibOreDict.RUNE[15], + 'E', LibOreDict.ELEMENTIUM); + recipeReachRing = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 89bec9613..eb467f08c 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -152,6 +152,7 @@ public final class LexiconData { public static LexiconEntry flightTiara; public static LexiconEntry pixieRing; public static LexiconEntry superTravelBelt; + public static LexiconEntry reachRing; public static LexiconEntry alfhomancyIntro; public static LexiconEntry elvenMessage; @@ -510,6 +511,9 @@ public final class LexiconData { superTravelBelt = new ALexiconEntry(LibLexicon.BAUBLE_SUPER_TRAVEL_BELT, categoryBaubles); superTravelBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeSuperTravelBelt)); + reachRing = new ALexiconEntry(LibLexicon.BAUBLE_REACH_RING, categoryBaubles); + reachRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeReachRing)); + // ALFHOMANCY ENTRIES alfhomancyIntro = new BLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); alfhomancyIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipeAlfPortal), new PageCraftingRecipe("3", ModCrafingRecipes.recipeNaturaPylon), diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 34d52c00f..b11339fa4 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -129,6 +129,7 @@ public final class LibLexicon { public static final String BAUBLE_FLIGHT_TIARA = "flightTiara"; public static final String BAUBLE_PIXIE_RING = "pixieRing"; public static final String BAUBLE_SUPER_TRAVEL_BELT = "superTravelBelt"; + public static final String BAUBLE_REACH_RING = "reachRing"; public static final String ALF_INTRO = "aIntro"; public static final String ALF_MESSAGE = "elfMessage"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 1f4b0fc71..7ce38376a 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -573,7 +573,7 @@ item.botania:redstoneRoot.name=Redstone Root item.botania:magnetRing.name=Ring of Magnetization item.botania:waterRing.name=Ring of Chordata item.botania:miningRing.name=Ring of the Mantle -item.botania:miningRing.name=Ring of Far Reach +item.botania:reachRing.name=Ring of Far Reach item.botania:terraPick.name=Terra Shatterer item.botania:divaCharm.name=Charm of the Diva item.botania:flightTiara.name=Flügel Tiara @@ -1172,7 +1172,7 @@ botania.page.elfGear15=The out of Infinity # -- EXTRAPOLATED BUCKET botania.entry.openBucket=Extrapolated Bucket botania.page.openBucket0=By creating a bucket out of &1Elementium&0 one seems to notice an interesting feature. The liquids acquired by it simply vanish into the ether, never to be seen again. This seems like a great clean up tool. -botania.page.openBucket1=Geeks... +botania.page.openBucket1=A Souvenir from Lewis # -- LIFE AGGREGATOR botania.entry.spawnerMover=Life Aggregator @@ -1278,6 +1278,11 @@ 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, case they aren't sneaking. botania.page.magnetRing1=How do they work? +# -- RING OF FAR REACH +botania.entry.reachRing=Ring of Far Reach +botania.page.reachRing0=Through the power of one's Pride, nothing is out of their reach. By wearing the &1Ring of Far Reach&0, the maximum distance the wearer can break, place or interact with blocks, as well as attack or interact with entities is increased by about three blocks. +botania.page.reachRing1=Fire and Blood + # -- CHARM OF THE DIVA botania.entry.divaCharm=Charm of the Diva botania.page.divaCharm0=The &1Charm of the Diva&0 blesses the wearer with the ability to have any attacked mob follow the attacker's will, and, case there are any nearby enemies, go after them instead. This process, of course, requires a bit of &4Mana&0 from the wearer's inventory in order to function. diff --git a/resources/assets/botania/textures/items/reachRing.png b/resources/assets/botania/textures/items/reachRing.png index 9197f682e..2f707582c 100644 Binary files a/resources/assets/botania/textures/items/reachRing.png and b/resources/assets/botania/textures/items/reachRing.png differ