tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Turbine model improvements

Browse source
This commit is contained in:
Calclavia 2014-02-23 21:35:29 +08:00
parent f3fc8dd0ea
commit 72bb31bcbf
6 changed files with 2647 additions and 1808 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
electrical/src/main/java/resonantinduction/electrical/tesla/BlockTesla.java
View file

@ -130,8 +130,12 @@ public class BlockTesla extends BlockSidedIO implements ITileEntityProvider
@Override
public void onNeighborBlockChange(World world, int x, int y, int z, int id)
{
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
((TileTesla) tileEntity).updatePositionStatus();
TileEntity tile = world.getBlockTileEntity(x, y, z);
if (tile instanceof TileTesla)
{
((TileTesla) tile).updatePositionStatus();
}
}
@Override

20
mechanical/src/main/java/resonantinduction/mechanical/turbine/RenderWaterTurbine.java
View file

@ -52,22 +52,27 @@ public class RenderWaterTurbine extends TileEntitySpecialRenderer implements ISi
GL11.glPushMatrix();
GL11.glScalef(1, 1.6f, 1);
RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "cobblestone.png");
MODEL.renderOnly("Beamknot", "wheel_shaft");
MODEL.renderOnly("bigwheel_endknot", "horizontal_centre_shaft");
GL11.glPopMatrix();
GL11.glPushMatrix();
GL11.glScalef(1, 1.4f, 1);
RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "planks_spruce.png");
MODEL.renderOnly("BaseSupporter");
MODEL.renderOnly("bigwheel_supporters");
RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "planks_oak.png");
MODEL.renderOnly("Scoops", "SupporterCircle");
MODEL.renderOnly("bigwheel_scoops", "bigwheel_supportercircle");
GL11.glPopMatrix();
}
else
{
GL11.glPushMatrix();
GL11.glScalef(0.7f, 1, 0.7f);
RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "cobblestone.png");
MODEL.renderOnly("turbine_centre");
MODEL.renderOnly("small_waterwheel_endknot");
RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "planks_oak.png");
MODEL.renderOnly("small_waterwheel", "small_waterwheel_supporters", "horizontal_centre_shaft");
GL11.glPopMatrix();
}
}
@ -83,8 +88,13 @@ public class RenderWaterTurbine extends TileEntitySpecialRenderer implements ISi
}
else
{
GL11.glPushMatrix();
GL11.glScalef(0.9f, 1f, 0.9f);
RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "cobblestone.png");
MODEL.renderOnly("turbine_centre");
MODEL.renderOnly("small_waterwheel_endknot");
RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "iron_block.png");
MODEL.renderOnly("small_turbine_blades");
GL11.glPopMatrix();
}
}

2
mechanical/src/main/java/resonantinduction/mechanical/turbine/RenderWindTurbine.java
View file

@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderWindTurbine extends TileEntitySpecialRenderer
{
public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "turbines.obj");
public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "windTurbines.obj");
@Override
public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f)

1
src/main/resources/assets/resonantinduction/languages/en_US.properties
View file

@ -151,7 +151,6 @@ tooltip.noShift=Hold %0shift %1for more information"
# %0 is the color for the charge level, %1 is grey to reset it back to normal (optional), %v0 is the current charge, %v1 is the max charge
tooltip.battery.energy=Energy: %0%v0 / %v1
tooltip.multimeter.line1=Right click to place,
tooltip.multimeter.line2=Control right click to scan data.
tooltip.multimeter.noSave=No detection saved.
tooltip.multimeter.lastSave=Last Detection: %v KJ

4422
src/main/resources/assets/resonantinduction/models/waterTurbines.obj
View file

File diff suppressed because it is too large Load diff

0
src/main/resources/assets/resonantinduction/models/turbines.obj → src/main/resources/assets/resonantinduction/models/windTurbines.obj
View file