fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Part models

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-09 00:53:40 +02:00
parent 4b11b8857b
commit 97e065ea1f
154 changed files with 578 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/networking/CableBusTESR.java
+6 -2
View File
@@ -29,7 +29,7 @@ import appeng.api.parts.IPart;
import appeng.tile.AEBaseTile;
public class CableBusTESR extends TileEntityRenderer<TileCableBusTESR>
public class CableBusTESR extends TileEntityRenderer<TileCableBus>
{
public CableBusTESR(TileEntityRendererDispatcher rendererDispatcherIn) {
@@ -37,7 +37,11 @@ public class CableBusTESR extends TileEntityRenderer<TileCableBusTESR>
}
@Override
public void render(TileCableBusTESR te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int combinedLightIn, int combinedOverlayIn) {
public void render(TileCableBus te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int combinedLightIn, int combinedOverlayIn) {
if (!te.getCableBus().isRequiresDynamicRender()) {
return;
}
for( Direction facing : Direction.values() )
{
IPart part = te.getPart( facing );
src/main/java/appeng/tile/networking/TileCableBus.java
+14 -16
View File
@@ -62,8 +62,6 @@ import java.util.Set;
public class TileCableBus extends AEBaseTile implements AEMultiTile
{
public static final ModelProperty<CableBusRenderState> RENDER_STATE_PROPERTY = new ModelProperty<>();
private CableBusContainer cb = new CableBusContainer( this );
private int oldLV = -1; // on re-calculate light when it changes
@@ -117,19 +115,19 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile
*/
protected void updateTileSetting()
{
if( this.getCableBus().isRequiresDynamicRender() )
{
try
{
final TileCableBus tcb = (TileCableBus) BlockCableBus.getTesrTile().newInstance();
tcb.copyFrom( this );
this.getWorld().setTileEntity( this.pos, tcb );
}
catch( final Throwable ignored )
{
}
}
// FIXME if( this.getCableBus().isRequiresDynamicRender() )
// FIXME {
// FIXME try
// FIXME {
// FIXME final TileCableBus tcb = (TileCableBus) BlockCableBus.getTesrTile().newInstance();
// FIXME tcb.copyFrom( this );
// FIXME this.getWorld().setTileEntity( this.pos, tcb );
// FIXME }
// FIXME catch( final Throwable ignored )
// FIXME {
// FIXME
// FIXME }
// FIXME }
}
protected void copyFrom( final TileCableBus oldTile )
@@ -401,7 +399,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile
renderState.setWorld(world);
renderState.setPos(pos);
return new ModelDataMap.Builder()
.withInitial(RENDER_STATE_PROPERTY, renderState)
.withInitial(CableBusRenderState.PROPERTY, renderState)
.build();
}
src/main/java/appeng/tile/networking/TileCableBusTESR.java
+13 -13
View File
@@ -36,18 +36,18 @@ public class TileCableBusTESR extends TileCableBus
@Override
protected void updateTileSetting()
{
if( !this.getCableBus().isRequiresDynamicRender() )
{
try
{
final TileCableBus tcb = (TileCableBus) BlockCableBus.getNoTesrTile().newInstance();
tcb.copyFrom( this );
this.getWorld().setTileEntity( this.pos, tcb );
}
catch( final Throwable ignored )
{
}
}
// FIXME if( !this.getCableBus().isRequiresDynamicRender() )
// FIXME {
// FIXME try
// FIXME {
// FIXME final TileCableBus tcb = (TileCableBus) BlockCableBus.getNoTesrTile().newInstance();
// FIXME tcb.copyFrom( this );
// FIXME this.getWorld().setTileEntity( this.pos, tcb );
// FIXME }
// FIXME catch( final Throwable ignored )
// FIXME {
// FIXME
// FIXME }
// FIXME }
}
}