diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java
index 9b27a4e9d..7ba2b7380 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java
@@ -14,8 +14,10 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
+import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
+import vazkii.botania.common.lexicon.LexiconData;
public class SubTileShulkMeNot extends SubTileGenerating {
@@ -55,7 +57,6 @@ public class SubTileShulkMeNot extends SubTileGenerating {
}
private void particles(World world, BlockPos pos, Entity entity) {
- float f = 0.01F;
if(world instanceof WorldServer) {
WorldServer ws = (WorldServer) world;
ws.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, entity.posX + entity.width / 2, entity.posY + entity.height / 2, entity.posZ + entity.width / 2, 100, entity.width, entity.height, entity.width, 0.05);
@@ -78,4 +79,9 @@ public class SubTileShulkMeNot extends SubTileGenerating {
return 75000;
}
+ @Override
+ public LexiconEntry getEntry() {
+ return LexiconData.shulkMeNot;
+ }
+
}
diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
index 9a96705a0..486151c06 100644
--- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
+++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java
@@ -12,6 +12,7 @@ package vazkii.botania.common.crafting;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
+import scala.runtime.RichDouble;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.common.Botania;
@@ -48,6 +49,7 @@ public final class ModPetalRecipes {
public static RecipePetals narslimmusRecipe;
public static RecipePetals spectrolusRecipe;
public static RecipePetals rafflowsiaRecipe;
+ public static RecipePetals shulkMeNotRecipe;
public static RecipePetals dandelifeonRecipe;
public static RecipePetals jadedAmaranthusRecipe;
@@ -92,6 +94,7 @@ public final class ModPetalRecipes {
narslimmusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS), lime, lime, green, green, black, runeSummer, runeWater);
spectrolusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS), red, red, green, green, blue, blue, white, white, runeWinter, runeAir, pixieDust);
rafflowsiaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RAFFLOWSIA), purple, purple, green, green, black, runeEarth, runePride, pixieDust);
+ shulkMeNotRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SHULK_ME_NOT), purple, purple, magenta, magenta, lightGray, gaiaSpirit, runeEnvy, runeWrath);
dandelifeonRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON), purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit);
jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purple, lime, green, runeSpring, redstoneRoot);
diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
index 555daa2be..a74cad0c4 100644
--- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
+++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
@@ -134,6 +134,7 @@ public final class LexiconData {
public static LexiconEntry narslimmus;
public static LexiconEntry spectrolus;
public static LexiconEntry rafflowsia;
+ public static LexiconEntry shulkMeNot;
public static LexiconEntry dandelifeon;
public static LexiconEntry pylon;
@@ -676,6 +677,9 @@ public final class LexiconData {
rafflowsia = new AlfheimLexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers);
rafflowsia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.rafflowsiaRecipe));
+ shulkMeNot = new AlfheimLexiconEntry(LibLexicon.GFLOWER_SHULK_ME_NOT, categoryGenerationFlowers);
+ shulkMeNot.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.shulkMeNotRecipe));
+
dandelifeon = new AlfheimLexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers);
dandelifeon.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"),
new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageText("10"),
diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
index 07d78e0c6..c5a2969a5 100644
--- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java
+++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
@@ -108,6 +108,7 @@ public final class LibLexicon {
public static final String GFLOWER_NARSLIMMUS = "narslimmus";
public static final String GFLOWER_SPECTROLUS = "spectrolus";
public static final String GFLOWER_RAFFLOWSIA = "rafflowsia";
+ public static final String GFLOWER_SHULK_ME_NOT = "shulk_me_not";
public static final String GFLOWER_DANDELIFEON = "dandelifeon";
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 265676f0a..43b140f31 100644
--- a/src/main/resources/assets/botania/lang/en_us.lang
+++ b/src/main/resources/assets/botania/lang/en_us.lang
@@ -2545,6 +2545,13 @@ botania.page.dandelifeon7=&1Cellular Blocks&0 are crafted with &1Cactus&0, &1Car
botania.page.dandelifeon8=&oCellCraft^2&r.
botania.page.dandelifeon9=Creating &1Cellular Blocks&0
+# -- SHULK ME NOT
+botania.entry.shulk_me_not=Shulk Me Not
+botania.tagline.shulk_me_not=Mana from shulkers
+botania.page.shulk_me_not0=The &1Shulk Me Not&0 is a generating flower that creates &4Mana&0 by harnessing the power of the &4Levitation&0 effect.
The flower will create a massive amount of &4Mana&0 while its internal buffer is empty, and a monster within its range is hit with a shulker's projectile, causing it to gain &4Levitation&0.
+botania.page.shulk_me_not1=A few extra points are relevant to this generation process.
First off, both the hit entity and the shulker are killed, and their drops and experience suppressed. Second, for the process to happen, the shulker must be targetting the other monster, rather than the projectile just wandering in its way. Lastly, both entities need to be within the flower's range.
+botania.page.shulk_me_not2=&oPetal plucking not recommended&r.
+
# - NATURAL APPARATUS
# -- MANA PYLON
botania.entry.pylon=Mana Pylon