Fixes and cleanup

- Compile error fixes (blame @biggles2206). Fixes #53.
- UVLModelLoader is now cross compatible with vanilla (vanilla can use
uvl parents who have vanilla parents).
- Due to it, now using uvlMarker instead of .uvl.
- General code reformatting and cleanup.
This commit is contained in:
elix-x
2016-08-15 18:19:33 +02:00
parent 24ddc0e574
commit 63f426336b
10 changed files with 46 additions and 31 deletions
@@ -29,6 +29,7 @@ import net.minecraft.world.World;
import appeng.api.util.IOrientable;
import appeng.block.AEBaseBlock;
import appeng.decorative.solid.QuartzPillarBlock;
public class MetaRotation implements IOrientable
@@ -71,7 +72,8 @@ public class MetaRotation implements IOrientable
return state.getValue( facingProp );
}
Axis a = state.getValue( AEBaseBlock.AXIS_ORIENTATION );
//TODO 1.10.2-R - Temp
Axis a = state.getValue( QuartzPillarBlock.AXIS_ORIENTATION );
if( a == null )
{
@@ -101,7 +103,8 @@ public class MetaRotation implements IOrientable
}
else
{
( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( AEBaseBlock.AXIS_ORIENTATION, up.getAxis() ) );
//TODO 1.10.2-R - Temp
( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( QuartzPillarBlock.AXIS_ORIENTATION, up.getAxis() ) );
}
}
else