All parameters on one line (for now)

Easier picking of 1.7 changes

src/main/java/appeng/core/localization/ButtonToolTips.java

@@ -24,46 +24,120 @@ import net.minecraft.util.StatCollector;
 
 public enum ButtonToolTips
 {
-	PowerUnits, IOMode, CondenserOutput, RedstoneMode, MatchingFuzzy,
+	PowerUnits,
+	IOMode,
+	CondenserOutput,
+	RedstoneMode,
+	MatchingFuzzy,
 
-	MatchingMode, TransferDirection, SortOrder, SortBy, View,
+	MatchingMode,
+	TransferDirection,
+	SortOrder,
+	SortBy,
+	View,
 
-	PartitionStorage, Clear, FuzzyMode, OperationMode, TrashController,
+	PartitionStorage,
+	Clear,
+	FuzzyMode,
+	OperationMode,
+	TrashController,
 
-	InterfaceBlockingMode, InterfaceCraftingMode, Trash, MatterBalls,
+	InterfaceBlockingMode,
+	InterfaceCraftingMode,
+	Trash,
+	MatterBalls,
 
-	Singularity, Read, Write, ReadWrite, AlwaysActive,
+	Singularity,
+	Read,
+	Write,
+	ReadWrite,
+	AlwaysActive,
 
-	ActiveWithoutSignal, ActiveWithSignal, ActiveOnPulse,
+	ActiveWithoutSignal,
+	ActiveWithSignal,
+	ActiveOnPulse,
 
-	EmitLevelsBelow, EmitLevelAbove, MatchingExact, TransferToNetwork,
+	EmitLevelsBelow,
+	EmitLevelAbove,
+	MatchingExact,
+	TransferToNetwork,
 
-	TransferToStorageCell, ToggleSortDirection, SearchMode_Auto,
+	TransferToStorageCell,
+	ToggleSortDirection,
+	SearchMode_Auto,
 
-	SearchMode_Standard, SearchMode_NEIAuto, SearchMode_NEIStandard,
+	SearchMode_Standard,
+	SearchMode_NEIAuto,
+	SearchMode_NEIStandard,
 
-	SearchMode, ItemName, NumberOfItems, PartitionStorageHint,
+	SearchMode,
+	ItemName,
+	NumberOfItems,
+	PartitionStorageHint,
 
-	ClearSettings, StoredItems, StoredCraftable, Craftable,
+	ClearSettings,
+	StoredItems,
+	StoredCraftable,
+	Craftable,
 
-	FZPercent_25, FZPercent_50, FZPercent_75, FZPercent_99, FZIgnoreAll,
+	FZPercent_25,
+	FZPercent_50,
+	FZPercent_75,
+	FZPercent_99,
+	FZIgnoreAll,
 
-	MoveWhenEmpty, MoveWhenWorkIsDone, MoveWhenFull, Disabled, Enable,
+	MoveWhenEmpty,
+	MoveWhenWorkIsDone,
+	MoveWhenFull,
+	Disabled,
+	Enable,
 
-	Blocking, NonBlocking,
+	Blocking,
+	NonBlocking,
 
-	LevelType, LevelType_Energy, LevelType_Item, InventoryTweaks, TerminalStyle, TerminalStyle_Full, TerminalStyle_Tall, TerminalStyle_Small,
+	LevelType,
+	LevelType_Energy,
+	LevelType_Item,
+	InventoryTweaks,
+	TerminalStyle,
+	TerminalStyle_Full,
+	TerminalStyle_Tall,
+	TerminalStyle_Small,
 
-	Stash, StashDesc, Encode, EncodeDescription, Substitutions, SubstitutionsOn, SubstitutionsOff, SubstitutionsDescEnabled, SubstitutionsDescDisabled, CraftOnly, CraftEither,
+	Stash,
+	StashDesc,
+	Encode,
+	EncodeDescription,
+	Substitutions,
+	SubstitutionsOn,
+	SubstitutionsOff,
+	SubstitutionsDescEnabled,
+	SubstitutionsDescDisabled,
+	CraftOnly,
+	CraftEither,
 
-	Craft, Mod, DoesntDespawn, EmitterMode, CraftViaRedstone, EmitWhenCrafting, ReportInaccessibleItems, ReportInaccessibleItemsYes, ReportInaccessibleItemsNo,
+	Craft,
+	Mod,
+	DoesntDespawn,
+	EmitterMode,
+	CraftViaRedstone,
+	EmitWhenCrafting,
+	ReportInaccessibleItems,
+	ReportInaccessibleItemsYes,
+	ReportInaccessibleItemsNo,
 
-	BlockPlacement, BlockPlacementYes, BlockPlacementNo,
+	BlockPlacement,
+	BlockPlacementYes,
+	BlockPlacementNo,
 
 	// Used in the tooltips of the items in the terminal, when moused over
-	ItemsStored, ItemsRequestable,
+	ItemsStored,
+	ItemsRequestable,
 
-	SchedulingMode, SchedulingModeDefault, SchedulingModeRoundRobin, SchedulingModeRandom;
+	SchedulingMode,
+	SchedulingModeDefault,
+	SchedulingModeRoundRobin,
+	SchedulingModeRandom;
 
 	private final String root;
 

src/main/java/appeng/core/localization/GuiText.java

@@ -26,28 +26,76 @@ public enum GuiText
 {
 	inventory( "container" ), // mc's default Inventory localization.
 
-	Chest, StoredEnergy, Of, Condenser, Drive, GrindStone, SkyChest,
+	Chest,
+	StoredEnergy,
+	Of,
+	Condenser,
+	Drive,
+	GrindStone,
+	SkyChest,
 
-	VibrationChamber, SpatialIOPort, LevelEmitter, Terminal,
+	VibrationChamber,
+	SpatialIOPort,
+	LevelEmitter,
+	Terminal,
 
-	Interface, Config, StoredItems, Patterns, ImportBus, ExportBus,
+	Interface,
+	Config,
+	StoredItems,
+	Patterns,
+	ImportBus,
+	ExportBus,
 
-	CellWorkbench, NetworkDetails, StorageCells, IOBuses,
+	CellWorkbench,
+	NetworkDetails,
+	StorageCells,
+	IOBuses,
 
-	IOPort, BytesUsed, Types, QuantumLinkChamber, PortableCell,
+	IOPort,
+	BytesUsed,
+	Types,
+	QuantumLinkChamber,
+	PortableCell,
 
-	NetworkTool, PowerUsageRate, PowerInputRate, Installed, EnergyDrain,
+	NetworkTool,
+	PowerUsageRate,
+	PowerInputRate,
+	Installed,
+	EnergyDrain,
 
-	StorageBus, Priority, Security, Encoded, Blank, Unlinked, Linked,
+	StorageBus,
+	Priority,
+	Security,
+	Encoded,
+	Blank,
+	Unlinked,
+	Linked,
 
-	SecurityCardEditor, NoPermissions, WirelessTerminal, Wireless,
+	SecurityCardEditor,
+	NoPermissions,
+	WirelessTerminal,
+	Wireless,
 
-	CraftingTerminal, FormationPlane, Inscriber, QuartzCuttingKnife,
+	CraftingTerminal,
+	FormationPlane,
+	Inscriber,
+	QuartzCuttingKnife,
 
 	// tunnel names
-	METunnel, ItemTunnel, RedstoneTunnel, EUTunnel, FluidTunnel, OCTunnel, LightTunnel, RFTunnel, PressureTunnel,
+	METunnel,
+	ItemTunnel,
+	RedstoneTunnel,
+	EUTunnel,
+	FluidTunnel,
+	OCTunnel,
+	LightTunnel,
+	RFTunnel,
+	PressureTunnel,
 
-	StoredSize, CopyMode, CopyModeDesc, PatternTerminal,
+	StoredSize,
+	CopyMode,
+	CopyModeDesc,
+	PatternTerminal,
 
 	// Pattern tooltips
 	CraftingPattern,
@@ -62,34 +110,77 @@ public enum GuiText
 
 	MolecularAssembler,
 
-	StoredPower, MaxPower, RequiredPower, Efficiency, InWorldCrafting,
+	StoredPower,
+	MaxPower,
+	RequiredPower,
+	Efficiency,
+	InWorldCrafting,
 
-	inWorldFluix, inWorldPurificationCertus, inWorldPurificationNether,
+	inWorldFluix,
+	inWorldPurificationCertus,
+	inWorldPurificationNether,
 
-	inWorldPurificationFluix, inWorldSingularity, ChargedQuartz,
+	inWorldPurificationFluix,
+	inWorldSingularity,
+	ChargedQuartz,
 
 	NoSecondOutput,
 	OfSecondOutput,
 	MultipleOutputs,
 
-	Stores, Next, SelectAmount, Lumen, Empty,
+	Stores,
+	Next,
+	SelectAmount,
+	Lumen,
+	Empty,
 
-	ConfirmCrafting, Stored, Crafting, Scheduled, CraftingStatus, Cancel, ETA, ETAFormat,
+	ConfirmCrafting,
+	Stored,
+	Crafting,
+	Scheduled,
+	CraftingStatus,
+	Cancel,
+	ETA,
+	ETAFormat,
 
-	FromStorage, ToCraft, CraftingPlan, CalculatingWait, Start, Bytes,
+	FromStorage,
+	ToCraft,
+	CraftingPlan,
+	CalculatingWait,
+	Start,
+	Bytes,
 
-	CraftingCPU, Automatic, CoProcessors, Simulation, Missing,
+	CraftingCPU,
+	Automatic,
+	CoProcessors,
+	Simulation,
+	Missing,
 
-	InterfaceTerminal, NoCraftingCPUs, Clean, InvalidPattern,
+	InterfaceTerminal,
+	NoCraftingCPUs,
+	Clean,
+	InvalidPattern,
 
-	InterfaceTerminalHint, Range, TransparentFacades, TransparentFacadesHint,
+	InterfaceTerminalHint,
+	Range,
+	TransparentFacades,
+	TransparentFacadesHint,
 
-	NoCraftingJobs, CPUs, FacadeCrafting, inWorldCraftingPresses, ChargedQuartzFind,
+	NoCraftingJobs,
+	CPUs,
+	FacadeCrafting,
+	inWorldCraftingPresses,
+	ChargedQuartzFind,
 
-	Included, Excluded, Partitioned, Precise, Fuzzy,
+	Included,
+	Excluded,
+	Partitioned,
+	Precise,
+	Fuzzy,
 
 	// Used in a terminal to indicate that an item is craftable
-	SmallFontCraft, LargeFontCraft,
+	SmallFontCraft,
+	LargeFontCraft,
 
 	// Used in a ME Interface when no appropriate TileEntity was detected near it
 	Nothing;

src/main/java/appeng/core/localization/PlayerMessages.java

@@ -25,11 +25,21 @@ import net.minecraft.util.IChatComponent;
 
 public enum PlayerMessages
 {
-	ChestCannotReadStorageCell, InvalidMachine, LoadedSettings, SavedSettings, MachineNotPowered,
+	ChestCannotReadStorageCell,
+	InvalidMachine,
+	LoadedSettings,
+	SavedSettings,
+	MachineNotPowered,
 
-	isNowLocked, isNowUnlocked,
+	isNowLocked,
+	isNowUnlocked,
 	AmmoDepleted,
-	CommunicationError, OutOfRange, DeviceNotPowered, DeviceNotWirelessTerminal, DeviceNotLinked, StationCanNotBeLocated,
+	CommunicationError,
+	OutOfRange,
+	DeviceNotPowered,
+	DeviceNotWirelessTerminal,
+	DeviceNotLinked,
+	StationCanNotBeLocated,
 	SettingCleared, ;
 
 	public IChatComponent get()