diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java
index 7aea89ad0..c2ad4643a 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java
@@ -26,7 +26,9 @@ import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
+import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.SubTileGenerating;
+import vazkii.botania.common.lexicon.LexiconData;
public class SubTileSpectrolus extends SubTileGenerating {
@@ -68,6 +70,11 @@ public class SubTileSpectrolus extends SubTileGenerating {
return Color.HSBtoRGB((float) ticksExisted / 100F, 1F, 1F);
}
+ @Override
+ public LexiconEntry getEntry() {
+ return LexiconData.spectrolus;
+ }
+
@Override
public void renderHUD(Minecraft mc, ScaledResolution res) {
super.renderHUD(mc, res);
diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
index f8d5238da..5cdf03036 100644
--- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
+++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
@@ -44,6 +44,7 @@ public final class ModPetalRecipes {
public static RecipePetals kekimurusRecipe;
public static RecipePetals gourmaryllisRecipe;
public static RecipePetals narslimmusRecipe;
+ public static RecipePetals spectrolusRecipe;
public static RecipePetals jadedAmaranthusRecipe;
public static RecipePetals bellethorneRecipe;
@@ -82,7 +83,9 @@ public final class ModPetalRecipes {
entropinnyumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM), red, redMana, gray, grayMana, white, whiteMana, runeWrath, runeFire);
kekimurusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS), white, whiteMana, orangeMana, brownMana, brownMana, orange, runeGluttony, pixieDust);
gourmaryllisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_GOURMARYLLIS), lightGray, lightGrayMana, yellowMana, yellow, yellowMana, red, runeFire, runeSummer);
-
+ narslimmusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS), lime, limeMana, green, greenMana, black, runeSummer, runeWater);
+ spectrolusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS), redMana, orangeMana, yellowMana, greenMana, blueMana, cyanMana, purpleMana, white, runeWinter, runeAir, pixieDust);
+
jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purpleMana, purpleMana, lime, purple, green, runeSpring, redstoneRoot);
bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), redMana, redMana, cyan, cyan, red, redstoneRoot);
dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DREADTHORN), blackMana, purpleMana, cyan, cyan, black, purple, redstoneRoot);
@@ -106,7 +109,6 @@ public final class ModPetalRecipes {
spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTRANTHEMUM), whiteMana, whiteMana, white, white, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust);
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);
- narslimmusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS), lime, limeMana, green, greenMana, black, runeSummer, runeWater);
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 c1d2fd519..bb00da8ca 100644
--- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
+++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
@@ -107,6 +107,7 @@ public final class LexiconData {
public static LexiconEntry kekimurus;
public static LexiconEntry gourmaryllis;
public static LexiconEntry narslimmus;
+ public static LexiconEntry spectrolus;
public static LexiconEntry pistonRelay;
public static LexiconEntry pylon;
@@ -439,6 +440,9 @@ public final class LexiconData {
narslimmus = new BLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers);
narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.narslimmusRecipe));
+ spectrolus = new ALexiconEntry(LibLexicon.GFLOWER_SPECTROLUS, categoryGenerationFlowers);
+ spectrolus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.spectrolusRecipe));
+
// DEVICES ENTRIES
pistonRelay = new BLexiconEntry(LibLexicon.DEVICE_PISTON_RELAY, categoryDevices);
pistonRelay.setLexiconPages(new PageText("0"), new PageText("1"), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.pistonRelayRecipe));
diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
index c7ae8b0bf..cc6ae9c7c 100644
--- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java
+++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
@@ -88,6 +88,7 @@ public final class LibLexicon {
public static final String GFLOWER_KEKIMURUS = "kekimurus";
public static final String GFLOWER_GOURMARYLLIS = "gourmaryllis";
public static final String GFLOWER_NARSLIMMUS = "narslimmus";
+ public static final String GFLOWER_SPECTROLUS = "spectrolus";
public static final String DEVICE_PISTON_RELAY = "pistonRelay";
public static final String DEVICE_PYLON = "pylon";
diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang
index 20162a5c6..f4725f3ed 100644
--- a/src/main/resources/assets/botania/lang/en_US.lang
+++ b/src/main/resources/assets/botania/lang/en_US.lang
@@ -1456,7 +1456,13 @@ botania.page.gourmaryllis6=&oThe sad one who was hanged, only eat him the crows
# -- NARSLIMMUS
botania.entry.narslimmus=Narslimmus
botania.page.narslimmus0=There's some sort of unbeknownst power in the universe that creates &1Slimes&0 at seemingly random spots. The &1Narslimmus&0 is a flower that has the ability to tap into that energy. If placed down near a &1Slime&0 created by that power, it'll destroy it, collecting all the &4Mana&0 generated by the entropy. The larger the &1Slime&0, the more &4Mana&0 is created. It also makes a bit of a sticky mess.
-botania.page.narslimmus1=Stick around, would ye?
+botania.page.narslimmus1=&oStick around, would ye&r?
+
+# -- SPECTROLUS
+botania.entry.spectrolus=Spectrolus
+botania.page.spectrolus0=The &1Spectrolus&0 is a flower that's particularly fond of the various tones of &1Wool&0. It'll absorb any and all &1Wool&0 blocks dropped nearby and create &4Mana&0 from them.
There's a caveat though. It's picky as to what colors it wants. Starting at white, after it absorbs one piece of &1Wool&0, it'll rotate to the next color in the spectrum.
+botania.page.spectrolus1=While it consumes all &1Wool&0 around, it'll only create any mana if its of the color it wants, so haphazardly tossing &1Wool&0 at it is a wasteful strategy.
The color it'll absorb properly next can be seen by hovering over the flower with a &1Wand of the Forest&0.
+botania.page.spectrolus2=&oTaste the Rainbow&r.
# - MAGICAL APPARATUS
# -- FORCE RELAY