Merge pull request #1913 from thatsIch/e-final-stuff
final variables and parameters
This commit is contained in:
commit
b560382e80
819 changed files with 9390 additions and 9396 deletions
|
@ -51,15 +51,15 @@ public enum AEApi
|
||||||
|
|
||||||
HELD_API = (IAppEngApi) apiField.get( apiClass );
|
HELD_API = (IAppEngApi) apiField.get( apiClass );
|
||||||
}
|
}
|
||||||
catch( ClassNotFoundException e )
|
catch( final ClassNotFoundException e )
|
||||||
{
|
{
|
||||||
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared." );
|
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared." );
|
||||||
}
|
}
|
||||||
catch( NoSuchFieldException e )
|
catch( final NoSuchFieldException e )
|
||||||
{
|
{
|
||||||
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without it being declared." );
|
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without it being declared." );
|
||||||
}
|
}
|
||||||
catch( IllegalAccessException e )
|
catch( final IllegalAccessException e )
|
||||||
{
|
{
|
||||||
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without enough access permissions." );
|
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without enough access permissions." );
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,22 +30,22 @@ public enum AccessRestriction
|
||||||
|
|
||||||
private final int permissionBit;
|
private final int permissionBit;
|
||||||
|
|
||||||
AccessRestriction( int v )
|
AccessRestriction( final int v )
|
||||||
{
|
{
|
||||||
this.permissionBit = v;
|
this.permissionBit = v;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasPermission( AccessRestriction ar )
|
public boolean hasPermission( final AccessRestriction ar )
|
||||||
{
|
{
|
||||||
return ( this.permissionBit & ar.permissionBit ) == ar.permissionBit;
|
return ( this.permissionBit & ar.permissionBit ) == ar.permissionBit;
|
||||||
}
|
}
|
||||||
|
|
||||||
public AccessRestriction restrictPermissions( AccessRestriction ar )
|
public AccessRestriction restrictPermissions( final AccessRestriction ar )
|
||||||
{
|
{
|
||||||
return this.getPermByBit( this.permissionBit & ar.permissionBit );
|
return this.getPermByBit( this.permissionBit & ar.permissionBit );
|
||||||
}
|
}
|
||||||
|
|
||||||
private AccessRestriction getPermByBit( int bit )
|
private AccessRestriction getPermByBit( final int bit )
|
||||||
{
|
{
|
||||||
switch( bit )
|
switch( bit )
|
||||||
{
|
{
|
||||||
|
@ -61,12 +61,12 @@ public enum AccessRestriction
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public AccessRestriction addPermissions( AccessRestriction ar )
|
public AccessRestriction addPermissions( final AccessRestriction ar )
|
||||||
{
|
{
|
||||||
return this.getPermByBit( this.permissionBit | ar.permissionBit );
|
return this.getPermByBit( this.permissionBit | ar.permissionBit );
|
||||||
}
|
}
|
||||||
|
|
||||||
public AccessRestriction removePermissions( AccessRestriction ar )
|
public AccessRestriction removePermissions( final AccessRestriction ar )
|
||||||
{
|
{
|
||||||
return this.getPermByBit( this.permissionBit & ( ~ar.permissionBit ) );
|
return this.getPermByBit( this.permissionBit & ( ~ar.permissionBit ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,13 +32,13 @@ public enum FuzzyMode
|
||||||
public final float breakPoint;
|
public final float breakPoint;
|
||||||
public final float percentage;
|
public final float percentage;
|
||||||
|
|
||||||
FuzzyMode( float p )
|
FuzzyMode( final float p )
|
||||||
{
|
{
|
||||||
this.percentage = p;
|
this.percentage = p;
|
||||||
this.breakPoint = p / 100.0f;
|
this.breakPoint = p / 100.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int calculateBreakPoint( int maxDamage )
|
public int calculateBreakPoint( final int maxDamage )
|
||||||
{
|
{
|
||||||
return (int) ( ( this.percentage * maxDamage ) / 100.0f );
|
return (int) ( ( this.percentage * maxDamage ) / 100.0f );
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,12 +33,12 @@ public enum PowerMultiplier
|
||||||
*/
|
*/
|
||||||
public double multiplier = 1.0;
|
public double multiplier = 1.0;
|
||||||
|
|
||||||
public double multiply( double in )
|
public double multiply( final double in )
|
||||||
{
|
{
|
||||||
return in * this.multiplier;
|
return in * this.multiplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
public double divide( double in )
|
public double divide( final double in )
|
||||||
{
|
{
|
||||||
return in / this.multiplier;
|
return in / this.multiplier;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ public enum PowerUnits
|
||||||
*/
|
*/
|
||||||
public double conversionRatio = 1.0;
|
public double conversionRatio = 1.0;
|
||||||
|
|
||||||
PowerUnits( String un )
|
PowerUnits( final String un )
|
||||||
{
|
{
|
||||||
this.unlocalizedName = un;
|
this.unlocalizedName = un;
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,7 @@ public enum PowerUnits
|
||||||
*
|
*
|
||||||
* @return value converted to target units, from this units.
|
* @return value converted to target units, from this units.
|
||||||
*/
|
*/
|
||||||
public double convertTo( PowerUnits target, double value )
|
public double convertTo( final PowerUnits target, final double value )
|
||||||
{
|
{
|
||||||
return ( value * this.conversionRatio ) / target.conversionRatio;
|
return ( value * this.conversionRatio ) / target.conversionRatio;
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ public enum Settings
|
||||||
|
|
||||||
private final EnumSet<? extends Enum<?>> values;
|
private final EnumSet<? extends Enum<?>> values;
|
||||||
|
|
||||||
Settings( @Nonnull EnumSet<? extends Enum<?>> possibleOptions )
|
Settings( @Nonnull final EnumSet<? extends Enum<?>> possibleOptions )
|
||||||
{
|
{
|
||||||
if( possibleOptions.isEmpty() )
|
if( possibleOptions.isEmpty() )
|
||||||
{
|
{
|
||||||
|
|
|
@ -59,7 +59,7 @@ public enum Upgrades
|
||||||
@Deprecated
|
@Deprecated
|
||||||
private final Map<ItemStack, Integer> supportedMax = new HashMap<ItemStack, Integer>();
|
private final Map<ItemStack, Integer> supportedMax = new HashMap<ItemStack, Integer>();
|
||||||
|
|
||||||
Upgrades( int tier )
|
Upgrades( final int tier )
|
||||||
{
|
{
|
||||||
this.tier = tier;
|
this.tier = tier;
|
||||||
}
|
}
|
||||||
|
@ -78,10 +78,10 @@ public enum Upgrades
|
||||||
* @param item machine in which this upgrade can be installed
|
* @param item machine in which this upgrade can be installed
|
||||||
* @param maxSupported amount how many upgrades can be installed
|
* @param maxSupported amount how many upgrades can be installed
|
||||||
*/
|
*/
|
||||||
public void registerItem( IItemDefinition item, int maxSupported )
|
public void registerItem( final IItemDefinition item, final int maxSupported )
|
||||||
{
|
{
|
||||||
final Optional<ItemStack> maybeStack = item.maybeStack( 1 );
|
final Optional<ItemStack> maybeStack = item.maybeStack( 1 );
|
||||||
for( ItemStack stack : maybeStack.asSet() )
|
for( final ItemStack stack : maybeStack.asSet() )
|
||||||
{
|
{
|
||||||
this.registerItem( stack, maxSupported );
|
this.registerItem( stack, maxSupported );
|
||||||
}
|
}
|
||||||
|
@ -93,7 +93,7 @@ public enum Upgrades
|
||||||
* @param stack machine in which this upgrade can be installed
|
* @param stack machine in which this upgrade can be installed
|
||||||
* @param maxSupported amount how many upgrades can be installed
|
* @param maxSupported amount how many upgrades can be installed
|
||||||
*/
|
*/
|
||||||
public void registerItem( ItemStack stack, int maxSupported )
|
public void registerItem( final ItemStack stack, final int maxSupported )
|
||||||
{
|
{
|
||||||
if( stack != null )
|
if( stack != null )
|
||||||
{
|
{
|
||||||
|
@ -110,7 +110,7 @@ public enum Upgrades
|
||||||
* @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)}
|
* @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)}
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public void registerItem( AEItemDefinition item, int maxSupported )
|
public void registerItem( final AEItemDefinition item, final int maxSupported )
|
||||||
{
|
{
|
||||||
if( item != null )
|
if( item != null )
|
||||||
{
|
{
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class LocatableEventAnnounce extends Event
|
||||||
public final ILocatable target;
|
public final ILocatable target;
|
||||||
public final LocatableEvent change;
|
public final LocatableEvent change;
|
||||||
|
|
||||||
public LocatableEventAnnounce( ILocatable o, LocatableEvent ev )
|
public LocatableEventAnnounce( final ILocatable o, final LocatableEvent ev )
|
||||||
{
|
{
|
||||||
this.target = o;
|
this.target = o;
|
||||||
this.change = ev;
|
this.change = ev;
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class AppEngException extends Exception
|
||||||
|
|
||||||
private static final long serialVersionUID = -9051434206368465494L;
|
private static final long serialVersionUID = -9051434206368465494L;
|
||||||
|
|
||||||
public AppEngException( String t )
|
public AppEngException( final String t )
|
||||||
{
|
{
|
||||||
super( t );
|
super( t );
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ package appeng.api.exceptions;
|
||||||
|
|
||||||
public class CoreInaccessibleException extends RuntimeException
|
public class CoreInaccessibleException extends RuntimeException
|
||||||
{
|
{
|
||||||
public CoreInaccessibleException( String message )
|
public CoreInaccessibleException( final String message )
|
||||||
{
|
{
|
||||||
super( message );
|
super( message );
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ package appeng.api.exceptions;
|
||||||
|
|
||||||
public class MissingDefinition extends RuntimeException
|
public class MissingDefinition extends RuntimeException
|
||||||
{
|
{
|
||||||
public MissingDefinition( String message )
|
public MissingDefinition( final String message )
|
||||||
{
|
{
|
||||||
super( message );
|
super( message );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class MissingIngredientError extends Exception
|
||||||
|
|
||||||
private static final long serialVersionUID = -998858343831371697L;
|
private static final long serialVersionUID = -998858343831371697L;
|
||||||
|
|
||||||
public MissingIngredientError( String n )
|
public MissingIngredientError( final String n )
|
||||||
{
|
{
|
||||||
super( n );
|
super( n );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class ModNotInstalled extends Exception
|
||||||
|
|
||||||
private static final long serialVersionUID = -9052435206368425494L;
|
private static final long serialVersionUID = -9052435206368425494L;
|
||||||
|
|
||||||
public ModNotInstalled( String t )
|
public ModNotInstalled( final String t )
|
||||||
{
|
{
|
||||||
super( t );
|
super( t );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class RecipeError extends Exception
|
||||||
|
|
||||||
private static final long serialVersionUID = -6602870588617670262L;
|
private static final long serialVersionUID = -6602870588617670262L;
|
||||||
|
|
||||||
public RecipeError( String n )
|
public RecipeError( final String n )
|
||||||
{
|
{
|
||||||
super( n );
|
super( n );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class RegistrationError extends Exception
|
||||||
|
|
||||||
private static final long serialVersionUID = -6602870588617670263L;
|
private static final long serialVersionUID = -6602870588617670263L;
|
||||||
|
|
||||||
public RegistrationError( String n )
|
public RegistrationError( final String n )
|
||||||
{
|
{
|
||||||
super( n );
|
super( n );
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@ public class TransitionResult
|
||||||
public final boolean success;
|
public final boolean success;
|
||||||
public final double energyUsage;
|
public final double energyUsage;
|
||||||
|
|
||||||
public TransitionResult( boolean _success, double power )
|
public TransitionResult( final boolean _success, final double power )
|
||||||
{
|
{
|
||||||
this.success = _success;
|
this.success = _success;
|
||||||
this.energyUsage = power;
|
this.energyUsage = power;
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class MENetworkChannelChanged extends MENetworkEvent
|
||||||
|
|
||||||
public final IGridNode node;
|
public final IGridNode node;
|
||||||
|
|
||||||
public MENetworkChannelChanged( IGridNode n )
|
public MENetworkChannelChanged( final IGridNode n )
|
||||||
{
|
{
|
||||||
this.node = n;
|
this.node = n;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ public class MENetworkCraftingCpuChange extends MENetworkEvent
|
||||||
|
|
||||||
public final IGridNode node;
|
public final IGridNode node;
|
||||||
|
|
||||||
public MENetworkCraftingCpuChange( IGridNode n )
|
public MENetworkCraftingCpuChange( final IGridNode n )
|
||||||
{
|
{
|
||||||
this.node = n;
|
this.node = n;
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ public class MENetworkCraftingPatternChange extends MENetworkEvent
|
||||||
public final ICraftingProvider provider;
|
public final ICraftingProvider provider;
|
||||||
public final IGridNode node;
|
public final IGridNode node;
|
||||||
|
|
||||||
public MENetworkCraftingPatternChange( ICraftingProvider p, IGridNode n )
|
public MENetworkCraftingPatternChange( final ICraftingProvider p, final IGridNode n )
|
||||||
{
|
{
|
||||||
this.provider = p;
|
this.provider = p;
|
||||||
this.node = n;
|
this.node = n;
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class MENetworkEvent
|
||||||
*
|
*
|
||||||
* @param v current number of visitors
|
* @param v current number of visitors
|
||||||
*/
|
*/
|
||||||
public void setVisitedObjects( int v )
|
public void setVisitedObjects( final int v )
|
||||||
{
|
{
|
||||||
this.visited = v;
|
this.visited = v;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class MENetworkPowerIdleChange extends MENetworkEvent
|
||||||
|
|
||||||
public final IGridNode node;
|
public final IGridNode node;
|
||||||
|
|
||||||
public MENetworkPowerIdleChange( IGridNode nodeThatChanged )
|
public MENetworkPowerIdleChange( final IGridNode nodeThatChanged )
|
||||||
{
|
{
|
||||||
this.node = nodeThatChanged;
|
this.node = nodeThatChanged;
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class MENetworkPowerStorage extends MENetworkEvent
|
||||||
public final IAEPowerStorage storage;
|
public final IAEPowerStorage storage;
|
||||||
public final PowerEventType type;
|
public final PowerEventType type;
|
||||||
|
|
||||||
public MENetworkPowerStorage( IAEPowerStorage t, PowerEventType y )
|
public MENetworkPowerStorage( final IAEPowerStorage t, final PowerEventType y )
|
||||||
{
|
{
|
||||||
this.storage = t;
|
this.storage = t;
|
||||||
this.type = y;
|
this.type = y;
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class MENetworkSpatialEvent extends MENetworkEvent
|
||||||
* @param SpatialIO ( INSTANCE of the SpatialIO block )
|
* @param SpatialIO ( INSTANCE of the SpatialIO block )
|
||||||
* @param EnergyUsage ( the amount of energy that the SpatialIO uses)
|
* @param EnergyUsage ( the amount of energy that the SpatialIO uses)
|
||||||
*/
|
*/
|
||||||
public MENetworkSpatialEvent( IGridHost SpatialIO, double EnergyUsage )
|
public MENetworkSpatialEvent( final IGridHost SpatialIO, final double EnergyUsage )
|
||||||
{
|
{
|
||||||
this.host = SpatialIO;
|
this.host = SpatialIO;
|
||||||
this.spatialEnergyUsage = EnergyUsage;
|
this.spatialEnergyUsage = EnergyUsage;
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class MENetworkStorageEvent extends MENetworkEvent
|
||||||
public final IMEMonitor monitor;
|
public final IMEMonitor monitor;
|
||||||
public final StorageChannel channel;
|
public final StorageChannel channel;
|
||||||
|
|
||||||
public MENetworkStorageEvent( IMEMonitor o, StorageChannel chan )
|
public MENetworkStorageEvent( final IMEMonitor o, final StorageChannel chan )
|
||||||
{
|
{
|
||||||
this.monitor = o;
|
this.monitor = o;
|
||||||
this.channel = chan;
|
this.channel = chan;
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class MachineSource extends BaseActionSource
|
||||||
|
|
||||||
public final IActionHost via;
|
public final IActionHost via;
|
||||||
|
|
||||||
public MachineSource( IActionHost v )
|
public MachineSource( final IActionHost v )
|
||||||
{
|
{
|
||||||
this.via = v;
|
this.via = v;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@ public class PlayerSource extends BaseActionSource
|
||||||
public final EntityPlayer player;
|
public final EntityPlayer player;
|
||||||
public final IActionHost via;
|
public final IActionHost via;
|
||||||
|
|
||||||
public PlayerSource( EntityPlayer p, IActionHost v )
|
public PlayerSource( final EntityPlayer p, final IActionHost v )
|
||||||
{
|
{
|
||||||
this.player = p;
|
this.player = p;
|
||||||
this.via = v;
|
this.via = v;
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class TickingRequest
|
||||||
*/
|
*/
|
||||||
public final boolean canBeAlerted;
|
public final boolean canBeAlerted;
|
||||||
|
|
||||||
public TickingRequest( int min, int max, boolean sleep, boolean alertable )
|
public TickingRequest( final int min, final int max, final boolean sleep, final boolean alertable )
|
||||||
{
|
{
|
||||||
this.minTickRate = min;
|
this.minTickRate = min;
|
||||||
this.maxTickRate = max;
|
this.maxTickRate = max;
|
||||||
|
|
|
@ -33,7 +33,7 @@ public enum CableRenderMode
|
||||||
public final boolean transparentFacades;
|
public final boolean transparentFacades;
|
||||||
public final boolean opaqueFacades;
|
public final boolean opaqueFacades;
|
||||||
|
|
||||||
CableRenderMode( boolean hideFacades )
|
CableRenderMode( final boolean hideFacades )
|
||||||
{
|
{
|
||||||
this.transparentFacades = hideFacades;
|
this.transparentFacades = hideFacades;
|
||||||
this.opaqueFacades = !hideFacades;
|
this.opaqueFacades = !hideFacades;
|
||||||
|
|
|
@ -46,7 +46,7 @@ public abstract class LayerBase extends TileEntity // implements IPartHost
|
||||||
*
|
*
|
||||||
* @return the part for the requested side.
|
* @return the part for the requested side.
|
||||||
*/
|
*/
|
||||||
public IPart getPart( ForgeDirection side )
|
public IPart getPart( final ForgeDirection side )
|
||||||
{
|
{
|
||||||
return null; // place holder.
|
return null; // place holder.
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,14 +55,14 @@ public class SelectedPart
|
||||||
this.side = ForgeDirection.UNKNOWN;
|
this.side = ForgeDirection.UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SelectedPart( IPart part, ForgeDirection side )
|
public SelectedPart( final IPart part, final ForgeDirection side )
|
||||||
{
|
{
|
||||||
this.part = part;
|
this.part = part;
|
||||||
this.facade = null;
|
this.facade = null;
|
||||||
this.side = side;
|
this.side = side;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SelectedPart( IFacadePart facade, ForgeDirection side )
|
public SelectedPart( final IFacadePart facade, final ForgeDirection side )
|
||||||
{
|
{
|
||||||
this.part = null;
|
this.part = null;
|
||||||
this.facade = facade;
|
this.facade = facade;
|
||||||
|
|
|
@ -34,14 +34,14 @@ public class ResolverResult
|
||||||
public final int damageValue;
|
public final int damageValue;
|
||||||
public final NBTTagCompound compound;
|
public final NBTTagCompound compound;
|
||||||
|
|
||||||
public ResolverResult( String name, int damage )
|
public ResolverResult( final String name, final int damage )
|
||||||
{
|
{
|
||||||
this.itemName = name;
|
this.itemName = name;
|
||||||
this.damageValue = damage;
|
this.damageValue = damage;
|
||||||
this.compound = null;
|
this.compound = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResolverResult( String name, int damage, NBTTagCompound data )
|
public ResolverResult( final String name, final int damage, final NBTTagCompound data )
|
||||||
{
|
{
|
||||||
this.itemName = name;
|
this.itemName = name;
|
||||||
this.damageValue = damage;
|
this.damageValue = damage;
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class ResolverResultSet
|
||||||
public final String name;
|
public final String name;
|
||||||
public final List<ItemStack> results;
|
public final List<ItemStack> results;
|
||||||
|
|
||||||
public ResolverResultSet( String myName, ItemStack... set )
|
public ResolverResultSet( final String myName, final ItemStack... set )
|
||||||
{
|
{
|
||||||
this.results = Arrays.asList( set );
|
this.results = Arrays.asList( set );
|
||||||
this.name = myName;
|
this.name = myName;
|
||||||
|
|
|
@ -52,32 +52,32 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
||||||
|
|
||||||
protected boolean hasChanged = true;
|
protected boolean hasChanged = true;
|
||||||
|
|
||||||
public MEMonitorHandler( IMEInventoryHandler<StackType> t )
|
public MEMonitorHandler( final IMEInventoryHandler<StackType> t )
|
||||||
{
|
{
|
||||||
this.internalHandler = t;
|
this.internalHandler = t;
|
||||||
this.cachedList = (IItemList<StackType>) t.getChannel().createList();
|
this.cachedList = (IItemList<StackType>) t.getChannel().createList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public MEMonitorHandler( IMEInventoryHandler<StackType> t, StorageChannel chan )
|
public MEMonitorHandler( final IMEInventoryHandler<StackType> t, final StorageChannel chan )
|
||||||
{
|
{
|
||||||
this.internalHandler = t;
|
this.internalHandler = t;
|
||||||
this.cachedList = (IItemList<StackType>) chan.createList();
|
this.cachedList = (IItemList<StackType>) chan.createList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addListener( IMEMonitorHandlerReceiver<StackType> l, Object verificationToken )
|
public void addListener( final IMEMonitorHandlerReceiver<StackType> l, final Object verificationToken )
|
||||||
{
|
{
|
||||||
this.listeners.put( l, verificationToken );
|
this.listeners.put( l, verificationToken );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeListener( IMEMonitorHandlerReceiver<StackType> l )
|
public void removeListener( final IMEMonitorHandlerReceiver<StackType> l )
|
||||||
{
|
{
|
||||||
this.listeners.remove( l );
|
this.listeners.remove( l );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public StackType injectItems( StackType input, Actionable mode, BaseActionSource src )
|
public StackType injectItems( final StackType input, final Actionable mode, final BaseActionSource src )
|
||||||
{
|
{
|
||||||
if( mode == Actionable.SIMULATE )
|
if( mode == Actionable.SIMULATE )
|
||||||
{
|
{
|
||||||
|
@ -91,9 +91,9 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
||||||
return this.internalHandler;
|
return this.internalHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
private StackType monitorDifference( IAEStack original, StackType leftOvers, boolean extraction, BaseActionSource src )
|
private StackType monitorDifference( final IAEStack original, final StackType leftOvers, final boolean extraction, final BaseActionSource src )
|
||||||
{
|
{
|
||||||
StackType diff = (StackType) original.copy();
|
final StackType diff = (StackType) original.copy();
|
||||||
|
|
||||||
if( extraction )
|
if( extraction )
|
||||||
{
|
{
|
||||||
|
@ -112,19 +112,19 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
||||||
return leftOvers;
|
return leftOvers;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void postChangesToListeners( Iterable<StackType> changes, BaseActionSource src )
|
protected void postChangesToListeners( final Iterable<StackType> changes, final BaseActionSource src )
|
||||||
{
|
{
|
||||||
this.notifyListenersOfChange( changes, src );
|
this.notifyListenersOfChange( changes, src );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void notifyListenersOfChange( Iterable<StackType> diff, BaseActionSource src )
|
protected void notifyListenersOfChange( final Iterable<StackType> diff, final BaseActionSource src )
|
||||||
{
|
{
|
||||||
this.hasChanged = true;// need to update the cache.
|
this.hasChanged = true;// need to update the cache.
|
||||||
Iterator<Entry<IMEMonitorHandlerReceiver<StackType>, Object>> i = this.getListeners();
|
final Iterator<Entry<IMEMonitorHandlerReceiver<StackType>, Object>> i = this.getListeners();
|
||||||
while( i.hasNext() )
|
while( i.hasNext() )
|
||||||
{
|
{
|
||||||
Entry<IMEMonitorHandlerReceiver<StackType>, Object> o = i.next();
|
final Entry<IMEMonitorHandlerReceiver<StackType>, Object> o = i.next();
|
||||||
IMEMonitorHandlerReceiver<StackType> receiver = o.getKey();
|
final IMEMonitorHandlerReceiver<StackType> receiver = o.getKey();
|
||||||
if( receiver.isValid( o.getValue() ) )
|
if( receiver.isValid( o.getValue() ) )
|
||||||
{
|
{
|
||||||
receiver.postChange( this, diff, src );
|
receiver.postChange( this, diff, src );
|
||||||
|
@ -142,7 +142,7 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public StackType extractItems( StackType request, Actionable mode, BaseActionSource src )
|
public StackType extractItems( final StackType request, final Actionable mode, final BaseActionSource src )
|
||||||
{
|
{
|
||||||
if( mode == Actionable.SIMULATE )
|
if( mode == Actionable.SIMULATE )
|
||||||
{
|
{
|
||||||
|
@ -175,17 +175,17 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isPrioritized( StackType input )
|
public boolean isPrioritized( final StackType input )
|
||||||
{
|
{
|
||||||
return this.getHandler().isPrioritized( input );
|
return this.getHandler().isPrioritized( input );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAccept( StackType input )
|
public boolean canAccept( final StackType input )
|
||||||
{
|
{
|
||||||
return this.getHandler().canAccept( input );
|
return this.getHandler().canAccept( input );
|
||||||
} @Override
|
} @Override
|
||||||
public IItemList<StackType> getAvailableItems( IItemList out )
|
public IItemList<StackType> getAvailableItems( final IItemList out )
|
||||||
{
|
{
|
||||||
return this.getHandler().getAvailableItems( out );
|
return this.getHandler().getAvailableItems( out );
|
||||||
}
|
}
|
||||||
|
@ -203,7 +203,7 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean validForPass( int i )
|
public boolean validForPass( final int i )
|
||||||
{
|
{
|
||||||
return this.getHandler().validForPass( i );
|
return this.getHandler().validForPass( i );
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ public enum StorageChannel
|
||||||
|
|
||||||
public final Class<? extends IAEStack> type;
|
public final Class<? extends IAEStack> type;
|
||||||
|
|
||||||
StorageChannel( Class<? extends IAEStack> t )
|
StorageChannel( final Class<? extends IAEStack> t )
|
||||||
{
|
{
|
||||||
this.type = t;
|
this.type = t;
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,7 +94,7 @@ public enum AEColor
|
||||||
*/
|
*/
|
||||||
public final int whiteVariant;
|
public final int whiteVariant;
|
||||||
|
|
||||||
AEColor( String unlocalizedName, int blackHex, int medHex, int whiteHex )
|
AEColor( final String unlocalizedName, final int blackHex, final int medHex, final int whiteHex )
|
||||||
{
|
{
|
||||||
this.unlocalizedName = unlocalizedName;
|
this.unlocalizedName = unlocalizedName;
|
||||||
this.blackVariant = blackHex;
|
this.blackVariant = blackHex;
|
||||||
|
@ -105,7 +105,7 @@ public enum AEColor
|
||||||
/**
|
/**
|
||||||
* Logic to see which colors match each other.. special handle for Transparent
|
* Logic to see which colors match each other.. special handle for Transparent
|
||||||
*/
|
*/
|
||||||
public boolean matches( AEColor color )
|
public boolean matches( final AEColor color )
|
||||||
{
|
{
|
||||||
return this == Transparent || color == Transparent || this == color;
|
return this == Transparent || color == Transparent || this == color;
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,21 +37,21 @@ public class DimensionalCoord extends WorldCoord
|
||||||
private final World w;
|
private final World w;
|
||||||
private final int dimId;
|
private final int dimId;
|
||||||
|
|
||||||
public DimensionalCoord( DimensionalCoord s )
|
public DimensionalCoord( final DimensionalCoord s )
|
||||||
{
|
{
|
||||||
super( s.x, s.y, s.z );
|
super( s.x, s.y, s.z );
|
||||||
this.w = s.w;
|
this.w = s.w;
|
||||||
this.dimId = s.dimId;
|
this.dimId = s.dimId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DimensionalCoord( TileEntity s )
|
public DimensionalCoord( final TileEntity s )
|
||||||
{
|
{
|
||||||
super( s );
|
super( s );
|
||||||
this.w = s.getWorldObj();
|
this.w = s.getWorldObj();
|
||||||
this.dimId = this.w.provider.dimensionId;
|
this.dimId = this.w.provider.dimensionId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DimensionalCoord( World _w, int _x, int _y, int _z )
|
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.w = _w;
|
||||||
|
@ -71,12 +71,12 @@ public class DimensionalCoord extends WorldCoord
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals( Object obj )
|
public boolean equals( final Object obj )
|
||||||
{
|
{
|
||||||
return obj instanceof DimensionalCoord && this.isEqual( (DimensionalCoord) obj );
|
return obj instanceof DimensionalCoord && this.isEqual( (DimensionalCoord) obj );
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEqual( DimensionalCoord c )
|
public boolean isEqual( final DimensionalCoord c )
|
||||||
{
|
{
|
||||||
return this.x == c.x && this.y == c.y && this.z == c.z && c.w == this.w;
|
return this.x == c.x && this.y == c.y && this.z == c.z && c.w == this.w;
|
||||||
}
|
}
|
||||||
|
@ -87,7 +87,7 @@ public class DimensionalCoord extends WorldCoord
|
||||||
return "dimension=" + this.dimId + ", " + super.toString();
|
return "dimension=" + this.dimId + ", " + super.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isInWorld( World world )
|
public boolean isInWorld( final World world )
|
||||||
{
|
{
|
||||||
return this.w == world;
|
return this.w == world;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,19 +39,19 @@ public class WorldCoord
|
||||||
public int y;
|
public int y;
|
||||||
public int z;
|
public int z;
|
||||||
|
|
||||||
public WorldCoord( TileEntity s )
|
public WorldCoord( final TileEntity s )
|
||||||
{
|
{
|
||||||
this( s.xCoord, s.yCoord, s.zCoord );
|
this( s.xCoord, s.yCoord, s.zCoord );
|
||||||
}
|
}
|
||||||
|
|
||||||
public WorldCoord( int _x, int _y, int _z )
|
public WorldCoord( final int _x, final int _y, final int _z )
|
||||||
{
|
{
|
||||||
this.x = _x;
|
this.x = _x;
|
||||||
this.y = _y;
|
this.y = _y;
|
||||||
this.z = _z;
|
this.z = _z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public WorldCoord subtract( ForgeDirection direction, int length )
|
public WorldCoord subtract( final ForgeDirection direction, final int length )
|
||||||
{
|
{
|
||||||
this.x -= direction.offsetX * length;
|
this.x -= direction.offsetX * length;
|
||||||
this.y -= direction.offsetY * length;
|
this.y -= direction.offsetY * length;
|
||||||
|
@ -59,7 +59,7 @@ public class WorldCoord
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public WorldCoord add( int _x, int _y, int _z )
|
public WorldCoord add( final int _x, final int _y, final int _z )
|
||||||
{
|
{
|
||||||
this.x += _x;
|
this.x += _x;
|
||||||
this.y += _y;
|
this.y += _y;
|
||||||
|
@ -67,7 +67,7 @@ public class WorldCoord
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public WorldCoord subtract( int _x, int _y, int _z )
|
public WorldCoord subtract( final int _x, final int _y, final int _z )
|
||||||
{
|
{
|
||||||
this.x -= _x;
|
this.x -= _x;
|
||||||
this.y -= _y;
|
this.y -= _y;
|
||||||
|
@ -75,7 +75,7 @@ public class WorldCoord
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public WorldCoord multiple( int _x, int _y, int _z )
|
public WorldCoord multiple( final int _x, final int _y, final int _z )
|
||||||
{
|
{
|
||||||
this.x *= _x;
|
this.x *= _x;
|
||||||
this.y *= _y;
|
this.y *= _y;
|
||||||
|
@ -83,7 +83,7 @@ public class WorldCoord
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public WorldCoord divide( int _x, int _y, int _z )
|
public WorldCoord divide( final int _x, final int _y, final int _z )
|
||||||
{
|
{
|
||||||
this.x /= _x;
|
this.x /= _x;
|
||||||
this.y /= _y;
|
this.y /= _y;
|
||||||
|
@ -94,15 +94,15 @@ public class WorldCoord
|
||||||
/**
|
/**
|
||||||
* Will Return NULL if it's at some diagonal!
|
* Will Return NULL if it's at some diagonal!
|
||||||
*/
|
*/
|
||||||
public ForgeDirection directionTo( WorldCoord loc )
|
public ForgeDirection directionTo( final WorldCoord loc )
|
||||||
{
|
{
|
||||||
int ox = this.x - loc.x;
|
final int ox = this.x - loc.x;
|
||||||
int oy = this.y - loc.y;
|
final int oy = this.y - loc.y;
|
||||||
int oz = this.z - loc.z;
|
final int oz = this.z - loc.z;
|
||||||
|
|
||||||
int xlen = Math.abs( ox );
|
final int xlen = Math.abs( ox );
|
||||||
int ylen = Math.abs( oy );
|
final int ylen = Math.abs( oy );
|
||||||
int zlen = Math.abs( oz );
|
final int zlen = Math.abs( oz );
|
||||||
|
|
||||||
if( loc.isEqual( this.copy().add( ForgeDirection.EAST, xlen ) ) )
|
if( loc.isEqual( this.copy().add( ForgeDirection.EAST, xlen ) ) )
|
||||||
{
|
{
|
||||||
|
@ -137,12 +137,12 @@ public class WorldCoord
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEqual( WorldCoord c )
|
public boolean isEqual( final WorldCoord c )
|
||||||
{
|
{
|
||||||
return this.x == c.x && this.y == c.y && this.z == c.z;
|
return this.x == c.x && this.y == c.y && this.z == c.z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public WorldCoord add( ForgeDirection direction, int length )
|
public WorldCoord add( final ForgeDirection direction, final int length )
|
||||||
{
|
{
|
||||||
this.x += direction.offsetX * length;
|
this.x += direction.offsetX * length;
|
||||||
this.y += direction.offsetY * length;
|
this.y += direction.offsetY * length;
|
||||||
|
@ -162,7 +162,7 @@ public class WorldCoord
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals( Object obj )
|
public boolean equals( final Object obj )
|
||||||
{
|
{
|
||||||
return obj instanceof WorldCoord && this.isEqual( (WorldCoord) obj );
|
return obj instanceof WorldCoord && this.isEqual( (WorldCoord) obj );
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
BlockRenderInfo renderInfo;
|
BlockRenderInfo renderInfo;
|
||||||
|
|
||||||
protected AEBaseBlock( Material mat )
|
protected AEBaseBlock( final Material mat )
|
||||||
{
|
{
|
||||||
this( mat, Optional.<String>absent() );
|
this( mat, Optional.<String>absent() );
|
||||||
this.setLightOpacity( 255 );
|
this.setLightOpacity( 255 );
|
||||||
|
@ -86,7 +86,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
this.setHarvestLevel( "pickaxe", 0 );
|
this.setHarvestLevel( "pickaxe", 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected AEBaseBlock( Material mat, Optional<String> subName )
|
protected AEBaseBlock( final Material mat, final Optional<String> subName )
|
||||||
{
|
{
|
||||||
super( mat );
|
super( mat );
|
||||||
|
|
||||||
|
@ -139,11 +139,11 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
|
|
||||||
return this.renderInfo;
|
return this.renderInfo;
|
||||||
}
|
}
|
||||||
catch( InstantiationException e )
|
catch( final InstantiationException e )
|
||||||
{
|
{
|
||||||
throw new IllegalStateException( "Failed to create a new instance of an illegal class " + this.getRenderer(), e );
|
throw new IllegalStateException( "Failed to create a new instance of an illegal class " + this.getRenderer(), e );
|
||||||
}
|
}
|
||||||
catch( IllegalAccessException e )
|
catch( final IllegalAccessException e )
|
||||||
{
|
{
|
||||||
throw new IllegalStateException( "Failed to create a new instance of " + this.getRenderer() + " because of permissions.", e );
|
throw new IllegalStateException( "Failed to create a new instance of " + this.getRenderer() + " because of permissions.", e );
|
||||||
}
|
}
|
||||||
|
@ -155,12 +155,12 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
return BaseBlockRender.class;
|
return BaseBlockRender.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IIcon unmappedGetIcon( IBlockAccess w, int x, int y, int z, int s )
|
public IIcon unmappedGetIcon( final IBlockAccess w, final int x, final int y, final int z, final int s )
|
||||||
{
|
{
|
||||||
return super.getIcon( w, x, y, z, s );
|
return super.getIcon( w, x, y, z, s );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setFeature( EnumSet<AEFeature> f )
|
protected void setFeature( final EnumSet<AEFeature> f )
|
||||||
{
|
{
|
||||||
final AEBlockFeatureHandler featureHandler = new AEBlockFeatureHandler( f, this, this.featureSubName );
|
final AEBlockFeatureHandler featureHandler = new AEBlockFeatureHandler( f, this, this.featureSubName );
|
||||||
this.setHandler( featureHandler );
|
this.setHandler( featureHandler );
|
||||||
|
@ -172,7 +172,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
return this.handler;
|
return this.handler;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void setHandler( IFeatureHandler handler )
|
protected final void setHandler( final IFeatureHandler handler )
|
||||||
{
|
{
|
||||||
this.handler = handler;
|
this.handler = handler;
|
||||||
}
|
}
|
||||||
|
@ -202,19 +202,19 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( IBlockAccess w, int x, int y, int z, int s )
|
public IIcon getIcon( final IBlockAccess w, final int x, final int y, final int z, final int s )
|
||||||
{
|
{
|
||||||
return this.getIcon( this.mapRotation( w, x, y, z, s ), w.getBlockMetadata( x, y, z ) );
|
return this.getIcon( this.mapRotation( w, x, y, z, s ), w.getBlockMetadata( x, y, z ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
return this.getRendererInstance().getTexture( ForgeDirection.getOrientation( direction ) );
|
return this.getRendererInstance().getTexture( ForgeDirection.getOrientation( direction ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected ICustomCollision getCustomCollision( World w, int x, int y, int z )
|
protected ICustomCollision getCustomCollision( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
if( this instanceof ICustomCollision )
|
if( this instanceof ICustomCollision )
|
||||||
{
|
{
|
||||||
|
@ -226,15 +226,15 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
@Override
|
@Override
|
||||||
@SuppressWarnings( "unchecked" )
|
@SuppressWarnings( "unchecked" )
|
||||||
// NOTE: WAS FINAL, changed for Immibis
|
// NOTE: WAS FINAL, changed for Immibis
|
||||||
public void addCollisionBoxesToList( World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e )
|
public void addCollisionBoxesToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List out, final Entity e )
|
||||||
{
|
{
|
||||||
final ICustomCollision collisionHandler = this.getCustomCollision( w, x, y, z );
|
final ICustomCollision collisionHandler = this.getCustomCollision( w, x, y, z );
|
||||||
|
|
||||||
if( collisionHandler != null && bb != null )
|
if( collisionHandler != null && bb != null )
|
||||||
{
|
{
|
||||||
List<AxisAlignedBB> tmp = new ArrayList<AxisAlignedBB>();
|
final List<AxisAlignedBB> tmp = new ArrayList<AxisAlignedBB>();
|
||||||
collisionHandler.addCollidingBlockToList( w, x, y, z, bb, tmp, e );
|
collisionHandler.addCollidingBlockToList( w, x, y, z, bb, tmp, e );
|
||||||
for( AxisAlignedBB b : tmp )
|
for( final AxisAlignedBB b : tmp )
|
||||||
{
|
{
|
||||||
b.minX += x;
|
b.minX += x;
|
||||||
b.minY += y;
|
b.minY += y;
|
||||||
|
@ -256,7 +256,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public final AxisAlignedBB getSelectedBoundingBoxFromPool( World w, int x, int y, int z )
|
public final AxisAlignedBB getSelectedBoundingBoxFromPool( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
final ICustomCollision collisionHandler = this.getCustomCollision( w, x, y, z );
|
final ICustomCollision collisionHandler = this.getCustomCollision( w, x, y, z );
|
||||||
|
|
||||||
|
@ -272,11 +272,11 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
|
|
||||||
double lastDist = 0;
|
double lastDist = 0;
|
||||||
|
|
||||||
for( AxisAlignedBB bb : bbs )
|
for( final AxisAlignedBB bb : bbs )
|
||||||
{
|
{
|
||||||
this.setBlockBounds( (float) bb.minX, (float) bb.minY, (float) bb.minZ, (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ );
|
this.setBlockBounds( (float) bb.minX, (float) bb.minY, (float) bb.minZ, (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ );
|
||||||
|
|
||||||
MovingObjectPosition r = super.collisionRayTrace( w, x, y, z, ld.a, ld.b );
|
final MovingObjectPosition r = super.collisionRayTrace( w, x, y, z, ld.a, ld.b );
|
||||||
|
|
||||||
this.setBlockBounds( 0, 0, 0, 1, 1, 1 );
|
this.setBlockBounds( 0, 0, 0, 1, 1, 1 );
|
||||||
|
|
||||||
|
@ -305,7 +305,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
|
|
||||||
final AxisAlignedBB b = AxisAlignedBB.getBoundingBox( 16d, 16d, 16d, 0d, 0d, 0d );
|
final AxisAlignedBB b = AxisAlignedBB.getBoundingBox( 16d, 16d, 16d, 0d, 0d, 0d );
|
||||||
|
|
||||||
for( AxisAlignedBB bx : collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, null, false ) )
|
for( final AxisAlignedBB bx : collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, null, false ) )
|
||||||
{
|
{
|
||||||
final double minX = Math.min( b.minX, bx.minX );
|
final double minX = Math.min( b.minX, bx.minX );
|
||||||
final double minY = Math.min( b.minY, bx.minY );
|
final double minY = Math.min( b.minY, bx.minY );
|
||||||
|
@ -332,7 +332,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public MovingObjectPosition collisionRayTrace( World w, int x, int y, int z, Vec3 a, Vec3 b )
|
public MovingObjectPosition collisionRayTrace( final World w, final int x, final int y, final int z, final Vec3 a, final Vec3 b )
|
||||||
{
|
{
|
||||||
final ICustomCollision collisionHandler = this.getCustomCollision( w, x, y, z );
|
final ICustomCollision collisionHandler = this.getCustomCollision( w, x, y, z );
|
||||||
|
|
||||||
|
@ -343,21 +343,21 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
|
|
||||||
double lastDist = 0;
|
double lastDist = 0;
|
||||||
|
|
||||||
for( AxisAlignedBB bb : bbs )
|
for( final AxisAlignedBB bb : bbs )
|
||||||
{
|
{
|
||||||
this.setBlockBounds( (float) bb.minX, (float) bb.minY, (float) bb.minZ, (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ );
|
this.setBlockBounds( (float) bb.minX, (float) bb.minY, (float) bb.minZ, (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ );
|
||||||
|
|
||||||
MovingObjectPosition r = super.collisionRayTrace( w, x, y, z, a, b );
|
final MovingObjectPosition r = super.collisionRayTrace( w, x, y, z, a, b );
|
||||||
|
|
||||||
this.setBlockBounds( 0, 0, 0, 1, 1, 1 );
|
this.setBlockBounds( 0, 0, 0, 1, 1, 1 );
|
||||||
|
|
||||||
if( r != null )
|
if( r != null )
|
||||||
{
|
{
|
||||||
double xLen = ( a.xCoord - r.hitVec.xCoord );
|
final double xLen = ( a.xCoord - r.hitVec.xCoord );
|
||||||
double yLen = ( a.yCoord - r.hitVec.yCoord );
|
final double yLen = ( a.yCoord - r.hitVec.yCoord );
|
||||||
double zLen = ( a.zCoord - r.hitVec.zCoord );
|
final double zLen = ( a.zCoord - r.hitVec.zCoord );
|
||||||
|
|
||||||
double thisDist = xLen * xLen + yLen * yLen + zLen * zLen;
|
final double thisDist = xLen * xLen + yLen * yLen + zLen * zLen;
|
||||||
if( br == null || lastDist > thisDist )
|
if( br == null || lastDist > thisDist )
|
||||||
{
|
{
|
||||||
lastDist = thisDist;
|
lastDist = thisDist;
|
||||||
|
@ -378,7 +378,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
return super.collisionRayTrace( w, x, y, z, a, b );
|
return super.collisionRayTrace( w, x, y, z, a, b );
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -386,7 +386,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
@SuppressWarnings( "unchecked" )
|
@SuppressWarnings( "unchecked" )
|
||||||
public final void getSubBlocks( Item item, CreativeTabs tabs, List itemStacks )
|
public final void getSubBlocks( final Item item, final CreativeTabs tabs, final List itemStacks )
|
||||||
{
|
{
|
||||||
this.getCheckedSubBlocks( item, tabs, itemStacks );
|
this.getCheckedSubBlocks( item, tabs, itemStacks );
|
||||||
}
|
}
|
||||||
|
@ -398,14 +398,14 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getComparatorInputOverride( World w, int x, int y, int z, int s )
|
public int getComparatorInputOverride( final World w, final int x, final int y, final int z, final int s )
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void registerBlockIcons( IIconRegister iconRegistry )
|
public void registerBlockIcons( final IIconRegister iconRegistry )
|
||||||
{
|
{
|
||||||
final BlockRenderInfo info = this.getRendererInstance();
|
final BlockRenderInfo info = this.getRendererInstance();
|
||||||
final FlippableIcon topIcon = this.optionalIcon( iconRegistry, this.getTextureName(), null );
|
final FlippableIcon topIcon = this.optionalIcon( iconRegistry, this.getTextureName(), null );
|
||||||
|
@ -422,12 +422,12 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final boolean isNormalCube( IBlockAccess world, int x, int y, int z )
|
public final boolean isNormalCube( final IBlockAccess world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return this.isFullSize;
|
return this.isFullSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IOrientable getOrientable( IBlockAccess w, int x, int y, int z )
|
public IOrientable getOrientable( final IBlockAccess w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
if( this instanceof IOrientableBlock )
|
if( this instanceof IOrientableBlock )
|
||||||
{
|
{
|
||||||
|
@ -437,7 +437,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final boolean rotateBlock( World w, int x, int y, int z, ForgeDirection axis )
|
public final boolean rotateBlock( final World w, final int x, final int y, final int z, final ForgeDirection axis )
|
||||||
{
|
{
|
||||||
final IOrientable rotatable = this.getOrientable( w, x, y, z );
|
final IOrientable rotatable = this.getOrientable( w, x, y, z );
|
||||||
|
|
||||||
|
@ -475,24 +475,24 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void customRotateBlock( IOrientable rotatable, ForgeDirection axis )
|
protected void customRotateBlock( final IOrientable rotatable, final ForgeDirection axis )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isValidOrientation( World w, int x, int y, int z, ForgeDirection forward, ForgeDirection up )
|
public boolean isValidOrientation( final World w, final int x, final int y, final int z, final ForgeDirection forward, final ForgeDirection up )
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ForgeDirection[] getValidRotations( World w, int x, int y, int z )
|
public ForgeDirection[] getValidRotations( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return new ForgeDirection[0];
|
return new ForgeDirection[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
private FlippableIcon optionalIcon( IIconRegister ir, String name, IIcon substitute )
|
private FlippableIcon optionalIcon( final IIconRegister ir, final String name, IIcon substitute )
|
||||||
{
|
{
|
||||||
// if the input is an flippable IIcon find the original.
|
// if the input is an flippable IIcon find the original.
|
||||||
while( substitute instanceof FlippableIcon )
|
while( substitute instanceof FlippableIcon )
|
||||||
|
@ -507,13 +507,13 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
ResourceLocation resLoc = new ResourceLocation( name );
|
ResourceLocation resLoc = new ResourceLocation( name );
|
||||||
resLoc = new ResourceLocation( resLoc.getResourceDomain(), String.format( "%s/%s%s", "textures/blocks", resLoc.getResourcePath(), ".png" ) );
|
resLoc = new ResourceLocation( resLoc.getResourceDomain(), String.format( "%s/%s%s", "textures/blocks", resLoc.getResourcePath(), ".png" ) );
|
||||||
|
|
||||||
IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc );
|
final IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc );
|
||||||
if( res != null )
|
if( res != null )
|
||||||
{
|
{
|
||||||
return new FlippableIcon( ir.registerIcon( name ) );
|
return new FlippableIcon( ir.registerIcon( name ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch( Throwable e )
|
catch( final Throwable e )
|
||||||
{
|
{
|
||||||
return new FlippableIcon( substitute );
|
return new FlippableIcon( substitute );
|
||||||
}
|
}
|
||||||
|
@ -523,12 +523,12 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
super.getSubBlocks( item, tabs, itemStacks );
|
super.getSubBlocks( item, tabs, itemStacks );
|
||||||
}
|
}
|
||||||
|
|
||||||
int mapRotation( IBlockAccess w, int x, int y, int z, int s )
|
int mapRotation( final IBlockAccess w, final int x, final int y, final int z, final int s )
|
||||||
{
|
{
|
||||||
final IOrientable ori = this.getOrientable( w, x, y, z );
|
final IOrientable ori = this.getOrientable( w, x, y, z );
|
||||||
|
|
||||||
|
@ -540,7 +540,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ForgeDirection mapRotation( IOrientable ori, ForgeDirection dir )
|
public ForgeDirection mapRotation( final IOrientable ori, final ForgeDirection dir )
|
||||||
{
|
{
|
||||||
// case DOWN: return bottomIcon;
|
// case DOWN: return bottomIcon;
|
||||||
// case UP: return blockIcon;
|
// case UP: return blockIcon;
|
||||||
|
@ -557,12 +557,12 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
return dir;
|
return dir;
|
||||||
}
|
}
|
||||||
|
|
||||||
int west_x = forward.offsetY * up.offsetZ - forward.offsetZ * up.offsetY;
|
final int west_x = forward.offsetY * up.offsetZ - forward.offsetZ * up.offsetY;
|
||||||
int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ;
|
final int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ;
|
||||||
int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX;
|
final int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX;
|
||||||
|
|
||||||
ForgeDirection west = ForgeDirection.UNKNOWN;
|
ForgeDirection west = ForgeDirection.UNKNOWN;
|
||||||
for( ForgeDirection dx : ForgeDirection.VALID_DIRECTIONS )
|
for( final ForgeDirection dx : ForgeDirection.VALID_DIRECTIONS )
|
||||||
{
|
{
|
||||||
if( dx.offsetX == west_x && dx.offsetY == west_y && dx.offsetZ == west_z )
|
if( dx.offsetX == west_x && dx.offsetY == west_y && dx.offsetZ == west_z )
|
||||||
{
|
{
|
||||||
|
@ -601,17 +601,17 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void setRenderStateByMeta( int itemDamage )
|
public void setRenderStateByMeta( final int itemDamage )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getUnlocalizedName( ItemStack is )
|
public String getUnlocalizedName( final ItemStack is )
|
||||||
{
|
{
|
||||||
return this.getUnlocalizedName();
|
return this.getUnlocalizedName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addInformation( ItemStack is, EntityPlayer player, List<String> lines, boolean advancedItemTooltips )
|
public void addInformation( final ItemStack is, final EntityPlayer player, final List<String> lines, final boolean advancedItemTooltips )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ public class AEBaseItemBlock extends ItemBlock
|
||||||
|
|
||||||
private final AEBaseBlock blockType;
|
private final AEBaseBlock blockType;
|
||||||
|
|
||||||
public AEBaseItemBlock( Block id )
|
public AEBaseItemBlock( final Block id )
|
||||||
{
|
{
|
||||||
super( id );
|
super( id );
|
||||||
this.blockType = (AEBaseBlock) id;
|
this.blockType = (AEBaseBlock) id;
|
||||||
|
@ -62,7 +62,7 @@ public class AEBaseItemBlock extends ItemBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMetadata( int dmg )
|
public int getMetadata( final int dmg )
|
||||||
{
|
{
|
||||||
if( this.hasSubtypes )
|
if( this.hasSubtypes )
|
||||||
{
|
{
|
||||||
|
@ -74,31 +74,31 @@ public class AEBaseItemBlock extends ItemBlock
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
@SuppressWarnings( "unchecked" )
|
@SuppressWarnings( "unchecked" )
|
||||||
public final void addInformation( ItemStack itemStack, EntityPlayer player, List toolTip, boolean advancedTooltips )
|
public final void addInformation( final ItemStack itemStack, final EntityPlayer player, final List toolTip, final boolean advancedTooltips )
|
||||||
{
|
{
|
||||||
this.addCheckedInformation( itemStack, player, toolTip, advancedTooltips );
|
this.addCheckedInformation( itemStack, player, toolTip, advancedTooltips );
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void addCheckedInformation( ItemStack itemStack, EntityPlayer player, List<String> toolTip, boolean advancedToolTips )
|
public void addCheckedInformation( final ItemStack itemStack, final EntityPlayer player, final List<String> toolTip, final boolean advancedToolTips )
|
||||||
{
|
{
|
||||||
this.blockType.addInformation( itemStack, player, toolTip, advancedToolTips );
|
this.blockType.addInformation( itemStack, player, toolTip, advancedToolTips );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isBookEnchantable( ItemStack itemstack1, ItemStack itemstack2 )
|
public boolean isBookEnchantable( final ItemStack itemstack1, final ItemStack itemstack2 )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getUnlocalizedName( ItemStack is )
|
public String getUnlocalizedName( final ItemStack is )
|
||||||
{
|
{
|
||||||
return this.blockType.getUnlocalizedName( is );
|
return this.blockType.getUnlocalizedName( is );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean placeBlockAt( ItemStack stack, EntityPlayer player, World w, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata )
|
public boolean placeBlockAt( final ItemStack stack, final EntityPlayer player, final World w, final int x, final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ, final int metadata )
|
||||||
{
|
{
|
||||||
ForgeDirection up = ForgeDirection.UNKNOWN;
|
ForgeDirection up = ForgeDirection.UNKNOWN;
|
||||||
ForgeDirection forward = ForgeDirection.UNKNOWN;
|
ForgeDirection forward = ForgeDirection.UNKNOWN;
|
||||||
|
@ -133,7 +133,7 @@ public class AEBaseItemBlock extends ItemBlock
|
||||||
{
|
{
|
||||||
up = ForgeDirection.UP;
|
up = ForgeDirection.UP;
|
||||||
|
|
||||||
byte rotation = (byte) ( MathHelper.floor_double( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
|
final byte rotation = (byte) ( MathHelper.floor_double( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
|
||||||
|
|
||||||
switch( rotation )
|
switch( rotation )
|
||||||
{
|
{
|
||||||
|
@ -186,7 +186,7 @@ public class AEBaseItemBlock extends ItemBlock
|
||||||
{
|
{
|
||||||
if( this.blockType instanceof AEBaseTileBlock && !( this.blockType instanceof BlockLightDetector ) )
|
if( this.blockType instanceof AEBaseTileBlock && !( this.blockType instanceof BlockLightDetector ) )
|
||||||
{
|
{
|
||||||
AEBaseTile tile = ( (AEBaseTileBlock) this.blockType ).getTileEntity( w, x, y, z );
|
final AEBaseTile tile = ( (AEBaseTileBlock) this.blockType ).getTileEntity( w, x, y, z );
|
||||||
ori = tile;
|
ori = tile;
|
||||||
|
|
||||||
if( tile == null )
|
if( tile == null )
|
||||||
|
|
|
@ -42,18 +42,18 @@ import appeng.util.Platform;
|
||||||
public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEItemPowerStorage
|
public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEItemPowerStorage
|
||||||
{
|
{
|
||||||
|
|
||||||
public AEBaseItemBlockChargeable( Block id )
|
public AEBaseItemBlockChargeable( final Block id )
|
||||||
{
|
{
|
||||||
super( id );
|
super( id );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void addCheckedInformation( ItemStack itemStack, EntityPlayer player, List<String> toolTip, boolean advancedTooltips )
|
public void addCheckedInformation( final ItemStack itemStack, final EntityPlayer player, final List<String> toolTip, final boolean advancedTooltips )
|
||||||
{
|
{
|
||||||
final NBTTagCompound tag = itemStack.getTagCompound();
|
final NBTTagCompound tag = itemStack.getTagCompound();
|
||||||
double internalCurrentPower = 0;
|
double internalCurrentPower = 0;
|
||||||
double internalMaxPower = this.getMaxEnergyCapacity();
|
final double internalMaxPower = this.getMaxEnergyCapacity();
|
||||||
|
|
||||||
if( tag != null )
|
if( tag != null )
|
||||||
{
|
{
|
||||||
|
@ -69,7 +69,7 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
|
||||||
{
|
{
|
||||||
final Block blockID = Block.getBlockFromItem( this );
|
final Block blockID = Block.getBlockFromItem( this );
|
||||||
final IBlockDefinition energyCell = Api.INSTANCE.definitions().blocks().energyCell();
|
final IBlockDefinition energyCell = Api.INSTANCE.definitions().blocks().energyCell();
|
||||||
for( Block block : energyCell.maybeBlock().asSet() )
|
for( final Block block : energyCell.maybeBlock().asSet() )
|
||||||
{
|
{
|
||||||
if( blockID == block )
|
if( blockID == block )
|
||||||
{
|
{
|
||||||
|
@ -85,10 +85,10 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double injectAEPower( ItemStack is, double amt )
|
public double injectAEPower( final ItemStack is, double amt )
|
||||||
{
|
{
|
||||||
double internalCurrentPower = this.getInternal( is );
|
double internalCurrentPower = this.getInternal( is );
|
||||||
double internalMaxPower = this.getMaxEnergyCapacity();
|
final double internalMaxPower = this.getMaxEnergyCapacity();
|
||||||
internalCurrentPower += amt;
|
internalCurrentPower += amt;
|
||||||
if( internalCurrentPower > internalMaxPower )
|
if( internalCurrentPower > internalMaxPower )
|
||||||
{
|
{
|
||||||
|
@ -102,20 +102,20 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private double getInternal( ItemStack is )
|
private double getInternal( final ItemStack is )
|
||||||
{
|
{
|
||||||
final NBTTagCompound nbt = Platform.openNbtData( is );
|
final NBTTagCompound nbt = Platform.openNbtData( is );
|
||||||
return nbt.getDouble( "internalCurrentPower" );
|
return nbt.getDouble( "internalCurrentPower" );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setInternal( ItemStack is, double amt )
|
private void setInternal( final ItemStack is, final double amt )
|
||||||
{
|
{
|
||||||
final NBTTagCompound nbt = Platform.openNbtData( is );
|
final NBTTagCompound nbt = Platform.openNbtData( is );
|
||||||
nbt.setDouble( "internalCurrentPower", amt );
|
nbt.setDouble( "internalCurrentPower", amt );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double extractAEPower( ItemStack is, double amt )
|
public double extractAEPower( final ItemStack is, double amt )
|
||||||
{
|
{
|
||||||
double internalCurrentPower = this.getInternal( is );
|
double internalCurrentPower = this.getInternal( is );
|
||||||
if( internalCurrentPower > amt )
|
if( internalCurrentPower > amt )
|
||||||
|
@ -131,19 +131,19 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getAEMaxPower( ItemStack is )
|
public double getAEMaxPower( final ItemStack is )
|
||||||
{
|
{
|
||||||
return this.getMaxEnergyCapacity();
|
return this.getMaxEnergyCapacity();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getAECurrentPower( ItemStack is )
|
public double getAECurrentPower( final ItemStack is )
|
||||||
{
|
{
|
||||||
return this.getInternal( is );
|
return this.getInternal( is );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AccessRestriction getPowerFlow( ItemStack is )
|
public AccessRestriction getPowerFlow( final ItemStack is )
|
||||||
{
|
{
|
||||||
return AccessRestriction.WRITE;
|
return AccessRestriction.WRITE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ import net.minecraft.item.ItemSlab;
|
||||||
public class AEBaseItemBlockSlab extends ItemSlab
|
public class AEBaseItemBlockSlab extends ItemSlab
|
||||||
{
|
{
|
||||||
|
|
||||||
public AEBaseItemBlockSlab( Block block, AEBaseSlabBlock singleSlab, AEBaseSlabBlock doubleSlab, Boolean isDoubleSlab )
|
public AEBaseItemBlockSlab( final Block block, final AEBaseSlabBlock singleSlab, final AEBaseSlabBlock doubleSlab, final Boolean isDoubleSlab )
|
||||||
{
|
{
|
||||||
super( block, singleSlab, doubleSlab, isDoubleSlab );
|
super( block, singleSlab, doubleSlab, isDoubleSlab );
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
|
||||||
private AEBaseSlabBlock doubleSlabs;
|
private AEBaseSlabBlock doubleSlabs;
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
public AEBaseSlabBlock( AEBaseBlock block, int meta, EnumSet<AEFeature> features, boolean isDoubleSlab, String name )
|
public AEBaseSlabBlock( final AEBaseBlock block, final int meta, final EnumSet<AEFeature> features, final boolean isDoubleSlab, final String name )
|
||||||
{
|
{
|
||||||
super( isDoubleSlab, block.getMaterial() );
|
super( isDoubleSlab, block.getMaterial() );
|
||||||
this.block = block;
|
this.block = block;
|
||||||
|
@ -63,7 +63,7 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
|
||||||
this.features = !this.field_150004_a ? new SlabBlockFeatureHandler( features, this ) : null;
|
this.features = !this.field_150004_a ? new SlabBlockFeatureHandler( features, this ) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public AEBaseSlabBlock setSlabs( AEBaseSlabBlock slabs )
|
public AEBaseSlabBlock setSlabs( final AEBaseSlabBlock slabs )
|
||||||
{
|
{
|
||||||
this.slabs = slabs;
|
this.slabs = slabs;
|
||||||
return this;
|
return this;
|
||||||
|
@ -92,30 +92,30 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( int dir, int meta )
|
public IIcon getIcon( final int dir, final int meta )
|
||||||
{
|
{
|
||||||
return this.block.getIcon( dir, this.meta );
|
return this.block.getIcon( dir, this.meta );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String func_150002_b( int p_150002_1_ )
|
public String func_150002_b( final int p_150002_1_ )
|
||||||
{
|
{
|
||||||
return this.getUnlocalizedName();
|
return this.getUnlocalizedName();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void registerBlockIcons( IIconRegister reg )
|
public void registerBlockIcons( final IIconRegister reg )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Item getItemDropped( int meta, Random rand, int fortune )
|
public Item getItemDropped( final int meta, final Random rand, final int fortune )
|
||||||
{
|
{
|
||||||
return this.field_150004_a ? Item.getItemFromBlock( this.slabs ) : Item.getItemFromBlock( this );
|
return this.field_150004_a ? Item.getItemFromBlock( this.slabs ) : Item.getItemFromBlock( this );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z )
|
public ItemStack getPickBlock( final MovingObjectPosition target, final World world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
AEBaseSlabBlock block = (AEBaseSlabBlock) world.getBlock( x, y, z );
|
AEBaseSlabBlock block = (AEBaseSlabBlock) world.getBlock( x, y, z );
|
||||||
|
|
||||||
|
@ -128,7 +128,7 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
|
||||||
block = this.slabs;
|
block = this.slabs;
|
||||||
}
|
}
|
||||||
|
|
||||||
int meta = world.getBlockMetadata( x, y, z ) & 7;
|
final int meta = world.getBlockMetadata( x, y, z ) & 7;
|
||||||
return new ItemStack( block, 1, meta );
|
return new ItemStack( block, 1, meta );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ public abstract class AEBaseStairBlock extends BlockStairs implements IAEFeature
|
||||||
{
|
{
|
||||||
private final IFeatureHandler features;
|
private final IFeatureHandler features;
|
||||||
|
|
||||||
protected AEBaseStairBlock( Block block, int meta, EnumSet<AEFeature> features )
|
protected AEBaseStairBlock( final Block block, final int meta, final EnumSet<AEFeature> features )
|
||||||
{
|
{
|
||||||
super( block, meta );
|
super( block, meta );
|
||||||
|
|
||||||
|
|
|
@ -68,24 +68,24 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private Class<? extends TileEntity> tileEntityType;
|
private Class<? extends TileEntity> tileEntityType;
|
||||||
|
|
||||||
public AEBaseTileBlock( Material mat )
|
public AEBaseTileBlock( final Material mat )
|
||||||
{
|
{
|
||||||
super( mat );
|
super( mat );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected AEBaseTileBlock( Material mat, Optional<String> subName )
|
protected AEBaseTileBlock( final Material mat, final Optional<String> subName )
|
||||||
{
|
{
|
||||||
super( mat, subName );
|
super( mat, subName );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void setFeature( EnumSet<AEFeature> f )
|
protected void setFeature( final EnumSet<AEFeature> f )
|
||||||
{
|
{
|
||||||
final AETileBlockFeatureHandler featureHandler = new AETileBlockFeatureHandler( f, this, this.featureSubName );
|
final AETileBlockFeatureHandler featureHandler = new AETileBlockFeatureHandler( f, this, this.featureSubName );
|
||||||
this.setHandler( featureHandler );
|
this.setHandler( featureHandler );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setTileEntity( Class<? extends TileEntity> c )
|
protected void setTileEntity( final Class<? extends TileEntity> c )
|
||||||
{
|
{
|
||||||
this.tileEntityType = c;
|
this.tileEntityType = c;
|
||||||
this.isInventory = IInventory.class.isAssignableFrom( c );
|
this.isInventory = IInventory.class.isAssignableFrom( c );
|
||||||
|
@ -93,7 +93,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
// update Block value.
|
// update Block value.
|
||||||
private void setTileProvider( boolean b )
|
private void setTileProvider( final boolean b )
|
||||||
{
|
{
|
||||||
ReflectionHelper.setPrivateValue( Block.class, this, b, "isTileProvider" );
|
ReflectionHelper.setPrivateValue( Block.class, this, b, "isTileProvider" );
|
||||||
}
|
}
|
||||||
|
@ -109,7 +109,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public <T extends AEBaseTile> T getTileEntity( IBlockAccess w, int x, int y, int z )
|
public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
if( !this.hasBlockTileEntity() )
|
if( !this.hasBlockTileEntity() )
|
||||||
{
|
{
|
||||||
|
@ -126,7 +126,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final TileEntity createNewTileEntity( World var1, int var2 )
|
public final TileEntity createNewTileEntity( final World var1, final int var2 )
|
||||||
{
|
{
|
||||||
if( this.hasBlockTileEntity() )
|
if( this.hasBlockTileEntity() )
|
||||||
{
|
{
|
||||||
|
@ -134,11 +134,11 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
{
|
{
|
||||||
return this.tileEntityType.newInstance();
|
return this.tileEntityType.newInstance();
|
||||||
}
|
}
|
||||||
catch( InstantiationException e )
|
catch( final InstantiationException e )
|
||||||
{
|
{
|
||||||
throw new IllegalStateException( "Failed to create a new instance of an illegal class " + this.tileEntityType, e );
|
throw new IllegalStateException( "Failed to create a new instance of an illegal class " + this.tileEntityType, e );
|
||||||
}
|
}
|
||||||
catch( IllegalAccessException e )
|
catch( final IllegalAccessException e )
|
||||||
{
|
{
|
||||||
throw new IllegalStateException( "Failed to create a new instance of " + this.tileEntityType + ", because lack of permissions", e );
|
throw new IllegalStateException( "Failed to create a new instance of " + this.tileEntityType + ", because lack of permissions", e );
|
||||||
}
|
}
|
||||||
|
@ -148,7 +148,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void breakBlock( World w, int x, int y, int z, Block a, int b )
|
public void breakBlock( final World w, final int x, final int y, final int z, final Block a, final int b )
|
||||||
{
|
{
|
||||||
final AEBaseTile te = this.getTileEntity( w, x, y, z );
|
final AEBaseTile te = this.getTileEntity( w, x, y, z );
|
||||||
if( te != null )
|
if( te != null )
|
||||||
|
@ -172,7 +172,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final ForgeDirection[] getValidRotations( World w, int x, int y, int z )
|
public final ForgeDirection[] getValidRotations( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
final AEBaseTile obj = this.getTileEntity( w, x, y, z );
|
final AEBaseTile obj = this.getTileEntity( w, x, y, z );
|
||||||
if( obj != null && obj.canBeRotated() )
|
if( obj != null && obj.canBeRotated() )
|
||||||
|
@ -184,7 +184,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean recolourBlock( World world, int x, int y, int z, ForgeDirection side, int colour )
|
public boolean recolourBlock( final World world, final int x, final int y, final int z, final ForgeDirection side, final int colour )
|
||||||
{
|
{
|
||||||
final TileEntity te = this.getTileEntity( world, x, y, z );
|
final TileEntity te = this.getTileEntity( world, x, y, z );
|
||||||
|
|
||||||
|
@ -206,7 +206,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getComparatorInputOverride( World w, int x, int y, int z, int s )
|
public int getComparatorInputOverride( final World w, final int x, final int y, final int z, final int s )
|
||||||
{
|
{
|
||||||
final TileEntity te = this.getTileEntity( w, x, y, z );
|
final TileEntity te = this.getTileEntity( w, x, y, z );
|
||||||
if( te instanceof IInventory )
|
if( te instanceof IInventory )
|
||||||
|
@ -217,7 +217,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onBlockEventReceived( World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_ )
|
public boolean onBlockEventReceived( final World p_149696_1_, final int p_149696_2_, final int p_149696_3_, final int p_149696_4_, final int p_149696_5_, final int p_149696_6_ )
|
||||||
{
|
{
|
||||||
super.onBlockEventReceived( p_149696_1_, p_149696_2_, p_149696_3_, p_149696_4_, p_149696_5_, p_149696_6_ );
|
super.onBlockEventReceived( p_149696_1_, p_149696_2_, p_149696_3_, p_149696_4_, p_149696_5_, p_149696_6_ );
|
||||||
final TileEntity tileentity = p_149696_1_.getTileEntity( p_149696_2_, p_149696_3_, p_149696_4_ );
|
final TileEntity tileentity = p_149696_1_.getTileEntity( p_149696_2_, p_149696_3_, p_149696_4_ );
|
||||||
|
@ -225,7 +225,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBlockPlacedBy( World w, int x, int y, int z, EntityLivingBase player, ItemStack is )
|
public void onBlockPlacedBy( final World w, final int x, final int y, final int z, final EntityLivingBase player, final ItemStack is )
|
||||||
{
|
{
|
||||||
if( is.hasDisplayName() )
|
if( is.hasDisplayName() )
|
||||||
{
|
{
|
||||||
|
@ -238,7 +238,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final boolean onBlockActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public final boolean onBlockActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( player != null )
|
if( player != null )
|
||||||
{
|
{
|
||||||
|
@ -264,7 +264,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
final ItemStack op = new ItemStack( this );
|
final ItemStack op = new ItemStack( this );
|
||||||
for( ItemStack ol : drops )
|
for( final ItemStack ol : drops )
|
||||||
{
|
{
|
||||||
if( Platform.isSameItemType( ol, op ) )
|
if( Platform.isSameItemType( ol, op ) )
|
||||||
{
|
{
|
||||||
|
@ -328,13 +328,13 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IOrientable getOrientable( IBlockAccess w, int x, int y, int z )
|
public IOrientable getOrientable( final IBlockAccess w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return this.getTileEntity( w, x, y, z );
|
return this.getTileEntity( w, x, y, z );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ICustomCollision getCustomCollision( World w, int x, int y, int z )
|
public ICustomCollision getCustomCollision( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
final AEBaseTile te = this.getTileEntity( w, x, y, z );
|
final AEBaseTile te = this.getTileEntity( w, x, y, z );
|
||||||
if( te instanceof ICustomCollision )
|
if( te instanceof ICustomCollision )
|
||||||
|
|
|
@ -26,7 +26,7 @@ import net.minecraft.world.IBlockAccess;
|
||||||
|
|
||||||
public class AEDecorativeBlock extends AEBaseBlock
|
public class AEDecorativeBlock extends AEBaseBlock
|
||||||
{
|
{
|
||||||
public AEDecorativeBlock( Material mat )
|
public AEDecorativeBlock( final Material mat )
|
||||||
{
|
{
|
||||||
super( mat );
|
super( mat );
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ public class AEDecorativeBlock extends AEBaseBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( IBlockAccess w, int x, int y, int z, int s )
|
public IIcon getIcon( final IBlockAccess w, final int x, final int y, final int z, final int s )
|
||||||
{
|
{
|
||||||
return super.unmappedGetIcon( w, x, y, z, s );
|
return super.unmappedGetIcon( w, x, y, z, s );
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,11 +52,11 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
if( direction != ForgeDirection.SOUTH.ordinal() )
|
if( direction != ForgeDirection.SOUTH.ordinal() )
|
||||||
{
|
{
|
||||||
for( Block craftingUnitBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
|
for( final Block craftingUnitBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
|
||||||
{
|
{
|
||||||
return craftingUnitBlock.getIcon( direction, metadata );
|
return craftingUnitBlock.getIcon( direction, metadata );
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
itemStacks.add( new ItemStack( this, 1, 0 ) );
|
itemStacks.add( new ItemStack( this, 1, 0 ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@ public class BlockCraftingStorage extends BlockCraftingUnit
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
switch( metadata & ( ~4 ) )
|
switch( metadata & ( ~4 ) )
|
||||||
{
|
{
|
||||||
|
@ -75,7 +75,7 @@ public class BlockCraftingStorage extends BlockCraftingUnit
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
itemStacks.add( new ItemStack( this, 1, 0 ) );
|
itemStacks.add( new ItemStack( this, 1, 0 ) );
|
||||||
itemStacks.add( new ItemStack( this, 1, 1 ) );
|
itemStacks.add( new ItemStack( this, 1, 1 ) );
|
||||||
|
@ -84,7 +84,7 @@ public class BlockCraftingStorage extends BlockCraftingUnit
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getUnlocalizedName( ItemStack is )
|
public String getUnlocalizedName( final ItemStack is )
|
||||||
{
|
{
|
||||||
if( is.getItemDamage() == 1 )
|
if( is.getItemDamage() == 1 )
|
||||||
{
|
{
|
||||||
|
|
|
@ -65,7 +65,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
switch( metadata )
|
switch( metadata )
|
||||||
{
|
{
|
||||||
|
@ -82,9 +82,9 @@ public class BlockCraftingUnit extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
TileCraftingTile tg = this.getTileEntity( w, x, y, z );
|
final TileCraftingTile tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() )
|
if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() )
|
||||||
{
|
{
|
||||||
if( Platform.isClient() )
|
if( Platform.isClient() )
|
||||||
|
@ -101,24 +101,24 @@ public class BlockCraftingUnit extends AEBaseTileBlock
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
itemStacks.add( new ItemStack( this, 1, 0 ) );
|
itemStacks.add( new ItemStack( this, 1, 0 ) );
|
||||||
itemStacks.add( new ItemStack( this, 1, 1 ) );
|
itemStacks.add( new ItemStack( this, 1, 1 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setRenderStateByMeta( int itemDamage )
|
public void setRenderStateByMeta( final int itemDamage )
|
||||||
{
|
{
|
||||||
IIcon front = this.getIcon( ForgeDirection.SOUTH.ordinal(), itemDamage );
|
final IIcon front = this.getIcon( ForgeDirection.SOUTH.ordinal(), itemDamage );
|
||||||
IIcon other = this.getIcon( ForgeDirection.NORTH.ordinal(), itemDamage );
|
final IIcon other = this.getIcon( ForgeDirection.NORTH.ordinal(), itemDamage );
|
||||||
this.getRendererInstance().setTemporaryRenderIcons( other, other, front, other, other, other );
|
this.getRendererInstance().setTemporaryRenderIcons( other, other, front, other, other, other );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void breakBlock( World w, int x, int y, int z, Block a, int b )
|
public void breakBlock( final World w, final int x, final int y, final int z, final Block a, final int b )
|
||||||
{
|
{
|
||||||
TileCraftingTile cp = this.getTileEntity( w, x, y, z );
|
final TileCraftingTile cp = this.getTileEntity( w, x, y, z );
|
||||||
if( cp != null )
|
if( cp != null )
|
||||||
{
|
{
|
||||||
cp.breakCluster();
|
cp.breakCluster();
|
||||||
|
@ -128,7 +128,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getUnlocalizedName( ItemStack is )
|
public String getUnlocalizedName( final ItemStack is )
|
||||||
{
|
{
|
||||||
if( is.getItemDamage() == 1 )
|
if( is.getItemDamage() == 1 )
|
||||||
{
|
{
|
||||||
|
@ -138,15 +138,15 @@ public class BlockCraftingUnit extends AEBaseTileBlock
|
||||||
return this.getItemUnlocalizedName( is );
|
return this.getItemUnlocalizedName( is );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected String getItemUnlocalizedName( ItemStack is )
|
protected String getItemUnlocalizedName( final ItemStack is )
|
||||||
{
|
{
|
||||||
return super.getUnlocalizedName( is );
|
return super.getUnlocalizedName( is );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block junk )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block junk )
|
||||||
{
|
{
|
||||||
TileCraftingTile cp = this.getTileEntity( w, x, y, z );
|
final TileCraftingTile cp = this.getTileEntity( w, x, y, z );
|
||||||
if( cp != null )
|
if( cp != null )
|
||||||
{
|
{
|
||||||
cp.updateMultiBlock();
|
cp.updateMultiBlock();
|
||||||
|
@ -154,15 +154,15 @@ public class BlockCraftingUnit extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int damageDropped( int meta )
|
public int damageDropped( final int meta )
|
||||||
{
|
{
|
||||||
return meta & 3;
|
return meta & 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getDamageValue( World w, int x, int y, int z )
|
public int getDamageValue( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
int meta = w.getBlockMetadata( x, y, z );
|
final int meta = w.getBlockMetadata( x, y, z );
|
||||||
return this.damageDropped( meta );
|
return this.damageDropped( meta );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canRenderInPass( int pass )
|
public boolean canRenderInPass( final int pass )
|
||||||
{
|
{
|
||||||
booleanAlphaPass = pass == 1;
|
booleanAlphaPass = pass == 1;
|
||||||
return pass == 0 || pass == 1;
|
return pass == 0 || pass == 1;
|
||||||
|
@ -74,9 +74,9 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
TileMolecularAssembler tg = this.getTileEntity( w, x, y, z );
|
final TileMolecularAssembler tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null && !p.isSneaking() )
|
if( tg != null && !p.isSneaking() )
|
||||||
{
|
{
|
||||||
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_MAC );
|
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_MAC );
|
||||||
|
|
|
@ -31,15 +31,15 @@ import appeng.core.features.AEFeature;
|
||||||
public class ItemCraftingStorage extends AEBaseItemBlock
|
public class ItemCraftingStorage extends AEBaseItemBlock
|
||||||
{
|
{
|
||||||
|
|
||||||
public ItemCraftingStorage( Block id )
|
public ItemCraftingStorage( final Block id )
|
||||||
{
|
{
|
||||||
super( id );
|
super( id );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getContainerItem( ItemStack itemStack )
|
public ItemStack getContainerItem( final ItemStack itemStack )
|
||||||
{
|
{
|
||||||
for( ItemStack stack : AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 ).asSet() )
|
for( final ItemStack stack : AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 ).asSet() )
|
||||||
{
|
{
|
||||||
return stack;
|
return stack;
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ public class ItemCraftingStorage extends AEBaseItemBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasContainerItem( ItemStack stack )
|
public boolean hasContainerItem( final ItemStack stack )
|
||||||
{
|
{
|
||||||
return AEConfig.instance.isFeatureEnabled( AEFeature.enableDisassemblyCrafting );
|
return AEConfig.instance.isFeatureEnabled( AEFeature.enableDisassemblyCrafting );
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class BlockCrank extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( player instanceof FakePlayer || player == null )
|
if( player instanceof FakePlayer || player == null )
|
||||||
{
|
{
|
||||||
|
@ -70,7 +70,7 @@ public class BlockCrank extends AEBaseTileBlock
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
AEBaseTile tile = this.getTileEntity( w, x, y, z );
|
final AEBaseTile tile = this.getTileEntity( w, x, y, z );
|
||||||
if( tile instanceof TileCrank )
|
if( tile instanceof TileCrank )
|
||||||
{
|
{
|
||||||
if( ( (TileCrank) tile ).power() )
|
if( ( (TileCrank) tile ).power() )
|
||||||
|
@ -82,19 +82,19 @@ public class BlockCrank extends AEBaseTileBlock
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void dropCrank( World world, int x, int y, int z )
|
private void dropCrank( final World world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
world.func_147480_a( x, y, z, true ); // w.destroyBlock( x, y, z, true );
|
world.func_147480_a( x, y, z, true ); // w.destroyBlock( x, y, z, true );
|
||||||
world.markBlockForUpdate( x, y, z );
|
world.markBlockForUpdate( x, y, z );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBlockPlacedBy( World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemStack )
|
public void onBlockPlacedBy( final World world, final int x, final int y, final int z, final EntityLivingBase placer, final ItemStack itemStack )
|
||||||
{
|
{
|
||||||
AEBaseTile tile = this.getTileEntity( world, x, y, z );
|
final AEBaseTile tile = this.getTileEntity( world, x, y, z );
|
||||||
if( tile != null )
|
if( tile != null )
|
||||||
{
|
{
|
||||||
ForgeDirection mnt = this.findCrankable( world, x, y, z );
|
final ForgeDirection mnt = this.findCrankable( world, x, y, z );
|
||||||
ForgeDirection forward = ForgeDirection.UP;
|
ForgeDirection forward = ForgeDirection.UP;
|
||||||
if( mnt == ForgeDirection.UP || mnt == ForgeDirection.DOWN )
|
if( mnt == ForgeDirection.UP || mnt == ForgeDirection.DOWN )
|
||||||
{
|
{
|
||||||
|
@ -109,15 +109,15 @@ public class BlockCrank extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isValidOrientation( World world, int x, int y, int z, ForgeDirection forward, ForgeDirection up )
|
public boolean isValidOrientation( final World world, final int x, final int y, final int z, final ForgeDirection forward, final ForgeDirection up )
|
||||||
{
|
{
|
||||||
TileEntity te = world.getTileEntity( x, y, z );
|
final TileEntity te = world.getTileEntity( x, y, z );
|
||||||
return !( te instanceof TileCrank ) || this.isCrankable( world, x, y, z, up.getOpposite() );
|
return !( te instanceof TileCrank ) || this.isCrankable( world, x, y, z, up.getOpposite() );
|
||||||
}
|
}
|
||||||
|
|
||||||
private ForgeDirection findCrankable( World world, int x, int y, int z )
|
private ForgeDirection findCrankable( final World world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
for( final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
||||||
{
|
{
|
||||||
if( this.isCrankable( world, x, y, z, dir ) )
|
if( this.isCrankable( world, x, y, z, dir ) )
|
||||||
{
|
{
|
||||||
|
@ -127,17 +127,17 @@ public class BlockCrank extends AEBaseTileBlock
|
||||||
return ForgeDirection.UNKNOWN;
|
return ForgeDirection.UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isCrankable( World world, int x, int y, int z, ForgeDirection offset )
|
private boolean isCrankable( final World world, final int x, final int y, final int z, final ForgeDirection offset )
|
||||||
{
|
{
|
||||||
TileEntity te = world.getTileEntity( x + offset.offsetX, y + offset.offsetY, z + offset.offsetZ );
|
final TileEntity te = world.getTileEntity( x + offset.offsetX, y + offset.offsetY, z + offset.offsetZ );
|
||||||
|
|
||||||
return te instanceof ICrankable && ( (ICrankable) te ).canCrankAttach( offset.getOpposite() );
|
return te instanceof ICrankable && ( (ICrankable) te ).canCrankAttach( offset.getOpposite() );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World world, int x, int y, int z, Block block )
|
public void onNeighborBlockChange( final World world, final int x, final int y, final int z, final Block block )
|
||||||
{
|
{
|
||||||
AEBaseTile tile = this.getTileEntity( world, x, y, z );
|
final AEBaseTile tile = this.getTileEntity( world, x, y, z );
|
||||||
if( tile != null )
|
if( tile != null )
|
||||||
{
|
{
|
||||||
if( !this.isCrankable( world, x, y, z, tile.getUp().getOpposite() ) )
|
if( !this.isCrankable( world, x, y, z, tile.getUp().getOpposite() ) )
|
||||||
|
@ -152,7 +152,7 @@ public class BlockCrank extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlaceBlockAt( World world, int x, int y, int z )
|
public boolean canPlaceBlockAt( final World world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return this.findCrankable( world, x, y, z ) != ForgeDirection.UNKNOWN;
|
return this.findCrankable( world, x, y, z ) != ForgeDirection.UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,9 +46,9 @@ public class BlockGrinder extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
TileGrinder tg = this.getTileEntity( w, x, y, z );
|
final TileGrinder tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null && !p.isSneaking() )
|
if( tg != null && !p.isSneaking() )
|
||||||
{
|
{
|
||||||
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_GRINDER );
|
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_GRINDER );
|
||||||
|
|
|
@ -45,14 +45,14 @@ public class BlockCellWorkbench extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileCellWorkbench tg = this.getTileEntity( w, x, y, z );
|
final TileCellWorkbench tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
|
|
@ -69,7 +69,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( player.isSneaking() )
|
if( player.isSneaking() )
|
||||||
{
|
{
|
||||||
|
@ -78,7 +78,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
|
||||||
|
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
{
|
{
|
||||||
TileCharger tc = this.getTileEntity( w, x, y, z );
|
final TileCharger tc = this.getTileEntity( w, x, y, z );
|
||||||
if( tc != null )
|
if( tc != null )
|
||||||
{
|
{
|
||||||
tc.activate( player );
|
tc.activate( player );
|
||||||
|
@ -90,7 +90,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void randomDisplayTick( World w, int x, int y, int z, Random r )
|
public void randomDisplayTick( final World w, final int x, final int y, final int z, final Random r )
|
||||||
{
|
{
|
||||||
if( !AEConfig.instance.enableEffects )
|
if( !AEConfig.instance.enableEffects )
|
||||||
{
|
{
|
||||||
|
@ -102,22 +102,22 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
AEBaseTile tile = this.getTileEntity( w, x, y, z );
|
final AEBaseTile tile = this.getTileEntity( w, x, y, z );
|
||||||
if( tile instanceof TileCharger )
|
if( tile instanceof TileCharger )
|
||||||
{
|
{
|
||||||
TileCharger tc = (TileCharger) tile;
|
final TileCharger tc = (TileCharger) tile;
|
||||||
|
|
||||||
if( AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs( tc.getStackInSlot( 0 ) ) )
|
if( AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs( tc.getStackInSlot( 0 ) ) )
|
||||||
{
|
{
|
||||||
double xOff = 0.0;
|
final double xOff = 0.0;
|
||||||
double yOff = 0.0;
|
final double yOff = 0.0;
|
||||||
double zOff = 0.0;
|
final double zOff = 0.0;
|
||||||
|
|
||||||
for( int bolts = 0; bolts < 3; bolts++ )
|
for( int bolts = 0; bolts < 3; bolts++ )
|
||||||
{
|
{
|
||||||
if( CommonHelper.proxy.shouldAddParticles( r ) )
|
if( CommonHelper.proxy.shouldAddParticles( r ) )
|
||||||
{
|
{
|
||||||
LightningFX fx = new LightningFX( w, xOff + 0.5 + x, yOff + 0.5 + y, zOff + 0.5 + z, 0.0D, 0.0D, 0.0D );
|
final LightningFX fx = new LightningFX( w, xOff + 0.5 + x, yOff + 0.5 + y, zOff + 0.5 + z, 0.0D, 0.0D, 0.0D );
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -126,15 +126,15 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
TileCharger tile = this.getTileEntity( w, x, y, z );
|
final TileCharger tile = this.getTileEntity( w, x, y, z );
|
||||||
if( tile != null )
|
if( tile != null )
|
||||||
{
|
{
|
||||||
double twoPixels = 2.0 / 16.0;
|
final double twoPixels = 2.0 / 16.0;
|
||||||
ForgeDirection up = tile.getUp();
|
final ForgeDirection up = tile.getUp();
|
||||||
ForgeDirection forward = tile.getForward();
|
final ForgeDirection forward = tile.getForward();
|
||||||
AxisAlignedBB bb = AxisAlignedBB.getBoundingBox( twoPixels, twoPixels, twoPixels, 1.0 - twoPixels, 1.0 - twoPixels, 1.0 - twoPixels );
|
final AxisAlignedBB bb = AxisAlignedBB.getBoundingBox( twoPixels, twoPixels, twoPixels, 1.0 - twoPixels, 1.0 - twoPixels, 1.0 - twoPixels );
|
||||||
|
|
||||||
if( up.offsetX != 0 )
|
if( up.offsetX != 0 )
|
||||||
{
|
{
|
||||||
|
@ -182,7 +182,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
|
||||||
{
|
{
|
||||||
out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
|
out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class BlockCondenser extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( player.isSneaking() )
|
if( player.isSneaking() )
|
||||||
{
|
{
|
||||||
|
@ -54,7 +54,7 @@ public class BlockCondenser extends AEBaseTileBlock
|
||||||
|
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
{
|
{
|
||||||
TileCondenser tc = this.getTileEntity( w, x, y, z );
|
final TileCondenser tc = this.getTileEntity( w, x, y, z );
|
||||||
if( tc != null && !player.isSneaking() )
|
if( tc != null && !player.isSneaking() )
|
||||||
{
|
{
|
||||||
Platform.openGUI( player, tc, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CONDENSER );
|
Platform.openGUI( player, tc, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CONDENSER );
|
||||||
|
|
|
@ -55,14 +55,14 @@ public class BlockInscriber extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileInscriber tg = this.getTileEntity( w, x, y, z );
|
final TileInscriber tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
|
|
@ -54,14 +54,14 @@ public class BlockInterface extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileInterface tg = this.getTileEntity( w, x, y, z );
|
final TileInterface tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
@ -80,7 +80,7 @@ public class BlockInterface extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void customRotateBlock( IOrientable rotatable, ForgeDirection axis )
|
protected void customRotateBlock( final IOrientable rotatable, final ForgeDirection axis )
|
||||||
{
|
{
|
||||||
if( rotatable instanceof TileInterface )
|
if( rotatable instanceof TileInterface )
|
||||||
{
|
{
|
||||||
|
|
|
@ -61,7 +61,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int isProvidingWeakPower( IBlockAccess w, int x, int y, int z, int side )
|
public int isProvidingWeakPower( final IBlockAccess w, final int x, final int y, final int z, final int side )
|
||||||
{
|
{
|
||||||
if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, x, y, z ) ).isReady() )
|
if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, x, y, z ) ).isReady() )
|
||||||
{
|
{
|
||||||
|
@ -72,11 +72,11 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborChange( IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ )
|
public void onNeighborChange( final IBlockAccess world, final int x, final int y, final int z, final int tileX, final int tileY, final int tileZ )
|
||||||
{
|
{
|
||||||
super.onNeighborChange( world, x, y, z, tileX, tileY, tileZ );
|
super.onNeighborChange( world, x, y, z, tileX, tileY, tileZ );
|
||||||
|
|
||||||
TileLightDetector tld = this.getTileEntity( world, x, y, z );
|
final TileLightDetector tld = this.getTileEntity( world, x, y, z );
|
||||||
if( tld != null )
|
if( tld != null )
|
||||||
{
|
{
|
||||||
tld.updateLight();
|
tld.updateLight();
|
||||||
|
@ -85,7 +85,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void randomDisplayTick( World w, int x, int y, int z, Random r )
|
public void randomDisplayTick( final World w, final int x, final int y, final int z, final Random r )
|
||||||
{
|
{
|
||||||
// cancel out lightning
|
// cancel out lightning
|
||||||
}
|
}
|
||||||
|
@ -97,28 +97,28 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isValidOrientation( World w, int x, int y, int z, ForgeDirection forward, ForgeDirection up )
|
public boolean isValidOrientation( final World w, final int x, final int y, final int z, final ForgeDirection forward, final ForgeDirection up )
|
||||||
{
|
{
|
||||||
return this.canPlaceAt( w, x, y, z, up.getOpposite() );
|
return this.canPlaceAt( w, x, y, z, up.getOpposite() );
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean canPlaceAt( World w, int x, int y, int z, ForgeDirection dir )
|
private boolean canPlaceAt( final World w, final int x, final int y, final int z, final ForgeDirection dir )
|
||||||
{
|
{
|
||||||
return w.isSideSolid( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
|
return w.isSideSolid( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
final ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
||||||
double xOff = -0.3 * up.offsetX;
|
final double xOff = -0.3 * up.offsetX;
|
||||||
double yOff = -0.3 * up.offsetY;
|
final double yOff = -0.3 * up.offsetY;
|
||||||
double zOff = -0.3 * up.offsetZ;
|
final double zOff = -0.3 * up.offsetZ;
|
||||||
return Collections.singletonList( AxisAlignedBB.getBoundingBox( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) );
|
return Collections.singletonList( AxisAlignedBB.getBoundingBox( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List out, final Entity e )
|
||||||
{/*
|
{/*
|
||||||
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; double zOff = -0.15 *
|
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; double zOff = -0.15 *
|
||||||
* getUp().offsetZ; out.add( AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + (double) y + 0.15, zOff
|
* getUp().offsetZ; out.add( AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + (double) y + 0.15, zOff
|
||||||
|
@ -127,16 +127,16 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block id )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block id )
|
||||||
{
|
{
|
||||||
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
final ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
||||||
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
|
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
|
||||||
{
|
{
|
||||||
this.dropTorch( w, x, y, z );
|
this.dropTorch( w, x, y, z );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void dropTorch( World w, int x, int y, int z )
|
private void dropTorch( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
w.func_147480_a( x, y, z, true );
|
w.func_147480_a( x, y, z, true );
|
||||||
// w.destroyBlock( x, y, z, true );
|
// w.destroyBlock( x, y, z, true );
|
||||||
|
@ -144,9 +144,9 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlaceBlockAt( World w, int x, int y, int z )
|
public boolean canPlaceBlockAt( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
for( final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
||||||
{
|
{
|
||||||
if( this.canPlaceAt( w, x, y, z, dir ) )
|
if( this.canPlaceAt( w, x, y, z, dir ) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -66,27 +66,27 @@ public class BlockPaint extends AEBaseTileBlock
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AxisAlignedBB getCollisionBoundingBoxFromPool( World world, int x, int y, int z )
|
public AxisAlignedBB getCollisionBoundingBoxFromPool( final World world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canCollideCheck( int metadata, boolean isHoldingRightClick )
|
public boolean canCollideCheck( final int metadata, final boolean isHoldingRightClick )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block junk )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block junk )
|
||||||
{
|
{
|
||||||
TilePaint tp = this.getTileEntity( w, x, y, z );
|
final TilePaint tp = this.getTileEntity( w, x, y, z );
|
||||||
|
|
||||||
if( tp != null )
|
if( tp != null )
|
||||||
{
|
{
|
||||||
|
@ -95,19 +95,19 @@ public class BlockPaint extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Item getItemDropped( int meta, Random random, int fortune )
|
public Item getItemDropped( final int meta, final Random random, final int fortune )
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void dropBlockAsItemWithChance( World world, int x, int y, int z, int meta, float chance, int fortune )
|
public void dropBlockAsItemWithChance( final World world, final int x, final int y, final int z, final int meta, final float chance, final int fortune )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void fillWithRain( World w, int x, int y, int z )
|
public void fillWithRain( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
{
|
{
|
||||||
|
@ -116,9 +116,9 @@ public class BlockPaint extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getLightValue( IBlockAccess w, int x, int y, int z )
|
public int getLightValue( final IBlockAccess w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
TilePaint tp = this.getTileEntity( w, x, y, z );
|
final TilePaint tp = this.getTileEntity( w, x, y, z );
|
||||||
|
|
||||||
if( tp != null )
|
if( tp != null )
|
||||||
{
|
{
|
||||||
|
@ -129,13 +129,13 @@ public class BlockPaint extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isReplaceable( IBlockAccess world, int x, int y, int z )
|
public boolean isReplaceable( final IBlockAccess world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isAir( IBlockAccess world, int x, int y, int z )
|
public boolean isAir( final IBlockAccess world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,23 +62,23 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void randomDisplayTick( World w, int x, int y, int z, Random r )
|
public void randomDisplayTick( final World w, final int x, final int y, final int z, final Random r )
|
||||||
{
|
{
|
||||||
if( !AEConfig.instance.enableEffects )
|
if( !AEConfig.instance.enableEffects )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileQuartzGrowthAccelerator cga = this.getTileEntity( w, x, y, z );
|
final TileQuartzGrowthAccelerator cga = this.getTileEntity( w, x, y, z );
|
||||||
|
|
||||||
if( cga != null && cga.hasPower && CommonHelper.proxy.shouldAddParticles( r ) )
|
if( cga != null && cga.hasPower && CommonHelper.proxy.shouldAddParticles( r ) )
|
||||||
{
|
{
|
||||||
double d0 = r.nextFloat() - 0.5F;
|
final double d0 = r.nextFloat() - 0.5F;
|
||||||
double d1 = r.nextFloat() - 0.5F;
|
final double d1 = r.nextFloat() - 0.5F;
|
||||||
|
|
||||||
ForgeDirection up = cga.getUp();
|
final ForgeDirection up = cga.getUp();
|
||||||
ForgeDirection forward = cga.getForward();
|
final ForgeDirection forward = cga.getForward();
|
||||||
ForgeDirection west = Platform.crossProduct( forward, up );
|
final ForgeDirection west = Platform.crossProduct( forward, up );
|
||||||
|
|
||||||
double rx = 0.5 + x;
|
double rx = 0.5 + x;
|
||||||
double ry = 0.5 + y;
|
double ry = 0.5 + y;
|
||||||
|
@ -134,7 +134,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr
|
||||||
ry += dz * forward.offsetY;
|
ry += dz * forward.offsetY;
|
||||||
rz += dz * forward.offsetZ;
|
rz += dz * forward.offsetZ;
|
||||||
|
|
||||||
LightningFX fx = new LightningFX( w, rx, ry, rz, 0.0D, 0.0D, 0.0D );
|
final LightningFX fx = new LightningFX( w, rx, ry, rz, 0.0D, 0.0D, 0.0D );
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,28 +69,28 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isValidOrientation( World w, int x, int y, int z, ForgeDirection forward, ForgeDirection up )
|
public boolean isValidOrientation( final World w, final int x, final int y, final int z, final ForgeDirection forward, final ForgeDirection up )
|
||||||
{
|
{
|
||||||
return this.canPlaceAt( w, x, y, z, up.getOpposite() );
|
return this.canPlaceAt( w, x, y, z, up.getOpposite() );
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean canPlaceAt( World w, int x, int y, int z, ForgeDirection dir )
|
private boolean canPlaceAt( final World w, final int x, final int y, final int z, final ForgeDirection dir )
|
||||||
{
|
{
|
||||||
return w.isSideSolid( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
|
return w.isSideSolid( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
final ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
||||||
double xOff = -0.3 * up.offsetX;
|
final double xOff = -0.3 * up.offsetX;
|
||||||
double yOff = -0.3 * up.offsetY;
|
final double yOff = -0.3 * up.offsetY;
|
||||||
double zOff = -0.3 * up.offsetZ;
|
final double zOff = -0.3 * up.offsetZ;
|
||||||
return Collections.singletonList( AxisAlignedBB.getBoundingBox( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) );
|
return Collections.singletonList( AxisAlignedBB.getBoundingBox( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List out, final Entity e )
|
||||||
{/*
|
{/*
|
||||||
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; double zOff = -0.15 *
|
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; double zOff = -0.15 *
|
||||||
* getUp().offsetZ; out.add( AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + (double) y + 0.15, zOff
|
* getUp().offsetZ; out.add( AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + (double) y + 0.15, zOff
|
||||||
|
@ -100,7 +100,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void randomDisplayTick( World w, int x, int y, int z, Random r )
|
public void randomDisplayTick( final World w, final int x, final int y, final int z, final Random r )
|
||||||
{
|
{
|
||||||
if( !AEConfig.instance.enableEffects )
|
if( !AEConfig.instance.enableEffects )
|
||||||
{
|
{
|
||||||
|
@ -112,15 +112,15 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
final ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
||||||
double xOff = -0.3 * up.offsetX;
|
final double xOff = -0.3 * up.offsetX;
|
||||||
double yOff = -0.3 * up.offsetY;
|
final double yOff = -0.3 * up.offsetY;
|
||||||
double zOff = -0.3 * up.offsetZ;
|
final double zOff = -0.3 * up.offsetZ;
|
||||||
for( int bolts = 0; bolts < 3; bolts++ )
|
for( int bolts = 0; bolts < 3; bolts++ )
|
||||||
{
|
{
|
||||||
if( CommonHelper.proxy.shouldAddParticles( r ) )
|
if( CommonHelper.proxy.shouldAddParticles( r ) )
|
||||||
{
|
{
|
||||||
LightningFX fx = new LightningFX( w, xOff + 0.5 + x, yOff + 0.5 + y, zOff + 0.5 + z, 0.0D, 0.0D, 0.0D );
|
final LightningFX fx = new LightningFX( w, xOff + 0.5 + x, yOff + 0.5 + y, zOff + 0.5 + z, 0.0D, 0.0D, 0.0D );
|
||||||
|
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
|
@ -128,16 +128,16 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block id )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block id )
|
||||||
{
|
{
|
||||||
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
final ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
|
||||||
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
|
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
|
||||||
{
|
{
|
||||||
this.dropTorch( w, x, y, z );
|
this.dropTorch( w, x, y, z );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void dropTorch( World w, int x, int y, int z )
|
private void dropTorch( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
w.func_147480_a( x, y, z, true );
|
w.func_147480_a( x, y, z, true );
|
||||||
// w.destroyBlock( x, y, z, true );
|
// w.destroyBlock( x, y, z, true );
|
||||||
|
@ -145,9 +145,9 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlaceBlockAt( World w, int x, int y, int z )
|
public boolean canPlaceBlockAt( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
for( final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
||||||
{
|
{
|
||||||
if( this.canPlaceAt( w, x, y, z, dir ) )
|
if( this.canPlaceAt( w, x, y, z, dir ) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -53,14 +53,14 @@ public class BlockSecurity extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileSecurity tg = this.getTileEntity( w, x, y, z );
|
final TileSecurity tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isClient() )
|
if( Platform.isClient() )
|
||||||
|
|
|
@ -64,21 +64,21 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
return Blocks.iron_block.getIcon( direction, metadata );
|
return Blocks.iron_block.getIcon( direction, metadata );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void registerBlockIcons( IIconRegister iconRegistry )
|
public void registerBlockIcons( final IIconRegister iconRegistry )
|
||||||
{
|
{
|
||||||
// :P
|
// :P
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isValidOrientation( World w, int x, int y, int z, ForgeDirection forward, ForgeDirection up )
|
public boolean isValidOrientation( final World w, final int x, final int y, final int z, final ForgeDirection forward, final ForgeDirection up )
|
||||||
{
|
{
|
||||||
TileSkyCompass sc = this.getTileEntity( w, x, y, z );
|
final TileSkyCompass sc = this.getTileEntity( w, x, y, z );
|
||||||
if( sc != null )
|
if( sc != null )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
@ -86,23 +86,23 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
|
||||||
return this.canPlaceAt( w, x, y, z, forward.getOpposite() );
|
return this.canPlaceAt( w, x, y, z, forward.getOpposite() );
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean canPlaceAt( World w, int x, int y, int z, ForgeDirection dir )
|
private boolean canPlaceAt( final World w, final int x, final int y, final int z, final ForgeDirection dir )
|
||||||
{
|
{
|
||||||
return w.isSideSolid( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
|
return w.isSideSolid( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block id )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block id )
|
||||||
{
|
{
|
||||||
TileSkyCompass sc = this.getTileEntity( w, x, y, z );
|
final TileSkyCompass sc = this.getTileEntity( w, x, y, z );
|
||||||
ForgeDirection up = sc.getForward();
|
final ForgeDirection up = sc.getForward();
|
||||||
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
|
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
|
||||||
{
|
{
|
||||||
this.dropTorch( w, x, y, z );
|
this.dropTorch( w, x, y, z );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void dropTorch( World w, int x, int y, int z )
|
private void dropTorch( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
w.func_147480_a( x, y, z, true );
|
w.func_147480_a( x, y, z, true );
|
||||||
// w.destroyBlock( x, y, z, true );
|
// w.destroyBlock( x, y, z, true );
|
||||||
|
@ -110,9 +110,9 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlaceBlockAt( World w, int x, int y, int z )
|
public boolean canPlaceBlockAt( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
for( final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
||||||
{
|
{
|
||||||
if( this.canPlaceAt( w, x, y, z, dir ) )
|
if( this.canPlaceAt( w, x, y, z, dir ) )
|
||||||
{
|
{
|
||||||
|
@ -123,12 +123,12 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
TileSkyCompass tile = this.getTileEntity( w, x, y, z );
|
final TileSkyCompass tile = this.getTileEntity( w, x, y, z );
|
||||||
if( tile != null )
|
if( tile != null )
|
||||||
{
|
{
|
||||||
ForgeDirection forward = tile.getForward();
|
final ForgeDirection forward = tile.getForward();
|
||||||
|
|
||||||
double minX = 0;
|
double minX = 0;
|
||||||
double minY = 0;
|
double minY = 0;
|
||||||
|
@ -185,7 +185,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List out, final Entity e )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,13 +83,13 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
return new FullIcon( Blocks.tnt.getIcon( direction, metadata ) );
|
return new FullIcon( Blocks.tnt.getIcon( direction, metadata ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel )
|
if( player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel )
|
||||||
{
|
{
|
||||||
|
@ -105,23 +105,23 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void registerBlockIcons( IIconRegister iconRegistry )
|
public void registerBlockIcons( final IIconRegister iconRegistry )
|
||||||
{
|
{
|
||||||
// no images required.
|
// no images required.
|
||||||
}
|
}
|
||||||
|
|
||||||
public void startFuse( World w, int x, int y, int z, EntityLivingBase igniter )
|
public void startFuse( final World w, final int x, final int y, final int z, final EntityLivingBase igniter )
|
||||||
{
|
{
|
||||||
if( !w.isRemote )
|
if( !w.isRemote )
|
||||||
{
|
{
|
||||||
EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, igniter );
|
final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, igniter );
|
||||||
w.spawnEntityInWorld( primedTinyTNTEntity );
|
w.spawnEntityInWorld( primedTinyTNTEntity );
|
||||||
w.playSoundAtEntity( primedTinyTNTEntity, "game.tnt.primed", 1.0F, 1.0F );
|
w.playSoundAtEntity( primedTinyTNTEntity, "game.tnt.primed", 1.0F, 1.0F );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBlockAdded( World w, int x, int y, int z )
|
public void onBlockAdded( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
super.onBlockAdded( w, x, y, z );
|
super.onBlockAdded( w, x, y, z );
|
||||||
|
|
||||||
|
@ -133,7 +133,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block id )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block id )
|
||||||
{
|
{
|
||||||
if( w.isBlockIndirectlyGettingPowered( x, y, z ) )
|
if( w.isBlockIndirectlyGettingPowered( x, y, z ) )
|
||||||
{
|
{
|
||||||
|
@ -143,22 +143,22 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBlockDestroyedByExplosion( World w, int x, int y, int z, Explosion exp )
|
public void onBlockDestroyedByExplosion( final World w, final int x, final int y, final int z, final Explosion exp )
|
||||||
{
|
{
|
||||||
if( !w.isRemote )
|
if( !w.isRemote )
|
||||||
{
|
{
|
||||||
EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, exp.getExplosivePlacedBy() );
|
final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, exp.getExplosivePlacedBy() );
|
||||||
primedTinyTNTEntity.fuse = w.rand.nextInt( primedTinyTNTEntity.fuse / 4 ) + primedTinyTNTEntity.fuse / 8;
|
primedTinyTNTEntity.fuse = w.rand.nextInt( primedTinyTNTEntity.fuse / 4 ) + primedTinyTNTEntity.fuse / 8;
|
||||||
w.spawnEntityInWorld( primedTinyTNTEntity );
|
w.spawnEntityInWorld( primedTinyTNTEntity );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEntityCollidedWithBlock( World w, int x, int y, int z, Entity entity )
|
public void onEntityCollidedWithBlock( final World w, final int x, final int y, final int z, final Entity entity )
|
||||||
{
|
{
|
||||||
if( entity instanceof EntityArrow && !w.isRemote )
|
if( entity instanceof EntityArrow && !w.isRemote )
|
||||||
{
|
{
|
||||||
EntityArrow entityarrow = (EntityArrow) entity;
|
final EntityArrow entityarrow = (EntityArrow) entity;
|
||||||
|
|
||||||
if( entityarrow.isBurning() )
|
if( entityarrow.isBurning() )
|
||||||
{
|
{
|
||||||
|
@ -169,19 +169,19 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canDropFromExplosion( Explosion exp )
|
public boolean canDropFromExplosion( final Explosion exp )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
return Collections.singletonList( AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) );
|
return Collections.singletonList( AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
|
||||||
{
|
{
|
||||||
out.add( AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) );
|
out.add( AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,10 +51,10 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( IBlockAccess w, int x, int y, int z, int s )
|
public IIcon getIcon( final IBlockAccess w, final int x, final int y, final int z, final int s )
|
||||||
{
|
{
|
||||||
IIcon ico = super.getIcon( w, x, y, z, s );
|
final IIcon ico = super.getIcon( w, x, y, z, s );
|
||||||
TileVibrationChamber tvc = this.getTileEntity( w, x, y, z );
|
final TileVibrationChamber tvc = this.getTileEntity( w, x, y, z );
|
||||||
|
|
||||||
if( tvc != null && tvc.isOn && ico == this.getRendererInstance().getTexture( ForgeDirection.SOUTH ) )
|
if( tvc != null && tvc.isOn && ico == this.getRendererInstance().getTexture( ForgeDirection.SOUTH ) )
|
||||||
{
|
{
|
||||||
|
@ -65,7 +65,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( player.isSneaking() )
|
if( player.isSneaking() )
|
||||||
{
|
{
|
||||||
|
@ -74,7 +74,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
|
||||||
|
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
{
|
{
|
||||||
TileVibrationChamber tc = this.getTileEntity( w, x, y, z );
|
final TileVibrationChamber tc = this.getTileEntity( w, x, y, z );
|
||||||
if( tc != null && !player.isSneaking() )
|
if( tc != null && !player.isSneaking() )
|
||||||
{
|
{
|
||||||
Platform.openGUI( player, tc, ForgeDirection.getOrientation( side ), GuiBridge.GUI_VIBRATION_CHAMBER );
|
Platform.openGUI( player, tc, ForgeDirection.getOrientation( side ), GuiBridge.GUI_VIBRATION_CHAMBER );
|
||||||
|
@ -86,36 +86,36 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void randomDisplayTick( World w, int x, int y, int z, Random r )
|
public void randomDisplayTick( final World w, final int x, final int y, final int z, final Random r )
|
||||||
{
|
{
|
||||||
if( !AEConfig.instance.enableEffects )
|
if( !AEConfig.instance.enableEffects )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
AEBaseTile tile = this.getTileEntity( w, x, y, z );
|
final AEBaseTile tile = this.getTileEntity( w, x, y, z );
|
||||||
if( tile instanceof TileVibrationChamber )
|
if( tile instanceof TileVibrationChamber )
|
||||||
{
|
{
|
||||||
TileVibrationChamber tc = (TileVibrationChamber) tile;
|
final TileVibrationChamber tc = (TileVibrationChamber) tile;
|
||||||
if( tc.isOn )
|
if( tc.isOn )
|
||||||
{
|
{
|
||||||
float f1 = x + 0.5F;
|
float f1 = x + 0.5F;
|
||||||
float f2 = y + 0.5F;
|
float f2 = y + 0.5F;
|
||||||
float f3 = z + 0.5F;
|
float f3 = z + 0.5F;
|
||||||
|
|
||||||
ForgeDirection forward = tc.getForward();
|
final ForgeDirection forward = tc.getForward();
|
||||||
ForgeDirection up = tc.getUp();
|
final ForgeDirection up = tc.getUp();
|
||||||
|
|
||||||
int west_x = forward.offsetY * up.offsetZ - forward.offsetZ * up.offsetY;
|
final int west_x = forward.offsetY * up.offsetZ - forward.offsetZ * up.offsetY;
|
||||||
int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ;
|
final int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ;
|
||||||
int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX;
|
final int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX;
|
||||||
|
|
||||||
f1 += forward.offsetX * 0.6;
|
f1 += forward.offsetX * 0.6;
|
||||||
f2 += forward.offsetY * 0.6;
|
f2 += forward.offsetY * 0.6;
|
||||||
f3 += forward.offsetZ * 0.6;
|
f3 += forward.offsetZ * 0.6;
|
||||||
|
|
||||||
float ox = r.nextFloat();
|
final float ox = r.nextFloat();
|
||||||
float oy = r.nextFloat() * 0.2f;
|
final float oy = r.nextFloat() * 0.2f;
|
||||||
|
|
||||||
f1 += up.offsetX * ( -0.3 + oy );
|
f1 += up.offsetX * ( -0.3 + oy );
|
||||||
f2 += up.offsetY * ( -0.3 + oy );
|
f2 += up.offsetY * ( -0.3 + oy );
|
||||||
|
|
|
@ -102,19 +102,19 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void randomDisplayTick( World world, int x, int y, int z, Random r )
|
public void randomDisplayTick( final World world, final int x, final int y, final int z, final Random r )
|
||||||
{
|
{
|
||||||
this.cb( world, x, y, z ).randomDisplayTick( world, x, y, z, r );
|
this.cb( world, x, y, z ).randomDisplayTick( world, x, y, z, r );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block meh )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block meh )
|
||||||
{
|
{
|
||||||
this.cb( w, x, y, z ).onNeighborChanged();
|
this.cb( w, x, y, z ).onNeighborChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Item getItemDropped( int i, Random r, int k )
|
public Item getItemDropped( final int i, final Random r, final int k )
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -130,13 +130,13 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int colorMultiplier( IBlockAccess world, int x, int y, int z )
|
public int colorMultiplier( final IBlockAccess world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return this.myColorMultiplier;
|
return this.myColorMultiplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int isProvidingWeakPower( IBlockAccess w, int x, int y, int z, int side )
|
public int isProvidingWeakPower( final IBlockAccess w, final int x, final int y, final int z, final int side )
|
||||||
{
|
{
|
||||||
return this.cb( w, x, y, z ).isProvidingWeakPower( ForgeDirection.getOrientation( side ).getOpposite() );
|
return this.cb( w, x, y, z ).isProvidingWeakPower( ForgeDirection.getOrientation( side ).getOpposite() );
|
||||||
}
|
}
|
||||||
|
@ -148,21 +148,21 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEntityCollidedWithBlock( World w, int x, int y, int z, Entity e )
|
public void onEntityCollidedWithBlock( final World w, final int x, final int y, final int z, final Entity e )
|
||||||
{
|
{
|
||||||
this.cb( w, x, y, z ).onEntityCollision( e );
|
this.cb( w, x, y, z ).onEntityCollision( e );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int isProvidingStrongPower( IBlockAccess w, int x, int y, int z, int side )
|
public int isProvidingStrongPower( final IBlockAccess w, final int x, final int y, final int z, final int side )
|
||||||
{
|
{
|
||||||
return this.cb( w, x, y, z ).isProvidingStrongPower( ForgeDirection.getOrientation( side ).getOpposite() );
|
return this.cb( w, x, y, z ).isProvidingStrongPower( ForgeDirection.getOrientation( side ).getOpposite() );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getLightValue( IBlockAccess world, int x, int y, int z )
|
public int getLightValue( final IBlockAccess world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
Block block = world.getBlock( x, y, z );
|
final Block block = world.getBlock( x, y, z );
|
||||||
if( block != null && block != this )
|
if( block != null && block != this )
|
||||||
{
|
{
|
||||||
return block.getLightValue( world, x, y, z );
|
return block.getLightValue( world, x, y, z );
|
||||||
|
@ -175,30 +175,30 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isLadder( IBlockAccess world, int x, int y, int z, EntityLivingBase entity )
|
public boolean isLadder( final IBlockAccess world, final int x, final int y, final int z, final EntityLivingBase entity )
|
||||||
{
|
{
|
||||||
return this.cb( world, x, y, z ).isLadder( entity );
|
return this.cb( world, x, y, z ).isLadder( entity );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isSideSolid( IBlockAccess w, int x, int y, int z, ForgeDirection side )
|
public boolean isSideSolid( final IBlockAccess w, final int x, final int y, final int z, final ForgeDirection side )
|
||||||
{
|
{
|
||||||
return this.cb( w, x, y, z ).isSolidOnSide( side );
|
return this.cb( w, x, y, z ).isSolidOnSide( side );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isReplaceable( IBlockAccess world, int x, int y, int z )
|
public boolean isReplaceable( final IBlockAccess world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return this.cb( world, x, y, z ).isEmpty();
|
return this.cb( world, x, y, z ).isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings( "deprecation" )
|
@SuppressWarnings( "deprecation" )
|
||||||
@Override
|
@Override
|
||||||
public boolean removedByPlayer( World world, EntityPlayer player, int x, int y, int z )
|
public boolean removedByPlayer( final World world, final EntityPlayer player, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
if( player.capabilities.isCreativeMode )
|
if( player.capabilities.isCreativeMode )
|
||||||
{
|
{
|
||||||
AEBaseTile tile = this.getTileEntity( world, x, y, z );
|
final AEBaseTile tile = this.getTileEntity( world, x, y, z );
|
||||||
if( tile != null )
|
if( tile != null )
|
||||||
{
|
{
|
||||||
tile.disableDrops();
|
tile.disableDrops();
|
||||||
|
@ -209,7 +209,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canConnectRedstone( IBlockAccess w, int x, int y, int z, int side )
|
public boolean canConnectRedstone( final IBlockAccess w, final int x, final int y, final int z, final int side )
|
||||||
{
|
{
|
||||||
switch( side )
|
switch( side )
|
||||||
{
|
{
|
||||||
|
@ -229,7 +229,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canRenderInPass( int pass )
|
public boolean canRenderInPass( final int pass )
|
||||||
{
|
{
|
||||||
BusRenderHelper.INSTANCE.setPass( pass );
|
BusRenderHelper.INSTANCE.setPass( pass );
|
||||||
|
|
||||||
|
@ -242,10 +242,10 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player )
|
public ItemStack getPickBlock( final MovingObjectPosition target, final World world, final int x, final int y, final int z, final EntityPlayer player )
|
||||||
{
|
{
|
||||||
Vec3 v3 = target.hitVec.addVector( -x, -y, -z );
|
final Vec3 v3 = target.hitVec.addVector( -x, -y, -z );
|
||||||
SelectedPart sp = this.cb( world, x, y, z ).selectPart( v3 );
|
final SelectedPart sp = this.cb( world, x, y, z ).selectPart( v3 );
|
||||||
|
|
||||||
if( sp.part != null )
|
if( sp.part != null )
|
||||||
{
|
{
|
||||||
|
@ -261,24 +261,24 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public boolean addHitEffects( World world, MovingObjectPosition target, EffectRenderer effectRenderer )
|
public boolean addHitEffects( final World world, final MovingObjectPosition target, final EffectRenderer effectRenderer )
|
||||||
{
|
{
|
||||||
Object object = this.cb( world, target.blockX, target.blockY, target.blockZ );
|
final Object object = this.cb( world, target.blockX, target.blockY, target.blockZ );
|
||||||
if( object instanceof IPartHost )
|
if( object instanceof IPartHost )
|
||||||
{
|
{
|
||||||
IPartHost host = (IPartHost) object;
|
final IPartHost host = (IPartHost) object;
|
||||||
|
|
||||||
for( ForgeDirection side : ForgeDirection.values() )
|
for( final ForgeDirection side : ForgeDirection.values() )
|
||||||
{
|
{
|
||||||
IPart p = host.getPart( side );
|
final IPart p = host.getPart( side );
|
||||||
IIcon ico = this.getIcon( p );
|
final IIcon ico = this.getIcon( p );
|
||||||
|
|
||||||
if( ico == null )
|
if( ico == null )
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
byte b0 = (byte) ( Platform.getRandomInt() % 2 == 0 ? 1 : 0 );
|
final byte b0 = (byte) ( Platform.getRandomInt() % 2 == 0 ? 1 : 0 );
|
||||||
|
|
||||||
for( int i1 = 0; i1 < b0; ++i1 )
|
for( int i1 = 0; i1 < b0; ++i1 )
|
||||||
{
|
{
|
||||||
|
@ -286,14 +286,14 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
{
|
{
|
||||||
for( int k1 = 0; k1 < b0; ++k1 )
|
for( int k1 = 0; k1 < b0; ++k1 )
|
||||||
{
|
{
|
||||||
double d0 = target.blockX + ( i1 + 0.5D ) / b0;
|
final double d0 = target.blockX + ( i1 + 0.5D ) / b0;
|
||||||
double d1 = target.blockY + ( j1 + 0.5D ) / b0;
|
final double d1 = target.blockY + ( j1 + 0.5D ) / b0;
|
||||||
double d2 = target.blockZ + ( k1 + 0.5D ) / b0;
|
final double d2 = target.blockZ + ( k1 + 0.5D ) / b0;
|
||||||
|
|
||||||
double dd0 = target.hitVec.xCoord;
|
final double dd0 = target.hitVec.xCoord;
|
||||||
double dd1 = target.hitVec.yCoord;
|
final double dd1 = target.hitVec.yCoord;
|
||||||
double dd2 = target.hitVec.zCoord;
|
final double dd2 = target.hitVec.zCoord;
|
||||||
EntityDiggingFX fx = ( new EntityDiggingFX( world, dd0, dd1, dd2, d0 - target.blockX - 0.5D, d1 - target.blockY - 0.5D, d2 - target.blockZ - 0.5D, this, 0 ) ).applyColourMultiplier( target.blockX, target.blockY, target.blockZ );
|
final EntityDiggingFX fx = ( new EntityDiggingFX( world, dd0, dd1, dd2, d0 - target.blockX - 0.5D, d1 - target.blockY - 0.5D, d2 - target.blockZ - 0.5D, this, 0 ) ).applyColourMultiplier( target.blockX, target.blockY, target.blockZ );
|
||||||
|
|
||||||
fx.setParticleIcon( ico );
|
fx.setParticleIcon( ico );
|
||||||
|
|
||||||
|
@ -309,24 +309,24 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public boolean addDestroyEffects( World world, int x, int y, int z, int meta, EffectRenderer effectRenderer )
|
public boolean addDestroyEffects( final World world, final int x, final int y, final int z, final int meta, final EffectRenderer effectRenderer )
|
||||||
{
|
{
|
||||||
Object object = this.cb( world, x, y, z );
|
final Object object = this.cb( world, x, y, z );
|
||||||
if( object instanceof IPartHost )
|
if( object instanceof IPartHost )
|
||||||
{
|
{
|
||||||
IPartHost host = (IPartHost) object;
|
final IPartHost host = (IPartHost) object;
|
||||||
|
|
||||||
for( ForgeDirection side : ForgeDirection.values() )
|
for( final ForgeDirection side : ForgeDirection.values() )
|
||||||
{
|
{
|
||||||
IPart p = host.getPart( side );
|
final IPart p = host.getPart( side );
|
||||||
IIcon ico = this.getIcon( p );
|
final IIcon ico = this.getIcon( p );
|
||||||
|
|
||||||
if( ico == null )
|
if( ico == null )
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
byte b0 = 3;
|
final byte b0 = 3;
|
||||||
|
|
||||||
for( int i1 = 0; i1 < b0; ++i1 )
|
for( int i1 = 0; i1 < b0; ++i1 )
|
||||||
{
|
{
|
||||||
|
@ -334,10 +334,10 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
{
|
{
|
||||||
for( int k1 = 0; k1 < b0; ++k1 )
|
for( int k1 = 0; k1 < b0; ++k1 )
|
||||||
{
|
{
|
||||||
double d0 = x + ( i1 + 0.5D ) / b0;
|
final double d0 = x + ( i1 + 0.5D ) / b0;
|
||||||
double d1 = y + ( j1 + 0.5D ) / b0;
|
final double d1 = y + ( j1 + 0.5D ) / b0;
|
||||||
double d2 = z + ( k1 + 0.5D ) / b0;
|
final double d2 = z + ( k1 + 0.5D ) / b0;
|
||||||
EntityDiggingFX fx = ( new EntityDiggingFX( world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, meta ) ).applyColourMultiplier( x, y, z );
|
final EntityDiggingFX fx = ( new EntityDiggingFX( world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, meta ) ).applyColourMultiplier( x, y, z );
|
||||||
|
|
||||||
fx.setParticleIcon( ico );
|
fx.setParticleIcon( ico );
|
||||||
|
|
||||||
|
@ -352,7 +352,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborChange( IBlockAccess w, int x, int y, int z, int tileX, int tileY, int tileZ )
|
public void onNeighborChange( final IBlockAccess w, final int x, final int y, final int z, final int tileX, final int tileY, final int tileZ )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
{
|
{
|
||||||
|
@ -360,7 +360,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private IIcon getIcon( IPart p )
|
private IIcon getIcon( final IPart p )
|
||||||
{
|
{
|
||||||
if( p == null )
|
if( p == null )
|
||||||
{
|
{
|
||||||
|
@ -369,18 +369,18 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IIcon ico = p.getBreakingTexture();
|
final IIcon ico = p.getBreakingTexture();
|
||||||
if( ico != null )
|
if( ico != null )
|
||||||
{
|
{
|
||||||
return ico;
|
return ico;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch( Throwable t )
|
catch( final Throwable t )
|
||||||
{
|
{
|
||||||
// nothing.
|
// nothing.
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemStack is = p.getItemStack( PartItemStack.Network );
|
final ItemStack is = p.getItemStack( PartItemStack.Network );
|
||||||
if( is == null || is.getItem() == null )
|
if( is == null || is.getItem() == null )
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
|
@ -389,9 +389,9 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
return is.getItem().getIcon( is, 0 );
|
return is.getItem().getIcon( is, 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
private ICableBusContainer cb( IBlockAccess w, int x, int y, int z )
|
private ICableBusContainer cb( final IBlockAccess w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
TileEntity te = w.getTileEntity( x, y, z );
|
final TileEntity te = w.getTileEntity( x, y, z );
|
||||||
ICableBusContainer out = null;
|
ICableBusContainer out = null;
|
||||||
|
|
||||||
if( te instanceof TileCableBus )
|
if( te instanceof TileCableBus )
|
||||||
|
@ -413,15 +413,15 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( IBlockAccess w, int x, int y, int z, int s )
|
public IIcon getIcon( final IBlockAccess w, final int x, final int y, final int z, final int s )
|
||||||
{
|
{
|
||||||
return this.getIcon( s, 0 );
|
return this.getIcon( s, 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
IIcon i = super.getIcon( direction, metadata );
|
final IIcon i = super.getIcon( direction, metadata );
|
||||||
if( i != null )
|
if( i != null )
|
||||||
{
|
{
|
||||||
return i;
|
return i;
|
||||||
|
@ -431,30 +431,30 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
return this.cb( w, x, y, z ).activate( player, Vec3.createVectorHelper( hitX, hitY, hitZ ) );
|
return this.cb( w, x, y, z ).activate( player, Vec3.createVectorHelper( hitX, hitY, hitZ ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void registerBlockIcons( IIconRegister iconRegistry )
|
public void registerBlockIcons( final IIconRegister iconRegistry )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean recolourBlock( World world, int x, int y, int z, ForgeDirection side, int colour )
|
public boolean recolourBlock( final World world, final int x, final int y, final int z, final ForgeDirection side, final int colour )
|
||||||
{
|
{
|
||||||
return this.recolourBlock( world, x, y, z, side, colour, null );
|
return this.recolourBlock( world, x, y, z, side, colour, null );
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean recolourBlock( World world, int x, int y, int z, ForgeDirection side, int colour, EntityPlayer who )
|
public boolean recolourBlock( final World world, final int x, final int y, final int z, final ForgeDirection side, final int colour, final EntityPlayer who )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return this.cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
|
return this.cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
|
||||||
}
|
}
|
||||||
catch( Throwable ignored )
|
catch( final Throwable ignored )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -462,15 +462,15 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T extends AEBaseTile> T getTileEntity( IBlockAccess w, int x, int y, int z )
|
public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
TileEntity te = w.getTileEntity( x, y, z );
|
final TileEntity te = w.getTileEntity( x, y, z );
|
||||||
|
|
||||||
if( noTesrTile.isInstance( te ) )
|
if( noTesrTile.isInstance( te ) )
|
||||||
{
|
{
|
||||||
|
@ -486,7 +486,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void setFeature( EnumSet<AEFeature> f )
|
protected void setFeature( final EnumSet<AEFeature> f )
|
||||||
{
|
{
|
||||||
final AECableBusFeatureHandler featureHandler = new AECableBusFeatureHandler( f, this, this.featureSubName );
|
final AECableBusFeatureHandler featureHandler = new AECableBusFeatureHandler( f, this, this.featureSubName );
|
||||||
this.setHandler( featureHandler );
|
this.setHandler( featureHandler );
|
||||||
|
@ -507,12 +507,12 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Method( iname = IntegrationType.MFR )
|
@Method( iname = IntegrationType.MFR )
|
||||||
public RedNetConnectionType getConnectionType( World world, int x, int y, int z, ForgeDirection side )
|
public RedNetConnectionType getConnectionType( final World world, final int x, final int y, final int z, final ForgeDirection side )
|
||||||
{
|
{
|
||||||
return this.cb( world, x, y, z ).canConnectRedstone( EnumSet.allOf( ForgeDirection.class ) ) ? RedNetConnectionType.CableSingle : RedNetConnectionType.None;
|
return this.cb( world, x, y, z ).canConnectRedstone( EnumSet.allOf( ForgeDirection.class ) ) ? RedNetConnectionType.CableSingle : RedNetConnectionType.None;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRenderColor( int color )
|
public void setRenderColor( final int color )
|
||||||
{
|
{
|
||||||
this.myColorMultiplier = color;
|
this.myColorMultiplier = color;
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,9 +44,9 @@ public class BlockController extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block neighborBlock )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block neighborBlock )
|
||||||
{
|
{
|
||||||
TileController tc = this.getTileEntity( w, x, y, z );
|
final TileController tc = this.getTileEntity( w, x, y, z );
|
||||||
if( tc != null )
|
if( tc != null )
|
||||||
{
|
{
|
||||||
tc.onNeighborChange( false );
|
tc.onNeighborChange( false );
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
switch( metadata )
|
switch( metadata )
|
||||||
{
|
{
|
||||||
|
|
|
@ -61,7 +61,7 @@ public class BlockEnergyCell extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
switch( metadata )
|
switch( metadata )
|
||||||
{
|
{
|
||||||
|
@ -87,12 +87,12 @@ public class BlockEnergyCell extends AEBaseTileBlock
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
super.getCheckedSubBlocks( item, tabs, itemStacks );
|
super.getCheckedSubBlocks( item, tabs, itemStacks );
|
||||||
|
|
||||||
ItemStack charged = new ItemStack( this, 1 );
|
final ItemStack charged = new ItemStack( this, 1 );
|
||||||
NBTTagCompound tag = Platform.openNbtData( charged );
|
final NBTTagCompound tag = Platform.openNbtData( charged );
|
||||||
tag.setDouble( "internalCurrentPower", this.getMaxPower() );
|
tag.setDouble( "internalCurrentPower", this.getMaxPower() );
|
||||||
tag.setDouble( "internalMaxPower", this.getMaxPower() );
|
tag.setDouble( "internalMaxPower", this.getMaxPower() );
|
||||||
|
|
||||||
|
|
|
@ -60,14 +60,14 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileWireless tg = this.getTileEntity( w, x, y, z );
|
final TileWireless tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
@ -80,12 +80,12 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
TileWireless tile = this.getTileEntity( w, x, y, z );
|
final TileWireless tile = this.getTileEntity( w, x, y, z );
|
||||||
if( tile != null )
|
if( tile != null )
|
||||||
{
|
{
|
||||||
ForgeDirection forward = tile.getForward();
|
final ForgeDirection forward = tile.getForward();
|
||||||
|
|
||||||
double minX = 0;
|
double minX = 0;
|
||||||
double minY = 0;
|
double minY = 0;
|
||||||
|
@ -142,12 +142,12 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
|
||||||
{
|
{
|
||||||
TileWireless tile = this.getTileEntity( w, x, y, z );
|
final TileWireless tile = this.getTileEntity( w, x, y, z );
|
||||||
if( tile != null )
|
if( tile != null )
|
||||||
{
|
{
|
||||||
ForgeDirection forward = tile.getForward();
|
final ForgeDirection forward = tile.getForward();
|
||||||
|
|
||||||
double minX = 0;
|
double minX = 0;
|
||||||
double minY = 0;
|
double minY = 0;
|
||||||
|
|
|
@ -35,11 +35,11 @@ import appeng.tile.qnb.TileQuantumBridge;
|
||||||
public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICustomCollision
|
public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICustomCollision
|
||||||
{
|
{
|
||||||
|
|
||||||
public BlockQuantumBase( Material mat )
|
public BlockQuantumBase( final Material mat )
|
||||||
{
|
{
|
||||||
super( mat );
|
super( mat );
|
||||||
this.setTileEntity( TileQuantumBridge.class );
|
this.setTileEntity( TileQuantumBridge.class );
|
||||||
float shave = 2.0f / 16.0f;
|
final float shave = 2.0f / 16.0f;
|
||||||
this.setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave );
|
this.setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave );
|
||||||
this.setLightOpacity( 0 );
|
this.setLightOpacity( 0 );
|
||||||
this.isFullSize = this.isOpaque = false;
|
this.isFullSize = this.isOpaque = false;
|
||||||
|
@ -47,9 +47,9 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block pointlessNumber )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block pointlessNumber )
|
||||||
{
|
{
|
||||||
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
|
final TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
|
||||||
if( bridge != null )
|
if( bridge != null )
|
||||||
{
|
{
|
||||||
bridge.neighborUpdate();
|
bridge.neighborUpdate();
|
||||||
|
@ -57,9 +57,9 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void breakBlock( World w, int x, int y, int z, Block a, int b )
|
public void breakBlock( final World w, final int x, final int y, final int z, final Block a, final int b )
|
||||||
{
|
{
|
||||||
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
|
final TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
|
||||||
if( bridge != null )
|
if( bridge != null )
|
||||||
{
|
{
|
||||||
bridge.breakCluster();
|
bridge.breakCluster();
|
||||||
|
|
|
@ -50,9 +50,9 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void randomDisplayTick( World w, int bx, int by, int bz, Random r )
|
public void randomDisplayTick( final World w, final int bx, final int by, final int bz, final Random r )
|
||||||
{
|
{
|
||||||
TileQuantumBridge bridge = this.getTileEntity( w, bx, by, bz );
|
final TileQuantumBridge bridge = this.getTileEntity( w, bx, by, bz );
|
||||||
if( bridge != null )
|
if( bridge != null )
|
||||||
{
|
{
|
||||||
if( bridge.hasQES() )
|
if( bridge.hasQES() )
|
||||||
|
@ -66,14 +66,14 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileQuantumBridge tg = this.getTileEntity( w, x, y, z );
|
final TileQuantumBridge tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
@ -86,16 +86,16 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
double onePixel = 2.0 / 16.0;
|
final double onePixel = 2.0 / 16.0;
|
||||||
return Collections.singletonList( AxisAlignedBB.getBoundingBox( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) );
|
return Collections.singletonList( AxisAlignedBB.getBoundingBox( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
|
||||||
{
|
{
|
||||||
double onePixel = 2.0 / 16.0;
|
final double onePixel = 2.0 / 16.0;
|
||||||
out.add( AxisAlignedBB.getBoundingBox( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) );
|
out.add( AxisAlignedBB.getBoundingBox( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,10 +39,10 @@ public class BlockQuantumRing extends BlockQuantumBase
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
double onePixel = 2.0 / 16.0;
|
double onePixel = 2.0 / 16.0;
|
||||||
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
|
final TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
|
||||||
if( bridge != null && bridge.isCorner() )
|
if( bridge != null && bridge.isCorner() )
|
||||||
{
|
{
|
||||||
onePixel = 4.0 / 16.0;
|
onePixel = 4.0 / 16.0;
|
||||||
|
@ -55,10 +55,10 @@ public class BlockQuantumRing extends BlockQuantumBase
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
|
||||||
{
|
{
|
||||||
double onePixel = 2.0 / 16.0;
|
double onePixel = 2.0 / 16.0;
|
||||||
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
|
final TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
|
||||||
if( bridge != null && bridge.isCorner() )
|
if( bridge != null && bridge.isCorner() )
|
||||||
{
|
{
|
||||||
onePixel = 4.0 / 16.0;
|
onePixel = 4.0 / 16.0;
|
||||||
|
|
|
@ -52,9 +52,9 @@ public class BlockQuartzGlass extends AEBaseBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean shouldSideBeRendered( IBlockAccess w, int x, int y, int z, int side )
|
public boolean shouldSideBeRendered( final IBlockAccess w, final int x, final int y, final int z, final int side )
|
||||||
{
|
{
|
||||||
Material mat = w.getBlock( x, y, z ).getMaterial();
|
final Material mat = w.getBlock( x, y, z ).getMaterial();
|
||||||
if( mat == Material.glass || mat == AEGlassMaterial.INSTANCE )
|
if( mat == Material.glass || mat == AEGlassMaterial.INSTANCE )
|
||||||
{
|
{
|
||||||
if( w.getBlock( x, y, z ).getRenderType() == this.getRenderType() )
|
if( w.getBlock( x, y, z ).getRenderType() == this.getRenderType() )
|
||||||
|
|
|
@ -46,7 +46,7 @@ public class BlockQuartzLamp extends BlockQuartzGlass
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void randomDisplayTick( World w, int x, int y, int z, Random r )
|
public void randomDisplayTick( final World w, final int x, final int y, final int z, final Random r )
|
||||||
{
|
{
|
||||||
if( !AEConfig.instance.enableEffects )
|
if( !AEConfig.instance.enableEffects )
|
||||||
{
|
{
|
||||||
|
@ -55,11 +55,11 @@ public class BlockQuartzLamp extends BlockQuartzGlass
|
||||||
|
|
||||||
if( CommonHelper.proxy.shouldAddParticles( r ) )
|
if( CommonHelper.proxy.shouldAddParticles( r ) )
|
||||||
{
|
{
|
||||||
double d0 = ( r.nextFloat() - 0.5F ) * 0.96D;
|
final double d0 = ( r.nextFloat() - 0.5F ) * 0.96D;
|
||||||
double d1 = ( r.nextFloat() - 0.5F ) * 0.96D;
|
final double d1 = ( r.nextFloat() - 0.5F ) * 0.96D;
|
||||||
double d2 = ( r.nextFloat() - 0.5F ) * 0.96D;
|
final double d2 = ( r.nextFloat() - 0.5F ) * 0.96D;
|
||||||
|
|
||||||
VibrantFX fx = new VibrantFX( w, 0.5 + x + d0, 0.5 + y + d1, 0.5 + z + d2, 0.0D, 0.0D, 0.0D );
|
final VibrantFX fx = new VibrantFX( w, 0.5 + x + d0, 0.5 + y + d1, 0.5 + z + d2, 0.0D, 0.0D, 0.0D );
|
||||||
|
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,11 +78,11 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void breakFaster( PlayerEvent.BreakSpeed event )
|
public void breakFaster( final PlayerEvent.BreakSpeed event )
|
||||||
{
|
{
|
||||||
if( event.block == this && event.entityPlayer != null )
|
if( event.block == this && event.entityPlayer != null )
|
||||||
{
|
{
|
||||||
ItemStack is = event.entityPlayer.inventory.getCurrentItem();
|
final ItemStack is = event.entityPlayer.inventory.getCurrentItem();
|
||||||
int level = -1;
|
int level = -1;
|
||||||
|
|
||||||
if( is != null && is.getItem() != null )
|
if( is != null && is.getItem() != null )
|
||||||
|
@ -98,13 +98,13 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int damageDropped( int meta )
|
public int damageDropped( final int meta )
|
||||||
{
|
{
|
||||||
return meta;
|
return meta;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player )
|
public ItemStack getPickBlock( final MovingObjectPosition target, final World world, final int x, final int y, final int z, final EntityPlayer player )
|
||||||
{
|
{
|
||||||
final ItemStack is = super.getPickBlock( target, world, x, y, z, player );
|
final ItemStack is = super.getPickBlock( target, world, x, y, z, player );
|
||||||
is.setItemDamage( world.getBlockMetadata( x, y, z ) );
|
is.setItemDamage( world.getBlockMetadata( x, y, z ) );
|
||||||
|
@ -113,7 +113,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBlockAdded( World w, int x, int y, int z )
|
public void onBlockAdded( final World w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
super.onBlockAdded( w, x, y, z );
|
super.onBlockAdded( w, x, y, z );
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
@ -140,7 +140,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getUnlocalizedName( ItemStack is )
|
public String getUnlocalizedName( final ItemStack is )
|
||||||
{
|
{
|
||||||
if( is.getItemDamage() == 1 )
|
if( is.getItemDamage() == 1 )
|
||||||
{
|
{
|
||||||
|
@ -162,7 +162,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void registerBlockIcons( IIconRegister ir )
|
public void registerBlockIcons( final IIconRegister ir )
|
||||||
{
|
{
|
||||||
super.registerBlockIcons( ir );
|
super.registerBlockIcons( ir );
|
||||||
this.block = ir.registerIcon( this.getTextureName() + ".Block" );
|
this.block = ir.registerIcon( this.getTextureName() + ".Block" );
|
||||||
|
@ -172,7 +172,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
if( metadata == 1 )
|
if( metadata == 1 )
|
||||||
{
|
{
|
||||||
|
@ -190,14 +190,14 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setRenderStateByMeta( int metadata )
|
public void setRenderStateByMeta( final int metadata )
|
||||||
{
|
{
|
||||||
this.getRendererInstance().setTemporaryRenderIcon( this.getIcon( 0, metadata ) );
|
this.getRendererInstance().setTemporaryRenderIcon( this.getIcon( 0, metadata ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
super.getCheckedSubBlocks( item, tabs, itemStacks );
|
super.getCheckedSubBlocks( item, tabs, itemStacks );
|
||||||
|
|
||||||
|
@ -207,7 +207,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void breakBlock( World w, int x, int y, int z, Block b, int metadata )
|
public void breakBlock( final World w, final int x, final int y, final int z, final Block b, final int metadata )
|
||||||
{
|
{
|
||||||
super.breakBlock( w, x, y, z, b, metadata );
|
super.breakBlock( w, x, y, z, b, metadata );
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
|
|
@ -63,7 +63,7 @@ public class OreQuartz extends AEBaseBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMixedBrightnessForBlock( IBlockAccess par1iBlockAccess, int par2, int par3, int par4 )
|
public int getMixedBrightnessForBlock( final IBlockAccess par1iBlockAccess, final int par2, final int par3, final int par4 )
|
||||||
{
|
{
|
||||||
int j1 = super.getMixedBrightnessForBlock( par1iBlockAccess, par2, par3, par4 );
|
int j1 = super.getMixedBrightnessForBlock( par1iBlockAccess, par2, par3, par4 );
|
||||||
if( this.enhanceBrightness )
|
if( this.enhanceBrightness )
|
||||||
|
@ -89,16 +89,16 @@ public class OreQuartz extends AEBaseBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int quantityDropped( Random rand )
|
public int quantityDropped( final Random rand )
|
||||||
{
|
{
|
||||||
return 1 + rand.nextInt( 2 );
|
return 1 + rand.nextInt( 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public Item getItemDropped( int id, Random rand, int meta )
|
public Item getItemDropped( final int id, final Random rand, final int meta )
|
||||||
{
|
{
|
||||||
for( Item crystalItem : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeItem().asSet() )
|
for( final Item crystalItem : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeItem().asSet() )
|
||||||
{
|
{
|
||||||
return crystalItem;
|
return crystalItem;
|
||||||
}
|
}
|
||||||
|
@ -107,22 +107,22 @@ public class OreQuartz extends AEBaseBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void dropBlockAsItemWithChance( World w, int x, int y, int z, int blockID, float something, int meta )
|
public void dropBlockAsItemWithChance( final World w, final int x, final int y, final int z, final int blockID, final float something, final int meta )
|
||||||
{
|
{
|
||||||
super.dropBlockAsItemWithChance( w, x, y, z, blockID, something, meta );
|
super.dropBlockAsItemWithChance( w, x, y, z, blockID, something, meta );
|
||||||
|
|
||||||
if( this.getItemDropped( blockID, w.rand, meta ) != Item.getItemFromBlock( this ) )
|
if( this.getItemDropped( blockID, w.rand, meta ) != Item.getItemFromBlock( this ) )
|
||||||
{
|
{
|
||||||
int xp = MathHelper.getRandomIntegerInRange( w.rand, 2, 5 );
|
final int xp = MathHelper.getRandomIntegerInRange( w.rand, 2, 5 );
|
||||||
|
|
||||||
this.dropXpOnBlockBreak( w, x, y, z, xp );
|
this.dropXpOnBlockBreak( w, x, y, z, xp );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int damageDropped( int id )
|
public int damageDropped( final int id )
|
||||||
{
|
{
|
||||||
for( ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeStack( 1 ).asSet() )
|
for( final ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeStack( 1 ).asSet() )
|
||||||
{
|
{
|
||||||
return crystalStack.getItemDamage();
|
return crystalStack.getItemDamage();
|
||||||
}
|
}
|
||||||
|
@ -131,7 +131,7 @@ public class OreQuartz extends AEBaseBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int quantityDroppedWithBonus( int fortune, Random rand )
|
public int quantityDroppedWithBonus( final int fortune, final Random rand )
|
||||||
{
|
{
|
||||||
if( fortune > 0 && Item.getItemFromBlock( this ) != this.getItemDropped( 0, rand, fortune ) )
|
if( fortune > 0 && Item.getItemFromBlock( this ) != this.getItemDropped( 0, rand, fortune ) )
|
||||||
{
|
{
|
||||||
|
@ -150,17 +150,17 @@ public class OreQuartz extends AEBaseBlock
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBoostBrightnessLow( int boostBrightnessLow )
|
public void setBoostBrightnessLow( final int boostBrightnessLow )
|
||||||
{
|
{
|
||||||
this.boostBrightnessLow = boostBrightnessLow;
|
this.boostBrightnessLow = boostBrightnessLow;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBoostBrightnessHigh( int boostBrightnessHigh )
|
public void setBoostBrightnessHigh( final int boostBrightnessHigh )
|
||||||
{
|
{
|
||||||
this.boostBrightnessHigh = boostBrightnessHigh;
|
this.boostBrightnessHigh = boostBrightnessHigh;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setEnhanceBrightness( boolean enhanceBrightness )
|
public void setEnhanceBrightness( final boolean enhanceBrightness )
|
||||||
{
|
{
|
||||||
this.enhanceBrightness = enhanceBrightness;
|
this.enhanceBrightness = enhanceBrightness;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,9 +49,9 @@ public class OreQuartzCharged extends OreQuartz
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public Item getItemDropped( int id, Random rand, int meta )
|
public Item getItemDropped( final int id, final Random rand, final int meta )
|
||||||
{
|
{
|
||||||
for( Item charged : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeItem().asSet() )
|
for( final Item charged : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeItem().asSet() )
|
||||||
{
|
{
|
||||||
return charged;
|
return charged;
|
||||||
}
|
}
|
||||||
|
@ -60,9 +60,9 @@ public class OreQuartzCharged extends OreQuartz
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int damageDropped( int id )
|
public int damageDropped( final int id )
|
||||||
{
|
{
|
||||||
for( ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() )
|
for( final ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() )
|
||||||
{
|
{
|
||||||
return crystalStack.getItemDamage();
|
return crystalStack.getItemDamage();
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ public class OreQuartzCharged extends OreQuartz
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void randomDisplayTick( World w, int x, int y, int z, Random r )
|
public void randomDisplayTick( final World w, final int x, final int y, final int z, final Random r )
|
||||||
{
|
{
|
||||||
if( !AEConfig.instance.enableEffects )
|
if( !AEConfig.instance.enableEffects )
|
||||||
{
|
{
|
||||||
|
@ -110,7 +110,7 @@ public class OreQuartzCharged extends OreQuartz
|
||||||
|
|
||||||
if( CommonHelper.proxy.shouldAddParticles( r ) )
|
if( CommonHelper.proxy.shouldAddParticles( r ) )
|
||||||
{
|
{
|
||||||
ChargedOreFX fx = new ChargedOreFX( w, x + xOff, y + yOff, z + zOff, 0.0f, 0.0f, 0.0f );
|
final ChargedOreFX fx = new ChargedOreFX( w, x + xOff, y + yOff, z + zOff, 0.0f, 0.0f, 0.0f );
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,45 +64,45 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void registerBlockIcons( IIconRegister iconRegistry )
|
public void registerBlockIcons( final IIconRegister iconRegistry )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
return Arrays.asList( new AxisAlignedBB[] {} );// AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 )
|
return Arrays.asList( new AxisAlignedBB[] {} );// AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 )
|
||||||
// } );
|
// } );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
|
||||||
{
|
{
|
||||||
out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
|
out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlaceBlockAt( World world, int x, int y, int z )
|
public boolean canPlaceBlockAt( final World world, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBlockExploded( World world, int x, int y, int z, Explosion explosion )
|
public void onBlockExploded( final World world, final int x, final int y, final int z, final Explosion explosion )
|
||||||
{
|
{
|
||||||
// Don't explode.
|
// Don't explode.
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canEntityDestroy( IBlockAccess world, int x, int y, int z, Entity entity )
|
public boolean canEntityDestroy( final IBlockAccess world, final int x, final int y, final int z, final Entity entity )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,9 +45,9 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final void onNeighborBlockChange( World w, int x, int y, int z, Block junk )
|
public final void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block junk )
|
||||||
{
|
{
|
||||||
TileSpatialIOPort te = this.getTileEntity( w, x, y, z );
|
final TileSpatialIOPort te = this.getTileEntity( w, x, y, z );
|
||||||
if( te != null )
|
if( te != null )
|
||||||
{
|
{
|
||||||
te.updateRedstoneState();
|
te.updateRedstoneState();
|
||||||
|
@ -55,14 +55,14 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileSpatialIOPort tg = this.getTileEntity( w, x, y, z );
|
final TileSpatialIOPort tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
|
|
@ -44,9 +44,9 @@ public class BlockSpatialPylon extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNeighborBlockChange( World w, int x, int y, int z, Block junk )
|
public void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block junk )
|
||||||
{
|
{
|
||||||
TileSpatialPylon tsp = this.getTileEntity( w, x, y, z );
|
final TileSpatialPylon tsp = this.getTileEntity( w, x, y, z );
|
||||||
if( tsp != null )
|
if( tsp != null )
|
||||||
{
|
{
|
||||||
tsp.onNeighborBlockChange();
|
tsp.onNeighborBlockChange();
|
||||||
|
@ -54,9 +54,9 @@ public class BlockSpatialPylon extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getLightValue( IBlockAccess w, int x, int y, int z )
|
public int getLightValue( final IBlockAccess w, final int x, final int y, final int z )
|
||||||
{
|
{
|
||||||
TileSpatialPylon tsp = this.getTileEntity( w, x, y, z );
|
final TileSpatialPylon tsp = this.getTileEntity( w, x, y, z );
|
||||||
if( tsp != null )
|
if( tsp != null )
|
||||||
{
|
{
|
||||||
return tsp.getLightValue();
|
return tsp.getLightValue();
|
||||||
|
|
|
@ -29,7 +29,7 @@ import appeng.core.features.AEFeature;
|
||||||
|
|
||||||
public class ChiseledQuartzStairBlock extends AEBaseStairBlock
|
public class ChiseledQuartzStairBlock extends AEBaseStairBlock
|
||||||
{
|
{
|
||||||
public ChiseledQuartzStairBlock( Block block )
|
public ChiseledQuartzStairBlock( final Block block )
|
||||||
{
|
{
|
||||||
super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ import appeng.core.features.AEFeature;
|
||||||
|
|
||||||
public class FluixStairBlock extends AEBaseStairBlock
|
public class FluixStairBlock extends AEBaseStairBlock
|
||||||
{
|
{
|
||||||
public FluixStairBlock( Block block )
|
public FluixStairBlock( final Block block )
|
||||||
{
|
{
|
||||||
super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ import appeng.core.features.AEFeature;
|
||||||
|
|
||||||
public class QuartzPillarStairBlock extends AEBaseStairBlock
|
public class QuartzPillarStairBlock extends AEBaseStairBlock
|
||||||
{
|
{
|
||||||
public QuartzPillarStairBlock( Block block )
|
public QuartzPillarStairBlock( final Block block )
|
||||||
{
|
{
|
||||||
super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ import appeng.core.features.AEFeature;
|
||||||
|
|
||||||
public class QuartzStairBlock extends AEBaseStairBlock
|
public class QuartzStairBlock extends AEBaseStairBlock
|
||||||
{
|
{
|
||||||
public QuartzStairBlock( Block block )
|
public QuartzStairBlock( final Block block )
|
||||||
{
|
{
|
||||||
super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
super( block, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ import appeng.core.features.AEFeature;
|
||||||
|
|
||||||
public class SkyStoneBlockStairBlock extends AEBaseStairBlock
|
public class SkyStoneBlockStairBlock extends AEBaseStairBlock
|
||||||
{
|
{
|
||||||
public SkyStoneBlockStairBlock( Block block, Integer meta )
|
public SkyStoneBlockStairBlock( final Block block, final Integer meta )
|
||||||
{
|
{
|
||||||
super( block, meta, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
super( block, meta, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ import appeng.core.features.AEFeature;
|
||||||
|
|
||||||
public class SkyStoneBrickStairBlock extends AEBaseStairBlock
|
public class SkyStoneBrickStairBlock extends AEBaseStairBlock
|
||||||
{
|
{
|
||||||
public SkyStoneBrickStairBlock( Block block, Integer meta )
|
public SkyStoneBrickStairBlock( final Block block, final Integer meta )
|
||||||
{
|
{
|
||||||
super( block, meta, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
super( block, meta, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ import appeng.core.features.AEFeature;
|
||||||
|
|
||||||
public class SkyStoneSmallBrickStairBlock extends AEBaseStairBlock
|
public class SkyStoneSmallBrickStairBlock extends AEBaseStairBlock
|
||||||
{
|
{
|
||||||
public SkyStoneSmallBrickStairBlock( Block block, int meta )
|
public SkyStoneSmallBrickStairBlock( final Block block, final int meta )
|
||||||
{
|
{
|
||||||
super( block, meta, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
super( block, meta, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ import appeng.core.features.AEFeature;
|
||||||
|
|
||||||
public class SkyStoneStairBlock extends AEBaseStairBlock
|
public class SkyStoneStairBlock extends AEBaseStairBlock
|
||||||
{
|
{
|
||||||
public SkyStoneStairBlock( Block block, Integer meta )
|
public SkyStoneStairBlock( final Block block, final Integer meta )
|
||||||
{
|
{
|
||||||
super( block, meta, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
super( block, meta, EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,9 +56,9 @@ public class BlockChest extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
TileChest tg = this.getTileEntity( w, x, y, z );
|
final TileChest tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null && !p.isSneaking() )
|
if( tg != null && !p.isSneaking() )
|
||||||
{
|
{
|
||||||
if( Platform.isClient() )
|
if( Platform.isClient() )
|
||||||
|
@ -72,10 +72,10 @@ public class BlockChest extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ItemStack cell = tg.getStackInSlot( 1 );
|
final ItemStack cell = tg.getStackInSlot( 1 );
|
||||||
if( cell != null )
|
if( cell != null )
|
||||||
{
|
{
|
||||||
ICellHandler ch = AEApi.instance().registries().cell().getHandler( cell );
|
final ICellHandler ch = AEApi.instance().registries().cell().getHandler( cell );
|
||||||
|
|
||||||
tg.openGui( p, ch, cell, side );
|
tg.openGui( p, ch, cell, side );
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,14 +52,14 @@ public class BlockDrive extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileDrive tg = this.getTileEntity( w, x, y, z );
|
final TileDrive tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
|
|
@ -45,9 +45,9 @@ public class BlockIOPort extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final void onNeighborBlockChange( World w, int x, int y, int z, Block junk )
|
public final void onNeighborBlockChange( final World w, final int x, final int y, final int z, final Block junk )
|
||||||
{
|
{
|
||||||
TileIOPort te = this.getTileEntity( w, x, y, z );
|
final TileIOPort te = this.getTileEntity( w, x, y, z );
|
||||||
if( te != null )
|
if( te != null )
|
||||||
{
|
{
|
||||||
te.updateRedstoneState();
|
te.updateRedstoneState();
|
||||||
|
@ -55,14 +55,14 @@ public class BlockIOPort extends AEBaseTileBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer p, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( p.isSneaking() )
|
if( p.isSneaking() )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TileIOPort tg = this.getTileEntity( w, x, y, z );
|
final TileIOPort tg = this.getTileEntity( w, x, y, z );
|
||||||
if( tg != null )
|
if( tg != null )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
|
|
|
@ -68,13 +68,13 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int damageDropped( int metadata )
|
public int damageDropped( final int metadata )
|
||||||
{
|
{
|
||||||
return metadata;
|
return metadata;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player )
|
public ItemStack getPickBlock( final MovingObjectPosition target, final World world, final int x, final int y, final int z, final EntityPlayer player )
|
||||||
{
|
{
|
||||||
final ItemStack is = super.getPickBlock( target, world, x, y, z, player );
|
final ItemStack is = super.getPickBlock( target, world, x, y, z, player );
|
||||||
is.setItemDamage( world.getBlockMetadata( x, y, z ) );
|
is.setItemDamage( world.getBlockMetadata( x, y, z ) );
|
||||||
|
@ -90,9 +90,9 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public IIcon getIcon( int direction, int metadata )
|
public IIcon getIcon( final int direction, final int metadata )
|
||||||
{
|
{
|
||||||
for( Block skyStoneBlock : AEApi.instance().definitions().blocks().skyStone().maybeBlock().asSet() )
|
for( final Block skyStoneBlock : AEApi.instance().definitions().blocks().skyStone().maybeBlock().asSet() )
|
||||||
{
|
{
|
||||||
return skyStoneBlock.getIcon( direction, metadata );
|
return skyStoneBlock.getIcon( direction, metadata );
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
|
public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ )
|
||||||
{
|
{
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
{
|
{
|
||||||
|
@ -112,13 +112,13 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void registerBlockIcons( IIconRegister iconRegistry )
|
public void registerBlockIcons( final IIconRegister iconRegistry )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List<ItemStack> itemStacks )
|
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
|
||||||
{
|
{
|
||||||
super.getCheckedSubBlocks( item, tabs, itemStacks );
|
super.getCheckedSubBlocks( item, tabs, itemStacks );
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getUnlocalizedName( ItemStack is )
|
public String getUnlocalizedName( final ItemStack is )
|
||||||
{
|
{
|
||||||
if( is.getItemDamage() == 1 )
|
if( is.getItemDamage() == 1 )
|
||||||
{
|
{
|
||||||
|
@ -137,9 +137,9 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean isVisual )
|
||||||
{
|
{
|
||||||
TileSkyChest sk = this.getTileEntity( w, x, y, z );
|
final TileSkyChest sk = this.getTileEntity( w, x, y, z );
|
||||||
ForgeDirection o = ForgeDirection.UNKNOWN;
|
ForgeDirection o = ForgeDirection.UNKNOWN;
|
||||||
|
|
||||||
if( sk != null )
|
if( sk != null )
|
||||||
|
@ -147,16 +147,16 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
o = sk.getUp();
|
o = sk.getUp();
|
||||||
}
|
}
|
||||||
|
|
||||||
double offsetX = o.offsetX == 0 ? 0.06 : 0.0;
|
final double offsetX = o.offsetX == 0 ? 0.06 : 0.0;
|
||||||
double offsetY = o.offsetY == 0 ? 0.06 : 0.0;
|
final double offsetY = o.offsetY == 0 ? 0.06 : 0.0;
|
||||||
double offsetZ = o.offsetZ == 0 ? 0.06 : 0.0;
|
final double offsetZ = o.offsetZ == 0 ? 0.06 : 0.0;
|
||||||
|
|
||||||
double sc = 0.06;
|
final double sc = 0.06;
|
||||||
return Collections.singletonList( AxisAlignedBB.getBoundingBox( Math.max( 0.0, offsetX - o.offsetX * sc ), Math.max( 0.0, offsetY - o.offsetY * sc ), Math.max( 0.0, offsetZ - o.offsetZ * sc ), Math.min( 1.0, ( 1.0 - offsetX ) - o.offsetX * sc ), Math.min( 1.0, ( 1.0 - offsetY ) - o.offsetY * sc ), Math.min( 1.0, ( 1.0 - offsetZ ) - o.offsetZ * sc ) ) );
|
return Collections.singletonList( AxisAlignedBB.getBoundingBox( Math.max( 0.0, offsetX - o.offsetX * sc ), Math.max( 0.0, offsetY - o.offsetY * sc ), Math.max( 0.0, offsetZ - o.offsetZ * sc ), Math.min( 1.0, ( 1.0 - offsetX ) - o.offsetX * sc ), Math.min( 1.0, ( 1.0 - offsetY ) - o.offsetY * sc ), Math.min( 1.0, ( 1.0 - offsetZ ) - o.offsetZ * sc ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
public void addCollidingBlockToList( final World w, final int x, final int y, final int z, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
|
||||||
{
|
{
|
||||||
out.add( AxisAlignedBB.getBoundingBox( 0.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) );
|
out.add( AxisAlignedBB.getBoundingBox( 0.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) );
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,16 +92,16 @@ public class ClientHelper extends ServerHelper
|
||||||
private static final RenderBlocks BLOCK_RENDERER = new RenderBlocks();
|
private static final RenderBlocks BLOCK_RENDERER = new RenderBlocks();
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void postPlayerRender( RenderLivingEvent.Pre p )
|
public void postPlayerRender( final RenderLivingEvent.Pre p )
|
||||||
{
|
{
|
||||||
PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.entity.getEntityId() );
|
final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.entity.getEntityId() );
|
||||||
if( player != null )
|
if( player != null )
|
||||||
{
|
{
|
||||||
AEColor col = player.myColor;
|
final AEColor col = player.myColor;
|
||||||
|
|
||||||
float r = 0xff & ( col.mediumVariant >> 16 );
|
final float r = 0xff & ( col.mediumVariant >> 16 );
|
||||||
float g = 0xff & ( col.mediumVariant >> 8 );
|
final float g = 0xff & ( col.mediumVariant >> 8 );
|
||||||
float b = 0xff & ( col.mediumVariant );
|
final float b = 0xff & ( col.mediumVariant );
|
||||||
GL11.glColor3f( r / 255.0f, g / 255.0f, b / 255.0f );
|
GL11.glColor3f( r / 255.0f, g / 255.0f, b / 255.0f );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -126,9 +126,9 @@ public class ClientHelper extends ServerHelper
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk )
|
public void bindTileEntitySpecialRenderer( final Class tile, final AEBaseBlock blk )
|
||||||
{
|
{
|
||||||
BaseBlockRender bbr = blk.getRendererInstance().rendererInstance;
|
final BaseBlockRender bbr = blk.getRendererInstance().rendererInstance;
|
||||||
if( bbr.hasTESR() && tile != null )
|
if( bbr.hasTESR() && tile != null )
|
||||||
{
|
{
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer( tile, new TESRWrapper( bbr ) );
|
ClientRegistry.bindTileEntitySpecialRenderer( tile, new TESRWrapper( bbr ) );
|
||||||
|
@ -140,7 +140,7 @@ public class ClientHelper extends ServerHelper
|
||||||
{
|
{
|
||||||
if( Platform.isClient() )
|
if( Platform.isClient() )
|
||||||
{
|
{
|
||||||
List<EntityPlayer> o = new ArrayList<EntityPlayer>();
|
final List<EntityPlayer> o = new ArrayList<EntityPlayer>();
|
||||||
o.add( Minecraft.getMinecraft().thePlayer );
|
o.add( Minecraft.getMinecraft().thePlayer );
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,7 @@ public class ClientHelper extends ServerHelper
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void spawnEffect( EffectType effect, World worldObj, double posX, double posY, double posZ, Object o )
|
public void spawnEffect( final EffectType effect, final World worldObj, final double posX, final double posY, final double posZ, final Object o )
|
||||||
{
|
{
|
||||||
if( AEConfig.instance.enableEffects )
|
if( AEConfig.instance.enableEffects )
|
||||||
{
|
{
|
||||||
|
@ -180,34 +180,34 @@ public class ClientHelper extends ServerHelper
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void spawnAssembler( World worldObj, double posX, double posY, double posZ, Object o )
|
private void spawnAssembler( final World worldObj, final double posX, final double posY, final double posZ, final Object o )
|
||||||
{
|
{
|
||||||
PacketAssemblerAnimation paa = (PacketAssemblerAnimation) o;
|
final PacketAssemblerAnimation paa = (PacketAssemblerAnimation) o;
|
||||||
|
|
||||||
AssemblerFX fx = new AssemblerFX( Minecraft.getMinecraft().theWorld, posX, posY, posZ, 0.0D, 0.0D, 0.0D, paa.rate, paa.is );
|
final AssemblerFX fx = new AssemblerFX( Minecraft.getMinecraft().theWorld, posX, posY, posZ, 0.0D, 0.0D, 0.0D, paa.rate, paa.is );
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void spawnVibrant( World w, double x, double y, double z )
|
private void spawnVibrant( final World w, final double x, final double y, final double z )
|
||||||
{
|
{
|
||||||
if( CommonHelper.proxy.shouldAddParticles( Platform.getRandom() ) )
|
if( CommonHelper.proxy.shouldAddParticles( Platform.getRandom() ) )
|
||||||
{
|
{
|
||||||
double d0 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
|
final double d0 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
|
||||||
double d1 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
|
final double d1 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
|
||||||
double d2 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
|
final double d2 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
|
||||||
|
|
||||||
VibrantFX fx = new VibrantFX( w, x + d0, y + d1, z + d2, 0.0D, 0.0D, 0.0D );
|
final VibrantFX fx = new VibrantFX( w, x + d0, y + d1, z + d2, 0.0D, 0.0D, 0.0D );
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void spawnCrafting( World w, double posX, double posY, double posZ )
|
private void spawnCrafting( final World w, final double posX, final double posY, final double posZ )
|
||||||
{
|
{
|
||||||
float x = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
final float x = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
||||||
float y = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
final float y = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
||||||
float z = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
final float z = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
||||||
|
|
||||||
CraftingFx fx = new CraftingFx( w, posX + x, posY + y, posZ + z, Items.diamond );
|
final CraftingFx fx = new CraftingFx( w, posX + x, posY + y, posZ + z, Items.diamond );
|
||||||
|
|
||||||
fx.motionX = -x * 0.2;
|
fx.motionX = -x * 0.2;
|
||||||
fx.motionY = -y * 0.2;
|
fx.motionY = -y * 0.2;
|
||||||
|
@ -216,13 +216,13 @@ public class ClientHelper extends ServerHelper
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void spawnEnergy( World w, double posX, double posY, double posZ )
|
private void spawnEnergy( final World w, final double posX, final double posY, final double posZ )
|
||||||
{
|
{
|
||||||
float x = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
final float x = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
||||||
float y = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
final float y = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
||||||
float z = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
final float z = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f;
|
||||||
|
|
||||||
EnergyFx fx = new EnergyFx( w, posX + x, posY + y, posZ + z, Items.diamond );
|
final EnergyFx fx = new EnergyFx( w, posX + x, posY + y, posZ + z, Items.diamond );
|
||||||
|
|
||||||
fx.motionX = -x * 0.1;
|
fx.motionX = -x * 0.1;
|
||||||
fx.motionY = -y * 0.1;
|
fx.motionY = -y * 0.1;
|
||||||
|
@ -231,22 +231,22 @@ public class ClientHelper extends ServerHelper
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void spawnLightning( World worldObj, double posX, double posY, double posZ )
|
private void spawnLightning( final World worldObj, final double posX, final double posY, final double posZ )
|
||||||
{
|
{
|
||||||
LightningFX fx = new LightningFX( worldObj, posX, posY + 0.3f, posZ, 0.0f, 0.0f, 0.0f );
|
final LightningFX fx = new LightningFX( worldObj, posX, posY + 0.3f, posZ, 0.0f, 0.0f, 0.0f );
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void spawnLightningArc( World worldObj, double posX, double posY, double posZ, Vec3 second )
|
private void spawnLightningArc( final World worldObj, final double posX, final double posY, final double posZ, final Vec3 second )
|
||||||
{
|
{
|
||||||
LightningFX fx = new LightningArcFX( worldObj, posX, posY, posZ, second.xCoord, second.yCoord, second.zCoord, 0.0f, 0.0f, 0.0f );
|
final LightningFX fx = new LightningArcFX( worldObj, posX, posY, posZ, second.xCoord, second.yCoord, second.zCoord, 0.0f, 0.0f, 0.0f );
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean shouldAddParticles( Random r )
|
public boolean shouldAddParticles( final Random r )
|
||||||
{
|
{
|
||||||
int setting = Minecraft.getMinecraft().gameSettings.particleSetting;
|
final int setting = Minecraft.getMinecraft().gameSettings.particleSetting;
|
||||||
if( setting == 2 )
|
if( setting == 2 )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
@ -265,11 +265,11 @@ public class ClientHelper extends ServerHelper
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doRenderItem( ItemStack itemstack, World w )
|
public void doRenderItem( final ItemStack itemstack, final World w )
|
||||||
{
|
{
|
||||||
if( itemstack != null )
|
if( itemstack != null )
|
||||||
{
|
{
|
||||||
EntityItem entityitem = new EntityItem( w, 0.0D, 0.0D, 0.0D, itemstack );
|
final EntityItem entityitem = new EntityItem( w, 0.0D, 0.0D, 0.0D, itemstack );
|
||||||
entityitem.getEntityItem().stackSize = 1;
|
entityitem.getEntityItem().stackSize = 1;
|
||||||
|
|
||||||
// set all this stuff and then do shit? meh?
|
// set all this stuff and then do shit? meh?
|
||||||
|
@ -290,7 +290,7 @@ public class ClientHelper extends ServerHelper
|
||||||
GL11.glScalef( 1.0f, -1.0f, 0.005f );
|
GL11.glScalef( 1.0f, -1.0f, 0.005f );
|
||||||
// GL11.glScalef( 1.0f , -1.0f, 1.0f );
|
// GL11.glScalef( 1.0f , -1.0f, 1.0f );
|
||||||
|
|
||||||
Block block = Block.getBlockFromItem( itemstack.getItem() );
|
final Block block = Block.getBlockFromItem( itemstack.getItem() );
|
||||||
if( ( itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( block.getRenderType() ) ) )
|
if( ( itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( block.getRenderType() ) ) )
|
||||||
{
|
{
|
||||||
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
|
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
|
||||||
|
@ -298,7 +298,7 @@ public class ClientHelper extends ServerHelper
|
||||||
GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
|
GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
|
||||||
}
|
}
|
||||||
|
|
||||||
IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer( itemstack, IItemRenderer.ItemRenderType.ENTITY );
|
final IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer( itemstack, IItemRenderer.ItemRenderType.ENTITY );
|
||||||
if( customRenderer != null && !( itemstack.getItem() instanceof ItemBlock ) )
|
if( customRenderer != null && !( itemstack.getItem() instanceof ItemBlock ) )
|
||||||
{
|
{
|
||||||
if( customRenderer.shouldUseRenderHelper( IItemRenderer.ItemRenderType.ENTITY, itemstack, IItemRenderer.ItemRendererHelper.BLOCK_3D ) )
|
if( customRenderer.shouldUseRenderHelper( IItemRenderer.ItemRenderType.ENTITY, itemstack, IItemRenderer.ItemRendererHelper.BLOCK_3D ) )
|
||||||
|
@ -333,7 +333,7 @@ public class ClientHelper extends ServerHelper
|
||||||
GL11.glScalef( 1.0f, 1.0f, 0.005f );
|
GL11.glScalef( 1.0f, 1.0f, 0.005f );
|
||||||
|
|
||||||
RenderItem.renderInFrame = false;
|
RenderItem.renderInFrame = false;
|
||||||
FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
|
final FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
|
||||||
if( !ForgeHooksClient.renderInventoryItem( BLOCK_RENDERER, Minecraft.getMinecraft().renderEngine, itemstack, true, 0, 0, 0 ) )
|
if( !ForgeHooksClient.renderInventoryItem( BLOCK_RENDERER, Minecraft.getMinecraft().renderEngine, itemstack, true, 0, 0, 0 ) )
|
||||||
{
|
{
|
||||||
ITEM_RENDERER.renderItemIntoGUI( fr, Minecraft.getMinecraft().renderEngine, itemstack, 0, 0, false );
|
ITEM_RENDERER.renderItemIntoGUI( fr, Minecraft.getMinecraft().renderEngine, itemstack, 0, 0, false );
|
||||||
|
@ -360,8 +360,8 @@ public class ClientHelper extends ServerHelper
|
||||||
return super.getRenderMode();
|
return super.getRenderMode();
|
||||||
}
|
}
|
||||||
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
final Minecraft mc = Minecraft.getMinecraft();
|
||||||
EntityPlayer player = mc.thePlayer;
|
final EntityPlayer player = mc.thePlayer;
|
||||||
|
|
||||||
return this.renderModeForPlayer( player );
|
return this.renderModeForPlayer( player );
|
||||||
}
|
}
|
||||||
|
@ -369,19 +369,19 @@ public class ClientHelper extends ServerHelper
|
||||||
@Override
|
@Override
|
||||||
public void triggerUpdates()
|
public void triggerUpdates()
|
||||||
{
|
{
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
final Minecraft mc = Minecraft.getMinecraft();
|
||||||
if( mc == null || mc.thePlayer == null || mc.theWorld == null )
|
if( mc == null || mc.thePlayer == null || mc.theWorld == null )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
EntityPlayer player = mc.thePlayer;
|
final EntityPlayer player = mc.thePlayer;
|
||||||
|
|
||||||
int x = (int) player.posX;
|
final int x = (int) player.posX;
|
||||||
int y = (int) player.posY;
|
final int y = (int) player.posY;
|
||||||
int z = (int) player.posZ;
|
final int z = (int) player.posZ;
|
||||||
|
|
||||||
int range = 16 * 16;
|
final int range = 16 * 16;
|
||||||
|
|
||||||
mc.theWorld.markBlockRangeForRenderUpdate( x - range, y - range, z - range, x + range, y + range, z + range );
|
mc.theWorld.markBlockRangeForRenderUpdate( x - range, y - range, z - range, x + range, y + range, z + range );
|
||||||
}
|
}
|
||||||
|
@ -393,16 +393,16 @@ public class ClientHelper extends ServerHelper
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void wheelEvent( MouseEvent me )
|
public void wheelEvent( final MouseEvent me )
|
||||||
{
|
{
|
||||||
if( me.isCanceled() || me.dwheel == 0 )
|
if( me.isCanceled() || me.dwheel == 0 )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
final Minecraft mc = Minecraft.getMinecraft();
|
||||||
EntityPlayer player = mc.thePlayer;
|
final EntityPlayer player = mc.thePlayer;
|
||||||
ItemStack is = player.getHeldItem();
|
final ItemStack is = player.getHeldItem();
|
||||||
|
|
||||||
if( is != null && is.getItem() instanceof IMouseWheelItem && player.isSneaking() )
|
if( is != null && is.getItem() instanceof IMouseWheelItem && player.isSneaking() )
|
||||||
{
|
{
|
||||||
|
@ -411,7 +411,7 @@ public class ClientHelper extends ServerHelper
|
||||||
NetworkHandler.instance.sendToServer( new PacketValueConfig( "Item", me.dwheel > 0 ? "WheelUp" : "WheelDown" ) );
|
NetworkHandler.instance.sendToServer( new PacketValueConfig( "Item", me.dwheel > 0 ? "WheelUp" : "WheelDown" ) );
|
||||||
me.setCanceled( true );
|
me.setCanceled( true );
|
||||||
}
|
}
|
||||||
catch( IOException e )
|
catch( final IOException e )
|
||||||
{
|
{
|
||||||
AELog.error( e );
|
AELog.error( e );
|
||||||
}
|
}
|
||||||
|
@ -419,11 +419,11 @@ public class ClientHelper extends ServerHelper
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void updateTextureSheet( TextureStitchEvent.Pre ev )
|
public void updateTextureSheet( final TextureStitchEvent.Pre ev )
|
||||||
{
|
{
|
||||||
if( ev.map.getTextureType() == 1 )
|
if( ev.map.getTextureType() == 1 )
|
||||||
{
|
{
|
||||||
for( ExtraItemTextures et : ExtraItemTextures.values() )
|
for( final ExtraItemTextures et : ExtraItemTextures.values() )
|
||||||
{
|
{
|
||||||
et.registerIcon( ev.map );
|
et.registerIcon( ev.map );
|
||||||
}
|
}
|
||||||
|
@ -431,12 +431,12 @@ public class ClientHelper extends ServerHelper
|
||||||
|
|
||||||
if( ev.map.getTextureType() == 0 )
|
if( ev.map.getTextureType() == 0 )
|
||||||
{
|
{
|
||||||
for( ExtraBlockTextures et : ExtraBlockTextures.values() )
|
for( final ExtraBlockTextures et : ExtraBlockTextures.values() )
|
||||||
{
|
{
|
||||||
et.registerIcon( ev.map );
|
et.registerIcon( ev.map );
|
||||||
}
|
}
|
||||||
|
|
||||||
for( CableBusTextures cb : CableBusTextures.values() )
|
for( final CableBusTextures cb : CableBusTextures.values() )
|
||||||
{
|
{
|
||||||
cb.registerIcon( ev.map );
|
cb.registerIcon( ev.map );
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,28 +96,28 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
boolean useNEI = false;
|
boolean useNEI = false;
|
||||||
private boolean subGui;
|
private boolean subGui;
|
||||||
|
|
||||||
public AEBaseGui( Container container )
|
public AEBaseGui( final Container container )
|
||||||
{
|
{
|
||||||
super( container );
|
super( container );
|
||||||
this.subGui = switchingGuis;
|
this.subGui = switchingGuis;
|
||||||
switchingGuis = false;
|
switchingGuis = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static String join( Collection<String> toolTip, String delimiter )
|
protected static String join( final Collection<String> toolTip, final String delimiter )
|
||||||
{
|
{
|
||||||
final Joiner joiner = Joiner.on( delimiter );
|
final Joiner joiner = Joiner.on( delimiter );
|
||||||
|
|
||||||
return joiner.join( toolTip );
|
return joiner.join( toolTip );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected int getQty( GuiButton btn )
|
protected int getQty( final GuiButton btn )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
DecimalFormat df = new DecimalFormat( "+#;-#" );
|
final DecimalFormat df = new DecimalFormat( "+#;-#" );
|
||||||
return df.parse( btn.displayString ).intValue();
|
return df.parse( btn.displayString ).intValue();
|
||||||
}
|
}
|
||||||
catch( ParseException e )
|
catch( final ParseException e )
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -134,7 +134,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
super.initGui();
|
super.initGui();
|
||||||
|
|
||||||
final List<Slot> slots = this.getInventorySlots();
|
final List<Slot> slots = this.getInventorySlots();
|
||||||
Iterator<Slot> i = slots.iterator();
|
final Iterator<Slot> i = slots.iterator();
|
||||||
while( i.hasNext() )
|
while( i.hasNext() )
|
||||||
{
|
{
|
||||||
if( i.next() instanceof SlotME )
|
if( i.next() instanceof SlotME )
|
||||||
|
@ -143,7 +143,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for( InternalSlotME me : this.meSlots )
|
for( final InternalSlotME me : this.meSlots )
|
||||||
{
|
{
|
||||||
slots.add( new SlotME( me ) );
|
slots.add( new SlotME( me ) );
|
||||||
}
|
}
|
||||||
|
@ -156,22 +156,22 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawScreen( int mouseX, int mouseY, float btn )
|
public void drawScreen( final int mouseX, final int mouseY, final float btn )
|
||||||
{
|
{
|
||||||
super.drawScreen( mouseX, mouseY, btn );
|
super.drawScreen( mouseX, mouseY, btn );
|
||||||
|
|
||||||
boolean hasClicked = Mouse.isButtonDown( 0 );
|
final boolean hasClicked = Mouse.isButtonDown( 0 );
|
||||||
if( hasClicked && this.myScrollBar != null )
|
if( hasClicked && this.myScrollBar != null )
|
||||||
{
|
{
|
||||||
this.myScrollBar.click( this, mouseX - this.guiLeft, mouseY - this.guiTop );
|
this.myScrollBar.click( this, mouseX - this.guiLeft, mouseY - this.guiTop );
|
||||||
}
|
}
|
||||||
|
|
||||||
for( Object c : this.buttonList )
|
for( final Object c : this.buttonList )
|
||||||
{
|
{
|
||||||
if( c instanceof ITooltip )
|
if( c instanceof ITooltip )
|
||||||
{
|
{
|
||||||
ITooltip tooltip = (ITooltip) c;
|
final ITooltip tooltip = (ITooltip) c;
|
||||||
int x = tooltip.xPos(); // ((GuiImgButton) c).xPosition;
|
final int x = tooltip.xPos(); // ((GuiImgButton) c).xPosition;
|
||||||
int y = tooltip.yPos(); // ((GuiImgButton) c).yPosition;
|
int y = tooltip.yPos(); // ((GuiImgButton) c).yPosition;
|
||||||
|
|
||||||
if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
|
if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
|
||||||
|
@ -183,7 +183,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
y = 15;
|
y = 15;
|
||||||
}
|
}
|
||||||
|
|
||||||
String msg = tooltip.getMessage();
|
final String msg = tooltip.getMessage();
|
||||||
if( msg != null )
|
if( msg != null )
|
||||||
{
|
{
|
||||||
this.drawTooltip( x + 11, y + 4, 0, msg );
|
this.drawTooltip( x + 11, y + 4, 0, msg );
|
||||||
|
@ -194,14 +194,14 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void drawTooltip( int par2, int par3, int forceWidth, String message )
|
public void drawTooltip( final int par2, final int par3, final int forceWidth, final String message )
|
||||||
{
|
{
|
||||||
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
|
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
|
||||||
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
|
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
|
||||||
RenderHelper.disableStandardItemLighting();
|
RenderHelper.disableStandardItemLighting();
|
||||||
GL11.glDisable( GL11.GL_LIGHTING );
|
GL11.glDisable( GL11.GL_LIGHTING );
|
||||||
GL11.glDisable( GL11.GL_DEPTH_TEST );
|
GL11.glDisable( GL11.GL_DEPTH_TEST );
|
||||||
String[] var4 = message.split( "\n" );
|
final String[] var4 = message.split( "\n" );
|
||||||
|
|
||||||
if( var4.length > 0 )
|
if( var4.length > 0 )
|
||||||
{
|
{
|
||||||
|
@ -240,14 +240,14 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
|
|
||||||
this.zLevel = 300.0F;
|
this.zLevel = 300.0F;
|
||||||
itemRender.zLevel = 300.0F;
|
itemRender.zLevel = 300.0F;
|
||||||
int var10 = -267386864;
|
final int var10 = -267386864;
|
||||||
this.drawGradientRect( var6 - 3, var7 - 4, var6 + var5 + 3, var7 - 3, var10, var10 );
|
this.drawGradientRect( var6 - 3, var7 - 4, var6 + var5 + 3, var7 - 3, var10, var10 );
|
||||||
this.drawGradientRect( var6 - 3, var7 + var9 + 3, var6 + var5 + 3, var7 + var9 + 4, var10, var10 );
|
this.drawGradientRect( var6 - 3, var7 + var9 + 3, var6 + var5 + 3, var7 + var9 + 4, var10, var10 );
|
||||||
this.drawGradientRect( var6 - 3, var7 - 3, var6 + var5 + 3, var7 + var9 + 3, var10, var10 );
|
this.drawGradientRect( var6 - 3, var7 - 3, var6 + var5 + 3, var7 + var9 + 3, var10, var10 );
|
||||||
this.drawGradientRect( var6 - 4, var7 - 3, var6 - 3, var7 + var9 + 3, var10, var10 );
|
this.drawGradientRect( var6 - 4, var7 - 3, var6 - 3, var7 + var9 + 3, var10, var10 );
|
||||||
this.drawGradientRect( var6 + var5 + 3, var7 - 3, var6 + var5 + 4, var7 + var9 + 3, var10, var10 );
|
this.drawGradientRect( var6 + var5 + 3, var7 - 3, var6 + var5 + 4, var7 + var9 + 3, var10, var10 );
|
||||||
int var11 = 1347420415;
|
final int var11 = 1347420415;
|
||||||
int var12 = ( var11 & 16711422 ) >> 1 | var11 & -16777216;
|
final int var12 = ( var11 & 16711422 ) >> 1 | var11 & -16777216;
|
||||||
this.drawGradientRect( var6 - 3, var7 - 3 + 1, var6 - 3 + 1, var7 + var9 + 3 - 1, var11, var12 );
|
this.drawGradientRect( var6 - 3, var7 - 3 + 1, var6 - 3 + 1, var7 + var9 + 3 - 1, var11, var12 );
|
||||||
this.drawGradientRect( var6 + var5 + 2, var7 - 3 + 1, var6 + var5 + 3, var7 + var9 + 3 - 1, var11, var12 );
|
this.drawGradientRect( var6 + var5 + 2, var7 - 3 + 1, var6 + var5 + 3, var7 + var9 + 3 - 1, var11, var12 );
|
||||||
this.drawGradientRect( var6 - 3, var7 - 3, var6 + var5 + 3, var7 - 3 + 1, var11, var11 );
|
this.drawGradientRect( var6 - 3, var7 - 3, var6 + var5 + 3, var7 - 3 + 1, var11, var11 );
|
||||||
|
@ -283,10 +283,10 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void drawGuiContainerForegroundLayer( int x, int y )
|
protected final void drawGuiContainerForegroundLayer( final int x, final int y )
|
||||||
{
|
{
|
||||||
int ox = this.guiLeft; // (width - xSize) / 2;
|
final int ox = this.guiLeft; // (width - xSize) / 2;
|
||||||
int oy = this.guiTop; // (height - ySize) / 2;
|
final int oy = this.guiTop; // (height - ySize) / 2;
|
||||||
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
||||||
|
|
||||||
if( this.myScrollBar != null )
|
if( this.myScrollBar != null )
|
||||||
|
@ -300,19 +300,19 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
public abstract void drawFG( int offsetX, int offsetY, int mouseX, int mouseY );
|
public abstract void drawFG( int offsetX, int offsetY, int mouseX, int mouseY );
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void drawGuiContainerBackgroundLayer( float f, int x, int y )
|
protected final void drawGuiContainerBackgroundLayer( final float f, final int x, final int y )
|
||||||
{
|
{
|
||||||
int ox = this.guiLeft; // (width - xSize) / 2;
|
final int ox = this.guiLeft; // (width - xSize) / 2;
|
||||||
int oy = this.guiTop; // (height - ySize) / 2;
|
final int oy = this.guiTop; // (height - ySize) / 2;
|
||||||
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
||||||
this.drawBG( ox, oy, x, y );
|
this.drawBG( ox, oy, x, y );
|
||||||
|
|
||||||
final List<Slot> slots = this.getInventorySlots();
|
final List<Slot> slots = this.getInventorySlots();
|
||||||
for( Slot slot : slots )
|
for( final Slot slot : slots )
|
||||||
{
|
{
|
||||||
if( slot instanceof OptionalSlotFake )
|
if( slot instanceof OptionalSlotFake )
|
||||||
{
|
{
|
||||||
OptionalSlotFake fs = (OptionalSlotFake) slot;
|
final OptionalSlotFake fs = (OptionalSlotFake) slot;
|
||||||
if( fs.renderDisabled() )
|
if( fs.renderDisabled() )
|
||||||
{
|
{
|
||||||
if( fs.isEnabled() )
|
if( fs.isEnabled() )
|
||||||
|
@ -334,15 +334,15 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void mouseClicked( int xCoord, int yCoord, int btn )
|
protected void mouseClicked( final int xCoord, final int yCoord, final int btn )
|
||||||
{
|
{
|
||||||
this.drag_click.clear();
|
this.drag_click.clear();
|
||||||
|
|
||||||
if( btn == 1 )
|
if( btn == 1 )
|
||||||
{
|
{
|
||||||
for( Object o : this.buttonList )
|
for( final Object o : this.buttonList )
|
||||||
{
|
{
|
||||||
GuiButton guibutton = (GuiButton) o;
|
final GuiButton guibutton = (GuiButton) o;
|
||||||
if( guibutton.mousePressed( this.mc, xCoord, yCoord ) )
|
if( guibutton.mousePressed( this.mc, xCoord, yCoord ) )
|
||||||
{
|
{
|
||||||
super.mouseClicked( xCoord, yCoord, 0 );
|
super.mouseClicked( xCoord, yCoord, 0 );
|
||||||
|
@ -355,19 +355,19 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void mouseClickMove( int x, int y, int c, long d )
|
protected void mouseClickMove( final int x, final int y, final int c, final long d )
|
||||||
{
|
{
|
||||||
Slot slot = this.getSlot( x, y );
|
final Slot slot = this.getSlot( x, y );
|
||||||
ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack();
|
final ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack();
|
||||||
|
|
||||||
if( slot instanceof SlotFake && itemstack != null )
|
if( slot instanceof SlotFake && itemstack != null )
|
||||||
{
|
{
|
||||||
this.drag_click.add( slot );
|
this.drag_click.add( slot );
|
||||||
if( this.drag_click.size() > 1 )
|
if( this.drag_click.size() > 1 )
|
||||||
{
|
{
|
||||||
for( Slot dr : this.drag_click )
|
for( final Slot dr : this.drag_click )
|
||||||
{
|
{
|
||||||
PacketInventoryAction p = new PacketInventoryAction( c == 0 ? InventoryAction.PICKUP_OR_SET_DOWN : InventoryAction.PLACE_SINGLE, dr.slotNumber, 0 );
|
final PacketInventoryAction p = new PacketInventoryAction( c == 0 ? InventoryAction.PICKUP_OR_SET_DOWN : InventoryAction.PLACE_SINGLE, dr.slotNumber, 0 );
|
||||||
NetworkHandler.instance.sendToServer( p );
|
NetworkHandler.instance.sendToServer( p );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -379,9 +379,9 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void handleMouseClick( Slot slot, int slotIdx, int ctrlDown, int key )
|
protected void handleMouseClick( final Slot slot, final int slotIdx, final int ctrlDown, final int key )
|
||||||
{
|
{
|
||||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||||
|
|
||||||
if( slot instanceof SlotFake )
|
if( slot instanceof SlotFake )
|
||||||
{
|
{
|
||||||
|
@ -392,7 +392,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
|
final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
|
||||||
NetworkHandler.instance.sendToServer( p );
|
NetworkHandler.instance.sendToServer( p );
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -409,7 +409,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
{
|
{
|
||||||
NetworkHandler.instance.sendToServer( ( (SlotPatternTerm) slot ).getRequest( key == 1 ) );
|
NetworkHandler.instance.sendToServer( ( (SlotPatternTerm) slot ).getRequest( key == 1 ) );
|
||||||
}
|
}
|
||||||
catch( IOException e )
|
catch( final IOException e )
|
||||||
{
|
{
|
||||||
AELog.error( e );
|
AELog.error( e );
|
||||||
}
|
}
|
||||||
|
@ -431,7 +431,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
action = ctrlDown == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
|
action = ctrlDown == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
|
final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
|
||||||
NetworkHandler.instance.sendToServer( p );
|
NetworkHandler.instance.sendToServer( p );
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -455,7 +455,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
|
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
|
||||||
PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 );
|
final PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 );
|
||||||
NetworkHandler.instance.sendToServer( p );
|
NetworkHandler.instance.sendToServer( p );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -490,7 +490,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
|
|
||||||
if( action != null )
|
if( action != null )
|
||||||
{
|
{
|
||||||
PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ( (SlotDisconnected) slot ).mySlot.id );
|
final PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ( (SlotDisconnected) slot ).mySlot.id );
|
||||||
NetworkHandler.instance.sendToServer( p );
|
NetworkHandler.instance.sendToServer( p );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -528,7 +528,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
else if( player.capabilities.isCreativeMode )
|
else if( player.capabilities.isCreativeMode )
|
||||||
{
|
{
|
||||||
IAEItemStack slotItem = ( (SlotME) slot ).getAEStack();
|
final IAEItemStack slotItem = ( (SlotME) slot ).getAEStack();
|
||||||
if( slotItem != null )
|
if( slotItem != null )
|
||||||
{
|
{
|
||||||
action = InventoryAction.CREATIVE_DUPLICATE;
|
action = InventoryAction.CREATIVE_DUPLICATE;
|
||||||
|
@ -544,7 +544,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
if( action != null )
|
if( action != null )
|
||||||
{
|
{
|
||||||
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
|
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
|
||||||
PacketInventoryAction p = new PacketInventoryAction( action, this.getInventorySlots().size(), 0 );
|
final PacketInventoryAction p = new PacketInventoryAction( action, this.getInventorySlots().size(), 0 );
|
||||||
NetworkHandler.instance.sendToServer( p );
|
NetworkHandler.instance.sendToServer( p );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -574,7 +574,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
// a replica of the weird broken vanilla feature.
|
// a replica of the weird broken vanilla feature.
|
||||||
|
|
||||||
final List<Slot> slots = this.getInventorySlots();
|
final List<Slot> slots = this.getInventorySlots();
|
||||||
for( Slot inventorySlot : slots )
|
for( final Slot inventorySlot : slots )
|
||||||
{
|
{
|
||||||
if( inventorySlot != null && inventorySlot.canTakeStack( this.mc.thePlayer ) && inventorySlot.getHasStack() && inventorySlot.inventory == slot.inventory && Container.func_94527_a( inventorySlot, this.dbl_whichItem, true ) )
|
if( inventorySlot != null && inventorySlot.canTakeStack( this.mc.thePlayer ) && inventorySlot.getHasStack() && inventorySlot.inventory == slot.inventory && Container.func_94527_a( inventorySlot, this.dbl_whichItem, true ) )
|
||||||
{
|
{
|
||||||
|
@ -590,15 +590,15 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean checkHotbarKeys( int keyCode )
|
protected boolean checkHotbarKeys( final int keyCode )
|
||||||
{
|
{
|
||||||
Slot theSlot;
|
final Slot theSlot;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
theSlot = ObfuscationReflectionHelper.getPrivateValue( GuiContainer.class, this, "theSlot", "field_147006_u", "f" );
|
theSlot = ObfuscationReflectionHelper.getPrivateValue( GuiContainer.class, this, "theSlot", "field_147006_u", "f" );
|
||||||
}
|
}
|
||||||
catch( Throwable t )
|
catch( final Throwable t )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -610,7 +610,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
if( keyCode == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode() )
|
if( keyCode == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode() )
|
||||||
{
|
{
|
||||||
final List<Slot> slots = this.getInventorySlots();
|
final List<Slot> slots = this.getInventorySlots();
|
||||||
for( Slot s : slots )
|
for( final Slot s : slots )
|
||||||
{
|
{
|
||||||
if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() )
|
if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() )
|
||||||
{
|
{
|
||||||
|
@ -628,7 +628,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for( Slot s : slots )
|
for( final Slot s : slots )
|
||||||
{
|
{
|
||||||
if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() )
|
if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() )
|
||||||
{
|
{
|
||||||
|
@ -651,10 +651,10 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
this.subGui = true; // in case the gui is reopened later ( i'm looking at you NEI )
|
this.subGui = true; // in case the gui is reopened later ( i'm looking at you NEI )
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Slot getSlot( int mouseX, int mouseY )
|
protected Slot getSlot( final int mouseX, final int mouseY )
|
||||||
{
|
{
|
||||||
final List<Slot> slots = this.getInventorySlots();
|
final List<Slot> slots = this.getInventorySlots();
|
||||||
for( Slot slot : slots )
|
for( final Slot slot : slots )
|
||||||
{
|
{
|
||||||
// isPointInRegion
|
// isPointInRegion
|
||||||
if( this.func_146978_c( slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY ) )
|
if( this.func_146978_c( slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY ) )
|
||||||
|
@ -673,11 +673,11 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
{
|
{
|
||||||
super.handleMouseInput();
|
super.handleMouseInput();
|
||||||
|
|
||||||
int i = Mouse.getEventDWheel();
|
final int i = Mouse.getEventDWheel();
|
||||||
if( i != 0 && isShiftKeyDown() )
|
if( i != 0 && isShiftKeyDown() )
|
||||||
{
|
{
|
||||||
int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
|
final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
|
||||||
int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
|
final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
|
||||||
this.mouseWheelEvent( x, y, i / Math.abs( i ) );
|
this.mouseWheelEvent( x, y, i / Math.abs( i ) );
|
||||||
}
|
}
|
||||||
else if( i != 0 && this.myScrollBar != null )
|
else if( i != 0 && this.myScrollBar != null )
|
||||||
|
@ -686,21 +686,21 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void mouseWheelEvent( int x, int y, int wheel )
|
protected void mouseWheelEvent( final int x, final int y, final int wheel )
|
||||||
{
|
{
|
||||||
Slot slot = this.getSlot( x, y );
|
final Slot slot = this.getSlot( x, y );
|
||||||
if( slot instanceof SlotME )
|
if( slot instanceof SlotME )
|
||||||
{
|
{
|
||||||
IAEItemStack item = ( (SlotME) slot ).getAEStack();
|
final IAEItemStack item = ( (SlotME) slot ).getAEStack();
|
||||||
if( item != null )
|
if( item != null )
|
||||||
{
|
{
|
||||||
( (AEBaseContainer) this.inventorySlots ).setTargetStack( item );
|
( (AEBaseContainer) this.inventorySlots ).setTargetStack( item );
|
||||||
InventoryAction direction = wheel > 0 ? InventoryAction.ROLL_DOWN : InventoryAction.ROLL_UP;
|
final InventoryAction direction = wheel > 0 ? InventoryAction.ROLL_DOWN : InventoryAction.ROLL_UP;
|
||||||
int times = Math.abs( wheel );
|
final int times = Math.abs( wheel );
|
||||||
final int inventorySize = this.getInventorySlots().size();
|
final int inventorySize = this.getInventorySlots().size();
|
||||||
for( int h = 0; h < times; h++ )
|
for( int h = 0; h < times; h++ )
|
||||||
{
|
{
|
||||||
PacketInventoryAction p = new PacketInventoryAction( direction, inventorySize, 0 );
|
final PacketInventoryAction p = new PacketInventoryAction( direction, inventorySize, 0 );
|
||||||
NetworkHandler.instance.sendToServer( p );
|
NetworkHandler.instance.sendToServer( p );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -712,13 +712,13 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void bindTexture( String base, String file )
|
public void bindTexture( final String base, final String file )
|
||||||
{
|
{
|
||||||
ResourceLocation loc = new ResourceLocation( base, "textures/" + file );
|
final ResourceLocation loc = new ResourceLocation( base, "textures/" + file );
|
||||||
this.mc.getTextureManager().bindTexture( loc );
|
this.mc.getTextureManager().bindTexture( loc );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawItem( int x, int y, ItemStack is )
|
protected void drawItem( final int x, final int y, final ItemStack is )
|
||||||
{
|
{
|
||||||
this.zLevel = 100.0F;
|
this.zLevel = 100.0F;
|
||||||
itemRender.zLevel = 100.0F;
|
itemRender.zLevel = 100.0F;
|
||||||
|
@ -735,7 +735,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
this.zLevel = 0.0F;
|
this.zLevel = 0.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected String getGuiDisplayName( String in )
|
protected String getGuiDisplayName( final String in )
|
||||||
{
|
{
|
||||||
return this.hasCustomInventoryName() ? this.getInventoryName() : in;
|
return this.hasCustomInventoryName() ? this.getInventoryName() : in;
|
||||||
}
|
}
|
||||||
|
@ -754,16 +754,16 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
return ( (AEBaseContainer) this.inventorySlots ).customName;
|
return ( (AEBaseContainer) this.inventorySlots ).customName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void a( Slot s )
|
public void a( final Slot s )
|
||||||
{
|
{
|
||||||
this.drawSlot( s );
|
this.drawSlot( s );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void drawSlot( Slot s )
|
public void drawSlot( final Slot s )
|
||||||
{
|
{
|
||||||
if( s instanceof SlotME )
|
if( s instanceof SlotME )
|
||||||
{
|
{
|
||||||
RenderItem pIR = this.setItemRender( this.aeRenderItem );
|
final RenderItem pIR = this.setItemRender( this.aeRenderItem );
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
this.zLevel = 100.0F;
|
this.zLevel = 100.0F;
|
||||||
|
@ -783,7 +783,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
|
|
||||||
this.safeDrawSlot( s );
|
this.safeDrawSlot( s );
|
||||||
}
|
}
|
||||||
catch( Exception err )
|
catch( final Exception err )
|
||||||
{
|
{
|
||||||
AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
|
AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
|
||||||
}
|
}
|
||||||
|
@ -794,45 +794,45 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ItemStack is = s.getStack();
|
final ItemStack is = s.getStack();
|
||||||
if( s instanceof AppEngSlot && ( ( (AppEngSlot) s ).renderIconWithItem() || is == null ) && ( ( (AppEngSlot) s ).shouldDisplay() ) )
|
if( s instanceof AppEngSlot && ( ( (AppEngSlot) s ).renderIconWithItem() || is == null ) && ( ( (AppEngSlot) s ).shouldDisplay() ) )
|
||||||
{
|
{
|
||||||
AppEngSlot aes = (AppEngSlot) s;
|
final AppEngSlot aes = (AppEngSlot) s;
|
||||||
if( aes.getIcon() >= 0 )
|
if( aes.getIcon() >= 0 )
|
||||||
{
|
{
|
||||||
this.bindTexture( "guis/states.png" );
|
this.bindTexture( "guis/states.png" );
|
||||||
|
|
||||||
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
|
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
|
||||||
Tessellator tessellator = Tessellator.instance;
|
final Tessellator tessellator = Tessellator.instance;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
int uv_y = (int) Math.floor( aes.getIcon() / 16 );
|
final int uv_y = (int) Math.floor( aes.getIcon() / 16 );
|
||||||
int uv_x = aes.getIcon() - uv_y * 16;
|
final int uv_x = aes.getIcon() - uv_y * 16;
|
||||||
|
|
||||||
GL11.glEnable( GL11.GL_BLEND );
|
GL11.glEnable( GL11.GL_BLEND );
|
||||||
GL11.glDisable( GL11.GL_LIGHTING );
|
GL11.glDisable( GL11.GL_LIGHTING );
|
||||||
GL11.glEnable( GL11.GL_TEXTURE_2D );
|
GL11.glEnable( GL11.GL_TEXTURE_2D );
|
||||||
GL11.glBlendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA );
|
GL11.glBlendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA );
|
||||||
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
|
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
|
||||||
float par1 = aes.xDisplayPosition;
|
final float par1 = aes.xDisplayPosition;
|
||||||
float par2 = aes.yDisplayPosition;
|
final float par2 = aes.yDisplayPosition;
|
||||||
float par3 = uv_x * 16;
|
final float par3 = uv_x * 16;
|
||||||
float par4 = uv_y * 16;
|
final float par4 = uv_y * 16;
|
||||||
|
|
||||||
tessellator.startDrawingQuads();
|
tessellator.startDrawingQuads();
|
||||||
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() );
|
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() );
|
||||||
float f1 = 0.00390625F;
|
final float f1 = 0.00390625F;
|
||||||
float f = 0.00390625F;
|
final float f = 0.00390625F;
|
||||||
float par6 = 16;
|
final float par6 = 16;
|
||||||
tessellator.addVertexWithUV( par1 + 0, par2 + par6, this.zLevel, ( par3 + 0 ) * f, ( par4 + par6 ) * f1 );
|
tessellator.addVertexWithUV( par1 + 0, par2 + par6, this.zLevel, ( par3 + 0 ) * f, ( par4 + par6 ) * f1 );
|
||||||
float par5 = 16;
|
final float par5 = 16;
|
||||||
tessellator.addVertexWithUV( par1 + par5, par2 + par6, this.zLevel, ( par3 + par5 ) * f, ( par4 + par6 ) * f1 );
|
tessellator.addVertexWithUV( par1 + par5, par2 + par6, this.zLevel, ( par3 + par5 ) * f, ( par4 + par6 ) * f1 );
|
||||||
tessellator.addVertexWithUV( par1 + par5, par2 + 0, this.zLevel, ( par3 + par5 ) * f, ( par4 + 0 ) * f1 );
|
tessellator.addVertexWithUV( par1 + par5, par2 + 0, this.zLevel, ( par3 + par5 ) * f, ( par4 + 0 ) * f1 );
|
||||||
tessellator.addVertexWithUV( par1 + 0, par2 + 0, this.zLevel, ( par3 + 0 ) * f, ( par4 + 0 ) * f1 );
|
tessellator.addVertexWithUV( par1 + 0, par2 + 0, this.zLevel, ( par3 + 0 ) * f, ( par4 + 0 ) * f1 );
|
||||||
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, 1.0f );
|
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, 1.0f );
|
||||||
tessellator.draw();
|
tessellator.draw();
|
||||||
}
|
}
|
||||||
catch( Exception err )
|
catch( final Exception err )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
GL11.glPopAttrib();
|
GL11.glPopAttrib();
|
||||||
|
@ -850,7 +850,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
{
|
{
|
||||||
isValid = ( (SlotRestrictedInput) s ).isValid( is, this.mc.theWorld );
|
isValid = ( (SlotRestrictedInput) s ).isValid( is, this.mc.theWorld );
|
||||||
}
|
}
|
||||||
catch( Exception err )
|
catch( final Exception err )
|
||||||
{
|
{
|
||||||
AELog.error( err );
|
AELog.error( err );
|
||||||
}
|
}
|
||||||
|
@ -884,7 +884,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
catch( Exception err )
|
catch( final Exception err )
|
||||||
{
|
{
|
||||||
AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
|
AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
|
||||||
}
|
}
|
||||||
|
@ -893,7 +893,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
this.safeDrawSlot( s );
|
this.safeDrawSlot( s );
|
||||||
}
|
}
|
||||||
|
|
||||||
private RenderItem setItemRender( RenderItem item )
|
private RenderItem setItemRender( final RenderItem item )
|
||||||
{
|
{
|
||||||
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.NEI ) )
|
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.NEI ) )
|
||||||
{
|
{
|
||||||
|
@ -901,7 +901,7 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
RenderItem ri = itemRender;
|
final RenderItem ri = itemRender;
|
||||||
itemRender = item;
|
itemRender = item;
|
||||||
return ri;
|
return ri;
|
||||||
}
|
}
|
||||||
|
@ -912,24 +912,24 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void safeDrawSlot( Slot s )
|
private void safeDrawSlot( final Slot s )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
GuiContainer.class.getDeclaredMethod( "func_146977_a_original", Slot.class ).invoke( this, s );
|
GuiContainer.class.getDeclaredMethod( "func_146977_a_original", Slot.class ).invoke( this, s );
|
||||||
}
|
}
|
||||||
catch( Exception err )
|
catch( final Exception err )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void bindTexture( String file )
|
public void bindTexture( final String file )
|
||||||
{
|
{
|
||||||
ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/" + file );
|
final ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/" + file );
|
||||||
this.mc.getTextureManager().bindTexture( loc );
|
this.mc.getTextureManager().bindTexture( loc );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_146977_a( Slot s )
|
public void func_146977_a( final Slot s )
|
||||||
{
|
{
|
||||||
this.drawSlot( s );
|
this.drawSlot( s );
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,28 +36,28 @@ import appeng.core.localization.ButtonToolTips;
|
||||||
public abstract class AEBaseMEGui extends AEBaseGui
|
public abstract class AEBaseMEGui extends AEBaseGui
|
||||||
{
|
{
|
||||||
|
|
||||||
public AEBaseMEGui( Container container )
|
public AEBaseMEGui( final Container container )
|
||||||
{
|
{
|
||||||
super( container );
|
super( container );
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<String> handleItemTooltip( ItemStack stack, int mouseX, int mouseY, List<String> currentToolTip )
|
public List<String> handleItemTooltip( final ItemStack stack, final int mouseX, final int mouseY, final List<String> currentToolTip )
|
||||||
{
|
{
|
||||||
if( stack != null )
|
if( stack != null )
|
||||||
{
|
{
|
||||||
Slot s = this.getSlot( mouseX, mouseY );
|
final Slot s = this.getSlot( mouseX, mouseY );
|
||||||
if( s instanceof SlotME )
|
if( s instanceof SlotME )
|
||||||
{
|
{
|
||||||
int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
|
final int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
|
||||||
|
|
||||||
IAEItemStack myStack = null;
|
IAEItemStack myStack = null;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
SlotME theSlotField = (SlotME) s;
|
final SlotME theSlotField = (SlotME) s;
|
||||||
myStack = theSlotField.getAEStack();
|
myStack = theSlotField.getAEStack();
|
||||||
}
|
}
|
||||||
catch( Throwable ignore )
|
catch( final Throwable ignore )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,28 +97,28 @@ public abstract class AEBaseMEGui extends AEBaseGui
|
||||||
// Vanilla version...
|
// Vanilla version...
|
||||||
// protected void drawItemStackTooltip(ItemStack stack, int x, int y)
|
// protected void drawItemStackTooltip(ItemStack stack, int x, int y)
|
||||||
@Override
|
@Override
|
||||||
protected void renderToolTip( ItemStack stack, int x, int y )
|
protected void renderToolTip( final ItemStack stack, final int x, final int y )
|
||||||
{
|
{
|
||||||
Slot s = this.getSlot( x, y );
|
final Slot s = this.getSlot( x, y );
|
||||||
if( s instanceof SlotME && stack != null )
|
if( s instanceof SlotME && stack != null )
|
||||||
{
|
{
|
||||||
int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
|
final int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
|
||||||
|
|
||||||
IAEItemStack myStack = null;
|
IAEItemStack myStack = null;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
SlotME theSlotField = (SlotME) s;
|
final SlotME theSlotField = (SlotME) s;
|
||||||
myStack = theSlotField.getAEStack();
|
myStack = theSlotField.getAEStack();
|
||||||
}
|
}
|
||||||
catch( Throwable ignore )
|
catch( final Throwable ignore )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
if( myStack != null )
|
if( myStack != null )
|
||||||
{
|
{
|
||||||
@SuppressWarnings( "unchecked" )
|
@SuppressWarnings( "unchecked" )
|
||||||
List<String> currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
|
final List<String> currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
|
||||||
|
|
||||||
if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
|
if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
|
||||||
{
|
{
|
||||||
|
@ -134,7 +134,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
|
||||||
}
|
}
|
||||||
else if( stack.stackSize > BigNumber )
|
else if( stack.stackSize > BigNumber )
|
||||||
{
|
{
|
||||||
List var4 = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
|
final List var4 = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
|
||||||
var4.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.stackSize ) );
|
var4.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.stackSize ) );
|
||||||
this.drawTooltip( x, y, 0, join( var4, "\n" ) );
|
this.drawTooltip( x, y, 0, join( var4, "\n" ) );
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -25,18 +25,18 @@ import net.minecraft.inventory.Container;
|
||||||
public class GuiNull extends AEBaseGui
|
public class GuiNull extends AEBaseGui
|
||||||
{
|
{
|
||||||
|
|
||||||
public GuiNull( Container container )
|
public GuiNull( final Container container )
|
||||||
{
|
{
|
||||||
super( container );
|
super( container );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
|
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
|
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,16 +36,16 @@ import appeng.core.AppEng;
|
||||||
public class AEConfigGui extends GuiConfig
|
public class AEConfigGui extends GuiConfig
|
||||||
{
|
{
|
||||||
|
|
||||||
public AEConfigGui( GuiScreen parent )
|
public AEConfigGui( final GuiScreen parent )
|
||||||
{
|
{
|
||||||
super( parent, getConfigElements(), AppEng.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath( AEConfig.instance.getFilePath() ) );
|
super( parent, getConfigElements(), AppEng.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath( AEConfig.instance.getFilePath() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<IConfigElement> getConfigElements()
|
private static List<IConfigElement> getConfigElements()
|
||||||
{
|
{
|
||||||
List<IConfigElement> list = new ArrayList<IConfigElement>();
|
final List<IConfigElement> list = new ArrayList<IConfigElement>();
|
||||||
|
|
||||||
for( String cat : AEConfig.instance.getCategoryNames() )
|
for( final String cat : AEConfig.instance.getCategoryNames() )
|
||||||
{
|
{
|
||||||
if( cat.equals( "versionchecker" ) )
|
if( cat.equals( "versionchecker" ) )
|
||||||
{
|
{
|
||||||
|
@ -57,14 +57,14 @@ public class AEConfigGui extends GuiConfig
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigCategory cc = AEConfig.instance.getCategory( cat );
|
final ConfigCategory cc = AEConfig.instance.getCategory( cat );
|
||||||
|
|
||||||
if( cc.isChild() )
|
if( cc.isChild() )
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigElement ce = new ConfigElement( cc );
|
final ConfigElement ce = new ConfigElement( cc );
|
||||||
list.add( ce );
|
list.add( ce );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ public class AEConfigGuiFactory implements IModGuiFactory
|
||||||
{
|
{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initialize( Minecraft minecraftInstance )
|
public void initialize( final Minecraft minecraftInstance )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ public class AEConfigGuiFactory implements IModGuiFactory
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RuntimeOptionGuiHandler getHandlerFor( RuntimeOptionCategoryElement element )
|
public RuntimeOptionGuiHandler getHandlerFor( final RuntimeOptionCategoryElement element )
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
|
||||||
GuiImgButton partition;
|
GuiImgButton partition;
|
||||||
GuiToggleButton copyMode;
|
GuiToggleButton copyMode;
|
||||||
|
|
||||||
public GuiCellWorkbench( InventoryPlayer inventoryPlayer, TileCellWorkbench te )
|
public GuiCellWorkbench( final InventoryPlayer inventoryPlayer, final TileCellWorkbench te )
|
||||||
{
|
{
|
||||||
super( new ContainerCellWorkbench( inventoryPlayer, te ) );
|
super( new ContainerCellWorkbench( inventoryPlayer, te ) );
|
||||||
this.workbench = (ContainerCellWorkbench) this.inventorySlots;
|
this.workbench = (ContainerCellWorkbench) this.inventorySlots;
|
||||||
|
@ -77,7 +77,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
|
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
|
||||||
{
|
{
|
||||||
this.handleButtonVisibility();
|
this.handleButtonVisibility();
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
|
||||||
this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 7 + 8 * 18 );
|
this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 7 + 8 * 18 );
|
||||||
this.drawTexturedModalRect( offsetX + 177, offsetY + ( 7 + ( 8 ) * 18 ), 177, 151, 35, 7 );
|
this.drawTexturedModalRect( offsetX + 177, offsetY + ( 7 + ( 8 ) * 18 ), 177, 151, 35, 7 );
|
||||||
|
|
||||||
int dx = this.workbench.availableUpgrades() - 8;
|
final int dx = this.workbench.availableUpgrades() - 8;
|
||||||
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
|
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
|
||||||
if( dx == 8 )
|
if( dx == 8 )
|
||||||
{
|
{
|
||||||
|
@ -114,7 +114,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
|
||||||
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + 8 * 18 );
|
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + 8 * 18 );
|
||||||
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY + ( 7 + ( 8 ) * 18 ), 186, 151, 35 - 8, 7 );
|
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY + ( 7 + ( 8 ) * 18 ), 186, 151, 35 - 8, 7 );
|
||||||
|
|
||||||
int dx = this.workbench.availableUpgrades() - 16;
|
final int dx = this.workbench.availableUpgrades() - 16;
|
||||||
this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
|
this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
|
||||||
if( dx == 8 )
|
if( dx == 8 )
|
||||||
{
|
{
|
||||||
|
@ -138,10 +138,10 @@ public class GuiCellWorkbench extends GuiUpgradeable
|
||||||
this.copyMode.setState( this.workbench.copyMode == CopyMode.CLEAR_ON_REMOVE );
|
this.copyMode.setState( this.workbench.copyMode == CopyMode.CLEAR_ON_REMOVE );
|
||||||
|
|
||||||
boolean hasFuzzy = false;
|
boolean hasFuzzy = false;
|
||||||
IInventory inv = this.workbench.getCellUpgradeInventory();
|
final IInventory inv = this.workbench.getCellUpgradeInventory();
|
||||||
for( int x = 0; x < inv.getSizeInventory(); x++ )
|
for( int x = 0; x < inv.getSizeInventory(); x++ )
|
||||||
{
|
{
|
||||||
ItemStack is = inv.getStackInSlot( x );
|
final ItemStack is = inv.getStackInSlot( x );
|
||||||
if( is != null && is.getItem() instanceof IUpgradeModule )
|
if( is != null && is.getItem() instanceof IUpgradeModule )
|
||||||
{
|
{
|
||||||
if( ( (IUpgradeModule) is.getItem() ).getType( is ) == Upgrades.FUZZY )
|
if( ( (IUpgradeModule) is.getItem() ).getType( is ) == Upgrades.FUZZY )
|
||||||
|
@ -172,7 +172,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void actionPerformed( GuiButton btn )
|
protected void actionPerformed( final GuiButton btn )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -190,7 +190,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
|
||||||
}
|
}
|
||||||
else if( btn == this.fuzzyMode )
|
else if( btn == this.fuzzyMode )
|
||||||
{
|
{
|
||||||
boolean backwards = Mouse.isButtonDown( 1 );
|
final boolean backwards = Mouse.isButtonDown( 1 );
|
||||||
|
|
||||||
FuzzyMode fz = (FuzzyMode) this.fuzzyMode.getCurrentValue();
|
FuzzyMode fz = (FuzzyMode) this.fuzzyMode.getCurrentValue();
|
||||||
fz = Platform.rotateEnum( fz, backwards, Settings.FUZZY_MODE.getPossibleValues() );
|
fz = Platform.rotateEnum( fz, backwards, Settings.FUZZY_MODE.getPossibleValues() );
|
||||||
|
@ -202,7 +202,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
|
||||||
super.actionPerformed( btn );
|
super.actionPerformed( btn );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch( IOException ignored )
|
catch( final IOException ignored )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue