Added the Rainbow Lens (had to fix a bunch of things to get it to work cuz weird stuff with clients).

This commit is contained in:
Vasco Lavos committed 2014-01-31 17:30:37 +00:00
1 parent 7b43512b71
commit a8946af0db
16 files changed
+166 -53

No files matched your search

@@ -11,6 +11,7 @@
*/
package vazkii.botania.api.internal;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChunkCoordinates;
/**
@@ -18,6 +19,8 @@ import net.minecraft.util.ChunkCoordinates;
*/
public interface IManaBurst {
public boolean isFake();
public int getColor();
public void setColor(int color);
@@ -45,5 +48,9 @@ public interface IManaBurst {
public ChunkCoordinates getBurstSourceChunkCoordinates();
public void setBurstSourceCoords(int x, int y, int z);
public ItemStack getSourceLens();
public void setSourceLens(ItemStack lens);
}
+18 -1
View File
@@ -12,7 +12,8 @@
package vazkii.botania.api.mana;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import vazkii.botania.api.internal.IManaBurst;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -24,6 +25,22 @@ public interface ILens {
@SideOnly(Side.CLIENT)
public int getLensColor(ItemStack stack);
/**
* Called when a mana spreader that has this focus shoots a burst. This is where
* you change the properties of the burst.
*/
public void apply(ItemStack stack, BurstProperties props);
/**
* Called when a mana burst fired from a mana spreader with this focus collides against
* any block. This is called after the collision is handled.
*/
public void collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, ItemStack stack);
/**
* Called when a mana burst fired from a mana spreader with this focus is updated.
* This is called before the update is handled.
*/
public void updateBurst(IManaBurst burst, ItemStack stack);
}
@@ -67,6 +67,7 @@ public class ClientProxy extends CommonProxy {
RenderLens lensRender = new RenderLens();
MinecraftForgeClient.registerItemRenderer(ModItems.colorLens.itemID, lensRender);
MinecraftForgeClient.registerItemRenderer(ModItems.rainbowLens.itemID, lensRender);
ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar());
ClientRegistry.bindTileEntitySpecialRenderer(TileSpreader.class, new RenderTileSpreader());
+12 -42
View File
@@ -49,7 +49,7 @@ public class FXWisp extends EntityFX
particleMaxAge = (int)(36D / (Math.random() * 0.3D + 0.7D));
moteHalfLife = particleMaxAge / 2;
noClip = false;
noClip = true;
setSize(0.01F, 0.01F);
EntityLivingBase renderentity = FMLClientHandler.instance().getClient().renderViewEntity;
int visibleDistance = 50;
@@ -126,9 +126,7 @@ public class FXWisp extends EntityFX
}
public FXWisp(World world, double d, double d1, double d2, double x, double y, double z,
float f, float red, float green, float blue)
{
public FXWisp(World world, double d, double d1, double d2, double x, double y, double z, float f, float red, float green, float blue) {
this(world, d, d1, d2, f, red,green,blue);
if (particleMaxAge>0) {
double dx = x - posX;
@@ -142,11 +140,7 @@ public class FXWisp extends EntityFX
}
@Override
public void renderParticle(Tessellator tessellator, float f, float f1, float f2, float f3, float f4, float f5)
{
public void renderParticle(Tessellator tessellator, float f, float f1, float f2, float f3, float f4, float f5) {
float agescale = 0;
if (shrink) {
agescale = ((float)particleMaxAge-(float)particleAge) / particleMaxAge;
@@ -155,13 +149,11 @@ public class FXWisp extends EntityFX
if (agescale>1f) agescale = 2-agescale;
}
particleScale = moteParticleScale * agescale;
tessellator.draw();
GL11.glPushMatrix();
GL11.glDepthMask(false);
GL11.glEnable(3042);
GL11.glBlendFunc(770, blendmode);
@@ -170,16 +162,13 @@ public class FXWisp extends EntityFX
GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F);
float f10 = 0.5F * particleScale;
float f11 = (float)(prevPosX + (posX - prevPosX) * f - interpPosX);
float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY);
float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ);
tessellator.startDrawingQuads();
tessellator.setBrightness(0x0000f0);
tessellator.setBrightness(240);
tessellator.setColorRGBA_F(particleRed, particleGreen, particleBlue, 0.5F);
tessellator.addVertexWithUV(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10, 0, 1);
tessellator.addVertexWithUV(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10, 1, 1);
@@ -197,49 +186,30 @@ public class FXWisp extends EntityFX
}
@Override
public void onUpdate()
{
public void onUpdate() {
prevPosX = posX;
prevPosY = posY;
prevPosZ = posZ;
if (particleAge==0 && tinkle && worldObj.rand.nextInt(3)==0)
worldObj.playSoundAtEntity(this, "random.orb", 0.02F, 0.5F * ((worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.6F + 2F));
if (particleAge++ >= particleMaxAge)
{
setDead();
}
motionY -= 0.040000000000000001D * particleGravity;
// moveEntity(motionX, motionY, motionZ);
posX+=motionX;
posY+=motionY;
posZ+=motionZ;
motionY -= 0.04D * particleGravity;
posX += motionX;
posY += motionY;
posZ += motionZ;
motionX *= 0.98000001907348633D;
motionY *= 0.98000001907348633D;
motionZ *= 0.98000001907348633D;
if (onGround)
{
motionX *= 0.69999998807907104D;
motionZ *= 0.69999998807907104D;
}
}
public void setGravity(float value) {
particleGravity = value;
}
public boolean shrink=false;
public boolean shrink = false;
float moteParticleScale;
int moteHalfLife;
public boolean tinkle=false;
public int blendmode=1;
public boolean tinkle = false;
public int blendmode = 1;
}
@@ -11,6 +11,7 @@
*/
package vazkii.botania.common.block.tile;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.player.EntityPlayer;
@@ -86,7 +87,7 @@ public class TileSpecialFlower extends TileMod {
}
public Icon getIcon() {
return subTile.getIcon();
return subTile == null ? Block.plantRed.getIcon(0, 0) : subTile.getIcon();
}
public LexiconEntry getEntry() {
@@ -233,6 +233,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector
if(lens != null)
((ILens) lens.getItem()).apply(lens, props);
burst.setSourceLens(lens);
if(getCurrentMana() >= props.maxMana || fake) {
burst.setColor(props.color);
burst.setMana(props.maxMana);
@@ -54,6 +54,7 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.spreader);
addItem(ModItems.colorLens);
addItem(ModItems.rainbowLens);
addBlock(ModBlocks.pool);
addBlock(ModBlocks.specialFlower);
@@ -45,6 +45,7 @@ public final class ConfigHandler {
LibItemIDs.idTwigWand = loadItem(LibItemNames.TWIG_WAND, LibItemIDs.idTwigWand);
LibItemIDs.idManaResource = loadItem(LibItemNames.MANA_RESOURCE, LibItemIDs.idManaResource);
LibItemIDs.idColorLens = loadItem(LibItemNames.COLOR_LENS, LibItemIDs.idColorLens);
LibItemIDs.idRainbowLens = loadItem(LibItemNames.RAINBOW_LENS, LibItemIDs.idRainbowLens);
config.save();
}
@@ -13,8 +13,8 @@ package vazkii.botania.common.entity;
import java.awt.Color;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
@@ -22,10 +22,11 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.IManaCollector;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.tile.TileSpreader;
import cpw.mods.fml.common.network.PacketDispatcher;
public class EntityManaBurst extends EntityThrowable implements IManaBurst {
@@ -41,7 +42,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
boolean fake = false;
final int dataWatcherEntries = 9;
final int dataWatcherEntries = 10;
final int dataWatcherStart = 32 - dataWatcherEntries;
public EntityManaBurst(World world) {
@@ -51,6 +52,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
int j = dataWatcherStart + i;
if(i == 4 || i == 5)
dataWatcher.addObject(j, 0F);
else if(i == 9)
dataWatcher.addObject(j, new ItemStack(1, 0, 0));
else dataWatcher.addObject(j, 0);
dataWatcher.setObjectWatched(j);
@@ -77,6 +80,11 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
@Override
public void onUpdate() {
super.onUpdate();
ILens lens = getLensInstance();
if(lens != null)
lens.updateBurst(this, getSourceLens());
particles();
int mana = getMana();
@@ -138,7 +146,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
}
public void particles() {
if(!worldObj.isRemote || isDead)
if(worldObj.isRemote || isDead)
return;
Color color = new Color(getColor());
@@ -152,12 +160,13 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
if(fake) {
if(!noParticles)
Botania.proxy.sparkleFX(worldObj, posX, posY, posZ, r, g, b, 0.4F * size, 1, true);
} else
Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.2F * size, (float) -motionX * 0.01F, (float) -motionY * 0.01F, (float) -motionZ * 0.01F);
} else Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.2F * size, (float) -motionX * 0.01F, (float) -motionY * 0.01F, (float) -motionZ * 0.01F);
}
@Override
protected void onImpact(MovingObjectPosition movingobjectposition) {
boolean mana = false;
if(movingobjectposition.entityHit == null) {
TileEntity tile = worldObj.getBlockTileEntity(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ);
@@ -167,6 +176,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
if(tile == null || tile.xCoord != coords.posX || tile.yCoord != coords.posY || tile.zCoord != coords.posZ) {
if((!fake || noParticles) && !worldObj.isRemote && tile != null && tile instanceof IManaReceiver && ((IManaReceiver) tile).canRecieveManaFromBursts()) {
mana = true;
((IManaReceiver) tile).recieveMana(getMana());
PacketDispatcher.sendPacketToAllInDimension(tile.getDescriptionPacket(), worldObj.provider.dimensionId);
}
@@ -174,6 +184,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
setDead();
}
}
ILens lens = getLensInstance();
if(lens != null)
lens.collideBurst(this, movingobjectposition, mana, getSourceLens());
}
@Override
@@ -192,6 +206,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
protected float getGravityVelocity() {
return getGravity();
}
@Override
public boolean isFake() {
return fake;
}
@Override
public int getColor() {
@@ -272,4 +292,22 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
dataWatcher.updateObject(coordsStart + 1, y);
dataWatcher.updateObject(coordsStart + 2, z);
}
@Override
public ItemStack getSourceLens() {
return dataWatcher.getWatchableObjectItemStack(dataWatcherStart + 9);
}
@Override
public void setSourceLens(ItemStack lens) {
dataWatcher.updateObject(dataWatcherStart + 9, lens == null ? new ItemStack(1, 0, 0) : lens);
}
public ILens getLensInstance() {
ItemStack lens = getSourceLens();
if(lens != null && lens.getItem() instanceof ILens)
return (ILens) lens.getItem();
return null;
}
}
@@ -11,11 +11,12 @@
*/
package vazkii.botania.common.item;
import vazkii.botania.common.item.lens.ItemColorLens;
import vazkii.botania.common.lib.LibOreDict;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import vazkii.botania.common.item.lens.ItemColorLens;
import vazkii.botania.common.item.lens.ItemRainbowLens;
import vazkii.botania.common.lib.LibOreDict;
public final class ModItems {
@@ -26,6 +27,7 @@ public final class ModItems {
public static Item twigWand;
public static Item manaResource;
public static Item colorLens;
public static Item rainbowLens;
public static void init() {
lexicon = new ItemLexicon();
@@ -35,7 +37,8 @@ public final class ModItems {
twigWand = new ItemTwigWand();
manaResource = new ItemManaResource();
colorLens = new ItemColorLens();
rainbowLens = new ItemRainbowLens();
OreDictionary.registerOre(LibOreDict.LEXICON, lexicon);
for(int i = 0; i < 16; i++) {
OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal.itemID, 1, i));
@@ -14,12 +14,14 @@ package vazkii.botania.common.item.lens;
import java.awt.Color;
import java.util.List;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.BurstProperties;
import vazkii.botania.common.lib.LibItemIDs;
import vazkii.botania.common.lib.LibItemNames;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition;
public class ItemColorLens extends ItemLens {
@@ -53,4 +55,14 @@ public class ItemColorLens extends ItemLens {
props.color = getLensColor(stack);
}
@Override
public void collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, ItemStack stack) {
// NO-OP
}
@Override
public void updateBurst(IManaBurst burst, ItemStack stack) {
// NO-OP
}
}
@@ -14,6 +14,9 @@ package vazkii.botania.common.item.lens;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.BurstProperties;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.item.ItemMod;
@@ -50,4 +53,19 @@ public abstract class ItemLens extends ItemMod implements ILens {
return par2 == 1 ? getLensColor(par1ItemStack) : 0xFFFFFF;
}
@Override
public void apply(ItemStack stack, BurstProperties props) {
// NO-OP
}
@Override
public void collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, ItemStack stack) {
// NO-OP
}
@Override
public void updateBurst(IManaBurst burst, ItemStack stack) {
// NO-OP
}
}
@@ -0,0 +1,40 @@
/**
* 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 a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* File Created @ [Jan 31, 2014, 4:53:05 PM (GMT)]
*/
package vazkii.botania.common.item.lens;
import java.awt.Color;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.common.lib.LibItemIDs;
import vazkii.botania.common.lib.LibItemNames;
public class ItemRainbowLens extends ItemLens {
public ItemRainbowLens() {
super(LibItemIDs.idRainbowLens, LibItemNames.RAINBOW_LENS);
}
@Override
public int getLensColor(ItemStack stack) {
World world = Minecraft.getMinecraft().theWorld;
return world == null ? 0xFFFFFF : Color.HSBtoRGB((float) ((world.getTotalWorldTime() * 2) % 360) / 360F, 1F, 1F);
}
@Override
public void updateBurst(IManaBurst burst, ItemStack stack) {
burst.setColor(getLensColor(stack));
}
}
@@ -20,5 +20,6 @@ public final class LibItemIDs {
public static int idTwigWand = 19559;
public static int idManaResource = 19560;
public static int idColorLens = 19561;
public static int idRainbowLens = 19562;
}
@@ -22,6 +22,7 @@ public final class LibItemNames {
public static final String TWIG_WAND = LibResources.PREFIX_MOD + "twigWand";
public static final String MANA_RESOURCE = LibResources.PREFIX_MOD + "manaResource";
public static final String COLOR_LENS = LibResources.PREFIX_MOD + "colorLens";
public static final String RAINBOW_LENS = LibResources.PREFIX_MOD + "rainbowLens";
public static final String[] MANA_RESOURCE_NAMES = new String[] {
LibResources.PREFIX_MOD + "manasteel",
+1
View File
@@ -95,6 +95,7 @@ item.botania:colorLens12.name=Brown Tinted Lens
item.botania:colorLens13.name=Green Tinted Lens
item.botania:colorLens14.name=Red Tinted Lens
item.botania:colorLens15.name=Black Tinted Lens
item.botania:rainbowLens.name=Rainbow Lens
# GUI TEXT
botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: