Early Luminizer work.

This commit is contained in:
Lizbeth Rika committed 2015-07-16 04:06:02 +01:00
1 parent 45fccc6dec
commit 10cdc44d66
8 files changed
+193 -1

No files matched your search

@@ -28,5 +28,6 @@ public final class LibRenderIDs {
public static int idIncensePlate = -1;
public static int idHourglass = -1;
public static int idCocoon = -1;
public static int idLightRelay = -1;
}
@@ -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 @ [Jul 15, 2015, 8:31:13 PM (GMT)]
*/
package vazkii.botania.common.block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import vazkii.botania.api.wand.IWandBindable;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.common.block.tile.TileLightRelay;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockLightRelay extends BlockModContainer implements IWandable {
public static IIcon invIcon, worldIcon;
protected BlockLightRelay() {
super(Material.glass);
float f = 5F / 16F;
setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f);
setBlockName(LibBlockNames.LIGHT_RELAY);
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
invIcon = IconHelper.forBlock(par1IconRegister, this, 0);
worldIcon = IconHelper.forBlock(par1IconRegister, this, 1);
}
@Override
public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
return invIcon;
}
@Override
public boolean renderAsNormalBlock() {
return false;
}
@Override
public boolean isOpaqueCube() {
return false;
}
@Override
public int getRenderType() {
return LibRenderIDs.idLightRelay;
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return new TileLightRelay();
}
@Override
public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) {
return false;
}
}
@@ -122,6 +122,7 @@ import vazkii.botania.common.block.tile.TileFloatingSpecialFlower;
import vazkii.botania.common.block.tile.TileForestEye;
import vazkii.botania.common.block.tile.TileHourglass;
import vazkii.botania.common.block.tile.TileIncensePlate;
import vazkii.botania.common.block.tile.TileLightRelay;
import vazkii.botania.common.block.tile.TileManaBeacon;
import vazkii.botania.common.block.tile.TileManaFlame;
import vazkii.botania.common.block.tile.TileOpenCrate;
@@ -235,6 +236,7 @@ public final class ModBlocks {
public static Block root;
public static Block felPumpkin;
public static Block cocoon;
public static Block lightRelay;
public static void init() {
flower = new BlockModFlower();
@@ -312,7 +314,8 @@ public final class ModBlocks {
root = new BlockRoot();
felPumpkin = new BlockFelPumpkin();
cocoon = new BlockCocoon();
lightRelay = new BlockLightRelay();
ModFluffBlocks.init();
for(int i = 0; i < 16; i++)
@@ -403,6 +406,7 @@ public final class ModBlocks {
registerTile(TileHourglass.class, LibBlockNames.HOURGLASS);
registerTile(TileSparkChanger.class, LibBlockNames.SPARK_CHANGER);
registerTile(TileCocoon.class, LibBlockNames.COCOON);
registerTile(TileLightRelay.class, LibBlockNames.LIGHT_RELAY);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class);
@@ -0,0 +1,109 @@
/**
* 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 @ [Jul 15, 2015, 8:32:04 PM (GMT)]
*/
package vazkii.botania.common.block.tile;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ChunkCoordinates;
import vazkii.botania.api.wand.IWandBindable;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.Vector3;
public class TileLightRelay extends TileMod implements IWandBindable {
private static final int MAX_DIST = 20;
private static final String TAG_BIND_X = "bindX";
private static final String TAG_BIND_Y = "bindY";
private static final String TAG_BIND_Z = "bindZ";
int bindX, bindY = -1, bindZ;
int ticksElapsed = 0;
@Override
public void updateEntity() {
if(bindY > -1) {
Block block = worldObj.getBlock(bindX, bindY, bindZ);
if(block != ModBlocks.lightRelay) {
bindY = -1;
return;
}
ticksElapsed++;
Vector3 vec = getMovementVector();
double dist = 0.1;
int size = (int) (vec.mag() / dist);
int count = 10;
int start = ticksElapsed % size;
Vector3 vecMag = vec.copy().normalize().multiply(dist);
Vector3 vecTip = vecMag.copy().multiply(start).add(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5);
double radPer = Math.PI / 16.0;
float mul = 0.5F;
float mulPer = 0.4F;
float maxMul = 2;
for(int i = start; i < start + count; i++) { // <- Replace to i = 0; i < size
mul = Math.min(maxMul, mul + mulPer);
double rad = radPer * (i + ticksElapsed * 0.4);
Vector3 vecRot = vecMag.copy().crossProduct(Vector3.one).multiply(mul).rotate(rad, vecMag).add(vecTip);
Botania.proxy.wispFX(worldObj, vecRot.x, vecRot.y, vecRot.z, 0.4F, 0.4F, 1F, 0.1F, (float) -vecMag.x, (float) -vecMag.y, (float) -vecMag.z, 1F);
vecTip.add(vecMag);
}
}
}
public Vector3 getMovementVector() {
return new Vector3(bindX - xCoord, bindY - yCoord, bindZ - zCoord);
}
@Override
public ChunkCoordinates getBinding() {
return new ChunkCoordinates(bindX, bindY, bindZ);
}
@Override
public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) {
return true;
}
@Override
public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) {
if(player.worldObj.getBlock(x, y, z) != ModBlocks.lightRelay || MathHelper.pointDistanceSpace(x, y, z, xCoord, yCoord, zCoord) > MAX_DIST)
return false;
bindX = x;
bindY = y;
bindZ = z;
return true;
}
@Override
public void readCustomNBT(NBTTagCompound cmp) {
bindX = cmp.getInteger(TAG_BIND_X);
bindY = cmp.getInteger(TAG_BIND_Y);
bindZ = cmp.getInteger(TAG_BIND_Z);
}
@Override
public void writeCustomNBT(NBTTagCompound cmp) {
cmp.setInteger(TAG_BIND_X, bindX);
cmp.setInteger(TAG_BIND_Y, bindY);
cmp.setInteger(TAG_BIND_Z, bindZ);
}
}
@@ -253,6 +253,7 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.corporeaFunnel);
addBlock(ModBlocks.corporeaInterceptor);
addBlock(ModBlocks.corporeaCrystalCube);
addBlock(ModBlocks.lightRelay);
// FLUFF
@@ -90,6 +90,7 @@ public final class LibBlockNames {
public static final String ROOT = "root";
public static final String FEL_PUMPKIN = "felPumpkin";
public static final String COCOON = "cocoon";
public static final String LIGHT_RELAY = "lightRelay";
public static final String SUBTILE_PUREDAISY = "puredaisy";
public static final String SUBTILE_MANASTAR = "manastar";