Added creative capacitor bank.

This commit is contained in:
CrazyPants committed 2014-05-16 23:43:49 +08:00
1 parent 0b51a522e2
commit 70db4f38e8
10 files changed
+124 -69

No files matched your search

@@ -381,7 +381,9 @@ public class NetworkPowerManager {
receptors.clear();
storageReceptors.clear();
for (ReceptorEntry rec : network.getPowerReceptors()) {
if(rec.powerInterface.getDelegate() != null && rec.powerInterface.getDelegate().getClass() == TileCapacitorBank.class) {
if(rec.powerInterface.getDelegate() != null &&
rec.powerInterface.getDelegate().getClass() == TileCapacitorBank.class &&
!((TileCapacitorBank)rec.powerInterface.getDelegate()).isCreative()) {
storageReceptors.add(rec);
} else {
receptors.add(rec);
@@ -354,7 +354,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
long curTick = getBundle().getWorld().getTotalWorldTime();
long recT = recievedTicks.get(dir);
if(curTick >= (recT - 5)) {
if(curTick - recT <= 5) {
return true;
}
return false;
@@ -20,6 +20,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.tools.IToolWrench;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
@@ -30,6 +31,7 @@ import crazypants.enderio.enderface.BlockEio;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
import crazypants.enderio.gui.TooltipAddera;
import crazypants.enderio.machine.IoMode;
import crazypants.enderio.material.ItemFusedQuartz;
import crazypants.enderio.power.PowerHandlerUtil;
import crazypants.util.BlockCoord;
import crazypants.util.Util;
@@ -61,7 +63,13 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc
@Override
protected void init() {
super.init();
//super.init();
GameRegistry.registerBlock(this, BlockItemCapacitorBank.class, name);
if(teClass != null) {
GameRegistry.registerTileEntity(teClass, name + "TileEntity");
}
EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_CAPACITOR_BANK, this);
setLightOpacity(255);
}
@@ -72,9 +80,19 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc
ItemStack is = BlockItemCapacitorBank.createItemStackWithPower(0);
list.add(is);
is = BlockItemCapacitorBank.createItemStackWithPower(TileCapacitorBank.BASE_CAP.getMaxEnergyStored());
list.add(is);
is = BlockItemCapacitorBank.createItemStackWithPower(TileCapacitorBank.BASE_CAP.getMaxEnergyStored() / 2);
is.setItemDamage(1);
list.add(is);
}
@Override
public int damageDropped(int par1) {
return par1;
}
@Override
@@ -219,6 +237,10 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc
return;
}
TileCapacitorBank tr = (TileCapacitorBank) world.getTileEntity(x, y, z);
int meta = world.getBlockMetadata(x, y, z);
if(meta == 1) {
tr.setCreativeMode();
}
tr.onBlockAdded();
}
@@ -2,11 +2,15 @@ package crazypants.enderio.machine.power;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.material.BlockFusedQuartz;
import crazypants.enderio.power.PowerHandlerUtil;
public class BlockItemCapacitorBank extends ItemBlock {
@@ -21,20 +25,38 @@ public class BlockItemCapacitorBank extends ItemBlock {
super(EnderIO.blockCapacitorBank);
setHasSubtypes(true);
}
public BlockItemCapacitorBank(Block block) {
super(block);
setHasSubtypes(true);
setCreativeTab(EnderIOTab.tabEnderIO);
}
@Override
public int getMetadata(int par1) {
return par1;
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
int meta = par1ItemStack.getItemDamage();
String result = super.getUnlocalizedName(par1ItemStack);
if(meta == 1) {
result += ".creative";
}
return result;
}
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
ItemStack stack = createItemStackWithPower(0);
stack.setItemDamage(0);
par3List.add(stack);
stack = createItemStackWithPower(TileCapacitorBank.BASE_CAP.getMaxEnergyStored());
par3List.add(stack);
stack = createItemStackWithPower(TileCapacitorBank.BASE_CAP.getMaxEnergyStored()/2);
stack.setItemDamage(1);
par3List.add(stack);
@@ -6,6 +6,7 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureUtil;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
@@ -17,6 +18,7 @@ import crazypants.render.ConnectedTextureRenderer;
import crazypants.render.CustomCubeRenderer;
import crazypants.render.CustomRenderBlocks;
import crazypants.render.IRenderFace;
import crazypants.render.IconUtil;
import crazypants.render.RenderUtil;
import crazypants.util.BlockCoord;
import crazypants.util.ForgeDirectionOffsets;
@@ -38,6 +40,7 @@ public class CapBankRenderer2 implements ISimpleBlockRenderingHandler {
public CapBankRenderer2() {
connectedTexRenderer = new ConnectedTextureRenderer();
connectedTexRenderer.setMatchMeta(true);
GaugueRenderer gaugeRenderer = new GaugueRenderer();
renderers.add(connectedTexRenderer);
@@ -55,7 +58,14 @@ public class CapBankRenderer2 implements ISimpleBlockRenderingHandler {
TileCapacitorBank cb = ((TileCapacitorBank) te);
cb.energyAtLastRender = cb.getEnergyStored();
}
connectedTexRenderer.setEdgeTexture(EnderIO.blockAlloySmelter.getBlockTextureFromSide(3)); //can't do in constructor as texture not loaded yet
int meta = world.getBlockMetadata(x, y, z);
if(meta == 1) {
connectedTexRenderer.setEdgeTexture(IconUtil.whiteTexture);
connectedTexRenderer.setForceAllEdges(true);
} else {
connectedTexRenderer.setEdgeTexture(EnderIO.blockAlloySmelter.getBlockTextureFromSide(3));
connectedTexRenderer.setForceAllEdges(false);
}
CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, renderers);
return true;
}
@@ -19,6 +19,7 @@ import crazypants.enderio.EnderIO;
import crazypants.enderio.power.PowerHandlerUtil;
import crazypants.render.BoundingBox;
import crazypants.render.CubeRenderer;
import crazypants.render.IconUtil;
import crazypants.render.RenderUtil;
import crazypants.util.BlockCoord;
import crazypants.vecmath.Vector2f;
@@ -45,7 +46,7 @@ public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
renderBlock(null, PowerHandlerUtil.getStoredEnergyForItem(item) / TileCapacitorBank.BASE_CAP.getMaxEnergyStored());
renderBlock(null, PowerHandlerUtil.getStoredEnergyForItem(item) / TileCapacitorBank.BASE_CAP.getMaxEnergyStored(), item.getItemDamage());
}
//------------------------- Entity renderer
@@ -61,14 +62,14 @@ public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements
GL11.glTranslated(x, y, z);
TileCapacitorBank cb = (TileCapacitorBank) te;
renderBlock(cb, cb.getEnergyStoredRatio());
renderBlock(cb, cb.getEnergyStoredRatio(), 0);
GL11.glPopMatrix();
Minecraft.getMinecraft().entityRenderer.enableLightmap(0);
}
private void renderBlock(TileCapacitorBank te, float filledRatio) {
private void renderBlock(TileCapacitorBank te, float filledRatio, int meta) {
RenderUtil.bindBlockTexture();
Tessellator tes = Tessellator.instance;
@@ -115,9 +116,9 @@ public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements
tes.setColorRGBA_F(maxBrightness, maxBrightness, maxBrightness, 1);
if(te != null) {
//RenderUtil.setTesselatorBrightness(te.worldObj, te.xCoord, te.yCoord, te.zCoord);
renderBorder(te.getWorld(), te.xCoord, te.yCoord, te.zCoord);
renderBorder(te.getWorld(), te.xCoord, te.yCoord, te.zCoord, meta);
} else {
renderBorder(null, 0, 0, 0);
renderBorder(null, 0, 0, 0, meta);
}
for (GaugeBounds gb : gaugeBounds) {
renderGaugeOnFace(gb, EnderIO.blockCapacitorBank.overlayIcon);
@@ -139,8 +140,13 @@ public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements
GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL);
}
private void renderBorder(IBlockAccess blockAccess, int x, int y, int z) {
IIcon texture = EnderIO.blockAlloySmelter.getBlockTextureFromSide(3);
private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) {
IIcon texture;
if(meta == 0) {
texture = EnderIO.blockAlloySmelter.getBlockTextureFromSide(3);
} else {
texture = IconUtil.whiteTexture;
}
for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) {
RenderUtil.renderConnectedTextureFace(blockAccess, x, y, z, face, texture,
blockAccess == null, false, false);
@@ -94,6 +94,8 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
float energyAtLastRender = -1;
private boolean isCreative = false;
public TileCapacitorBank() {
inventory = new ItemStack[4];
storedEnergy = 0;
@@ -242,6 +244,9 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
storedEnergy += powerHandler.getEnergyStored();
powerHandler.setEnergy(0);
}
if(isCreative) {
storedEnergy = getMaxEnergyStored()/2;
}
requiresClientSync |= lastSyncPowerStored != storedEnergy && worldObj.getTotalWorldTime() % 10 == 0;
@@ -358,7 +363,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
&& mode != IoMode.PULL && mode != IoMode.DISABLED
&& powerInterface.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) {
float used;
if(receptor.receptor.getDelegate() instanceof IConduitBundle) {
if(receptor.receptor.getDelegate() instanceof IConduitBundle && !isCreative) {
//All other power transfer is handled by the conduit network
IConduitBundle bundle = (IConduitBundle) receptor.receptor.getDelegate();
IPowerConduit conduit = bundle.getConduit(IPowerConduit.class);
@@ -367,7 +372,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
} else {
used = 0;
}
} else {
} else {
used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit);
}
@@ -548,6 +553,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
public int doReceiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
float freeSpace = maxStoredEnergy - storedEnergy;
freeSpace = Math.min(freeSpace, getMaxInput());
int result = (int) Math.min(maxReceive / 10, freeSpace);
if(!simulate) {
doAddEnergy(result);
@@ -757,6 +763,9 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
}
private void formMultiblock() {
if(isCreative) {
return;
}
List<TileCapacitorBank> blocks = new ArrayList<TileCapacitorBank>();
blocks.add(this);
findNighbouringBanks(this, blocks);
@@ -790,10 +799,13 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
}
private void findNighbouringBanks(TileCapacitorBank tileCapacitorBank, List<TileCapacitorBank> blocks) {
if(isCreative) {
return;
}
BlockCoord bc = new BlockCoord(tileCapacitorBank);
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
TileCapacitorBank cb = getCapBank(bc.getLocation(dir));
if(cb != null && !blocks.contains(cb)) {
if(cb != null && !blocks.contains(cb) && !cb.isCreative) {
blocks.add(cb);
findNighbouringBanks(cb, blocks);
}
@@ -1156,8 +1168,20 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe
@Override
public boolean hasCustomInventoryName() {
// TODO Auto-generated method stub
return false;
}
public void setCreativeMode() {
this.isCreative = true;
maxIO = maxIO * 1000;
maxInput = maxIO;
maxOutput = maxIO;
updatePowerHandler();
}
public boolean isCreative() {
return isCreative;
}
}
@@ -57,6 +57,8 @@ public class ConnectedTextureRenderer implements IRenderFace {
private TextureCallback edgeTexureCallback;
private boolean matchMetaData;
public boolean isForceAllEdges() {
return forceAllEdges;
}
@@ -80,6 +82,11 @@ public class ConnectedTextureRenderer implements IRenderFace {
}
edgeTexureCallback = new DefaultTextureCallback(texture);
}
public void setMatchMeta(boolean matchMetaData) {
this.matchMetaData = matchMetaData;
}
@Override
public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List<Vertex> refVertices,
@@ -96,7 +103,7 @@ public class ConnectedTextureRenderer implements IRenderFace {
if(forceAllEdges) {
edges = RenderUtil.getEdgesForFace(face);
} else {
edges = RenderUtil.getNonConectedEdgesForFace(rb.blockAccess, (int) x, (int) y, (int) z, face);
edges = RenderUtil.getNonConectedEdgesForFace(rb.blockAccess, (int) x, (int) y, (int) z, face, matchMetaData);
}
List<ForgeDirection> allEdges = RenderUtil.getEdgesForFace(face);
@@ -239,12 +246,6 @@ public class ConnectedTextureRenderer implements IRenderFace {
}
}
// private int interpolateBrightness(float u, float v, int bl, int br, int tl, int tr) {
// //(1 - yfrac) * [(1 - xfrac)*s00 + xfrac*s01] + yfrac * [(1 - xfrac)*s10 + xfrac*s11]
// float res = (1 - v) * ((1 - u) * bl + u * tl) + v * ((1 - u) * br + u * tr);
// return (int) res;
// }
private boolean needsCorner(ForgeDirection dir, ForgeDirection dir2, List<ForgeDirection> edges, ForgeDirection face,
Block par1Block, double x, double y,
double z, IBlockAccess blockAccess) {
@@ -308,44 +309,5 @@ public class ConnectedTextureRenderer implements IRenderFace {
return xyz.z;
}
// private void moveCornerVec(List<Vector3d> corners, Vector3d edge, float scaleFactor) {
// int[] indices = getClosestVec(edge, corners);
// corners.get(indices[0]).x -= scaleFactor * edge.x;
// corners.get(indices[1]).x -= scaleFactor * edge.x;
// corners.get(indices[0]).y -= scaleFactor * edge.y;
// corners.get(indices[1]).y -= scaleFactor * edge.y;
// corners.get(indices[0]).z -= scaleFactor * edge.z;
// corners.get(indices[1]).z -= scaleFactor * edge.z;
// }
//
// private int[] getClosestVec(Vector3d edge, List<Vector3d> corners) {
// int[] res = new int[] { -1, -1 };
// boolean highest = edge.x > 0 || edge.y > 0 || edge.z > 0;
// double minMax = highest ? -Double.MAX_VALUE : Double.MAX_VALUE;
// int index = 0;
// for (Vector3d v : corners) {
// double val = get(v, edge);
// if(highest ? val >= minMax : val <= minMax) {
// if(val != minMax) {
// res[0] = index;
// } else {
// res[1] = index;
// }
// minMax = val;
// }
// index++;
// }
// return res;
// }
//
// private double get(Vector3d xyz, Vector3d edge) {
// if(Math.abs(edge.x) > 0.5) {
// return xyz.x;
// }
// if(Math.abs(edge.y) > 0.5) {
// return xyz.y;
// }
// return xyz.z;
// }
}
@@ -299,8 +299,13 @@ public class RenderUtil {
}
}
public static List<ForgeDirection> getNonConectedEdgesForFace(IBlockAccess blockAccess, int x, int y, int z, ForgeDirection face) {
return getNonConectedEdgesForFace(blockAccess, x, y, z, face, false);
}
public static List<ForgeDirection> getNonConectedEdgesForFace(IBlockAccess blockAccess, int x, int y, int z, ForgeDirection face, boolean matchMetaData) {
Block block = blockAccess.getBlock(x, y, z);
if(block == null) {
return Collections.emptyList();
@@ -316,13 +321,14 @@ public class RenderUtil {
}
List<ForgeDirection> result = new ArrayList<ForgeDirection>(4);
for (EdgeNeighbour edge : edges) {
if(blockAccess.getBlock(edge.bc.x, edge.bc.y, edge.bc.z) != block) {
boolean matchingNeighbour = blockAccess.getBlock(edge.bc.x, edge.bc.y, edge.bc.z) == block;
if(matchingNeighbour && matchMetaData) {
matchingNeighbour = blockAccess.getBlockMetadata(x, y, z) == blockAccess.getBlockMetadata(edge.bc.x, edge.bc.y, edge.bc.z) ;
}
if(!matchingNeighbour) {
result.add(edge.dir);
}
// else if(blockAccess.getBlockId(edge.bc.x + face.offsetX, edge.bc.y +
// face.offsetY, edge.bc.z + face.offsetZ) == blockID) {
// result.add(edge.dir); //corner
// }
}
return result;
}