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

QuartzFixture and (semi-borked) LightningFX

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-01 16:59:11 +02:00
parent 260b2d1c92
commit 2a1ba12516
37 changed files with 270 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/networking/BlockCableBus.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
CableBusRenderState renderState = this.cb( world, pos ).getRenderState();
renderState.setWorld( world );
renderState.setPos( pos );
return ( (IExtendedBlockState) state ).withProperty( RENDER_STATE_PROPERTY, renderState );
return ( (IExtendedBlockState) state ).with( RENDER_STATE_PROPERTY, renderState );
}
@Override
src/main/java/appeng/block/networking/BlockController.java
+4 -4
View File
@@ -76,8 +76,8 @@ public class BlockController extends AEBaseTileBlock
super( Material.IRON );
this.setHardness( 6 );
this.setDefaultState( this.getDefaultState()
.withProperty( CONTROLLER_STATE, ControllerBlockState.offline )
.withProperty( CONTROLLER_TYPE, ControllerRenderType.block ) );
.with( CONTROLLER_STATE, ControllerBlockState.offline )
.with( CONTROLLER_TYPE, ControllerRenderType.block ) );
}
@Override
@@ -144,7 +144,7 @@ public class BlockController extends AEBaseTileBlock
}
}
return state.withProperty( CONTROLLER_TYPE, type );
return state.with( CONTROLLER_TYPE, type );
}
@Override
@@ -163,7 +163,7 @@ public class BlockController extends AEBaseTileBlock
public BlockState getStateFromMeta( final int meta )
{
ControllerBlockState state = ControllerBlockState.values()[meta];
return this.getDefaultState().withProperty( CONTROLLER_STATE, state );
return this.getDefaultState().with( CONTROLLER_STATE, state );
}
@Override
src/main/java/appeng/block/networking/BlockEnergyCell.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class BlockEnergyCell extends AEBaseTileBlock
@Override
public BlockState getStateFromMeta( final int meta )
{
return this.getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) );
return this.getDefaultState().with( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) );
}
public BlockEnergyCell()
src/main/java/appeng/block/networking/BlockWireless.java
+2 -2
View File
@@ -69,7 +69,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
this.setLightOpacity( 0 );
this.setFullSize( false );
this.setOpaque( false );
this.setDefaultState( this.getDefaultState().withProperty( STATE, State.OFF ) );
this.setDefaultState( this.getDefaultState().with( STATE, State.OFF ) );
}
@Override
@@ -97,7 +97,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
}
return super.getActualState( state, worldIn, pos )
.withProperty( STATE, teState );
.with( STATE, teState );
}
@Override