diff --git a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java
index 6d75ddb0f..cbd2d962b 100644
--- a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java
+++ b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java
@@ -14,6 +14,7 @@ package vazkii.botania.api.internal;
import java.util.List;
import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.Icon;
import vazkii.botania.api.lexicon.LexiconPage;
@@ -73,10 +74,14 @@ public class DummyMethodHandler implements IInternalMethodHandler {
return dummyPage(key);
}
-
private LexiconPage dummyPage(String key) {
return new DummyPage(key);
}
+
+ @Override
+ public ItemStack getSubTileAsStack(String subTile) {
+ return new ItemStack(1, 0, 0);
+ }
@Override
public Icon getSubTileIconForName(String name) {
diff --git a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java
index 04ec78578..f238ad358 100644
--- a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java
+++ b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java
@@ -13,6 +13,7 @@ package vazkii.botania.api.internal;
import java.util.List;
+import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.Icon;
import vazkii.botania.api.lexicon.LexiconPage;
@@ -49,6 +50,8 @@ public interface IInternalMethodHandler {
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe);
+ public ItemStack getSubTileAsStack(String subTile);
+
public Icon getSubTileIconForName(String name);
}
diff --git a/MODSRC/vazkii/botania/api/internal/MappableStackWrapper.java b/MODSRC/vazkii/botania/api/internal/MappableStackWrapper.java
index a04eb78ae..c3a84ae26 100644
--- a/MODSRC/vazkii/botania/api/internal/MappableStackWrapper.java
+++ b/MODSRC/vazkii/botania/api/internal/MappableStackWrapper.java
@@ -17,8 +17,7 @@ public class MappableStackWrapper {
private ItemStack wrap;
- public MappableStackWrapper(ItemStack toWrap)
- {
+ public MappableStackWrapper(ItemStack toWrap) {
wrap = toWrap;
}
@@ -26,11 +25,11 @@ public class MappableStackWrapper {
public boolean equals(Object obj) {
if (!(obj instanceof MappableStackWrapper))
return false;
-
+
MappableStackWrapper isw = (MappableStackWrapper) obj;
if (wrap.getHasSubtypes())
return isw.wrap.isItemEqual(wrap);
-
+
else return isw.wrap == wrap;
}
diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java
index 540290ff8..32501d396 100644
--- a/MODSRC/vazkii/botania/client/lib/LibResources.java
+++ b/MODSRC/vazkii/botania/client/lib/LibResources.java
@@ -32,6 +32,7 @@ public final class LibResources {
public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png";
public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png";
+ public static final String ENTRY_PURE_DAISY = PREFIX_ENTRIES + "pureDaisy.png";
public static final String MODEL_ALTAR = PREFIX_MODEL + "altar.png";
public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader.png";
diff --git a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java
index e58c920e1..1832bdec8 100644
--- a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java
+++ b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java
@@ -14,6 +14,7 @@ package vazkii.botania.common.core.handler;
import java.util.List;
import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.Icon;
import vazkii.botania.api.internal.IInternalMethodHandler;
@@ -22,6 +23,7 @@ import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.common.block.BlockSpecialFlower;
+import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lexicon.page.PageCraftingRecipe;
import vazkii.botania.common.lexicon.page.PageImage;
import vazkii.botania.common.lexicon.page.PageText;
@@ -79,8 +81,14 @@ public class InternalMethodHandler implements IInternalMethodHandler {
return null;
}
+ @Override
+ public ItemStack getSubTileAsStack(String subTile) {
+ return ItemBlockSpecialFlower.ofType(subTile);
+ }
+
@Override
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) {
return null;
}
+
}
diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java
index 1d9daf352..ea482a590 100644
--- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java
+++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java
@@ -11,20 +11,20 @@
*/
package vazkii.botania.common.crafting;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipePetals;
+import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
+import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibOreDict;
public final class ModPetalRecipes {
public static final String white = LibOreDict.PETAL[0], orange = LibOreDict.PETAL[1], magenta = LibOreDict.PETAL[2], lightBlue = LibOreDict.PETAL[3], yellow = LibOreDict.PETAL[4], lime = LibOreDict.PETAL[5], pink = LibOreDict.PETAL[6], gray = LibOreDict.PETAL[7], lightGray = LibOreDict.PETAL[8], cyan = LibOreDict.PETAL[9], purple = LibOreDict.PETAL[10], blue = LibOreDict.PETAL[11], brown = LibOreDict.PETAL[12], green = LibOreDict.PETAL[13], red = LibOreDict.PETAL[14], black = LibOreDict.PETAL[15];
- public static RecipePetals testRecipe;
+ public static RecipePetals pureDaisyRecipe;
public static void init() {
- testRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(Item.diamond), orange, orange, white);
+ pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white);
}
}
diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
index 4dd004bcb..2ecd9d65d 100644
--- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
+++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
@@ -41,6 +41,7 @@ public final class LexiconData {
public static LexiconEntry apothecary;
public static LexiconEntry lexicon;
public static LexiconEntry wand;
+ public static LexiconEntry pureDaisy;
public static LexiconEntry pool;
@@ -66,9 +67,12 @@ public final class LexiconData {
wand = new BLexiconEntry(LibLexicon.BASICS_WAND, categoryBasics);
wand.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipesTwigWand));
+ pureDaisy = new BLexiconEntry(LibLexicon.BASICS_PURE_DAISY, categoryBasics);
+ pureDaisy.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PagePetalRecipe("2", ModPetalRecipes.pureDaisyRecipe));
+
// MANA ENTRIES
pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana);
- pool.setPriority().setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.manaPetalRecipes), new PagePetalRecipe("2", ModPetalRecipes.testRecipe), new PageRuneRecipe("3", ModRuneRecipes.recipeDebug));
+ pool.setPriority().setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.manaPetalRecipes), new PagePetalRecipe("2", ModPetalRecipes.pureDaisyRecipe), new PageRuneRecipe("3", ModRuneRecipes.recipeDebug));
}
}
diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java
index 08d9c0c35..edac258a1 100644
--- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java
+++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java
@@ -27,7 +27,8 @@ public final class LibLexicon {
public static final String BASICS_APOTHECARY = "apothecary";
public static final String BASICS_LEXICON = "lexicon";
public static final String BASICS_WAND = "wand";
-
+ public static final String BASICS_PURE_DAISY = "pureDaisy";
+
public static final String MANA_POOL = "pool";
}
diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang
index 2165952ef..08ee3deac 100644
--- a/resources/assets/botania/lang/en_US.lang
+++ b/resources/assets/botania/lang/en_US.lang
@@ -193,7 +193,13 @@ botania.page.apothecary2=This block, when placed in the world and given some wat
botania.page.apothecary3=Quite a few plants can be made using this method, for more information, read on the &4Functional Flora&0 and &4Generation Flora&0 sections of this Lexicon.
botania.page.apothecary4=Crafting the &1Petal Apothecary&0.
+# -- PURE DAISY
+botania.entry.pureDaisy=Pure Daisy
+botania.page.pureDaisy0=The &1Pure Daisy&0 is not only the most basic, but also the most important flower a Botanist can have.
This flower will purify any adjacent &1Wood&0 and &1Stone&0 blocks, as seen in the next page, into their purified counterparts, &1Livingwood&0 and &1Livingrock&0, which can be used for crafting.
+botania.page.pureDaisy1=Just give it &4a minute&0 or so...
+botania.page.pureDaisy2=White is bright and pure
+
# -- WAND OF THE FOREST
botania.entry.wand=Wand of the Forest
botania.page.wand0=The general multi use tool for a botanist is the &1Wand of the Forest&0.
This wand, made by, effectively, strapping a pair of &1Mystical Petals&0 of any color to a few &1Sticks&0 is required for a good amount of tasks.
-botania.page.wand1=The petals use determine the colors.
\ No newline at end of file
+botania.page.wand1=The petals use determine the colors.
diff --git a/resources/assets/botania/textures/gui/entries/pureDaisy.png b/resources/assets/botania/textures/gui/entries/pureDaisy.png
new file mode 100644
index 000000000..8f9d9bee6
Binary files /dev/null and b/resources/assets/botania/textures/gui/entries/pureDaisy.png differ