Merge upstream

This commit is contained in:
Vincent Lee committed 2016-02-18 10:04:02 -06:00
commit ad5b7fd73b
15 files changed
+460 -337

No files matched your search

+2
View File
@@ -53,3 +53,5 @@ l0nekitsune=14
swiftlileagle=14
gryphonn=11
loraanicus=10
samerater=8
coolcabbage16=13
@@ -370,6 +370,7 @@ public final class ModelHandler {
BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS));
BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC));
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA));
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA + "Chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM));
BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL));
BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS));
@@ -510,7 +510,7 @@ public final class ModBlocks {
registerSubTileWithMini(LibBlockNames.SUBTILE_RANNUNCARPUS, SubTileRannuncarpus.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYACIDUS, SubTileHyacidus.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_POLLIDISIAC, SubTilePollidisiac.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_CLAYCONIA, SubTileClayconia.class);
registerSubTileWithMini(LibBlockNames.SUBTILE_CLAYCONIA, SubTileClayconia.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_LOONIUM, SubTileLoonuim.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DAFFOMILL, SubTileDaffomill.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_VINCULOTUS, SubTileVinculotus.class);
@@ -27,16 +27,19 @@ import vazkii.botania.common.lexicon.LexiconData;
public class SubTileClayconia extends SubTileFunctional {
private static final int COST = 80;
private static final int RANGE = 5;
private static final int RANGE_Y = 3;
private static final int RANGE_MINI = 2;
private static final int RANGE_Y_MINI = 1;
@Override
public void onUpdate() {
super.onUpdate();
if(!supertile.getWorld().isRemote && ticksExisted % 5 == 0) {
int manaCost = 80;
if(mana >= manaCost) {
if(mana >= COST) {
BlockPos coords = getCoordsToPut();
if(coords != null) {
supertile.getWorld().setBlockToAir(coords);
@@ -44,7 +47,7 @@ public class SubTileClayconia extends SubTileFunctional {
supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(Blocks.sand.getDefaultState()));
EntityItem item = new EntityItem(supertile.getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.clay_ball));
supertile.getWorld().spawnEntityInWorld(item);
mana -= manaCost;
mana -= COST;
}
}
}
@@ -53,12 +56,15 @@ public class SubTileClayconia extends SubTileFunctional {
public BlockPos getCoordsToPut() {
List<BlockPos> possibleCoords = new ArrayList<>();
for(int i = -RANGE; i < RANGE + 1; i++)
for(int j = -RANGE_Y; j < RANGE_Y + 1; j++)
for(int k = -RANGE; k < RANGE + 1; k++) {
int range = getRange();
int rangeY = getRangeY();
for(int i = -range; i < range + 1; i++)
for(int j = -rangeY; j < rangeY + 1; j++)
for(int k = -range; k < range + 1; k++) {
BlockPos pos = supertile.getPos().add(i, j, k);
Block block = supertile.getWorld().getBlockState(pos).getBlock();
if(block == Block.getBlockFromName("sand"))
if(block == Blocks.sand)
possibleCoords.add(pos);
}
@@ -69,9 +75,17 @@ public class SubTileClayconia extends SubTileFunctional {
@Override
public RadiusDescriptor getRadius() {
return new RadiusDescriptor.Square(toBlockPos(), RANGE);
return new RadiusDescriptor.Square(toBlockPos(), getRange());
}
public int getRange() {
return RANGE;
}
public int getRangeY() {
return RANGE_Y;
}
@Override
public int getColor() {
return 0x7B8792;
@@ -87,4 +101,8 @@ public class SubTileClayconia extends SubTileFunctional {
return LexiconData.clayconia;
}
public static class Mini extends SubTileClayconia {
@Override public int getRange() { return RANGE_MINI; }
@Override public int getRangeY() { return RANGE_Y_MINI; }
}
}
@@ -95,7 +95,7 @@ public class SubTileMarimorphosis extends SubTileFunctional {
int rangeY = getRangeY();
for(int i = -range; i < range + 1; i++)
for(int j = -range; j < rangeY; j++)
for(int j = -rangeY; j < rangeY; j++)
for(int k = -range; k < range + 1; k++) {
BlockPos pos = supertile.getPos().add(i, j, k);
Block block = supertile.getWorld().getBlockState(pos).getBlock();
@@ -2,16 +2,22 @@
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
*
* File Created @ [Jan 13, 2014, 7:45:37 PM (GMT)]
*/
package vazkii.botania.common.core.proxy;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.boss.EntityDragon;
import net.minecraft.entity.boss.EntityDragonPart;
import net.minecraft.entity.boss.EntityWither;
import net.minecraft.entity.item.EntityEnderCrystal;
import net.minecraft.entity.item.EntityItemFrame;
import net.minecraft.entity.item.EntityPainting;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemRecord;
import net.minecraft.item.ItemStack;
@@ -34,6 +40,7 @@ import vazkii.botania.common.block.ModBanners;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModMultiblocks;
import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus;
import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover;
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
import vazkii.botania.common.brew.ModBrews;
import vazkii.botania.common.brew.ModPotions;
@@ -60,7 +67,15 @@ import vazkii.botania.common.crafting.ModManaInfusionRecipes;
import vazkii.botania.common.crafting.ModPetalRecipes;
import vazkii.botania.common.crafting.ModPureDaisyRecipes;
import vazkii.botania.common.crafting.ModRuneRecipes;
import vazkii.botania.common.entity.EntityCorporeaSpark;
import vazkii.botania.common.entity.EntityDoppleganger;
import vazkii.botania.common.entity.EntityFlameRing;
import vazkii.botania.common.entity.EntityMagicLandmine;
import vazkii.botania.common.entity.EntityMagicMissile;
import vazkii.botania.common.entity.EntityManaBurst;
import vazkii.botania.common.entity.EntityPinkWither;
import vazkii.botania.common.entity.EntitySignalFlare;
import vazkii.botania.common.entity.EntitySpark;
import vazkii.botania.common.entity.ModEntities;
//import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; todo 1.8
//import vazkii.botania.common.block.ModBanners;
@@ -125,7 +140,7 @@ public class CommonProxy {
MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler());
MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter());
MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler());
if(Botania.gardenOfGlassLoaded)
MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents());
@@ -158,6 +173,8 @@ public class CommonProxy {
words += countWords(((ITwoNamedPage) page).getSecondUnlocalizedName());
}
FMLLog.log(Level.INFO, "[Botania] The Lexica Botania has %d words.", words);
registerDefaultEntityBlacklist();
}
private int countWords(String s) {
@@ -165,6 +182,28 @@ public class CommonProxy {
return s1.split(" ").length;
}
private void registerDefaultEntityBlacklist() {
// Vanilla
BotaniaAPI.blacklistEntityFromGravityRod(EntityDragon.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityDragonPart.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityWither.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityItemFrame.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityEnderCrystal.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityPainting.class);
// Botania
BotaniaAPI.blacklistEntityFromGravityRod(EntityCorporeaSpark.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityDoppleganger.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityFlameRing.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicLandmine.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicMissile.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityManaBurst.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityPinkWither.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntitySignalFlare.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntitySpark.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityPlayerMover.class);
}
// Overriding the internal method handler will break everything as it changes regularly.
// So just don't be a moron and don't override it. Thanks.
public void serverAboutToStart(FMLServerAboutToStartEvent event) {
@@ -1392,7 +1392,7 @@ public final class ModCraftingRecipes {
// Wing Recipes
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.flightTiara, 1, 1), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), "gemQuartz"));
for(int i = 0; i < 7; i++)
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.flightTiara, 1, 2 + i), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), new ItemStack(ModItems.quartz, 1, i));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.flightTiara, 1, 2 + i), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), LibOreDict.QUARTZ[i]));
recipesWings = BotaniaAPI.getLatestAddedRecipes(8);
// Mana Fluxfield Recipe
@@ -2313,9 +2313,9 @@ public final class ModCraftingRecipes {
}
private static IRecipe addQuartzRecipes(int meta, Item req, Block block, Block stairs, Block slab) {
GameRegistry.addRecipe(new ItemStack(block),
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(block),
"QQ", "QQ",
'Q', new ItemStack(ModItems.quartz, 1, meta));
'Q', LibOreDict.QUARTZ[meta]));
GameRegistry.addRecipe(new ItemStack(block, 2, 2),
"Q", "Q",
'Q', block);
@@ -76,7 +76,7 @@ public final class ModManaInfusionRecipes {
if(Botania.thaumcraftLoaded) {
Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "scribing_tools"));
manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell), new ItemStack(inkwell), 35000);
manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell, 1, ModItems.manaInkwell.getMaxDamage()), new ItemStack(inkwell), 35000);
}
managlassRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manaGlass), new ItemStack(Blocks.glass), 150);
@@ -25,50 +25,48 @@ import codechicken.microblock.MicroMaterialRegistry;
public class MultipartHandler {
public MultipartHandler() {
registerAllMultiparts(ModBlocks.livingrock);
registerAllMultiparts(ModBlocks.livingwood);
registerAllMultiparts(ModBlocks.storage);
registerAllMultiparts(ModBlocks.dreamwood);
registerAllMultiparts(ModBlocks.livingrock);
registerAllMultiparts(ModBlocks.prismarine);
registerAllMultiparts(ModBlocks.seaLamp);
registerAllMultiparts(ModBlocks.reedBlock);
registerAllMultiparts(ModBlocks.thatch);
registerAllMultiparts(ModBlocks.customBrick);
registerAllMultiparts(ModBlocks.elfGlass);
registerAllMultiparts(ModBlocks.manaGlass);
registerAllMultiparts(ModBlocks.endStoneBrick);
registerAllMultiparts(ModBlocks.blazeBlock);
registerAllMultiparts(ModBlocks.livingrock);
registerAllMultiparts(ModBlocks.bifrostPerm);
registerAllMultiparts(ModBlocks.shimmerrock);
registerAllMultiparts(ModBlocks.shimmerwoodPlanks);
registerMultiparts(ModBlocks.livingrock, 0, 4);
registerMultiparts(ModBlocks.livingwood, 0, 5);
registerMultiparts(ModBlocks.storage, 0, 4);
registerMultiparts(ModBlocks.dreamwood, 0, 4);
registerMultiparts(ModBlocks.prismarine, 0, 2);
registerMultiparts(ModBlocks.seaLamp);
registerMultiparts(ModBlocks.reedBlock);
registerMultiparts(ModBlocks.thatch);
registerMultiparts(ModBlocks.customBrick, 0, 15);
registerMultiparts(ModBlocks.elfGlass);
registerMultiparts(ModBlocks.manaGlass);
registerMultiparts(ModBlocks.endStoneBrick, 0, 3);
registerMultiparts(ModBlocks.blazeBlock);
registerMultiparts(ModBlocks.bifrostPerm);
registerMultiparts(ModBlocks.shimmerrock);
registerMultiparts(ModBlocks.shimmerwoodPlanks);
registerAllMultiparts(ModFluffBlocks.darkQuartz);
registerAllMultiparts(ModFluffBlocks.manaQuartz);
registerAllMultiparts(ModFluffBlocks.blazeQuartz);
registerAllMultiparts(ModFluffBlocks.lavenderQuartz);
registerAllMultiparts(ModFluffBlocks.redQuartz);
registerAllMultiparts(ModFluffBlocks.elfQuartz);
registerAllMultiparts(ModFluffBlocks.sunnyQuartz);
registerAllMultiparts(ModFluffBlocks.biomeStoneA);
registerAllMultiparts(ModFluffBlocks.biomeStoneB);
registerAllMultiparts(ModFluffBlocks.stone);
registerAllMultiparts(ModFluffBlocks.pavement);
registerMultiparts(ModFluffBlocks.darkQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.manaQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.blazeQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.lavenderQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.redQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.elfQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.sunnyQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.biomeStoneA, 0, 15);
registerMultiparts(ModFluffBlocks.biomeStoneB, 0, 15);
registerMultiparts(ModFluffBlocks.stone, 0, 15);
registerMultiparts(ModFluffBlocks.pavement, 0, 5);
}
private static void registerAllMultiparts(Block block) {
List<ItemStack> stacks = new ArrayList();
Item item = Item.getItemFromBlock(block);
block.getSubBlocks(item, block.getCreativeTabToDisplayOn(), stacks);
for(ItemStack stack : stacks)
if(stack.getItem() == item)
registerMultipart(block, stack.getItemDamage());
private static void registerMultiparts(Block block) {
registerMultiparts(block, 0);
}
private static void registerMultipart(Block block, int meta) {
private static void registerMultiparts(Block block, int meta) {
MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta));
}
private static void registerMultiparts(Block block, int metamin, int metamax) {
for (int i = metamin; i <= metamax; i++) {
registerMultiparts(block, i);
}
}
}*/
@@ -423,6 +423,9 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i));
OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i));
}
for(int i = 0; i < 7; i++)
OreDictionary.registerOre(LibOreDict.QUARTZ[i], new ItemStack(quartz, 1, i));
OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar);
OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaResource, 1, 0));
OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaResource, 1, 1));
@@ -90,4 +90,9 @@ public final class LibOreDict {
"stoneAndesiteBricks", "stoneBasaltBricks", "stoneDioriteBricks", "stoneGraniteBricks",
"stoneAndesiteChiseled", "stoneBasaltChiseled", "stoneDioriteChiseled", "stoneGraniteChiseled"
};
public static final String[] QUARTZ = new String[] {
"quartzDark", "quartzMana", "quartzBlaze",
"quartzLavender", "quartzRed", "quartzElven", "quartzSunny"
};
}
@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"variants": {
"normal": [{
"model": "botania:cross_tinted",
"textures": {
"cross": "botania:blocks/clayconiaChibi"
}
}],
"inventory": [{
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "botania:blocks/clayconiaChibi"
}
}]
}
}
@@ -1304,6 +1304,8 @@ tile.botania:flower.pollidisiac.name=Pollidisiac
tile.botania:flower.pollidisiac.reference=Birds and bees
tile.botania:flower.clayconia.name=Clayconia
tile.botania:flower.clayconia.reference=Rupees not included
tile.botania:flower.clayconiaChibi.name=Clayconia Petite
tile.botania:flower.clayconiaChibi.reference=Rupees not included
tile.botania:flower.loonium.name=Loonium
tile.botania:flower.loonium.reference=Hold it up above your head
tile.botania:flower.daffomill.name=Daffomill
@@ -2625,7 +2627,7 @@ botania.page.dandelifeon9=Creating &1Cellular Blocks&0
# -- MANA PYLON
botania.entry.pylon=Mana Pylon
botania.tagline.pylon=Enchantment booster
botania.page.pylon0=A &1Mana Pylon&0 is a structure that can pull energies from the earth and use them to power enchanting processes.<br>For one, setting one adjusted to an &1Enchanting Table&0 as if it was a &1Bookshelf&0 will drastically increase the power it can convey, just 2 of these are enough for it to reach &4Level 30&0.
botania.page.pylon0=A &1Mana Pylon&0 is a structure that can pull energies from the earth and use them to power enchanting processes.<br>For one, setting one adjacent to an &1Enchanting Table&0 as if it was a &1Bookshelf&0 will drastically increase the power it can convey, just 2 of these are enough for it to reach &4Level 30&0.
botania.page.pylon1=&oYou must construct additional pylons!&r
# -- MANA ENCHANTING
@@ -2849,13 +2851,13 @@ botania.page.cocoon2=New World, Perfect World
# -- MANASTORM CHARGE
botania.entry.manaBomb=Manastorm Charge
botania.tagline.manaBomb=Manastorm Charge go BOOM. BOOM BOOM. BOOMBOOMBOOMBOOMBOOMBOOM
botania.page.manaBomb0=Putting together some &1TNT&0 and a &1Gaia Spirit&0 creates a &1Manastorm Charge&0, a type of explosive, per say. Ignited with a &1Mana Burst&0, the charge will create an unstable &1Manastorm Epicenter&0, which will, over time, spawn supercharged &1Mana Bursts&0, that explode on contact with other blocks.<br>Needless to say, only a maniac would unleash such a force near anything they care about.
botania.page.manaBomb0=Putting together some &1TNT&0 and a &1Gaia Spirit&0 creates a &1Manastorm Charge&0, a type of explosive, per se. Ignited with a &1Mana Burst&0, the charge will create an unstable &1Manastorm Epicenter&0, which will, over time, spawn supercharged &1Mana Bursts&0, that explode on contact with other blocks.<br>Needless to say, only a maniac would unleash such a force near anything they care about.
botania.page.manaBomb1=Prepare to face the mighty...
# -- TERU TERU BOZU
botania.entry.teruTeruBozu=Teru Teru Bozu
botania.tagline.teruTeruBozu=Weather control and cuteness overload
botania.page.teruTeruBozu0=&1Teru Teru Bozu&0 are known as amulets that can ward away bad weather. Simply creating one of these and placing it in the world will decrease the amount of time that &1Rain&0 or &1Snowstorms&0 will last for. During bad weather, right clicking one with a &1Sunflower&0 or tossing said flower at it will have sun come back. Attaching a &1Redstone Comparator&0 to one of these allows for it to detect bad weather.
botania.page.teruTeruBozu0=&1Teru Teru Bozu&0 are known as amulets that can ward away bad weather. Simply creating one of these and placing it in the world will decrease the amount of time that &1Rain&0 or &1Snowstorms&0 will last. During bad weather, right clicking one with a &1Sunflower&0 or tossing said flower at it will have the sun come back. Attaching a &1Redstone Comparator&0 to one of these allows for it to detect bad weather.
botania.page.teruTeruBozu1=Too spoopy
# -- LIVINGWOOD AVATAR
@@ -2875,9 +2877,9 @@ botania.page.felPumpkin1=Nerfing warlocks again
# -- MANA BLASTER
botania.entry.manaBlaster=Mana Blaster
botania.tagline.manaBlaster=Portable Mana Spreader, with lenses!
botania.page.manaBlaster0=The &1Mana Blaster&0 is like a portable &1Mana Spreader&0, while shaped like a pistol for easy handling, it's not exactly a firearm, as much as it is just a portable spreader.<br>By utilizing &4Mana&0 from &4Mana carrying items&0 in the holder's inventory, it can shoot a mana burst when one is looking at.
botania.page.manaBlaster0=The &1Mana Blaster&0 is like a portable &1Mana Spreader&0, while shaped like a pistol for easy handling, it's not exactly a firearm, as much as it is just a portable spreader.<br>By utilizing &4Mana&0 from &4Mana carrying items&0 in the holder's inventory, it can shoot a mana burst wherever one is looking.
botania.page.manaBlaster1=This burst is a bit different from the one fired from speaders, as it's faster, but carries only three quarters of the mana a spreader burst would. There's also a short cooldown period after firing the blaster until another burst can be shot.
botania.page.manaBlaster2=&1Mana Lenses&0 also function with the blaster, to attach one to it, put them side by side on a crafting table, to remove it, simply place the &1Mana Blaster&0 back on the crafting grid.<br>If the shooter has a &1Haste&0 effect present on their person, the speed at which they can fire the blaster also increases.
botania.page.manaBlaster2=&1Mana Lenses&0 also function with the blaster. To attach one to it, put them side by side on a crafting table, to remove it, simply place the &1Mana Blaster&0 back on the crafting grid.<br>If the shooter has a &1Haste&0 effect present on their person, the speed at which they can fire the blaster also increases.
botania.page.manaBlaster3=We need more dakka
# -- PASTURE SEEDS
@@ -2893,7 +2895,7 @@ botania.page.grassSeeds5=The alternate &1Pasture Seeds&0
# -- ROD OF THE LANDS
botania.entry.dirtRod=Rod of the Lands
botania.tagline.dirtRod=A rod to create dirt
botania.page.dirtRod0=The &1Rod of the Lands&0 is a rather simpleton tool, by utilizing &4Mana&0 from the user's inventory (via a &1Mana Tablet&0 or others), it can materialize and place a &1Dirt&0 block down.<br>For the same &4Mana&0 cost, this item can provide &1Dirt&0 to the &1Rod of the Shifting Crust&0.
botania.page.dirtRod0=The &1Rod of the Lands&0 is a rather simple tool; by utilizing &4Mana&0 from the user's inventory (via a &1Mana Tablet&0 or others), it can materialize and place a &1Dirt&0 block down.<br>For the same &4Mana&0 cost, this item can provide &1Dirt&0 to the &1Rod of the Shifting Crust&0.
botania.page.dirtRod1=The Dirty Stick
# -- TERRA FIRMA ROD
@@ -2907,7 +2909,7 @@ botania.page.terraformRod3=Quite a justicar
# -- MANASTEEL EQUIPMENT
botania.entry.manaGear=Manasteel Equipment
botania.tagline.manaGear=Iron-tier equipment that repairs itself with Mana
botania.page.manaGear0=&1Manasteel&0, alike other metals, can be shaped into tools and armor alike.<br>Tools or armor crafted from this material will share their properties with &1Iron&0, albeit somewhat superior in enchantability and durability. Whenever a &1Manasteel&0 item is to take damage, if there's &4Mana&0 available in the inventory (such as a &1Mana Tablet&0), it'll use that instead.
botania.page.manaGear0=&1Manasteel&0, like other metals, can be shaped into tools and armor alike.<br>Tools or armor crafted from this material will share their properties with &1Iron&0, albeit somewhat superior in enchantability and durability. Whenever a &1Manasteel&0 item is to take damage, if there's &4Mana&0 available in the inventory (such as a &1Mana Tablet&0), it'll use that instead.
botania.page.manaGear10=Some pieces of the toolset have an ability when right clicked. The &1Pickaxe&0 will place a torch from the user's inventory, the &1Axe&0 will do the same for a sapling and the &1Shovel&0 will till the earth, similarly to a hoe.<br>A detail to keep in mind is that &1Shears&0 made of mana materials will trigger tripwire, unlike iron ones.
botania.page.manaGear1=The &1Manasteel Pickaxe&0
botania.page.manaGear2=The &1Manasteel Shovel&0
@@ -2930,7 +2932,7 @@ botania.page.grassHorn3=Modifying to break &1Snow&0
# -- TERRASTEEL ARMOR
botania.entry.terrasteelArmor=Terrasteel Armor
botania.tagline.terrasteelArmor=Diamond-tier armor with Manasteel properties
botania.page.terrasteelArmor0=Armor made out of &1Terrasteel&0, much alike the &1Manasteel&0 counterpart, can utilize &4Mana&0 from the inventory instead of taking damage.<br>This armor, however, has properties more alike &1Diamond&0 instead of &1Iron&0.
botania.page.terrasteelArmor0=Armor made out of &1Terrasteel&0, much like its &1Manasteel&0 counterpart, can utilize &4Mana&0 from the inventory instead of taking damage.<br>This armor, however, has properties more like &1Diamond&0 instead of &1Iron&0.
botania.page.terrasteelArmor1=The &1Terrasteel Helmet&0
botania.page.terrasteelArmor2=The &1Terrasteel Chestplate&0
botania.page.terrasteelArmor3=The &1Terrasteel Leggings&0
@@ -2945,11 +2947,11 @@ botania.page.terraSword1=No Broken Hero Sword
# -- TERRA SHATTERER
botania.entry.terraPick=Terra Shatterer
botania.tagline.terraPick=Upgradable pickaxe with large area of effect powers
botania.page.terraPick0=The &1Terra Shatterer&0 is a tool that can amass insane quantities of mana on itself, due to the amount of &1Terrasteel&0 required for its creation.<br>The tool functions very much like a &1Mana Tablet&0 by which it can amass &4Mana&0 by being tossed on a &1Mana Pool&0, it can't give the &4Mana&0 back, though, so it doesn't function as a storage method.
botania.page.terraPick1=The amount of &4Mana&0 stored on the tool defines its &4Rank&0. Ranks go as follows: &4D&0, &4C&0, &4B&0, &4A&0, &4S&0, &4SS&0. &4D&0 being the default rank.<br>The amount of &4Mana&0 required to advance from rank to rank increases as the rank does. To advance from &4D&0 to &4C&0, for example, it requires just a few seconds of exposition to a &1Mana Pool&0.
botania.page.terraPick0=The &1Terra Shatterer&0 is a tool that can amass insane quantities of mana on itself, due to the amount of &1Terrasteel&0 required for its creation.<br>The tool functions very much like a &1Mana Tablet&0, in that it can amass &4Mana&0 by being tossed on a &1Mana Pool&0. It can't give the &4Mana&0 back, though, so it doesn't function as a storage method.
botania.page.terraPick1=The amount of &4Mana&0 stored on the tool defines its &4Rank&0. Ranks go as follows: &4D&0, &4C&0, &4B&0, &4A&0, &4S&0, &4SS&0, with &4D&0 being the default rank.<br>The amount of &4Mana&0 required to advance from rank to rank increases as the rank does. To advance from &4D&0 to &4C&0, for example, it requires just a few seconds of exposition to a &1Mana Pool&0.
botania.page.terraPick2=To advance from rank &4C&0 to rank &4B&0, a full &1Mana Pool&0 is required, and the cost increases by a tenfold per rank from there on in, all the way to &4SS&0.<br>The rank of the tool does not change its speed, but instead, it increases the power of its &4Active Ability&0.<br>Toggling the tool's ability can be done via right click.
botania.page.terraPick3=While the tool is active, it enables it to break blocks in an extended area. At rank &4C&0 it's a small column, which increases to a square at rank &4B&0, that gets larger through the ranks. It's to note that the rank &4D&0 tool does not have the active ability.<br>Having the tool active consumes &4Mana&0 from its storage passively, even if not being used to mine.
botania.page.terraPick4=Lastly, the tool takes damage for every single block broken, so a good supply of &4Mana&0 in the wielder's inventory is a must for the higher ranks, as the tool does function like normal &1Manasteel Tools&0, in which it'll use &4Mana&0 instead of actually taking damage, given it's made of &1Terrasteel&0.<br>It also won't despawn like regular dropped items.
botania.page.terraPick4=Lastly, the tool takes damage for every single block broken, so a good supply of &4Mana&0 in the wielder's inventory is a must for the higher ranks, as the tool does function like normal &1Manasteel Tools&0, in that it'll use &4Mana&0 instead of actually taking damage, given it's made of &1Terrasteel&0.<br>It also won't despawn like regular dropped items.
botania.page.terraPick5=WE'RE MINING IN THE DATABASE WOW WOW
# -- ROD OF THE SEAS
File diff suppressed because it is too large. Load diff
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB