upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-13 00:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

A fancier mana transfer fx.

Browse Source
This commit is contained in:
Vasco Lavos committed 2014-07-12 01:33:20 +01:00
1 parent 7e28f2e7fe
commit afe16d18e2
2 files changed
+9 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MODSRC/vazkii/botania/client/core/handler/LightningHandler.java
+3 -1
View File
@@ -11,6 +11,7 @@
*/
package vazkii.botania.client.core.handler;
import java.awt.Color;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -129,7 +130,8 @@ public class LightningHandler {
Vector3 startvec = rendersegment.startpoint.point;
Vector3 endvec = rendersegment.endpoint.point;
tessellator.setColorRGBA_I(inner ? bolt.colorInner : bolt.colorOuter, (int) (mainalpha * rendersegment.light * 255));
int color = inner ? bolt.colorInner : bolt.colorOuter;
tessellator.setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha()));
tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0);
tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0);
MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java
+6 -3
View File
@@ -35,11 +35,13 @@ import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.mana.ManaNetworkEvent;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.TileMod;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ModItems;
public class TilePool extends TileMod implements IManaPool, IKeyLocked {
@@ -215,9 +217,10 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked {
if(didSomething) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
if(worldObj.isRemote) {
Color color = new Color(0x00C6FF);
Botania.proxy.wispFX(worldObj, item.posX + Math.random() * 0.5 - 0.25, item.posY + Math.random() * 0.5 - (outputting ? 0.65 : 0.25), item.posZ + Math.random() * 0.5 - 0.25, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 15F, (outputting ? -1F : 1) * (float) Math.random() / 25F, 0.1F);
if(worldObj.isRemote && worldObj.rand.nextInt(5) == 0) {
Vector3 itemVec = Vector3.fromTileEntity(this).add(0.5, 0.5 + Math.random() * 0.3, 0.5);
Vector3 tileVec = Vector3.fromTileEntity(this).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6);
LightningHandler.spawnLightningBolt(worldObj, outputting ? tileVec : itemVec, outputting ? itemVec : tileVec, 80, worldObj.rand.nextLong(), 0x4400799c, 0x4400C6FF);
}
}
}