diff --git a/src/api/java/appeng/api/util/IConfigManager.java b/src/api/java/appeng/api/util/IConfigManager.java index 1adce431..1162ada4 100644 --- a/src/api/java/appeng/api/util/IConfigManager.java +++ b/src/api/java/appeng/api/util/IConfigManager.java @@ -23,10 +23,10 @@ package appeng.api.util; -import net.minecraft.nbt.NBTTagCompound; - import java.util.Set; +import net.minecraft.nbt.NBTTagCompound; + /** * Used to adjust settings on an object, * @@ -70,9 +70,9 @@ public interface IConfigManager /** * write all settings to the NBT Tag so they can be read later. * - * @param dest to be written nbt tag + * @param destination to be written nbt tag */ - void writeToNBT(NBTTagCompound dest); + void writeToNBT(NBTTagCompound destination); /** * Only works after settings have been registered diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index aeb843ef..bd34e879 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -25,14 +25,14 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import com.google.common.base.Joiner; - import org.lwjgl.opengl.GL11; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import com.google.common.base.Joiner; + import appeng.api.AEApi; import appeng.api.config.SortDir; import appeng.api.config.SortOrder; @@ -328,10 +328,10 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource if ( AEConfig.instance.useColoredCraftingStatus && ( active || scheduled ) ) { - int bgcol = ( active ? AEColor.Green.blackVariant : AEColor.Yellow.blackVariant ) | 0x5A000000; + int bgColor = ( active ? AEColor.Green.blackVariant : AEColor.Yellow.blackVariant ) | 0x5A000000; int startX = (x * (1 + sectionLength) + xo) * 2; int startY = ((y * offY + yo) - 3) * 2; - drawRect( startX, startY, startX + (sectionLength * 2), startY + (offY * 2) - 2, bgcol); + drawRect( startX, startY, startX + (sectionLength * 2), startY + (offY * 2) - 2, bgColor); } int negY = ((lines - 1) * 5) / 2; diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java index 32d3b065..7c558a60 100644 --- a/src/main/java/appeng/client/me/SlotDisconnected.java +++ b/src/main/java/appeng/client/me/SlotDisconnected.java @@ -39,7 +39,7 @@ public class SlotDisconnected extends AppEngSlot @Override public ItemStack getDisplayStack() { - if ( Platform.isClient() )// && (which == PlaceableItemType.ENCODED_PATTERN) ) + if ( Platform.isClient() ) { ItemStack is = super.getStack(); if ( is != null && is.getItem() instanceof ItemEncodedPattern ) diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index c8db1911..e8fa7d4d 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -83,7 +83,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab public TickRateModulation call() throws Exception { this.breaking = false; - return this.breakblock( true ); + return this.breakBlock( true ); } @Override @@ -244,7 +244,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab this.getHost().markForUpdate(); } - public TickRateModulation breakblock( boolean modulate ) + public TickRateModulation breakBlock( boolean modulate ) { if ( this.isAccepting && this.proxy.isActive() ) { @@ -419,7 +419,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab } this.isAccepting = true; - return this.breakblock( false ); + return this.breakBlock( false ); } /** diff --git a/src/main/java/appeng/util/ConfigManager.java b/src/main/java/appeng/util/ConfigManager.java index 44db97f5..85bd76dc 100644 --- a/src/main/java/appeng/util/ConfigManager.java +++ b/src/main/java/appeng/util/ConfigManager.java @@ -78,15 +78,15 @@ public class ConfigManager implements IConfigManager /** * save all settings using config manager. * - * @param tagCompound to be written to compound + * @param destination to be written to compound */ @Override - public void writeToNBT(NBTTagCompound tagCompound) + public void writeToNBT(NBTTagCompound destination ) { for (Enum e : this.Settings.keySet()) { - tagCompound.setString( e.name(), this.Settings.get( e ).toString() ); + destination.setString( e.name(), this.Settings.get( e ).toString() ); } }