Style fixes.
This commit is contained in:
parent
b6862e08e0
commit
f288ff10dc
|
@ -94,12 +94,13 @@ final class IntegrationNode
|
||||||
|
|
||||||
if( enabled )
|
if( enabled )
|
||||||
{
|
{
|
||||||
switch (type) {
|
switch( type )
|
||||||
|
{
|
||||||
case IC2:
|
case IC2:
|
||||||
this.mod = Integrations.ic2 = new IC2Module();
|
this.mod = Integrations.setIc2( new IC2Module() );
|
||||||
break;
|
break;
|
||||||
case JEI:
|
case JEI:
|
||||||
this.mod = Integrations.jei = new JEIModule();
|
this.mod = Integrations.setJei( new JEIModule() );
|
||||||
break;
|
break;
|
||||||
case Waila:
|
case Waila:
|
||||||
this.mod = new WailaModule();
|
this.mod = new WailaModule();
|
||||||
|
|
|
@ -26,6 +26,9 @@ import appeng.integration.abstraction.IMekanism;
|
||||||
import appeng.integration.abstraction.IRC;
|
import appeng.integration.abstraction.IRC;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides convenient access to various integrations with other mods.
|
||||||
|
*/
|
||||||
public final class Integrations
|
public final class Integrations
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -67,4 +70,35 @@ public final class Integrations
|
||||||
{
|
{
|
||||||
return invTweaks;
|
return invTweaks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static IIC2 setIc2( IIC2 ic2 )
|
||||||
|
{
|
||||||
|
Integrations.ic2 = ic2;
|
||||||
|
return ic2;
|
||||||
|
}
|
||||||
|
|
||||||
|
static IJEI setJei( IJEI jei )
|
||||||
|
{
|
||||||
|
Integrations.jei = jei;
|
||||||
|
return jei;
|
||||||
|
}
|
||||||
|
|
||||||
|
static IRC setRc( IRC rc )
|
||||||
|
{
|
||||||
|
Integrations.rc = rc;
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
static IMekanism setMekanism( IMekanism mekanism )
|
||||||
|
{
|
||||||
|
Integrations.mekanism = mekanism;
|
||||||
|
return mekanism;
|
||||||
|
}
|
||||||
|
|
||||||
|
static IInvTweaks setInvTweaks( IInvTweaks invTweaks )
|
||||||
|
{
|
||||||
|
Integrations.invTweaks = invTweaks;
|
||||||
|
return invTweaks;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -297,11 +297,8 @@ public class PartPlacement
|
||||||
te_pos = pos.offset( side );
|
te_pos = pos.offset( side );
|
||||||
|
|
||||||
final Block blkID = world.getBlockState( te_pos ).getBlock();
|
final Block blkID = world.getBlockState( te_pos ).getBlock();
|
||||||
tile = world.getTileEntity( te_pos );
|
|
||||||
|
|
||||||
if( ( blkID == null || blkID.isReplaceable( world, te_pos ) || host != null ) ) // /&& side !=
|
if( blkID == null || blkID.isReplaceable( world, te_pos ) || host != null )
|
||||||
// AEPartLocation.INTERNAL
|
|
||||||
// )
|
|
||||||
{
|
{
|
||||||
return place( held, te_pos, side.getOpposite(), player, hand, world, pass == PlaceType.INTERACT_FIRST_PASS ? PlaceType.INTERACT_SECOND_PASS : PlaceType.PLACE_ITEM, depth + 1 );
|
return place( held, te_pos, side.getOpposite(), player, hand, world, pass == PlaceType.INTERACT_FIRST_PASS ? PlaceType.INTERACT_SECOND_PASS : PlaceType.PLACE_ITEM, depth + 1 );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue