tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix tank rendering, make Configurator serve as a BuildCraft wrench

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-02 07:55:14 -05:00
parent 5eba673468
commit 4a499d6dac
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/client/render/tileentity/RenderDynamicTank.java
View file

@ -61,7 +61,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
if(tileEntity.structure.fluidStored.getFluid().isGaseous())
{
GL11.glColor4f(1F, 1F, 1F, (float)tileEntity.structure.fluidStored.amount / (float)tileEntity.clientCapacity);
GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.fluidStored.amount / (float)tileEntity.clientCapacity)+0.3F));
GL11.glCallList(displayList[getStages(data.height)-1]);
}
else {

14
common/mekanism/common/item/ItemBlockOre.java
View file

@ -48,6 +48,20 @@ public class ItemBlockOre extends ItemBlock
list.add("It is known to have many uses in");
list.add("the construction of machinery.");
}
else if(itemstack.getItemDamage() == 1)
{
list.add("A common, conductive material that");
list.add("can be used in the production of.");
list.add("wires. It's ability to withstand");
list.add("high heats also makes it essential");
list.add("to advanced machinery.");
}
else if(itemstack.getItemDamage() == 2)
{
list.add("A lightweight, yet sturdy, conductive");
list.add("material that is found slighly less");
list.add("commonly than Copper.");
}
}
}

12
common/mekanism/common/item/ItemConfigurator.java
View file

@ -23,8 +23,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatMessageComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.tools.IToolWrench;
public class ItemConfigurator extends ItemEnergized
public class ItemConfigurator extends ItemEnergized implements IToolWrench
{
public final int ENERGY_PER_CONFIGURE = 400;
public final int ENERGY_PER_ITEM_DUMP = 8;
@ -302,4 +303,13 @@ public class ItemConfigurator extends ItemEnergized
{
return false;
}
@Override
public boolean canWrench(EntityPlayer player, int x, int y, int z)
{
return true;
}
@Override
public void wrenchUsed(EntityPlayer player, int x, int y, int z) {}
}