Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed #274 - Pipe break texture

Browse source
This commit is contained in:
Calclavia 2014-02-24 20:48:04 +08:00
parent 5118106f9d
commit 0166ed66fa
3 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
electrical/src/main/java/resonantinduction/electrical/wire/framed/RenderFramedWire.java
View file

@ -134,12 +134,6 @@ public class RenderFramedWire
} }
} }
public static void registerIcons(IconRegister iconReg)
{
lainWireIcon = iconReg.registerIcon(Reference.PREFIX + "models/lainWire");
breakIcon = iconReg.registerIcon(Reference.PREFIX + "wire");
}
public void renderStatic(PartFramedWire wire) public void renderStatic(PartFramedWire wire)
{ {
TextureUtils.bindAtlas(0); TextureUtils.bindAtlas(0);

4
mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
View file

@ -18,6 +18,7 @@ import resonantinduction.api.mechanical.fluid.IFluidPipe;
import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction;
import resonantinduction.core.prefab.fluid.PipeNetwork; import resonantinduction.core.prefab.fluid.PipeNetwork;
import resonantinduction.core.prefab.part.PartFramedConnection; import resonantinduction.core.prefab.part.PartFramedConnection;
import resonantinduction.electrical.wire.framed.RenderFramedWire;
import resonantinduction.mechanical.Mechanical; import resonantinduction.mechanical.Mechanical;
import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IConductor;
import calclavia.lib.utility.WrenchUtility; import calclavia.lib.utility.WrenchUtility;
@ -30,10 +31,11 @@ import codechicken.microblock.IHollowConnect;
import codechicken.multipart.JIconHitEffects; import codechicken.multipart.JIconHitEffects;
import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.JNormalOcclusion;
import codechicken.multipart.TSlottedPart; import codechicken.multipart.TSlottedPart;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe, IFluidNetwork> implements IFluidPipe, TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe, IFluidNetwork> implements IFluidPipe, TSlottedPart, JNormalOcclusion, IHollowConnect
{ {
protected FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME); protected FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
private int pressure; private int pressure;

39
src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java
View file

@ -126,27 +126,12 @@ public abstract class PartFramedConnection<M extends Enum, C extends IConnector<
@Override @Override
public void drawBreaking(RenderBlocks renderBlocks) public void drawBreaking(RenderBlocks renderBlocks)
{
if (breakIcon != null)
{ {
CCRenderState.reset(); CCRenderState.reset();
RenderUtils.renderBlock(sides[6], 0, new Translation(x(), y(), z()), new IconTransformation(renderBlocks.overrideBlockTexture), null); RenderUtils.renderBlock(sides[6], 0, new Translation(x(), y(), z()), new IconTransformation(breakIcon), null);
} }
@Override
public Iterable<Cuboid6> getOcclusionBoxes()
{
return getCollisionBoxes();
}
@Override
public int getSlotMask()
{
return PartMap.CENTER.mask;
}
@Override
public int getHollowSize()
{
return isInsulated ? 8 : 6;
} }
@Override @Override
@ -167,6 +152,24 @@ public abstract class PartFramedConnection<M extends Enum, C extends IConnector<
return breakIcon; return breakIcon;
} }
@Override
public Iterable<Cuboid6> getOcclusionBoxes()
{
return getCollisionBoxes();
}
@Override
public int getSlotMask()
{
return PartMap.CENTER.mask;
}
@Override
public int getHollowSize()
{
return isInsulated ? 8 : 6;
}
@Override @Override
public void addHitEffects(MovingObjectPosition hit, EffectRenderer effectRenderer) public void addHitEffects(MovingObjectPosition hit, EffectRenderer effectRenderer)
{ {