Skip to content

Commit

Permalink
Clean up some odd casts and obfuscated param names
Browse files Browse the repository at this point in the history
  • Loading branch information
@mezz
mezz committed Oct 21, 2016
1 parent 507b8fa commit d06b1d6
Show file tree
Hide file tree
Showing 29 changed files with 50 additions and 62 deletions.
2 changes: 1 addition & 1 deletion src/main/java/binnie/botany/ceramic/BlockCeramic.java
View file
Expand Up @@ -79,7 +79,7 @@ public void dropAsStack(final World world, final BlockPos pos, final ItemStack d
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final EnumFlowerColor c : EnumFlowerColor.values()) {
itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java
View file
Expand Up @@ -86,7 +86,7 @@ public void dropAsStack(final World world, final BlockPos pos, final ItemStack d
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final EnumFlowerColor c : EnumFlowerColor.values()) {
final BlockType type = new BlockType(c, c, TileType.Tile);
itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal()));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/botany/ceramic/BlockStained.java
View file
Expand Up @@ -111,7 +111,7 @@ public void dropAsStack(World p0, BlockPos pos, ItemStack p4) {
// }

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final EnumFlowerColor c : EnumFlowerColor.values()) {
itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
}
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/binnie/botany/genetics/ItemDictionary.java
View file
Expand Up @@ -26,12 +26,6 @@ public class ItemDictionary extends Item {
// return (par1 == 0) ? this.itemIcon : this.iconMaster;
// }

@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
}

@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/botany/items/ItemClay.java
View file
Expand Up @@ -32,7 +32,7 @@ public String getItemStackDisplayName(final ItemStack stack) {

@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item p_150895_1_, final CreativeTabs p_150895_2_, final List list) {
public void getSubItems(final Item itemIn, final CreativeTabs tab, final List<ItemStack> list) {
for (final EnumFlowerColor c : EnumFlowerColor.values()) {
list.add(new ItemStack(this, 1, c.ordinal()));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/botany/items/ItemPigment.java
View file
Expand Up @@ -33,7 +33,7 @@ public String getItemStackDisplayName(final ItemStack stack) {

@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item p_150895_1_, final CreativeTabs p_150895_2_, final List list) {
public void getSubItems(final Item itemIn, final CreativeTabs tab, final List<ItemStack> list) {
for (final EnumFlowerColor c : EnumFlowerColor.values()) {
list.add(new ItemStack(this, 1, c.ordinal()));
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/binnie/core/AbstractMod.java
View file
Expand Up @@ -100,8 +100,8 @@ public void init() {
return;
}
this.getProxy().init();
(this.wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel())).registerMessage((Class) this.getPacketHandler(), (Class) MessageBinnie.class, 1, Side.CLIENT);
this.wrapper.registerMessage((Class) this.getPacketHandler(), (Class) MessageBinnie.class, 1, Side.SERVER);
(this.wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(this.getChannel())).registerMessage(this.getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT);
this.wrapper.registerMessage(this.getPacketHandler(), MessageBinnie.class, 1, Side.SERVER);
for (final IInitializable module : this.modules) {
module.init();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/core/block/ItemMetadata.java
View file
Expand Up @@ -45,7 +45,7 @@ public int getMetadata(final int par1) {
//
// @Override
// @SideOnly(Side.CLIENT)
// public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
// public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
// ((IBlockMetadata) this.field_150939_a).getBlockTooltip(par1ItemStack, par3List);
// }
//
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/binnie/core/item/ItemMisc.java
View file
Expand Up @@ -44,11 +44,11 @@ public ItemStack getStack(final IItemMisc type, final int size) {

@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
final IItemMisc item = this.getItem(par1ItemStack.getItemDamage());
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
final IItemMisc item = this.getItem(stack.getItemDamage());
if (item != null) {
item.addInformation(par3List);
item.addInformation(tooltip);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/core/machines/BlockMachine.java
View file
Expand Up @@ -35,7 +35,7 @@ public BlockMachine(final MachineGroup group, final String blockName) {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final MachinePackage pack : this.group.getPackages()) {
if (pack.isActive()) {
itemList.add(new ItemStack(this, 1, pack.getMetadata()));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/core/proxy/BinnieProxyClient.java
View file
Expand Up @@ -136,7 +136,7 @@ public File getDirectory() {
@Override
public void registerTileEntity(final Class<? extends TileEntity> tile, final String id, final Object renderer) {
if (renderer != null && renderer instanceof TileEntitySpecialRenderer) {
ClientRegistry.registerTileEntity((Class) tile, id, (TileEntitySpecialRenderer) renderer);
ClientRegistry.registerTileEntity(tile, id, (TileEntitySpecialRenderer) renderer);
} else {
GameRegistry.registerTileEntity(tile, id);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extrabees/apiary/IndustrialFrame.java
View file
Expand Up @@ -103,7 +103,7 @@ public boolean isHellish() {
return false;
}

public Object getName() {
public String getName() {
return this.name;
}

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java
View file
Expand Up @@ -31,13 +31,13 @@ public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, fi

@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
final IndustrialFrame frame = getFrame(par1ItemStack);
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
final IndustrialFrame frame = getFrame(stack);
if (frame == null) {
par3List.add("Invalid Contents");
tooltip.add("Invalid Contents");
} else {
par3List.add(frame.getName());
tooltip.add(frame.getName());
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java
View file
Expand Up @@ -41,10 +41,10 @@ public ItemDictionary() {

@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
if (par1ItemStack.getItemDamage() > 0) {
par3List.add("Flora-in-a-box");
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add("Flora-in-a-box");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java
View file
Expand Up @@ -34,7 +34,7 @@ public String getUnlocalizedName(final ItemStack par1ItemStack) {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (int i = 0; i < EnumHiveType.values().length; ++i) {
itemList.add(new ItemStack(this, 1, i));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/block/BlockBranch.java
View file
Expand Up @@ -26,7 +26,7 @@ public BlockBranch() {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (int i = 0; i < EnumExtraTreeLog.values().length; ++i) {
itemList.add(TileEntityMetadata.getItemStack(this, i));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/block/BlockETDoor.java
View file
Expand Up @@ -249,7 +249,7 @@ public void dropAsStack(final World world, final BlockPos pos, final ItemStack d
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final IPlankType type : PlankType.ExtraTreePlanks.values()) {
itemList.add(WoodManager.getDoor(type, DoorType.Standard));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/block/BlockETPlanks.java
View file
Expand Up @@ -87,7 +87,7 @@ public void dropAsStack(World world, BlockPos pos, ItemStack p4) {
// }

// @Override
// public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
// public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
// for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) {
// itemList.add(TileEntityMetadata.getItemStack(this, i));
// }
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/block/BlockETSlab.java
View file
Expand Up @@ -98,7 +98,7 @@ public void dropAsStack(World p0, BlockPos pos, ItemStack p4) {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
// if (this.field_150004_a) {
// return;
// }
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/block/BlockETStairs.java
View file
Expand Up @@ -36,7 +36,7 @@ public BlockETStairs(final Block par2Block) {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) {
itemList.add(new ItemStack(this, 1, i));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/block/decor/BlockFence.java
View file
Expand Up @@ -34,7 +34,7 @@ public BlockFence(String name) {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final IFenceProvider type : PlankType.ExtraTreePlanks.values()) {
itemList.add(type.getFence());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/block/decor/BlockGate.java
View file
Expand Up @@ -32,7 +32,7 @@ public BlockGate() {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final IPlankType type : WoodManager.getAllPlankTypes()) {
final ItemStack gate = WoodManager.getGate(type);
if (gate != null) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java
View file
Expand Up @@ -19,7 +19,7 @@ public BlockMultiFence() {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final FenceType type : FenceType.values()) {
itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java
View file
Expand Up @@ -18,7 +18,7 @@ public BlockCarpentryPanel() {
}

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
}

// @Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/binnie/extratrees/carpentry/BlockDesign.java
View file
Expand Up @@ -59,7 +59,7 @@ public BlockDesign(final IDesignSystem system, final Material material) {
public abstract ItemStack getCreativeStack(final IDesign p0);

@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
for (final IDesign design : CarpentryManager.carpentryInterface.getSortedDesigns()) {
itemList.add(this.getCreativeStack(design));
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/binnie/extratrees/item/ItemDictionary.java
View file
Expand Up @@ -34,10 +34,10 @@ public class ItemDictionary extends Item {

@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
if (par1ItemStack.getItemDamage() > 0) {
par3List.add("Sengir-in-a-can");
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add("Sengir-in-a-can");

This comment has been minimized.

Sign in to view

Copy link
@Chocohead

Chocohead Oct 21, 2016

Contributor

Surprise tabs
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/binnie/extratrees/item/ItemFood.java
View file
Expand Up @@ -43,11 +43,11 @@ public ItemStack getStack(final IItemMisc type, final int size) {

@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
final IItemMisc item = this.getItem(par1ItemStack.getItemDamage());
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
final IItemMisc item = this.getItem(stack.getItemDamage());
if (item != null) {
item.addInformation(par3List);
item.addInformation(tooltip);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/binnie/extratrees/item/ItemMothDatabase.java
View file
Expand Up @@ -34,10 +34,10 @@ public class ItemMothDatabase extends Item {

@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
if (par1ItemStack.getItemDamage() > 0) {
par3List.add("Binnie's Emporium of Lepidopterans");
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add("Binnie's Emporium of Lepidopterans");
}
}

Expand Down
12 changes: 3 additions & 9 deletions src/main/java/binnie/genetics/item/ItemDatabase.java
View file
Expand Up @@ -34,15 +34,9 @@ public class ItemDatabase extends Item {

@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
}

@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) {
super.getSubItems(par1, par2CreativeTabs, par3List);
par3List.add(new ItemStack(par1, 1, 1));
public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems) {
super.getSubItems(itemIn, tab, subItems);
subItems.add(new ItemStack(itemIn, 1, 1));
}

public ItemDatabase() {
Expand Down

0 comments on commit d06b1d6

Please sign in to comment.