diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java
index 6eacf1da9..995e5dd42 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java
@@ -41,9 +41,14 @@ public class SubTileSolegnolia extends SubTileFunctional {
mana--;
}
+ @Override
+ public boolean acceptsRedstone() {
+ return true;
+ }
+
public static boolean hasSolegnoliaAround(Entity e) {
for(SubTileSolegnolia flower : existingFlowers) {
- if(flower.mana == 0 || flower.supertile.getWorldObj() != e.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile)
+ if(flower.mana == 0 || flower.redstoneSignal > 0 || flower.supertile.getWorldObj() != e.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile)
continue;
if(MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, flower.supertile.xCoord + 0.5, flower.supertile.yCoord + 0.5, flower.supertile.zCoord + 0.5) <= RANGE)
diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
index 979310e3b..578d920aa 100644
--- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
+++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
@@ -69,6 +69,7 @@ public final class ModPetalRecipes {
public static RecipePetals medumoneRecipe;
public static RecipePetals marimorphosisRecipe;
public static RecipePetals bubbellRecipe;
+ public static RecipePetals solegnoliaRecipe;
public static void init() {
pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white);
@@ -111,6 +112,7 @@ public final class ModPetalRecipes {
medumoneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MEDUMONE), brown, brown, brownMana, gray, grayMana, runeEarth, redstoneRoot);
marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), grayMana, yellow, green, lime, lightBlue, red, runeEarth, runeFire, redstoneRoot);
bubbellRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BUBBELL), cyanMana, cyan, blue, lightBlue, lightBlueMana, runeWater, runeSummer, pixieDust);
+ solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SOLEGNOLIA), brown, red, brownMana, red, blue, redstoneRoot);
ItemStack stack = new ItemStack(Items.skull, 1, 3);
ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii");
diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
index 260885750..765e79fb8 100644
--- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
+++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
@@ -111,6 +111,7 @@ public final class LexiconData {
public static LexiconEntry medumone;
public static LexiconEntry marimorphosis;
public static LexiconEntry bubbell;
+ public static LexiconEntry solegnolia;
public static LexiconEntry generatingIntro;
public static LexiconEntry daybloom;
@@ -457,6 +458,9 @@ public final class LexiconData {
bubbell = new ALexiconEntry(LibLexicon.FFLOWER_BUBBELL, categoryFunctionalFlowers);
bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bubbellRecipe));
+ solegnolia = new BLexiconEntry(LibLexicon.FFLOWER_SOLEGNOLIA, categoryFunctionalFlowers);
+ solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.solegnoliaRecipe));
+
// GENERATING FLOWERS ENTRIES
generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers);
generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"));
diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
index a1bdc937d..ee12f0de9 100644
--- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java
+++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
@@ -83,6 +83,7 @@ public final class LibLexicon {
public static final String FFLOWER_MEDUMONE = "medumone";
public static final String FFLOWER_MARIMORPHOSIS = "marimorphosis";
public static final String FFLOWER_BUBBELL = "bubbell";
+ public static final String FFLOWER_SOLEGNOLIA = "solegnolia";
public static final String GFLOWER_INTRO = "gIntro";
public static final String GFLOWER_DAYBLOOM = "daybloom";
diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang
index 11b1e4873..58708f06c 100644
--- a/src/main/resources/assets/botania/lang/en_US.lang
+++ b/src/main/resources/assets/botania/lang/en_US.lang
@@ -980,7 +980,7 @@ tile.botania:flower.marimorphosis.reference=Solid as a rock
tile.botania:flower.bubbell.name=Bubbell
tile.botania:flower.bubbell.reference=And whistle
tile.botania:flower.solegnolia.name=Solegnolia
-tile.botania:flower.solegnolia.reference=WIP
+tile.botania:flower.solegnolia.reference=All your magnets are belong to us
# ITEM NAMES
item.botania:lexicon.name=Lexica Botania
@@ -1728,6 +1728,11 @@ botania.entry.bubbell=Bubbell
botania.page.bubbell0=Building underwater is a no small task. Clearing air under the sea is incredibly troublesome and time consuming. Placing down a &1Bubbell&0 underwater and providing it with &4Mana&0 (preferably a priori) will have it start to create a dome of air which will keep water at bay. The dome has about twelve blocks of radius. &4Mana&0 is required constantly to keep it up and going.
botania.page.bubbell1=&oLike some casual game&r.
+# -- SOLEGNOLIA
+botania.entry.solegnolia=Solegnolia
+botania.page.solegnolia0=The &1Ring of Magnetization&0 is a rather handy tool for anyone digging or collecting. It does, however, fall into the problem that it picks up unwanted items near complex systems.
The &1Solegnolia&0 disrupts the ring and prevents any items around it from being pulled towards a wearer of one. It uses up a small bit of &4Mana&0 for this, but nothing considerate.
+botania.page.solegnolia1=On/Off
+
# - GENERATING FLOWERS
# -- AN INTRODUCTION TO GENERATION
botania.entry.gIntro=An Introduction to Generation
@@ -2405,7 +2410,7 @@ botania.page.miningRing1=Diggy diggy hole
# -- RING OF MAGNETIZATION
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.
+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?
# -- RING OF FAR REACH