Merge upstream
No files matched your search
@@ -46,29 +46,27 @@ minecraft {
|
||||
replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here.
|
||||
}
|
||||
|
||||
//This here is for FTP
|
||||
//This here is for SCP
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
configurations {
|
||||
ftpAntTask
|
||||
sshAntTask
|
||||
}
|
||||
//End of the FTP config
|
||||
|
||||
//End of the SCP config
|
||||
|
||||
dependencies {
|
||||
compile files(
|
||||
'Baubles-deobf.jar'
|
||||
'Baubles-deobf.jar'
|
||||
)
|
||||
compile "codechicken:CodeChickenLib:1.8-1.1.2.139:dev"
|
||||
compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev"
|
||||
compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev"
|
||||
//compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev"
|
||||
|
||||
//and a bit more for FTP
|
||||
ftpAntTask module("org.apache.ant:ant-commons-net:1.7.0") {
|
||||
module("commons-net:commons-net:1.4.1") {
|
||||
dependencies("oro:oro:2.0.8@jar")
|
||||
}
|
||||
}
|
||||
//and a bit more for SCP
|
||||
sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29"
|
||||
}
|
||||
|
||||
processResources {
|
||||
@@ -150,17 +148,16 @@ task sort(type: Delete) {
|
||||
/**
|
||||
* This is the upload task from the build.xml
|
||||
*/
|
||||
task upload(dependsOn: 'reobf') << {
|
||||
ftp(action: 'mkdir', remotedir: '/files')
|
||||
ftp(action: 'send', remotedir: '/files') {
|
||||
task upload() << {
|
||||
scp('/files') {
|
||||
fileset(file: jar.archivePath)
|
||||
}
|
||||
|
||||
ftp(action: 'send', remotedir: '/files/deobf') {
|
||||
scp('/files/deobf') {
|
||||
fileset(file: deobfJar.archivePath)
|
||||
}
|
||||
|
||||
ftp(action: 'send', remotedir: '.') {
|
||||
scp('/') {
|
||||
fileset(file: 'web/changelog.txt')
|
||||
fileset(file: 'web/versions.ini')
|
||||
}
|
||||
@@ -170,25 +167,27 @@ task upload(dependsOn: 'reobf') << {
|
||||
* This is deply_web task
|
||||
*/
|
||||
task deployWeb << {
|
||||
ftp(action: 'send', remotedir: '.') {
|
||||
scp('/') {
|
||||
fileset(dir: 'web') //everything from the web directory
|
||||
}
|
||||
}
|
||||
|
||||
//simple function that we can use
|
||||
//Got this from: http://svn.codehaus.org/gradle/website/build.gradle
|
||||
void ftp(Map args, Closure antFileset = {}) {
|
||||
def scp(String dir, Closure antFileset = {}) {
|
||||
ant {
|
||||
taskdef(name: 'ftp',
|
||||
classname: 'org.apache.tools.ant.taskdefs.optional.net.FTP',
|
||||
classpath: configurations.ftpAntTask.asPath)
|
||||
Map ftpArgs = args + [ //some default options
|
||||
verbose : 'yes',
|
||||
server : priv.host,
|
||||
userid : priv.user,
|
||||
password: priv.pass
|
||||
taskdef(
|
||||
name: 'scp',
|
||||
classname: 'org.apache.tools.ant.taskdefs.optional.ssh.Scp',
|
||||
classpath: configurations.sshAntTask.asPath)
|
||||
|
||||
String dirstr = priv.scp_dir + dir
|
||||
Map scpArgs = [
|
||||
todir : dirstr,
|
||||
password : priv.scp_pass,
|
||||
sftp: true,
|
||||
trust: 'yes'
|
||||
]
|
||||
delegate.ftp(ftpArgs) {
|
||||
|
||||
delegate.scp(scpArgs) {
|
||||
antFileset.delegate = delegate
|
||||
antFileset()
|
||||
}
|
||||
@@ -218,6 +217,4 @@ curse {
|
||||
relatedProject 'baubles': 'requiredLibrary'
|
||||
}
|
||||
|
||||
//change this so it only increments on upload
|
||||
upload.dependsOn tasks.incrementBuildNumber
|
||||
defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'curse', 'upload' //remove clean if you want faster builds, this will stop rare inconsistancies.
|
||||
defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload'
|
||||
@@ -1,9 +1,9 @@
|
||||
#
|
||||
#Wed Nov 11 22:20:42 GMT 2015
|
||||
#Thu Nov 12 23:30:17 GMT 2015
|
||||
version=r1.7
|
||||
dir_output=../Build Output/Botania/
|
||||
mc_version=1.8
|
||||
forge_version=11.14.3.1468
|
||||
dir_repo=./
|
||||
build_number=233
|
||||
build_number=234
|
||||
mod_name=Botania
|
||||
@@ -1,5 +1,4 @@
|
||||
host=
|
||||
user=
|
||||
pass=
|
||||
scp_dir=
|
||||
scp_pass=
|
||||
cfkey=
|
||||
dir_forgecraft=../Build Output/Botania/
|
||||
@@ -0,0 +1,24 @@
|
||||
/**
|
||||
* 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 @ [15/11/2015, 19:27:07 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.api.mana;
|
||||
|
||||
/**
|
||||
* Any TileEntity that implements this is defined as having a direction,
|
||||
* and has two rotations (X and Y).
|
||||
* An example of this is the Mana Spreader.
|
||||
*/
|
||||
public interface IDirectioned {
|
||||
|
||||
public float getRotationX();
|
||||
|
||||
public float getRotationY();
|
||||
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
/**
|
||||
* 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 @ [15/11/2015, 21:00:32 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.api.mana;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
/**
|
||||
* An extension of ILens that allows for the lens item to control the
|
||||
* spreader's behaviour.
|
||||
*/
|
||||
public interface ILensControl extends ILens {
|
||||
|
||||
public boolean isControlLens(ItemStack stack);
|
||||
|
||||
public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone);
|
||||
|
||||
/**
|
||||
* Used for the tick of a non-redstone spreader.
|
||||
*/
|
||||
public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone);
|
||||
|
||||
/**
|
||||
* Used for when a redstone spreader gets a pulse.
|
||||
*/
|
||||
public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone);
|
||||
|
||||
}
|
||||
@@ -14,13 +14,8 @@ package vazkii.botania.api.mana;
|
||||
/**
|
||||
* Any TileEntity that implements this is considered a Mana Spreader,
|
||||
* by which can fire mana bursts as a spreader.
|
||||
*
|
||||
*/
|
||||
public interface IManaSpreader extends IManaBlock, IPingable {
|
||||
|
||||
public float getRotationX();
|
||||
|
||||
public float getRotationY();
|
||||
public interface IManaSpreader extends IManaBlock, IPingable, IDirectioned {
|
||||
|
||||
public void setCanShoot(boolean canShoot);
|
||||
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
/**
|
||||
* 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 @ [15/11/2015, 19:28:18 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.api.mana;
|
||||
|
||||
/**
|
||||
* This is an extension of IDirectioned for TileEntities
|
||||
* that allow for their rotation to be public and modifiable outside.
|
||||
* This is used in botania for the Redirective mana lens.
|
||||
*/
|
||||
public interface IRedirectable extends IDirectioned {
|
||||
|
||||
public void setRotationX(float rot);
|
||||
|
||||
public void setRotationY(float rot);
|
||||
|
||||
/**
|
||||
* This should be called after rotation setting is done to allow
|
||||
* for the block to re-calculate.
|
||||
*/
|
||||
public void commitRedirection();
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
@API(owner = "Botania", apiVersion = "67", provides = "BotaniaAPI")
|
||||
@API(owner = "Botania", apiVersion = "68", provides = "BotaniaAPI")
|
||||
package vazkii.botania.api;
|
||||
import net.minecraftforge.fml.common.API;
|
||||
|
||||
@@ -59,7 +59,7 @@ public class ModelArmorManaweave extends ModelBiped {
|
||||
skirtL.mirror = true;
|
||||
skirtL.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
skirtL.addBox(-2.0F, -2.0F, -3.5F, 5, 13, 7, s);
|
||||
setRotateAngle(skirtL, 0.0F, 0F, 0F);
|
||||
setRotateAngle(skirtL, 0.0F, -0.17453292519943295F, -0.2617993877991494F);
|
||||
armR = new ModelRenderer(this, 24, 83);
|
||||
armR.setRotationPoint(-5.0F, 2.0F, 0.0F);
|
||||
armR.addBox(-3.0F, -1.5F, -2.5F, 4, 10, 5, s);
|
||||
@@ -83,7 +83,7 @@ public class ModelArmorManaweave extends ModelBiped {
|
||||
skirtR = new ModelRenderer(this, 0, 83);
|
||||
skirtR.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
skirtR.addBox(-3.0F, -2.0F, -3.5F, 5, 13, 7, s);
|
||||
setRotateAngle(skirtR, 0.0F, 0F, 0F);
|
||||
setRotateAngle(skirtR, 0.0F, 0.17453292519943295F, 0.2617993877991494F);
|
||||
armRpauldron = new ModelRenderer(this, 0, 72);
|
||||
armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
armRpauldron.addBox(-4.0F, -2.0F, -3.0F, 3, 5, 6, s);
|
||||
|
||||
@@ -37,6 +37,7 @@ public class BlockModPane extends BlockPane {
|
||||
setCreativeTab(BotaniaCreativeTab.INSTANCE);
|
||||
setHardness(0.3F);
|
||||
setStepSound(soundTypeGlass);
|
||||
useNeighborBrightness = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -30,7 +30,9 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
@@ -122,6 +124,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addCollisionBoxesToList(World p_149743_1_, int p_149743_2_, int p_149743_3_, int p_149743_4_, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) {
|
||||
float f = 1F / 16F;
|
||||
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, f, 1.0F);
|
||||
@@ -136,6 +139,11 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
|
||||
super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_);
|
||||
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) {
|
||||
return side == ForgeDirection.DOWN;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube() {
|
||||
|
||||
@@ -48,8 +48,8 @@ public class SubTileAgricarnation extends SubTileFunctional {
|
||||
mana -= 5;
|
||||
supertile.getWorld().scheduleBlockUpdate(x, y, z, block, 1);
|
||||
if(ConfigHandler.blockBreakParticles)
|
||||
supertile.getWorld().playAuxSFX(2005, x, y, z, 6 + supertile.getWorld().rand.nextInt(4));
|
||||
supertile.getWorld().playSoundEffect(x, y, z, "botania:agricarnation", 0.1F, 0.5F + (float) Math.random() * 0.5F);
|
||||
supertile.getWorldObj().playAuxSFX(2005, x, y, z, 6 + supertile.getWorldObj().rand.nextInt(4));
|
||||
supertile.getWorldObj().playSoundEffect(x, y, z, "botania:agricarnation", 0.01F, 0.5F + (float) Math.random() * 0.5F);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ import java.util.List;
|
||||
import net.minecraft.command.IEntitySelector;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.monster.EntityWitch;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.DamageSource;
|
||||
@@ -57,7 +58,11 @@ public class SubTileBellethorn extends SubTileFunctional {
|
||||
continue;
|
||||
|
||||
if(entity.hurtTime == 0 && mana >= manaToUse) {
|
||||
entity.attackEntityFrom(DamageSource.magic, 4);
|
||||
int dmg = 4;
|
||||
if(entity instanceof EntityWitch)
|
||||
dmg = 20;
|
||||
|
||||
entity.attackEntityFrom(DamageSource.magic, dmg);
|
||||
mana -= manaToUse;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ public class TileLightRelay extends TileMod implements IWandBindable {
|
||||
|
||||
boolean isItem = riddenByEntity instanceof EntityItem;
|
||||
if(!isItem && ticksExisted % 30 == 0)
|
||||
worldObj.playSoundAtEntity(this, "botania:lightRelay", 0.2F, (float) Math.random() * 0.3F + 0.7F);
|
||||
worldObj.playSoundAtEntity(this, "botania:lightRelay", 0.05F, (float) Math.random() * 0.3F + 0.7F);
|
||||
|
||||
int exitX = getExitX();
|
||||
int exitY = getExitY();
|
||||
@@ -223,9 +223,6 @@ public class TileLightRelay extends TileMod implements IWandBindable {
|
||||
if(x == exitX && y == exitY && z == exitZ) {
|
||||
TileEntity tile = worldObj.getTileEntity(x, y, z);
|
||||
if(tile != null && tile instanceof TileLightRelay) {
|
||||
if(!isItem)
|
||||
worldObj.playSoundAtEntity(this, "random.orb", 0.2F, (float) Math.random() * 0.3F + 0.7F);
|
||||
|
||||
int meta = worldObj.getBlockMetadata(x, y, z);
|
||||
if(meta > 0) {
|
||||
worldObj.setBlockMetadataWithNotify(x, y, z, meta | 8, 1 | 2);
|
||||
|
||||
@@ -36,11 +36,13 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.mana.BurstProperties;
|
||||
import vazkii.botania.api.mana.IKeyLocked;
|
||||
import vazkii.botania.api.mana.ILens;
|
||||
import vazkii.botania.api.mana.ILensControl;
|
||||
import vazkii.botania.api.mana.ILensEffect;
|
||||
import vazkii.botania.api.mana.IManaCollector;
|
||||
import vazkii.botania.api.mana.IManaPool;
|
||||
import vazkii.botania.api.mana.IManaReceiver;
|
||||
import vazkii.botania.api.mana.IManaSpreader;
|
||||
import vazkii.botania.api.mana.IRedirectable;
|
||||
import vazkii.botania.api.mana.IThrottledPacket;
|
||||
import vazkii.botania.api.mana.ManaNetworkEvent;
|
||||
import vazkii.botania.api.wand.IWandBindable;
|
||||
@@ -55,7 +57,7 @@ import vazkii.botania.common.entity.EntityManaBurst;
|
||||
import vazkii.botania.common.entity.EntityManaBurst.PositionProperties;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader {
|
||||
public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable {
|
||||
|
||||
private static final int MAX_MANA = 1000;
|
||||
private static final int ULTRA_MAX_MANA = 6400;
|
||||
@@ -218,12 +220,24 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
boolean shouldShoot = !redstone;
|
||||
|
||||
if(isRedstone())
|
||||
boolean isredstone = isRedstone();
|
||||
if(isredstone)
|
||||
shouldShoot = redstone && !redstoneLastTick;
|
||||
|
||||
if(shouldShoot && receiver != null && receiver instanceof IKeyLocked)
|
||||
shouldShoot = ((IKeyLocked) receiver).getInputKey().equals(getOutputKey());
|
||||
|
||||
ItemStack lens = getStackInSlot(0);
|
||||
ILensControl control = getLensController(lens);
|
||||
if(control != null) {
|
||||
if(isredstone) {
|
||||
if(shouldShoot)
|
||||
control.onControlledSpreaderPulse(lens, this, redstone);
|
||||
} else control.onControlledSpreaderTick(lens, this, redstone);
|
||||
|
||||
shouldShoot &= control.allowBurstShooting(lens, this, redstone);
|
||||
}
|
||||
|
||||
if(shouldShoot)
|
||||
tryShootBurst();
|
||||
|
||||
@@ -335,7 +349,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
@Override
|
||||
public boolean canRecieveManaFromBursts() {
|
||||
return !isFull();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -430,6 +444,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
}
|
||||
|
||||
public void checkForReceiver() {
|
||||
ItemStack stack = getStackInSlot(0);
|
||||
ILensControl control = getLensController(stack);
|
||||
if(control != null && !control.allowBurstShooting(stack, this, false))
|
||||
return;
|
||||
|
||||
EntityManaBurst fakeBurst = getBurst(true);
|
||||
fakeBurst.setScanBeam();
|
||||
TileEntity receiver = fakeBurst.getCollidedTile(true);
|
||||
@@ -481,6 +500,16 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public ILensControl getLensController(ItemStack stack) {
|
||||
if(stack != null && stack.getItem() instanceof ILensControl) {
|
||||
ILensControl control = (ILensControl) stack.getItem();
|
||||
if(control.isControlLens(stack))
|
||||
return control;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean par3, double range) {
|
||||
float f = 1.0F;
|
||||
@@ -666,6 +695,21 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
return rotationY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRotationX(float rot) {
|
||||
rotationX = rot;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRotationY(float rot) {
|
||||
rotationY = rot;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void commitRedirection() {
|
||||
checkForReceiver();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCanShoot(boolean canShoot) {
|
||||
canShootBurst = canShoot;
|
||||
@@ -713,4 +757,5 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
public UUID getIdentifierUnsafe() {
|
||||
return identity;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -168,6 +168,9 @@ public final class ModCraftingRecipes {
|
||||
public static IRecipe recipeLensWeight;
|
||||
public static IRecipe recipeLensPaint;
|
||||
public static IRecipe recipeLensWarp;
|
||||
public static IRecipe recipeLensRedirect;
|
||||
public static IRecipe recipeLensFirework;
|
||||
public static IRecipe recipeLensFlare;
|
||||
public static List<IRecipe> recipesMiniIsland;
|
||||
public static IRecipe recipeGaiaPylon;
|
||||
public static IRecipe recipeGatherDrum;
|
||||
@@ -1104,7 +1107,7 @@ public final class ModCraftingRecipes {
|
||||
'L', new ItemStack(ModItems.lens));
|
||||
recipeLensWeight = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Paint Lens Recipe
|
||||
// Paintslinger Lens Recipe
|
||||
addOreDictRecipe(new ItemStack(ModItems.lens, 1, 14),
|
||||
" E ", "WLW", " E ",
|
||||
'E', LibOreDict.ELEMENTIUM,
|
||||
@@ -1116,6 +1119,18 @@ public final class ModCraftingRecipes {
|
||||
addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 18), new ItemStack(ModItems.lens), LibOreDict.PIXIE_DUST);
|
||||
recipeLensWarp = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Redirective Lens Recipe
|
||||
addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 19), new ItemStack(ModItems.lens), LibOreDict.LIVING_WOOD, LibOreDict.ELEMENTIUM);
|
||||
recipeLensRedirect = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Celebratory Lens Recipe
|
||||
addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 20), new ItemStack(ModItems.lens), new ItemStack(Items.fireworks), LibOreDict.ELEMENTIUM);
|
||||
recipeLensFirework = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Flare Lens Recipe
|
||||
addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 21), new ItemStack(ModItems.lens), new ItemStack(ModBlocks.elfGlass), LibOreDict.ELEMENTIUM);
|
||||
recipeLensFlare = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Mini Island Recipes
|
||||
for(int i = 0; i < 16; i++)
|
||||
GameRegistry.addRecipe(new ItemStack(ModBlocks.floatingFlower, 1, i),
|
||||
|
||||
@@ -90,7 +90,7 @@ public class LensDyeingRecipe implements IRecipe {
|
||||
int[] ids = OreDictionary.getOreIDs(stack);
|
||||
for(int i : ids) {
|
||||
int index = DYES.indexOf(OreDictionary.getOreName(i));
|
||||
if(index > 0)
|
||||
if(index >= 0)
|
||||
return index;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import vazkii.botania.api.mana.ILens;
|
||||
import vazkii.botania.api.mana.ILensControl;
|
||||
import vazkii.botania.common.item.ItemManaGun;
|
||||
|
||||
public class ManaGunLensRecipe implements IRecipe {
|
||||
@@ -31,9 +32,12 @@ public class ManaGunLensRecipe implements IRecipe {
|
||||
if(stack.getItem() instanceof ItemManaGun && ItemManaGun.getLens(stack) == null)
|
||||
foundGun = true;
|
||||
|
||||
else if(stack.getItem() instanceof ILens)
|
||||
foundLens = true;
|
||||
|
||||
else if(stack.getItem() instanceof ILens) {
|
||||
if(!(stack.getItem() instanceof ILensControl) || !((ILensControl) stack.getItem()).isControlLens(stack))
|
||||
foundLens = true;
|
||||
else return false;
|
||||
}
|
||||
|
||||
else return false; // Found an invalid item, breaking the recipe
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,6 +30,8 @@ import net.minecraftforge.oredict.RecipeSorter.Category;
|
||||
import vazkii.botania.api.internal.IManaBurst;
|
||||
import vazkii.botania.api.mana.BurstProperties;
|
||||
import vazkii.botania.api.mana.ILens;
|
||||
import vazkii.botania.api.mana.ILensControl;
|
||||
import vazkii.botania.api.mana.IManaSpreader;
|
||||
import vazkii.botania.api.mana.ITinyPlanetExcempt;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.Botania;
|
||||
@@ -40,9 +42,9 @@ import vazkii.botania.common.item.ItemMod;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt {
|
||||
public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcempt {
|
||||
|
||||
public static final int SUBTYPES = 19;
|
||||
public static final int SUBTYPES = 22;
|
||||
|
||||
public static final int NORMAL = 0,
|
||||
SPEED = 1,
|
||||
@@ -62,7 +64,10 @@ public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt {
|
||||
FIRE = 15,
|
||||
PISTON = 16,
|
||||
LIGHT = 17,
|
||||
WARP = 18;
|
||||
WARP = 18,
|
||||
REDIRECT = 19,
|
||||
FIREWORK = 20,
|
||||
FLARE = 21;
|
||||
|
||||
public static final int STORM = 5000;
|
||||
|
||||
@@ -71,7 +76,8 @@ public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt {
|
||||
PROP_ORIENTATION = 1 << 1,
|
||||
PROP_TOUCH = 1 << 2,
|
||||
PROP_INTERACTION = 1 << 3,
|
||||
PROP_DAMAGE = 1 << 4;
|
||||
PROP_DAMAGE = 1 << 4,
|
||||
PROP_CONTROL = 1 << 5;
|
||||
|
||||
private static final int[] props = new int[SUBTYPES];
|
||||
private static final Lens[] lenses = new Lens[SUBTYPES];
|
||||
@@ -98,6 +104,9 @@ public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt {
|
||||
setProps(PISTON, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(LIGHT, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(WARP, PROP_NONE);
|
||||
setProps(REDIRECT, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(FIREWORK, PROP_TOUCH);
|
||||
setProps(FLARE, PROP_CONTROL);
|
||||
|
||||
setLens(NORMAL, fallbackLens);
|
||||
setLens(SPEED, new LensSpeed());
|
||||
@@ -118,6 +127,9 @@ public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt {
|
||||
setLens(PISTON, new LensPiston());
|
||||
setLens(LIGHT, new LensLight());
|
||||
setLens(WARP, new LensWarp());
|
||||
setLens(REDIRECT, new LensRedirect());
|
||||
setLens(FIREWORK, new LensFirework());
|
||||
setLens(FLARE, new LensFlare());
|
||||
}
|
||||
|
||||
private static final String TAG_COLOR = "color";
|
||||
@@ -316,4 +328,24 @@ public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt {
|
||||
public boolean shouldPull(ItemStack stack) {
|
||||
return stack.getItemDamage() != STORM;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isControlLens(ItemStack stack) {
|
||||
return (props[stack.getItemDamage()] & PROP_CONTROL) != 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
return lenses[stack.getItemDamage()].allowBurstShooting(stack, spreader, redstone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
lenses[stack.getItemDamage()].onControlledSpreaderTick(stack, spreader, redstone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
lenses[stack.getItemDamage()].onControlledSpreaderPulse(stack, spreader, redstone);
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import vazkii.botania.api.internal.IManaBurst;
|
||||
import vazkii.botania.api.mana.BurstProperties;
|
||||
import vazkii.botania.api.mana.IManaSpreader;
|
||||
|
||||
public class Lens {
|
||||
|
||||
@@ -29,5 +30,18 @@ public class Lens {
|
||||
public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
return true;
|
||||
}
|
||||
|
||||
public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
/**
|
||||
* 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 @ [15/11/2015, 19:12:41 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.item.lens;
|
||||
|
||||
import net.minecraft.entity.item.EntityFireworkRocket;
|
||||
import net.minecraft.entity.projectile.EntityThrowable;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagByte;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import vazkii.botania.api.internal.IManaBurst;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
|
||||
public class LensFirework extends Lens {
|
||||
|
||||
@Override
|
||||
public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) {
|
||||
if(!burst.isFake()) {
|
||||
ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates();
|
||||
if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) {
|
||||
ItemStack fireworkStack = generateFirework(burst.getColor());
|
||||
|
||||
EntityFireworkRocket rocket = new EntityFireworkRocket(entity.worldObj, entity.posX, entity.posY, entity.posZ, fireworkStack);
|
||||
entity.worldObj.spawnEntityInWorld(rocket);
|
||||
}
|
||||
} else dead = false;
|
||||
|
||||
return dead;
|
||||
}
|
||||
|
||||
public ItemStack generateFirework(int color) {
|
||||
ItemStack stack = new ItemStack(Items.fireworks);
|
||||
NBTTagCompound explosion = new NBTTagCompound();
|
||||
explosion.setIntArray("Colors", new int[] { color });
|
||||
|
||||
int type = 1;
|
||||
double rand = Math.random();
|
||||
if(rand > 0.25) {
|
||||
if(rand > 0.9)
|
||||
type = 2;
|
||||
else type = 0;
|
||||
}
|
||||
|
||||
explosion.setInteger("Type", type);
|
||||
|
||||
if(Math.random() < 0.05)
|
||||
if(Math.random() < 0.5)
|
||||
explosion.setBoolean("Flicker", true);
|
||||
else explosion.setBoolean("Trail", true);
|
||||
|
||||
ItemNBTHelper.setCompound(stack, "Explosion", explosion);
|
||||
|
||||
NBTTagCompound fireworks = new NBTTagCompound();
|
||||
fireworks.setInteger("Flight", ((int) Math.random() * 3) + 2);
|
||||
|
||||
NBTTagList explosions = new NBTTagList();
|
||||
explosions.appendTag(explosion);
|
||||
fireworks.setTag("Explosions", explosions);
|
||||
|
||||
ItemNBTHelper.setCompound(stack, "Fireworks", fireworks);
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
/**
|
||||
* 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 @ [15/11/2015, 19:13:10 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.item.lens;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
import net.minecraft.entity.passive.EntitySheep;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import vazkii.botania.api.mana.IManaSpreader;
|
||||
import vazkii.botania.common.Botania;
|
||||
|
||||
public class LensFlare extends Lens {
|
||||
|
||||
@Override
|
||||
public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
if(!redstone)
|
||||
emitParticles(stack, spreader, redstone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
emitParticles(stack, spreader, redstone);
|
||||
}
|
||||
|
||||
private void emitParticles(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
float rotationYaw = -(spreader.getRotationX() + 90F);
|
||||
float rotationPitch = spreader.getRotationY();
|
||||
|
||||
// Lots of EntityThrowable copypasta
|
||||
float f = 0.3F;
|
||||
float mx = (float) (MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D);
|
||||
float mz = (float) (-(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D);
|
||||
float my = (float) (MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI) * f / 2D);
|
||||
|
||||
int storedColor = ItemLens.getStoredColor(stack);
|
||||
float r = 1, g = 1, b = 1;
|
||||
|
||||
TileEntity tile = (TileEntity) spreader;
|
||||
if(storedColor == 16) {
|
||||
Color c = Color.getHSBColor(tile.getWorldObj().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F);
|
||||
r = (float) c.getRed() / 255F;
|
||||
g = (float) c.getGreen() / 255F;
|
||||
b = (float) c.getBlue() / 255F;
|
||||
} else if(storedColor >= 0) {
|
||||
float[] colortable = EntitySheep.fleeceColorTable[storedColor];
|
||||
r = colortable[0];
|
||||
g = colortable[1];
|
||||
b = colortable[2];
|
||||
}
|
||||
|
||||
Botania.proxy.wispFX(tile.getWorldObj(), tile.xCoord + 0.5, tile.yCoord + 0.5, tile.zCoord + 0.5, r, g, b, 0.4F, mx, my, mz);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
/**
|
||||
* 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 @ [15/11/2015, 19:13:03 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.item.lens;
|
||||
|
||||
import net.minecraft.entity.projectile.EntityThrowable;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import vazkii.botania.api.internal.IManaBurst;
|
||||
import vazkii.botania.api.mana.IDirectioned;
|
||||
import vazkii.botania.api.mana.IManaSpreader;
|
||||
import vazkii.botania.api.mana.IRedirectable;
|
||||
import vazkii.botania.api.mana.IThrottledPacket;
|
||||
import vazkii.botania.common.block.tile.mana.TileSpreader;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
|
||||
public class LensRedirect extends Lens {
|
||||
|
||||
@Override
|
||||
public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) {
|
||||
ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates();
|
||||
if(!entity.worldObj.isRemote && pos.entityHit == null && coords.posY != -1 && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) {
|
||||
TileEntity tile = entity.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ);
|
||||
if(tile != null && tile instanceof IRedirectable) {
|
||||
if(!burst.isFake()) {
|
||||
IRedirectable redir = (IRedirectable) tile;
|
||||
Vector3 tileVec = Vector3.fromTileEntityCenter(tile);
|
||||
Vector3 sourceVec = new Vector3(coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5);
|
||||
|
||||
AxisAlignedBB axis = entity.worldObj.getBlock(coords.posX, coords.posY, coords.posZ).getCollisionBoundingBoxFromPool(entity.worldObj, coords.posX, coords.posY, coords.posZ);
|
||||
if(axis == null)
|
||||
axis = AxisAlignedBB.getBoundingBox(coords.posX, coords.posY, coords.posZ, coords.posX + 1, coords.posY + 1, coords.posZ + 1);
|
||||
|
||||
if(!sourceVec.isInside(axis))
|
||||
sourceVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2);
|
||||
|
||||
Vector3 diffVec = sourceVec.copy().sub(tileVec);
|
||||
Vector3 diffVec2D = new Vector3(diffVec.x, diffVec.z, 0);
|
||||
Vector3 rotVec = new Vector3(0, 1, 0);
|
||||
double angle = rotVec.angle(diffVec2D) / Math.PI * 180.0;
|
||||
|
||||
if(sourceVec.x < tileVec.x)
|
||||
angle = -angle;
|
||||
|
||||
redir.setRotationX((float) angle + 90F);
|
||||
|
||||
rotVec = new Vector3(diffVec.x, 0, diffVec.z);
|
||||
angle = diffVec.angle(rotVec) * 180F / Math.PI;
|
||||
if(sourceVec.y < tileVec.y)
|
||||
angle = -angle;
|
||||
redir.setRotationY((float) angle);
|
||||
|
||||
redir.commitRedirection();
|
||||
if(redir instanceof IThrottledPacket)
|
||||
((IThrottledPacket) redir).markDispatchable();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!isManaBlock) {
|
||||
dead = false;
|
||||
burst.setMinManaLoss(Math.max(0, burst.getMinManaLoss() - 4));
|
||||
}
|
||||
|
||||
return dead;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -82,8 +82,7 @@ public final class LexiconData {
|
||||
public static LexiconEntry redstoneSpreader;
|
||||
public static LexiconEntry manastar;
|
||||
public static LexiconEntry dreamwoodSpreader;
|
||||
public static LexiconEntry paintLens;
|
||||
public static LexiconEntry warpLens;
|
||||
public static LexiconEntry elvenLenses;
|
||||
public static LexiconEntry sparks;
|
||||
public static LexiconEntry sparkUpgrades;
|
||||
public static LexiconEntry rfGenerator;
|
||||
@@ -422,12 +421,10 @@ public final class LexiconData {
|
||||
dreamwoodSpreader = new ALexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana);
|
||||
dreamwoodSpreader.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesDreamwoodSpreader), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeUltraSpreader));
|
||||
|
||||
paintLens = new ALexiconEntry(LibLexicon.MANA_PAINT_LENS, categoryMana);
|
||||
paintLens.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLensPaint));
|
||||
|
||||
warpLens = new ALexiconEntry(LibLexicon.MANA_WARP_LENS, categoryMana);
|
||||
warpLens.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLensWarp));
|
||||
|
||||
elvenLenses = new ALexiconEntry(LibLexicon.MANA_ELVEN_LENSES, categoryMana);
|
||||
elvenLenses.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLensPaint), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeLensWarp), new PageText("5"), new PageCraftingRecipe("6", ModCraftingRecipes.recipeLensRedirect),
|
||||
new PageText("7"), new PageCraftingRecipe("8", ModCraftingRecipes.recipeLensFirework), new PageText("9"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeLensFlare));
|
||||
|
||||
prism = new ALexiconEntry(LibLexicon.MANA_PRISM, categoryMana);
|
||||
prism.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipePrism));
|
||||
|
||||
|
||||
@@ -179,7 +179,10 @@ public final class LibItemNames {
|
||||
"lensFire",
|
||||
"lensPiston",
|
||||
"lensLight",
|
||||
"lensWarp"
|
||||
"lensWarp",
|
||||
"lensRedirect",
|
||||
"lensFirework",
|
||||
"lensFlare"
|
||||
};
|
||||
|
||||
public static final String[] MANA_RESOURCE_NAMES = new String[] {
|
||||
|
||||
@@ -54,8 +54,7 @@ public final class LibLexicon {
|
||||
public static final String MANA_REDSTONE_SPREADER = "redstoneSpreader";
|
||||
public static final String MANA_MANASTAR = "manastar";
|
||||
public static final String MANA_DREAMWOOD_SPREADER = "dreamwoodSpreader";
|
||||
public static final String MANA_PAINT_LENS = "paintLens";
|
||||
public static final String MANA_WARP_LENS = "warpLens";
|
||||
public static final String MANA_ELVEN_LENSES = "elvenLenses";
|
||||
public static final String MANA_SPARKS = "sparks";
|
||||
public static final String MANA_SPARK_UPGRADES = "sparkUpgrades";
|
||||
public static final String MANA_PRISM = "prism";
|
||||
|
||||
@@ -504,7 +504,7 @@ achievement.botania:l20ShardUse=Out of Step
|
||||
achievement.botania:l20ShardUse.desc=Raise the ground up to the sky with a Power XX Shard of Laputa
|
||||
achievement.botania:gaiaGuardianNoArmor=Mythologia's End
|
||||
achievement.botania:gaiaGuardianNoArmor.desc=Slay a Gaia Guardian without wearing any armor at any point during the fight
|
||||
achievement.botania:rankSSPick=Talent Shredder
|
||||
achievement.botania:rankSSPick=A Tale of Six Trillion Years and a Night
|
||||
achievement.botania:rankSSPick.desc=Dig through the world using a rank SS Terra Shatterer
|
||||
achievement.botania:superCorporeaRequest=Invader Girl
|
||||
achievement.botania:superCorporeaRequest.desc=Successfully request 50,000 or more of a single item in a Corporea Index
|
||||
@@ -1362,6 +1362,12 @@ item.botania:lensLight.name=Mana Lens: Flash
|
||||
item.botania:lensLight.short=Flash
|
||||
item.botania:lensWarp.name=Mana Lens: Warp
|
||||
item.botania:lensWarp.short=Warp
|
||||
item.botania:lensRedirect.name=Mana Lens: Redirective
|
||||
item.botania:lensRedirect.short=Redirective
|
||||
item.botania:lensFirework.name=Mana Lens: Celebratory
|
||||
item.botania:lensFirework.short=Celebratory
|
||||
item.botania:lensFlare.name=Mana Lens: Flare
|
||||
item.botania:lensFlare.short=Flare
|
||||
item.botania:manaPetal0.name=White Mana Petal
|
||||
item.botania:manaPetal1.name=Orange Mana Petal
|
||||
item.botania:manaPetal2.name=Magenta Mana Petal
|
||||
@@ -2220,16 +2226,25 @@ botania.page.dreamwoodSpreader1=Better spreaders, that's it
|
||||
botania.page.dreamwoodSpreader2=By combining this already powerful spreader with a &1Gaia Spirit&0 and a &1Dragonstone&0 gem, one can create an even more potent variant. The &1Gaia Spreader&0 is within the top percentage of Mana Spreaders, with pretty much upgrades all round.<br>It's to note that these spreaders fire a larger payload at once and thus, might fire less often.
|
||||
botania.page.dreamwoodSpreader3=ULTRA_SPREADER
|
||||
|
||||
# -- PAINTSLINGER LENS
|
||||
botania.entry.paintLens=Paintslinger Lens
|
||||
botania.tagline.paintLens=A Mana Lens that can paint wool and others
|
||||
botania.page.paintLens0=The &4Elves&0 are one crafty bunch. This lens is somewhat unique in comparison to the other lenses. The &1Paintslinger Lens&0 needs to be dyed one of the 16 colors of the spectrum to function. When it hits a colorable block (&1Wool, Stained Clay or Glass&0...) it'll turn any blocks connected, of the same type and color, into the color of the &4Mana Burst&0 itself. It seems to work with &4Sheep&0 too.
|
||||
botania.page.paintLens1=A M'AIDER Stranded Girl
|
||||
# -- ELVEN MANA LENSES
|
||||
botania.entry.elvenLenses=Elven Mana Lenses
|
||||
botania.tagline.elvenLenses=Advanced Mana Lenses with new abilities
|
||||
botania.page.elvenLenses0=The knowledge of mana handling methods of alfheim comes, of course, with an array of new &1Mana Lenses&0 that can be experimented with.<br>Unlike common overworld-y lenses, these are a bit more ubiquitous in their uses...
|
||||
botania.page.elvenLenses1=First off, the &1Paintslinger Lens&0. This lens needs to be dyed one of the 16 colors of the spectrum to function. When a burst with its effect hits a colorable block (&1Wool, Stained Clay or Glass&0...) it'll turn any blocks connected, of the same type and color, into the color of the &4Mana Burst&0 itself. It seems to work with &4Sheep&0 too.
|
||||
botania.page.elvenLenses2=Paintslinger Lens
|
||||
botania.page.elvenLenses3=The &1Warp Lens&0 is an interesting one. A burst with its effect, when colliding with a &1Force Relay&0 will teleport to the end position of said &1Force Relay&0, maintaining its momentum. Furthermore, when it's used as a composite material to a &1Bore Lens&0 (the &1Bore Lens&0 must be visible) it'll make the lens not break &1Force Relays&0 or &1Pistons&0, as well as teleport any blocks to the spot where the burst was fired.
|
||||
botania.page.elvenLenses4=Warp Lens
|
||||
botania.page.elvenLenses5=The &1Redirective Lens&0 will only work when fired from a &1Mana Spreader&0. Any burst with its effect that would collide against a &1Mana Spreader&0, aside from the normal &4Mana&0 transfer interaction, also makes the spreader point towards the one that fired the burst.
|
||||
botania.page.elvenLenses6=Redirective Lens
|
||||
botania.page.elvenLenses7=The &1Celebratory Lens&0 functions much akin to the common &1Entropic Lens&0, however, instead of exploding, it creates a festive firework dyed the color of the burst.
|
||||
botania.page.elvenLenses8=Celebratory Lens
|
||||
botania.page.elvenLenses9=The &1Flare Lens&0 takes over a &1Mana Spreader&0's functionality, preventing it from firing any bursts. Instead, the spreader becomes a continuous particle burst of the color the lens is dyed, in the direction the spreader is firing.<br>There's surely plenty of decorative uses for this.
|
||||
botania.page.elvenLenses10=Flare Lens
|
||||
|
||||
# -- WARP LENS
|
||||
botania.entry.warpLens=Warp Lens
|
||||
botania.tagline.warpLens=A Mana Lens to combine with the Force Relay for burst teleporting
|
||||
botania.page.warpLens0=The &1Mana Lens: Warp&0 is an interesting one. A &4Mana Burst&0 with its effect, when colliding with a &1Force Relay&0 will teleport to the end position of said &1Force Relay&0, maintaining its momentum. Furthermore, when it's used as a composite material to a &1Bore Lens&0 (the &1Bore Lens&0 must be visible) it'll make the lens not break &1Force Relays&0 or &1Pistons&0, as well as teleport any blocks to the spot where the burst was fired.
|
||||
botania.page.warpLens0=
|
||||
botania.page.warpLens1=Hakase Quarries
|
||||
|
||||
# -- MANA PRISM
|
||||
|
||||
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 301 B After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 322 B After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 302 B After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 291 B After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 19 KiB |
@@ -1 +1 @@
|
||||
r1.7-232
|
||||
r1.7-233
|
||||
@@ -1,3 +1,6 @@
|
||||
r1.7 233
|
||||
*Fixed items that take damage when used in a crafting recipe taking damage purely by being put in the grid.
|
||||
*Fixed the Lexica Botania's main page making the screen dark on lower end (and integrated) graphics cards.
|
||||
r1.7 232
|
||||
*Added the botania version to the F3 menu next to the network monitors.
|
||||
*Changed the way multitexture is handled on graphics cards that don't support OpenGL 1.3 (using ARB instead).
|
||||
|
||||
@@ -229,4 +229,5 @@ r1.7-228=1.7.10
|
||||
r1.7-229=1.7.10
|
||||
r1.7-230=1.7.10
|
||||
r1.7-231=1.7.10
|
||||
r1.7-232=1.7.10
|
||||
r1.7-232=1.7.10
|
||||
r1.7-233=1.7.10
|
||||