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

Capitalised enums to match conventions

Browse Source
This commit is contained in:
yueh
2016-09-17 15:02:51 +02:00
parent 2d1d29eb37
commit f185bc07a6
43 changed files with 105 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/crafting/BlockCraftingMonitor.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
@Override
public IExtendedBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
{
AEColor color = AEColor.Transparent;
AEColor color = AEColor.TRANSPARENT;
EnumFacing forward = EnumFacing.NORTH;
TileCraftingMonitorTile te = getTileEntity( world, pos );
src/main/java/appeng/block/misc/SecurityStationRendering.java
+1 -1
View File
@@ -20,6 +20,6 @@ public class SecurityStationRendering extends BlockRenderingCustomizer
public void customize( IBlockRendering rendering, IItemRendering itemRendering )
{
rendering.blockColor( ColorableTileBlockColor.INSTANCE );
itemRendering.color( new StaticItemColor( AEColor.Transparent ) );
itemRendering.color( new StaticItemColor( AEColor.TRANSPARENT ) );
}
}
src/main/java/appeng/block/networking/BlockCableBus.java
+1 -1
View File
@@ -244,7 +244,7 @@ public class BlockCableBus extends AEBaseTileBlock
if( sp.part != null )
{
return sp.part.getItemStack( PartItemStack.Pick );
return sp.part.getItemStack( PartItemStack.PICK );
}
else if( sp.facade != null )
{
src/main/java/appeng/block/networking/CableBusColor.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class CableBusColor implements IBlockColor
public int colorMultiplier( IBlockState state, IBlockAccess worldIn, BlockPos pos, int color )
{
AEColor busColor = AEColor.Transparent;
AEColor busColor = AEColor.TRANSPARENT;
if( state instanceof IExtendedBlockState )
{
src/main/java/appeng/block/storage/ChestRendering.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class ChestRendering extends BlockRenderingCustomizer
public void customize( IBlockRendering rendering, IItemRendering itemRendering )
{
// I checked, the ME chest doesn't keep its color in item form
itemRendering.color( new StaticItemColor( AEColor.Transparent ) );
itemRendering.color( new StaticItemColor( AEColor.TRANSPARENT ) );
rendering.blockColor( new ColorableTileBlockColor() );
}
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+1 -1
View File
@@ -250,7 +250,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
if( AEConfig.instance.useColoredCraftingStatus && ( active || scheduled ) )
{
final int bgColor = ( active ? AEColor.Green.blackVariant : AEColor.Yellow.blackVariant ) | BACKGROUND_ALPHA;
final int bgColor = ( active ? AEColor.GREEN.blackVariant : AEColor.YELLOW.blackVariant ) | BACKGROUND_ALPHA;
final int startX = ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET ) * 2;
final int startY = ( ( y * offY + ITEMSTACK_TOP_OFFSET ) - 3 ) * 2;
drawRect( startX, startY, startX + ( SECTION_LENGTH * 2 ), startY + ( offY * 2 ) - 2, bgColor );
src/main/java/appeng/client/render/ColorableTileBlockColor.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class ColorableTileBlockColor implements IBlockColor
@Override
public int colorMultiplier( IBlockState state, @Nullable IBlockAccess worldIn, @Nullable BlockPos pos, int tintIndex )
{
AEColor color = AEColor.Transparent; // Default to a neutral color
AEColor color = AEColor.TRANSPARENT; // Default to a neutral color
if( worldIn != null && pos != null )
{
src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class CableBusRenderState
// The type to use for rendering the core of the cable.
private CableCoreType coreType;
private AEColor cableColor = AEColor.Transparent;
private AEColor cableColor = AEColor.TRANSPARENT;
// Describes the outgoing connections of this cable bus to other blocks, and how they should be rendered
private EnumMap<EnumFacing, AECableType> connectionTypes = new EnumMap<>( EnumFacing.class );
src/main/java/appeng/client/render/crafting/MonitorBakedModel.java
+1 -1
View File
@@ -96,7 +96,7 @@ class MonitorBakedModel extends CraftingCubeBakedModel
}
}
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
private static EnumFacing getForward( IBlockState state )
src/main/java/appeng/core/Registration.java
+1 -1
View File
@@ -482,7 +482,7 @@ public final class Registration
// whitelist from config
for( final int dimension : AEConfig.instance.meteoriteDimensionWhitelist )
{
registries.worldgen().enableWorldGenForDimension( WorldGenType.Meteorites, dimension );
registries.worldgen().enableWorldGenForDimension( WorldGenType.METEORITES, dimension );
}
/*
src/main/java/appeng/core/features/registries/LocatableRegistry.java
+2 -2
View File
@@ -50,11 +50,11 @@ public final class LocatableRegistry implements ILocatableRegistry
return; // IGNORE!
}
if( e.change == LocatableEvent.Register )
if( e.change == LocatableEvent.REGISTER )
{
this.set.put( e.target.getLocatableSerial(), e.target );
}
else if( e.change == LocatableEvent.Unregister )
else if( e.change == LocatableEvent.UNREGISTER )
{
this.set.remove( e.target.getLocatableSerial() );
}
src/main/java/appeng/core/features/registries/WorldGenRegistry.java
+1 -1
View File
@@ -104,7 +104,7 @@ public final class WorldGenRegistry implements IWorldGen
return false;
}
if( !isGoodDimension && type == WorldGenType.Meteorites )
if( !isGoodDimension && type == WorldGenType.METEORITES )
{
return false;
}
src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java
+1 -1
View File
@@ -23,6 +23,6 @@ public class InscriberInscribeRecipe extends InscriberRecipe
{
public InscriberInscribeRecipe( @Nonnull final Collection<ItemStack> inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot )
{
super( inputs, output, top, bot, InscriberProcessType.Inscribe );
super( inputs, output, top, bot, InscriberProcessType.INSCRIBE );
}
}
src/main/java/appeng/core/stats/Achievements.java
+1 -1
View File
@@ -116,7 +116,7 @@ public enum Achievements
Achievements( final int x, final int y, final AEColoredItemDefinition which, final AchievementType type )
{
this.stack = ( which != null ) ? which.stack( AEColor.Transparent, 1 ) : null;
this.stack = ( which != null ) ? which.stack( AEColor.TRANSPARENT, 1 ) : null;
this.type = type;
this.x = x;
this.y = y;
src/main/java/appeng/hooks/TickHandler.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class TickHandler
private final HandlerRep client = new HandlerRep();
private final HashMap<Integer, PlayerColor> cliPlayerColors = new HashMap<Integer, PlayerColor>();
private final HashMap<Integer, PlayerColor> srvPlayerColors = new HashMap<Integer, PlayerColor>();
private CableRenderMode crm = CableRenderMode.Standard;
private CableRenderMode crm = CableRenderMode.STANDARD;
public HashMap<Integer, PlayerColor> getPlayerColors()
{
src/main/java/appeng/items/misc/ItemPaintBall.java
+3 -3
View File
@@ -61,7 +61,7 @@ public class ItemPaintBall extends AEBaseItem
if( dmg >= AEColor.values().length )
{
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
return AEColor.values()[dmg];
@@ -72,7 +72,7 @@ public class ItemPaintBall extends AEBaseItem
{
for( final AEColor c : AEColor.values() )
{
if( c != AEColor.Transparent )
if( c != AEColor.TRANSPARENT )
{
itemStacks.add( new ItemStack( this, 1, c.ordinal() ) );
}
@@ -80,7 +80,7 @@ public class ItemPaintBall extends AEBaseItem
for( final AEColor c : AEColor.values() )
{
if( c != AEColor.Transparent )
if( c != AEColor.TRANSPARENT )
{
itemStacks.add( new ItemStack( this, 1, DAMAGE_THRESHOLD + c.ordinal() ) );
}
src/main/java/appeng/items/parts/ItemMultipartRendering.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class ItemMultipartRendering extends ItemRenderingCustomizer
rendering.meshDefinition( this::getItemMeshDefinition );
rendering.color( new StaticItemColor( AEColor.Transparent ) );
rendering.color( new StaticItemColor( AEColor.TRANSPARENT ) );
// Register all item models as variants so they get loaded
rendering.variants( Arrays.stream( PartType.values() )
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+5 -5
View File
@@ -89,7 +89,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
for( final AEColor col : AEColor.values() )
{
if( col == AEColor.Transparent )
if( col == AEColor.TRANSPARENT )
{
continue;
}
@@ -142,9 +142,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
// clean cables.
if( te instanceof IColorableTile )
{
if( this.getAECurrentPower( is ) > powerPerUse && ( (IColorableTile) te ).getColor() != AEColor.Transparent )
if( this.getAECurrentPower( is ) > powerPerUse && ( (IColorableTile) te ).getColor() != AEColor.TRANSPARENT )
{
if( ( (IColorableTile) te ).recolourBlock( side, AEColor.Transparent, p ) )
if( ( (IColorableTile) te ).recolourBlock( side, AEColor.TRANSPARENT, p ) )
{
inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() );
this.extractAEPower( is, powerPerUse );
@@ -170,7 +170,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( color != null && this.getAECurrentPower( is ) > powerPerUse )
{
if( color != AEColor.Transparent && this.recolourBlock( blk, side, w, pos, side, color, p ) )
if( color != AEColor.TRANSPARENT && this.recolourBlock( blk, side, w, pos, side, color, p ) )
{
inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() );
this.extractAEPower( is, powerPerUse );
@@ -217,7 +217,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( paintBall.getItem() instanceof ItemSnowball )
{
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
if( paintBall.getItem() instanceof ItemPaintBall )
src/main/java/appeng/me/GridNode.java
+2 -2
View File
@@ -106,7 +106,7 @@ public class GridNode implements IGridNode, IPathItem
this.connections.add( gridConnection );
if( gridConnection.hasDirection() )
{
this.gridProxy.onGridNotification( GridNotification.ConnectionsChanged );
this.gridProxy.onGridNotification( GridNotification.CONNECTIONS_CHANGED );
}
final IGridNode gn = this;
@@ -119,7 +119,7 @@ public class GridNode implements IGridNode, IPathItem
this.connections.remove( gridConnection );
if( gridConnection.hasDirection() )
{
this.gridProxy.onGridNotification( GridNotification.ConnectionsChanged );
this.gridProxy.onGridNotification( GridNotification.CONNECTIONS_CHANGED );
}
}
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
+4 -4
View File
@@ -87,7 +87,7 @@ public class QuantumCluster implements ILocatable, IAECluster
{
if( this.thisSide != 0 )
{
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
}
if( this.canUseNode( -qe ) )
@@ -101,11 +101,11 @@ public class QuantumCluster implements ILocatable, IAECluster
this.otherSide = -qe;
}
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Register ) );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.REGISTER ) );
}
else
{
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
this.otherSide = 0;
this.thisSide = 0;
@@ -243,7 +243,7 @@ public class QuantumCluster implements ILocatable, IAECluster
if( this.thisSide != 0 )
{
this.updateStatus( true );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
}
this.center.updateStatus( null, (byte) -1, this.isUpdateStatus() );
src/main/java/appeng/me/helpers/AENetworkProxy.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class AENetworkProxy implements IGridBlock
private final IGridProxyable gp;
private final boolean worldNode;
private final String nbtName; // name
private AEColor myColor = AEColor.Transparent;
private AEColor myColor = AEColor.TRANSPARENT;
private NBTTagCompound data = null; // input
private ItemStack myRepInstance;
private boolean isReady = false;
src/main/java/appeng/parts/AEBasePart.java
+3 -3
View File
@@ -140,7 +140,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
{
if( this.host == null )
{
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
return this.host.getColor();
}
@@ -212,7 +212,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
@Override
public ItemStack getItemStack( final PartItemStack type )
{
if( type == PartItemStack.Network )
if( type == PartItemStack.NETWORK )
{
final ItemStack copy = this.is.copy();
copy.setTagCompound( null );
@@ -437,7 +437,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
{
final IMemoryCard memoryCard = (IMemoryCard) memCardIS.getItem();
ItemStack is = this.getItemStack( PartItemStack.Network );
ItemStack is = this.getItemStack( PartItemStack.NETWORK );
// Blocks and parts share the same soul!
final IDefinitions definitions = AEApi.instance().definitions();
src/main/java/appeng/parts/CableBusContainer.java
+6 -6
View File
@@ -388,7 +388,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPartCable c = this.getCenter();
return c.getCableColor();
}
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
@Override
@@ -928,7 +928,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPart p = this.getPart( AEPartLocation.fromOrdinal( x ) );
if( p != null )
{
final ItemStack is = p.getItemStack( PartItemStack.Network );
final ItemStack is = p.getItemStack( PartItemStack.NETWORK );
data.writeShort( Item.getIdFromItem( is.getItem() ) );
data.writeShort( is.getItemDamage() );
@@ -958,7 +958,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final Item myItem = Item.getItemById( itemID );
final ItemStack current = p != null ? p.getItemStack( PartItemStack.Network ) : null;
final ItemStack current = p != null ? p.getItemStack( PartItemStack.NETWORK ) : null;
if( current != null && current.getItem() == myItem && current.getItemDamage() == dmgValue )
{
if( p.readFromStream( data ) )
@@ -1008,7 +1008,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
if( part != null )
{
final NBTTagCompound def = new NBTTagCompound();
part.getItemStack( PartItemStack.World ).writeToNBT( def );
part.getItemStack( PartItemStack.WORLD ).writeToNBT( def );
final NBTTagCompound extra = new NBTTagCompound();
part.writeToNBT( extra );
@@ -1061,7 +1061,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
continue;
}
final ItemStack current = p == null ? null : p.getItemStack( PartItemStack.World );
final ItemStack current = p == null ? null : p.getItemStack( PartItemStack.WORLD );
if( Platform.isSameItemType( iss, current ) )
{
@@ -1098,7 +1098,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPart part = this.getPart( s );
if( part != null )
{
drops.add( part.getItemStack( PartItemStack.Break ) );
drops.add( part.getItemStack( PartItemStack.BREAK ) );
part.getDrops( drops, false );
}
src/main/java/appeng/parts/PartPlacement.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class PartPlacement
if( sp.part != null )
{
is.add( sp.part.getItemStack( PartItemStack.Wrench ) );
is.add( sp.part.getItemStack( PartItemStack.WRENCH ) );
sp.part.getDrops( is, true );
host.removePart( sp.side, false );
}
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+2 -2
View File
@@ -115,7 +115,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
@Override
public ItemStack getItemStack( final PartItemStack type )
{
if( type == PartItemStack.World || type == PartItemStack.Network || type == PartItemStack.Wrench || type == PartItemStack.Pick )
if( type == PartItemStack.WORLD || type == PartItemStack.NETWORK || type == PartItemStack.WRENCH || type == PartItemStack.PICK )
{
return super.getItemStack( type );
}
@@ -339,7 +339,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
this.onTunnelConfigChange();
final ItemStack p2pItem = this.getItemStack( PartItemStack.Wrench );
final ItemStack p2pItem = this.getItemStack( PartItemStack.WRENCH );
final String type = p2pItem.getUnlocalizedName();
p2pItem.writeToNBT( data );
src/main/java/appeng/recipes/AEItemResolver.java
+3 -3
View File
@@ -156,10 +156,10 @@ public class AEItemResolver implements ISubItemResolver
}
catch( final Throwable t )
{
col = AEColor.Transparent;
col = AEColor.TRANSPARENT;
}
if( col == AEColor.Transparent )
if( col == AEColor.TRANSPARENT )
{
return null;
}
@@ -178,7 +178,7 @@ public class AEItemResolver implements ISubItemResolver
}
catch( final Throwable t )
{
col = AEColor.Transparent;
col = AEColor.TRANSPARENT;
}
final ItemStack is = partType.stack( col, 1 );
src/main/java/appeng/recipes/handlers/Inscribe.java
+1 -1
View File
@@ -61,7 +61,7 @@ public final class Inscribe extends InscriberProcess
final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack();
final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().getItemStack();
final ItemStack output = this.getOutput().getItemStack();
final InscriberProcessType type = InscriberProcessType.Inscribe;
final InscriberProcessType type = InscriberProcessType.INSCRIBE;
final IInscriberRecipe recipe = new InscriberRecipe( inputs, output, top, bot, type );
src/main/java/appeng/recipes/handlers/Press.java
+1 -1
View File
@@ -61,7 +61,7 @@ public final class Press extends InscriberProcess
final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack();
final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().getItemStack();
final ItemStack output = this.getOutput().getItemStack();
final InscriberProcessType type = InscriberProcessType.Press;
final InscriberProcessType type = InscriberProcessType.PRESS;
final IInscriberRecipe recipe = new InscriberRecipe( inputs, output, top, bot, type );
src/main/java/appeng/server/ServerHelper.java
+3 -3
View File
@@ -144,7 +144,7 @@ public class ServerHelper extends CommonHelper
{
if( this.renderModeBased == null )
{
return CableRenderMode.Standard;
return CableRenderMode.STANDARD;
}
return this.renderModeForPlayer( this.renderModeBased );
@@ -181,12 +181,12 @@ public class ServerHelper extends CommonHelper
final NBTTagCompound c = is.getTagCompound();
if( c != null && c.getBoolean( "hideFacades" ) )
{
return CableRenderMode.CableView;
return CableRenderMode.CABLE_VIEW;
}
}
}
}
return CableRenderMode.Standard;
return CableRenderMode.STANDARD;
}
}
src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
private boolean updateList;
private IAEItemStack dspPlay;
private AEColor paintedColor = AEColor.Transparent;
private AEColor paintedColor = AEColor.TRANSPARENT;
@TileEvent( TileEventType.NETWORK_READ )
public boolean readFromStream_TileCraftingMonitorTile( final ByteBuf data ) throws IOException
src/main/java/appeng/tile/misc/TileInscriber.java
+2 -2
View File
@@ -390,7 +390,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
final List<ItemStack> inputs = Lists.newArrayList( startingItem );
final InscriberProcessType type = InscriberProcessType.Inscribe;
final InscriberProcessType type = InscriberProcessType.INSCRIBE;
return new InscriberRecipe( inputs, renamedItem, plateA, plateB, type );
}
@@ -436,7 +436,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
if( ad.addItems( outputCopy ) == null )
{
this.setProcessingTime( 0 );
if( out.getProcessType() == InscriberProcessType.Press )
if( out.getProcessType() == InscriberProcessType.PRESS )
{
this.setInventorySlotContents( 0, null );
this.setInventorySlotContents( 1, null );
src/main/java/appeng/tile/misc/TileSecurityStation.java
+4 -4
View File
@@ -89,7 +89,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
private final SecurityStationInventory inventory = new SecurityStationInventory( this );
private final MEMonitorHandler<IAEItemStack> securityMonitor = new MEMonitorHandler<IAEItemStack>( this.inventory );
private long securityKey;
private AEColor paintedColor = AEColor.Transparent;
private AEColor paintedColor = AEColor.TRANSPARENT;
private boolean isActive = false;
public TileSecurityStation()
@@ -234,7 +234,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
public void onChunkUnload()
{
super.onChunkUnload();
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
this.isActive = false;
}
@@ -245,7 +245,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
if( Platform.isServer() )
{
this.isActive = true;
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Register ) );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.REGISTER ) );
}
}
@@ -253,7 +253,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
public void invalidate()
{
super.invalidate();
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) );
MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.UNREGISTER ) );
this.isActive = false;
}
src/main/java/appeng/tile/storage/TileChest.java
+1 -1
View File
@@ -108,7 +108,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
private int priority = 0;
private int state = 0;
private boolean wasActive = false;
private AEColor paintedColor = AEColor.Transparent;
private AEColor paintedColor = AEColor.TRANSPARENT;
private boolean isCached = false;
private ICellHandler cellHandler;
private MEMonitorHandler itemCell;
src/main/java/appeng/util/Platform.java
+4 -4
View File
@@ -2104,22 +2104,22 @@ public class Platform
for( final ItemStack stack : is )
{
if( parts.cableGlass().sameAs( AEColor.Transparent, stack ) )
if( parts.cableGlass().sameAs( AEColor.TRANSPARENT, stack ) )
{
return stack;
}
if( parts.cableCovered().sameAs( AEColor.Transparent, stack ) )
if( parts.cableCovered().sameAs( AEColor.TRANSPARENT, stack ) )
{
return stack;
}
if( parts.cableSmart().sameAs( AEColor.Transparent, stack ) )
if( parts.cableSmart().sameAs( AEColor.TRANSPARENT, stack ) )
{
return stack;
}
if( parts.cableDense().sameAs( AEColor.Transparent, stack ) )
if( parts.cableDense().sameAs( AEColor.TRANSPARENT, stack ) )
{
return stack;
}
src/main/java/appeng/worldgen/MeteoriteWorldGen.java
+1 -1
View File
@@ -42,7 +42,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator
@Override
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
{
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.Meteorites, w ) )
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.METEORITES, w ) )
{
// add new meteorites?
if( r.nextFloat() < AEConfig.instance.meteoriteSpawnChance )
src/main/java/appeng/worldgen/QuartzWorldGen.java
+1 -1
View File
@@ -80,7 +80,7 @@ public final class QuartzWorldGen implements IWorldGenerator
final boolean isCharged = r.nextFloat() > AEConfig.instance.spawnChargedChance;
final WorldGenMinable whichOre = isCharged ? this.oreCharged : this.oreNormal;
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( isCharged ? WorldGenType.ChargedCertusQuartz : WorldGenType.CertusQuartz, w ) )
if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( isCharged ? WorldGenType.CHARGED_CERTUS_QUARTZ : WorldGenType.CERTUS_QUARTZ, w ) )
{
final int cx = chunkX * 16 + r.nextInt( 22 );
final int cy = r.nextInt( 40 * seaLevel / 64 ) + r.nextInt( 22 * seaLevel / 64 ) + 12 * seaLevel / 64;