From 2ba614dcb5aa9e1863ac9826d2589229682e4ecf Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jun 2014 01:05:51 +0100 Subject: [PATCH] Recipe/docs for the Daffomill. --- .../block/subtile/functional/SubTileDaffomill.java | 9 ++++++++- .../vazkii/botania/common/crafting/ModPetalRecipes.java | 4 +++- MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 4 ++++ MODSRC/vazkii/botania/common/lib/LibLexicon.java | 1 + resources/assets/botania/lang/en_US.lang | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 7d00410a1..95b0ed11c 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -19,8 +19,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileDaffomill extends SubTileFunctional { @@ -43,7 +45,7 @@ public class SubTileDaffomill extends SubTileFunctional { mana--; } - if(windTicks > 0) { + if(windTicks > 0 && redstoneSignal == 0) { int x = supertile.xCoord; int y = supertile.yCoord; int z = supertile.zCoord; @@ -103,6 +105,11 @@ public class SubTileDaffomill extends SubTileFunctional { return 100; } + @Override + public LexiconEntry getEntry() { + return LexiconData.daffomill; + } + @Override public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); diff --git a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java index d9589499e..1f1402c0e 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -60,6 +60,7 @@ public final class ModPetalRecipes { public static RecipePetals pollidisiacRecipe; public static RecipePetals clayconiaRecipe; public static RecipePetals looniumRecipe; + public static RecipePetals daffomillRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -93,7 +94,8 @@ public final class ModPetalRecipes { pollidisiacRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_POLLIDISIAC), orange, orangeMana, red, redMana, pink, pinkMana, runeLust, runeFire); clayconiaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_CLAYCONIA), gray, lightGray, lightGrayMana, lightGrayMana, grayMana, cyan, runeEarth); looniumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_LOONIUM), green, green, greenMana, greenMana, gray, grayMana, runeSloth, runeGluttony, runeEnvy, redstoneRoot); - + daffomillRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAFFOMILL), white, whiteMana, brown, yellowMana, runeAir, redstoneRoot); + ItemStack stack = new ItemStack(Items.skull, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii"); Object[] inputs = new Object[16]; diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 803fd0e43..6af4796c2 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -108,6 +108,7 @@ public final class LexiconData { public static LexiconEntry munchdew; public static LexiconEntry entropinnyum; public static LexiconEntry kekimurus; + public static LexiconEntry daffomill; public static LexiconEntry pistonRelay; public static LexiconEntry pylon; @@ -326,6 +327,9 @@ public final class LexiconData { loonium = new BLexiconEntry(LibLexicon.FFLOWER_LOONIUM, categoryFunctionalFlowers); loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.looniumRecipe)); + daffomill = new BLexiconEntry(LibLexicon.GFLOWER_DAFFOMILL, categoryFunctionalFlowers); + daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.daffomillRecipe)); + // 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/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 4774a2962..79e790d35 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -85,6 +85,7 @@ public final class LibLexicon { public static final String GFLOWER_MUNCHDEW = "munchdew"; public static final String GFLOWER_ENTROPINNYUM = "entropinnyum"; public static final String GFLOWER_KEKIMURUS = "kekimurus"; + public static final String GFLOWER_DAFFOMILL = "daffomill"; public static final String DEVICE_PISTON_RELAY = "pistonRelay"; public static final String DEVICE_PYLON = "pylon"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 26bf599dc..2e510b42a 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -819,6 +819,11 @@ botania.entry.loonium=Loonium botania.page.loonium0=Any weary adventurer knows that &4Dungeons&0 can hold valuable goodies. The &1Loonium&0 can, at the use of an extreme amount of &4Mana&0, materialize these items and drop them in the nearby vacinity. botania.page.loonium1=&oTank Tank Heal Tank&r! +# -- DAFFOMILL +botania.entry.daffomill=Daffomill +botania.page.daffomill0=The &1Daffodill&0 works as a fan of sorts. It pushes, at the cost of a small amount of &4Mana&0, any items found in front of it.
Shift-right clicking it with a &1Wand of the Forest&0 changes the orientation. Where it's currently facing can be seen via the subtle wind particles it emits. +botania.page.daffomill1=&oWind Turbines? I'm a big fan&r. + # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION botania.entry.gIntro=An Introduction to Generation