diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 869d1859b..e50b693e0 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -32,6 +32,7 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.api.subtile.SubTileEntity; public class DummyMethodHandler implements IInternalMethodHandler { @@ -148,7 +149,17 @@ public class DummyMethodHandler implements IInternalMethodHandler { public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) { // NO-OP } + + @Override + public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) { + // NO-OP + } + @Override + public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { + return new ItemStack(Blocks.stone, 0, 0); + } + @Override public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText) { // NO-OP diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 5364bc9fa..afbd5ff2a 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -31,6 +31,7 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.api.subtile.SubTileEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -96,6 +97,12 @@ public interface IInternalMethodHandler { @SideOnly(Side.CLIENT) public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res); + @SideOnly(Side.CLIENT) + public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound); + + @SideOnly(Side.CLIENT) + public ItemStack getBindDisplayForFlowerType(SubTileEntity e); + @SideOnly(Side.CLIENT) public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText); diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 50c7015c5..b94416a77 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "56", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "57", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 139c30d85..144f42a81 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -23,6 +23,7 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; +import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.IManaPool; /** @@ -30,6 +31,8 @@ import vazkii.botania.api.mana.IManaPool; */ public class SubTileFunctional extends SubTileEntity { + public static final int RANGE = 10; + private static final String TAG_MANA = "mana"; private static final String TAG_POOL_X = "poolX"; @@ -85,8 +88,6 @@ public class SubTileFunctional extends SubTileEntity { } public void linkPool() { - final int range = 10; - boolean needsNew = false; if(linkedPool == null) { needsNew = true; @@ -103,31 +104,26 @@ public class SubTileFunctional extends SubTileEntity { cachedPoolCoordinates = null; } } + } else { + TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); + if(tileAt != null && tileAt instanceof IManaPool) + linkedPool = tileAt; } - if(!needsNew && linkedPool != null) { - if(supertile.getWorldObj().blockExists(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord) && !linkedPool.isInvalid()) { - TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); - if(!(tileAt instanceof IManaPool) || tileAt.isInvalid()) { - linkedPool = null; - needsNew = true; - } else linkedPool = tileAt; - } else { - cachedPoolCoordinates = new ChunkCoordinates(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); - linkedPool = null; - } - } - - if(needsNew) { + if(needsNew && ticksExisted == 1) { // Only for new flowers IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllPoolsInWorld(supertile.getWorldObj()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedPool = network.getClosestPool(coords, supertile.getWorldObj(), range); + linkedPool = network.getClosestPool(coords, supertile.getWorldObj(), RANGE); sizeLastCheck = size; } } } + + public void linkToForcefully(TileEntity pool) { + linkedPool = pool; + } public void addMana(int mana) { this.mana = Math.min(getMaxMana(), this.mana + mana); @@ -210,12 +206,16 @@ public class SubTileFunctional extends SubTileEntity { return false; } + + public boolean isValidBinding() { + return linkedPool != null && !linkedPool.isInvalid(); + } @Override public void renderHUD(Minecraft mc, ScaledResolution res) { String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); - BotaniaAPI.internalHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); + BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index b7010a21f..cfed61122 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -30,6 +30,8 @@ import vazkii.botania.api.mana.IManaCollector; */ public class SubTileGenerating extends SubTileEntity { + public static final int RANGE = 6; + private static final String TAG_MANA = "mana"; private static final String TAG_COLLECTOR_X = "collectorX"; @@ -78,8 +80,6 @@ public class SubTileGenerating extends SubTileEntity { } public void linkCollector() { - final int range = 6; - boolean needsNew = false; if(linkedCollector == null) { needsNew = true; @@ -96,31 +96,26 @@ public class SubTileGenerating extends SubTileEntity { cachedCollectorCoordinates = null; } } + } else { + TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); + if(tileAt != null && tileAt instanceof IManaCollector) + linkedCollector = tileAt; } - if(!needsNew && linkedCollector != null) { - if(supertile.getWorldObj().blockExists(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord) && !linkedCollector.isInvalid()) { - TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); - if(!(tileAt instanceof IManaCollector) || tileAt.isInvalid()) { - linkedCollector = null; - needsNew = true; - } else linkedCollector = tileAt; - } else { - cachedCollectorCoordinates = new ChunkCoordinates(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); - linkedCollector = null; - } - } - - if(needsNew) { + if(needsNew && ticksExisted == 1) { // New flowers only IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllCollectorsInWorld(supertile.getWorldObj()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedCollector = network.getClosestCollector(coords, supertile.getWorldObj(), range); + linkedCollector = network.getClosestCollector(coords, supertile.getWorldObj(), RANGE); sizeLastCheck = size; } } } + + public void linkToForcefully(TileEntity collector) { + linkedCollector = collector; + } public void addMana(int mana) { this.mana = Math.min(getMaxMana(), this.mana + mana); @@ -239,11 +234,16 @@ public class SubTileGenerating extends SubTileEntity { return false; } + + public boolean isValidBinding() { + return linkedCollector != null && !linkedCollector.isInvalid(); + } + @Override public void renderHUD(Minecraft mc, ScaledResolution res) { String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); - BotaniaAPI.internalHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); + BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index dabca1cec..40bd62166 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -394,6 +394,30 @@ public final class HUDHandler { GL11.glDisable(GL11.GL_BLEND); } + + public static void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) { + drawSimpleManaHUD(color, mana, maxMana, name, res); + + Minecraft mc = Minecraft.getMinecraft(); + + int x = res.getScaledWidth() / 2 + 55; + int y = res.getScaledHeight() / 2 + 12; + + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, bindDisplay, x, y); + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + + GL11.glDisable(GL11.GL_DEPTH_TEST); + if(properlyBound) { + mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00); + mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D); + } else { + mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000); + mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D); + } + GL11.glEnable(GL11.GL_DEPTH_TEST); + } public static void renderManaBar(int x, int y, int color, float alpha, int mana, int maxMana) { Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index c96971083..b3a3ee1ee 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -67,6 +67,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.grassSeeds); addItem(ModItems.blackLotus); addItem(ModItems.twigWand); + addItem(ModItems.obedienceStick); addItem(ModItems.manaResource); addBlock(ModBlocks.storage); addItem(ModItems.manaCookie); diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 9ac73feee..125a5908d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -35,6 +35,9 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.IconHelper; @@ -42,6 +45,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lexicon.page.PageBrew; @@ -179,6 +183,16 @@ public class InternalMethodHandler extends DummyMethodHandler { HUDHandler.drawSimpleManaHUD(color, mana, maxMana, name, res); } + @Override + public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) { + HUDHandler.drawComplexManaHUD(color, mana, maxMana, name, res, bindDisplay, properlyBound); + } + + @Override + public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { + return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.spreader) : e instanceof SubTileFunctional ? new ItemStack(ModBlocks.pool) : new ItemStack(ModItems.twigWand); + } + @Override public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText) { PageText.renderText(x, y, width, height, unlocalizedText); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index b7d5d89f2..02626a7da 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -270,6 +270,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeLuminizer; public static IRecipe recipeDetectorLuminizer; public static IRecipe recipeLuminizerLauncher; + public static IRecipe recipeObedienceStick; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -1828,6 +1829,13 @@ public final class ModCraftingRecipes { 'L', new ItemStack(ModBlocks.lightRelay)); recipeLuminizerLauncher = BotaniaAPI.getLatestAddedRecipe(); + // Floral Obedience Stick Recipe + addOreDictRecipe(new ItemStack(ModItems.obedienceStick), + " M", " T ", "T ", + 'M', LibOreDict.MANA_STEEL, + 'T', LibOreDict.LIVINGWOOD_TWIG); + recipeObedienceStick = 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/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java new file mode 100644 index 000000000..3d7b6062f --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -0,0 +1,96 @@ +/** + * 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 @ [Jul 20, 2015, 7:26:14 PM (GMT)] + */ +package vazkii.botania.common.item; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import vazkii.botania.api.mana.IManaCollector; +import vazkii.botania.api.mana.IManaPool; +import vazkii.botania.api.subtile.ISubTileContainer; +import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.common.core.helper.MathHelper; +import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemObedienceStick extends ItemMod { + + public ItemObedienceStick() { + setMaxStackSize(1); + setUnlocalizedName(LibItemNames.OBEDIENCE_STICK); + } + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { + TileEntity tileAt = world.getTileEntity(x, y, z); + if(tileAt != null && (tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) { + boolean pool = tileAt instanceof IManaPool; + Actuator act = pool ? Actuator.functionalActuator : Actuator.generatingActuator; + int range = pool ? SubTileFunctional.RANGE : SubTileGenerating.RANGE; + + for(int i = -range; i < range + 1; i++) + for(int j = -range; j < range + 1; j++) + for(int k = -range; k < range + 1; k++) { + int xp = x + i; + int yp = y + j; + int zp = z + k; + if(MathHelper.pointDistanceSpace(xp, yp, zp, x, y, z) > range) + continue; + + TileEntity tile = world.getTileEntity(xp, yp, zp); + if(tile instanceof ISubTileContainer) { + SubTileEntity subtile = ((ISubTileContainer) tile).getSubTile(); + if(act.actuate(subtile, tileAt)) { + Vector3 orig = new Vector3(xp + 0.5, yp + 0.5, zp + 0.5); + Vector3 end = new Vector3(x + 0.5, y + 0.5, z + 0.5); + ItemTwigWand.doParticleBeam(world, orig, end); + } + } + } + } + return false; + } + + public static abstract class Actuator { + public static final Actuator generatingActuator = new Actuator() { + + @Override + public boolean actuate(SubTileEntity flower, TileEntity tile) { + if(flower instanceof SubTileGenerating) { + ((SubTileGenerating) flower).linkToForcefully(tile); + return true; + } + return false; + } + + }; + + public static final Actuator functionalActuator = new Actuator() { + + @Override + public boolean actuate(SubTileEntity flower, TileEntity tile) { + if(flower instanceof SubTileFunctional) { + ((SubTileFunctional) flower).linkToForcefully(tile); + return true; + } + return false; + } + + }; + + public abstract boolean actuate(SubTileEntity flower, TileEntity tile); + + } + +} diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 59bc40128..aa3f4fc9c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -71,29 +71,9 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { TileEntity tile = par3World.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ); if(tile instanceof IWandBindable) { if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) { - if(par3World.isRemote) { - Vector3 orig = new Vector3(boundTile.posX + 0.5, boundTile.posY + 0.5, boundTile.posZ + 0.5); - Vector3 end = new Vector3(par4 + 0.5, par5 + 0.5, par6 + 0.5); - Vector3 diff = end.copy().sub(orig); - Vector3 movement = diff.copy().normalize().multiply(0.05); - int iters = (int) (diff.mag() / movement.mag()); - float huePer = 1F / iters; - float hueSum = (float) Math.random(); - - Vector3 currentPos = orig.copy(); - for(int i = 0; i < iters; i++) { - float hue = i * huePer + hueSum; - Color color = Color.getHSBColor(hue, 1F, 1F); - float r = color.getRed() / 255F; - float g = color.getGreen() / 255F; - float b = color.getBlue() / 255F; - - Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(par3World, currentPos.x, currentPos.y, currentPos.z, r, g, b, 0.5F, 4); - Botania.proxy.setSparkleFXNoClip(false); - currentPos.add(movement); - } - } + Vector3 orig = new Vector3(boundTile.posX + 0.5, boundTile.posY + 0.5, boundTile.posZ + 0.5); + Vector3 end = new Vector3(par4 + 0.5, par5 + 0.5, par6 + 0.5); + doParticleBeam(par3World, orig, end); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile.posX, boundTile.posY, boundTile.posZ); setBoundTile(par1ItemStack, 0, -1, 0); @@ -166,6 +146,31 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return false; } + + public static void doParticleBeam(World world, Vector3 orig, Vector3 end) { + if(!world.isRemote) + return; + + Vector3 diff = end.copy().sub(orig); + Vector3 movement = diff.copy().normalize().multiply(0.05); + int iters = (int) (diff.mag() / movement.mag()); + float huePer = 1F / iters; + float hueSum = (float) Math.random(); + + Vector3 currentPos = orig.copy(); + for(int i = 0; i < iters; i++) { + float hue = i * huePer + hueSum; + Color color = Color.getHSBColor(hue, 1F, 1F); + float r = color.getRed() / 255F; + float g = color.getGreen() / 255F; + float b = color.getBlue() / 255F; + + Botania.proxy.setSparkleFXNoClip(true); + Botania.proxy.sparkleFX(world, currentPos.x, currentPos.y, currentPos.z, r, g, b, 0.5F, 4); + Botania.proxy.setSparkleFXNoClip(false); + currentPos.add(movement); + } + } @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 9eba639ac..a2c5529d6 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -244,6 +244,7 @@ public final class ModItems { public static Item incenseStick; public static Item terraAxe; public static Item waterBowl; + public static Item obedienceStick; public static void init() { lexicon = new ItemLexicon(); @@ -378,6 +379,7 @@ public final class ModItems { incenseStick = new ItemIncenseStick(); terraAxe = new ItemTerraAxe(); waterBowl = new ItemWaterBowl(); + obedienceStick = new ItemObedienceStick(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 0c8f3e51f..ea35c1ac3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -191,6 +191,7 @@ public final class LexiconData { public static LexiconEntry crystalBow; public static LexiconEntry temperanceStone; public static LexiconEntry terraAxe; + public static LexiconEntry obedienceStick; public static LexiconEntry enderAir; public static LexiconEntry enderEyeBlock; @@ -731,6 +732,9 @@ public final class LexiconData { terraAxe = new BLexiconEntry(LibLexicon.TOOL_TERRA_AXE, categoryTools); terraAxe.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraAxe)); + obedienceStick = new BLexiconEntry(LibLexicon.TOOL_OBEDIENCE_STICK, categoryTools); + obedienceStick.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeObedienceStick)); + // ENDER ENTRIES enderAir = new BLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); enderAir.setPriority().setLexiconPages(new PageText("0")); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index b23eeb9c3..6a8f310ee 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -145,7 +145,8 @@ public final class LibItemNames { public static final String INCENSE_STICK = "incenseStick"; public static final String TERRA_AXE = "terraAxe"; public static final String WATER_BOWL = "waterBowl"; - + public static final String OBEDIENCE_STICK = "obedienceStick"; + public static final String[] LENS_NAMES = new String[] { "lensNormal", "lensSpeed", diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index b65b77f39..77041ef8d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -161,6 +161,7 @@ public final class LibLexicon { public static final String TOOL_CRYSTAL_BOW = "crystalBow"; public static final String TOOL_TEMPERANCE_STONE = "temperanceStone"; public static final String TOOL_TERRA_AXE = "terraAxe"; + public static final String TOOL_OBEDIENCE_STICK = "obedienceStick"; public static final String ENDER_AIR = "enderAir"; public static final String ENDER_ENDER_EYE_BLOCK = "enderEyeBlock"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 36e951371..d1f887a93 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1434,6 +1434,7 @@ item.botania:elementiumNugget.name=Elementium Nugget item.botania:root.name=Living Root item.botania:pebble.name=Pebble item.botania:waterBowl.name=Bowl of Water +item.botania:obedienceStick.name=Floral Obedience Stick # BREW NAMES botania.brew.fallback=Fallback @@ -1792,7 +1793,7 @@ botania.page.sparkChanger2=Hahahaha, water fire... botania.entry.fIntro=An Introduction to Function botania.page.fIntro0=There are various places in which the &4Mana&0 a botanist generates can be put to use, one of them is an assortment of &4Functional Flowers&0.
These flowers will drain &4Mana&0 from a nearby &1Mana Pool&0 into themselves, in order to do whatever task they were created for.
It's to note that these can't receive power directly through &1Mana Spreaders&0. botania.page.fIntro1=All &4Functional Flowers&0, alike the &4Generating Flowers&0 contain a small buffer of &4Mana&0.
Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings. -botania.page.fIntro2=It is important to keep in mind that these flowers memorize the &1Mana Pool&0 from which they should pull &4Mana&0 out of. They'll only pull from the nearest pool present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. It can be bound to another pool with a wand in &4Bind Mode&0. +botania.page.fIntro2=It is important to keep in mind that these flowers memorize the &1Mana Pool&0 from which they should pull &4Mana&0 out of. They'll only pull from the nearest pool present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other. It can be bound to another pool with a wand in &4Bind Mode&0. botania.page.fIntro3=Lastly, some functional flowers utilize a &1Redstone Root&0 in their creation. If they do, the flower's effect can be toggled with a redstone signal. botania.page.fIntro4=&1Redstone Root&0 for Redstone Control @@ -1941,7 +1942,7 @@ botania.page.solegnolia1=On/Off botania.entry.gIntro=An Introduction to Generation botania.page.gIntro0=&4Generating Mana&0 should be at the top of the priorities for any botanist. Luckily there's an array of &4Generating Flowers&0 willing to do the job.
These flowers, as their name shows, generate &4Mana&0, both passively and actively. Unless stated otherwise, all &4Generating Flowers&0 generate &4Mana&0 passively under certain circumstances. botania.page.gIntro1=All &4Generating Flowers&0, alike the &4Functional Flowers&0 contain a small buffer of &4Mana&0.
Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings.
This mana will be stored in the closest &1Mana Spreader&0 around. -botania.page.gIntro2=It is important to keep in mind that these flowers memorize the &1Mana Spreader&0 into which they should put &4Mana&0 into. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. It can be bound to another spreader with a wand in &4Bind Mode&0. +botania.page.gIntro2=It is important to keep in mind that these flowers memorize the &1Mana Spreader&0 into which they should put &4Mana&0 into. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other. It can be bound to another spreader with a wand in &4Bind Mode&0. # -- DAYBLOOM botania.entry.daybloom=Daybloom @@ -2449,6 +2450,11 @@ botania.entry.terraAxe=Terra Truncator botania.page.terraAxe0=The &1Terra Truncator&0 is a greataxe of premium quality achievable only with &1Terrasteel&0. When hitting a tree it'll take the whole thing down with speed, bringing all the logs and leaves along with it. Of course, this comes at a hefty cost of &4Mana&0.
This effect doesn't happen while sneaking or if the user has a &1Stone of Temperance&0. botania.page.terraAxe1=It's not a Dead END +# -- FLORAL OBEDIENCE STICK +botania.entry.obedienceStick=Floral Obedience Stick +botania.page.obedienceStick0=Nobody knows why, but attaching some &1Manasteel&0 to &1Livingwood Twigs&0 creates a stick type device that can make nearby flowers all bind towards a single focus point.
Dubbed the &1Floral Obedience Stick&0, right clicking with it on a &1Mana Spreader&0 or &1Mana Pool&0 in the world will bind all relevant nearby flowers to it. +botania.page.obedienceStick1=This is not a dumb new age hat + # - ENDER ARTEFACTS # -- EXTRACTING ENDER AIR botania.entry.enderAir=Extracting Ender Air diff --git a/src/main/resources/assets/botania/textures/items/obedienceStick.png b/src/main/resources/assets/botania/textures/items/obedienceStick.png new file mode 100644 index 000000000..94b67c878 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/obedienceStick.png differ