From 0f9ca7885a8bb5b166da81d41d1c33e7fe43e995 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Mon, 18 May 2015 00:08:05 +0200 Subject: [PATCH] Lower case methods --- .../container/slot/SlotCraftingTerm.java | 6 ++--- .../java/appeng/debug/BlockPhantomNode.java | 4 ++-- .../java/appeng/debug/TileChunkLoader.java | 4 ++-- .../java/appeng/debug/TileCubeGenerator.java | 4 ++-- .../java/appeng/debug/TilePhantomNode.java | 4 ++-- .../java/appeng/integration/modules/RF.java | 22 +++++++++---------- .../appeng/parts/p2p/PartP2PIC2Power.java | 6 ++--- .../java/appeng/parts/p2p/PartP2PRFPower.java | 4 ++-- .../java/appeng/parts/p2p/PartP2PTunnel.java | 4 ++-- .../server/subcommands/ChunkLogger.java | 10 ++++----- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index 65f9e0983..17d6053e9 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -117,7 +117,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot maxTimesToCraft = 1; } - maxTimesToCraft = this.CapCraftingAttempts( maxTimesToCraft ); + maxTimesToCraft = this.capCraftingAttempts( maxTimesToCraft ); if( ia == null ) { @@ -147,7 +147,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot } } - protected int CapCraftingAttempts( int maxTimesToCraft ) + protected int capCraftingAttempts( int maxTimesToCraft ) { return maxTimesToCraft; } diff --git a/src/main/java/appeng/debug/BlockPhantomNode.java b/src/main/java/appeng/debug/BlockPhantomNode.java index 5c41a5d4d..2a39b14eb 100644 --- a/src/main/java/appeng/debug/BlockPhantomNode.java +++ b/src/main/java/appeng/debug/BlockPhantomNode.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -44,7 +44,7 @@ public class BlockPhantomNode extends AEBaseBlock public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ ) { TilePhantomNode tpn = this.getTileEntity( w, x, y, z ); - tpn.BOOM(); + tpn.triggerCrashMode(); return true; } diff --git a/src/main/java/appeng/debug/TileChunkLoader.java b/src/main/java/appeng/debug/TileChunkLoader.java index 26b830fa7..a15ad89b8 100644 --- a/src/main/java/appeng/debug/TileChunkLoader.java +++ b/src/main/java/appeng/debug/TileChunkLoader.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -46,7 +46,7 @@ public class TileChunkLoader extends AEBaseTile Ticket ct; @TileEvent( TileEventType.TICK ) - public void Tick_TileChunkLoader() + public void onTickEvent() { if( this.requestTicket ) { diff --git a/src/main/java/appeng/debug/TileCubeGenerator.java b/src/main/java/appeng/debug/TileCubeGenerator.java index 75b000524..28faa4871 100644 --- a/src/main/java/appeng/debug/TileCubeGenerator.java +++ b/src/main/java/appeng/debug/TileCubeGenerator.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -41,7 +41,7 @@ public class TileCubeGenerator extends AEBaseTile EntityPlayer who; @TileEvent( TileEventType.TICK ) - public void TCG_Tick() + public void onTickEvent() { if( this.is != null && Platform.isServer() ) { diff --git a/src/main/java/appeng/debug/TilePhantomNode.java b/src/main/java/appeng/debug/TilePhantomNode.java index e930725a7..d9b0aa188 100644 --- a/src/main/java/appeng/debug/TilePhantomNode.java +++ b/src/main/java/appeng/debug/TilePhantomNode.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -54,7 +54,7 @@ public class TilePhantomNode extends AENetworkTile this.crashMode = true; } - public void BOOM() + public void triggerCrashMode() { if( this.proxy != null ) { diff --git a/src/main/java/appeng/integration/modules/RF.java b/src/main/java/appeng/integration/modules/RF.java index ddd8cb253..920bd8375 100644 --- a/src/main/java/appeng/integration/modules/RF.java +++ b/src/main/java/appeng/integration/modules/RF.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -50,20 +50,20 @@ public class RF extends BaseModule @Override public void postInit() { - this.RFStack( "ExtraUtilities", "extractor_base", 12 ); - this.RFStack( "ExtraUtilities", "pipes", 11 ); - this.RFStack( "ExtraUtilities", "pipes", 14 ); - this.RFStack( "ExtraUtilities", "generator", OreDictionary.WILDCARD_VALUE ); + this.registerRFAttunement( "ExtraUtilities", "extractor_base", 12 ); + this.registerRFAttunement( "ExtraUtilities", "pipes", 11 ); + this.registerRFAttunement( "ExtraUtilities", "pipes", 14 ); + this.registerRFAttunement( "ExtraUtilities", "generator", OreDictionary.WILDCARD_VALUE ); - this.RFStack( "ThermalExpansion", "Cell", OreDictionary.WILDCARD_VALUE ); - this.RFStack( "ThermalExpansion", "Dynamo", OreDictionary.WILDCARD_VALUE ); + this.registerRFAttunement( "ThermalExpansion", "Cell", OreDictionary.WILDCARD_VALUE ); + this.registerRFAttunement( "ThermalExpansion", "Dynamo", OreDictionary.WILDCARD_VALUE ); - this.RFStack( "EnderIO", "itemPowerConduit", OreDictionary.WILDCARD_VALUE ); - this.RFStack( "EnderIO", "blockCapacitorBank", 0 ); - this.RFStack( "EnderIO", "blockPowerMonitor", 0 ); + this.registerRFAttunement( "EnderIO", "itemPowerConduit", OreDictionary.WILDCARD_VALUE ); + this.registerRFAttunement( "EnderIO", "blockCapacitorBank", 0 ); + this.registerRFAttunement( "EnderIO", "blockPowerMonitor", 0 ); } - void RFStack( String mod, String name, int dmg ) + void registerRFAttunement( String mod, String name, int dmg ) { ItemStack modItem = GameRegistry.findItemStack( mod, name, 1 ); if( modItem != null ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index eb192059b..38c8fcbe3 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -201,7 +201,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i if( x != null && x.OutputEnergyA <= 0.001 ) { - this.QueueTunnelDrain( PowerUnits.EU, amount ); + this.queueTunnelDrain( PowerUnits.EU, amount ); x.OutputEnergyA = amount; x.OutputVoltageA = voltage; return 0; @@ -209,7 +209,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i if( x != null && x.OutputEnergyB <= 0.001 ) { - this.QueueTunnelDrain( PowerUnits.EU, amount ); + this.queueTunnelDrain( PowerUnits.EU, amount ); x.OutputEnergyB = amount; x.OutputVoltageB = voltage; return 0; diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index 1d49d2b74..070204ea3 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -133,7 +133,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen } } - this.QueueTunnelDrain( PowerUnits.RF, total ); + this.queueTunnelDrain( PowerUnits.RF, total ); } catch( GridAccessException ignored ) { diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index a95ef994e..a40aef4b2 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -439,7 +439,7 @@ public abstract class PartP2PTunnel extends PartBasicSt return CableBusTextures.BlockP2PTunnel2.getIcon(); } - protected void QueueTunnelDrain( PowerUnits unit, double f ) + protected void queueTunnelDrain( PowerUnits unit, double f ) { double ae_to_tax = unit.convertTo( PowerUnits.AE, f * AEConfig.TUNNEL_POWER_LOSS ); diff --git a/src/main/java/appeng/server/subcommands/ChunkLogger.java b/src/main/java/appeng/server/subcommands/ChunkLogger.java index 1fa42ed98..154fa6b87 100644 --- a/src/main/java/appeng/server/subcommands/ChunkLogger.java +++ b/src/main/java/appeng/server/subcommands/ChunkLogger.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -39,11 +39,11 @@ public class ChunkLogger implements ISubCommand boolean enabled = false; @SubscribeEvent - public void ChunkLoad( ChunkEvent.Load load ) + public void onChunkLoadEvent( ChunkEvent.Load event ) { - if( !load.world.isRemote ) + if( !event.world.isRemote ) { - AELog.info( "Chunk Loaded: " + load.getChunk().xPosition + ", " + load.getChunk().zPosition ); + AELog.info( "Chunk Loaded: " + event.getChunk().xPosition + ", " + event.getChunk().zPosition ); this.displayStack(); } } @@ -68,7 +68,7 @@ public class ChunkLogger implements ISubCommand } @SubscribeEvent - public void ChunkLoad( ChunkEvent.Unload unload ) + public void onChunkUnloadEvent( ChunkEvent.Unload unload ) { if( !unload.world.isRemote ) {