keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix some shadowing warnings.

Browse source
This commit is contained in:
LexManos 2012-04-02 01:08:37 -07:00
parent 116e078db7
commit 719e436caa
4 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
forge/forge_client/src/net/minecraft/src/forge/GuiControlsScrollPanel.java
View file

@ -16,8 +16,8 @@ public class GuiControlsScrollPanel extends GuiSlot
private GameSettings options;
private Minecraft mc;
private String[] message;
private int mouseX;
private int mouseY;
private int _mouseX;
private int _mouseY;
private int selected = -1;
public GuiControlsScrollPanel(GuiControls controls, GameSettings options, Minecraft mc)
@ -64,8 +64,8 @@ public class GuiControlsScrollPanel extends GuiSlot
@Override
public void drawScreen(int mX, int mY, float f)
{
mouseX = mX;
mouseY = mY;
_mouseX = mX;
_mouseY = mY;
if (selected != -1 && !Mouse.isButtonDown(0) && Mouse.getDWheel() == 0)
{
@ -87,7 +87,7 @@ public class GuiControlsScrollPanel extends GuiSlot
int width = 70;
int height = 20;
xPosition -= 20;
boolean flag = mouseX >= xPosition && mouseY >= yPosition && mouseX < xPosition + width && mouseY < yPosition + height;
boolean flag = _mouseX >= xPosition && _mouseY >= yPosition && _mouseX < xPosition + width && _mouseY < yPosition + height;
int k = (flag ? 2 : 1);
GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/gui.png"));

6
forge/forge_common/net/minecraft/src/forge/Configuration.java
View file

@ -71,8 +71,8 @@ public class Configuration
}
}
Map<String, Property> blockProperties = categories.get(CATEGORY_BLOCK);
if (blockProperties.containsKey(key))
Map<String, Property> properties = categories.get(CATEGORY_BLOCK);
if (properties.containsKey(key))
{
Property property = getOrCreateIntProperty(key, Configuration.CATEGORY_BLOCK, defaultId);
configBlocks[Integer.parseInt(property.value)] = true;
@ -81,7 +81,7 @@ public class Configuration
else
{
Property property = new Property();
blockProperties.put(key, property);
properties.put(key, property);
property.name = key;
if (Block.blocksList[defaultId] == null && !configBlocks[defaultId])

10
forge/forge_common/net/minecraft/src/forge/DungeonLoot.java
View file

@ -10,7 +10,7 @@ import net.minecraft.src.ItemStack;
*/
public class DungeonLoot
{
private ItemStack item;
private ItemStack itemStack;
private int minCount = 1;
private int maxCount = 1;
@ -21,7 +21,7 @@ public class DungeonLoot
*/
public DungeonLoot(ItemStack item, int min, int max)
{
this.item = item;
this.itemStack = item;
minCount = min;
maxCount = max;
}
@ -34,18 +34,18 @@ public class DungeonLoot
*/
public ItemStack generateStack(Random rand)
{
ItemStack ret = this.item.copy();
ItemStack ret = this.itemStack.copy();
ret.stackSize = minCount + (rand.nextInt(maxCount - minCount + 1));
return ret;
}
public boolean equals(ItemStack item, int min, int max)
{
return (min == minCount && max == maxCount && item.isItemEqual(this.item));
return (min == minCount && max == maxCount && item.isItemEqual(this.itemStack));
}
public boolean equals(ItemStack item)
{
return item.isItemEqual(this.item);
return item.isItemEqual(this.itemStack);
}
}

28
forge/forge_common/net/minecraft/src/forge/EnumHelper.java
View file

@ -30,7 +30,7 @@ public class EnumHelper
{EnumToolMaterial.class, int.class, int.class, float.class, int.class, int.class}
};
private static boolean[] decompiled = new boolean[ctrs.length];
private static boolean[] decompiledFlags = new boolean[ctrs.length];
public static EnumAction addAction(String name)
{
@ -39,7 +39,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[0], EnumAction.class, name,
return addEnum(decompiledFlags[0], EnumAction.class, name,
new Class[] {},
new Object[]{});
}
@ -50,7 +50,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[1], EnumArmorMaterial.class, name,
return addEnum(decompiledFlags[1], EnumArmorMaterial.class, name,
new Class[] { int.class, int[].class, int.class },
new Object[]{ durability, reductionAmounts, enchantability });
}
@ -61,7 +61,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[2], EnumArt.class, name,
return addEnum(decompiledFlags[2], EnumArt.class, name,
new Class[] {String.class, int.class, int.class, int.class, int.class},
new Object[]{tile, sizeX, sizeY, offsetX, offsetY});
}
@ -72,7 +72,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[3], EnumCreatureAttribute.class, name,
return addEnum(decompiledFlags[3], EnumCreatureAttribute.class, name,
new Class[] {},
new Object[]{});
}
@ -83,7 +83,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[4], EnumCreatureType.class, name,
return addEnum(decompiledFlags[4], EnumCreatureType.class, name,
new Class[] {Class.class, int.class, Material.class, boolean.class},
new Object[]{typeClass, maxNumber, material, peaceful});
}
@ -94,7 +94,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[5], EnumDoor.class, name,
return addEnum(decompiledFlags[5], EnumDoor.class, name,
new Class[] {},
new Object[]{});
}
@ -105,7 +105,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[6], EnumEnchantmentType.class, name,
return addEnum(decompiledFlags[6], EnumEnchantmentType.class, name,
new Class[] {},
new Object[]{});
}
@ -116,7 +116,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[7], EnumMobType.class, name,
return addEnum(decompiledFlags[7], EnumMobType.class, name,
new Class[] {},
new Object[]{});
}
@ -127,7 +127,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[8], EnumMovingObjectType.class, name,
return addEnum(decompiledFlags[8], EnumMovingObjectType.class, name,
new Class[] {},
new Object[]{});
}
@ -138,7 +138,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[9], EnumSkyBlock.class, name,
return addEnum(decompiledFlags[9], EnumSkyBlock.class, name,
new Class[] {int.class },
new Object[]{lightValue});
}
@ -149,7 +149,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[10], EnumStatus.class, name,
return addEnum(decompiledFlags[10], EnumStatus.class, name,
new Class[] {},
new Object[]{});
}
@ -160,7 +160,7 @@ public class EnumHelper
setup();
}
return addEnum(decompiled[11], EnumToolMaterial.class, name,
return addEnum(decompiledFlags[11], EnumToolMaterial.class, name,
new Class[] { int.class, int.class, float.class, int.class, int.class },
new Object[]{ harvestLevel, maxUses, efficiency, damage, enchantability });
}
@ -189,7 +189,7 @@ public class EnumHelper
}
ctrs[x][0].getDeclaredConstructor(enumHeaders);
decompiled[x] = true;
decompiledFlags[x] = true;
}
catch (Exception e)