diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java
index 07204d101..97bfe77f1 100644
--- a/src/main/java/vazkii/botania/common/block/BlockRoot.java
+++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java
@@ -42,7 +42,7 @@ public class BlockRoot extends BlockMod {
@Override
public int quantityDropped(Random r) {
- return 2 + r.nextInt(2);
+ return 2 + r.nextInt(3);
}
}
diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java
index 3e1c80307..20a1a1985 100644
--- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java
+++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java
@@ -91,6 +91,12 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14)
return EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6, par1ItemStack.getItemDamage() == 14);
+ else if(par1ItemStack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer)) {
+ if(!par3World.isRemote)
+ par3World.playAuxSFX(2005, par4, par5, par6, 0);
+
+ return true;
+ }
return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
}
diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
index 36647712b..1fa3fc19c 100644
--- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
+++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
@@ -69,6 +69,7 @@ public final class LexiconData {
public static LexiconEntry terrasteel;
public static LexiconEntry blackLotus;
public static LexiconEntry flowerBag;
+ public static LexiconEntry gardenOfGlass;
public static LexiconEntry manaIntro;
public static LexiconEntry spreader;
@@ -321,6 +322,12 @@ public final class LexiconData {
flowerBag = new BLexiconEntry(LibLexicon.BASICS_FLOWER_BAG, categoryBasics);
flowerBag.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFlowerBag));
+ if(Botania.gardenOfGlassLoaded) {
+ gardenOfGlass = new BLexiconEntry(LibLexicon.BASICS_GARDEN_OF_GLASS, categoryBasics);
+ gardenOfGlass.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeRootToSapling), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRootToFertilizer), new PageCraftingRecipe("5", ModCraftingRecipes.recipePebbleCobblestone), new PageText("6"), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.sugarCaneRecipe), new PageCraftingRecipe("8", ModCraftingRecipes.recipeMagmaToSlimeball), new PageText("9"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeFelPumpkin));
+ gardenOfGlass.setPriority().setIcon(new ItemStack(ModItems.manaResource, 1, 20));
+ }
+
if(Botania.thaumcraftLoaded)
new CLexiconEntry("wrap", categoryBasics, "Thaumcraft").setLexiconPages(new PageText("0")); // lel
diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
index e4638654e..bf2754ffa 100644
--- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java
+++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
@@ -38,6 +38,7 @@ public final class LibLexicon {
public static final String BASICS_TERRASTEEL = "terrasteel";
public static final String BASICS_BLACK_LOTUS = "blackLotus";
public static final String BASICS_FLOWER_BAG = "flowerBag";
+ public static final String BASICS_GARDEN_OF_GLASS = "gardenOfGlass";
public static final String MANA_INTRO = "mIntro";
public static final String MANA_SPREADER = "spreader";
diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java
index 9192f8812..8dbcaab55 100644
--- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java
+++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java
@@ -58,10 +58,11 @@ public final class SkyblockWorldEvents {
if(block == Blocks.grass || block == Blocks.dirt) {
if(event.world.isRemote)
event.entityPlayer.swingItem();
- else event.world.playSoundEffect(event.x + 0.5, event.y + 0.5, event.z + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getPitch() + (float) (Math.random() * 0.2 - 0.1));
-
- if(event.world.rand.nextInt(3) == 0)
- event.entityPlayer.inventory.addItemStackToInventory(new ItemStack(ModItems.manaResource, 1, 21));
+ else {
+ event.world.playSoundEffect(event.x + 0.5, event.y + 0.5, event.z + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getPitch() + (float) (Math.random() * 0.2 - 0.1));
+ if(Math.random() < 0.4)
+ event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false);
+ }
}
}
}
diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang
index de3f2673b..d0e0b9981 100644
--- a/src/main/resources/assets/botania/lang/en_US.lang
+++ b/src/main/resources/assets/botania/lang/en_US.lang
@@ -1480,6 +1480,20 @@ botania.page.tutorial0=While one could just go through the various entries in th
botania.entry.introVideo=An Introductory Clip
botania.page.introVideo0=For those readers who are not quite readers, a short video guide covering the basics of Botania is also available. It's to keep in note that this guide acts as an aid and not a substitution for the contents of the &1Lexica Botania&0.
+# -- GARDEN OF GLASS
+botania.entry.gardenOfGlass=Garden of Glass
+botania.page.gardenOfGlass0=In the &2Garden of Glass&0 nobody can hear you scream.
You're alone in space.
How exciting.
+botania.page.gardenOfGlass1=The &2Garden of Glass&0 is a skyblock mode for Botania. It's advised only for players who are somewhat experienced in the mod, but if you're new to it, you're more than welcome to try it out anyway.
Most of the mod functions the same, but some tweaks have been put in place to allow for the skyblock style game. They'll be listed in the following pages.
+botania.page.gardenOfGlass2=After spawning in the &1Garden of Glass&0 you'll find &1Living Roots&0 below the landing area. These can be used to create &1Saplings&0 and &1Floral Fertilizer&0. They also work as &1Bone Meal&0.
Shift-right clicking a &1Dirt&0 or &1Grass&0 block with an empty hand will have you rummage through the soil, doing this long will wield you some &1Pebbles&0, that can be converted into &1Cobblestone&0.
+botania.page.gardenOfGlass3=Creating &1Saplings&0
+botania.page.gardenOfGlass4=Creating &1Floral Fertilizer&0
+botania.page.gardenOfGlass5=Creating &1Cobblestone&0
+botania.page.gardenOfGlass6=Aside from that, some things in Botania are different to fit the Skyblock play: The &1Orechid&0 is easier to make, faster and much cheaper; &1Mana Spreaders&0 don't need gold; the &1Blaze Lamp&0, which can be used to create &1Obsidian&0, uses powder instead of rods; melon or pumpkin seeds may drop from tall grass; floral fertilizer creates more per craft, and &1Sugar Canes&0 and &1Slimeballs&0 can be crafted.
+botania.page.gardenOfGlass7=Creating &1Sugar Canes&0
+botania.page.gardenOfGlass8=Creating &1Slimeballs&0
+botania.page.gardenOfGlass9=Lastly, it's possible to infuse a &1Pumpkin&0 with the fel spirits of monster slain, creating a &1Fel Pumpkin&0. This can be placed atop two &1Iron Bars&0, in a similar fashion to a &1Snow Golem&0, to spawn a &1Blaze&0.
&1Blazes&0 spawned with this method drop &1Blaze Powder&0 instead of &1Blaze Rods&0.
+botania.page.gardenOfGlass10=Nerfing warlocks again
+
# -- LEXICA BOTANIA
botania.entry.lexicon=Lexica Botania
botania.page.lexicon0=The &1Lexica Botania&0 is the repository of all knowledge for all botany related matters. But you probably knew that already.
All information is stored here, as expected. For convenience, if a block happens to have an entry, it can be shift-right clicked with the &1Lexica Botania&0 to open that entry.
@@ -2857,7 +2871,7 @@ botania.page.stoneAlchemy4=Chiseling
# -- BLAZE LIGHT
botania.entry.blazeBlock=Blaze Light
-botania.page.blazeBlock0=Smashing a bunch of &1Blaze Rods&0 together makes a usable decorative light block. A crude one, admittedly, but a source of light non the less.
Naturally, like a &1Block of Coal&0, the &1Blaze Light&0 can also be used to fuel furnaces and other fuel consumers alike. Putting it next to a &1Pure Daisy&0 converts it into &1Obsidian&0, strangely enough.
+botania.page.blazeBlock0=Smashing a bunch of blazing material together makes a usable decorative light block. A crude one, admittedly, but a source of light non the less.
Naturally, like a &1Block of Coal&0, the &1Blaze Light&0 can also be used to fuel furnaces and other fuel consumers alike. Putting it next to a &1Pure Daisy&0 converts it into &1Obsidian&0, strangely enough.
botania.page.blazeBlock1=0x1a4
# -- CHALLENGES
@@ -2879,4 +2893,4 @@ botania.page.tcIntegration6b=The official frowny face
# -- BUILDCRAFT INTEGRATION
botania.entry.bcIntegration=Buildcraft Integration
-botania.page.bcIntegration0=Recent advances in piping technology have allowed &1Gates&0 to get a feel of the &4Mana&0 around them. A &1Gate&0 can now sense whether a &4Mana&0 container is empty, full or if it contains any mana.
&1Gates&0 can also use the &1Mana Detector&0 trigger to detect if a mana is passing by the pipe block. In addition, they can also sense when a &1Runic Altar&0 is ready to create runes.
+botania.page.bcIntegration0=Recent advances in piping technology have allowed &1Gates&0 to get a feel of the &4Mana&0 around them. A &1Gate&0 can now sense whether a &4Mana&0 container is empty, full or if it contains any mana.
&1Gates&0 can also use the &1Mana Detector&0 trigger to detect if a mana is passing by the pipe block. In addition, they can also sense when a &1Runic Altar&0 is ready to create runes.
\ No newline at end of file