Code format
This commit is contained in:
parent
68c3ea5ae9
commit
ab689f2a48
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.api.definitions;
|
||||
|
||||
|
||||
|
|
|
@ -86,22 +86,15 @@ public interface IBlocks
|
|||
IBlockDefinition quartzPillarStair();
|
||||
|
||||
/*
|
||||
IBlockDefinition skyStoneSlab();
|
||||
|
||||
IBlockDefinition skyStoneBlockSlab();
|
||||
|
||||
IBlockDefinition skyStoneBrickSlab();
|
||||
|
||||
IBlockDefinition skyStoneSmallBrickSlab();
|
||||
|
||||
IBlockDefinition fluixSlab();
|
||||
|
||||
IBlockDefinition quartzSlab();
|
||||
|
||||
IBlockDefinition chiseledQuartzSlab();
|
||||
|
||||
IBlockDefinition quartzPillarSlab();
|
||||
*/
|
||||
* IBlockDefinition skyStoneSlab();
|
||||
* IBlockDefinition skyStoneBlockSlab();
|
||||
* IBlockDefinition skyStoneBrickSlab();
|
||||
* IBlockDefinition skyStoneSmallBrickSlab();
|
||||
* IBlockDefinition fluixSlab();
|
||||
* IBlockDefinition quartzSlab();
|
||||
* IBlockDefinition chiseledQuartzSlab();
|
||||
* IBlockDefinition quartzPillarSlab();
|
||||
*/
|
||||
|
||||
/*
|
||||
* misc
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.api.definitions;
|
||||
|
||||
|
||||
|
|
|
@ -32,11 +32,11 @@ import net.minecraft.item.Item;
|
|||
import net.minecraft.item.ItemStack;
|
||||
|
||||
|
||||
|
||||
public interface IItemDefinition extends IComparableDefinition
|
||||
{
|
||||
/**
|
||||
* @return the unique name of the definition which will be used to register the underlying structure. Will never be null
|
||||
* @return the unique name of the definition which will be used to register the underlying structure. Will never be
|
||||
* null
|
||||
*/
|
||||
@Nonnull
|
||||
String identifier();
|
||||
|
|
|
@ -78,15 +78,15 @@ public interface IParts
|
|||
|
||||
IItemDefinition p2PTunnelLiquids();
|
||||
|
||||
//IItemDefinition p2PTunnelEU();
|
||||
// IItemDefinition p2PTunnelEU();
|
||||
|
||||
//IItemDefinition p2PTunnelRF();
|
||||
// IItemDefinition p2PTunnelRF();
|
||||
|
||||
IItemDefinition p2PTunnelLight();
|
||||
|
||||
//IItemDefinition p2PTunnelOpenComputers();
|
||||
// IItemDefinition p2PTunnelOpenComputers();
|
||||
|
||||
// IItemDefinition p2PTunnelPneumaticCraft();
|
||||
// IItemDefinition p2PTunnelPneumaticCraft();
|
||||
|
||||
IItemDefinition cableAnchor();
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.api.definitions;
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.api.exceptions;
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.api.exceptions;
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.api.features;
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.api.features;
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.api.features;
|
||||
|
||||
|
||||
|
|
|
@ -51,12 +51,18 @@ public interface IMovableHandler
|
|||
* Potential Example:
|
||||
*
|
||||
* <pre>
|
||||
* {@code
|
||||
* Chunk c = world.getChunkFromBlockCoords( x, z ); c.setChunkBlockTileEntity( x
|
||||
* & 0xF, y + y, z & 0xF, tile );
|
||||
* {
|
||||
* @code
|
||||
* Chunk c = world.getChunkFromBlockCoords( x, z );
|
||||
* c.setChunkBlockTileEntity( x
|
||||
* & 0xF, y + y, z & 0xF, tile );
|
||||
*
|
||||
* if ( c.isChunkLoaded ) { world.addTileEntity( tile ); world.markBlockForUpdate( x,
|
||||
* y, z ); }
|
||||
* if( c.isChunkLoaded )
|
||||
* {
|
||||
* world.addTileEntity( tile );
|
||||
* world.markBlockForUpdate( x,
|
||||
* y, z );
|
||||
* }
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
|
|
|
@ -56,7 +56,8 @@ public enum GridFlags
|
|||
DENSE_CAPACITY,
|
||||
|
||||
/**
|
||||
* This block is part of a multiblock, used in conjunction with REQUIRE_CHANNEL, and {@link IGridMultiblock} see this
|
||||
* This block is part of a multiblock, used in conjunction with REQUIRE_CHANNEL, and {@link IGridMultiblock} see
|
||||
* this
|
||||
* interface for details.
|
||||
*/
|
||||
MULTIBLOCK,
|
||||
|
|
|
@ -155,7 +155,8 @@ public interface IGridNode
|
|||
|
||||
/**
|
||||
* tell the node who was responsible for placing it, failure to do this may result in in-compatibility with the
|
||||
* security system. Called instead of loadFromNBT when initially placed, once set never required again, the value is saved with the Node NBT.
|
||||
* security system. Called instead of loadFromNBT when initially placed, once set never required again, the value is
|
||||
* saved with the Node NBT.
|
||||
*
|
||||
* @param playerID new player id
|
||||
*/
|
||||
|
|
|
@ -71,7 +71,8 @@ public interface ICraftingGrid extends IGridCache
|
|||
* @param job - the crafting job from beginCraftingJob
|
||||
* @param requestingMachine - a machine if its being requested via automation, may be null.
|
||||
* @param target - can be null
|
||||
* @param prioritizePower - if cpu is null, this determine if the system should prioritize power, or if it should find the lower
|
||||
* @param prioritizePower - if cpu is null, this determine if the system should prioritize power, or if it should
|
||||
* find the lower
|
||||
* end cpus, automatic processes generally should pick lower end cpus.
|
||||
* @param src - the action source to use when starting the job, this will be used for extracting items, should
|
||||
* usually be the same as the one provided to beginCraftingJob.
|
||||
|
|
|
@ -30,8 +30,7 @@ import appeng.api.networking.energy.IEnergyGrid;
|
|||
|
||||
/**
|
||||
* Posted by the network when the power status of the network goes up or down,
|
||||
* the change is reflected via the {@link IEnergyGrid}.isNetworkPowered() or via
|
||||
* {@link IGridNode}.isActive()
|
||||
* the change is reflected via the {@link IEnergyGrid}.isNetworkPowered() or via {@link IGridNode}.isActive()
|
||||
*
|
||||
* Note: Most machines just need to check {@link IGridNode}.isActive()
|
||||
*/
|
||||
|
|
|
@ -32,7 +32,8 @@ public interface ISpatialCache extends IGridCache
|
|||
{
|
||||
|
||||
/**
|
||||
* @return true if a region is defined at all, it doesn't have to be valid, but all points must be in the same world.
|
||||
* @return true if a region is defined at all, it doesn't have to be valid, but all points must be in the same
|
||||
* world.
|
||||
*/
|
||||
boolean hasRegion();
|
||||
|
||||
|
|
|
@ -21,8 +21,10 @@
|
|||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
@API( apiVersion = "rv2", owner = "appliedenergistics2", provides = "appliedenergistics2|API" ) package appeng.api;
|
||||
@API( apiVersion = "rv2", owner = "appliedenergistics2", provides = "appliedenergistics2|API" )
|
||||
package appeng.api;
|
||||
|
||||
|
||||
import net.minecraftforge.fml.common.API;
|
||||
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@ public interface IPart extends IBoxProvider
|
|||
* texture.
|
||||
*/
|
||||
@SideOnly( Side.CLIENT )
|
||||
TextureAtlasSprite getBreakingTexture(ModelGenerator renderer);
|
||||
TextureAtlasSprite getBreakingTexture( ModelGenerator renderer );
|
||||
|
||||
/**
|
||||
* return true only if your part require dynamic rendering, must be consistent.
|
||||
|
|
|
@ -34,7 +34,8 @@ import net.minecraft.world.World;
|
|||
public interface IPartHelper
|
||||
{
|
||||
/**
|
||||
* Register a new layer with the part layer system, this allows you to write an in between between tile entities and parts.
|
||||
* Register a new layer with the part layer system, this allows you to write an in between between tile entities and
|
||||
* parts.
|
||||
*
|
||||
* AE By Default includes,
|
||||
*
|
||||
|
@ -52,7 +53,8 @@ public interface IPartHelper
|
|||
*
|
||||
* 7. IPipeConnection BC Pipe Connections
|
||||
*
|
||||
* As long as a valid layer is registered for a interface you can simply implement that interface on a part get implement it.
|
||||
* As long as a valid layer is registered for a interface you can simply implement that interface on a part get
|
||||
* implement it.
|
||||
*
|
||||
* @return true on success, false on failure, usually a error will be logged as well.
|
||||
*/
|
||||
|
|
|
@ -28,8 +28,8 @@ import javax.annotation.Nullable;
|
|||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
//@formatter:off
|
||||
|
||||
//@formatter:off
|
||||
|
||||
/**
|
||||
* This is a pretty basic requirement, once you implement the interface, and createPartFromItemStack
|
||||
|
|
|
@ -161,7 +161,9 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
|||
public AccessRestriction getAccess()
|
||||
{
|
||||
return this.getHandler().getAccess();
|
||||
} @Override
|
||||
}
|
||||
|
||||
@Override
|
||||
public IItemList<StackType> getStorageList()
|
||||
{
|
||||
if( this.hasChanged )
|
||||
|
@ -184,7 +186,9 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
|||
public boolean canAccept( final StackType input )
|
||||
{
|
||||
return this.getHandler().canAccept( input );
|
||||
} @Override
|
||||
}
|
||||
|
||||
@Override
|
||||
public IItemList<StackType> getAvailableItems( final IItemList out )
|
||||
{
|
||||
return this.getHandler().getAvailableItems( out );
|
||||
|
@ -208,7 +212,4 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
|||
return this.getHandler().validForPass( i );
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
|
||||
package appeng.api.util;
|
||||
|
||||
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
|
||||
|
||||
/**
|
||||
* Mutable stand in for Axis Aligned BB, this was used to prevent GC Thrashing.. Related code could also be re-written.
|
||||
*/
|
||||
|
@ -19,14 +22,14 @@ public class AEAxisAlignedBB
|
|||
return AxisAlignedBB.fromBounds( this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ );
|
||||
}
|
||||
|
||||
public AEAxisAlignedBB( final double a, final double b, final double c, final double d, final double e, final double f)
|
||||
public AEAxisAlignedBB( final double a, final double b, final double c, final double d, final double e, final double f )
|
||||
{
|
||||
this.minX =a;
|
||||
this.minY =b;
|
||||
this.minZ =c;
|
||||
this.maxX =d;
|
||||
this.maxY =e;
|
||||
this.maxZ =f;
|
||||
this.minX = a;
|
||||
this.minY = b;
|
||||
this.minZ = c;
|
||||
this.maxX = d;
|
||||
this.maxY = e;
|
||||
this.maxZ = f;
|
||||
}
|
||||
|
||||
public static AEAxisAlignedBB fromBounds(
|
||||
|
@ -37,7 +40,7 @@ public class AEAxisAlignedBB
|
|||
final double e,
|
||||
final double f )
|
||||
{
|
||||
return new AEAxisAlignedBB(a,b,c,d,e,f);
|
||||
return new AEAxisAlignedBB( a, b, c, d, e, f );
|
||||
}
|
||||
|
||||
public static AEAxisAlignedBB fromBounds(
|
||||
|
|
|
@ -1,57 +1,61 @@
|
|||
|
||||
package appeng.api.util;
|
||||
|
||||
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
|
||||
/**
|
||||
* Stand in for previous Forge Direction, Several uses of this class are simply legacy where as some uses of this class are intended.
|
||||
* Stand in for previous Forge Direction, Several uses of this class are simply legacy where as some uses of this class
|
||||
* are intended.
|
||||
*/
|
||||
public enum AEPartLocation
|
||||
{
|
||||
/**
|
||||
* Negative Y
|
||||
*/
|
||||
DOWN(0, -1, 0),
|
||||
DOWN( 0, -1, 0 ),
|
||||
|
||||
/**
|
||||
* Positive Y
|
||||
*/
|
||||
UP(0, 1, 0),
|
||||
UP( 0, 1, 0 ),
|
||||
|
||||
/**
|
||||
* Negative Z
|
||||
*/
|
||||
NORTH(0, 0, -1),
|
||||
NORTH( 0, 0, -1 ),
|
||||
|
||||
/**
|
||||
* Positive Z
|
||||
*/
|
||||
SOUTH(0, 0, 1),
|
||||
SOUTH( 0, 0, 1 ),
|
||||
|
||||
/**
|
||||
* Negative X
|
||||
*/
|
||||
WEST(-1, 0, 0),
|
||||
WEST( -1, 0, 0 ),
|
||||
|
||||
/**
|
||||
* Posative X
|
||||
*/
|
||||
EAST(1, 0, 0),
|
||||
EAST( 1, 0, 0 ),
|
||||
|
||||
/**
|
||||
* Center or inside of the block.
|
||||
*/
|
||||
INTERNAL(0, 0, 0);
|
||||
INTERNAL( 0, 0, 0 );
|
||||
|
||||
public final int xOffset;
|
||||
public final int yOffset;
|
||||
public final int zOffset;
|
||||
|
||||
private static final EnumFacing[] facings = { EnumFacing.DOWN, EnumFacing.UP, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST, null };
|
||||
private static final int[] OPPOSITES = {1, 0, 3, 2, 5, 4, 6};
|
||||
private static final int[] OPPOSITES = { 1, 0, 3, 2, 5, 4, 6 };
|
||||
|
||||
public static final AEPartLocation[] SIDE_LOCATIONS = {DOWN, UP, NORTH, SOUTH, WEST, EAST};
|
||||
public static final AEPartLocation[] SIDE_LOCATIONS = { DOWN, UP, NORTH, SOUTH, WEST, EAST };
|
||||
|
||||
private AEPartLocation( final int x, final int y, final int z)
|
||||
private AEPartLocation( final int x, final int y, final int z )
|
||||
{
|
||||
this.xOffset = x;
|
||||
this.yOffset = y;
|
||||
|
@ -61,9 +65,9 @@ public enum AEPartLocation
|
|||
/**
|
||||
* @return Part Location
|
||||
*/
|
||||
public static AEPartLocation fromOrdinal( final int id)
|
||||
public static AEPartLocation fromOrdinal( final int id )
|
||||
{
|
||||
if (id >= 0 && id < SIDE_LOCATIONS.length)
|
||||
if( id >= 0 && id < SIDE_LOCATIONS.length )
|
||||
return SIDE_LOCATIONS[id];
|
||||
|
||||
return INTERNAL;
|
||||
|
@ -75,9 +79,10 @@ public enum AEPartLocation
|
|||
* @param side
|
||||
* @return proper Part Location for a facing enum.
|
||||
*/
|
||||
public static AEPartLocation fromFacing( final EnumFacing side)
|
||||
public static AEPartLocation fromFacing( final EnumFacing side )
|
||||
{
|
||||
if ( side == null ) return INTERNAL;
|
||||
if( side == null )
|
||||
return INTERNAL;
|
||||
return values()[side.ordinal()];
|
||||
}
|
||||
|
||||
|
@ -86,7 +91,7 @@ public enum AEPartLocation
|
|||
*/
|
||||
public AEPartLocation getOpposite()
|
||||
{
|
||||
return fromOrdinal(OPPOSITES[this.ordinal()]);
|
||||
return fromOrdinal( OPPOSITES[this.ordinal()] );
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -54,7 +54,7 @@ public class DimensionalCoord extends WorldCoord
|
|||
|
||||
public DimensionalCoord( final World _w, final int x, final int y, final int z )
|
||||
{
|
||||
super( x,y,z );
|
||||
super( x, y, z );
|
||||
this.w = _w;
|
||||
this.dimId = _w.provider.getDimensionId();
|
||||
}
|
||||
|
|
|
@ -23,11 +23,10 @@
|
|||
|
||||
package appeng.api.util;
|
||||
|
||||
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Nearly all of AE's Tile Entities implement IOrientable.
|
||||
*
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
package appeng.block.misc;
|
||||
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
|
@ -44,6 +45,7 @@ import appeng.helpers.ICustomCollision;
|
|||
import appeng.helpers.MetaRotation;
|
||||
import appeng.tile.misc.TileLightDetector;
|
||||
|
||||
|
||||
public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision
|
||||
{
|
||||
|
||||
|
@ -86,7 +88,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
|||
final IBlockState state,
|
||||
final EnumFacing side )
|
||||
{
|
||||
if ( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() )
|
||||
if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() )
|
||||
{
|
||||
return ( (World) w ).getLightFromNeighbors( pos ) - 6;
|
||||
}
|
||||
|
@ -103,7 +105,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
|||
super.onNeighborChange( world, pos, neighbor );
|
||||
|
||||
final TileLightDetector tld = this.getTileEntity( world, pos );
|
||||
if ( tld != null )
|
||||
if( tld != null )
|
||||
{
|
||||
tld.updateLight();
|
||||
}
|
||||
|
@ -181,7 +183,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
|||
final Block neighborBlock )
|
||||
{
|
||||
final EnumFacing up = getOrientable( w, pos ).getUp();
|
||||
if ( !canPlaceAt( w, pos, up.getOpposite() ) )
|
||||
if( !canPlaceAt( w, pos, up.getOpposite() ) )
|
||||
{
|
||||
dropTorch( w, pos );
|
||||
}
|
||||
|
@ -200,9 +202,9 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
|||
final World w,
|
||||
final BlockPos pos )
|
||||
{
|
||||
for ( final EnumFacing dir : EnumFacing.VALUES )
|
||||
for( final EnumFacing dir : EnumFacing.VALUES )
|
||||
{
|
||||
if ( canPlaceAt( w, pos, dir ) )
|
||||
if( canPlaceAt( w, pos, dir ) )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
package appeng.block.networking;
|
||||
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
@ -68,10 +69,11 @@ import appeng.tile.networking.TileCableBus;
|
|||
import appeng.tile.networking.TileCableBusTESR;
|
||||
import appeng.util.Platform;
|
||||
|
||||
|
||||
// TODO: MFR INTEGRATION
|
||||
//@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = IntegrationType.MFR )
|
||||
public class BlockCableBus extends AEBaseTileBlock // implements
|
||||
// IRedNetConnection
|
||||
// IRedNetConnection
|
||||
{
|
||||
|
||||
private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
|
||||
|
@ -175,11 +177,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
final BlockPos pos )
|
||||
{
|
||||
final IBlockState block = world.getBlockState( pos );
|
||||
if ( block != null && block.getBlock() != this )
|
||||
if( block != null && block.getBlock() != this )
|
||||
{
|
||||
return block.getBlock().getLightValue( world, pos );
|
||||
}
|
||||
if ( block == null )
|
||||
if( block == null )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@ -219,10 +221,10 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
final EntityPlayer player,
|
||||
final boolean willHarvest )
|
||||
{
|
||||
if ( player.capabilities.isCreativeMode )
|
||||
if( player.capabilities.isCreativeMode )
|
||||
{
|
||||
final AEBaseTile tile = this.getTileEntity( world, pos );
|
||||
if ( tile != null )
|
||||
if( tile != null )
|
||||
{
|
||||
tile.disableDrops();
|
||||
}
|
||||
|
@ -237,7 +239,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
final BlockPos pos,
|
||||
EnumFacing side )
|
||||
{
|
||||
if ( side == null )
|
||||
if( side == null )
|
||||
{
|
||||
side = EnumFacing.UP;
|
||||
}
|
||||
|
@ -249,7 +251,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
public boolean canRenderInLayer(
|
||||
final EnumWorldBlockLayer layer )
|
||||
{
|
||||
if ( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
|
||||
if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
|
||||
{
|
||||
return layer == EnumWorldBlockLayer.CUTOUT || layer == EnumWorldBlockLayer.TRANSLUCENT;
|
||||
}
|
||||
|
@ -266,11 +268,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
final Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() );
|
||||
final SelectedPart sp = cb( world, pos ).selectPart( v3 );
|
||||
|
||||
if ( sp.part != null )
|
||||
if( sp.part != null )
|
||||
{
|
||||
return sp.part.getItemStack( PartItemStack.Pick );
|
||||
}
|
||||
else if ( sp.facade != null )
|
||||
else if( sp.facade != null )
|
||||
{
|
||||
return sp.facade.getItemStack();
|
||||
}
|
||||
|
@ -286,7 +288,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
final EffectRenderer effectRenderer )
|
||||
{
|
||||
final Object object = cb( world, target.getBlockPos() );
|
||||
if ( object instanceof IPartHost )
|
||||
if( object instanceof IPartHost )
|
||||
{
|
||||
final IPartHost host = (IPartHost) object;
|
||||
|
||||
|
@ -320,7 +322,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
final EffectRenderer effectRenderer )
|
||||
{
|
||||
final Object object = cb( world, pos );
|
||||
if ( object instanceof IPartHost )
|
||||
if( object instanceof IPartHost )
|
||||
{
|
||||
final IPartHost host = (IPartHost) object;
|
||||
|
||||
|
@ -349,7 +351,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
final IBlockState state,
|
||||
final Block neighborBlock )
|
||||
{
|
||||
if ( Platform.isServer() )
|
||||
if( Platform.isServer() )
|
||||
{
|
||||
cb( w, pos ).onNeighborChanged();
|
||||
}
|
||||
|
@ -362,11 +364,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
final TileEntity te = w.getTileEntity( pos );
|
||||
ICableBusContainer out = null;
|
||||
|
||||
if ( te instanceof TileCableBus )
|
||||
if( te instanceof TileCableBus )
|
||||
{
|
||||
out = ( (TileCableBus) te ).getCableBus();
|
||||
}
|
||||
else if ( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.FMP ) )
|
||||
else if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.FMP ) )
|
||||
{
|
||||
out = ( (IFMP) IntegrationRegistry.INSTANCE.getInstance( IntegrationType.FMP ) ).getCableContainer( te );
|
||||
}
|
||||
|
@ -414,7 +416,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
{
|
||||
return cb( world, pos ).recolourBlock( side, AEColor.values()[color.ordinal()], who );
|
||||
}
|
||||
catch ( final Throwable ignored )
|
||||
catch( final Throwable ignored )
|
||||
{
|
||||
}
|
||||
return false;
|
||||
|
@ -437,12 +439,12 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
{
|
||||
final TileEntity te = w.getTileEntity( pos );
|
||||
|
||||
if ( noTesrTile.isInstance( te ) )
|
||||
if( noTesrTile.isInstance( te ) )
|
||||
{
|
||||
return (T) te;
|
||||
}
|
||||
|
||||
if ( tesrTile != null && tesrTile.isInstance( te ) )
|
||||
if( tesrTile != null && tesrTile.isInstance( te ) )
|
||||
{
|
||||
return (T) te;
|
||||
}
|
||||
|
@ -463,7 +465,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
|
|||
noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class.getName() );
|
||||
setTileEntity( noTesrTile );
|
||||
GameRegistry.registerTileEntity( noTesrTile, "BlockCableBus" );
|
||||
if ( Platform.isClient() )
|
||||
if( Platform.isClient() )
|
||||
{
|
||||
tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class.getName() );
|
||||
GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" );
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
|
||||
package appeng.client;
|
||||
|
||||
|
||||
public enum ItemRenderType
|
||||
{
|
||||
INVENTORY, ENTITY
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
package appeng.client;
|
||||
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
|
@ -23,6 +24,7 @@ import appeng.client.render.BlockRenderInfo;
|
|||
import appeng.client.render.ModelGenerator;
|
||||
import appeng.client.texture.MissingIcon;
|
||||
|
||||
|
||||
// net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer
|
||||
public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel
|
||||
{
|
||||
|
|
|
@ -823,11 +823,11 @@ public abstract class AEBaseGui extends GuiContainer
|
|||
final float f1 = 0.00390625F;
|
||||
final float f = 0.00390625F;
|
||||
final float par6 = 16;
|
||||
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + par6, this.zLevel).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).endVertex();
|
||||
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + par6, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).endVertex();
|
||||
final float par5 = 16;
|
||||
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + par6, this.zLevel).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).endVertex();
|
||||
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + 0, this.zLevel).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).endVertex();
|
||||
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + 0, this.zLevel).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex();
|
||||
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + par6, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).endVertex();
|
||||
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + 0, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).endVertex();
|
||||
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + 0, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex();
|
||||
tessellator.draw();
|
||||
}
|
||||
catch( final Exception err )
|
||||
|
|
|
@ -141,12 +141,12 @@ public class AppEngRenderItem extends RenderItem
|
|||
{
|
||||
final WorldRenderer wr = par1Tessellator.getWorldRenderer();
|
||||
|
||||
wr.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM);
|
||||
wr.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM );
|
||||
|
||||
wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2, par3, 0.0D ).endVertex();
|
||||
wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos(par2, par3 + par5, 0.0D ).endVertex();
|
||||
wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2 + par4, par3 + par5, 0.0D ).endVertex();
|
||||
wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2 + par4, par3, 0.0D ).endVertex();
|
||||
wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2, par3, 0.0D ).endVertex();
|
||||
wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2, par3 + par5, 0.0D ).endVertex();
|
||||
wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2 + par4, par3 + par5, 0.0D ).endVertex();
|
||||
wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2 + par4, par3, 0.0D ).endVertex();
|
||||
|
||||
par1Tessellator.draw();
|
||||
}
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
package appeng.client.render;
|
||||
|
||||
|
||||
|
||||
import org.lwjgl.util.vector.Vector3f;
|
||||
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
|
|
|
@ -109,10 +109,10 @@ public class SpatialSkyRender extends IRenderHandler
|
|||
}
|
||||
|
||||
worldrenderer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM );
|
||||
worldrenderer.color(0f,0f,0f,1f).pos( -100.0D, -100.0D, -100.0D).tex( 0.0D, 0.0D ).endVertex();
|
||||
worldrenderer.color(0f,0f,0f,1f).pos( -100.0D, -100.0D, 100.0D).tex( 0.0D, 16.0D ).endVertex();
|
||||
worldrenderer.color(0f,0f,0f,1f).pos( 100.0D, -100.0D, 100.0D).tex( 16.0D, 16.0D ).endVertex();
|
||||
worldrenderer.color(0f,0f,0f,1f).pos( 100.0D, -100.0D, -100.0D).tex( 16.0D, 0.0D ).endVertex();
|
||||
worldrenderer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, -100.0D ).tex( 0.0D, 0.0D ).endVertex();
|
||||
worldrenderer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, 100.0D ).tex( 0.0D, 16.0D ).endVertex();
|
||||
worldrenderer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, 100.0D ).tex( 16.0D, 16.0D ).endVertex();
|
||||
worldrenderer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, -100.0D ).tex( 16.0D, 0.0D ).endVertex();
|
||||
tessellator.draw();
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
|
|
@ -197,27 +197,27 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
|||
float middle = 0.5f;
|
||||
middle += 0.02f;
|
||||
final float TwoPx = 2.0f / 16.0f;
|
||||
tess.pos( TwoPx, middle + press, TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle + press, TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle + press, TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
|
||||
|
||||
tess.pos( TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
|
||||
final float base = 0.4f;
|
||||
tess.pos( 1.0 - TwoPx, middle + base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
|
||||
tess.pos( TwoPx, middle + base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle + base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
|
||||
tess.pos( TwoPx, middle + base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
|
||||
|
||||
middle -= 2.0f * 0.02f;
|
||||
tess.pos( 1.0 - TwoPx, middle - press, TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle - press, TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle - press, TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle - press, TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
|
||||
|
||||
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle - base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle + -base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
|
||||
tess.pos( TwoPx, middle - base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
|
||||
tess.pos( 1.0 - TwoPx, middle + -base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
|
||||
|
||||
Tessellator.getInstance().draw();
|
||||
|
||||
|
|
|
@ -97,10 +97,10 @@ public class CraftingFx extends EntityBreakingFX
|
|||
|
||||
// AELog.info( "" + partialTick );
|
||||
final float f14 = 1.0F;
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale).tex( f7, f9 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale).tex( f7, f8 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale + rx * scale, offY + y * scale, offZ + z * scale + rz * scale).tex( f6, f8 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale - rx * scale, offY - y * scale, offZ + z * scale - rz * scale).tex( f6, f9 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale ).tex( f7, f9 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale ).tex( f7, f8 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale + rx * scale, offY + y * scale, offZ + z * scale + rz * scale ).tex( f6, f8 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale - rx * scale, offY - y * scale, offZ + z * scale - rz * scale ).tex( f6, f9 ).endVertex();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -87,10 +87,10 @@ public class EnergyFx extends EntityBreakingFX
|
|||
if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
|
||||
{
|
||||
final float f14 = 1.0F;
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10).tex( f7, f9 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10).tex( f7, f8 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10).tex( f6, f8 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10).tex( f6, f9 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ).tex( f7, f9 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ).tex( f7, f8 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ).tex( f6, f8 ).endVertex();
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ).tex( f6, f9 ).endVertex();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -126,9 +126,9 @@ public class LightningFX extends EntityFX
|
|||
offX *= 0.001;
|
||||
offY *= 0.001;
|
||||
offZ *= 0.001;
|
||||
red=this.particleRed * j * 0.4f;
|
||||
green=this.particleGreen * j * 0.25f;
|
||||
blue= this.particleBlue * j * 0.45f;
|
||||
red = this.particleRed * j * 0.4f;
|
||||
green = this.particleGreen * j * 0.25f;
|
||||
blue = this.particleBlue * j * 0.45f;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -136,7 +136,7 @@ public class LightningFX extends EntityFX
|
|||
offY = 0;
|
||||
offZ = 0;
|
||||
scale = 0.02;
|
||||
red= this.particleRed * j * 0.9f;
|
||||
red = this.particleRed * j * 0.9f;
|
||||
green = this.particleGreen * j * 0.65f;
|
||||
blue = this.particleBlue * j * 0.85f;
|
||||
}
|
||||
|
@ -191,7 +191,7 @@ public class LightningFX extends EntityFX
|
|||
b[1] = y;
|
||||
b[2] = z;
|
||||
|
||||
this.draw( red,green,blue,tess, a, b, f6, f8 );
|
||||
this.draw( red, green, blue, tess, a, b, f6, f8 );
|
||||
|
||||
x = xN;
|
||||
y = yN;
|
||||
|
@ -210,14 +210,14 @@ public class LightningFX extends EntityFX
|
|||
this.hasData = false;
|
||||
}
|
||||
|
||||
private void draw( float red,float green, float blue, final WorldRenderer tess, final double[] a, final double[] b, final double f6, final double f8 )
|
||||
private void draw( float red, float green, float blue, final WorldRenderer tess, final double[] a, final double[] b, final double f6, final double f8 )
|
||||
{
|
||||
if( this.hasData )
|
||||
{
|
||||
tess.color(red,green,blue,particleAlpha).pos( a[0], a[1], a[2]).tex( f6, f8 ).endVertex();
|
||||
tess.color(red,green,blue,particleAlpha).pos( this.vertices[0], this.vertices[1], this.vertices[2]).tex( f6, f8 ).endVertex();
|
||||
tess.color(red,green,blue,particleAlpha).pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2]).tex( f6, f8 ).endVertex();
|
||||
tess.color(red,green,blue,particleAlpha).pos( b[0], b[1], b[2]).tex( f6, f8 ).endVertex();
|
||||
tess.color( red, green, blue, particleAlpha ).pos( a[0], a[1], a[2] ).tex( f6, f8 ).endVertex();
|
||||
tess.color( red, green, blue, particleAlpha ).pos( this.vertices[0], this.vertices[1], this.vertices[2] ).tex( f6, f8 ).endVertex();
|
||||
tess.color( red, green, blue, particleAlpha ).pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2] ).tex( f6, f8 ).endVertex();
|
||||
tess.color( red, green, blue, particleAlpha ).pos( b[0], b[1], b[2] ).tex( f6, f8 ).endVertex();
|
||||
}
|
||||
this.hasData = true;
|
||||
for( int x = 0; x < 3; x++ )
|
||||
|
|
|
@ -84,9 +84,9 @@ public class MatterCannonFX extends EntityBreakingFX
|
|||
final float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * par2 - interpPosZ );
|
||||
final float f14 = 1.0F;
|
||||
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10).tex( f7, f9 );
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10).tex( f7, f8 );
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10).tex( f6, f8 );
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10).tex( f6, f9 );
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ).tex( f7, f9 );
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ).tex( f7, f8 );
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ).tex( f6, f8 );
|
||||
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ).tex( f6, f9 );
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,19 +28,18 @@ import appeng.client.ItemRenderType;
|
|||
public class ToolBiometricCardRender // TileEntityItemStackRenderer
|
||||
{
|
||||
|
||||
|
||||
public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )//, final ItemRendererHelper helper )
|
||||
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )// , final ItemRendererHelper
|
||||
// helper )
|
||||
{
|
||||
return false;//return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
|
||||
return false;// return helper == ItemRendererHelper.ENTITY_BOBBING || helper ==
|
||||
// ItemRendererHelper.ENTITY_ROTATION;
|
||||
}
|
||||
|
||||
|
||||
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
|
||||
{
|
||||
/*
|
||||
|
|
|
@ -34,7 +34,8 @@ public class ToolColorApplicatorRender
|
|||
|
||||
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )
|
||||
{
|
||||
return false;//return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
|
||||
return false;// return helper == ItemRendererHelper.ENTITY_BOBBING || helper ==
|
||||
// ItemRendererHelper.ENTITY_ROTATION;
|
||||
}
|
||||
|
||||
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
|
||||
|
|
|
@ -45,7 +45,7 @@ public class PlayerStatsRegistration
|
|||
/**
|
||||
* is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the
|
||||
*
|
||||
* @param config}
|
||||
* @param config
|
||||
*/
|
||||
private final boolean isAchievementFeatureEnabled;
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
|
|||
if( Platform.isClient() )
|
||||
{
|
||||
// TODO - PORT ToolBiometricCardRender
|
||||
//MinecraftForgeClient.registerItemRenderer( this, new ToolBiometricCardRender() );
|
||||
// MinecraftForgeClient.registerItemRenderer( this, new ToolBiometricCardRender() );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -108,8 +108,8 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
|
|||
this.setFeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.PoweredTools ) );
|
||||
if( Platform.isClient() )
|
||||
{
|
||||
//TODO - color applicator
|
||||
//MinecraftForgeClient.registerItemRenderer( this, new ToolColorApplicatorRender() );
|
||||
// TODO - color applicator
|
||||
// MinecraftForgeClient.registerItemRenderer( this, new ToolColorApplicatorRender() );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ public class ServerHelper extends CommonHelper
|
|||
|
||||
if( server != null )
|
||||
{
|
||||
return (List)server.getConfigurationManager().playerEntityList;
|
||||
return (List) server.getConfigurationManager().playerEntityList;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -411,14 +411,16 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
|
|||
@Override
|
||||
public EnumFacing getForward()
|
||||
{
|
||||
if ( forward == null ) return EnumFacing.NORTH;
|
||||
if( forward == null )
|
||||
return EnumFacing.NORTH;
|
||||
return this.forward;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumFacing getUp()
|
||||
{
|
||||
if ( up == null ) return EnumFacing.UP;
|
||||
if( up == null )
|
||||
return EnumFacing.UP;
|
||||
return this.up;
|
||||
}
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
package appeng.tile.misc;
|
||||
|
||||
|
||||
|
||||
import net.minecraft.util.ITickable;
|
||||
|
||||
import appeng.tile.AEBaseTile;
|
||||
|
|
|
@ -113,5 +113,4 @@ public final class VersionTest
|
|||
Assert.assertEquals( DEFAULT_VERSION_RV2_BETA_8.formatted(), "rv2-beta-8" );
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.util;
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
package appeng.util;
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue